[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48725] trunk/blender: code cleanup: quiet uninitialized memory use warning for X11 - harmless in this case but always gave warnings with memcheck (RGB color for alpha zero icon color wasnt initialized).

[Campbell Barton]

Revision: 48725
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48725
Author:   campbellbarton
Date:     2012-07-08 12:23:58 +0000 (Sun, 08 Jul 2012)
Log Message:
-----------
code cleanup: quiet uninitialized memory use warning for X11 - harmless in this case but always gave warnings with memcheck (RGB color for alpha zero icon color wasnt initialized).

also some other minor changes.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
    trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
    trunk/blender/source/blender/compositor/intern/COM_CompositorContext.cpp
    trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2012-07-08 09:27:33 UTC (rev 48724)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2012-07-08 12:23:58 UTC (rev 48725)
@@ -419,8 +419,8 @@
 	x_image = XCreateImage(display, m_visual->visual, 24, ZPixmap, 0, NULL, BLENDER_ICON_WIDTH, BLENDER_ICON_HEIGHT, 32, 0);
 	mask_image = XCreateImage(display, m_visual->visual, 1, ZPixmap, 0, NULL,  BLENDER_ICON_WIDTH, BLENDER_ICON_HEIGHT, 8, 0);
 	
-	x_image->data = (char *)malloc(x_image->bytes_per_line * BLENDER_ICON_HEIGHT);
-	mask_image->data = (char *)malloc(mask_image->bytes_per_line * BLENDER_ICON_HEIGHT);
+	x_image->data = (char *)calloc(x_image->bytes_per_line * BLENDER_ICON_HEIGHT, 1);
+	mask_image->data = (char *)calloc(mask_image->bytes_per_line * BLENDER_ICON_HEIGHT, 1);
 	
 	/* copy the BLENDER_ICON_48x48x24 into the XImage */
 	unsigned char *col = BLENDER_ICON_48x48x24;
@@ -429,7 +429,11 @@
 		for (py = 0; py < BLENDER_ICON_HEIGHT; py++, col += 3) {
 			/* mask out pink */
 			if (col[0] == 255 && col[1] == 0 && col[2] == 255) {
+#if 0
+				/* instead, use calloc above */
+				XPutPixel(x_image, px, py, 0); /* avoid uninitialized memory, otherwise not needed */
 				XPutPixel(mask_image, px, py, 0);
+#endif
 			}
 			else {
 				XPutPixel(x_image, px, py, (col[0] << 16) + (col[1] << 8) + col[2]);
@@ -1143,7 +1147,6 @@
 }
 
 #include <iostream>
-using namespace std;
 
 GHOST_TSuccess
 GHOST_WindowX11::

Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c	2012-07-08 09:27:33 UTC (rev 48724)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c	2012-07-08 12:23:58 UTC (rev 48725)
@@ -29,15 +29,11 @@
  *  \ingroup bli
  */
 
-
 #include <assert.h>
 
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
-
-
-
 #include "BLI_kdopbvh.h"
 #include "BLI_math.h"
 
@@ -45,8 +41,6 @@
 #include <omp.h>
 #endif
 
-
-
 #define MAX_TREETYPE 32
 #define DEFAULT_FIND_NEAREST_HEAP_SIZE 1024
 

Modified: trunk/blender/source/blender/compositor/intern/COM_CompositorContext.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_CompositorContext.cpp	2012-07-08 09:27:33 UTC (rev 48724)
+++ trunk/blender/source/blender/compositor/intern/COM_CompositorContext.cpp	2012-07-08 12:23:58 UTC (rev 48725)
@@ -26,7 +26,7 @@
 
 CompositorContext::CompositorContext()
 {
-	this->m_rd = 0;
+	this->m_rd = NULL;
 	this->m_quality = COM_QUALITY_HIGH;
 	this->m_hasActiveOpenCLDevices = false;
 	this->m_activegNode = NULL;

Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp	2012-07-08 09:27:33 UTC (rev 48724)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp	2012-07-08 12:23:58 UTC (rev 48725)
@@ -151,7 +151,7 @@
 
 #else
 
-RayObject *RE_rayobject_qbvh_create(int size)
+RayObject *RE_rayobject_qbvh_create(int UNUSED(size))
 {
 	puts("WARNING: SSE disabled at compile time\n");
 	return NULL;

Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp	2012-07-08 09:27:33 UTC (rev 48724)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp	2012-07-08 12:23:58 UTC (rev 48725)
@@ -183,7 +183,7 @@
 
 #else
 
-RayObject *RE_rayobject_svbvh_create(int size)
+RayObject *RE_rayobject_svbvh_create(int UNUSED(size))
 {
 	puts("WARNING: SSE disabled at compile time\n");
 	return NULL;