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, 19 insertions, 15 deletions

diff --git a/source/blender/freestyle/intern/geometry/Grid.cpp b/source/blender/freestyle/intern/geometry/Grid.cpp
index 59b730358bc..2477227c410 100755
--- a/source/blender/freestyle/intern/geometry/Grid.cpp
+++ b/source/blender/freestyle/intern/geometry/Grid.cpp
@@ -46,7 +46,7 @@ void firstIntersectionGridVisitor::examineOccluder(Polygon3r *occ){
     //first let us compute the plane equation.
     Vec3r v1(((occ)->getVertices())[0]);           
     Vec3d normal((occ)->getNormal());
-    double d = -(v1 * normal);
+    //soc unused - double d = -(v1 * normal);
 
     double tmp_u, tmp_v, tmp_t;
     if((occ)->rayIntersect(ray_org_, ray_dir_, tmp_t, tmp_u, tmp_v)){
@@ -106,7 +106,7 @@ void Grid::configure(const Vec3r& orig,
 
   if(grid_vol == 0){
     double min=DBL_MAX;
-    int index;
+    int index=0;
     int nzeros=0;
     for(int i=0;i<3;++i){
         if(size[i] == 0){
@@ -336,7 +336,7 @@ void Grid::initRay (const Vec3r &orig,
 
   for(unsigned i = 0; i < 3; i++) {
     _current_cell[i] = (unsigned)floor((orig[i] - _orig[i]) / _cell_size[i]);
-    unsigned u = _current_cell[i];
+    //soc unused - unsigned u = _current_cell[i];
     _pt[i] = orig[i] - _orig[i] - _current_cell[i] * _cell_size[i];
   }
   //_ray_occluders.clear();
@@ -359,7 +359,7 @@ bool Grid::initInfiniteRay (const Vec3r &orig,
   if(box.inside(orig)){
       for(unsigned i = 0; i < 3; i++) {
           _current_cell[i] = (unsigned)floor((orig[i] - _orig[i]) / _cell_size[i]);
-          unsigned u = _current_cell[i];
+          //soc unused - unsigned u = _current_cell[i];
           _pt[i] = orig[i] - _orig[i] - _current_cell[i] * _cell_size[i];
       }
   }else{
@@ -372,7 +372,7 @@ bool Grid::initInfiniteRay (const Vec3r &orig,
             _current_cell[i] = (unsigned)floor((newOrig[i] - _orig[i]) / _cell_size[i]);
             if(_current_cell[i] == _cells_nb[i])
                 _current_cell[i] = _cells_nb[i] - 1;
-            unsigned u = _current_cell[i];
+            //soc unused - unsigned u = _current_cell[i];
             _pt[i] = newOrig[i] - _orig[i] - _current_cell[i] * _cell_size[i];
         }
 
diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h
index 6197721bb45..fdca13d4ca4 100755
--- a/source/blender/freestyle/intern/geometry/Grid.h
+++ b/source/blender/freestyle/intern/geometry/Grid.h
@@ -81,6 +81,7 @@ class LIB_GEOMETRY_EXPORT Cell
 
 class GridVisitor{
 public:
+	virtual ~GridVisitor() {}; //soc
     virtual void discoverCell(Cell *cell) {}
     virtual void examineOccluder(Polygon3r *occ) {}
     virtual void finishCell(Cell *cell) {}
@@ -106,10 +107,21 @@ private:
  * the intersection information are stored and accessible.
  */
 class firstIntersectionGridVisitor : public GridVisitor {
+
+//soc - changed order to remove warnings
+public:
+    double u_, v_, t_;
+private:
+    Polygon3r *occluder_;
+	Vec3r ray_org_, ray_dir_, cell_size_;
+    Cell * current_cell_;
+
 public:
       firstIntersectionGridVisitor(const Vec3r& ray_org, const Vec3r& ray_dir, const Vec3r& cell_size) : 
-      GridVisitor(), ray_org_(ray_org), cell_size_(cell_size),ray_dir_(ray_dir),occluder_(0),
-            u_(0),v_(0),t_(DBL_MAX),current_cell_(0){}
+		 GridVisitor(), u_(0),v_(0),t_(DBL_MAX),
+		 occluder_(0),
+		 ray_org_(ray_org), ray_dir_(ray_dir), cell_size_(cell_size),
+      	 current_cell_(0) {}
       virtual ~firstIntersectionGridVisitor() {}
 
     virtual void discoverCell(Cell *cell) {current_cell_=cell;}
@@ -117,14 +129,6 @@ public:
     virtual bool stop();
 
     Polygon3r * occluder() {return occluder_;}
-    
-public:
-    double u_, v_, t_;
-private:
-    Polygon3r *occluder_;
-    Vec3r ray_org_, ray_dir_;
-    Vec3r cell_size_;
-    Cell * current_cell_;
 };
 
 //