diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2008-11-04 12:21:27 +0300 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2008-11-04 12:21:27 +0300 |
commit | 6eb3bf53dd753d4b00f0f76f9f7739aecb9af2f8 (patch) | |
tree | cd46ea1bc1c70778a4d1ac4bb94896287b28588c /source | |
parent | ca80578e4ee67280764aeaf4f562afe2bbc7519c (diff) |
VideoTexture: Bug report #17946: add (char*) casting to fix compile error with Python get-set method and module object.
Diffstat (limited to 'source')
-rw-r--r-- | source/gameengine/VideoTexture/FilterBlueScreen.cpp | 6 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/FilterColor.cpp | 10 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/FilterNormal.cpp | 6 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/ImageBuff.cpp | 10 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/ImageMix.cpp | 10 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/ImageRender.cpp | 12 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/ImageViewport.cpp | 16 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/PyTypeList.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/Texture.cpp | 4 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.cpp | 22 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/blendVideoTex.cpp | 2 |
11 files changed, 50 insertions, 50 deletions
diff --git a/source/gameengine/VideoTexture/FilterBlueScreen.cpp b/source/gameengine/VideoTexture/FilterBlueScreen.cpp index 50c3a87ffc4..43d7566102a 100644 --- a/source/gameengine/VideoTexture/FilterBlueScreen.cpp +++ b/source/gameengine/VideoTexture/FilterBlueScreen.cpp @@ -125,10 +125,10 @@ static int setLimits (PyFilter * self, PyObject * value, void * closure) // attributes structure static PyGetSetDef filterBSGetSets[] = { - {"color", (getter)getColor, (setter)setColor, "blue screen color", NULL}, - {"limits", (getter)getLimits, (setter)setLimits, "blue screen color limits", NULL}, + {(char*)"color", (getter)getColor, (setter)setColor, (char*)"blue screen color", NULL}, + {(char*)"limits", (getter)getLimits, (setter)setLimits, (char*)"blue screen color limits", NULL}, // attributes from FilterBase class - {"previous", (getter)Filter_getPrevious, (setter)Filter_setPrevious, "previous pixel filter", NULL}, + {(char*)"previous", (getter)Filter_getPrevious, (setter)Filter_setPrevious, (char*)"previous pixel filter", NULL}, {NULL} }; diff --git a/source/gameengine/VideoTexture/FilterColor.cpp b/source/gameengine/VideoTexture/FilterColor.cpp index a1ddf581aef..eaf6e955003 100644 --- a/source/gameengine/VideoTexture/FilterColor.cpp +++ b/source/gameengine/VideoTexture/FilterColor.cpp @@ -34,7 +34,7 @@ http://www.gnu.org/copyleft/lesser.txt. // attributes structure static PyGetSetDef filterGrayGetSets[] = { // attributes from FilterBase class - {"previous", (getter)Filter_getPrevious, (setter)Filter_setPrevious, "previous pixel filter", NULL}, + {(char*)"previous", (getter)Filter_getPrevious, (setter)Filter_setPrevious, (char*)"previous pixel filter", NULL}, {NULL} }; @@ -164,9 +164,9 @@ static int setMatrix (PyFilter * self, PyObject * value, void * closure) // attributes structure static PyGetSetDef filterColorGetSets[] = { - {"matrix", (getter)getMatrix, (setter)setMatrix, "matrix [4][5] for color calculation", NULL}, + {(char*)"matrix", (getter)getMatrix, (setter)setMatrix, (char*)"matrix [4][5] for color calculation", NULL}, // attributes from FilterBase class - {"previous", (getter)Filter_getPrevious, (setter)Filter_setPrevious, "previous pixel filter", NULL}, + {(char*)"previous", (getter)Filter_getPrevious, (setter)Filter_setPrevious, (char*)"previous pixel filter", NULL}, {NULL} }; @@ -298,9 +298,9 @@ static int setLevels (PyFilter * self, PyObject * value, void * closure) // attributes structure static PyGetSetDef filterLevelGetSets[] = { - {"levels", (getter)getLevels, (setter)setLevels, "levels matrix [4] (min, max)", NULL}, + {(char*)"levels", (getter)getLevels, (setter)setLevels, (char*)"levels matrix [4] (min, max)", NULL}, // attributes from FilterBase class - {"previous", (getter)Filter_getPrevious, (setter)Filter_setPrevious, "previous pixel filter", NULL}, + {(char*)"previous", (getter)Filter_getPrevious, (setter)Filter_setPrevious, (char*)"previous pixel filter", NULL}, {NULL} }; diff --git a/source/gameengine/VideoTexture/FilterNormal.cpp b/source/gameengine/VideoTexture/FilterNormal.cpp index 514214bec8b..736b9e3b958 100644 --- a/source/gameengine/VideoTexture/FilterNormal.cpp +++ b/source/gameengine/VideoTexture/FilterNormal.cpp @@ -109,10 +109,10 @@ static int setDepth (PyFilter * self, PyObject * value, void * closure) // attributes structure static PyGetSetDef filterNormalGetSets[] = { - {"colorIdx", (getter)getColor, (setter)setColor, "index of color used to calculate normal (0 - red, 1 - green, 2 - blue)", NULL}, - {"depth", (getter)getDepth, (setter)setDepth, "depth of relief", NULL}, + {(char*)"colorIdx", (getter)getColor, (setter)setColor, (char*)"index of color used to calculate normal (0 - red, 1 - green, 2 - blue)", NULL}, + {(char*)"depth", (getter)getDepth, (setter)setDepth, (char*)"depth of relief", NULL}, // attributes from FilterBase class - {"previous", (getter)Filter_getPrevious, (setter)Filter_setPrevious, "previous pixel filter", NULL}, + {(char*)"previous", (getter)Filter_getPrevious, (setter)Filter_setPrevious, (char*)"previous pixel filter", NULL}, {NULL} }; diff --git a/source/gameengine/VideoTexture/ImageBuff.cpp b/source/gameengine/VideoTexture/ImageBuff.cpp index a0c6e1f6f74..a22757dca39 100644 --- a/source/gameengine/VideoTexture/ImageBuff.cpp +++ b/source/gameengine/VideoTexture/ImageBuff.cpp @@ -111,11 +111,11 @@ static PyMethodDef imageBuffMethods[] = // attributes structure static PyGetSetDef imageBuffGetSets[] = { // attributes from ImageBase class - {"image", (getter)Image_getImage, NULL, "image data", NULL}, - {"size", (getter)Image_getSize, NULL, "image size", NULL}, - {"scale", (getter)Image_getScale, (setter)Image_setScale, "fast scale of image (near neighbour)", NULL}, - {"flip", (getter)Image_getFlip, (setter)Image_setFlip, "flip image vertically", NULL}, - {"filter", (getter)Image_getFilter, (setter)Image_setFilter, "pixel filter", NULL}, + {(char*)"image", (getter)Image_getImage, NULL, (char*)"image data", NULL}, + {(char*)"size", (getter)Image_getSize, NULL, (char*)"image size", NULL}, + {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbour)", NULL}, + {(char*)"flip", (getter)Image_getFlip, (setter)Image_setFlip, (char*)"flip image vertically", NULL}, + {(char*)"filter", (getter)Image_getFilter, (setter)Image_setFilter, (char*)"pixel filter", NULL}, {NULL} }; diff --git a/source/gameengine/VideoTexture/ImageMix.cpp b/source/gameengine/VideoTexture/ImageMix.cpp index 8532249f7d8..b07b362818c 100644 --- a/source/gameengine/VideoTexture/ImageMix.cpp +++ b/source/gameengine/VideoTexture/ImageMix.cpp @@ -150,11 +150,11 @@ static PyMethodDef imageMixMethods[] = // attributes structure static PyGetSetDef imageMixGetSets[] = { // attributes from ImageBase class - {"image", (getter)Image_getImage, NULL, "image data", NULL}, - {"size", (getter)Image_getSize, NULL, "image size", NULL}, - {"scale", (getter)Image_getScale, (setter)Image_setScale, "fast scale of image (near neighbour)", NULL}, - {"flip", (getter)Image_getFlip, (setter)Image_setFlip, "flip image vertically", NULL}, - {"filter", (getter)Image_getFilter, (setter)Image_setFilter, "pixel filter", NULL}, + {(char*)"image", (getter)Image_getImage, NULL, (char*)"image data", NULL}, + {(char*)"size", (getter)Image_getSize, NULL, (char*)"image size", NULL}, + {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbour)", NULL}, + {(char*)"flip", (getter)Image_getFlip, (setter)Image_setFlip, (char*)"flip image vertically", NULL}, + {(char*)"filter", (getter)Image_getFilter, (setter)Image_setFilter, (char*)"pixel filter", NULL}, {NULL} }; diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index fb284261d70..2f2d9debd48 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -207,13 +207,13 @@ static PyMethodDef imageRenderMethods[] = // attributes structure static PyGetSetDef imageRenderGetSets[] = { - {"background", (getter)getBackground, (setter)setBackground, "background color", NULL}, + {(char*)"background", (getter)getBackground, (setter)setBackground, (char*)"background color", NULL}, // attributes from ImageBase class - {"image", (getter)Image_getImage, NULL, "image data", NULL}, - {"size", (getter)Image_getSize, NULL, "image size", NULL}, - {"scale", (getter)Image_getScale, (setter)Image_setScale, "fast scale of image (near neighbour)", NULL}, - {"flip", (getter)Image_getFlip, (setter)Image_setFlip, "flip image vertically", NULL}, - {"filter", (getter)Image_getFilter, (setter)Image_setFilter, "pixel filter", NULL}, + {(char*)"image", (getter)Image_getImage, NULL, (char*)"image data", NULL}, + {(char*)"size", (getter)Image_getSize, NULL, (char*)"image size", NULL}, + {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbour)", NULL}, + {(char*)"flip", (getter)Image_getFlip, (setter)Image_setFlip, (char*)"flip image vertically", NULL}, + {(char*)"filter", (getter)Image_getFilter, (setter)Image_setFilter, (char*)"pixel filter", NULL}, {NULL} }; diff --git a/source/gameengine/VideoTexture/ImageViewport.cpp b/source/gameengine/VideoTexture/ImageViewport.cpp index 4ed1cd9e801..6bee9fd6624 100644 --- a/source/gameengine/VideoTexture/ImageViewport.cpp +++ b/source/gameengine/VideoTexture/ImageViewport.cpp @@ -239,15 +239,15 @@ static PyMethodDef imageViewportMethods[] = // attributes structure static PyGetSetDef imageViewportGetSets[] = { - {"whole", (getter)ImageViewport_getWhole, (setter)ImageViewport_setWhole, "use whole viewport to capture", NULL}, - {"position", (getter)ImageViewport_getPosition, (setter)ImageViewport_setPosition, "upper left corner of captured area", NULL}, - {"capsize", (getter)ImageViewport_getCaptureSize, (setter)ImageViewport_setCaptureSize, "size of viewport area being captured", NULL}, + {(char*)"whole", (getter)ImageViewport_getWhole, (setter)ImageViewport_setWhole, (char*)"use whole viewport to capture", NULL}, + {(char*)"position", (getter)ImageViewport_getPosition, (setter)ImageViewport_setPosition, (char*)"upper left corner of captured area", NULL}, + {(char*)"capsize", (getter)ImageViewport_getCaptureSize, (setter)ImageViewport_setCaptureSize, (char*)"size of viewport area being captured", NULL}, // attributes from ImageBase class - {"image", (getter)Image_getImage, NULL, "image data", NULL}, - {"size", (getter)Image_getSize, NULL, "image size", NULL}, - {"scale", (getter)Image_getScale, (setter)Image_setScale, "fast scale of image (near neighbour)", NULL}, - {"flip", (getter)Image_getFlip, (setter)Image_setFlip, "flip image vertically", NULL}, - {"filter", (getter)Image_getFilter, (setter)Image_setFilter, "pixel filter", NULL}, + {(char*)"image", (getter)Image_getImage, NULL, (char*)"image data", NULL}, + {(char*)"size", (getter)Image_getSize, NULL, (char*)"image size", NULL}, + {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbour)", NULL}, + {(char*)"flip", (getter)Image_getFlip, (setter)Image_setFlip, (char*)"flip image vertically", NULL}, + {(char*)"filter", (getter)Image_getFilter, (setter)Image_setFilter, (char*)"pixel filter", NULL}, {NULL} }; diff --git a/source/gameengine/VideoTexture/PyTypeList.cpp b/source/gameengine/VideoTexture/PyTypeList.cpp index 0451d74c8ad..6d2676dce09 100644 --- a/source/gameengine/VideoTexture/PyTypeList.cpp +++ b/source/gameengine/VideoTexture/PyTypeList.cpp @@ -78,6 +78,6 @@ void PyTypeList::reg (PyObject * module) // increase ref count Py_INCREF((*it)->getType()); // add type to module - PyModule_AddObject(module, (*it)->getName(), (PyObject*)(*it)->getType()); + PyModule_AddObject(module, (char*)(*it)->getName(), (PyObject*)(*it)->getType()); } } diff --git a/source/gameengine/VideoTexture/Texture.cpp b/source/gameengine/VideoTexture/Texture.cpp index ceda39aeff4..e922bbd768d 100644 --- a/source/gameengine/VideoTexture/Texture.cpp +++ b/source/gameengine/VideoTexture/Texture.cpp @@ -412,8 +412,8 @@ static PyMethodDef textureMethods[] = // class Texture attributes static PyGetSetDef textureGetSets[] = { - {"source", (getter)Texture_getSource, (setter)Texture_setSource, "source of texture", NULL}, - {"mipmap", (getter)Texture_getMipmap, (setter)Texture_setMipmap, "mipmap texture", NULL}, + {(char*)"source", (getter)Texture_getSource, (setter)Texture_setSource, (char*)"source of texture", NULL}, + {(char*)"mipmap", (getter)Texture_getMipmap, (setter)Texture_setMipmap, (char*)"mipmap texture", NULL}, {NULL} }; diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp index 2af7228a192..b97c4d670c4 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp +++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp @@ -692,18 +692,18 @@ static PyMethodDef videoMethods[] = // attributes structure static PyGetSetDef videoGetSets[] = { // methods from VideoBase class - {"status", (getter)Video_getStatus, NULL, "video status", NULL}, - {"range", (getter)Video_getRange, (setter)Video_setRange, "replay range", NULL}, - {"repeat", (getter)Video_getRepeat, (setter)Video_setRepeat, "repeat count, -1 for infinite repeat", NULL}, - {"framerate", (getter)Video_getFrameRate, (setter)Video_setFrameRate, "frame rate", NULL}, + {(char*)"status", (getter)Video_getStatus, NULL, (char*)"video status", NULL}, + {(char*)"range", (getter)Video_getRange, (setter)Video_setRange, (char*)"replay range", NULL}, + {(char*)"repeat", (getter)Video_getRepeat, (setter)Video_setRepeat, (char*)"repeat count, -1 for infinite repeat", NULL}, + {(char*)"framerate", (getter)Video_getFrameRate, (setter)Video_setFrameRate, (char*)"frame rate", NULL}, // attributes from ImageBase class - {"image", (getter)Image_getImage, NULL, "image data", NULL}, - {"size", (getter)Image_getSize, NULL, "image size", NULL}, - {"scale", (getter)Image_getScale, (setter)Image_setScale, "fast scale of image (near neighbour)", NULL}, - {"flip", (getter)Image_getFlip, (setter)Image_setFlip, "flip image vertically", NULL}, - {"filter", (getter)Image_getFilter, (setter)Image_setFilter, "pixel filter", NULL}, - {"preseek", (getter)VideoFFmpeg_getPreseek, (setter)VideoFFmpeg_setPreseek, "nb of frames of preseek", NULL}, - {"deinterlace", (getter)VideoFFmpeg_getDeinterlace, (setter)VideoFFmpeg_setDeinterlace, "deinterlace image", NULL}, + {(char*)"image", (getter)Image_getImage, NULL, (char*)"image data", NULL}, + {(char*)"size", (getter)Image_getSize, NULL, (char*)"image size", NULL}, + {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbour)", NULL}, + {(char*)"flip", (getter)Image_getFlip, (setter)Image_setFlip, (char*)"flip image vertically", NULL}, + {(char*)"filter", (getter)Image_getFilter, (setter)Image_setFilter, (char*)"pixel filter", NULL}, + {(char*)"preseek", (getter)VideoFFmpeg_getPreseek, (setter)VideoFFmpeg_setPreseek, (char*)"nb of frames of preseek", NULL}, + {(char*)"deinterlace", (getter)VideoFFmpeg_getDeinterlace, (setter)VideoFFmpeg_setDeinterlace, (char*)"deinterlace image", NULL}, {NULL} }; diff --git a/source/gameengine/VideoTexture/blendVideoTex.cpp b/source/gameengine/VideoTexture/blendVideoTex.cpp index 629b589c0e6..f206e2f71b4 100644 --- a/source/gameengine/VideoTexture/blendVideoTex.cpp +++ b/source/gameengine/VideoTexture/blendVideoTex.cpp @@ -180,7 +180,7 @@ PyObject* initVideoTexture(void) pyFilterTypes.reg(m); Py_INCREF(&TextureType); - PyModule_AddObject(m, "Texture", (PyObject*)&TextureType); + PyModule_AddObject(m, (char*)"Texture", (PyObject*)&TextureType); // init last error description Exception::m_lastError[0] = '\0'; |