Revision: 60745
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60745
Author:   campbellbarton
Date:     2013-10-14 08:23:57 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
code cleanup: correct unsigned int in string formatting and use empty() checks 
for vectors.

Modified Paths:
--------------
    
trunk/blender/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    trunk/blender/source/blender/makesrna/intern/makesrna.c
    trunk/blender/source/blender/render/intern/source/volume_precache.c

Modified: 
trunk/blender/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
===================================================================
--- 
trunk/blender/source/blender/compositor/operations/COM_WriteBufferOperation.cpp 
    2013-10-14 08:20:12 UTC (rev 60744)
+++ 
trunk/blender/source/blender/compositor/operations/COM_WriteBufferOperation.cpp 
    2013-10-14 08:23:57 UTC (rev 60745)
@@ -157,14 +157,14 @@
        this->getMemoryProxy()->getBuffer()->copyContentFrom(outputBuffer);
 
        // STEP 4
-       while (clMemToCleanUp->size() > 0) {
+       while (!clMemToCleanUp->empty()) {
                cl_mem mem = clMemToCleanUp->front();
                error = clReleaseMemObject(mem);
                if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, 
clewErrorString(error));  }
                clMemToCleanUp->pop_front();
        }
 
-       while (clKernelsToCleanUp->size() > 0) {
+       while (!clKernelsToCleanUp->empty()) {
                cl_kernel kernel = clKernelsToCleanUp->front();
                error = clReleaseKernel(kernel);
                if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, 
clewErrorString(error));  }

Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c     2013-10-14 
08:20:12 UTC (rev 60744)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c     2013-10-14 
08:23:57 UTC (rev 60745)
@@ -1555,7 +1555,7 @@
                        }
                        else if (prop->arraydimension && prop->totarraylength) {
                                fprintf(f, "void %sget(PointerRNA *ptr, int 
values[%u]);\n", func, prop->totarraylength);
-                               fprintf(f, "void %sset(PointerRNA *ptr, const 
int values[%d]);\n", func, prop->totarraylength);
+                               fprintf(f, "void %sset(PointerRNA *ptr, const 
int values[%u]);\n", func, prop->totarraylength);
                        }
                        else {
                                fprintf(f, "void %sget(PointerRNA *ptr, int 
values[]);\n", func);
@@ -1571,7 +1571,7 @@
                        }
                        else if (prop->arraydimension && prop->totarraylength) {
                                fprintf(f, "void %sget(PointerRNA *ptr, float 
values[%u]);\n", func, prop->totarraylength);
-                               fprintf(f, "void %sset(PointerRNA *ptr, const 
float values[%d]);\n", func, prop->totarraylength);
+                               fprintf(f, "void %sset(PointerRNA *ptr, const 
float values[%u]);\n", func, prop->totarraylength);
                        }
                        else {
                                fprintf(f, "void %sget(PointerRNA *ptr, float 
values[]);\n", func);

Modified: trunk/blender/source/blender/render/intern/source/volume_precache.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/volume_precache.c 
2013-10-14 08:20:12 UTC (rev 60744)
+++ trunk/blender/source/blender/render/intern/source/volume_precache.c 
2013-10-14 08:23:57 UTC (rev 60745)
@@ -495,7 +495,7 @@
        int totparts;
 } VolPrecacheState;
 
-static void vol_precache_part(TaskPool *pool, void *taskdata, int threadid)
+static void vol_precache_part(TaskPool *pool, void *taskdata, int 
UNUSED(threadid))
 {
        VolPrecacheState *state = (VolPrecacheState 
*)BLI_task_pool_userdata(pool);
        VolPrecachePart *pa = (VolPrecachePart *)taskdata;

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to