diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-01-09 17:53:18 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-09 17:53:18 +0300 |
commit | c9f353956c19abf184496978927c4af5209ec97f (patch) | |
tree | 89352c1d4e2110c583ce4b38ffe70ada6d1d945c /source/gameengine | |
parent | 0660078b8bb5eac6f81bd352505dc6f7d72e06c1 (diff) |
use PySequence_Size() rather then PySequence_Length(), this is only kept in python for backwards compatibility.
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/VideoTexture/FilterBlueScreen.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/FilterColor.cpp | 8 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/ImageRender.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/ImageViewport.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/VideoBase.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/source/gameengine/VideoTexture/FilterBlueScreen.cpp b/source/gameengine/VideoTexture/FilterBlueScreen.cpp index 2a624b2ccaa..73b104d4585 100644 --- a/source/gameengine/VideoTexture/FilterBlueScreen.cpp +++ b/source/gameengine/VideoTexture/FilterBlueScreen.cpp @@ -80,7 +80,7 @@ static PyObject * getColor (PyFilter * self, void * closure) static int setColor (PyFilter * self, PyObject * value, void * closure) { // check validity of parameter - if (value == NULL || !PySequence_Check(value) || PySequence_Length(value) != 3 + if (value == NULL || !PySequence_Check(value) || PySequence_Size(value) != 3 || !PyLong_Check(PySequence_Fast_GET_ITEM(value, 0)) || !PyLong_Check(PySequence_Fast_GET_ITEM(value, 1)) || !PyLong_Check(PySequence_Fast_GET_ITEM(value, 2))) @@ -107,7 +107,7 @@ static PyObject * getLimits (PyFilter * self, void * closure) static int setLimits (PyFilter * self, PyObject * value, void * closure) { // check validity of parameter - if (value == NULL || !PySequence_Check(value) || PySequence_Length(value) != 2 + if (value == NULL || !PySequence_Check(value) || PySequence_Size(value) != 2 || !PyLong_Check(PySequence_Fast_GET_ITEM(value, 0)) || !PyLong_Check(PySequence_Fast_GET_ITEM(value, 1))) { diff --git a/source/gameengine/VideoTexture/FilterColor.cpp b/source/gameengine/VideoTexture/FilterColor.cpp index e5d479747c4..7bbbc86e35f 100644 --- a/source/gameengine/VideoTexture/FilterColor.cpp +++ b/source/gameengine/VideoTexture/FilterColor.cpp @@ -129,14 +129,14 @@ static int setMatrix (PyFilter * self, PyObject * value, void * closure) ColorMatrix mat; // check validity of parameter bool valid = value != NULL && PySequence_Check(value) - && PySequence_Length(value) == 4; + && PySequence_Size(value) == 4; // check rows for (int r = 0; valid && r < 4; ++r) { // get row object PyObject * row = PySequence_Fast_GET_ITEM(value, r); // check sequence - valid = PySequence_Check(row) && PySequence_Length(row) == 5; + valid = PySequence_Check(row) && PySequence_Size(row) == 5; // check items for (int c = 0; valid && c < 5; ++c) { @@ -262,14 +262,14 @@ static int setLevels (PyFilter * self, PyObject * value, void * closure) ColorLevel lev; // check validity of parameter bool valid = value != NULL && PySequence_Check(value) - && PySequence_Length(value) == 4; + && PySequence_Size(value) == 4; // check rows for (int r = 0; valid && r < 4; ++r) { // get row object PyObject * row = PySequence_Fast_GET_ITEM(value, r); // check sequence - valid = PySequence_Check(row) && PySequence_Length(row) == 2; + valid = PySequence_Check(row) && PySequence_Size(row) == 2; // check items for (int c = 0; valid && c < 2; ++c) { diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index 0aba4be1121..2325329d55b 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -336,7 +336,7 @@ PyObject * getBackground (PyImage * self, void * closure) static int setBackground (PyImage * self, PyObject * value, void * closure) { // check validity of parameter - if (value == NULL || !PySequence_Check(value) || PySequence_Length(value) != 4 + if (value == NULL || !PySequence_Check(value) || PySequence_Size(value) != 4 || !PyLong_Check(PySequence_Fast_GET_ITEM(value, 0)) || !PyLong_Check(PySequence_Fast_GET_ITEM(value, 1)) || !PyLong_Check(PySequence_Fast_GET_ITEM(value, 2)) diff --git a/source/gameengine/VideoTexture/ImageViewport.cpp b/source/gameengine/VideoTexture/ImageViewport.cpp index 5a4e8af1b0c..50f5244138a 100644 --- a/source/gameengine/VideoTexture/ImageViewport.cpp +++ b/source/gameengine/VideoTexture/ImageViewport.cpp @@ -225,7 +225,7 @@ static PyObject * ImageViewport_getPosition (PyImage * self, void * closure) static int ImageViewport_setPosition (PyImage * self, PyObject * value, void * closure) { // check validity of parameter - if (value == NULL || !PySequence_Check(value) || PySequence_Length(value) != 2 + if (value == NULL || !PySequence_Check(value) || PySequence_Size(value) != 2 || !PyLong_Check(PySequence_Fast_GET_ITEM(value, 0)) || !PyLong_Check(PySequence_Fast_GET_ITEM(value, 1))) { @@ -253,7 +253,7 @@ PyObject * ImageViewport_getCaptureSize (PyImage * self, void * closure) int ImageViewport_setCaptureSize (PyImage * self, PyObject * value, void * closure) { // check validity of parameter - if (value == NULL || !PySequence_Check(value) || PySequence_Length(value) != 2 + if (value == NULL || !PySequence_Check(value) || PySequence_Size(value) != 2 || !PyLong_Check(PySequence_Fast_GET_ITEM(value, 0)) || !PyLong_Check(PySequence_Fast_GET_ITEM(value, 1))) { diff --git a/source/gameengine/VideoTexture/VideoBase.cpp b/source/gameengine/VideoTexture/VideoBase.cpp index 322ede7004d..bd620309926 100644 --- a/source/gameengine/VideoTexture/VideoBase.cpp +++ b/source/gameengine/VideoTexture/VideoBase.cpp @@ -147,7 +147,7 @@ PyObject * Video_getRange (PyImage * self, void * closure) int Video_setRange (PyImage * self, PyObject * value, void * closure) { // check validity of parameter - if (value == NULL || !PySequence_Check(value) || PySequence_Length(value) != 2 + if (value == NULL || !PySequence_Check(value) || PySequence_Size(value) != 2 || !PyFloat_Check(PySequence_Fast_GET_ITEM(value, 0)) || !PyFloat_Check(PySequence_Fast_GET_ITEM(value, 1))) { |