fix warnings

jef-n · jef-n · commit 1c14beaa4f19 · 2012-12-10T00:12:41.000+01:00
diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
@@ -355,7 +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/digitizing/offset_miter_limit", 5.0 ).toDouble();
 
-    GEOSGeometry* offsetGeom = GEOSOffsetCurve( geosGeom, ( leftSide > 0 ) ? offset : -offset, quadSegments, joinStyle, mitreLimit );
+    GEOSGeometry* offsetGeom = GEOSOffsetCurve( geosGeom, leftSide ? offset : -offset, quadSegments, joinStyle, mitreLimit );
     if ( !offsetGeom )
     {
       deleteRubberBandAndGeometry();
diff --git a/src/providers/grass/qgsgrassgislib.cpp b/src/providers/grass/qgsgrassgislib.cpp
@@ -960,11 +960,9 @@ RASTER_MAP_TYPE QgsGrassGisLib::grassRasterType( QgsRasterBlock::DataType qgisTy
     case QgsRasterBlock::CFloat64:
     case QgsRasterBlock::ARGB32:
     case QgsRasterBlock::ARGB32_Premultiplied:
-      return -1;
     default:
       return -1;
   }
-  return -1; // not reached
 }
 
 char GRASS_LIB_EXPORT *G_tempfile( void )

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ void QgsMapToolOffsetCurve::setOffsetForRubberBand( double offset, bool leftSide`
`355`	`355`	`int quadSegments = s.value( "/qgis/digitizing/offset_quad_seg", 8 ).toInt();`
`356`	`356`	`double mitreLimit = s.value( "/qgis/digitizing/offset_miter_limit", 5.0 ).toDouble();`
`357`	`357`
`358`		`- GEOSGeometry* offsetGeom = GEOSOffsetCurve( geosGeom, ( leftSide > 0 ) ? offset : -offset, quadSegments, joinStyle, mitreLimit );`
	`358`	`+ GEOSGeometry* offsetGeom = GEOSOffsetCurve( geosGeom, leftSide ? offset : -offset, quadSegments, joinStyle, mitreLimit );`
`359`	`359`	`if ( !offsetGeom )`
`360`	`360`	`{`
`361`	`361`	`deleteRubberBandAndGeometry();`
Original file line number	Diff line number	Diff line change
`@@ -960,11 +960,9 @@ RASTER_MAP_TYPE QgsGrassGisLib::grassRasterType( QgsRasterBlock::DataType qgisTy`
`960`	`960`	`case QgsRasterBlock::CFloat64:`
`961`	`961`	`case QgsRasterBlock::ARGB32:`
`962`	`962`	`case QgsRasterBlock::ARGB32_Premultiplied:`
`963`		`- return -1;`
`964`	`963`	`default:`
`965`	`964`	`return -1;`
`966`	`965`	`}`
`967`		`- return -1; // not reached`
`968`	`966`	`}`
`969`	`967`
`970`	`968`	`char GRASS_LIB_EXPORT *G_tempfile( void )`