SET PATH=E:\builds\release-1916\bin;E:\builds\release-1916\bin\curl;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX86\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft SDKs\TypeScript\3.1;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX86\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft SDKs\TypeScript\3.1;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ActiveTcl\bin;C:\Perl64\site\bin;C:\Perl64\bin;C:\Program Files\Microsoft MPI\Bin\;E:\app\szekeres\product\11.2.0\dbhome_1\bin;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PrivateAssemblies\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\WINDOWS\system32\config\systemprofile\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Microsoft SDKs\TypeScript\1.0\;C:\Program Files\nodejs\;C:\Program Files (x86)\Microsoft Team Foundation Server 2015 Power Tools\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Microsoft Network Monitor 3\;C:\Program Files\dotnet\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;;C:\Program Files\7-Zip;C:\Program Files (x86)\Certum\proCertum CardManager;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\dotnet\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Users\szekeres\AppData\Roaming\npm;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\AppData\Local\Programs\Fiddler;C:\Users\szekeres\.dotnet\tools;;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja if exist E:\builds\release-1916\bin\curl\curl.exe E:\builds\release-1916\bin\curl\curl.exe -o E:\builds\release-1916\bin\curl\curl-ca-bundle.crt "https://curl.haxx.se/ca/cacert.pem" set TERM=msys set "PATH=E:\Git\bin;%PATH%" cd ..\sdk\vc15\mapserver git reset --hard HEAD HEAD is now at 611ab86b Merge pull request #6091 from rouault/wfs_intersects_envelope git pull origin Updating 611ab86b..e0f3ae29 Fast-forward .travis.yml | 12 +- Makefile | 2 +- Vagrantfile | 5 +- appveyor.yml | 31 +- ci/travis/after_success.sh | 2 +- ci/travis/before_install.sh | 20 +- ci/travis/script.sh | 31 +- mapcairo.c | 11 + maplabel.c | 10 + mapmetadata.c | 3 + mapogcfilter.cpp | 2 +- mapows.c | 2 + mapows.h | 4 +- mapparser.h | 8 +- mapscript/java/CMakeLists.txt | 8 +- mapscript/phpng/CMakeLists.txt | 2 + mapscript/phpng/php7module.i | 2 + mapscript/python/CMakeLists.txt | 4 +- mapscript/python/examples/project_csv.py | 144 ++++---- mapscript/python/examples/shpdump.py | 188 +++++----- mapscript/python/examples/shpinfo.py | 218 +++++------ mapscript/python/examples/wxs.py | 122 +++--- mapscript/python/pymodule.i | 6 +- mapserver.h | 1 + mapwms.cpp | 17 +- msautotest/gdal/expected/256_overlay_res.png | Bin 3171 -> 3171 bytes msautotest/gdal/expected/deferred.png | Bin 3447 -> 3458 bytes msautotest/gdal/expected/grayalpha.png | Bin 2413 -> 2410 bytes msautotest/gdal/expected/grayalpha_8bit.png | Bin 2413 -> 2410 bytes msautotest/gdal/expected/grayalpha_plug.png | Bin 4475 -> 4497 bytes msautotest/gdal/expected/nodata_8bit.png | Bin 2259 -> 2290 bytes msautotest/gdal/expected/offsite_pct_rgb.png | Bin 3411 -> 3245 bytes msautotest/gdal/expected/offsite_pct_rgb_torgb.png | Bin 3411 -> 3245 bytes msautotest/gdal/expected/rgb_overlay.png | Bin 1747 -> 1747 bytes msautotest/gdal/expected/rgb_overlay_plug.png | Bin 2678 -> 2680 bytes msautotest/gdal/expected/rgb_overlay_res.png | Bin 2983 -> 2985 bytes .../gdal/expected/rgb_overlay_res_to8bit.png | Bin 2552 -> 2543 bytes .../expected/rgb_overlay_res_to8bit_dithered.png | Bin 2552 -> 2543 bytes msautotest/gdal/expected/rgba_overlay_res.png | Bin 2805 -> 2797 bytes msautotest/misc/expected/geopdf-iso.pdf | Bin 2284 -> 2257 bytes msautotest/misc/expected/geopdf-ogc.pdf | Bin 1949 -> 1958 bytes msautotest/pymod/mstestlib.py | 2 + msautotest/renderers/expected/average_rgb.pdf | Bin 1404 -> 1362 bytes msautotest/renderers/expected/average_rgb.svg | 4 +- .../renderers/expected/baseline_text.cairo.png | Bin 1721 -> 1710 bytes msautotest/renderers/expected/baseline_text.pdf | Bin 3042 -> 2988 bytes msautotest/renderers/expected/chartlayer_bar.pdf | 40 +- .../renderers/expected/chartlayer_pie.cairo.png | Bin 2411 -> 2428 bytes msautotest/renderers/expected/chartlayer_pie.pdf | Bin 1678 -> 1642 bytes .../renderers/expected/chartlayer_pie2.cairo.png | Bin 1879 -> 1888 bytes msautotest/renderers/expected/chartlayer_pie2.pdf | Bin 1608 -> 1568 bytes .../expected/chartlayer_pie_expressions.cairo.png | Bin 3660 -> 3577 bytes .../expected/chartlayer_pie_expressions.pdf | Bin 2619 -> 2563 bytes msautotest/renderers/expected/chartlayer_vbar.pdf | 41 ++- .../renderers/expected/circle_layer.cairo.png | Bin 584 -> 591 bytes msautotest/renderers/expected/circle_layer.pdf | Bin 1561 -> 1542 bytes msautotest/renderers/expected/compositing.pdf | Bin 3525 -> 2665 bytes msautotest/renderers/expected/compositing.svg | 6 +- .../renderers/expected/embed_legend.cairo.png | Bin 5644 -> 5623 bytes .../renderers/expected/embed_legend_rgba.cairo.png | Bin 6076 -> 6065 bytes .../expected/embed_legend_rgba_tr.cairo.png | Bin 6076 -> 6065 bytes .../renderers/expected/embed_legend_tr.cairo.png | Bin 5656 -> 5644 bytes .../renderers/expected/embed_sb_rgb.cairo.png | Bin 1317 -> 1305 bytes .../renderers/expected/embed_sb_rgb_tr.cairo.png | Bin 1345 -> 1336 bytes .../renderers/expected/embed_sb_rgba.cairo.png | Bin 1412 -> 1394 bytes .../expected/embed_sb_rgba_offset.cairo.png | Bin 1413 -> 1394 bytes .../renderers/expected/embed_sb_rgba_tr.cairo.png | Bin 1045 -> 1021 bytes msautotest/renderers/expected/empty.pdf | Bin 951 -> 915 bytes .../expected/entity_encoded_follow_text.cairo.png | Bin 27554 -> 27197 bytes .../expected/entity_encoded_follow_text.pdf | Bin 59546 -> 59458 bytes .../expected/geomtransform-vertex-layer.cairo.png | Bin 7725 -> 7740 bytes .../expected/geomtransform-vertex-layer.pdf | Bin 1141 -> 1101 bytes .../expected/geomtransform-vertex.cairo.png | Bin 15696 -> 15506 bytes .../renderers/expected/geomtransform-vertex.pdf | Bin 2215 -> 2173 bytes msautotest/renderers/expected/grid.cairo.png | Bin 24277 -> 24216 bytes msautotest/renderers/expected/grid.pdf | Bin 18574 -> 18666 bytes .../expected/label-align-center.cairo.png | Bin 2319 -> 2361 bytes .../expected/label-align-default.cairo.png | Bin 2377 -> 2402 bytes .../renderers/expected/label-align-left.cairo.png | Bin 2363 -> 2394 bytes .../renderers/expected/label-align-right.cairo.png | Bin 2381 -> 2403 bytes .../renderers/expected/label-multifont.cairo.png | Bin 4804 -> 4810 bytes msautotest/renderers/expected/label-multifont.pdf | Bin 13483 -> 13471 bytes .../expected/label_ar-align-center.cairo.png | Bin 1313 -> 1320 bytes .../expected/label_ar-align-default.cairo.png | Bin 1353 -> 1347 bytes .../expected/label_ar-align-left.cairo.png | Bin 1350 -> 1329 bytes .../expected/label_ar-align-right.cairo.png | Bin 1353 -> 1347 bytes .../renderers/expected/label_noclip.cairo.png | Bin 3284 -> 3229 bytes msautotest/renderers/expected/label_noclip.pdf | Bin 9317 -> 9260 bytes .../renderers/expected/labelcacheoff.cairo.png | Bin 11424 -> 11298 bytes msautotest/renderers/expected/labelcacheoff.pdf | Bin 9218 -> 9261 bytes msautotest/renderers/expected/labelpnt.cairo.png | Bin 5144 -> 5113 bytes msautotest/renderers/expected/labelpnt.pdf | Bin 9776 -> 9674 bytes msautotest/renderers/expected/labelrot.cairo.png | Bin 13583 -> 13772 bytes msautotest/renderers/expected/labelrot.pdf | Bin 23864 -> 23538 bytes .../renderers/expected/labels-anno.cairo.png | Bin 14208 -> 14138 bytes msautotest/renderers/expected/labels-anno.pdf | Bin 38734 -> 38771 bytes .../renderers/expected/labels-leader.cairo.png | Bin 11819 -> 11844 bytes msautotest/renderers/expected/labels-leader.pdf | Bin 35668 -> 35646 bytes .../expected/labels-min-distance.cairo.png | Bin 38025 -> 37084 bytes .../renderers/expected/labels-min-distance.pdf | Bin 30378 -> 30496 bytes msautotest/renderers/expected/labels.cairo.png | Bin 12556 -> 12481 bytes msautotest/renderers/expected/labels.pdf | Bin 34618 -> 34582 bytes msautotest/renderers/expected/legend.cairo.png | Bin 13024 -> 13076 bytes msautotest/renderers/expected/legend.pdf | Bin 56274 -> 56463 bytes .../expected/legend_label_offset.cairo.png | Bin 19196 -> 19404 bytes .../renderers/expected/legend_label_offset.pdf | Bin 56838 -> 57075 bytes .../expected/legend_sizeunits_meters.cairo.png | Bin 12495 -> 12525 bytes .../renderers/expected/legend_sizeunits_meters.pdf | Bin 56130 -> 56411 bytes .../renderers/expected/line_anchorpoint.cairo.png | Bin 4381 -> 4246 bytes .../renderers/expected/line_label_auto.cairo.png | Bin 11731 -> 11554 bytes msautotest/renderers/expected/line_label_auto.pdf | Bin 10531 -> 10618 bytes .../renderers/expected/line_label_auto2.cairo.png | Bin 8206 -> 8012 bytes msautotest/renderers/expected/line_label_auto2.pdf | Bin 23454 -> 23406 bytes .../renderers/expected/line_label_follow.cairo.png | Bin 26876 -> 25893 bytes .../renderers/expected/line_label_follow.pdf | Bin 162712 -> 162508 bytes .../expected/line_label_follow_offsetted.cairo.png | Bin 11898 -> 11762 bytes .../expected/line_label_follow_offsetted.pdf | Bin 7429 -> 7390 bytes .../expected/line_label_follow_retry.cairo.png | Bin 101158 -> 95151 bytes .../renderers/expected/line_label_follow_retry.pdf | Bin 256050 -> 255604 bytes .../expected/line_marker_pixmap.cairo.png | Bin 8082 -> 8026 bytes .../renderers/expected/line_marker_pixmap.pdf | Bin 2425 -> 2389 bytes .../renderers/expected/line_marker_svg.cairo.png | Bin 16072 -> 16006 bytes msautotest/renderers/expected/line_marker_svg.pdf | Bin 55815 -> 69616 bytes msautotest/renderers/expected/line_marker_svg.png | Bin 13592 -> 13593 bytes .../expected/line_marker_truetype.cairo.png | Bin 15194 -> 15216 bytes .../renderers/expected/line_marker_truetype.pdf | Bin 28386 -> 28306 bytes .../expected/line_marker_vector.cairo.png | Bin 17657 -> 17614 bytes .../renderers/expected/line_marker_vector.pdf | Bin 4035 -> 4001 bytes .../renderers/expected/line_offset.cairo.png | Bin 18831 -> 17834 bytes msautotest/renderers/expected/line_offset.pdf | Bin 1949 -> 1913 bytes .../renderers/expected/line_pattern.cairo.png | Bin 6783 -> 6780 bytes msautotest/renderers/expected/line_pattern.pdf | Bin 1214 -> 1175 bytes .../expected/line_pattern_offset.cairo.png | Bin 13600 -> 11743 bytes .../renderers/expected/line_pattern_offset.pdf | 42 ++- .../renderers/expected/line_short_gap.cairo.png | Bin 1203 -> 1182 bytes msautotest/renderers/expected/line_short_gap.pdf | Bin 1159 -> 1117 bytes .../renderers/expected/line_simple.cairo.jpg | Bin 8708 -> 8698 bytes .../renderers/expected/line_simple.cairo.png | Bin 6028 -> 5920 bytes msautotest/renderers/expected/line_simple.pdf | Bin 1208 -> 1167 bytes .../renderers/expected/lots_of_text.cairo.png | Bin 114585 -> 115894 bytes .../expected/marker_anchorpoint.cairo.png | Bin 13099 -> 12832 bytes .../renderers/expected/marker_anchorpoint.pdf | Bin 8167 -> 8111 bytes .../renderers/expected/marker_pixmap.cairo.png | Bin 4578 -> 4575 bytes msautotest/renderers/expected/marker_pixmap.pdf | Bin 2045 -> 1999 bytes msautotest/renderers/expected/mask.cairo.png | Bin 15565 -> 15579 bytes .../renderers/expected/mask_opacity.cairo.png | Bin 17042 -> 16918 bytes .../renderers/expected/multilabel-leader.cairo.png | Bin 41947 -> 41968 bytes .../renderers/expected/multilabel-leader.pdf | Bin 46415 -> 46341 bytes msautotest/renderers/expected/multilabel.cairo.png | Bin 5497 -> 5560 bytes msautotest/renderers/expected/multilabel.pdf | Bin 16364 -> 16546 bytes .../renderers/expected/nodata_8bit.cairo.png | Bin 1953 -> 1953 bytes msautotest/renderers/expected/nodata_8bit.pdf | Bin 3013 -> 2972 bytes msautotest/renderers/expected/nodata_8bit.png | Bin 1953 -> 1953 bytes msautotest/renderers/expected/nodata_8bit.svg | 2 +- .../renderers/expected/plb_embed_legend.cairo.png | Bin 3087 -> 3089 bytes .../expected/plb_embed_legend_rgba.cairo.png | Bin 3623 -> 3638 bytes .../expected/plb_embed_legend_rgba_tr.cairo.png | Bin 3623 -> 3638 bytes .../expected/plb_embed_legend_tr.cairo.png | Bin 3490 -> 3488 bytes .../renderers/expected/point-polaroffset.cairo.png | Bin 2106 -> 2070 bytes .../renderers/expected/point-polaroffset.pdf | Bin 1341 -> 1307 bytes .../renderers/expected/point_ellipse.cairo.png | Bin 2052 -> 2044 bytes msautotest/renderers/expected/point_ellipse.pdf | Bin 1214 -> 1173 bytes .../renderers/expected/point_pixmap.cairo.png | Bin 5496 -> 5488 bytes msautotest/renderers/expected/point_pixmap.pdf | Bin 3887 -> 3843 bytes .../renderers/expected/point_pixmap_gif.cairo.png | Bin 5110 -> 5105 bytes msautotest/renderers/expected/point_pixmap_gif.pdf | Bin 2956 -> 2914 bytes msautotest/renderers/expected/point_svg.cairo.png | Bin 6938 -> 6818 bytes msautotest/renderers/expected/point_svg.pdf | Bin 3532 -> 3483 bytes msautotest/renderers/expected/point_svg.png | Bin 6903 -> 6777 bytes .../renderers/expected/point_truetype.cairo.png | Bin 1263 -> 1248 bytes msautotest/renderers/expected/point_truetype.pdf | Bin 1690 -> 1672 bytes .../renderers/expected/point_vector.cairo.png | Bin 887 -> 849 bytes msautotest/renderers/expected/point_vector.pdf | Bin 1152 -> 1112 bytes .../poly-label-multiline-pos-auto.cairo.png | Bin 8485 -> 8482 bytes .../expected/poly-label-multiline-pos-auto.pdf | Bin 22443 -> 22433 bytes .../expected/poly-label-pos-auto.cairo.png | Bin 4206 -> 4261 bytes .../renderers/expected/poly-label-pos-auto.pdf | Bin 8079 -> 8049 bytes .../expected/poly_geomtransform_anchor.cairo.png | Bin 19051 -> 19032 bytes .../expected/poly_geomtransform_anchor.pdf | Bin 2075 -> 2031 bytes .../expected/polygon-as-line-offset.cairo.png | Bin 6051 -> 5530 bytes .../renderers/expected/polygon-as-line-offset.pdf | Bin 4502 -> 4457 bytes .../renderers/expected/polygon-as-line.cairo.png | Bin 4869 -> 4802 bytes msautotest/renderers/expected/polygon-as-line.pdf | Bin 3232 -> 3192 bytes msautotest/renderers/expected/polygon-as-line.svg | 2 +- .../expected/polygon-hatch-dashed.cairo.png | Bin 4285 -> 4129 bytes .../renderers/expected/polygon-hatch-dashed.pdf | Bin 2483 -> 2433 bytes .../renderers/expected/polygon-hatch.cairo.png | Bin 6390 -> 5967 bytes msautotest/renderers/expected/polygon-hatch.pdf | Bin 3694 -> 3660 bytes .../renderers/expected/polygon-pixmap.cairo.png | Bin 4506 -> 4465 bytes msautotest/renderers/expected/polygon-pixmap.pdf | Bin 4669 -> 4577 bytes msautotest/renderers/expected/polygon-pixmap.svg | 2 +- .../renderers/expected/polygon-simple.cairo.png | Bin 4407 -> 4350 bytes msautotest/renderers/expected/polygon-simple.pdf | Bin 8558 -> 8665 bytes .../renderers/expected/polygon-ttf.cairo.png | Bin 3929 -> 3912 bytes msautotest/renderers/expected/polygon-ttf.pdf | Bin 3853 -> 3809 bytes msautotest/renderers/expected/polygon-ttf.svg | 4 +- .../renderers/expected/polygon-vector.cairo.png | Bin 3885 -> 3858 bytes msautotest/renderers/expected/polygon-vector.pdf | Bin 3980 -> 3935 bytes msautotest/renderers/expected/polygon-vector.svg | 4 +- msautotest/renderers/expected/raster_simple.pdf | Bin 2195 -> 2154 bytes .../renderers/expected/raster_simple_opacity.pdf | Bin 3523 -> 2663 bytes .../renderers/expected/raster_simple_opacity.svg | 6 +- msautotest/renderers/expected/reproj.pdf | Bin 2984 -> 2946 bytes msautotest/renderers/expected/reproj.svg | 4 +- .../renderers/expected/rgb_overlay.cairo.png | Bin 1243 -> 1250 bytes msautotest/renderers/expected/rgb_overlay.pdf | Bin 4019 -> 3978 bytes msautotest/renderers/expected/rgb_overlay.png | Bin 1243 -> 1250 bytes msautotest/renderers/expected/rgb_overlay.svg | 2 +- .../renderers/expected/rgb_overlay_res.cairo.png | Bin 1427 -> 1430 bytes msautotest/renderers/expected/rgb_overlay_res.pdf | Bin 4581 -> 4540 bytes msautotest/renderers/expected/rgb_overlay_res.png | Bin 1427 -> 1430 bytes msautotest/renderers/expected/rgb_overlay_res.svg | 8 +- .../expected/rgb_overlay_res_to8bit.cairo.png | Bin 1427 -> 1430 bytes .../renderers/expected/rgb_overlay_res_to8bit.pdf | Bin 4581 -> 4540 bytes .../renderers/expected/rgb_overlay_res_to8bit.png | Bin 1427 -> 1430 bytes .../renderers/expected/rgb_overlay_res_to8bit.svg | 8 +- .../rgb_overlay_res_to8bit_dithered.cairo.png | Bin 1427 -> 1430 bytes .../expected/rgb_overlay_res_to8bit_dithered.pdf | Bin 4581 -> 4540 bytes .../expected/rgb_overlay_res_to8bit_dithered.png | Bin 1427 -> 1430 bytes .../expected/rgb_overlay_res_to8bit_dithered.svg | 8 +- .../renderers/expected/rgba_overlay_res.cairo.png | Bin 2289 -> 2292 bytes msautotest/renderers/expected/rgba_overlay_res.pdf | Bin 5122 -> 5080 bytes msautotest/renderers/expected/rgba_overlay_res.png | Bin 2289 -> 2292 bytes msautotest/renderers/expected/rgba_overlay_res.svg | 8 +- .../renderers/expected/text_shaping_1.cairo.png | Bin 4962 -> 4987 bytes msautotest/renderers/expected/text_shaping_1.pdf | Bin 13386 -> 13287 bytes .../renderers/expected/transparent_layer.cairo.png | Bin 4003 -> 3726 bytes .../renderers/expected/transparent_layer.pdf | Bin 2999 -> 2132 bytes .../renderers/expected/transparent_layer.svg | 6 +- msautotest/renderers/expected/uvraster.cairo.png | Bin 51969 -> 51671 bytes msautotest/renderers/expected/uvraster.pdf | Bin 11483 -> 11506 bytes .../renderers/expected/uvraster_reproj.cairo.png | Bin 50015 -> 49834 bytes msautotest/renderers/expected/uvraster_reproj.pdf | Bin 10667 -> 10588 bytes msautotest/renderers/expected/wld_rotate.pdf | Bin 6807 -> 6769 bytes msautotest/renderers/expected/wld_rotate.svg | 4 +- msautotest/renderers/expected/wld_upsidedown.pdf | Bin 2613 -> 2572 bytes msautotest/renderers/expected/wld_upsidedown.svg | 4 +- msautotest/renderers/expected/wmsclient.pdf | Bin 55333 -> 55291 bytes msautotest/sld/expected/map_linemark.png | Bin 48423 -> 48289 bytes msautotest/sld/expected/sld_linemark.png | Bin 48423 -> 48289 bytes msautotest/sld/expected/sld_url_linemark.png | Bin 48423 -> 48289 bytes ...ws_metadata_wfs_capabilities110.xml.alternative | 167 +++++++++ ...ws_metadata_wfs_capabilities200.xml.alternative | 368 ++++++++++++++++++ msautotest/wxs/expected/wcs11_post_getcov_grd.dat | 2 +- .../wxs/expected/wcs11_post_getcov_grd_4326.dat | 2 +- .../expected/wcs11_post_getcov_grd_imagecrs.dat | 2 +- .../wxs/expected/wcs11_post_getcov_grd_wgs84.dat | 2 +- msautotest/wxs/expected/wcs_20_getcov_grd.dat | 2 +- msautotest/wxs/expected/wcs_20_getcov_grd_mp.dat | 2 +- .../expected/wcs_20_getcov_gtiff_compress_jpeg.tif | Bin 1028 -> 959 bytes .../wxs/expected/wcs_20_getcov_outputcrs.tif | Bin 1618 -> 1619 bytes msautotest/wxs/expected/wcs_20_getcov_reproj.dat | Bin 4626 -> 4626 bytes msautotest/wxs/expected/wcs_20_getcov_reproj.tif | Bin 539 -> 540 bytes ..._getcov_reproj_scaling_resolution_trim_both.tif | Bin 1418 -> 1419 bytes ...wcs_20_getcov_reproj_scaling_size_trim_both.tif | Bin 1618 -> 1619 bytes .../wxs/expected/wcs_20_getcov_subsettingcrs.tif | Bin 539 -> 540 bytes .../wxs/expected/wcs_20_post_getcov_reproj.tif | Bin 539 -> 540 bytes ..._getcov_reproj_scaling_resolution_trim_both.tif | Bin 1418 -> 1419 bytes ...0_post_getcov_reproj_scaling_size_trim_both.tif | Bin 1618 -> 1619 bytes .../wcs_20_post_getcov_subsettingcrs_outputcrs.tif | Bin 443 -> 444 bytes .../wxs/expected/wcs_get_caps.xml.alternative | 116 ++++++ msautotest/wxs/expected/wcs_getcov_grd_11.dat | 2 +- msautotest/wxs/expected/wcs_getcov_grd_11_4326.dat | 2 +- .../wxs/expected/wcs_getcov_grd_11_imagecrs.dat | 2 +- .../wxs/expected/wcs_getcov_grd_11_wgs84.dat | 2 +- ...nput_output_wcs11_get_coverage.grb2.alternative | Bin 0 -> 6644 bytes ...grib_output_wcs11_get_coverage.grb2.alternative | Bin 0 -> 6644 bytes msautotest/wxs/expected/wcs_mask_20_getcov_grd.dat | 2 +- .../wxs/expected/wcs_mask_20_getcov_grd_mp.dat | 2 +- .../wxs/expected/wcs_mask_20_getcov_reproj.dat | Bin 4626 -> 4626 bytes .../wxs/expected/wcs_mask_20_getcov_reproj.tif | Bin 539 -> 540 bytes ..._getcov_reproj_scaling_resolution_trim_both.tif | Bin 1418 -> 1419 bytes ...ask_20_getcov_reproj_scaling_size_trim_both.tif | Bin 1618 -> 1619 bytes msautotest/wxs/expected/wcs_mask_getcov_grd_11.dat | 2 +- .../wxs/expected/wcs_mask_getcov_grd_11_4326.dat | 2 +- .../expected/wcs_mask_getcov_grd_11_imagecrs.dat | 2 +- .../wxs/expected/wcs_mask_getcov_grd_11_wgs84.dat | 2 +- msautotest/wxs/expected/wfs11_cap.xml.alternative | 152 ++++++++ .../wxs/expected/wfs11_cap_ogr.xml.alternative | 152 ++++++++ .../wfs11_caps_updatesequence.xml.alternative | 152 ++++++++ .../wfs11_caps_updatesequence_ogr.xml.alternative | 152 ++++++++ .../wfs11_test_xml_escaping.xml.alternative | 148 ++++++++ msautotest/wxs/expected/wfs20_cap.xml.alternative | 350 ++++++++++++++++++ .../wfs20_test_xml_escaping.xml.alternative | 346 +++++++++++++++++ .../wxs/expected/wfs_200_caps.xml.alternative | 354 ++++++++++++++++++ .../expected/wfs_200_caps_post_kvp.xml.alternative | 354 ++++++++++++++++++ .../wfs_200_caps_sections_all.xml.alternative | 354 ++++++++++++++++++ ...caps_sections_feature_type_list.xml.alternative | 24 ++ .../expected/wfs_200_insipire_caps.xml.alternative | 409 ++++++++++++++++++++ .../wfs_200_insipire_caps_eng.xml.alternative | 409 ++++++++++++++++++++ .../wfs_200_insipire_caps_fre.xml.alternative | 410 +++++++++++++++++++++ .../wfs_200_insipire_caps_unk.xml.alternative | 409 ++++++++++++++++++++ ...fs_200_insipire_missing_md_caps.xml.alternative | 399 ++++++++++++++++++++ ...wfs_200_insipire_scenario1_caps.xml.alternative | 376 +++++++++++++++++++ .../wxs/expected/wfs_filter_projmeter_disjoint.xml | 2 +- ...fs_multiple_metadataurl_110_cap.xml.alternative | 153 ++++++++ ...fs_multiple_metadataurl_200_cap.xml.alternative | 351 ++++++++++++++++++ msautotest/wxs/expected/wfs_ogr_native_sql_36.xml | 41 ++- msautotest/wxs/expected/wfs_ogr_native_sql_40.xml | 30 +- msautotest/wxs/expected/wfsogr10_bnazip.zip | Bin 319 -> 339 bytes msautotest/wxs/expected/wfsogr10_csvstream.txt | 2 +- msautotest/wxs/expected/wfsogr10_nullnumeric.xml | 4 +- msautotest/wxs/expected/wfsogr10_shapezip.zip | Bin 1044 -> 1127 bytes .../wxs/expected/wfsogr11_caps.xml.alternative | 264 +++++++++++++ msautotest/wxs/expected/wfsogr11_ogrcsv.xml | 20 +- .../wxs/expected/wfsogr_addfiles_onelayer.zip | Bin 827 -> 907 bytes .../wxs/expected/wfsogr_wms_getfeatureinfo.xml | 2 +- msautotest/wxs/expected/wms_contour_layer_ti.png | Bin 15770 -> 15781 bytes .../wxs/expected/wms_get_map_ext_sld_fileproto.xml | 2 +- .../wxs/expected/wms_get_map_ext_sld_proto.xml | 2 +- msautotest/wxs/expected/wms_get_map_polygon.kmz | Bin 19917 -> 19937 bytes .../expected/wms_get_map_symbol_ext_svg_sld.png | Bin 2044 -> 2038 bytes .../expected/wms_time_multi_ranges_reso_hour.png | Bin 2889 -> 2909 bytes .../wms_time_multi_ranges_reso_hour_postgis.png | Bin 2889 -> 2909 bytes msautotest/wxs/expected/wms_time_multi_reverse.png | Bin 1955 -> 1982 bytes .../expected/wms_time_multi_reverse_postgis.png | Bin 1955 -> 1982 bytes msautotest/wxs/expected/wms_time_no_time_param.png | Bin 2889 -> 2909 bytes .../expected/wms_time_no_time_param_postgis.png | Bin 2889 -> 2909 bytes .../wms_uvraster_lonwrap180_accross_hemisphere.png | Bin 43202 -> 41751 bytes ...r_lonwrap180_accross_hemisphere.png.alternative | Bin 0 -> 34236 bytes .../wms_uvraster_lonwrap180_east_hemisphere.png | Bin 44548 -> 43829 bytes ...ster_lonwrap180_east_hemisphere.png.alternative | Bin 0 -> 36617 bytes ...ster_lonwrap180_west_hemisphere.png.alternative | Bin 0 -> 35303 bytes .../wms_uvraster_lonwrap180_whole_world.png | Bin 87317 -> 86289 bytes ...uvraster_lonwrap180_whole_world.png.alternative | Bin 0 -> 84814 bytes renderers/agg/include/agg_conv_curve.h | 4 +- renderers/agg/include/agg_rasterizer_scanline_aa.h | 4 +- scripts/vagrant/mapserver.sh | 14 +- scripts/vagrant/packages.sh | 21 +- scripts/vagrant/postgis.sh | 4 +- scripts/vagrant/proj6.sh | 17 - 331 files changed, 7037 insertions(+), 595 deletions(-) create mode 100644 msautotest/wxs/expected/ows_metadata_wfs_capabilities110.xml.alternative create mode 100644 msautotest/wxs/expected/ows_metadata_wfs_capabilities200.xml.alternative create mode 100644 msautotest/wxs/expected/wcs_get_caps.xml.alternative create mode 100644 msautotest/wxs/expected/wcs_grib_input_output_wcs11_get_coverage.grb2.alternative create mode 100644 msautotest/wxs/expected/wcs_grib_output_wcs11_get_coverage.grb2.alternative create mode 100644 msautotest/wxs/expected/wfs11_cap.xml.alternative create mode 100644 msautotest/wxs/expected/wfs11_cap_ogr.xml.alternative create mode 100644 msautotest/wxs/expected/wfs11_caps_updatesequence.xml.alternative create mode 100644 msautotest/wxs/expected/wfs11_caps_updatesequence_ogr.xml.alternative create mode 100644 msautotest/wxs/expected/wfs11_test_xml_escaping.xml.alternative create mode 100644 msautotest/wxs/expected/wfs20_cap.xml.alternative create mode 100644 msautotest/wxs/expected/wfs20_test_xml_escaping.xml.alternative create mode 100644 msautotest/wxs/expected/wfs_200_caps.xml.alternative create mode 100644 msautotest/wxs/expected/wfs_200_caps_post_kvp.xml.alternative create mode 100644 msautotest/wxs/expected/wfs_200_caps_sections_all.xml.alternative create mode 100644 msautotest/wxs/expected/wfs_200_caps_sections_feature_type_list.xml.alternative create mode 100644 msautotest/wxs/expected/wfs_200_insipire_caps.xml.alternative create mode 100644 msautotest/wxs/expected/wfs_200_insipire_caps_eng.xml.alternative create mode 100644 msautotest/wxs/expected/wfs_200_insipire_caps_fre.xml.alternative create mode 100644 msautotest/wxs/expected/wfs_200_insipire_caps_unk.xml.alternative create mode 100644 msautotest/wxs/expected/wfs_200_insipire_missing_md_caps.xml.alternative create mode 100644 msautotest/wxs/expected/wfs_200_insipire_scenario1_caps.xml.alternative create mode 100644 msautotest/wxs/expected/wfs_multiple_metadataurl_110_cap.xml.alternative create mode 100644 msautotest/wxs/expected/wfs_multiple_metadataurl_200_cap.xml.alternative create mode 100644 msautotest/wxs/expected/wfsogr11_caps.xml.alternative create mode 100644 msautotest/wxs/expected/wms_uvraster_lonwrap180_accross_hemisphere.png.alternative create mode 100644 msautotest/wxs/expected/wms_uvraster_lonwrap180_east_hemisphere.png.alternative create mode 100644 msautotest/wxs/expected/wms_uvraster_lonwrap180_west_hemisphere.png.alternative create mode 100644 msautotest/wxs/expected/wms_uvraster_lonwrap180_whole_world.png.alternative delete mode 100755 scripts/vagrant/proj6.sh git reset --hard HEAD HEAD is now at e0f3ae29 Merge pull request #6120 from szekerest/issue_6119 git log --pretty=format:%H -n 1 > E:\builds\release-1916\doc\ms_revision.txt