Keep image aspect in bilinear resampling, apply oversampling for zoom…

… out
qgis · Jan 14, 2012 · 2883fbc · 2883fbc
1 parent 662ec12
commit 2883fbc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/core/raster/qgsbilinearrasterresampler.cpp b/src/core/raster/qgsbilinearrasterresampler.cpp
@@ -29,5 +29,5 @@ QgsBilinearRasterResampler::~QgsBilinearRasterResampler()
 
 void QgsBilinearRasterResampler::resample( const QImage& srcImage, QImage& dstImage )
 {
-  dstImage = srcImage.scaled( dstImage.width(), dstImage.height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
+  dstImage = srcImage.scaled( dstImage.width(), dstImage.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation );
 }
diff --git a/src/core/raster/qgsrasterrenderer.cpp b/src/core/raster/qgsrasterrenderer.cpp
@@ -59,7 +59,7 @@ void QgsRasterRenderer::startRasterRead( int bandNumber, QgsRasterViewPort* view
       providerExtent = t.transformBoundingBox( providerExtent );
     }
     double pixelRatio = mapToPixel->mapUnitsPerPixel() / ( providerExtent.width() / mProvider->xSize() );
-    oversampling = pixelRatio > 1.0 ? 1.0 : pixelRatio;
+    oversampling = ( pixelRatio > 4.0 ) ? 4.0 : pixelRatio;
   }
 
   //split raster into small portions if necessary