git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
optimized lib/pdf/Makefile.in
[swftools.git]
/
lib
/
python
/
gfx.c
diff --git
a/lib/python/gfx.c
b/lib/python/gfx.c
index
cbb4eb0
..
0af8b65
100644
(file)
--- a/
lib/python/gfx.c
+++ b/
lib/python/gfx.c
@@
-72,11
+72,11
@@
static char* strf(char*format, ...)
int l;
va_list arglist;
va_start(arglist, format);
int l;
va_list arglist;
va_start(arglist, format);
- vsprintf(buf, format, arglist);
+ vsnprintf(buf, sizeof(buf)-1, format, arglist);
va_end(arglist);
return strdup(buf);
}
va_end(arglist);
return strdup(buf);
}
-#define PY_ERROR(s,args...) (PyErr_SetString(PyExc_Exception, strf(s, ## args)),(PyObject*)NULL)
+#define PY_ERROR(s,args...) (PyErr_SetString(PyExc_Exception, strf(s, ## args)),(void*)NULL)
#define PY_NONE Py_BuildValue("s", 0)
//---------------------------------------------------------------------
#define PY_NONE Py_BuildValue("s", 0)
//---------------------------------------------------------------------
@@
-158,8
+158,9
@@
static gfxline_t*toLine(PyObject*_line)
gfxline_t*last=&first;
for(t=0;t<num;t++) {
PyObject*p= PySequence_GetItem(_line, t);
gfxline_t*last=&first;
for(t=0;t<num;t++) {
PyObject*p= PySequence_GetItem(_line, t);
- if(!PyTuple_Check(p))
+ if(!PyTuple_Check(p)) {
return PY_ERROR("each point must be a tuple");
return PY_ERROR("each point must be a tuple");
+ }
PyObject*_type = PyTuple_GetItem(p, 0);
if(!PyString_Check(_type))
return PY_ERROR("point tuples must start with a string");
PyObject*_type = PyTuple_GetItem(p, 0);
if(!PyString_Check(_type))
return PY_ERROR("point tuples must start with a string");
@@
-918,7
+919,7
@@
static PyObject* doc_setparameter(PyObject* _self, PyObject* args, PyObject* kwa
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss", kwlist, &key,&value))
return NULL;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss", kwlist, &key,&value))
return NULL;
- self->doc->set_parameter(self->doc, key, value);
+ self->doc->setparameter(self->doc, key, value);
return PY_NONE;
}
return PY_NONE;
}
@@
-1118,7
+1119,7
@@
static PyObject* f_setparameter(PyObject* self, PyObject* args, PyObject* kwargs
char*key=0,*value=0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss", kwlist, &key, &value))
return NULL;
char*key=0,*value=0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss", kwlist, &key, &value))
return NULL;
- pdfdriver->set_parameter(pdfdriver,key,value);
+ pdfdriver->setparameter(pdfdriver,key,value);
return PY_NONE;
}
return PY_NONE;
}
@@
-1158,7
+1159,7
@@
static PyObject* f_addfont(PyObject* self, PyObject* args, PyObject* kwargs)
char*filename=0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &filename))
return NULL;
char*filename=0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &filename))
return NULL;
- pdfdriver->set_parameter(pdfdriver,"font", filename);
+ pdfdriver->setparameter(pdfdriver,"font", filename);
return PY_NONE;
}
return PY_NONE;
}
@@
-1174,7
+1175,7
@@
static PyObject* f_addfontdir(PyObject* self, PyObject* args, PyObject* kwargs)
char*filename=0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &filename))
return NULL;
char*filename=0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s", kwlist, &filename))
return NULL;
- pdfdriver->set_parameter(pdfdriver,"fontdir", filename);
+ pdfdriver->setparameter(pdfdriver,"fontdir", filename);
return PY_NONE;
}
return PY_NONE;
}