[QGIS Commit] r12812 - trunk/qgis/src/core/raster

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-01-21 11:20:30 -0500 (Thu, 21 Jan 2010)
New Revision: 12812

Modified:
   trunk/qgis/src/core/raster/qgsrasterlayer.cpp
   trunk/qgis/src/core/raster/qgsrasterlayer.h
Log:
fix windows build error

Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2010-01-21 16:14:04 UTC (rev 12811)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp	2010-01-21 16:20:30 UTC (rev 12812)
@@ -5605,7 +5605,7 @@
   }
   GDALDataType type = GDALGetRasterDataType( mRasterBand );
   int size = GDALGetDataTypeSize( type ) / 8;
-  *rasterScanLine = mCurrentGDALData + mCurrentPartImageRow * mViewPort->drawableAreaXDim * size;
+  *rasterScanLine = ( unsigned char * )mCurrentGDALData + mCurrentPartImageRow * mViewPort->drawableAreaXDim * size;
 
   ++mCurrentPartImageRow;
   ++mCurrentRow;

Modified: trunk/qgis/src/core/raster/qgsrasterlayer.h
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.h	2010-01-21 16:14:04 UTC (rev 12811)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.h	2010-01-21 16:20:30 UTC (rev 12812)
@@ -895,7 +895,7 @@
 class CORE_EXPORT QgsRasterImageBuffer
 {
   public:
-    QgsRasterImageBuffer( GDALRasterBandH rasterBand, QPainter* p, \
+    QgsRasterImageBuffer( GDALRasterBandH rasterBand, QPainter* p,
                           QgsRasterViewPort* viewPort, const QgsMapToPixel* mapToPixel, double* mGeoTransform );
     ~QgsRasterImageBuffer();
     void reset( int maxPixelsInVirtualMemory = 5000000 );