Fix bilinear resampler

mhugent · mhugent · commit cb7b812d0e61 · 2011-12-28T12:20:36.000+01:00
diff --git a/src/core/raster/qgsbilinearrasterresampler.cpp b/src/core/raster/qgsbilinearrasterresampler.cpp
@@ -31,7 +31,7 @@ void QgsBilinearRasterResampler::resample( const QImage& srcImage, QImage& dstIm
   double nSrcPerDstX = ( double ) srcImage.width() / ( double ) dstImage.width();
   double nSrcPerDstY = ( double ) srcImage.height() / ( double ) dstImage.height();
 
-  double currentSrcRow = nSrcPerDstX / 2.0 - 0.5;
+  double currentSrcRow = nSrcPerDstY / 2.0 - 0.5;
   double currentSrcCol;
 
   QRgb px1, px2, px3, px4;
@@ -44,7 +44,7 @@ void QgsBilinearRasterResampler::resample( const QImage& srcImage, QImage& dstIm
       currentSrcRow += nSrcPerDstY;
     }
 
-    currentSrcCol = nSrcPerDstY / 2.0 - 0.5;
+    currentSrcCol = nSrcPerDstX / 2.0 - 0.5;
     for ( int j = 0; j < dstImage.width(); ++j )
     {
       double u = currentSrcCol - ( int )currentSrcCol;

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ void QgsBilinearRasterResampler::resample( const QImage& srcImage, QImage& dstIm`
`31`	`31`	`double nSrcPerDstX = ( double ) srcImage.width() / ( double ) dstImage.width();`
`32`	`32`	`double nSrcPerDstY = ( double ) srcImage.height() / ( double ) dstImage.height();`
`33`	`33`
`34`		`- double currentSrcRow = nSrcPerDstX / 2.0 - 0.5;`
	`34`	`+ double currentSrcRow = nSrcPerDstY / 2.0 - 0.5;`
`35`	`35`	`double currentSrcCol;`
`36`	`36`
`37`	`37`	`QRgb px1, px2, px3, px4;`
`@@ -44,7 +44,7 @@ void QgsBilinearRasterResampler::resample( const QImage& srcImage, QImage& dstIm`
`44`	`44`	`currentSrcRow += nSrcPerDstY;`
`45`	`45`	`}`
`46`	`46`
`47`		`- currentSrcCol = nSrcPerDstY / 2.0 - 0.5;`
	`47`	`+ currentSrcCol = nSrcPerDstX / 2.0 - 0.5;`
`48`	`48`	`for ( int j = 0; j < dstImage.width(); ++j )`
`49`	`49`	`{`
`50`	`50`	`double u = currentSrcCol - ( int )currentSrcCol;`