Additional code improvements: avoid unnecessary Python object allocations in Freestyle.

6 files changed, 154 insertions, 145 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index bb907ec572c..56c096a1eae 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -512,103 +512,100 @@ Nature::EdgeNature EdgeNature_from_BPy_Nature(PyObject *obj)
 	return static_cast<Nature::EdgeNature>(PyLong_AsLong(obj));
 }
 
-Vec2f *Vec2f_ptr_from_PyObject(PyObject *obj)
-{
-	Vec2f *v;
-	if ((v = Vec2f_ptr_from_Vector(obj)))
-		return v;
-	if ((v = Vec2f_ptr_from_PyList(obj)))
-		return v;
-	if ((v = Vec2f_ptr_from_PyTuple(obj)))
-		return v;
-	return NULL;
+bool Vec2f_ptr_from_PyObject(PyObject *obj, Vec2f *vec)
+{
+	if (Vec2f_ptr_from_Vector(obj, vec))
+		return true;
+	if (Vec2f_ptr_from_PyList(obj, vec))
+		return true;
+	if (Vec2f_ptr_from_PyTuple(obj, vec))
+		return true;
+	return false;
 }
 
-Vec3f *Vec3f_ptr_from_PyObject(PyObject *obj)
+bool Vec3f_ptr_from_PyObject(PyObject *obj, Vec3f *vec)
 {
-	Vec3f *v;
-	if ((v = Vec3f_ptr_from_Vector(obj)))
-		return v;
-	if ((v = Vec3f_ptr_from_Color(obj)))
-		return v;
-	if ((v = Vec3f_ptr_from_PyList(obj)))
-		return v;
-	if ((v = Vec3f_ptr_from_PyTuple(obj)))
-		return v;
-	return NULL;
+	if (Vec3f_ptr_from_Vector(obj, vec))
+		return true;
+	if (Vec3f_ptr_from_Color(obj, vec))
+		return true;
+	if (Vec3f_ptr_from_PyList(obj, vec))
+		return true;
+	if (Vec3f_ptr_from_PyTuple(obj, vec))
+		return true;
+	return false;
 }
 
-Vec3r *Vec3r_ptr_from_PyObject(PyObject *obj)
+bool Vec3r_ptr_from_PyObject(PyObject *obj, Vec3r *vec)
 {
-	Vec3r *v;
-	if ((v = Vec3r_ptr_from_Vector(obj)))
-		return v;
-	if ((v = Vec3r_ptr_from_Color(obj)))
-		return v;
-	if ((v = Vec3r_ptr_from_PyList(obj)))
-		return v;
-	if ((v = Vec3r_ptr_from_PyTuple(obj)))
-		return v;
-	return NULL;
+	if (Vec3r_ptr_from_Vector(obj, vec))
+		return true;
+	if (Vec3r_ptr_from_Color(obj, vec))
+		return true;
+	if (Vec3r_ptr_from_PyList(obj, vec))
+		return true;
+	if (Vec3r_ptr_from_PyTuple(obj, vec))
+		return true;
+	return false;
 }
 
-Vec2f *Vec2f_ptr_from_Vector(PyObject *obj)
+bool Vec2f_ptr_from_Vector(PyObject *obj, Vec2f *vec)
 {
 	if (!VectorObject_Check(obj) || ((VectorObject *)obj)->size != 2)
-		return NULL;
+		return false;
 	if (BaseMath_ReadCallback((BaseMathObject *)obj) == -1)
-		return NULL;
-	float x = ((VectorObject *)obj)->vec[0];
-	float y = ((VectorObject *)obj)->vec[1];
-	return new Vec2f(x, y);
+		return false;
+	vec[0] = ((VectorObject *)obj)->vec[0];
+	vec[1] = ((VectorObject *)obj)->vec[1];
+	return true;
 }
 
-Vec3f *Vec3f_ptr_from_Vector(PyObject *obj)
+bool Vec3f_ptr_from_Vector(PyObject *obj, Vec3f *vec)
 {
 	if (!VectorObject_Check(obj) || ((VectorObject *)obj)->size != 3)
-		return NULL;
+		return false;
 	if (BaseMath_ReadCallback((BaseMathObject *)obj) == -1)
-		return NULL;
-	float x = ((VectorObject *)obj)->vec[0];
-	float y = ((VectorObject *)obj)->vec[1];
-	float z = ((VectorObject *)obj)->vec[2];
-	return new Vec3f(x, y, z);
+		return false;
+	vec[0] = ((VectorObject *)obj)->vec[0];
+	vec[1] = ((VectorObject *)obj)->vec[1];
+	vec[2] = ((VectorObject *)obj)->vec[2];
+	return true;
 }
 
-Vec3r *Vec3r_ptr_from_Vector(PyObject *obj)
+bool Vec3r_ptr_from_Vector(PyObject *obj, Vec3r *vec)
 {
 	if (!VectorObject_Check(obj) || ((VectorObject *)obj)->size != 3)
-		return NULL;
+		return false;
 	if (BaseMath_ReadCallback((BaseMathObject *)obj) == -1)
-		return NULL;
-	real x = ((VectorObject *)obj)->vec[0];
-	real y = ((VectorObject *)obj)->vec[1];
-	real z = ((VectorObject *)obj)->vec[2];
-	return new Vec3r(x, y, z);
+		return false;
+	vec[0] = ((VectorObject *)obj)->vec[0];
+	vec[1] = ((VectorObject *)obj)->vec[1];
+	vec[2] = ((VectorObject *)obj)->vec[2];
+	return true;
 }
 
-Vec3f *Vec3f_ptr_from_Color(PyObject *obj)
+bool Vec3f_ptr_from_Color(PyObject *obj, Vec3f *vec)
 {
 	if (!ColorObject_Check(obj))
-		return NULL;
+		return false;
 	if (BaseMath_ReadCallback((BaseMathObject *)obj) == -1)
-		return NULL;
-	float r = ((ColorObject *)obj)->col[0];
-	float g = ((ColorObject *)obj)->col[1];
-	float b = ((ColorObject *)obj)->col[2];
-	return new Vec3f(r, g, b);
+		return false;
+	vec[0] = ((ColorObject *)obj)->col[0];
+	vec[1] = ((ColorObject *)obj)->col[1];
+	vec[2] = ((ColorObject *)obj)->col[2];
+	return true;
 }
 
-Vec3r *Vec3r_ptr_from_Color(PyObject *obj)
+bool Vec3r_ptr_from_Color(PyObject *obj, Vec3r *vec)
 {
 	if (!ColorObject_Check(obj))
-		return NULL;
+		return false;
 	if (BaseMath_ReadCallback((BaseMathObject *)obj) == -1)
-		return NULL;
-	real r = ((ColorObject *)obj)->col[0];
-	real g = ((ColorObject *)obj)->col[1];
-	real b = ((ColorObject *)obj)->col[2];
-	return new Vec3r(r, g, b);
+		return false;
+	vec[0] = ((ColorObject *)obj)->col[0];
+	vec[1] = ((ColorObject *)obj)->col[1];
+	vec[2] = ((ColorObject *)obj)->col[2];
+	return true;
 }
 
 static int float_array_from_PyList(PyObject *obj, float *v, int n)
@@ -623,37 +620,45 @@ static int float_array_from_PyList(PyObject *obj, float *v, int n)
 	return 1;
 }
 
-Vec2f *Vec2f_ptr_from_PyList(PyObject *obj)
+bool Vec2f_ptr_from_PyList(PyObject *obj, Vec2f *vec)
 {
 	float v[2];
 
 	if (!PyList_Check(obj) || PyList_Size(obj) != 2)
-		return NULL;
+		return false;
 	if (!float_array_from_PyList(obj, v, 2))
-		return NULL;
-	return new Vec2f(v[0], v[1]);
+		return false;
+	vec[0] = v[0];
+	vec[1] = v[1];
+	return true;
 }
 
-Vec3f *Vec3f_ptr_from_PyList(PyObject *obj)
+bool Vec3f_ptr_from_PyList(PyObject *obj, Vec3f *vec)
 {
 	float v[3];
 
 	if (!PyList_Check(obj) || PyList_Size(obj) != 3)
-		return NULL;
+		return false;
 	if (!float_array_from_PyList(obj, v, 3))
-		return NULL;
-	return new Vec3f(v[0], v[1], v[2]);
+		return false;
+	vec[0] = v[0];
+	vec[1] = v[1];
+	vec[2] = v[2];
+	return true;
 }
 
-Vec3r *Vec3r_ptr_from_PyList(PyObject *obj)
+bool Vec3r_ptr_from_PyList(PyObject *obj, Vec3r *vec)
 {
 	float v[3];
 
 	if (!PyList_Check(obj) || PyList_Size(obj) != 3)
-		return NULL;
+		return false;
 	if (!float_array_from_PyList(obj, v, 3))
-		return NULL;
-	return new Vec3r(v[0], v[1], v[2]);
+		return false;
+	vec[0] = v[0];
+	vec[1] = v[1];
+	vec[2] = v[2];
+	return true;
 }
 
 static int float_array_from_PyTuple(PyObject *obj, float *v, int n)
@@ -668,37 +673,45 @@ static int float_array_from_PyTuple(PyObject *obj, float *v, int n)
 	return 1;
 }
 
-Vec2f *Vec2f_ptr_from_PyTuple(PyObject *obj)
+bool Vec2f_ptr_from_PyTuple(PyObject *obj, Vec2f *vec)
 {
 	float v[2];
 
 	if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 2)
-		return NULL;
+		return false;
 	if (!float_array_from_PyTuple(obj, v, 2))
-		return NULL;
-	return new Vec2f(v[0], v[1]);
+		return false;
+	vec[0] = v[0];
+	vec[1] = v[1];
+	return true;
 }
 
-Vec3f *Vec3f_ptr_from_PyTuple(PyObject *obj)
+bool Vec3f_ptr_from_PyTuple(PyObject *obj, Vec3f *vec)
 {
 	float v[3];
 
 	if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 3)
-		return NULL;
+		return false;
 	if (!float_array_from_PyTuple(obj, v, 3))
-		return NULL;
-	return new Vec3f(v[0], v[1], v[2]);
+		return false;
+	vec[0] = v[0];
+	vec[1] = v[1];
+	vec[2] = v[2];
+	return true;
 }
 
-Vec3r *Vec3r_ptr_from_PyTuple(PyObject *obj)
+bool Vec3r_ptr_from_PyTuple(PyObject *obj, Vec3r *vec)
 {
 	float v[3];
 
 	if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 3)
-		return NULL;
+		return false;
 	if (!float_array_from_PyTuple(obj, v, 3))
-		return NULL;
-	return new Vec3r(v[0], v[1], v[2]);
+		return false;
+	vec[0] = v[0];
+	vec[1] = v[1];
+	vec[2] = v[2];
+	return true;
 }
 
 // helper for argument parsing
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 1df4901757b..a8bc7eaa306 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -150,20 +150,20 @@ bool bool_from_PyBool(PyObject *b);
 IntegrationType IntegrationType_from_BPy_IntegrationType(PyObject *obj);
 Stroke::MediumType MediumType_from_BPy_MediumType(PyObject *obj);
 Nature::EdgeNature EdgeNature_from_BPy_Nature(PyObject *obj);
-Vec2f * Vec2f_ptr_from_PyObject(PyObject *obj);
-Vec3f * Vec3f_ptr_from_PyObject(PyObject *obj);
-Vec3r * Vec3r_ptr_from_PyObject(PyObject *obj);
-Vec2f * Vec2f_ptr_from_Vector(PyObject *obj);
-Vec3f * Vec3f_ptr_from_Vector(PyObject *obj);
-Vec3r * Vec3r_ptr_from_Vector(PyObject *obj);
-Vec3f * Vec3f_ptr_from_Color(PyObject *obj);
-Vec3r * Vec3r_ptr_from_Color(PyObject *obj);
-Vec2f * Vec2f_ptr_from_PyList(PyObject *obj);
-Vec3f * Vec3f_ptr_from_PyList(PyObject *obj);
-Vec3r * Vec3r_ptr_from_PyList(PyObject *obj);
-Vec2f * Vec2f_ptr_from_PyTuple(PyObject *obj);
-Vec3f * Vec3f_ptr_from_PyTuple(PyObject *obj);
-Vec3r * Vec3r_ptr_from_PyTuple(PyObject *obj);
+bool Vec2f_ptr_from_PyObject(PyObject *obj, Vec2f *vec);
+bool Vec3f_ptr_from_PyObject(PyObject *obj, Vec3f *vec);
+bool Vec3r_ptr_from_PyObject(PyObject *obj, Vec3r *vec);
+bool Vec2f_ptr_from_Vector(PyObject *obj, Vec2f *vec);
+bool Vec3f_ptr_from_Vector(PyObject *obj, Vec3f *vec);
+bool Vec3r_ptr_from_Vector(PyObject *obj, Vec3r *vec);
+bool Vec3f_ptr_from_Color(PyObject *obj, Vec3f *vec);
+bool Vec3r_ptr_from_Color(PyObject *obj, Vec3r *vec);
+bool Vec2f_ptr_from_PyList(PyObject *obj, Vec2f *vec);
+bool Vec3f_ptr_from_PyList(PyObject *obj, Vec3f *vec);
+bool Vec3r_ptr_from_PyList(PyObject *obj, Vec3r *vec);
+bool Vec2f_ptr_from_PyTuple(PyObject *obj, Vec2f *vec);
+bool Vec3f_ptr_from_PyTuple(PyObject *obj, Vec3f *vec);
+bool Vec3r_ptr_from_PyTuple(PyObject *obj, Vec3r *vec);
 
 int float_array_from_PyObject(PyObject *obj, float *v, int n);
 
diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
index abdcbaff6e1..2575b16b27a 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
@@ -132,16 +132,15 @@ static PyObject *FrsNoise_turbulence2(BPy_FrsNoise *self, PyObject *args, PyObje
 	PyObject *obj1;
 	float f2, f3;
 	unsigned int i = 4;
+	Vec2f vec;
 
 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "Off|I", (char **)kwlist, &obj1, &f2, &f3, &i))
 		return NULL;
-	Vec2f *v = Vec2f_ptr_from_PyObject(obj1);
-	if (!v) {
+	if (!Vec2f_ptr_from_PyObject(obj1, &vec)) {
 		PyErr_SetString(PyExc_TypeError, "argument 1 must be a 2D vector (either a list of 2 elements or Vector)");
 		return NULL;
 	}
-	float t = self->n->turbulence2(*v, f2, f3, i);
-	delete v;
+	float t = self->n->turbulence2(vec, f2, f3, i);
 	return PyFloat_FromDouble(t);
 }
 
@@ -167,16 +166,15 @@ static PyObject *FrsNoise_turbulence3(BPy_FrsNoise *self, PyObject *args, PyObje
 	PyObject *obj1;
 	float f2, f3;
 	unsigned int i = 4;
+	Vec3f vec;
 
 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "Off|I", (char **)kwlist, &obj1, &f2, &f3, &i))
 		return NULL;
-	Vec3f *v = Vec3f_ptr_from_PyObject(obj1);
-	if (!v) {
+	if (!Vec3f_ptr_from_PyObject(obj1, &vec)) {
 		PyErr_SetString(PyExc_TypeError, "argument 1 must be a 3D vector (either a list of 3 elements or Vector)");
 		return NULL;
 	}
-	float t = self->n->turbulence3(*v, f2, f3, i);
-	delete v;
+	float t = self->n->turbulence3(vec, f2, f3, i);
 	return PyFloat_FromDouble(t);
 }
 
@@ -214,16 +212,15 @@ static PyObject *FrsNoise_smoothNoise2(BPy_FrsNoise *self, PyObject *args, PyObj
 {
 	static const char *kwlist[] = {"v", NULL};
 	PyObject *obj;
+	Vec2f vec;
 
 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "O", (char **)kwlist, &obj))
 		return NULL;
-	Vec2f *v = Vec2f_ptr_from_PyObject(obj);
-	if (!v) {
+	if (!Vec2f_ptr_from_PyObject(obj, &vec)) {
 		PyErr_SetString(PyExc_TypeError, "argument 1 must be a 2D vector (either a list of 2 elements or Vector)");
 		return NULL;
 	}
-	float t = self->n->smoothNoise2(*v);
-	delete v;
+	float t = self->n->smoothNoise2(vec);
 	return PyFloat_FromDouble(t);
 }
 
@@ -241,16 +238,15 @@ static PyObject *FrsNoise_smoothNoise3(BPy_FrsNoise *self, PyObject *args, PyObj
 {
 	static const char *kwlist[] = {"v", NULL};
 	PyObject *obj;
+	Vec3f vec;
 
 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "O", (char **)kwlist, &obj))
 		return NULL;
-	Vec3f *v = Vec3f_ptr_from_PyObject(obj);
-	if (!v) {
+	if (!Vec3f_ptr_from_PyObject(obj, &vec)) {
 		PyErr_SetString(PyExc_TypeError, "argument 1 must be a 3D vector (either a list of 3 elements or Vector)");
 		return NULL;
 	}
-	float t = self->n->smoothNoise3(*v);
-	delete v;
+	float t = self->n->smoothNoise3(vec);
 	return PyFloat_FromDouble(t);
 }
 
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
index e17f16a2fa7..b08fcfa8dba 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
@@ -311,16 +311,15 @@ static PyObject * StrokeAttribute_set_attribute_vec2(BPy_StrokeAttribute *self,
 	static const char *kwlist[] = {"name", "value", NULL};
 	char *s;
 	PyObject *obj = 0;
+	Vec2f vec;
 
 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "sO", (char **)kwlist, &s, &obj))
 		return NULL;
-	Vec2f *v = Vec2f_ptr_from_PyObject(obj);
-	if (!v) {
+	if (!Vec2f_ptr_from_PyObject(obj, &vec)) {
 		PyErr_SetString(PyExc_TypeError, "argument 2 must be a 2D vector (either a list of 2 elements or Vector)");
 		return NULL;
 	}
-	self->sa->setAttributeVec2f(s, *v);
-	delete v;
+	self->sa->setAttributeVec2f(s, vec);
 	Py_RETURN_NONE;
 }
 
@@ -341,16 +340,15 @@ static PyObject * StrokeAttribute_set_attribute_vec3(BPy_StrokeAttribute *self,
 	static const char *kwlist[] = {"name", "value", NULL};
 	char *s;
 	PyObject *obj = 0;
+	Vec3f vec;
 
 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "sO", (char **)kwlist, &s, &obj))
 		return NULL;
-	Vec3f *v = Vec3f_ptr_from_PyObject(obj);
-	if (!v) {
+	if (!Vec3f_ptr_from_PyObject(obj, &vec)) {
 		PyErr_SetString(PyExc_TypeError, "argument 2 must be a 3D vector (either a list of 3 elements or Vector)");
 		return NULL;
 	}
-	self->sa->setAttributeVec3f(s, *v);
-	delete v;
+	self->sa->setAttributeVec3f(s, vec);
 	Py_RETURN_NONE;
 }
 
diff --git a/source/blender/freestyle/intern/python/Director.cpp b/source/blender/freestyle/intern/python/Director.cpp
index cd6f9da3e05..011609bb343 100644
--- a/source/blender/freestyle/intern/python/Director.cpp
+++ b/source/blender/freestyle/intern/python/Director.cpp
@@ -251,14 +251,16 @@ int Director_BPy_UnaryFunction0D___call__(void *uf0D, PyObject *obj, Interface0D
 		((UnaryFunction0D<unsigned> *)uf0D)->result = PyLong_AsLong(result);
 	}
 	else if (BPy_UnaryFunction0DVec2f_Check(obj)) {
-		Vec2f *v = Vec2f_ptr_from_Vector(result);
-		((UnaryFunction0D<Vec2f> *)uf0D)->result = *v;
-		delete v; 
+		Vec2f vec;
+		if (!Vec2f_ptr_from_Vector(result, &vec))
+			return -1;
+		((UnaryFunction0D<Vec2f> *)uf0D)->result = vec;
 	}
 	else if (BPy_UnaryFunction0DVec3f_Check(obj)) {
-		Vec3f *v = Vec3f_ptr_from_Vector(result);
-		((UnaryFunction0D<Vec3f> *)uf0D)->result = *v;
-		delete v;
+		Vec3f vec;
+		if (!Vec3f_ptr_from_Vector(result, &vec))
+			return -1;
+		((UnaryFunction0D<Vec3f> *)uf0D)->result = vec;
 	}
 	else if (BPy_UnaryFunction0DVectorViewShape_Check(obj)) {
 		vector<ViewShape*> vec;
@@ -301,14 +303,16 @@ int Director_BPy_UnaryFunction1D___call__(void *uf1D, PyObject *obj, Interface1D
 		((UnaryFunction1D<unsigned> *)uf1D)->result = PyLong_AsLong(result);
 	}
 	else if (BPy_UnaryFunction1DVec2f_Check(obj)) {
-		Vec2f *v = Vec2f_ptr_from_Vector(result);
-		((UnaryFunction1D<Vec2f> *)uf1D)->result = *v;
-		delete v; 
+		Vec2f vec;
+		if (!Vec2f_ptr_from_Vector(result, &vec))
+			return -1;
+		((UnaryFunction1D<Vec2f> *)uf1D)->result = vec;
 	}
 	else if (BPy_UnaryFunction1DVec3f_Check(obj)) {
-		Vec3f *v = Vec3f_ptr_from_Vector(result);
-		((UnaryFunction1D<Vec3f> *)uf1D)->result = *v;
-		delete v;
+		Vec3f vec;
+		if (!Vec3f_ptr_from_Vector(result, &vec))
+			return -1;
+		((UnaryFunction1D<Vec3f> *)uf1D)->result = vec;
 	}
 	else if (BPy_UnaryFunction1DVectorViewShape_Check(obj)) {
 		vector<ViewShape*> vec;
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
index 3205a3a3d7e..d2dd1657770 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
@@ -107,17 +107,15 @@ static PyObject *SVertex_add_normal(BPy_SVertex *self, PyObject *args, PyObject
 {
 	static const char *kwlist[] = {"normal", NULL};
 	PyObject *py_normal;
+	Vec3r n;
 
 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "O", (char **)kwlist, &py_normal))
 		return NULL;
-	Vec3r *n = Vec3r_ptr_from_PyObject(py_normal);
-	if (!n) {
+	if (!Vec3r_ptr_from_PyObject(py_normal, &n)) {
 		PyErr_SetString(PyExc_TypeError, "argument 1 must be a 3D vector (either a list of 3 elements or Vector)");
 		return NULL;
 	}
-	self->sv->AddNormal(*n);
-	delete n;
-
+	self->sv->AddNormal(n);
 	Py_RETURN_NONE;
 }