fix warnings

qgis · Mar 23, 2012 · 05f7d6baea740780601619afe34a6c70f324255e · 05f7d6b
1 parent 585e581
commit 05f7d6baea740780601619afe34a6c70f324255e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
@@ -211,7 +211,7 @@ void QgsMapToolOffsetCurve::canvasMoveEvent( QMouseEvent * e )
   int beforeVertex;
   double leftOf;
   double offset = sqrt( mOriginalGeometry->closestSegmentWithContext( layerCoords, minDistPoint, beforeVertex, &leftOf ) );
-  if ( !offset > 0 )
+  if ( offset == 0.0 )
   {
     return;
   }
@@ -332,6 +332,9 @@ void QgsMapToolOffsetCurve::deleteRubberBandAndGeometry()
 
 void QgsMapToolOffsetCurve::setOffsetForRubberBand( double offset, bool leftSide )
 {
+  // need at least geos 3.3 for OffsetCurve tool
+#if defined(GEOS_VERSION_MAJOR) && defined(GEOS_VERSION_MINOR) && \
+  ((GEOS_VERSION_MAJOR>3) || ((GEOS_VERSION_MAJOR==3) && (GEOS_VERSION_MINOR>=3)))
   if ( !mRubberBand || !mOriginalGeometry )
   {
     return;
@@ -343,7 +346,6 @@ void QgsMapToolOffsetCurve::setOffsetForRubberBand( double offset, bool leftSide
     return;
   }
 
-
   QgsGeometry geomCopy( *mOriginalGeometry );
   GEOSGeometry* geosGeom = geomCopy.asGeos();
   if ( geosGeom )
@@ -353,15 +355,7 @@ void QgsMapToolOffsetCurve::setOffsetForRubberBand( double offset, bool leftSide
     int quadSegments = s.value( "/qgis/digitizing/offset_quad_seg", 8 ).toInt();
     double mitreLimit = s.value( "/qgis/digitizine/offset_miter_limit", 5.0 ).toDouble();
 
-    GEOSGeometry* offsetGeom = 0;
-    //need at least geos 3.3 for OffsetCurve tool
-#if defined(GEOS_VERSION_MAJOR) && defined(GEOS_VERSION_MINOR) && \
-  ((GEOS_VERSION_MAJOR>3) || ((GEOS_VERSION_MAJOR==3) && (GEOS_VERSION_MINOR>=3)))
-    offsetGeom = GEOSOffsetCurve( geosGeom, ( leftSide > 0 ) ? offset : -offset, quadSegments, joinStyle, mitreLimit );
-#else
-    return;
-#endif //GEOS_VERSION
-
+    GEOSGeometry* offsetGeom = GEOSOffsetCurve( geosGeom, ( leftSide > 0 ) ? offset : -offset, quadSegments, joinStyle, mitreLimit );
     if ( !offsetGeom )
     {
       deleteRubberBandAndGeometry();
@@ -380,6 +374,7 @@ void QgsMapToolOffsetCurve::setOffsetForRubberBand( double offset, bool leftSide
       mRubberBand->setToGeometry( &mModifiedGeometry, sourceLayer );
     }
   }
+#endif //GEOS_VERSION>=3.3
 }
 
 QgsGeometry* QgsMapToolOffsetCurve::linestringFromPolygon( QgsGeometry* featureGeom, int vertex )

diff --git a/src/mapserver/qgswfsserver.cpp b/src/mapserver/qgswfsserver.cpp
@@ -405,6 +405,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
       }
       catch ( QgsMapServiceException& e )
       {
+        Q_UNUSED( e );
         filterOk = false;
       }
     }
@@ -519,6 +520,8 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
       }
       catch ( QgsMapServiceException& e )
       {
+        Q_UNUSED( e );
+
         while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
         {
           sendGetFeature( request, format, &feature, featureCounter, layerCrs, fields, layerHiddenAttributes );