fix msvc build errors

git-svn-id: http://svn.osgeo.org/qgis/trunk@10485 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 6, 2009 · 472848e · 472848e
1 parent 846a43c
commit 472848e
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 12 deletions.
diff --git a/src/core/pal/geomfunction.cpp b/src/core/pal/geomfunction.cpp
@@ -274,7 +274,7 @@ namespace pal {
     bool computeLineSegIntersection (double x1, double y1, double x2, double y2,  // 1st line
                                  double x3, double y3, double x4, double y4,  // 2nd segment
                                  double *x, double *y) {
-        double cp1, cp2, cp3, cp4;
+        double cp1, cp2;
         cp1 = cross_product (x1, y1, x2, y2, x3, y3);
         cp2 = cross_product (x1, y1, x2, y2, x4, y4);
 

diff --git a/src/core/pal/layer.h b/src/core/pal/layer.h
@@ -53,7 +53,7 @@ namespace pal {
     class Pal;
     class SimpleMutex;
 
-    struct Feat;
+    class Feat;
 
     /**
      * \brief A layer of spacial entites

diff --git a/src/core/pal/pal.h b/src/core/pal/pal.h
@@ -40,6 +40,9 @@
 #include <list>
 #include <iostream>
 
+#ifdef _MSC_VER
+#include <time.h>
+#endif
 
 // TODO ${MAJOR} ${MINOR} etc instead of 0.2
 

diff --git a/src/core/pal/problem.cpp b/src/core/pal/problem.cpp
@@ -1317,7 +1317,7 @@ namespace pal {
             std::cout << "    Conflictual..." << std::endl;
 #endif
             int feat, rfeat;
-            bool sub = ctx->featWrap;
+            bool sub = ctx->featWrap!=NULL;
 
             feat = lp->probFeat;
             if (sub) {
@@ -1578,6 +1578,8 @@ namespace pal {
                 } catch (int i) {
 #ifdef _DEBUG_FULL_
                     std::cout << "catch int " << i << std::endl;
+#else
+                    i;
 #endif
                     while (conflicts->size() > 0)
                         conflicts->pop_front();
@@ -1838,6 +1840,8 @@ namespace pal {
                 } catch (int i) {
 #ifdef _DEBUG_FULL_
                     std::cout << "catch Cycle in chain" << std::endl;
+#else
+                    i;
 #endif
                     while (conflicts->size() > 0)
                         conflicts->pop_front();

diff --git a/src/core/pal/util.cpp b/src/core/pal/util.cpp
@@ -247,8 +247,6 @@ namespace pal {
     void extractXYCoord (Feat *f) {
         int i, j;
 
-        double phi, lambda;
-
         //Projection *proj = pal->proj;
 
         const GEOSCoordSequence *coordSeq;

diff --git a/src/core/pal/util.h b/src/core/pal/util.h
@@ -58,7 +58,8 @@ namespace pal {
     /**
      * \brief For translating feature from GEOS to Pal
      */
-    typedef struct Feat {
+    class Feat {
+      public:
         const GEOSGeometry *geom;
         const char *id;
         int type;
@@ -72,7 +73,7 @@ namespace pal {
         int nbHoles;
         PointSet **holes;
 
-    } Feat;
+    };
 
 
     /**

diff --git a/src/core/qgscentralpointpositionmanager.cpp b/src/core/qgscentralpointpositionmanager.cpp
@@ -182,8 +182,8 @@ int QgsCentralPointPositionManager::findObjectPosition(const unsigned char* wkb,
         }
         currentPosition+= sizeof(int);
 
-        double x[numberOfPoints];
-        double y[numberOfPoints];
+        double *x = new double[numberOfPoints];
+        double *y = new double[numberOfPoints];
 
         for(int i = 0; i < numberOfPoints; ++i)
           {
@@ -197,7 +197,11 @@ int QgsCentralPointPositionManager::findObjectPosition(const unsigned char* wkb,
               }
           }
         double centroidX, centroidY;
-        if(calculatePolygonCentroid(x, y, numberOfPoints, centroidX, centroidY) != 0)
+        int res = calculatePolygonCentroid(x, y, numberOfPoints, centroidX, centroidY);
+        delete [] x;
+        delete [] y;
+
+        if( res != 0)
           {
             return 1;
           }

diff --git a/src/core/qgsoverlayobject.cpp b/src/core/qgsoverlayobject.cpp
@@ -40,6 +40,7 @@ QgsOverlayObject& QgsOverlayObject::operator=(const QgsOverlayObject& other)
   mPositions = other.positions();
   mRotation = other.rotation();
   mGeometry = new QgsGeometry(*(other.geometry()));
+  return *this;
 }
 
 GEOSGeometry* QgsOverlayObject::getGeosGeometry()

diff --git a/src/plugins/diagram_overlay/qgsbardiagramfactory.cpp b/src/plugins/diagram_overlay/qgsbardiagramfactory.cpp
@@ -158,4 +158,5 @@ bool QgsBarDiagramFactory::_writeXML(QDomNode& factory_node, QDomDocument& doc)
     QDomText barWidthText = doc.createTextNode(QString::number(mBarWidth));
     barWidthElem.appendChild(barWidthText);
     factory_node.appendChild(barWidthElem);
+    return true;
 }
diff --git a/src/plugins/diagram_overlay/qgsdiagramrenderer.h b/src/plugins/diagram_overlay/qgsdiagramrenderer.h
@@ -30,9 +30,9 @@ class QDomNode;
 class QImage;
 
 //structure that describes a renderer entry
-struct QgsDiagramItem
+class QgsDiagramItem
 {
-
+public:
   QVariant value;
   int size;
 };