Skip to content

Commit d424c1b

Browse files
author
jef
committed
fix warnings and link error on windows
git-svn-id: http://svn.osgeo.org/qgis/trunk@10250 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 233cf07 commit d424c1b

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

src/core/composer/qgscomposeritem.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ class CORE_EXPORT QgsComposerItem: public QGraphicsRectItem
9090
/**Move Content of item. Does nothing per default (but implemented in composer map)
9191
@param dx move in x-direction (canvas coordinates)
9292
@param dy move in y-direction(canvas coordinates)*/
93-
virtual void moveContent( double dx, double dy ) {}
93+
virtual void moveContent( double dx, double dy ) { Q_UNUSED(dx); Q_UNUSED(dy); }
9494

9595
/**Zoom content of item. Does nothing per default (but implemented in composer map)
9696
@param delta value from wheel event that describes magnitude and direction (positive /negative number)
9797
@param x x-position of mouse cursor (in item coordinates)
9898
@param y y-position of mouse cursor (in item coordinates)*/
99-
virtual void zoomContent( int delta, double x, double y ) {}
99+
virtual void zoomContent( int delta, double x, double y ) { Q_UNUSED(delta); Q_UNUSED(x); Q_UNUSED(y); }
100100

101101
/**Moves the item to a new position (in canvas coordinates)*/
102102
void setItemPosition( double x, double y, ItemPositionMode itemPoint = UpperLeft );
@@ -128,7 +128,7 @@ class CORE_EXPORT QgsComposerItem: public QGraphicsRectItem
128128
void setFrame( bool drawFrame ) {mFrame = drawFrame;}
129129

130130
/**Composite operations for item groups do nothing per default*/
131-
virtual void addItem( QgsComposerItem* item ) {}
131+
virtual void addItem( QgsComposerItem* item ) { Q_UNUSED(item); }
132132
virtual void removeItems() {}
133133

134134
const QgsComposition* composition() const {return mComposition;}

src/core/composer/qgspaperitem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
/**Item representing the paper. May draw the snapping grid lines if composition is in
2424
preview mode*/
25-
class QgsPaperItem: public QgsComposerItem
25+
class CORE_EXPORT QgsPaperItem: public QgsComposerItem
2626
{
2727
public:
2828
QgsPaperItem( QgsComposition* c );

src/core/qgsgeometry.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -4871,6 +4871,11 @@ int QgsGeometry::splitPolygonGeometry( GEOSGeometry* splitLine, QList<QgsGeometr
48714871
{
48724872
const GEOSGeometry *polygon = GEOSGetGeometryN( polygons, i );
48734873
intersectGeometry = GEOSIntersection( mGeos, polygon );
4874+
if ( !intersectGeometry )
4875+
{
4876+
QgsDebugMsg( "intersectGeometry is NULL" );
4877+
continue;
4878+
}
48744879

48754880
double intersectionArea;
48764881
GEOSArea( intersectGeometry, &intersectionArea );

src/plugins/interpolation/qgsinterpolator.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
#include "qgsvectordataprovider.h"
2020
#include "qgsgeometry.h"
2121
#include <cmath>
22+
#ifdef _MSC_VER
23+
#include <float.h>
24+
#define isnan(f) _isnan(f)
25+
#endif
2226

2327
QgsInterpolator::QgsInterpolator( const QList<QgsVectorLayer*>& vlayers ): mDataIsCached( false ), mVectorLayers( vlayers ), zCoordInterpolation( false ), mValueAttribute( -1 )
2428
{

0 commit comments

Comments
 (0)