[QGIS Commit] r15423 - trunk/qgis/src/providers/gdal

[svn_qgis at osgeo.org]

Author: rblazek
Date: 2011-03-10 13:39:54 -0800 (Thu, 10 Mar 2011)
New Revision: 15423

Modified:
   trunk/qgis/src/providers/gdal/qgsgdalprovider.cpp
Log:
alignment better, avoid artifacts

Modified: trunk/qgis/src/providers/gdal/qgsgdalprovider.cpp
===================================================================
--- trunk/qgis/src/providers/gdal/qgsgdalprovider.cpp	2011-03-10 21:27:01 UTC (rev 15422)
+++ trunk/qgis/src/providers/gdal/qgsgdalprovider.cpp	2011-03-10 21:39:54 UTC (rev 15423)
@@ -670,6 +670,11 @@
   int topAddPixels = static_cast<int> ( round( topSpace / yRes ) );
 
   QgsDebugMsg( QString("xAddPixels = %1 yAddPixels = %2 leftAddPixels = %3 topAddPixels = %4").arg(xAddPixels).arg(yAddPixels).arg(leftAddPixels).arg(topAddPixels) );
+  // Currently only positive allowed, verify if negative has sense and check following use
+  xAddPixels = xAddPixels > 0 ? xAddPixels : 0;
+  yAddPixels = yAddPixels > 0 ? yAddPixels : 0;
+  leftAddPixels = leftAddPixels > 0 ? leftAddPixels : 0;
+  topAddPixels = topAddPixels > 0 ? topAddPixels : 0;
 
   int totalWidth = width + xAddPixels;
   int totalHeight = height + yAddPixels;