Fix unwanted double reading in last commit

mhugent · mhugent · commit 5c76a5f70356 · 2012-12-12T12:40:37.000+01:00
diff --git a/src/core/raster/qgsrasterdataprovider.cpp b/src/core/raster/qgsrasterdataprovider.cpp
@@ -90,7 +90,6 @@ QgsRasterBlock * QgsRasterDataProvider::block( int theBandNo, QgsRectangle  cons
     tmpYRes = yRes;
   }
 
-#if 1 //disable for performance reason?
   if ( tmpExtent != theExtent ||
        tmpXRes > xRes || tmpYRes > yRes )
   {
@@ -192,8 +191,6 @@ QgsRasterBlock * QgsRasterDataProvider::block( int theBandNo, QgsRectangle  cons
   {
     readBlock( theBandNo, theExtent, theWidth, theHeight, block->data() );
   }
-#endif //0
-  readBlock( theBandNo, theExtent, theWidth, theHeight, block->data() );
 
   // apply user no data values
   // TODO: there are other readBlock methods where no data are not applied

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,6 @@ QgsRasterBlock * QgsRasterDataProvider::block( int theBandNo, QgsRectangle cons`
`90`	`90`	`tmpYRes = yRes;`
`91`	`91`	`}`
`92`	`92`
`93`		`-#if 1 //disable for performance reason?`
`94`	`93`	`if ( tmpExtent != theExtent \|\|`
`95`	`94`	`tmpXRes > xRes \|\| tmpYRes > yRes )`
`96`	`95`	`{`
`@@ -192,8 +191,6 @@ QgsRasterBlock * QgsRasterDataProvider::block( int theBandNo, QgsRectangle cons`
`192`	`191`	`{`
`193`	`192`	`readBlock( theBandNo, theExtent, theWidth, theHeight, block->data() );`
`194`	`193`	`}`
`195`		`-#endif //0`
`196`		`- readBlock( theBandNo, theExtent, theWidth, theHeight, block->data() );`
`197`	`194`
`198`	`195`	`// apply user no data values`
`199`	`196`	`// TODO: there are other readBlock methods where no data are not applied`