Merge pull request #5 from timlinux/release-1_7_0

timlinux · timlinux · commit aadfa8cf5f7f · 2011-05-07T08:20:17.000-07:00
Radims fix for raster otf of wms render issues - and Guiseppi's gdal warp fix
diff --git a/src/core/qgsrasterprojector.cpp b/src/core/qgsrasterprojector.cpp
@@ -130,7 +130,7 @@ void QgsRasterProjector::calcSrcExtent()
   mSrcExtent = QgsRectangle( myPoint.x(), myPoint.y(), myPoint.x(), myPoint.y() );
   for ( int i = 0; i < mCPRows; i++ )
   {
-    for ( int j = 1; j < mCPCols - 1; j++ )
+    for ( int j = 0; j < mCPCols ; j++ )
     {
       myPoint = mCPMatrix[i][j];
       mSrcExtent.combineExtentWith( myPoint.x(), myPoint.y() );

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ void QgsRasterProjector::calcSrcExtent()`
`130`	`130`	`mSrcExtent = QgsRectangle( myPoint.x(), myPoint.y(), myPoint.x(), myPoint.y() );`
`131`	`131`	`for ( int i = 0; i < mCPRows; i++ )`
`132`	`132`	`{`
`133`		`- for ( int j = 1; j < mCPCols - 1; j++ )`
	`133`	`+ for ( int j = 0; j < mCPCols ; j++ )`
`134`	`134`	`{`
`135`	`135`	`myPoint = mCPMatrix[i][j];`
`136`	`136`	`mSrcExtent.combineExtentWith( myPoint.x(), myPoint.y() );`