size_t is 8, int is 4 on amd64

homann · homann · commit 35f7a1cc90a7 · 2012-09-13T19:49:31.000+02:00
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -959,8 +959,8 @@ void QgsWmsProvider::readBlock( int bandNo, QgsRectangle  const & viewExtent, in
     return;
   }
   QgsDebugMsg( QString( "image height = %1 bytesPerLine = %2" ).arg( image->height() ) . arg( image->bytesPerLine() ) ) ;
-  int myExpectedSize = pixelWidth * pixelHeight * 4;
-  int myImageSize = image->height() *  image->bytesPerLine();
+  size_t myExpectedSize = pixelWidth * pixelHeight * 4;
+  size_t myImageSize = image->height() *  image->bytesPerLine();
   if ( myExpectedSize != myImageSize )   // should not happen
   {
     QgsMessageLog::logMessage( tr( "unexpected image size" ), tr( "WMS" ) );

Original file line number	Diff line number	Diff line change
`@@ -959,8 +959,8 @@ void QgsWmsProvider::readBlock( int bandNo, QgsRectangle const & viewExtent, in`
`959`	`959`	`return;`
`960`	`960`	`}`
`961`	`961`	`QgsDebugMsg( QString( "image height = %1 bytesPerLine = %2" ).arg( image->height() ) . arg( image->bytesPerLine() ) ) ;`
`962`		`- int myExpectedSize = pixelWidth * pixelHeight * 4;`
`963`		`- int myImageSize = image->height() * image->bytesPerLine();`
	`962`	`+ size_t myExpectedSize = pixelWidth * pixelHeight * 4;`
	`963`	`+ size_t myImageSize = image->height() * image->bytesPerLine();`
`964`	`964`	`if ( myExpectedSize != myImageSize ) // should not happen`
`965`	`965`	`{`
`966`	`966`	`QgsMessageLog::logMessage( tr( "unexpected image size" ), tr( "WMS" ) );`