[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55794] trunk/blender/source: correction to previous warning cleanup, also quiet shadow-warning for thumbnail `size`

[Campbell Barton]

Revision: 55794
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55794
Author:   campbellbarton
Date:     2013-04-05 00:10:33 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
correction to previous warning cleanup, also quiet shadow-warning for thumbnail `size`

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/thumbs.c
    trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
    trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
    trunk/blender/source/gameengine/VideoTexture/VideoBase.h
    trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp

Modified: trunk/blender/source/blender/imbuf/intern/thumbs.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/thumbs.c	2013-04-04 23:52:33 UTC (rev 55793)
+++ trunk/blender/source/blender/imbuf/intern/thumbs.c	2013-04-05 00:10:33 UTC (rev 55794)
@@ -285,8 +285,8 @@
 
 	/* exception, skip images over 100mb */
 	if (source == THB_SOURCE_IMAGE) {
-		const size_t size = BLI_file_size(path);
-		if (size != -1 && size > THUMB_SIZE_MAX) {
+		const size_t file_size = BLI_file_size(path);
+		if (file_size != -1 && file_size > THUMB_SIZE_MAX) {
 			// printf("file too big: %d, skipping %s\n", (int)size, path);
 			return NULL;
 		}

Modified: trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp	2013-04-04 23:52:33 UTC (rev 55793)
+++ trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp	2013-04-05 00:10:33 UTC (rev 55794)
@@ -398,7 +398,7 @@
 
 
 // define python type
-static PyTypeObject ImageRenderType = {
+PyTypeObject ImageRenderType = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	"VideoTexture.ImageRender",   /*tp_name*/
 	sizeof(PyImage),          /*tp_basicsize*/
@@ -732,7 +732,7 @@
 
 
 // define python type
-static PyTypeObject ImageMirrorType = {
+PyTypeObject ImageMirrorType = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	"VideoTexture.ImageMirror",   /*tp_name*/
 	sizeof(PyImage),          /*tp_basicsize*/

Modified: trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp	2013-04-04 23:52:33 UTC (rev 55793)
+++ trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp	2013-04-05 00:10:33 UTC (rev 55794)
@@ -358,7 +358,7 @@
 
 
 // define python type
-static PyTypeObject ImageViewportType = {
+PyTypeObject ImageViewportType = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	"VideoTexture.ImageViewport",   /*tp_name*/
 	sizeof(PyImage),          /*tp_basicsize*/

Modified: trunk/blender/source/gameengine/VideoTexture/VideoBase.h
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/VideoBase.h	2013-04-04 23:52:33 UTC (rev 55793)
+++ trunk/blender/source/gameengine/VideoTexture/VideoBase.h	2013-04-05 00:10:33 UTC (rev 55794)
@@ -199,6 +199,9 @@
 PyObject *Video_getFrameRate(PyImage *self, void *closure);
 int       Video_setFrameRate(PyImage *self, PyObject *value, void *closure);
 
+/* py api */
+extern PyTypeObject ImageRenderType;
+extern PyTypeObject ImageMirrorType;
+extern PyTypeObject ImageViewportType;
 
-#endif
-
+#endif  /* __VIDEOBASE_H__ */

Modified: trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp	2013-04-04 23:52:33 UTC (rev 55793)
+++ trunk/blender/source/gameengine/VideoTexture/blendVideoTex.cpp	2013-04-05 00:10:33 UTC (rev 55794)
@@ -134,12 +134,7 @@
 extern PyTypeObject FilterBGR24Type;
 extern PyTypeObject ImageBuffType;
 extern PyTypeObject ImageMixType;
-extern PyTypeObject ImageRenderType;
-extern PyTypeObject ImageMirrorType;
-extern PyTypeObject ImageViewportType;
-extern PyTypeObject ImageViewportType;
 
-
 static void registerAllTypes(void)
 {
 #ifdef WITH_FFMPEG