Skip to content
Permalink
Browse files

fix warnings and link error on windows

git-svn-id: http://svn.osgeo.org/qgis/trunk@10250 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Mar 1, 2009
1 parent 233cf07 commit d424c1bf1c76bc8f35fecb17028806911b5b6f17
@@ -90,13 +90,13 @@ class CORE_EXPORT QgsComposerItem: public QGraphicsRectItem
/**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 @@ class CORE_EXPORT QgsComposerItem: public QGraphicsRectItem
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;}
@@ -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 );
@@ -4871,6 +4871,11 @@ int QgsGeometry::splitPolygonGeometry( GEOSGeometry* splitLine, QList<QgsGeometr
{
const GEOSGeometry *polygon = GEOSGetGeometryN( polygons, i );
intersectGeometry = GEOSIntersection( mGeos, polygon );
if ( !intersectGeometry )
{
QgsDebugMsg( "intersectGeometry is NULL" );
continue;
}

double intersectionArea;
GEOSArea( intersectGeometry, &intersectionArea );
@@ -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 )
{

0 comments on commit d424c1b

Please sign in to comment.
You can’t perform that action at this time.