libgeotiff/libgeotiff-1.7.1-proj-9.4.0-2.patch

63 lines
2.8 KiB
Diff
Raw Normal View History

From 468e2a178fa2c72ac7ae4a226abb76ac047e3774 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 26 Nov 2022 13:24:02 +0100
Subject: [PATCH] testlistgeo: do not print corner coordinates for data files
with Cassini Soldner projection, whose formulas have changed in PROJ 9.1.1
(fixes #81)
---
libgeotiff/test/testlistgeo | 4 ++--
libgeotiff/test/testlistgeo_out.dist | 14 --------------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/libgeotiff/test/testlistgeo b/libgeotiff/test/testlistgeo
index 596301b4..9a41e74f 100755
--- a/libgeotiff/test/testlistgeo
+++ b/libgeotiff/test/testlistgeo
@@ -59,11 +59,11 @@ $EXE ${DATA_DIR}/ProjLinearUnitsGeoKey_9036.tif >>${OUT}
echo "" >>${OUT}
echo "Testing listgeo ProjectedCSTypeGeoKey_28191_cassini_soldner.tif" >> ${OUT}
-$EXE ${DATA_DIR}/ProjectedCSTypeGeoKey_28191_cassini_soldner.tif >>${OUT}
+$EXE -no_corners ${DATA_DIR}/ProjectedCSTypeGeoKey_28191_cassini_soldner.tif >>${OUT}
echo "" >>${OUT}
echo "Testing listgeo cassini_soldner.tif" >> ${OUT}
-$EXE ${DATA_DIR}/cassini_soldner.tif >>${OUT}
+$EXE -no_corners ${DATA_DIR}/cassini_soldner.tif >>${OUT}
echo "" >>${OUT}
echo "Testing listgeo ProjectedCSTypeGeoKey_27200_new_zealand_mapping_grid.tif" >> ${OUT}
diff --git a/libgeotiff/test/testlistgeo_out.dist b/libgeotiff/test/testlistgeo_out.dist
index 742f0fce..20221cec 100644
--- a/libgeotiff/test/testlistgeo_out.dist
+++ b/libgeotiff/test/testlistgeo_out.dist
@@ -299,13 +299,6 @@ Ellipsoid: 7010/Clarke 1880 (Benoit) (6378300.79,6356566.43)
Prime Meridian: 8901/Greenwich (0.000000/ 0d 0' 0.00"E)
Projection Linear Units: 9001/metre (1.000000m)
-Corner Coordinates:
-Upper Left ( 440720.000, 3751320.000) ( 40d47'28.08"E, 64d13'29.57"N)
-Lower Left ( 440720.000, 3751260.000) ( 40d47'27.69"E, 64d13'27.64"N)
-Upper Right ( 440780.000, 3751320.000) ( 40d47'32.51"E, 64d13'29.40"N)
-Lower Right ( 440780.000, 3751260.000) ( 40d47'32.12"E, 64d13'27.47"N)
-Center ( 440750.000, 3751290.000) ( 40d47'30.10"E, 64d13'28.52"N)
-
Testing listgeo cassini_soldner.tif
Geotiff_Information:
Version: 1
@@ -348,13 +341,6 @@ Projection Method: CT_CassiniSoldner
ProjFalseNorthingGeoKey: 126867.909000 m
Projection Linear Units: 9001/metre (1.000000m)
-Corner Coordinates:
-Upper Left ( 440720.000, 3751320.000) ( 40d47'28.08"E, 64d13'29.57"N)
-Lower Left ( 440720.000, 3751260.000) ( 40d47'27.69"E, 64d13'27.64"N)
-Upper Right ( 440780.000, 3751320.000) ( 40d47'32.51"E, 64d13'29.40"N)
-Lower Right ( 440780.000, 3751260.000) ( 40d47'32.12"E, 64d13'27.47"N)
-Center ( 440750.000, 3751290.000) ( 40d47'30.10"E, 64d13'28.52"N)
-
Testing listgeo ProjectedCSTypeGeoKey_27200_new_zealand_mapping_grid.tif
Geotiff_Information:
Version: 1