diff --git a/src/agg/process_raster_symbolizer.cpp b/src/agg/process_raster_symbolizer.cpp
index f83fa0757..6dcdda2d9 100644
--- a/src/agg/process_raster_symbolizer.cpp
+++ b/src/agg/process_raster_symbolizer.cpp
@@ -63,10 +63,10 @@ void agg_renderer<T>::process(raster_symbolizer const& sym,
         box2d<double> target_ext = box2d<double>(source->ext_);
         prj_trans.backward(target_ext, PROJ_ENVELOPE_POINTS);
         box2d<double> ext = t_.forward(target_ext);
-        int start_x = static_cast<int>(ext.minx());
-        int start_y = static_cast<int>(ext.miny());
-        int end_x = static_cast<int>(std::ceil(ext.maxx()));
-        int end_y = static_cast<int>(std::ceil(ext.maxy()));
+        int start_x = static_cast<int>(std::floor(ext.minx()+.5));
+        int start_y = static_cast<int>(std::floor(ext.miny()+.5));
+        int end_x = static_cast<int>(std::floor(ext.maxx()+.5));
+        int end_y = static_cast<int>(std::floor(ext.maxy()+.5));
         int raster_width = end_x - start_x;
         int raster_height = end_y - start_y;
         if (raster_width > 0 && raster_height > 0)
diff --git a/tests/visual_tests/images/tiff-edge-alignment-gdal1-255-reference.png b/tests/visual_tests/images/tiff-edge-alignment-gdal1-255-reference.png
index d7c2f0390..f661017da 100644
Binary files a/tests/visual_tests/images/tiff-edge-alignment-gdal1-255-reference.png and b/tests/visual_tests/images/tiff-edge-alignment-gdal1-255-reference.png differ
diff --git a/tests/visual_tests/images/tiff-edge-alignment-gdal1-256-reference.png b/tests/visual_tests/images/tiff-edge-alignment-gdal1-256-reference.png
index 19ac940b5..98c93e98c 100644
Binary files a/tests/visual_tests/images/tiff-edge-alignment-gdal1-256-reference.png and b/tests/visual_tests/images/tiff-edge-alignment-gdal1-256-reference.png differ
diff --git a/tests/visual_tests/images/tiff-edge-alignment-gdal2-255-reference.png b/tests/visual_tests/images/tiff-edge-alignment-gdal2-255-reference.png
index 2130be28e..44a7403b3 100644
Binary files a/tests/visual_tests/images/tiff-edge-alignment-gdal2-255-reference.png and b/tests/visual_tests/images/tiff-edge-alignment-gdal2-255-reference.png differ
diff --git a/tests/visual_tests/images/tiff-edge-alignment-gdal2-256-reference.png b/tests/visual_tests/images/tiff-edge-alignment-gdal2-256-reference.png
index c885dfeaa..099e70d70 100644
Binary files a/tests/visual_tests/images/tiff-edge-alignment-gdal2-256-reference.png and b/tests/visual_tests/images/tiff-edge-alignment-gdal2-256-reference.png differ
diff --git a/tests/visual_tests/images/tiff-nodata-edge-gdal-600-reference.png b/tests/visual_tests/images/tiff-nodata-edge-gdal-600-reference.png
index df5fa419e..b53356e57 100644
Binary files a/tests/visual_tests/images/tiff-nodata-edge-gdal-600-reference.png and b/tests/visual_tests/images/tiff-nodata-edge-gdal-600-reference.png differ
diff --git a/tests/visual_tests/images/tiff-nodata-edge-gdal-969-reference.png b/tests/visual_tests/images/tiff-nodata-edge-gdal-969-reference.png
index 934236bba..343ae97a2 100644
Binary files a/tests/visual_tests/images/tiff-nodata-edge-gdal-969-reference.png and b/tests/visual_tests/images/tiff-nodata-edge-gdal-969-reference.png differ