soc-2008-mxcurioni: towards Freestyle compilation, removing Qt's QString and QImage dependencies. Up to this commit, the following directories compile well (and without any warning): system, image, geometry, graph, winged_edge, view_map, stroke.

Modified code is commented by //soc and unused variables by //soc unused

2 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/freestyle/intern/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h
index c75177541d3..c9ad04d4b80 100755
--- a/source/blender/freestyle/intern/image/GaussianFilter.h
+++ b/source/blender/freestyle/intern/image/GaussianFilter.h
@@ -116,8 +116,8 @@ float GaussianFilter::getSmoothedPixel(Map * map, int x, int y)
 {
   float sum = 0.f;  
   float L=0.f;
-  unsigned w=map->width();
-  unsigned h=map->height();
+  int w = (int)map->width(); //soc
+  int h = (int)map->height(); //soc
 
   // Current pixel is x,y
   // Sum surrounding pixels L value:
diff --git a/source/blender/freestyle/intern/image/ImagePyramid.cpp b/source/blender/freestyle/intern/image/ImagePyramid.cpp
index 45c02004d1c..e3f84983055 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);
   }
-  int i  = 1<<level;
-  int sx = x>>level;
-  int sy = y>>level;
+  uint i  = 1<<level;
+  uint sx = x>>level;
+  uint sy = y>>level;
   if(sx >= img->width())
     sx = img->width()-1;
   if(sy >= img->height())
@@ -135,7 +135,7 @@ void GaussianPyramid::BuildPyramid(GrayImage* level0, unsigned nbLevels){
   unsigned h = pLevel->height();
   if(nbLevels!=0)
   {
-    for(unsigned i=0; i<nbLevels; ++i){
+    for(unsigned i=0; i<nbLevels; ++i){ //soc
       w = pLevel->width()>>1;
       h = pLevel->height()>>1;
       GrayImage *img = new GrayImage(w,h);