Merge branch 'fix_1715' into branch-7-0

MapServer · Jan 17, 2017 · ba9e11a · ba9e11a
2 parents bbe23e8 + 026847b
commit ba9e11a
Show file tree

Hide file tree

Showing 40 changed files with 989 additions and 977 deletions.
diff --git a/mapresample.c b/mapresample.c
@@ -1509,6 +1509,18 @@ int msResampleGDALToMap( mapObj *map, layerObj *layer, imageObj *image,
   adfSrcGeoTransform[4] *= (sDummyMap.cellsize / dfNominalCellSize);
   adfSrcGeoTransform[5] *= (sDummyMap.cellsize / dfNominalCellSize);
 
+  /* In the non-rotated case, make sure that the geotransform exactly */
+  /* matches the sSrcExtent, even if that generates non-square pixels (#1715) */
+  /* The rotated case should ideally be dealt with, but not for now... */
+  if( adfSrcGeoTransform[2] == 0 && adfSrcGeoTransform[4] == 0 &&
+      adfSrcGeoTransform[5] < 0 )
+  {
+      adfSrcGeoTransform[1] = (sSrcExtent.maxx - sSrcExtent.minx) *
+                                            dfNominalCellSize / nLoadImgXSize;
+      adfSrcGeoTransform[5] = -(sSrcExtent.maxy - sSrcExtent.miny) *
+                                            dfNominalCellSize / nLoadImgYSize;
+  }
+
   papszAlteredProcessing = CSLDuplicate( layer->processing );
   papszAlteredProcessing =
     CSLSetNameValue( papszAlteredProcessing, "RAW_WINDOW",

diff --git a/msautotest/gdal/expected/average_rgb.png b/msautotest/gdal/expected/average_rgb.png
diff --git a/msautotest/gdal/expected/average_rgb_plug.png b/msautotest/gdal/expected/average_rgb_plug.png
diff --git a/msautotest/gdal/expected/wmsclient_3543.png b/msautotest/gdal/expected/wmsclient_3543.png
diff --git a/msautotest/misc/expected/runtime_sub_test012.png b/msautotest/misc/expected/runtime_sub_test012.png
diff --git a/msautotest/misc/expected/runtime_sub_test013.png b/msautotest/misc/expected/runtime_sub_test013.png
diff --git a/msautotest/renderers/expected/average_rgb.cairo.png b/msautotest/renderers/expected/average_rgb.cairo.png
diff --git a/msautotest/renderers/expected/average_rgb.pdf b/msautotest/renderers/expected/average_rgb.pdf
diff --git a/msautotest/renderers/expected/average_rgb.png b/msautotest/renderers/expected/average_rgb.png
diff --git a/msautotest/renderers/expected/average_rgb.svg b/msautotest/renderers/expected/average_rgb.svg
diff --git a/msautotest/renderers/expected/rgb_overlay_res.cairo.png b/msautotest/renderers/expected/rgb_overlay_res.cairo.png
diff --git a/msautotest/renderers/expected/rgb_overlay_res.pdf b/msautotest/renderers/expected/rgb_overlay_res.pdf
diff --git a/msautotest/renderers/expected/rgb_overlay_res.png b/msautotest/renderers/expected/rgb_overlay_res.png
diff --git a/msautotest/renderers/expected/rgb_overlay_res.svg b/msautotest/renderers/expected/rgb_overlay_res.svg
diff --git a/msautotest/renderers/expected/rgb_overlay_res_to8bit.cairo.png b/msautotest/renderers/expected/rgb_overlay_res_to8bit.cairo.png
diff --git a/msautotest/renderers/expected/rgb_overlay_res_to8bit.pdf b/msautotest/renderers/expected/rgb_overlay_res_to8bit.pdf
diff --git a/msautotest/renderers/expected/rgb_overlay_res_to8bit.png b/msautotest/renderers/expected/rgb_overlay_res_to8bit.png
diff --git a/msautotest/renderers/expected/rgb_overlay_res_to8bit.svg b/msautotest/renderers/expected/rgb_overlay_res_to8bit.svg
diff --git a/msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.cairo.png b/msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.cairo.png
diff --git a/msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.pdf b/msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.pdf
diff --git a/msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.png b/msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.png
diff --git a/msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.svg b/msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.svg
diff --git a/msautotest/renderers/expected/rgba_overlay_res.cairo.png b/msautotest/renderers/expected/rgba_overlay_res.cairo.png
diff --git a/msautotest/renderers/expected/rgba_overlay_res.pdf b/msautotest/renderers/expected/rgba_overlay_res.pdf
diff --git a/msautotest/renderers/expected/rgba_overlay_res.png b/msautotest/renderers/expected/rgba_overlay_res.png