Freestyle: use bool instead of int.
Patch contribution by flokkievids (Folkert de Vries). Thanks!
This commit is contained in:
@@ -201,7 +201,7 @@ PyObject *BPy_Interface0D_from_Interface0D(Interface0D& if0D)
|
|||||||
{
|
{
|
||||||
PyObject *py_if0D = Interface0D_Type.tp_new(&Interface0D_Type, 0, 0);
|
PyObject *py_if0D = Interface0D_Type.tp_new(&Interface0D_Type, 0, 0);
|
||||||
((BPy_Interface0D *)py_if0D)->if0D = &if0D;
|
((BPy_Interface0D *)py_if0D)->if0D = &if0D;
|
||||||
((BPy_Interface0D *)py_if0D)->borrowed = 1;
|
((BPy_Interface0D *)py_if0D)->borrowed = true;
|
||||||
return py_if0D;
|
return py_if0D;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -209,7 +209,7 @@ PyObject *BPy_Interface1D_from_Interface1D(Interface1D& if1D)
|
|||||||
{
|
{
|
||||||
PyObject *py_if1D = Interface1D_Type.tp_new(&Interface1D_Type, 0, 0);
|
PyObject *py_if1D = Interface1D_Type.tp_new(&Interface1D_Type, 0, 0);
|
||||||
((BPy_Interface1D *)py_if1D)->if1D = &if1D;
|
((BPy_Interface1D *)py_if1D)->if1D = &if1D;
|
||||||
((BPy_Interface1D *)py_if1D)->borrowed = 1;
|
((BPy_Interface1D *)py_if1D)->borrowed = true;
|
||||||
return py_if1D;
|
return py_if1D;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -218,7 +218,7 @@ PyObject *BPy_SVertex_from_SVertex(SVertex& sv)
|
|||||||
PyObject *py_sv = SVertex_Type.tp_new(&SVertex_Type, 0, 0);
|
PyObject *py_sv = SVertex_Type.tp_new(&SVertex_Type, 0, 0);
|
||||||
((BPy_SVertex *)py_sv)->sv = &sv;
|
((BPy_SVertex *)py_sv)->sv = &sv;
|
||||||
((BPy_SVertex *)py_sv)->py_if0D.if0D = ((BPy_SVertex *)py_sv)->sv;
|
((BPy_SVertex *)py_sv)->py_if0D.if0D = ((BPy_SVertex *)py_sv)->sv;
|
||||||
((BPy_SVertex *)py_sv)->py_if0D.borrowed = 1;
|
((BPy_SVertex *)py_sv)->py_if0D.borrowed = true;
|
||||||
return py_sv;
|
return py_sv;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -228,7 +228,7 @@ PyObject *BPy_FEdgeSharp_from_FEdgeSharp(FEdgeSharp& fes)
|
|||||||
((BPy_FEdgeSharp *)py_fe)->fes = &fes;
|
((BPy_FEdgeSharp *)py_fe)->fes = &fes;
|
||||||
((BPy_FEdgeSharp *)py_fe)->py_fe.fe = ((BPy_FEdgeSharp *)py_fe)->fes;
|
((BPy_FEdgeSharp *)py_fe)->py_fe.fe = ((BPy_FEdgeSharp *)py_fe)->fes;
|
||||||
((BPy_FEdgeSharp *)py_fe)->py_fe.py_if1D.if1D = ((BPy_FEdgeSharp *)py_fe)->fes;
|
((BPy_FEdgeSharp *)py_fe)->py_fe.py_if1D.if1D = ((BPy_FEdgeSharp *)py_fe)->fes;
|
||||||
((BPy_FEdgeSharp *)py_fe)->py_fe.py_if1D.borrowed = 1;
|
((BPy_FEdgeSharp *)py_fe)->py_fe.py_if1D.borrowed = true;
|
||||||
return py_fe;
|
return py_fe;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -238,7 +238,7 @@ PyObject *BPy_FEdgeSmooth_from_FEdgeSmooth(FEdgeSmooth& fes)
|
|||||||
((BPy_FEdgeSmooth *)py_fe)->fes = &fes;
|
((BPy_FEdgeSmooth *)py_fe)->fes = &fes;
|
||||||
((BPy_FEdgeSmooth *)py_fe)->py_fe.fe = ((BPy_FEdgeSmooth *)py_fe)->fes;
|
((BPy_FEdgeSmooth *)py_fe)->py_fe.fe = ((BPy_FEdgeSmooth *)py_fe)->fes;
|
||||||
((BPy_FEdgeSmooth *)py_fe)->py_fe.py_if1D.if1D = ((BPy_FEdgeSmooth *)py_fe)->fes;
|
((BPy_FEdgeSmooth *)py_fe)->py_fe.py_if1D.if1D = ((BPy_FEdgeSmooth *)py_fe)->fes;
|
||||||
((BPy_FEdgeSmooth *)py_fe)->py_fe.py_if1D.borrowed = 1;
|
((BPy_FEdgeSmooth *)py_fe)->py_fe.py_if1D.borrowed = true;
|
||||||
return py_fe;
|
return py_fe;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -247,7 +247,7 @@ PyObject *BPy_FEdge_from_FEdge(FEdge& fe)
|
|||||||
PyObject *py_fe = FEdge_Type.tp_new(&FEdge_Type, 0, 0);
|
PyObject *py_fe = FEdge_Type.tp_new(&FEdge_Type, 0, 0);
|
||||||
((BPy_FEdge *)py_fe)->fe = &fe;
|
((BPy_FEdge *)py_fe)->fe = &fe;
|
||||||
((BPy_FEdge *)py_fe)->py_if1D.if1D = ((BPy_FEdge *)py_fe)->fe;
|
((BPy_FEdge *)py_fe)->py_if1D.if1D = ((BPy_FEdge *)py_fe)->fe;
|
||||||
((BPy_FEdge *)py_fe)->py_if1D.borrowed = 1;
|
((BPy_FEdge *)py_fe)->py_if1D.borrowed = true;
|
||||||
return py_fe;
|
return py_fe;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -265,7 +265,7 @@ PyObject *BPy_Stroke_from_Stroke(Stroke& s)
|
|||||||
PyObject *py_s = Stroke_Type.tp_new(&Stroke_Type, 0, 0);
|
PyObject *py_s = Stroke_Type.tp_new(&Stroke_Type, 0, 0);
|
||||||
((BPy_Stroke *)py_s)->s = &s;
|
((BPy_Stroke *)py_s)->s = &s;
|
||||||
((BPy_Stroke *)py_s)->py_if1D.if1D = ((BPy_Stroke *)py_s)->s;
|
((BPy_Stroke *)py_s)->py_if1D.if1D = ((BPy_Stroke *)py_s)->s;
|
||||||
((BPy_Stroke *)py_s)->py_if1D.borrowed = 1;
|
((BPy_Stroke *)py_s)->py_if1D.borrowed = true;
|
||||||
return py_s;
|
return py_s;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -273,7 +273,7 @@ PyObject *BPy_StrokeAttribute_from_StrokeAttribute(StrokeAttribute& sa)
|
|||||||
{
|
{
|
||||||
PyObject *py_sa = StrokeAttribute_Type.tp_new(&StrokeAttribute_Type, 0, 0);
|
PyObject *py_sa = StrokeAttribute_Type.tp_new(&StrokeAttribute_Type, 0, 0);
|
||||||
((BPy_StrokeAttribute *)py_sa)->sa = &sa;
|
((BPy_StrokeAttribute *)py_sa)->sa = &sa;
|
||||||
((BPy_StrokeAttribute *)py_sa)->borrowed = 1;
|
((BPy_StrokeAttribute *)py_sa)->borrowed = true;
|
||||||
return py_sa;
|
return py_sa;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -292,7 +292,7 @@ PyObject *BPy_StrokeVertex_from_StrokeVertex(StrokeVertex& sv)
|
|||||||
((BPy_StrokeVertex *)py_sv)->sv = &sv;
|
((BPy_StrokeVertex *)py_sv)->sv = &sv;
|
||||||
((BPy_StrokeVertex *)py_sv)->py_cp.cp = ((BPy_StrokeVertex *)py_sv)->sv;
|
((BPy_StrokeVertex *)py_sv)->py_cp.cp = ((BPy_StrokeVertex *)py_sv)->sv;
|
||||||
((BPy_StrokeVertex *)py_sv)->py_cp.py_if0D.if0D = ((BPy_StrokeVertex *)py_sv)->sv;
|
((BPy_StrokeVertex *)py_sv)->py_cp.py_if0D.if0D = ((BPy_StrokeVertex *)py_sv)->sv;
|
||||||
((BPy_StrokeVertex *)py_sv)->py_cp.py_if0D.borrowed = 1;
|
((BPy_StrokeVertex *)py_sv)->py_cp.py_if0D.borrowed = true;
|
||||||
return py_sv;
|
return py_sv;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -301,7 +301,7 @@ PyObject *BPy_ViewVertex_from_ViewVertex(ViewVertex& vv)
|
|||||||
PyObject *py_vv = ViewVertex_Type.tp_new(&ViewVertex_Type, 0, 0);
|
PyObject *py_vv = ViewVertex_Type.tp_new(&ViewVertex_Type, 0, 0);
|
||||||
((BPy_ViewVertex *)py_vv)->vv = &vv;
|
((BPy_ViewVertex *)py_vv)->vv = &vv;
|
||||||
((BPy_ViewVertex *)py_vv)->py_if0D.if0D = ((BPy_ViewVertex *)py_vv)->vv;
|
((BPy_ViewVertex *)py_vv)->py_if0D.if0D = ((BPy_ViewVertex *)py_vv)->vv;
|
||||||
((BPy_ViewVertex *)py_vv)->py_if0D.borrowed = 1;
|
((BPy_ViewVertex *)py_vv)->py_if0D.borrowed = true;
|
||||||
return py_vv;
|
return py_vv;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -311,7 +311,7 @@ PyObject *BPy_NonTVertex_from_NonTVertex(NonTVertex& ntv)
|
|||||||
((BPy_NonTVertex *)py_ntv)->ntv = &ntv;
|
((BPy_NonTVertex *)py_ntv)->ntv = &ntv;
|
||||||
((BPy_NonTVertex *)py_ntv)->py_vv.vv = ((BPy_NonTVertex *)py_ntv)->ntv;
|
((BPy_NonTVertex *)py_ntv)->py_vv.vv = ((BPy_NonTVertex *)py_ntv)->ntv;
|
||||||
((BPy_NonTVertex *)py_ntv)->py_vv.py_if0D.if0D = ((BPy_NonTVertex *)py_ntv)->ntv;
|
((BPy_NonTVertex *)py_ntv)->py_vv.py_if0D.if0D = ((BPy_NonTVertex *)py_ntv)->ntv;
|
||||||
((BPy_NonTVertex *)py_ntv)->py_vv.py_if0D.borrowed = 1;
|
((BPy_NonTVertex *)py_ntv)->py_vv.py_if0D.borrowed = true;
|
||||||
return py_ntv;
|
return py_ntv;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -321,7 +321,7 @@ PyObject *BPy_TVertex_from_TVertex(TVertex& tv)
|
|||||||
((BPy_TVertex *)py_tv)->tv = &tv;
|
((BPy_TVertex *)py_tv)->tv = &tv;
|
||||||
((BPy_TVertex *)py_tv)->py_vv.vv = ((BPy_TVertex *)py_tv)->tv;
|
((BPy_TVertex *)py_tv)->py_vv.vv = ((BPy_TVertex *)py_tv)->tv;
|
||||||
((BPy_TVertex *)py_tv)->py_vv.py_if0D.if0D = ((BPy_TVertex *)py_tv)->tv;
|
((BPy_TVertex *)py_tv)->py_vv.py_if0D.if0D = ((BPy_TVertex *)py_tv)->tv;
|
||||||
((BPy_TVertex *)py_tv)->py_vv.py_if0D.borrowed = 1;
|
((BPy_TVertex *)py_tv)->py_vv.py_if0D.borrowed = true;
|
||||||
return py_tv;
|
return py_tv;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -337,7 +337,7 @@ PyObject *BPy_ViewEdge_from_ViewEdge(ViewEdge& ve)
|
|||||||
PyObject *py_ve = ViewEdge_Type.tp_new(&ViewEdge_Type, 0, 0);
|
PyObject *py_ve = ViewEdge_Type.tp_new(&ViewEdge_Type, 0, 0);
|
||||||
((BPy_ViewEdge *)py_ve)->ve = &ve;
|
((BPy_ViewEdge *)py_ve)->ve = &ve;
|
||||||
((BPy_ViewEdge *)py_ve)->py_if1D.if1D = ((BPy_ViewEdge *)py_ve)->ve;
|
((BPy_ViewEdge *)py_ve)->py_if1D.if1D = ((BPy_ViewEdge *)py_ve)->ve;
|
||||||
((BPy_ViewEdge *)py_ve)->py_if1D.borrowed = 1;
|
((BPy_ViewEdge *)py_ve)->py_if1D.borrowed = true;
|
||||||
return py_ve;
|
return py_ve;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -347,7 +347,7 @@ PyObject *BPy_Chain_from_Chain(Chain& c)
|
|||||||
((BPy_Chain *)py_c)->c = &c;
|
((BPy_Chain *)py_c)->c = &c;
|
||||||
((BPy_Chain *)py_c)->py_c.c = ((BPy_Chain *)py_c)->c;
|
((BPy_Chain *)py_c)->py_c.c = ((BPy_Chain *)py_c)->c;
|
||||||
((BPy_Chain *)py_c)->py_c.py_if1D.if1D = ((BPy_Chain *)py_c)->c;
|
((BPy_Chain *)py_c)->py_c.py_if1D.if1D = ((BPy_Chain *)py_c)->c;
|
||||||
((BPy_Chain *)py_c)->py_c.py_if1D.borrowed = 1;
|
((BPy_Chain *)py_c)->py_c.py_if1D.borrowed = true;
|
||||||
return py_c;
|
return py_c;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -355,7 +355,7 @@ PyObject *BPy_SShape_from_SShape(SShape& ss)
|
|||||||
{
|
{
|
||||||
PyObject *py_ss = SShape_Type.tp_new(&SShape_Type, 0, 0);
|
PyObject *py_ss = SShape_Type.tp_new(&SShape_Type, 0, 0);
|
||||||
((BPy_SShape *)py_ss)->ss = &ss;
|
((BPy_SShape *)py_ss)->ss = &ss;
|
||||||
((BPy_SShape *)py_ss)->borrowed = 1;
|
((BPy_SShape *)py_ss)->borrowed = true;
|
||||||
return py_ss;
|
return py_ss;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -363,7 +363,7 @@ PyObject *BPy_ViewShape_from_ViewShape(ViewShape& vs)
|
|||||||
{
|
{
|
||||||
PyObject *py_vs = ViewShape_Type.tp_new(&ViewShape_Type, 0, 0);
|
PyObject *py_vs = ViewShape_Type.tp_new(&ViewShape_Type, 0, 0);
|
||||||
((BPy_ViewShape *)py_vs)->vs = &vs;
|
((BPy_ViewShape *)py_vs)->vs = &vs;
|
||||||
((BPy_ViewShape *)py_vs)->borrowed = 1;
|
((BPy_ViewShape *)py_vs)->borrowed = true;
|
||||||
((BPy_ViewShape *)py_vs)->py_ss = NULL;
|
((BPy_ViewShape *)py_vs)->py_ss = NULL;
|
||||||
return py_vs;
|
return py_vs;
|
||||||
}
|
}
|
||||||
@@ -389,7 +389,7 @@ PyObject *BPy_CurvePoint_from_CurvePoint(CurvePoint& cp)
|
|||||||
PyObject *py_cp = CurvePoint_Type.tp_new(&CurvePoint_Type, 0, 0);
|
PyObject *py_cp = CurvePoint_Type.tp_new(&CurvePoint_Type, 0, 0);
|
||||||
((BPy_CurvePoint *) py_cp)->cp = &cp;
|
((BPy_CurvePoint *) py_cp)->cp = &cp;
|
||||||
((BPy_CurvePoint *) py_cp)->py_if0D.if0D = ((BPy_CurvePoint *)py_cp)->cp;
|
((BPy_CurvePoint *) py_cp)->py_if0D.if0D = ((BPy_CurvePoint *)py_cp)->cp;
|
||||||
((BPy_CurvePoint *) py_cp)->py_if0D.borrowed = 1;
|
((BPy_CurvePoint *) py_cp)->py_if0D.borrowed = true;
|
||||||
return py_cp;
|
return py_cp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ static int Interface0D_init(BPy_Interface0D *self, PyObject *args, PyObject *kwd
|
|||||||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
|
||||||
return -1;
|
return -1;
|
||||||
self->if0D = new Interface0D();
|
self->if0D = new Interface0D();
|
||||||
self->borrowed = 0;
|
self->borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ extern PyTypeObject Interface0D_Type;
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
PyObject_HEAD
|
PyObject_HEAD
|
||||||
Interface0D *if0D;
|
Interface0D *if0D;
|
||||||
int borrowed; /* non-zero if *if0D is a borrowed object */
|
bool borrowed; /* true if *if0D is a borrowed object */
|
||||||
} BPy_Interface0D;
|
} BPy_Interface0D;
|
||||||
|
|
||||||
/*---------------------------Python BPy_Interface0D visible prototypes-----------*/
|
/*---------------------------Python BPy_Interface0D visible prototypes-----------*/
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ static int Interface1D_init(BPy_Interface1D *self, PyObject *args, PyObject *kwd
|
|||||||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist))
|
||||||
return -1;
|
return -1;
|
||||||
self->if1D = new Interface1D();
|
self->if1D = new Interface1D();
|
||||||
self->borrowed = 0;
|
self->borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -141,7 +141,7 @@ PyDoc_STRVAR(Interface1D_vertices_begin_doc,
|
|||||||
static PyObject * Interface1D_vertices_begin(BPy_Interface1D *self)
|
static PyObject * Interface1D_vertices_begin(BPy_Interface1D *self)
|
||||||
{
|
{
|
||||||
Interface0DIterator if0D_it(self->if1D->verticesBegin());
|
Interface0DIterator if0D_it(self->if1D->verticesBegin());
|
||||||
return BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, 0);
|
return BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
PyDoc_STRVAR(Interface1D_vertices_end_doc,
|
PyDoc_STRVAR(Interface1D_vertices_end_doc,
|
||||||
@@ -156,7 +156,7 @@ PyDoc_STRVAR(Interface1D_vertices_end_doc,
|
|||||||
static PyObject * Interface1D_vertices_end(BPy_Interface1D *self)
|
static PyObject * Interface1D_vertices_end(BPy_Interface1D *self)
|
||||||
{
|
{
|
||||||
Interface0DIterator if0D_it(self->if1D->verticesEnd());
|
Interface0DIterator if0D_it(self->if1D->verticesEnd());
|
||||||
return BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, 1);
|
return BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
PyDoc_STRVAR(Interface1D_points_begin_doc,
|
PyDoc_STRVAR(Interface1D_points_begin_doc,
|
||||||
@@ -181,7 +181,7 @@ static PyObject * Interface1D_points_begin(BPy_Interface1D *self, PyObject *args
|
|||||||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|f", (char **)kwlist, &f))
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|f", (char **)kwlist, &f))
|
||||||
return NULL;
|
return NULL;
|
||||||
Interface0DIterator if0D_it(self->if1D->pointsBegin(f));
|
Interface0DIterator if0D_it(self->if1D->pointsBegin(f));
|
||||||
return BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, 0);
|
return BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
PyDoc_STRVAR(Interface1D_points_end_doc,
|
PyDoc_STRVAR(Interface1D_points_end_doc,
|
||||||
@@ -206,7 +206,7 @@ static PyObject * Interface1D_points_end(BPy_Interface1D *self, PyObject *args,
|
|||||||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|f", (char **)kwlist, &f))
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|f", (char **)kwlist, &f))
|
||||||
return NULL;
|
return NULL;
|
||||||
Interface0DIterator if0D_it(self->if1D->pointsEnd(f));
|
Interface0DIterator if0D_it(self->if1D->pointsEnd(f));
|
||||||
return BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, 1);
|
return BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
static PyMethodDef BPy_Interface1D_methods[] = {
|
static PyMethodDef BPy_Interface1D_methods[] = {
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ extern PyTypeObject Interface1D_Type;
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
PyObject_HEAD
|
PyObject_HEAD
|
||||||
Interface1D *if1D;
|
Interface1D *if1D;
|
||||||
int borrowed; /* non-zero if *if1D is a borrowed object */
|
bool borrowed; /* true if *if1D is a borrowed object */
|
||||||
} BPy_Interface1D;
|
} BPy_Interface1D;
|
||||||
|
|
||||||
/*---------------------------Python BPy_Interface1D visible prototypes-----------*/
|
/*---------------------------Python BPy_Interface1D visible prototypes-----------*/
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ static int SShape_init(BPy_SShape *self, PyObject *args, PyObject *kwds)
|
|||||||
self->ss = new SShape();
|
self->ss = new SShape();
|
||||||
else
|
else
|
||||||
self->ss = new SShape(*(((BPy_SShape *)brother)->ss));
|
self->ss = new SShape(*(((BPy_SShape *)brother)->ss));
|
||||||
self->borrowed = 0;
|
self->borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ extern PyTypeObject SShape_Type;
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
PyObject_HEAD
|
PyObject_HEAD
|
||||||
SShape *ss;
|
SShape *ss;
|
||||||
int borrowed; /* non-zero if *ss is a borrowed object */
|
bool borrowed; /* true if *ss is a borrowed object */
|
||||||
} BPy_SShape;
|
} BPy_SShape;
|
||||||
|
|
||||||
/*---------------------------Python BPy_SShape visible prototypes-----------*/
|
/*---------------------------Python BPy_SShape visible prototypes-----------*/
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ static int StrokeAttribute_init(BPy_StrokeAttribute *self, PyObject *args, PyObj
|
|||||||
PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
|
PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
self->borrowed = 0;
|
self->borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ extern PyTypeObject StrokeAttribute_Type;
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
PyObject_HEAD
|
PyObject_HEAD
|
||||||
StrokeAttribute *sa;
|
StrokeAttribute *sa;
|
||||||
int borrowed; /* non-zero if *sa is a borrowed reference */
|
bool borrowed; /* true if *sa is a borrowed reference */
|
||||||
} BPy_StrokeAttribute;
|
} BPy_StrokeAttribute;
|
||||||
|
|
||||||
/*---------------------------Python BPy_StrokeAttribute visible prototypes-----------*/
|
/*---------------------------Python BPy_StrokeAttribute visible prototypes-----------*/
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ static int ViewShape_init(BPy_ViewShape *self, PyObject *args, PyObject *kwds)
|
|||||||
PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
|
PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
self->borrowed = 0;
|
self->borrowed = false;
|
||||||
Py_XINCREF(self->py_ss);
|
Py_XINCREF(self->py_ss);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ extern PyTypeObject ViewShape_Type;
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
PyObject_HEAD
|
PyObject_HEAD
|
||||||
ViewShape *vs;
|
ViewShape *vs;
|
||||||
int borrowed; /* non-zero if *vs a borrowed object */
|
bool borrowed; /* true if *vs a borrowed object */
|
||||||
BPy_SShape *py_ss;
|
BPy_SShape *py_ss;
|
||||||
} BPy_ViewShape;
|
} BPy_ViewShape;
|
||||||
|
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ int Director_BPy_UnaryPredicate0D___call__(UnaryPredicate0D *up0D, Interface0DIt
|
|||||||
PyErr_SetString(PyExc_RuntimeError, "Reference to Python object (py_up0D) not initialized");
|
PyErr_SetString(PyExc_RuntimeError, "Reference to Python object (py_up0D) not initialized");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
PyObject *arg = BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, 0);
|
PyObject *arg = BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, false);
|
||||||
if (!arg)
|
if (!arg)
|
||||||
return -1;
|
return -1;
|
||||||
PyObject *result = PyObject_CallMethod((PyObject *)up0D->py_up0D, (char *)"__call__", (char *)"O", arg);
|
PyObject *result = PyObject_CallMethod((PyObject *)up0D->py_up0D, (char *)"__call__", (char *)"O", arg);
|
||||||
@@ -226,7 +226,7 @@ int Director_BPy_UnaryFunction0D___call__(void *uf0D, void *py_uf0D, Interface0D
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
PyObject *obj = (PyObject *)py_uf0D;
|
PyObject *obj = (PyObject *)py_uf0D;
|
||||||
PyObject *arg = BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, 0);
|
PyObject *arg = BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, false);
|
||||||
if (!arg)
|
if (!arg)
|
||||||
return -1;
|
return -1;
|
||||||
PyObject *result = PyObject_CallMethod(obj, (char *)"__call__", (char *)"O", arg);
|
PyObject *result = PyObject_CallMethod(obj, (char *)"__call__", (char *)"O", arg);
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ static int CurvePoint_init(BPy_CurvePoint *self, PyObject *args, PyObject *kwds)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
self->py_if0D.if0D = self->cp;
|
self->py_if0D.if0D = self->cp;
|
||||||
self->py_if0D.borrowed = 0;
|
self->py_if0D.borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ static int SVertex_init(BPy_SVertex *self, PyObject *args, PyObject *kwds)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
self->py_if0D.if0D = self->sv;
|
self->py_if0D.if0D = self->sv;
|
||||||
self->py_if0D.borrowed = 0;
|
self->py_if0D.borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ PyDoc_STRVAR(ViewVertex_edges_begin_doc,
|
|||||||
static PyObject *ViewVertex_edges_begin(BPy_ViewVertex *self)
|
static PyObject *ViewVertex_edges_begin(BPy_ViewVertex *self)
|
||||||
{
|
{
|
||||||
ViewVertexInternal::orientedViewEdgeIterator ove_it(self->vv->edgesBegin());
|
ViewVertexInternal::orientedViewEdgeIterator ove_it(self->vv->edgesBegin());
|
||||||
return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ove_it, 0);
|
return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ove_it, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
PyDoc_STRVAR(ViewVertex_edges_end_doc,
|
PyDoc_STRVAR(ViewVertex_edges_end_doc,
|
||||||
@@ -113,7 +113,7 @@ static PyObject *ViewVertex_edges_iterator(BPy_ViewVertex *self, PyObject *args,
|
|||||||
return NULL;
|
return NULL;
|
||||||
ViewEdge *ve = ((BPy_ViewEdge *)py_ve)->ve;
|
ViewEdge *ve = ((BPy_ViewEdge *)py_ve)->ve;
|
||||||
ViewVertexInternal::orientedViewEdgeIterator ove_it(self->vv->edgesIterator(ve));
|
ViewVertexInternal::orientedViewEdgeIterator ove_it(self->vv->edgesIterator(ve));
|
||||||
return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ove_it, 0);
|
return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ove_it, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
static PyMethodDef BPy_ViewVertex_methods[] = {
|
static PyMethodDef BPy_ViewVertex_methods[] = {
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ static int StrokeVertex_init(BPy_StrokeVertex *self, PyObject *args, PyObject *k
|
|||||||
}
|
}
|
||||||
self->py_cp.cp = self->sv;
|
self->py_cp.cp = self->sv;
|
||||||
self->py_cp.py_if0D.if0D = self->sv;
|
self->py_cp.py_if0D.if0D = self->sv;
|
||||||
self->py_cp.py_if0D.borrowed = 0;
|
self->py_cp.py_if0D.borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ static int NonTVertex_init(BPy_NonTVertex *self, PyObject *args, PyObject *kwds)
|
|||||||
self->ntv = new NonTVertex(((BPy_SVertex *)obj)->sv);
|
self->ntv = new NonTVertex(((BPy_SVertex *)obj)->sv);
|
||||||
self->py_vv.vv = self->ntv;
|
self->py_vv.vv = self->ntv;
|
||||||
self->py_vv.py_if0D.if0D = self->ntv;
|
self->py_vv.py_if0D.if0D = self->ntv;
|
||||||
self->py_vv.py_if0D.borrowed = 0;
|
self->py_vv.py_if0D.borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ static int TVertex_init(BPy_TVertex *self, PyObject *args, PyObject *kwds)
|
|||||||
self->tv = new TVertex();
|
self->tv = new TVertex();
|
||||||
self->py_vv.vv = self->tv;
|
self->py_vv.vv = self->tv;
|
||||||
self->py_vv.py_if0D.if0D = self->tv;
|
self->py_vv.py_if0D.if0D = self->tv;
|
||||||
self->py_vv.py_if0D.borrowed = 0;
|
self->py_vv.py_if0D.borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ static int FEdge_init(BPy_FEdge *self, PyObject *args, PyObject *kwds)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
self->py_if1D.if1D = self->fe;
|
self->py_if1D.if1D = self->fe;
|
||||||
self->py_if1D.borrowed = 0;
|
self->py_if1D.borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ static int FrsCurve_init(BPy_FrsCurve *self, PyObject *args, PyObject *kwds)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
self->py_if1D.if1D = self->c;
|
self->py_if1D.if1D = self->c;
|
||||||
self->py_if1D.borrowed = 0;
|
self->py_if1D.borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -73,14 +73,14 @@ static int Stroke_init(BPy_Stroke *self, PyObject *args, PyObject *kwds)
|
|||||||
else
|
else
|
||||||
self->s = new Stroke(*(((BPy_Stroke *)brother)->s));
|
self->s = new Stroke(*(((BPy_Stroke *)brother)->s));
|
||||||
self->py_if1D.if1D = self->s;
|
self->py_if1D.if1D = self->s;
|
||||||
self->py_if1D.borrowed = 0;
|
self->py_if1D.borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static PyObject *Stroke_iter(PyObject *self)
|
static PyObject *Stroke_iter(PyObject *self)
|
||||||
{
|
{
|
||||||
StrokeInternal::StrokeVertexIterator sv_it( ((BPy_Stroke *)self)->s->strokeVerticesBegin() );
|
StrokeInternal::StrokeVertexIterator sv_it( ((BPy_Stroke *)self)->s->strokeVerticesBegin() );
|
||||||
return BPy_StrokeVertexIterator_from_StrokeVertexIterator( sv_it, 0 );
|
return BPy_StrokeVertexIterator_from_StrokeVertexIterator(sv_it, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
static Py_ssize_t Stroke_sq_length(BPy_Stroke *self)
|
static Py_ssize_t Stroke_sq_length(BPy_Stroke *self)
|
||||||
@@ -192,7 +192,7 @@ static PyObject *Stroke_insert_vertex(BPy_Stroke *self, PyObject *args, PyObject
|
|||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
((BPy_StrokeVertex *)py_sv)->py_cp.py_if0D.borrowed = 1; /* make the wrapped StrokeVertex internal */
|
((BPy_StrokeVertex *)py_sv)->py_cp.py_if0D.borrowed = true; /* make the wrapped StrokeVertex internal */
|
||||||
StrokeVertex *sv = ((BPy_StrokeVertex *)py_sv)->sv;
|
StrokeVertex *sv = ((BPy_StrokeVertex *)py_sv)->sv;
|
||||||
StrokeInternal::StrokeVertexIterator sv_it(*(((BPy_StrokeVertexIterator *)py_sv_it)->sv_it));
|
StrokeInternal::StrokeVertexIterator sv_it(*(((BPy_StrokeVertexIterator *)py_sv_it)->sv_it));
|
||||||
self->s->InsertVertex(sv, sv_it);
|
self->s->InsertVertex(sv, sv_it);
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ static int ViewEdge_init(BPy_ViewEdge *self, PyObject *args, PyObject *kwds)
|
|||||||
else
|
else
|
||||||
self->ve = new ViewEdge(*(((BPy_ViewEdge *)brother)->ve));
|
self->ve = new ViewEdge(*(((BPy_ViewEdge *)brother)->ve));
|
||||||
self->py_if1D.if1D = self->ve;
|
self->py_if1D.if1D = self->ve;
|
||||||
self->py_if1D.borrowed = 0;
|
self->py_if1D.borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ static int Chain_init(BPy_Chain *self, PyObject *args, PyObject *kwds)
|
|||||||
}
|
}
|
||||||
self->py_c.c = self->c;
|
self->py_c.c = self->c;
|
||||||
self->py_c.py_if1D.if1D = self->c;
|
self->py_c.py_if1D.if1D = self->c;
|
||||||
self->py_c.py_if1D.borrowed = 0;
|
self->py_c.py_if1D.borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ static int FEdgeSharp_init(BPy_FEdgeSharp *self, PyObject *args, PyObject *kwds)
|
|||||||
}
|
}
|
||||||
self->py_fe.fe = self->fes;
|
self->py_fe.fe = self->fes;
|
||||||
self->py_fe.py_if1D.if1D = self->fes;
|
self->py_fe.py_if1D.if1D = self->fes;
|
||||||
self->py_fe.py_if1D.borrowed = 0;
|
self->py_fe.py_if1D.borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ static int FEdgeSmooth_init(BPy_FEdgeSmooth *self, PyObject *args, PyObject *kwd
|
|||||||
}
|
}
|
||||||
self->py_fe.fe = self->fes;
|
self->py_fe.fe = self->fes;
|
||||||
self->py_fe.py_if1D.if1D = self->fes;
|
self->py_fe.py_if1D.if1D = self->fes;
|
||||||
self->py_fe.py_if1D.borrowed = 0;
|
self->py_fe.py_if1D.borrowed = false;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user