soc-2008-mxcurioni: resolved uint issues (replaced with unsigned int). Still NOT linking

3 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/freestyle/intern/image/ImagePyramid.cpp b/source/blender/freestyle/intern/image/ImagePyramid.cpp
index e3f84983055..542ab7917e3 100755
--- a/source/blender/freestyle/intern/image/ImagePyramid.cpp
+++ b/source/blender/freestyle/intern/image/ImagePyramid.cpp
@@ -58,9 +58,9 @@ float ImagePyramid::pixel(int x, int y, int level){
   if(0 == level){
     return img->pixel(x,y);
   }
-  uint i  = 1<<level;
-  uint sx = x>>level;
-  uint sy = y>>level;
+  unsigned int i  = 1<<level;
+  unsigned int sx = x>>level;
+  unsigned int sy = y>>level;
   if(sx >= img->width())
     sx = img->width()-1;
   if(sy >= img->height())
diff --git a/source/blender/freestyle/intern/system/PseudoNoise.cpp b/source/blender/freestyle/intern/system/PseudoNoise.cpp
index 4d62f967cde..87ee45e69b2 100755
--- a/source/blender/freestyle/intern/system/PseudoNoise.cpp
+++ b/source/blender/freestyle/intern/system/PseudoNoise.cpp
@@ -36,7 +36,7 @@ PseudoNoise::init (long seed)
 {
   _values = new real[NB_VALUE_NOISE];
   RandGen::srand48(seed);
-  for (uint i=0; i<NB_VALUE_NOISE; i++)
+  for (unsigned int i=0; i<NB_VALUE_NOISE; i++)
     _values[i] = -1.0 + 2.0 * RandGen::drand48();
 }
 
diff --git a/source/blender/freestyle/intern/system/StringUtils.cpp b/source/blender/freestyle/intern/system/StringUtils.cpp
index 556299e45c5..bbdbef10a10 100755
--- a/source/blender/freestyle/intern/system/StringUtils.cpp
+++ b/source/blender/freestyle/intern/system/StringUtils.cpp
@@ -53,7 +53,7 @@ namespace StringUtils {
 		stringstream out("");
 		char s;
 		
-		for(uint i=0; i < str.size() ; i++){
+		for(unsigned int i=0; i < str.size() ; i++){
 			s =  ((char)(str.at(i) & 0x7F));
 			out << s;
 		}