[QGIS Commit] r15269 - branches/raster-providers/src/providers/gdal

[svn_qgis at osgeo.org]

Author: rblazek
Date: 2011-02-27 07:42:05 -0800 (Sun, 27 Feb 2011)
New Revision: 15269

Modified:
   branches/raster-providers/src/providers/gdal/qgsgdalprovider.cpp
Log:
readBlock data type fix

Modified: branches/raster-providers/src/providers/gdal/qgsgdalprovider.cpp
===================================================================
--- branches/raster-providers/src/providers/gdal/qgsgdalprovider.cpp	2011-02-27 15:05:00 UTC (rev 15268)
+++ branches/raster-providers/src/providers/gdal/qgsgdalprovider.cpp	2011-02-27 15:42:05 UTC (rev 15269)
@@ -532,7 +532,12 @@
   QgsDebugMsg( "yBlock = "  + QString::number( yBlock ) );
 
   GDALRasterBandH myGdalBand = GDALGetRasterBand( mGdalDataset, theBandNo );
-  GDALReadBlock( myGdalBand, xBlock, yBlock, block );
+  //GDALReadBlock( myGdalBand, xBlock, yBlock, block );
+
+  /* We have to read with correct data type consistent with other readBlock functions */
+  int xOff = xBlock * mXBlockSize; 
+  int yOff = yBlock * mYBlockSize;
+  GDALRasterIO ( myGdalBand, GF_Read, xOff, yOff, mXBlockSize, mYBlockSize, block, mXBlockSize, mYBlockSize, (GDALDataType) mGdalDataType[theBandNo-1], 0, 0 );
 }
 
 void QgsGdalProvider::readBlock( int theBandNo, QgsRectangle  const & theExtent, int thePixelWidth, int thePixelHeight, void *theBlock )