prepare-commit.sh

homann · homann · commit c1f37e8a03b4 · 2012-09-12T16:07:03.000+02:00
diff --git a/src/core/qgsrasterprojector.cpp b/src/core/qgsrasterprojector.cpp
@@ -596,18 +596,18 @@ bool QgsRasterProjector::checkCols()
       QgsPoint mySrcApprox(( mySrcPoint1.x() + mySrcPoint3.x() ) / 2, ( mySrcPoint1.y() + mySrcPoint3.y() ) / 2 );
       try
       {
-	QgsPoint myDestApprox = mCoordinateTransform.transform( mySrcApprox, QgsCoordinateTransform::ReverseTransform );
-	double mySqrDist = myDestApprox.sqrDist( myDestPoint );
-	if ( mySqrDist > mSqrTolerance )
-	{
-	  return false;
-	}
+        QgsPoint myDestApprox = mCoordinateTransform.transform( mySrcApprox, QgsCoordinateTransform::ReverseTransform );
+        double mySqrDist = myDestApprox.sqrDist( myDestPoint );
+        if ( mySqrDist > mSqrTolerance )
+        {
+          return false;
+        }
       }
       catch ( QgsCsException &e )
       {
-	Q_UNUSED( e );
-	// Caught an error in transform
-	return false;
+        Q_UNUSED( e );
+        // Caught an error in transform
+        return false;
       }
     }
   }
@@ -631,18 +631,18 @@ bool QgsRasterProjector::checkRows()
       QgsPoint mySrcApprox(( mySrcPoint1.x() + mySrcPoint3.x() ) / 2, ( mySrcPoint1.y() + mySrcPoint3.y() ) / 2 );
       try
       {
-	QgsPoint myDestApprox = mCoordinateTransform.transform( mySrcApprox, QgsCoordinateTransform::ReverseTransform );
-	double mySqrDist = myDestApprox.sqrDist( myDestPoint );
-	if ( mySqrDist > mSqrTolerance )
-	{
-	  return false;
-	}
+        QgsPoint myDestApprox = mCoordinateTransform.transform( mySrcApprox, QgsCoordinateTransform::ReverseTransform );
+        double mySqrDist = myDestApprox.sqrDist( myDestPoint );
+        if ( mySqrDist > mSqrTolerance )
+        {
+          return false;
+        }
       }
       catch ( QgsCsException &e )
       {
-	Q_UNUSED( e );
-	// Caught an error in transform
-	return false;
+        Q_UNUSED( e );
+        // Caught an error in transform
+        return false;
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -596,18 +596,18 @@ bool QgsRasterProjector::checkCols()`
`596`	`596`	`QgsPoint mySrcApprox(( mySrcPoint1.x() + mySrcPoint3.x() ) / 2, ( mySrcPoint1.y() + mySrcPoint3.y() ) / 2 );`
`597`	`597`	`try`
`598`	`598`	`{`
`599`		`- QgsPoint myDestApprox = mCoordinateTransform.transform( mySrcApprox, QgsCoordinateTransform::ReverseTransform );`
`600`		`- double mySqrDist = myDestApprox.sqrDist( myDestPoint );`
`601`		`- if ( mySqrDist > mSqrTolerance )`
`602`		`- {`
`603`		`- return false;`
`604`		`- }`
	`599`	`+ QgsPoint myDestApprox = mCoordinateTransform.transform( mySrcApprox, QgsCoordinateTransform::ReverseTransform );`
	`600`	`+ double mySqrDist = myDestApprox.sqrDist( myDestPoint );`
	`601`	`+ if ( mySqrDist > mSqrTolerance )`
	`602`	`+ {`
	`603`	`+ return false;`
	`604`	`+ }`
`605`	`605`	`}`
`606`	`606`	`catch ( QgsCsException &e )`
`607`	`607`	`{`
`608`		`- Q_UNUSED( e );`
`609`		`- // Caught an error in transform`
`610`		`- return false;`
	`608`	`+ Q_UNUSED( e );`
	`609`	`+ // Caught an error in transform`
	`610`	`+ return false;`
`611`	`611`	`}`
`612`	`612`	`}`
`613`	`613`	`}`
`@@ -631,18 +631,18 @@ bool QgsRasterProjector::checkRows()`
`631`	`631`	`QgsPoint mySrcApprox(( mySrcPoint1.x() + mySrcPoint3.x() ) / 2, ( mySrcPoint1.y() + mySrcPoint3.y() ) / 2 );`
`632`	`632`	`try`
`633`	`633`	`{`
`634`		`- QgsPoint myDestApprox = mCoordinateTransform.transform( mySrcApprox, QgsCoordinateTransform::ReverseTransform );`
`635`		`- double mySqrDist = myDestApprox.sqrDist( myDestPoint );`
`636`		`- if ( mySqrDist > mSqrTolerance )`
`637`		`- {`
`638`		`- return false;`
`639`		`- }`
	`634`	`+ QgsPoint myDestApprox = mCoordinateTransform.transform( mySrcApprox, QgsCoordinateTransform::ReverseTransform );`
	`635`	`+ double mySqrDist = myDestApprox.sqrDist( myDestPoint );`
	`636`	`+ if ( mySqrDist > mSqrTolerance )`
	`637`	`+ {`
	`638`	`+ return false;`
	`639`	`+ }`
`640`	`640`	`}`
`641`	`641`	`catch ( QgsCsException &e )`
`642`	`642`	`{`
`643`		`- Q_UNUSED( e );`
`644`		`- // Caught an error in transform`
`645`		`- return false;`
	`643`	`+ Q_UNUSED( e );`
	`644`	`+ // Caught an error in transform`
	`645`	`+ return false;`
`646`	`646`	`}`
`647`	`647`	`}`
`648`	`648`	`}`