Revision: 17317
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17317
Author: ben2610
Date: 2008-11-04 10:21:27 +0100 (Tue, 04 Nov 2008)
Log Message:
-----------
VideoTexture: Bug report #17946: add (char*) casting to fix compile error with
Python get-set method and module object.
Modified Paths:
--------------
trunk/blender/source/gameengine/VideoTexture/FilterBlueScreen.cpp
trunk/blender/source/gameengine/VideoTexture/FilterColor.cpp
trunk/blender/source/gameengine/VideoTexture/FilterNormal.cpp
trunk/blender/source/gameengine/VideoTexture/ImageBuff.cpp
trunk/blender/source/gameengine/VideoTexture/ImageMix.cpp
trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
trunk/blender/source/gameengine/VideoTexture/PyTypeList.cpp
trunk/blender/source/gameengine/VideoTexture/Texture.cpp
trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.cpp
trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
Modified: trunk/blender/source/gameengine/VideoTexture/FilterBlueScreen.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/FilterBlueScreen.cpp
2008-11-04 05:29:36 UTC (rev 17316)
+++ trunk/blender/source/gameengine/VideoTexture/FilterBlueScreen.cpp
2008-11-04 09:21:27 UTC (rev 17317)
@@ -125,10 +125,10 @@
// 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}
};
Modified: trunk/blender/source/gameengine/VideoTexture/FilterColor.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/FilterColor.cpp
2008-11-04 05:29:36 UTC (rev 17316)
+++ trunk/blender/source/gameengine/VideoTexture/FilterColor.cpp
2008-11-04 09:21:27 UTC (rev 17317)
@@ -34,7 +34,7 @@
// 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 @@
// 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 @@
// 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}
};
Modified: trunk/blender/source/gameengine/VideoTexture/FilterNormal.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/FilterNormal.cpp
2008-11-04 05:29:36 UTC (rev 17316)
+++ trunk/blender/source/gameengine/VideoTexture/FilterNormal.cpp
2008-11-04 09:21:27 UTC (rev 17317)
@@ -109,10 +109,10 @@
// 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}
};
Modified: trunk/blender/source/gameengine/VideoTexture/ImageBuff.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/ImageBuff.cpp 2008-11-04
05:29:36 UTC (rev 17316)
+++ trunk/blender/source/gameengine/VideoTexture/ImageBuff.cpp 2008-11-04
09:21:27 UTC (rev 17317)
@@ -111,11 +111,11 @@
// 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}
};
Modified: trunk/blender/source/gameengine/VideoTexture/ImageMix.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/ImageMix.cpp 2008-11-04
05:29:36 UTC (rev 17316)
+++ trunk/blender/source/gameengine/VideoTexture/ImageMix.cpp 2008-11-04
09:21:27 UTC (rev 17317)
@@ -150,11 +150,11 @@
// 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}
};
Modified: trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
2008-11-04 05:29:36 UTC (rev 17316)
+++ trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
2008-11-04 09:21:27 UTC (rev 17317)
@@ -207,13 +207,13 @@
// 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}
};
Modified: trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
2008-11-04 05:29:36 UTC (rev 17316)
+++ trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
2008-11-04 09:21:27 UTC (rev 17317)
@@ -239,15 +239,15 @@
// 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},
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
