fix windows build

jef-n · jef-n · commit e576d93b5f6e · 2012-10-14T01:39:07.000+02:00
diff --git a/src/core/raster/qgsrasterblock.cpp b/src/core/raster/qgsrasterblock.cpp
@@ -115,7 +115,7 @@ QImage::Format QgsRasterBlock::imageFormat( QgsRasterBlock::DataType theDataType
   { 
     return QImage::Format_ARGB32_Premultiplied;
   }
-  return QImage::QImage::Format_Invalid;
+  return QImage::Format_Invalid;
 }
 
 QgsRasterBlock::DataType QgsRasterBlock::dataType ( QImage::Format theFormat )
@@ -267,7 +267,7 @@ double QgsRasterBlock::value( int row, int column) const
 
 QRgb QgsRasterBlock::color( size_t index) const
 {
-  int row = floor ( index / mWidth );
+  int row = floor ( (double)index / mWidth );
   int column = index % mWidth;
   return color( row, column);
 }

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ QImage::Format QgsRasterBlock::imageFormat( QgsRasterBlock::DataType theDataType`
`115`	`115`	`{`
`116`	`116`	`return QImage::Format_ARGB32_Premultiplied;`
`117`	`117`	`}`
`118`		`- return QImage::QImage::Format_Invalid;`
	`118`	`+ return QImage::Format_Invalid;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`QgsRasterBlock::DataType QgsRasterBlock::dataType ( QImage::Format theFormat )`
`@@ -267,7 +267,7 @@ double QgsRasterBlock::value( int row, int column) const`
`267`	`267`
`268`	`268`	`QRgb QgsRasterBlock::color( size_t index) const`
`269`	`269`	`{`
`270`		`- int row = floor ( index / mWidth );`
	`270`	`+ int row = floor ( (double)index / mWidth );`
`271`	`271`	`int column = index % mWidth;`
`272`	`272`	`return color( row, column);`
`273`	`273`	`}`