Permalink
Browse files

msResampleGDALToMap(): fix issue that cause line pattern in image mos…

…aic (#1715)
  • Loading branch information...
rouault committed Jan 17, 2017
1 parent 506c173 commit 026847b1c962cdd666d28cfbe38ac40fff54ffbb
Showing with 989 additions and 977 deletions.
  1. +12 −0 mapresample.c
  2. BIN msautotest/gdal/expected/average_rgb.png
  3. BIN msautotest/gdal/expected/average_rgb_plug.png
  4. BIN msautotest/gdal/expected/wmsclient_3543.png
  5. BIN msautotest/misc/expected/runtime_sub_test012.png
  6. BIN msautotest/misc/expected/runtime_sub_test013.png
  7. BIN msautotest/renderers/expected/average_rgb.cairo.png
  8. BIN msautotest/renderers/expected/average_rgb.pdf
  9. BIN msautotest/renderers/expected/average_rgb.png
  10. +1 −1 msautotest/renderers/expected/average_rgb.svg
  11. BIN msautotest/renderers/expected/rgb_overlay_res.cairo.png
  12. BIN msautotest/renderers/expected/rgb_overlay_res.pdf
  13. BIN msautotest/renderers/expected/rgb_overlay_res.png
  14. +1 −1 msautotest/renderers/expected/rgb_overlay_res.svg
  15. BIN msautotest/renderers/expected/rgb_overlay_res_to8bit.cairo.png
  16. BIN msautotest/renderers/expected/rgb_overlay_res_to8bit.pdf
  17. BIN msautotest/renderers/expected/rgb_overlay_res_to8bit.png
  18. +1 −1 msautotest/renderers/expected/rgb_overlay_res_to8bit.svg
  19. BIN msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.cairo.png
  20. BIN msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.pdf
  21. BIN msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.png
  22. +1 −1 msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.svg
  23. BIN msautotest/renderers/expected/rgba_overlay_res.cairo.png
  24. BIN msautotest/renderers/expected/rgba_overlay_res.pdf
  25. BIN msautotest/renderers/expected/rgba_overlay_res.png
  26. +1 −1 msautotest/renderers/expected/rgba_overlay_res.svg
  27. BIN msautotest/renderers/expected/uvraster.cairo.png
  28. BIN msautotest/renderers/expected/uvraster.pdf
  29. BIN msautotest/renderers/expected/uvraster.png
  30. +484 −484 msautotest/renderers/expected/uvraster.svg
  31. BIN msautotest/renderers/expected/uvraster_reproj.cairo.png
  32. BIN msautotest/renderers/expected/uvraster_reproj.pdf
  33. BIN msautotest/renderers/expected/uvraster_reproj.png
  34. +484 −484 msautotest/renderers/expected/uvraster_reproj.svg
  35. BIN msautotest/wxs/expected/wcs11_post_getcov_gdpng8.dat
  36. +1 −1 msautotest/wxs/expected/wcs11_post_getcov_grd_4326.dat
  37. +1 −1 msautotest/wxs/expected/wcs11_post_getcov_grd_wgs84.dat
  38. +1 −1 msautotest/wxs/expected/wcs_getcov_grd_11_4326.dat
  39. +1 −1 msautotest/wxs/expected/wcs_getcov_grd_11_wgs84.dat
  40. BIN msautotest/wxs/expected/wcs_getcov_png8_11.dat
View
@@ -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",
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12pt" height="9pt" viewBox="0 0 12 9" version="1.1">
<defs>
-<image id="image11" width="12" height="9" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAJCAIAAACJ2loDAAAABmJLR0QA/wD/AP+gvaeTAAAAc0lEQVQYlWPk+sZAELDIPCFCkeptKEtGMYKdQ5SBgeHHt+dPH67Brui/FCMDBxMDAwPnD0a4IFSRyh0o65E5w09+BgYGBs7vDDJ3UBQx7nSHsv6yszMwMTIwMDD8+8f88xeKontKhB3O+IeZCEX/CathAADZzxtT6ePwlgAAAABJRU5ErkJggg=="/>
+<image id="image11" width="12" height="9" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAJCAIAAACJ2loDAAAABmJLR0QA/wD/AP+gvaeTAAAAcUlEQVQYlY2OQQpAUBRFzyvlswADKaVYgwVYhD3agpX4EwpL4I88k08ZfXd0up3eu5IeBBMVqydB3lbRj9RMnoqqj00GuGPf5uEj1dbTlYMBMCdv+VyyKKAsLQ6AxFFaVJHnv4xdeLgs5Q/pkh+Shh1uDpYcPczARMQAAAAASUVORK5CYII="/>
</defs>
<g id="surface2">
<rect x="0" y="0" width="12" height="9" style="fill:rgb(100%,100%,0%);fill-opacity:1;stroke:none;"/>
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -2,7 +2,7 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200pt" height="150pt" viewBox="0 0 200 150" version="1.1">
<defs>
<image id="image11" width="200" height="150" xlink:href="data:image/png;base64,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"/>
-<image id="image19" width="200" height="150" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACWCAYAAACb3McZAAAABmJLR0QA/wD/AP+gvaeTAAACYElEQVR4nO3dwU0lQRBEwRr4nuEHxuEHpsGsAYvygJTMFERYUFLqqY99zMwc55wD/OcxM/P0efUZcE8CgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCD4dYG8v8xx9Q0/5eXdx0dtvy6Qv8RufQJZzG59AlnMbn2PmZnnj6vP4Dvs1ucFWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn3HzMzb65xXHwJ35AWBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIHjMzDx/XH0G3JMXBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgOGZmzmPOqw+BO3rMzMgDvvZ09QFwZwKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgQDwPf8AeQO2Hr28J04AAAAASUVORK5CYII="/>
+<image id="image19" width="200" height="150" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACWCAYAAACb3McZAAAABmJLR0QA/wD/AP+gvaeTAAACY0lEQVR4nO3dwY0UURAFwRpYzzAE2zAE02AwAJSHlYrZgggLSnpKffWpHzMzj+c8B/jN28zMp5+vPgM+JoFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFA+OcC+f5lHq++4W/58t2Pj7b9c4H8T+y2TyCH2W2fQA6z2763mZnPP159Bu9ht31ekMPstk8gh9ltn0AOs9s+gRxmt30COcxu+wRymN32CeQwu+0TyGF22yeQw+y2TyCH2W2fQA6z2z6BHGa3fQI5zG77BHKY3fYJ5DC77RPIYXbbJ5DD7LZPIIfZbZ9ADrPbPoEcZrd9AjnMbvsEcpjd9gnkMLvtE8hhdtsnkMPstk8gh9ltn0AOs9s+gRxmt30COcxu+wRymN32CeQwu+0TyGF22yeQw+y2TyCH2W2fQA6z2z6BHGa3fQI5zG773mZmHs9Xn8F72G2fF+Qwu+0TyGF22yeQw+y2TyCH2W3fY2bm29fxuQd/4AWBIBAIAoEgEAgCgSAQCAKBIBAIAoEgEAgCgSAQCAKBIBAIAoEgEAgCgSAQCAKBIBAIAoEgEAgCgSAQCAKBIBAIAoEgEAgCgSAQCAKB8DYz8/nHq8+Aj8kLAkEgEAQCQSAQBAJBIBAEAkEgEAQCQSAQBAJBIBAEAkEgEB4zM8+Z56sPgY/o06sPgI9MIBAEAkEgEAQCQSAQBAJBIBAEAkEgEAQCQSAQBAJBIBAEAkEgEAQCQSAQBAJBIBAEAkEgEH4Bapu2IMvTlR4AAAAASUVORK5CYII="/>
</defs>
<g id="surface2">
<rect x="0" y="0" width="200" height="150" style="fill:rgb(100%,100%,0%);fill-opacity:1;stroke:none;"/>
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -2,7 +2,7 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200pt" height="150pt" viewBox="0 0 200 150" version="1.1">
<defs>
<image id="image11" width="200" height="150" xlink:href="data:image/png;base64,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"/>
-<image id="image19" width="200" height="150" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACWCAYAAACb3McZAAAABmJLR0QA/wD/AP+gvaeTAAACYElEQVR4nO3dwU0lQRBEwRr4nuEHxuEHpsGsAYvygJTMFERYUFLqqY99zMwc55wD/OcxM/P0efUZcE8CgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCD4dYG8v8xx9Q0/5eXdx0dtvy6Qv8RufQJZzG59AlnMbn2PmZnnj6vP4Dvs1ucFWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn3HzMzb65xXHwJ35AWBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIHjMzDx/XH0G3JMXBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgOGZmzmPOqw+BO3rMzMgDvvZ09QFwZwKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgQDwPf8AeQO2Hr28J04AAAAASUVORK5CYII="/>
+<image id="image19" width="200" height="150" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACWCAYAAACb3McZAAAABmJLR0QA/wD/AP+gvaeTAAACY0lEQVR4nO3dwY0UURAFwRpYzzAE2zAE02AwAJSHlYrZgggLSnpKffWpHzMzj+c8B/jN28zMp5+vPgM+JoFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFA+OcC+f5lHq++4W/58t2Pj7b9c4H8T+y2TyCH2W2fQA6z2763mZnPP159Bu9ht31ekMPstk8gh9ltn0AOs9s+gRxmt30COcxu+wRymN32CeQwu+0TyGF22yeQw+y2TyCH2W2fQA6z2z6BHGa3fQI5zG77BHKY3fYJ5DC77RPIYXbbJ5DD7LZPIIfZbZ9ADrPbPoEcZrd9AjnMbvsEcpjd9gnkMLvtE8hhdtsnkMPstk8gh9ltn0AOs9s+gRxmt30COcxu+wRymN32CeQwu+0TyGF22yeQw+y2TyCH2W2fQA6z2z6BHGa3fQI5zG773mZmHs9Xn8F72G2fF+Qwu+0TyGF22yeQw+y2TyCH2W3fY2bm29fxuQd/4AWBIBAIAoEgEAgCgSAQCAKBIBAIAoEgEAgCgSAQCAKBIBAIAoEgEAgCgSAQCAKBIBAIAoEgEAgCgSAQCAKBIBAIAoEgEAgCgSAQCAKB8DYz8/nHq8+Aj8kLAkEgEAQCQSAQBAJBIBAEAkEgEAQCQSAQBAJBIBAEAkEgEB4zM8+Z56sPgY/o06sPgI9MIBAEAkEgEAQCQSAQBAJBIBAEAkEgEAQCQSAQBAJBIBAEAkEgEAQCQSAQBAJBIBAEAkEgEH4Bapu2IMvTlR4AAAAASUVORK5CYII="/>
</defs>
<g id="surface2">
<rect x="0" y="0" width="200" height="150" style="fill:rgb(100%,100%,0%);fill-opacity:1;stroke:none;"/>
@@ -2,7 +2,7 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200pt" height="150pt" viewBox="0 0 200 150" version="1.1">
<defs>
<image id="image11" width="200" height="150" xlink:href="data:image/png;base64,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"/>
-<image id="image19" width="200" height="150" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACWCAYAAACb3McZAAAABmJLR0QA/wD/AP+gvaeTAAACYElEQVR4nO3dwU0lQRBEwRr4nuEHxuEHpsGsAYvygJTMFERYUFLqqY99zMwc55wD/OcxM/P0efUZcE8CgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCD4dYG8v8xx9Q0/5eXdx0dtvy6Qv8RufQJZzG59AlnMbn2PmZnnj6vP4Dvs1ucFWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn0CWcxufQJZzG59AlnMbn3HzMzb65xXHwJ35AWBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIHjMzDx/XH0G3JMXBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgOGZmzmPOqw+BO3rMzMgDvvZ09QFwZwKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgQDwPf8AeQO2Hr28J04AAAAASUVORK5CYII="/>
+<image id="image19" width="200" height="150" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAACWCAYAAACb3McZAAAABmJLR0QA/wD/AP+gvaeTAAACY0lEQVR4nO3dwY0UURAFwRpYzzAE2zAE02AwAJSHlYrZgggLSnpKffWpHzMzj+c8B/jN28zMp5+vPgM+JoFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFA+OcC+f5lHq++4W/58t2Pj7b9c4H8T+y2TyCH2W2fQA6z2763mZnPP159Bu9ht31ekMPstk8gh9ltn0AOs9s+gRxmt30COcxu+wRymN32CeQwu+0TyGF22yeQw+y2TyCH2W2fQA6z2z6BHGa3fQI5zG77BHKY3fYJ5DC77RPIYXbbJ5DD7LZPIIfZbZ9ADrPbPoEcZrd9AjnMbvsEcpjd9gnkMLvtE8hhdtsnkMPstk8gh9ltn0AOs9s+gRxmt30COcxu+wRymN32CeQwu+0TyGF22yeQw+y2TyCH2W2fQA6z2z6BHGa3fQI5zG773mZmHs9Xn8F72G2fF+Qwu+0TyGF22yeQw+y2TyCH2W3fY2bm29fxuQd/4AWBIBAIAoEgEAgCgSAQCAKBIBAIAoEgEAgCgSAQCAKBIBAIAoEgEAgCgSAQCAKBIBAIAoEgEAgCgSAQCAKBIBAIAoEgEAgCgSAQCAKB8DYz8/nHq8+Aj8kLAkEgEAQCQSAQBAJBIBAEAkEgEAQCQSAQBAJBIBAEAkEgEB4zM8+Z56sPgY/o06sPgI9MIBAEAkEgEAQCQSAQBAJBIBAEAkEgEAQCQSAQBAJBIBAEAkEgEAQCQSAQBAJBIBAEAkEgEH4Bapu2IMvTlR4AAAAASUVORK5CYII="/>
</defs>
<g id="surface2">
<rect x="0" y="0" width="200" height="150" style="fill:rgb(100%,100%,0%);fill-opacity:1;stroke:none;"/>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit 026847b

Please sign in to comment.