soc-2008-mxcurioni: resolved uint issues (replaced with unsigned int). Still NOT...
authorMaxime Curioni <maxime.curioni@gmail.com>
Mon, 19 May 2008 13:15:07 +0000 (13:15 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Mon, 19 May 2008 13:15:07 +0000 (13:15 +0000)
SConstruct
source/blender/freestyle/intern/image/ImagePyramid.cpp
source/blender/freestyle/intern/system/PseudoNoise.cpp
source/blender/freestyle/intern/system/StringUtils.cpp
source/blender/imbuf/SConscript
source/blender/render/SConscript

index 341638c0e0ccf7f0d7c189201a629dc41fdd8a13..69908045173aebae8c7294cc53d6597735fd9df3 100644 (file)
@@ -492,7 +492,7 @@ if env['WITH_BF_PLAYER']:
     Depends(blenderplayer,installtarget)
 
 if not env['WITH_BF_GAMEENGINE']:
-    blendernogame = env.Alias('blendernogame', B.program_list)
+    blendernogame = env.Alias('blendernogame', B.game)
     Depends(blendernogame,installtarget)
 
 Depends(nsiscmd, allinstall)
index e3f84983055c2c0518c36a60d9831a460973367b..542ab7917e3dbb4482a03e7db16ee4e770fcd960 100755 (executable)
@@ -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())
index 4d62f967cde4e24dabe0d370fd49c3614025a7e4..87ee45e69b2de66f43c36080a47204c7f80650ed 100755 (executable)
@@ -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();
 }
 
index 556299e45c5e7ca96a88e5a5b25c275d18b85210..bbdbef10a10dd1709ca6a441685a18ccf9fe89e5 100755 (executable)
@@ -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;
                }       
index f9e46b20d9a55bbe3f7af8b106a37cef40a332b8..53ba2c3e6617687054d08ccfb30c513a8ff078f5 100644 (file)
@@ -31,4 +31,4 @@ if env['WITH_BF_QUICKTIME']==1:
        incs += ' ' + env['BF_QUICKTIME_INC']
        defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80,40] )
index ce00af8af4391620a700dc197b896cfe9ac328e8..52f5042cd507092ffbb21ef3a6c9a6dd7a5def79 100644 (file)
@@ -29,4 +29,4 @@ if env['WITH_BF_OPENEXR']:
 if env['OURPLATFORM']=='linux2':
     cflags='-pthread'
 
-env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=45, compileflags=cflags )
+env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype=['core'], priority=[45], compileflags=cflags )