Fix for small raster shift introduced by my raster memory handling im…

…provements git-svn-id: http://svn.osgeo.org/qgis/trunk@12904 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 9, 2010 · 038f6ccf9530c869955521e0108b916dee8f1a64 · 038f6cc
1 parent 6b9f41d
commit 038f6ccf9530c869955521e0108b916dee8f1a64
Unified Split

Showing with 23 additions and 6 deletions.

+23 −6 src/core/raster/qgsrasterlayer.cpp
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -1118,7 +1118,7 @@ QgsRasterLayer::RasterPyramidList  QgsRasterLayer::buildPyramidList()
   int myWidth = mWidth;
   int myHeight = mHeight;
   int myDivisor = 2;
-  
+
   if ( mDataProvider ) return mPyramidList;
 
   GDALRasterBandH myGDALBand = GDALGetRasterBand( mGdalDataset, 1 ); //just use the first band
@@ -3227,7 +3227,7 @@ void QgsRasterLayer::setDataProvider( QString const & provider,
           mDrawingStyle = MultiBandColor;  //sensible default
 
           // Setup source CRS
-          if ( mProviderKey == "wms" ) 
+          if ( mProviderKey == "wms" )
           {
             *mCRS = QgsCoordinateReferenceSystem();
             mCRS->createFromOgcWmsCrs( crs );
@@ -5417,7 +5417,8 @@ bool QgsRasterLayer::update()
 
   if ( mLastModified < QgsRasterLayer::lastModified( source() ) )
   {
-    if ( !usesProvider() ) {
+    if ( !usesProvider() )
+    {
       QgsDebugMsg( "Outdated -> reload" );
       closeDataset();
       return readFile( source() );
@@ -5600,9 +5601,25 @@ bool QgsRasterImageBuffer::createNextPartImage()
       }
       else
       {
-        double xLeft = mViewPort->topLeftPoint.x();
-        double yTop = mViewPort->topLeftPoint.y() + fabs( mGeoTransform[5] ) * mCurrentPartRasterMin / mMapToPixel->mapUnitsPerPixel();
-        mPainter->drawImage( QPointF( xLeft, yTop + 0.5 ), *mCurrentImage );
+        int paintXoffset = static_cast<int>(
+                             ( mViewPort->rectXOffsetFloat -
+                               mViewPort->rectXOffset )
+                             / mMapToPixel->mapUnitsPerPixel()
+                             * fabs( mGeoTransform[1] )
+                           );
+
+        int paintYoffset = static_cast<int>(
+                             ( mViewPort->rectYOffsetFloat -
+                               mViewPort->rectYOffset )
+                             / mMapToPixel->mapUnitsPerPixel()
+                             * fabs( mGeoTransform[5] )
+                           );
+
+        mPainter->drawImage( static_cast<int>( mViewPort->topLeftPoint.x() + 0.5 ),
+                             static_cast<int>( mViewPort->topLeftPoint.y() + 0.5 +  fabs( mGeoTransform[5] ) * mCurrentPartRasterMin / mMapToPixel->mapUnitsPerPixel() ),
+                             *mCurrentImage,
+                             paintXoffset,
+                             paintYoffset );
       }
     }
   }