[QGIS Commit] r10250 - in trunk/qgis/src: core core/composer plugins/interpolation

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-02-28 21:04:07 -0500 (Sat, 28 Feb 2009)
New Revision: 10250

Modified:
   trunk/qgis/src/core/composer/qgscomposeritem.h
   trunk/qgis/src/core/composer/qgspaperitem.h
   trunk/qgis/src/core/qgsgeometry.cpp
   trunk/qgis/src/plugins/interpolation/qgsinterpolator.cpp
Log:
fix warnings and link error on windows

Modified: trunk/qgis/src/core/composer/qgscomposeritem.h
===================================================================
--- trunk/qgis/src/core/composer/qgscomposeritem.h	2009-02-28 16:46:59 UTC (rev 10249)
+++ trunk/qgis/src/core/composer/qgscomposeritem.h	2009-03-01 02:04:07 UTC (rev 10250)
@@ -90,13 +90,13 @@
     /**Move Content of item. Does nothing per default (but implemented in composer map)
        @param dx move in x-direction (canvas coordinates)
        @param dy move in y-direction(canvas coordinates)*/
-    virtual void moveContent( double dx, double dy ) {}
+    virtual void moveContent( double dx, double dy ) { Q_UNUSED(dx); Q_UNUSED(dy); }
 
     /**Zoom content of item. Does nothing per default (but implemented in composer map)
      @param delta value from wheel event that describes magnitude and direction (positive /negative number)
     @param x x-position of mouse cursor (in item coordinates)
     @param y y-position of mouse cursor (in item coordinates)*/
-    virtual void zoomContent( int delta, double x, double y ) {}
+    virtual void zoomContent( int delta, double x, double y ) { Q_UNUSED(delta); Q_UNUSED(x); Q_UNUSED(y); }
 
     /**Moves the item to a new position (in canvas coordinates)*/
     void setItemPosition( double x, double y, ItemPositionMode itemPoint = UpperLeft );
@@ -128,7 +128,7 @@
     void setFrame( bool drawFrame ) {mFrame = drawFrame;}
 
     /**Composite operations for item groups do nothing per default*/
-    virtual void addItem( QgsComposerItem* item ) {}
+    virtual void addItem( QgsComposerItem* item ) { Q_UNUSED(item); }
     virtual void removeItems() {}
 
     const QgsComposition* composition() const {return mComposition;}

Modified: trunk/qgis/src/core/composer/qgspaperitem.h
===================================================================
--- trunk/qgis/src/core/composer/qgspaperitem.h	2009-02-28 16:46:59 UTC (rev 10249)
+++ trunk/qgis/src/core/composer/qgspaperitem.h	2009-03-01 02:04:07 UTC (rev 10250)
@@ -22,7 +22,7 @@
 
 /**Item representing the paper. May draw the snapping grid lines if composition is in
  preview mode*/
-class QgsPaperItem: public QgsComposerItem
+class CORE_EXPORT QgsPaperItem: public QgsComposerItem
 {
   public:
     QgsPaperItem( QgsComposition* c );

Modified: trunk/qgis/src/core/qgsgeometry.cpp
===================================================================
--- trunk/qgis/src/core/qgsgeometry.cpp	2009-02-28 16:46:59 UTC (rev 10249)
+++ trunk/qgis/src/core/qgsgeometry.cpp	2009-03-01 02:04:07 UTC (rev 10250)
@@ -4871,6 +4871,11 @@
   {
     const GEOSGeometry *polygon = GEOSGetGeometryN( polygons, i );
     intersectGeometry = GEOSIntersection( mGeos, polygon );
+    if ( !intersectGeometry )
+    {
+      QgsDebugMsg( "intersectGeometry is NULL" );
+      continue;
+    }
 
     double intersectionArea;
     GEOSArea( intersectGeometry, &intersectionArea );

Modified: trunk/qgis/src/plugins/interpolation/qgsinterpolator.cpp
===================================================================
--- trunk/qgis/src/plugins/interpolation/qgsinterpolator.cpp	2009-02-28 16:46:59 UTC (rev 10249)
+++ trunk/qgis/src/plugins/interpolation/qgsinterpolator.cpp	2009-03-01 02:04:07 UTC (rev 10250)
@@ -19,6 +19,10 @@
 #include "qgsvectordataprovider.h"
 #include "qgsgeometry.h"
 #include <cmath>
+#ifdef _MSC_VER
+#include <float.h>
+#define isnan(f) _isnan(f)
+#endif
 
 QgsInterpolator::QgsInterpolator( const QList<QgsVectorLayer*>& vlayers ): mDataIsCached( false ), mVectorLayers( vlayers ), zCoordInterpolation( false ), mValueAttribute( -1 )
 {