Followup 71dc33, fix projective transform in georeferencer (fix #14551)

nyalldawson · nyalldawson · commit 83160632ace4 · 2016-06-15T12:15:43.000+10:00
diff --git a/src/plugins/georeferencer/qgsgeoreftransform.cpp b/src/plugins/georeferencer/qgsgeoreftransform.cpp
@@ -577,10 +577,11 @@ bool QgsProjectiveGeorefTransform::updateParametersFromGCPs( const QVector<QgsPo
     return false;
 
   // HACK: flip y coordinates, because georeferencer and gdal use different conventions
-  QVector<QgsPoint> flippedPixelCoords( pixelCoords.size() );
-  for ( int i = 0; i < pixelCoords.size(); i++ )
+  QVector<QgsPoint> flippedPixelCoords;
+  flippedPixelCoords.reserve( pixelCoords.size() );
+  Q_FOREACH ( const QgsPoint& coord, pixelCoords )
   {
-    flippedPixelCoords[i] = pixelCoords[i];
+    flippedPixelCoords << QgsPoint( coord.x(), -coord.y() );
   }
 
   QgsLeastSquares::projective( mapCoords, flippedPixelCoords, mParameters.H );

Original file line number	Diff line number	Diff line change
`@@ -577,10 +577,11 @@ bool QgsProjectiveGeorefTransform::updateParametersFromGCPs( const QVector<QgsPo`
`577`	`577`	`return false;`
`578`	`578`
`579`	`579`	`// HACK: flip y coordinates, because georeferencer and gdal use different conventions`
`580`		`- QVector<QgsPoint> flippedPixelCoords( pixelCoords.size() );`
`581`		`- for ( int i = 0; i < pixelCoords.size(); i++ )`
	`580`	`+ QVector<QgsPoint> flippedPixelCoords;`
	`581`	`+ flippedPixelCoords.reserve( pixelCoords.size() );`
	`582`	`+ Q_FOREACH ( const QgsPoint& coord, pixelCoords )`
`582`	`583`	`{`
`583`		`- flippedPixelCoords[i] = pixelCoords[i];`
	`584`	`+ flippedPixelCoords << QgsPoint( coord.x(), -coord.y() );`
`584`	`585`	`}`
`585`	`586`
`586`	`587`	`QgsLeastSquares::projective( mapCoords, flippedPixelCoords, mParameters.H );`