[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51550] trunk/blender/source/blender/ compositor/intern/COM_ExecutionGroup.cpp: Solve unresolved call of min(int& , unsigned int&)

Sergey Sharybin sergey.vfx at gmail.com
Tue Oct 23 18:46:14 CEST 2012


Revision: 51550
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51550
Author:   nazgul
Date:     2012-10-23 16:46:13 +0000 (Tue, 23 Oct 2012)
Log Message:
-----------
Solve unresolved call of min(int&, unsigned int&)

Alternative could be using unsigned ints for min/max chunks.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp

Modified: trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp	2012-10-23 16:36:53 UTC (rev 51549)
+++ trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp	2012-10-23 16:46:13 UTC (rev 51550)
@@ -477,8 +477,8 @@
 	int maxychunk = ceil((area->ymax - 1) / chunkSizef);
 	minxchunk = max(minxchunk, 0);
 	minychunk = max(minychunk, 0);
-	maxxchunk = min(maxxchunk, this->m_numberOfXChunks);
-	maxychunk = min(maxychunk, this->m_numberOfYChunks);
+	maxxchunk = min(maxxchunk, (int)this->m_numberOfXChunks);
+	maxychunk = min(maxychunk, (int)this->m_numberOfYChunks);
 
 	bool result = true;
 	for (indexx = minxchunk; indexx < maxxchunk; indexx++) {




More information about the Bf-blender-cvs mailing list