fix windows build error

jef · jef · commit fe5ccb78c85d · 2010-01-21T16:20:30.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12812 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -5605,7 +5605,7 @@ bool QgsRasterImageBuffer::nextScanLine( QRgb** imageScanLine, void** rasterScan
   }
   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;
diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h
@@ -895,7 +895,7 @@ class QPainter;*/
 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 );

Original file line number	Diff line number	Diff line change
`@@ -5605,7 +5605,7 @@ bool QgsRasterImageBuffer::nextScanLine( QRgb imageScanLine, void rasterScan`
`5605`	`5605`	`}`
`5606`	`5606`	`GDALDataType type = GDALGetRasterDataType( mRasterBand );`
`5607`	`5607`	`int size = GDALGetDataTypeSize( type ) / 8;`
`5608`		`- rasterScanLine = mCurrentGDALData + mCurrentPartImageRow mViewPort->drawableAreaXDim * size;`
	`5608`	`+ rasterScanLine = ( unsigned char )mCurrentGDALData + mCurrentPartImageRow * mViewPort->drawableAreaXDim * size;`
`5609`	`5609`
`5610`	`5610`	`++mCurrentPartImageRow;`
`5611`	`5611`	`++mCurrentRow;`
Original file line number	Diff line number	Diff line change
`@@ -895,7 +895,7 @@ class QPainter;*/`
`895`	`895`	`class CORE_EXPORT QgsRasterImageBuffer`
`896`	`896`	`{`
`897`	`897`	`public:`
`898`		`- QgsRasterImageBuffer( GDALRasterBandH rasterBand, QPainter* p, \`
	`898`	`+ QgsRasterImageBuffer( GDALRasterBandH rasterBand, QPainter* p,`
`899`	`899`	`QgsRasterViewPort* viewPort, const QgsMapToPixel* mapToPixel, double* mGeoTransform );`
`900`	`900`	`~QgsRasterImageBuffer();`
`901`	`901`	`void reset( int maxPixelsInVirtualMemory = 5000000 );`