Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-10-23 20:46:13 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-10-23 20:46:13 +0400
commita32d134dc790f3e8bf064865e4e6c79b55562630 (patch)
tree7461b87e2776b5aea4ca4c45a9949a049bee419e /source/blender/compositor
parent933864da1886f3e61a7233949de8f1dbbc89e1c5 (diff)
Solve unresolved call of min(int&, unsigned int&)
Alternative could be using unsigned ints for min/max chunks.
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/intern/COM_ExecutionGroup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
index 265fab97cc5..0553aebbba6 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
@@ -477,8 +477,8 @@ bool ExecutionGroup::scheduleAreaWhenPossible(ExecutionSystem *graph, rcti *area
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++) {