found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1930\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\\Extensions\Microsoft\IntelliCode\CLI;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.30.30705\bin\HostX86\x86;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\\x86;C:\Program Files (x86)\Windows Kits\10\bin\\x86;C:\Program Files\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\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\;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:\Users\szekeres\.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\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\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\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\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;C:\Program Files (x86)\dotnet\;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:\Users\szekeres\.dotnet\tools;;C:\Program Files\Azure Data Studio\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe if not exist src\mapserver-vc17 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc17 cd src\mapserver-vc17 git reset --hard HEAD HEAD is now at c046f6b4a Merge pull request #6531 from rouault/ubuntu_2004_warning_fixes git fetch git checkout main Your branch is behind 'origin/main' by 3 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating c046f6b4a..644ce9a82 Fast-forward .github/workflows/build.yml | 2 +- .github/workflows/start.sh | 8 +- .travis.yml | 20 +- CMakeLists.txt | 7 - Makefile | 7 +- Vagrantfile | 2 +- ci/travis/after_success.sh | 2 +- ci/travis/before_install.sh | 52 +- ci/travis/script.sh | 34 +- mapscript/php/CMakeLists.txt | 46 - mapscript/php/Makefile.vc | 108 - mapscript/php/README | 6 +- mapscript/php/README.WIN32 | 64 - mapscript/php/class.c | 1076 ------ mapscript/php/cluster.c | 411 --- mapscript/php/color.c | 339 -- mapscript/php/error.c | 259 -- mapscript/php/examples/phpinfo_mapscript.phtml | 28 - mapscript/php/examples/test_draw_legend_icon.phtml | 91 - mapscript/php/examples/test_draw_map.phtml | 69 - mapscript/php/examples/test_layer_mask.phtml | 113 - mapscript/php/examples/test_writeshape.phtml | 56 - mapscript/php/grid.c | 280 -- mapscript/php/hashtable.c | 369 -- mapscript/php/image.c | 431 --- mapscript/php/label.c | 895 ----- mapscript/php/labelcache.c | 198 - mapscript/php/labelcachemember.c | 283 -- mapscript/php/labelleader.c | 210 -- mapscript/php/layer.c | 2435 ------------- mapscript/php/legend.c | 337 -- mapscript/php/line.c | 505 --- mapscript/php/map.c | 3770 -------------------- mapscript/php/mapscript_error.c | 120 - mapscript/php/mapscript_i.c | 2083 ----------- mapscript/php/nmake.opt | 35 - mapscript/php/outputformat.c | 394 -- mapscript/php/owsrequest.c | 576 --- mapscript/php/php_mapscript.c | 1349 ------- mapscript/php/php_mapscript.h | 1176 ------ mapscript/php/php_mapscript_util.c | 191 - mapscript/php/php_mapscript_util.h | 364 -- mapscript/php/php_regex.c | 96 - mapscript/php/point.c | 535 --- mapscript/php/projection.c | 274 -- mapscript/php/querymap.c | 314 -- mapscript/php/rect.c | 452 --- mapscript/php/referencemap.c | 335 -- mapscript/php/result.c | 239 -- mapscript/php/scalebar.c | 385 -- mapscript/php/shape.c | 1396 -------- mapscript/php/shapefile.c | 516 --- mapscript/php/style.c | 801 ----- mapscript/php/symbol.c | 488 --- mapscript/php/web.c | 342 -- mapscript/phpng/CMakeLists.txt | 2 +- msautotest/create_postgis_test_data.sh | 16 +- msautotest/gdal/expected/rawmode_multiband.png | Bin 480786 -> 480666 bytes msautotest/misc/expected/geopdf-iso.pdf | 4 +- msautotest/misc/expected/geopdf-ogc.pdf | 2 +- msautotest/misc/expected/ortho.png | Bin 12759 -> 12682 bytes .../misc/{sde_bug2072.map => sde_bug2072.map.old} | 0 msautotest/misc/{sde_join.map => sde_join.map.old} | 0 msautotest/misc/{sde_utf.map => sde_utf.map.old} | 0 msautotest/misc/{sde_utf2.map => sde_utf2.map.old} | 0 msautotest/misc/{sde_view.map => sde_view.map.old} | 0 msautotest/misc/{sde_wms.map => sde_wms.map.old} | 0 msautotest/php/README | 9 +- msautotest/php/classObjTest.php | 8 +- msautotest/php/colorObjTest.php | 69 +- msautotest/php/errorObjTest.php | 27 - ...shtableObjTest.php => hashtableObjTest.php.bad} | 16 +- msautotest/php/labelObjTest.php | 14 +- ...eaderObjTest.php => labelleaderObjTest.php.bad} | 2 +- msautotest/php/layerObjTest.php | 56 +- msautotest/php/lineObjTest.php | 23 +- msautotest/php/mapObjTest.php | 32 +- msautotest/php/maps/gml.gml | 74 +- msautotest/php/maps/ogr_query.map | 2 +- msautotest/php/outputFrmtObj.php | 8 +- msautotest/php/owsRequestObjTest.php | 54 - msautotest/php/owsRequestTest.php | 51 + msautotest/php/phpunit.xml | 18 + msautotest/php/pointObjTest.php | 12 +- msautotest/php/projectionObjTest.php | 19 +- msautotest/php/queryMapObjTest.php | 7 +- msautotest/php/rectObjTest.php | 11 +- msautotest/php/run_test.sh | 12 +- msautotest/php/shapeFileObjTest.php | 34 +- msautotest/php/shapeObjTest.php | 26 +- msautotest/php/styleObjTest.php | 9 +- msautotest/php/symbolObjTest.php | 12 +- msautotest/php/webObjTest.php | 15 +- msautotest/pymod/testlib.py | 125 +- msautotest/query/expected/rfc62_test001.txt | 115 +- msautotest/query/expected/rfc62_test002.txt | 115 +- msautotest/query/expected/rfc62_test003.txt | 115 +- msautotest/renderers/expected/average_rgb.pdf | Bin 1362 -> 1362 bytes msautotest/renderers/expected/baseline_text.pdf | Bin 2251 -> 2251 bytes msautotest/renderers/expected/chartlayer_bar.pdf | 2 +- msautotest/renderers/expected/chartlayer_pie.pdf | Bin 1642 -> 1642 bytes msautotest/renderers/expected/chartlayer_pie2.pdf | Bin 1568 -> 1568 bytes .../expected/chartlayer_pie_expressions.pdf | Bin 2563 -> 2563 bytes msautotest/renderers/expected/chartlayer_vbar.pdf | 2 +- msautotest/renderers/expected/circle_layer.pdf | Bin 1542 -> 1542 bytes msautotest/renderers/expected/compositing.pdf | Bin 2665 -> 2665 bytes msautotest/renderers/expected/empty.pdf | Bin 915 -> 915 bytes .../expected/entity_encoded_follow_text.pdf | Bin 59511 -> 59511 bytes .../expected/geomtransform-vertex-layer.pdf | Bin 1101 -> 1101 bytes .../renderers/expected/geomtransform-vertex.pdf | Bin 2173 -> 2173 bytes msautotest/renderers/expected/grid.cairo.png | Bin 24236 -> 23748 bytes msautotest/renderers/expected/grid.pdf | Bin 18664 -> 19642 bytes msautotest/renderers/expected/grid.png | Bin 24456 -> 24502 bytes msautotest/renderers/expected/grid.svg | 148 +- .../expected/label-align-center.cairo.png | Bin 2380 -> 2368 bytes .../renderers/expected/label-align-center.png | Bin 2382 -> 2383 bytes .../expected/label-align-default.cairo.png | Bin 2376 -> 2382 bytes .../renderers/expected/label-align-default.png | Bin 2426 -> 2437 bytes .../renderers/expected/label-align-left.cairo.png | Bin 2364 -> 2367 bytes msautotest/renderers/expected/label-align-left.png | Bin 2414 -> 2425 bytes .../renderers/expected/label-align-right.cairo.png | Bin 2377 -> 2382 bytes .../renderers/expected/label-align-right.png | Bin 2427 -> 2434 bytes msautotest/renderers/expected/label-multifont.pdf | Bin 13520 -> 13520 bytes .../expected/label_ar-align-center.cairo.png | Bin 1309 -> 1315 bytes .../renderers/expected/label_ar-align-center.png | Bin 1346 -> 1349 bytes .../expected/label_ar-align-default.cairo.png | Bin 1333 -> 1341 bytes .../renderers/expected/label_ar-align-default.png | Bin 1369 -> 1366 bytes .../expected/label_ar-align-left.cairo.png | Bin 1324 -> 1331 bytes .../renderers/expected/label_ar-align-left.png | Bin 1353 -> 1350 bytes .../expected/label_ar-align-right.cairo.png | Bin 1333 -> 1341 bytes .../renderers/expected/label_ar-align-right.png | Bin 1369 -> 1366 bytes msautotest/renderers/expected/label_noclip.pdf | Bin 9260 -> 9260 bytes msautotest/renderers/expected/labelcacheoff.pdf | Bin 9258 -> 9258 bytes msautotest/renderers/expected/labelpnt.pdf | Bin 9686 -> 9686 bytes msautotest/renderers/expected/labelrot.pdf | Bin 23473 -> 23473 bytes msautotest/renderers/expected/labels-anno.pdf | Bin 38719 -> 38719 bytes msautotest/renderers/expected/labels-leader.pdf | Bin 35639 -> 35639 bytes .../renderers/expected/labels-min-distance.pdf | Bin 30493 -> 30493 bytes msautotest/renderers/expected/labels.pdf | Bin 34578 -> 34578 bytes msautotest/renderers/expected/legend.pdf | Bin 56463 -> 56463 bytes .../renderers/expected/legend_label_offset.pdf | Bin 57075 -> 57075 bytes .../renderers/expected/legend_sizeunits_meters.pdf | Bin 56463 -> 56463 bytes msautotest/renderers/expected/line_label_auto.pdf | Bin 10618 -> 10618 bytes msautotest/renderers/expected/line_label_auto2.pdf | Bin 23406 -> 23406 bytes .../renderers/expected/line_label_follow.pdf | Bin 162508 -> 162508 bytes .../expected/line_label_follow_offsetted.pdf | Bin 7390 -> 7390 bytes .../renderers/expected/line_label_follow_retry.pdf | Bin 255604 -> 255604 bytes .../renderers/expected/line_marker_pixmap.pdf | Bin 2389 -> 2389 bytes msautotest/renderers/expected/line_marker_svg.pdf | Bin 69616 -> 69616 bytes msautotest/renderers/expected/line_marker_svg.svg | 146 +- .../renderers/expected/line_marker_truetype.pdf | Bin 28306 -> 28306 bytes .../renderers/expected/line_marker_vector.pdf | Bin 4001 -> 4001 bytes msautotest/renderers/expected/line_offset.pdf | Bin 1913 -> 1913 bytes msautotest/renderers/expected/line_pattern.pdf | Bin 1175 -> 1175 bytes .../renderers/expected/line_pattern_offset.pdf | 2 +- msautotest/renderers/expected/line_short_gap.pdf | Bin 1117 -> 1117 bytes msautotest/renderers/expected/line_simple.pdf | Bin 1167 -> 1167 bytes .../renderers/expected/marker_anchorpoint.pdf | Bin 8111 -> 8111 bytes msautotest/renderers/expected/marker_pixmap.pdf | Bin 1999 -> 1999 bytes .../renderers/expected/multilabel-leader.pdf | Bin 46313 -> 46313 bytes msautotest/renderers/expected/multilabel.pdf | Bin 16524 -> 16524 bytes msautotest/renderers/expected/nodata_8bit.pdf | Bin 2972 -> 2972 bytes .../renderers/expected/point-polaroffset.pdf | Bin 1307 -> 1307 bytes msautotest/renderers/expected/point_ellipse.pdf | 2 +- msautotest/renderers/expected/point_pixmap.pdf | Bin 3843 -> 3843 bytes msautotest/renderers/expected/point_pixmap_gif.pdf | Bin 2914 -> 2914 bytes msautotest/renderers/expected/point_svg.pdf | Bin 3483 -> 3483 bytes msautotest/renderers/expected/point_svg.svg | 4 +- msautotest/renderers/expected/point_truetype.pdf | Bin 1672 -> 1672 bytes msautotest/renderers/expected/point_vector.pdf | Bin 1112 -> 1112 bytes .../expected/poly-label-multiline-pos-auto.pdf | Bin 22363 -> 22363 bytes .../renderers/expected/poly-label-pos-auto.pdf | Bin 8085 -> 8085 bytes .../expected/poly_geomtransform_anchor.pdf | Bin 2031 -> 2031 bytes .../renderers/expected/polygon-as-line-offset.pdf | Bin 4756 -> 4756 bytes msautotest/renderers/expected/polygon-as-line.pdf | Bin 3192 -> 3192 bytes .../renderers/expected/polygon-hatch-dashed.pdf | Bin 2433 -> 2433 bytes msautotest/renderers/expected/polygon-hatch.pdf | Bin 3660 -> 3660 bytes msautotest/renderers/expected/polygon-pixmap.pdf | Bin 4577 -> 4577 bytes msautotest/renderers/expected/polygon-simple.pdf | Bin 8598 -> 8598 bytes msautotest/renderers/expected/polygon-ttf.pdf | Bin 3809 -> 3809 bytes msautotest/renderers/expected/polygon-vector.pdf | Bin 3935 -> 3935 bytes msautotest/renderers/expected/raster_simple.pdf | Bin 2154 -> 2154 bytes .../renderers/expected/raster_simple_opacity.pdf | Bin 2663 -> 2663 bytes msautotest/renderers/expected/reproj.pdf | Bin 2946 -> 2946 bytes msautotest/renderers/expected/rgb_overlay.pdf | Bin 3978 -> 3978 bytes msautotest/renderers/expected/rgb_overlay_res.pdf | Bin 4540 -> 4540 bytes .../renderers/expected/rgb_overlay_res_to8bit.pdf | Bin 4540 -> 4540 bytes .../expected/rgb_overlay_res_to8bit_dithered.pdf | Bin 4540 -> 4540 bytes msautotest/renderers/expected/rgba_overlay_res.pdf | Bin 5080 -> 5080 bytes .../renderers/expected/text_shaping_1.cairo.png | Bin 4974 -> 4975 bytes msautotest/renderers/expected/text_shaping_1.pdf | Bin 13289 -> 13276 bytes msautotest/renderers/expected/text_shaping_1.png | Bin 5056 -> 5061 bytes msautotest/renderers/expected/text_shaping_1.svg | 2 +- .../renderers/expected/transparent_layer.pdf | Bin 2132 -> 2132 bytes msautotest/renderers/expected/uvraster.pdf | Bin 11506 -> 11506 bytes msautotest/renderers/expected/uvraster_reproj.pdf | Bin 10588 -> 10588 bytes msautotest/renderers/expected/wld_rotate.pdf | Bin 6769 -> 6769 bytes msautotest/renderers/expected/wld_upsidedown.pdf | Bin 2572 -> 2572 bytes msautotest/renderers/expected/wmsclient.pdf | Bin 55291 -> 55291 bytes msautotest/sld/expected/map_linemark.png | Bin 48289 -> 41005 bytes msautotest/sld/expected/sld_label_mixed.png | Bin 100755 -> 100899 bytes msautotest/sld/expected/sld_label_property.png | Bin 87503 -> 87540 bytes msautotest/sld/expected/sld_linemark.png | Bin 48289 -> 41005 bytes msautotest/sld/expected/sld_url_linemark.png | Bin 48289 -> 41005 bytes msautotest/sld/linemark.map | 6 +- .../wxs/expected/wcs_20_getcov_bands_index.tif | Bin 19935 -> 19929 bytes .../wxs/expected/wcs_20_getcov_bands_index_new.tif | Bin 19935 -> 19929 bytes .../wxs/expected/wcs_20_getcov_bands_interval.tif | Bin 26438 -> 26430 bytes .../wxs/expected/wcs_20_getcov_bands_intervals.tif | Bin 45353 -> 45341 bytes .../wxs/expected/wcs_20_getcov_bands_name.dat | Bin 24103 -> 24097 bytes .../wxs/expected/wcs_20_getcov_bands_name.tif | Bin 19935 -> 19929 bytes .../wxs/expected/wcs_20_getcov_bands_name_new.dat | Bin 24326 -> 24320 bytes .../wxs/expected/wcs_20_getcov_bands_name_new.tif | Bin 19935 -> 19929 bytes .../wcs_20_getcov_bands_name_new_reproject.dat | Bin 24333 -> 24327 bytes .../wxs/expected/wcs_20_getcov_gtiff_tiling.tif | Bin 2008 -> 1996 bytes .../wxs/expected/wcs_20_getcov_native_format.tif | Bin 58191 -> 58175 bytes .../wxs/expected/wcs_20_getcov_outputcrs.tif | Bin 1619 -> 1619 bytes msautotest/wxs/expected/wcs_20_getcov_reproj.dat | Bin 4626 -> 4626 bytes .../wcs_20_post_bands_index.tif.alternative | Bin 0 -> 19929 bytes .../wcs_20_post_bands_index_new.tif.alternative | Bin 0 -> 19929 bytes ...0_post_bands_interval_component.tif.alternative | Bin 0 -> 45341 bytes msautotest/wxs/expected/wcs_20_post_bands_name.dat | Bin 24103 -> 24097 bytes .../wcs_20_post_bands_name.tif.alternative | Bin 0 -> 19929 bytes .../wxs/expected/wcs_20_post_bands_name_new.dat | Bin 24326 -> 24320 bytes .../wcs_20_post_bands_name_new.tif.alternative | Bin 0 -> 19929 bytes msautotest/wxs/expected/wcs_get_caps.xml | 4 +- .../wcs_get_coverage_tileindexmixedsrs_26711.tif | Bin 10426 -> 10418 bytes .../wcs_grib_input_output_wcs11_get_coverage.grb2 | Bin 6644 -> 6644 bytes .../wcs_grib_output_wcs11_get_coverage.grb2 | Bin 6644 -> 6644 bytes .../wxs/expected/wcs_mask_20_getcov_reproj.dat | Bin 4626 -> 4626 bytes .../wxs/expected/wcs_netcdf_3d_input_output.nc | Bin 54276 -> 54600 bytes msautotest/wxs/expected/wcs_netcdf_3d_output.nc | Bin 79828 -> 80148 bytes .../wcs_netcdf_input_output_wcs10_get_coverage.nc | Bin 2840 -> 3164 bytes .../wcs_netcdf_input_output_wcs20_get_coverage.nc | Bin 2816 -> 3116 bytes .../wxs/expected/wfs_filter_projmeter_beyond.xml | 10 +- .../wxs/expected/wfs_filter_projmeter_disjoint.xml | 32 +- msautotest/wxs/expected/wfsogr10_csvzip.zip | Bin 426 -> 426 bytes msautotest/wxs/expected/wfsogr10_multi.xml | 70 +- msautotest/wxs/expected/wfsogr10_ograuto.xml | 61 +- msautotest/wxs/expected/wfsogr10_ogrgml.xml | 61 +- .../expected/wfsogr10_shapezip.zip.with_headers | Bin 1127 -> 1127 bytes msautotest/wxs/expected/wfsogr11_ogrgml.xml | 79 +- .../wxs/expected/wfsogr_addfiles_onelayer.txt | 61 +- .../wxs/expected/wfsogr_addfiles_onelayer.zip | Bin 994 -> 994 bytes .../wxs/expected/wfsogr_addfiles_twolayers.txt | 74 +- msautotest/wxs/expected/wms_get_map_polygon.kmz | Bin 19937 -> 19937 bytes .../wxs/expected/wms_get_map_tileindexmixedsrs.tif | Bin 10426 -> 10418 bytes ...j_to_3857_non_square_pixels_beyond_validity.png | Bin 26655 -> 26654 bytes ...eproj_to_3857_square_pixels_beyond_validity.png | Bin 26616 -> 26603 bytes msautotest/wxs/wfs_ogr_25d.map | 2 +- msautotest/wxs/wfs_postgis_25d.map | 2 +- scripts/vagrant/mapserver.sh | 16 +- scripts/vagrant/packages.sh | 20 +- scripts/vagrant/postgis.sh | 6 +- 254 files changed, 1221 insertions(+), 25679 deletions(-) delete mode 100644 mapscript/php/CMakeLists.txt delete mode 100644 mapscript/php/Makefile.vc delete mode 100644 mapscript/php/README.WIN32 delete mode 100644 mapscript/php/class.c delete mode 100644 mapscript/php/cluster.c delete mode 100644 mapscript/php/color.c delete mode 100644 mapscript/php/error.c delete mode 100644 mapscript/php/examples/phpinfo_mapscript.phtml delete mode 100644 mapscript/php/examples/test_draw_legend_icon.phtml delete mode 100644 mapscript/php/examples/test_draw_map.phtml delete mode 100644 mapscript/php/examples/test_layer_mask.phtml delete mode 100644 mapscript/php/examples/test_writeshape.phtml delete mode 100644 mapscript/php/grid.c delete mode 100644 mapscript/php/hashtable.c delete mode 100644 mapscript/php/image.c delete mode 100644 mapscript/php/label.c delete mode 100644 mapscript/php/labelcache.c delete mode 100644 mapscript/php/labelcachemember.c delete mode 100644 mapscript/php/labelleader.c delete mode 100644 mapscript/php/layer.c delete mode 100644 mapscript/php/legend.c delete mode 100644 mapscript/php/line.c delete mode 100644 mapscript/php/map.c delete mode 100644 mapscript/php/mapscript_error.c delete mode 100644 mapscript/php/mapscript_i.c delete mode 100644 mapscript/php/nmake.opt delete mode 100644 mapscript/php/outputformat.c delete mode 100644 mapscript/php/owsrequest.c delete mode 100644 mapscript/php/php_mapscript.c delete mode 100644 mapscript/php/php_mapscript.h delete mode 100644 mapscript/php/php_mapscript_util.c delete mode 100644 mapscript/php/php_mapscript_util.h delete mode 100644 mapscript/php/php_regex.c delete mode 100644 mapscript/php/point.c delete mode 100644 mapscript/php/projection.c delete mode 100644 mapscript/php/querymap.c delete mode 100644 mapscript/php/rect.c delete mode 100644 mapscript/php/referencemap.c delete mode 100644 mapscript/php/result.c delete mode 100644 mapscript/php/scalebar.c delete mode 100644 mapscript/php/shape.c delete mode 100644 mapscript/php/shapefile.c delete mode 100644 mapscript/php/style.c delete mode 100644 mapscript/php/symbol.c delete mode 100644 mapscript/php/web.c rename msautotest/misc/{sde_bug2072.map => sde_bug2072.map.old} (100%) rename msautotest/misc/{sde_join.map => sde_join.map.old} (100%) rename msautotest/misc/{sde_utf.map => sde_utf.map.old} (100%) rename msautotest/misc/{sde_utf2.map => sde_utf2.map.old} (100%) rename msautotest/misc/{sde_view.map => sde_view.map.old} (100%) rename msautotest/misc/{sde_wms.map => sde_wms.map.old} (100%) delete mode 100644 msautotest/php/errorObjTest.php rename msautotest/php/{hashtableObjTest.php => hashtableObjTest.php.bad} (53%) rename msautotest/php/{labelleaderObjTest.php => labelleaderObjTest.php.bad} (94%) delete mode 100644 msautotest/php/owsRequestObjTest.php create mode 100644 msautotest/php/owsRequestTest.php create mode 100644 msautotest/php/phpunit.xml create mode 100644 msautotest/wxs/expected/wcs_20_post_bands_index.tif.alternative create mode 100644 msautotest/wxs/expected/wcs_20_post_bands_index_new.tif.alternative create mode 100644 msautotest/wxs/expected/wcs_20_post_bands_interval_component.tif.alternative create mode 100644 msautotest/wxs/expected/wcs_20_post_bands_name.tif.alternative create mode 100644 msautotest/wxs/expected/wcs_20_post_bands_name_new.tif.alternative git reset --hard HEAD HEAD is now at 644ce9a82 avoid random PHPUnit crashes (#6536) git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930\doc\ms_revision.txt type E:\buildsystem\release-1930\doc\ms_revision.txt 644ce9a82bbfbdb465231b05ccd034ed3a16e501 cd E:\buildsystem if not exist src\gdal-vc17 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc17 cd src\gdal-vc17 git reset --hard HEAD HEAD is now at 2fa91877a0 Merge pull request #5909 from mrylov/hana_fixes git fetch git checkout master Your branch is behind 'origin/master' by 62 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 2fa91877a0..37d804745c Fast-forward .github/workflows/android.yml | 2 +- .github/workflows/android_cmake.yml | 2 +- .github/workflows/asan_build.yml | 2 +- .github/workflows/backport.yml | 2 +- .github/workflows/clang_static_analyzer.yml | 4 +- .github/workflows/cmake-lint.yml | 2 +- .github/workflows/cmake_builds.yml | 17 +- .github/workflows/code_checks.yml | 10 +- .github/workflows/conda.yml | 2 +- .github/workflows/coverity_scan.yml | 2 +- .github/workflows/doc_build.yml | 2 +- .github/workflows/fedora_rawhide.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/mingw_w64.yml | 2 +- .github/workflows/ubuntu_18.04.yml | 2 +- .github/workflows/ubuntu_18.04_32bit.yml | 2 +- .github/workflows/ubuntu_20.04.yml | 2 +- .github/workflows/ubuntu_20.04/build-deps.sh | 2 +- .github/workflows/validate_xml.yml | 2 +- .github/workflows/windows_build.yml | 2 +- alg/gdalcutline.cpp | 23 +- alg/gdalgeoloc_carray_accessor.h | 13 +- alg/gdalgeolocquadtree.cpp | 4 +- alg/gdalpansharpen.cpp | 37 +- alg/gdalwarpoperation.cpp | 2 +- autotest/cpp/test_ogr.cpp | 19 +- autotest/gcore/vsistdin.py | 72 +++ autotest/postinstall/test_pkg-config.sh | 2 +- .../pyscripts/gdal2tiles/test_option_parser.py | 87 +++ autotest/pyscripts/test_gdal2tiles.py | 73 +++ cmake/helpers/CheckDependentLibraries.cmake | 2 +- cmake/helpers/GdalVersion.cmake | 2 +- cmake/helpers/configure.cmake | 1 + cmake/template/cpl_config.h.in | 3 + doc/source/build_hints.rst | 1 + doc/source/development/cmake.rst | 27 + doc/source/development/index.rst | 1 + doc/source/development/rfc/index.rst | 1 + .../development/rfc/rfc86_column_oriented_api.rst | 693 +++++++++++++++++++++ doc/source/drivers/vector/pg.rst | 1 - doc/source/programs/gdal2tiles.rst | 33 + doc/source/user/ogr_sql_dialect.rst | 16 +- doc/source/user/virtual_file_systems.rst | 18 +- docker/ubuntu-full/Dockerfile | 2 +- frmts/daas/daasdataset.cpp | 16 +- frmts/ecw/ecwdataset.cpp | 26 +- frmts/gif/giflib/gifalloc.c | 4 +- frmts/grib/gribcreatecopy.cpp | 30 +- frmts/gtiff/libtiff/tif_config.h | 10 +- frmts/gtiff/libtiff/tif_open.c | 1 - frmts/jp2kak/jp2kakdataset.cpp | 39 +- frmts/kea/keaband.cpp | 67 +- frmts/kea/keaband.h | 6 + frmts/kea/keadriver.cpp | 2 +- frmts/mbtiles/mbtilesdataset.cpp | 25 +- frmts/mem/memdataset.cpp | 127 ++-- frmts/mem/memdataset.h | 11 +- frmts/mem/memmultidim.h | 14 + frmts/mrf/mrf_band.cpp | 4 +- frmts/pcidsk/sdk/port/pthread_mutex.cpp | 8 +- frmts/pdf/pdfcreatecopy.cpp | 35 +- frmts/png/libpng/pngpriv.h | 4 +- frmts/rasterlite/CMakeLists.txt | 1 + frmts/rasterlite/GNUmakefile | 2 +- frmts/rasterlite/makefile.vc | 2 +- frmts/rasterlite/rasterlitecreatecopy.cpp | 29 +- frmts/rasterlite/rasterliteoverviews.cpp | 64 +- frmts/raw/ntv2dataset.cpp | 4 +- frmts/rmf/rmfjpeg.cpp | 30 +- frmts/stacta/stactadataset.cpp | 24 +- frmts/usgsdem/CMakeLists.txt | 2 +- frmts/usgsdem/GNUmakefile | 2 +- frmts/usgsdem/makefile.vc | 2 +- frmts/usgsdem/usgsdem_create.cpp | 42 +- frmts/vrt/vrtdataset.h | 2 + frmts/vrt/vrtdriver.cpp | 17 + gcore/gdaljp2metadatagenerator.cpp | 1 + gcore/gdalmultidim.cpp | 8 +- gcore/rasterio.cpp | 38 +- gcore/rasterio_ssse3.cpp | 8 +- gcore/rasterio_ssse3.h | 42 ++ gdal.cmake | 4 + ogr/ogrfeaturestyle.cpp | 20 +- ogr/ogrsf_frmts/geojson/libjson/config.h | 4 + ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp | 6 +- ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp | 64 +- .../openfilegdb/ogropenfilegdblayer.cpp | 6 +- ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h | 1 + ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp | 14 - ogr/ogrsf_frmts/wfs/ogr_wfs.h | 15 +- ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp | 114 ++-- ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp | 4 +- ogr/ogrspatialreference.cpp | 3 +- port/cpl_conv.cpp | 2 +- port/cpl_port.h | 9 +- port/cpl_spawn.cpp | 6 +- port/cpl_vsil_stdin.cpp | 414 +++++++++--- port/cpl_vsil_unix_stdio_64.cpp | 2 +- swig/include/gdal_array.i | 18 +- swig/python/extensions/gdal_array_wrap.cpp | 18 +- swig/python/gdal-utils/osgeo_utils/gdal2tiles.py | 157 +++-- 101 files changed, 2078 insertions(+), 750 deletions(-) create mode 100644 doc/source/development/cmake.rst create mode 100644 doc/source/development/rfc/rfc86_column_oriented_api.rst create mode 100644 gcore/rasterio_ssse3.h git reset --hard HEAD HEAD is now at 37d804745c Merge pull request #5936 from rouault/fix_5934 git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930\doc\gdal_revision.txt type E:\buildsystem\release-1930\doc\gdal_revision.txt 37d804745c773a7b10cd8be1181bcdb21aa99b28 cd E:\buildsystem set PATH=E:\buildsystem\release-1930\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\\Extensions\Microsoft\IntelliCode\CLI;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.30.30705\bin\HostX86\x86;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\\x86;C:\Program Files (x86)\Windows Kits\10\bin\\x86;C:\Program Files\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\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\;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:\Users\szekeres\.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\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\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\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\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;C:\Program Files (x86)\dotnet\;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:\Users\szekeres\.dotnet\tools;;C:\Program Files\Azure Data Studio\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe if not exist src\mapcache-vc17 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc17 cd src\mapcache-vc17 git reset --hard HEAD HEAD is now at 593314a Fix check failure caused by wrong HTTP header removal on Windows (#285) git fetch git checkout main Your branch is up to date with 'origin/main'. git pull origin main Already up to date. git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930\doc\mapcache_revision.txt type E:\buildsystem\release-1930\doc\mapcache_revision.txt 593314a0a10c40cb69d9bf57cdee4826626d0c78 cd E:\buildsystem