git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added f_Matrix2()
[swftools.git]
/
lib
/
python
/
primitives.c
diff --git
a/lib/python/primitives.c
b/lib/python/primitives.c
index
be62671
..
cbd2442
100644
(file)
--- a/
lib/python/primitives.c
+++ b/
lib/python/primitives.c
@@
-189,22
+189,22
@@
static int bbox_setattr(PyObject * self, char* a, PyObject* o)
BBoxObject*bbox= (BBoxObject*)self;
if(!strcmp(a, "xmin")) {
float xmin;
BBoxObject*bbox= (BBoxObject*)self;
if(!strcmp(a, "xmin")) {
float xmin;
- if (!PyArg_Parse(o, "i", &xmin)) goto err;
+ if (!PyArg_Parse(o, "f", &xmin)) goto err;
bbox->bbox.xmin = (int)(xmin*20);
return 0;
} else if(!strcmp(a, "ymin")) {
float ymin;
bbox->bbox.xmin = (int)(xmin*20);
return 0;
} else if(!strcmp(a, "ymin")) {
float ymin;
- if (!PyArg_Parse(o, "i", &ymin)) goto err;
+ if (!PyArg_Parse(o, "f", &ymin)) goto err;
bbox->bbox.ymin = (int)(ymin*20);
return 0;
} else if(!strcmp(a, "xmax")) {
float xmax;
bbox->bbox.ymin = (int)(ymin*20);
return 0;
} else if(!strcmp(a, "xmax")) {
float xmax;
- if (!PyArg_Parse(o, "i", &xmax)) goto err;
+ if (!PyArg_Parse(o, "f", &xmax)) goto err;
bbox->bbox.xmax = (int)(xmax*20);
return 0;
} else if(!strcmp(a, "ymax")) {
float ymax;
bbox->bbox.xmax = (int)(xmax*20);
return 0;
} else if(!strcmp(a, "ymax")) {
float ymax;
- if (!PyArg_Parse(o, "i", &ymax)) goto err;
+ if (!PyArg_Parse(o, "f", &ymax)) goto err;
bbox->bbox.ymax = (int)(ymax*20);
return 0;
}
bbox->bbox.ymax = (int)(ymax*20);
return 0;
}
@@
-247,6
+247,14
@@
typedef struct {
MATRIX matrix;
} MatrixObject;
MATRIX matrix;
} MatrixObject;
+PyObject* f_Matrix2(MATRIX* m)
+{
+ PyObject*self = (PyObject*)PyObject_New(MatrixObject, &MatrixClass);
+ MatrixObject*matrix = (MatrixObject*)self;
+ matrix->matrix = *m;
+ return self;
+}
+
PyObject* f_Matrix(PyObject* _self, PyObject* args, PyObject* kwargs)
{
PyObject*self = (PyObject*)PyObject_New(MatrixObject, &MatrixClass);
PyObject* f_Matrix(PyObject* _self, PyObject* args, PyObject* kwargs)
{
PyObject*self = (PyObject*)PyObject_New(MatrixObject, &MatrixClass);