fix nightly build and cppcheck in qwtpolar-0.1 (followup 0d2c564)

qgis · Jan 24, 2014 · c3f4bef · c3f4bef
1 parent 569e571
commit c3f4bef
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/app/gps/qwtpolar-1.0/qwt_polar_grid.cpp b/src/app/gps/qwtpolar-1.0/qwt_polar_grid.cpp
@@ -1048,7 +1048,7 @@ int QwtPolarGrid::marginHint() const
 */
 const QwtScaleDraw *QwtPolarGrid::scaleDraw( int axisId ) const
 {
-    if ( axisId >= QwtPolar::AxisLeft || axisId <= QwtPolar::AxisBottom )
+    if ( axisId >= QwtPolar::AxisLeft && axisId <= QwtPolar::AxisBottom )
         return static_cast<QwtScaleDraw *>( d_data->axisData[axisId].scaleDraw );
 
     return NULL;
@@ -1063,7 +1063,7 @@ const QwtScaleDraw *QwtPolarGrid::scaleDraw( int axisId ) const
 */
 QwtScaleDraw *QwtPolarGrid::scaleDraw( int axisId )
 {
-    if ( axisId >= QwtPolar::AxisLeft || axisId <= QwtPolar::AxisBottom )
+    if ( axisId >= QwtPolar::AxisLeft && axisId <= QwtPolar::AxisBottom )
         return static_cast<QwtScaleDraw *>( d_data->axisData[axisId].scaleDraw );
 
     return NULL;

diff --git a/src/app/gps/qwtpolar-1.0/qwt_polar_renderer.cpp b/src/app/gps/qwtpolar-1.0/qwt_polar_renderer.cpp
@@ -302,7 +302,7 @@ void QwtPolarRenderer::render( QwtPolarPlot *plot,
     renderLegend( painter, layout->legendRect() );
     painter->restore();
 
-    const QRectF canvasRect = layout->canvasRect();
+    const QRectF &canvasRect = layout->canvasRect();
 
     painter->save();
     painter->setClipRect( canvasRect );

diff --git a/src/plugins/dxf2shp_converter/shapelib-1.2.10/shpopen.c b/src/plugins/dxf2shp_converter/shapelib-1.2.10/shpopen.c
@@ -669,6 +669,7 @@ SHPCreate( const char * pszLayer, int nShapeType )
   {
     free( pszBasename );
     free( pszFullname );
+    fclose( fpSHP );
     return( NULL );
   }
 

diff --git a/src/plugins/globe/osgEarthUtil/Controls.cpp b/src/plugins/globe/osgEarthUtil/Controls.cpp
@@ -1799,20 +1799,19 @@ ControlNodeBin::draw( const ControlContext& context, bool newContext, int bin )
 
     if ( _sortingEnabled && _sortByDistance )
     {
-        for( ControlNodeCollection::iterator i = _controlNodes.begin(); i != _controlNodes.end(); )
+        for( ControlNodeCollection::iterator i = _controlNodes.begin(); i != _controlNodes.end(); ++i )
         {
             ControlNode* node = i->second.get();
             if ( node->getNumParents() == 0 )
             {
               _renderNodes.erase( node );
-              i = _controlNodes.erase( i );
+              _controlNodes.erase( i );
             }
             else
-            {
-                ControlNode::PerViewData& nodeData = node->getData( context._view );
-                byDepth.insert( ControlNodePair(nodeData._screenPos.z(), node) );
-                ++i;
-            }
+	    {
+	      ControlNode::PerViewData& nodeData = node->getData( context._view );
+	      byDepth.insert( ControlNodePair(nodeData._screenPos.z(), node) );
+	    }
         }
 
         drawList = &byDepth;