fix windows build

jef · jef · commit edec35d73e8b · 2010-05-08T23:48:40.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13445 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -1132,6 +1132,8 @@ bool QgsGeorefPluginGui::georeference()
       return true;
     }
   }
+
+  return false;
 }
 
 bool QgsGeorefPluginGui::writeWorldFile( QgsPoint origin, double pixelXSize, double pixelYSize, double rotation )
@@ -1256,7 +1258,7 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
 
       if ( nPointsEnabled > 4 )
       {
-        meanError = sqrt(( sumVxSquare + sumVySquare ) / ( 2 * nPointsEnabled - 4 ) ) * sqrt( 2 );
+        meanError = sqrt(( sumVxSquare + sumVySquare ) / ( 2 * nPointsEnabled - 4 ) ) * sqrt( 2.0 );
       }
     }
 
diff --git a/src/plugins/georeferencer/qgsresidualplotitem.cpp b/src/plugins/georeferencer/qgsresidualplotitem.cpp
@@ -141,7 +141,6 @@ double QgsResidualPlotItem::maxMMToPixelRatioForGCP( const QgsGeorefDataPoint* p
   QPointF residual = p->residual();
   QLineF residualLine( pixelXMM, pixelYMM, pixelXMM + residual.x(), pixelYMM + residual.y() );
   QPointF intersectionPoint;
-  double dx, dy;
 
   if ( residual.y() > 0 )
   {

Original file line number	Diff line number	Diff line change
`@@ -1132,6 +1132,8 @@ bool QgsGeorefPluginGui::georeference()`
`1132`	`1132`	`return true;`
`1133`	`1133`	`}`
`1134`	`1134`	`}`
	`1135`	`+`
	`1136`	`+ return false;`
`1135`	`1137`	`}`
`1136`	`1138`
`1137`	`1139`	`bool QgsGeorefPluginGui::writeWorldFile( QgsPoint origin, double pixelXSize, double pixelYSize, double rotation )`
`@@ -1256,7 +1258,7 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG`
`1256`	`1258`
`1257`	`1259`	`if ( nPointsEnabled > 4 )`
`1258`	`1260`	`{`
`1259`		`- meanError = sqrt(( sumVxSquare + sumVySquare ) / ( 2 * nPointsEnabled - 4 ) ) * sqrt( 2 );`
	`1261`	`+ meanError = sqrt(( sumVxSquare + sumVySquare ) / ( 2 * nPointsEnabled - 4 ) ) * sqrt( 2.0 );`
`1260`	`1262`	`}`
`1261`	`1263`	`}`
`1262`	`1264`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,6 @@ double QgsResidualPlotItem::maxMMToPixelRatioForGCP( const QgsGeorefDataPoint* p`
`141`	`141`	`QPointF residual = p->residual();`
`142`	`142`	`QLineF residualLine( pixelXMM, pixelYMM, pixelXMM + residual.x(), pixelYMM + residual.y() );`
`143`	`143`	`QPointF intersectionPoint;`
`144`		`- double dx, dy;`
`145`	`144`
`146`	`145`	`if ( residual.y() > 0 )`
`147`	`146`	`{`