From df8f8a6ae5bd7f2cb289019bd96d3f1b6b26244b Mon Sep 17 00:00:00 2001 From: jef Date: Sat, 15 Aug 2009 13:13:24 +0000 Subject: [PATCH] fix warnings git-svn-id: http://svn.osgeo.org/qgis/trunk@11387 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/core/qgscentralpointpositionmanager.cpp | 1 - src/core/qgsmaprenderer.cpp | 1 + src/plugins/diagram_overlay/qgsdiagramrenderer.cpp | 11 +++-------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/core/qgscentralpointpositionmanager.cpp b/src/core/qgscentralpointpositionmanager.cpp index 47d9cde12a8..aa0412a731a 100644 --- a/src/core/qgscentralpointpositionmanager.cpp +++ b/src/core/qgscentralpointpositionmanager.cpp @@ -216,7 +216,6 @@ int QgsCentralPointPositionManager::findObjectPosition( const unsigned char* wkb default: return 6; } - return 0; } int QgsCentralPointPositionManager::calculatePolygonCentroid( double x[], double y[], int numberOfPoints, double& centroidX, double& centroidY ) const diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp index c2be42aa1a8..ce084ffe94c 100644 --- a/src/core/qgsmaprenderer.cpp +++ b/src/core/qgsmaprenderer.cpp @@ -637,6 +637,7 @@ QgsPoint QgsMapRenderer::layerToMapCoordinates( QgsMapLayer* theLayer, QgsPoint } catch ( QgsCsException &cse ) { + Q_UNUSED( cse ); QgsDebugMsg( QString( "Transform error caught:%s" ).arg( cse.what() ) ); } } diff --git a/src/plugins/diagram_overlay/qgsdiagramrenderer.cpp b/src/plugins/diagram_overlay/qgsdiagramrenderer.cpp index f5800e8dd01..54047bd0d3e 100644 --- a/src/plugins/diagram_overlay/qgsdiagramrenderer.cpp +++ b/src/plugins/diagram_overlay/qgsdiagramrenderer.cpp @@ -285,7 +285,7 @@ int QgsDiagramRenderer::calculateDiagramSize( const QgsFeature& f, int& size ) c return 0; } -int QgsDiagramRenderer::interpolateSize( double value, double lowerValue, double upperValue, \ +int QgsDiagramRenderer::interpolateSize( double value, double lowerValue, double upperValue, int lowerSize, int upperSize ) const { switch ( mItemInterpretation ) @@ -305,13 +305,9 @@ int QgsDiagramRenderer::interpolateSize( double value, double lowerValue, double return upperSize; } - QgsDiagramFactory::SizeType t; - if ( mFactory ) - { - t = mFactory->sizeType(); - } + QgsDiagramFactory::SizeType t = mFactory ? mFactory->sizeType() : QgsDiagramFactory::HEIGHT; - if ( !mFactory || t == QgsDiagramFactory::HEIGHT ) + if ( t == QgsDiagramFactory::HEIGHT ) { //do one dimensional linear interpolation return ( int )((( value - lowerValue ) * upperSize + ( upperValue - value ) * lowerSize ) / ( upperValue - lowerValue ) ); @@ -327,5 +323,4 @@ int QgsDiagramRenderer::interpolateSize( double value, double lowerValue, double default: return 1; } - return 0; //something went wrong if we arrive here }