Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package geotiff for openSUSE:Factory checked
in at 2021-07-21 19:06:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/geotiff (Old)
and /work/SRC/openSUSE:Factory/.geotiff.new.2632 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geotiff"
Wed Jul 21 19:06:30 2021 rev:11 rq:907425 version:1.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/geotiff/geotiff.changes 2020-08-29
20:32:53.969226560 +0200
+++ /work/SRC/openSUSE:Factory/.geotiff.new.2632/geotiff.changes
2021-07-21 19:07:38.687423360 +0200
@@ -1,0 +2,13 @@
+Sat Jul 17 08:53:16 UTC 2021 - Dirk M??ller <dmuel...@suse.com>
+
+- update to 1.7.0:
+ * Add CoordinateEpochGeoKey = 5120 of type DOUBLE to store coordinate epoch
of
+ tie points / geotransform matrix for dynamic CRS.
+ * geo_normalize.h/c: rename variables to please codespell
+ * GTIFGetGCSInfoEx(): use proj_crs_get_datum_forced() for PROJ >= 8 to avoid
+ issues with datum ensembles
+ * GTIFGetGCSInfoEx(): remove dead code
+ * geo_normalize.c: follow-up to e06625c4e5bcce9f9217d1d5a43dc6af73156283 to
+ avoid look up of user-defined GeogGeodeticDatumGeoKey that cause PROJ
warnings
+
+-------------------------------------------------------------------
Old:
----
libgeotiff-1.6.0.tar.gz
New:
----
libgeotiff-1.7.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ geotiff.spec ++++++
--- /var/tmp/diff_new_pack.0wQ2WR/_old 2021-07-21 19:07:39.075424034 +0200
+++ /var/tmp/diff_new_pack.0wQ2WR/_new 2021-07-21 19:07:39.079424041 +0200
@@ -1,7 +1,7 @@
#
# spec file for package geotiff
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define sover 5
%define libname lib%{name}%{sover}
Name: geotiff
-Version: 1.6.0
+Version: 1.7.0
Release: 0
Summary: Library to handle georeferenced TIFF
License: MIT AND SUSE-Public-Domain
++++++ libgeotiff-1.6.0.tar.gz -> libgeotiff-1.7.0.tar.gz ++++++
++++ 4909 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libgeotiff-1.6.0/CMakeLists.txt new/libgeotiff-1.7.0/CMakeLists.txt
--- old/libgeotiff-1.6.0/CMakeLists.txt 2020-04-22 18:50:50.000000000 +0200
+++ new/libgeotiff-1.7.0/CMakeLists.txt 2021-06-30 10:51:17.000000000 +0200
@@ -18,7 +18,7 @@
# Version information
set(PROJECT_VERSION_MAJOR 1)
-set(PROJECT_VERSION_MINOR 6)
+set(PROJECT_VERSION_MINOR 7)
set(PROJECT_VERSION_PATCH 0)
set(PROJECT_VERSION
"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
@@ -29,7 +29,7 @@
# libgeotiff.so.2 -> libgeotiff.so.2.2.0
# libgeotiff.so.2.2.0
set(LINK_SOVERSION "5")
-set(LINK_VERSION "5.0.1")
+set(LINK_VERSION "5.1.0")
string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libgeotiff-1.6.0/Makefile.am new/libgeotiff-1.7.0/Makefile.am
--- old/libgeotiff-1.6.0/Makefile.am 2020-04-22 18:50:01.000000000 +0200
+++ new/libgeotiff-1.7.0/Makefile.am 2021-06-30 10:51:17.000000000 +0200
@@ -53,7 +53,7 @@
geo_strtod.c \
geotiff_proj4.c
-libgeotiff_la_LDFLAGS = -version-info 6:0:1 ${NOUNDEFINED}
+libgeotiff_la_LDFLAGS = -version-info 7:0:2 ${NOUNDEFINED}
libgeotiff_la_LIBADD = libxtiff/libxtiff.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libgeotiff-1.6.0/NEWS new/libgeotiff-1.7.0/NEWS
--- old/libgeotiff-1.6.0/NEWS 2020-04-22 20:15:30.000000000 +0200
+++ new/libgeotiff-1.7.0/NEWS 2021-06-30 10:51:17.000000000 +0200
@@ -1,3 +1,16 @@
+libgeotiff 1.7.0
+----------------
+
+* Add CoordinateEpochGeoKey = 5120 of type DOUBLE to store coordinate epoch of
+ tie points / geotransform matrix for dynamic CRS.
+ See https://github.com/opengeospatial/geotiff/pull/99
+* geo_normalize.h/c: rename variables to please codespell
+* GTIFGetGCSInfoEx(): use proj_crs_get_datum_forced() for PROJ >= 8 to avoid
+ issues with datum ensembles (fixes #54)
+* GTIFGetGCSInfoEx(): remove dead code (GDAL Coverity CID 1432690)
+* geo_normalize.c: follow-up to e06625c4e5bcce9f9217d1d5a43dc6af73156283 to
avoid
+ look up of user-defined GeogGeodeticDatumGeoKey that cause PROJ warnings
(fixes #41)
+
libgeotiff 1.6.0
----------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libgeotiff-1.6.0/compile new/libgeotiff-1.7.0/compile
--- old/libgeotiff-1.6.0/compile 2020-04-22 20:17:18.000000000 +0200
+++ new/libgeotiff-1.7.0/compile 2021-06-30 10:44:17.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libgeotiff-1.6.0/configure.ac new/libgeotiff-1.7.0/configure.ac
--- old/libgeotiff-1.6.0/configure.ac 2020-04-22 20:16:57.000000000 +0200
+++ new/libgeotiff-1.7.0/configure.ac 2021-06-30 10:51:17.000000000 +0200
@@ -1,7 +1,7 @@
m4_define([VERSION_MAJOR], [1])
-m4_define([VERSION_MINOR], [6])
+m4_define([VERSION_MINOR], [7])
m4_define([VERSION_POINT], [0])
m4_define([GEOTIFF_VERSION],
[VERSION_MAJOR.VERSION_MINOR.VERSION_POINT])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libgeotiff-1.6.0/geo_get.c new/libgeotiff-1.7.0/geo_get.c
--- old/libgeotiff-1.6.0/geo_get.c 2020-04-22 18:48:52.000000000 +0200
+++ new/libgeotiff-1.7.0/geo_get.c 2021-06-30 10:51:02.000000000 +0200
@@ -144,6 +144,9 @@
ValuePair( VerticalCitationGeoKey, 4097) -- documentation --
ValuePair( VerticalDatumGeoKey, 4098) -- Section 6.3.4.2 codes --
ValuePair( VerticalUnitsGeoKey, 4099) -- Section 6.3.1 (.x) codes --
+
+See https://github.com/opengeospatial/geotiff/pull/99
+ValuePair( CoordinateEpochGeoKey, 5120) -- GeoKey of type double
</pre>
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libgeotiff-1.6.0/geo_normalize.c new/libgeotiff-1.7.0/geo_normalize.c
--- old/libgeotiff-1.6.0/geo_normalize.c 2020-04-22 18:48:52.000000000
+0200
+++ new/libgeotiff-1.7.0/geo_normalize.c 2021-03-06 18:48:18.000000000
+0100
@@ -466,10 +466,6 @@
return TRUE;
}
-
- if( nGCSCode == KvUserDefined )
- return FALSE;
-
/* -------------------------------------------------------------------- */
/* Search the database. */
/* -------------------------------------------------------------------- */
@@ -512,7 +508,11 @@
if( pnDatum )
{
+#if PROJ_VERSION_MAJOR >= 8
+ PJ* datum = proj_crs_get_datum_forced(ctx, geod_crs);
+#else
PJ* datum = proj_crs_get_datum(ctx, geod_crs);
+#endif
if( !datum )
{
proj_destroy(geod_crs);
@@ -1063,6 +1063,9 @@
return TRUE;
}
+ if( nUOMAngleCode == KvUserDefined )
+ return FALSE;
+
/* -------------------------------------------------------------------- */
/* Search the units database for this unit. If we don't find */
/* it return failure. */
@@ -1199,25 +1202,25 @@
}
/************************************************************************/
-/* SetGTParmIds() */
+/* SetGTParamIds() */
/* */
/* This is hardcoded logic to set the GeoTIFF parameter */
/* identifiers for all the EPSG supported projections. As new */
/* projection methods are added, this code will need to be updated */
/************************************************************************/
-static int SetGTParmIds( int nCTProjection,
- int nEPSGProjMethod,
- int *panProjParmId,
- int *panEPSGCodes )
+static int SetGTParamIds( int nCTProjection,
+ int nEPSGProjMethod,
+ int *panProjParamId,
+ int *panEPSGCodes )
{
int anWorkingDummy[7];
if( panEPSGCodes == NULL )
panEPSGCodes = anWorkingDummy;
- if( panProjParmId == NULL )
- panProjParmId = anWorkingDummy;
+ if( panProjParamId == NULL )
+ panProjParamId = anWorkingDummy;
memset( panEPSGCodes, 0, sizeof(int) * 7 );
@@ -1228,10 +1231,10 @@
case CT_CassiniSoldner:
case CT_NewZealandMapGrid:
case CT_Polyconic:
- panProjParmId[0] = ProjNatOriginLatGeoKey;
- panProjParmId[1] = ProjNatOriginLongGeoKey;
- panProjParmId[5] = ProjFalseEastingGeoKey;
- panProjParmId[6] = ProjFalseNorthingGeoKey;
+ panProjParamId[0] = ProjNatOriginLatGeoKey;
+ panProjParamId[1] = ProjNatOriginLongGeoKey;
+ panProjParamId[5] = ProjFalseEastingGeoKey;
+ panProjParamId[6] = ProjFalseNorthingGeoKey;
panEPSGCodes[0] = EPSGNatOriginLat;
panEPSGCodes[1] = EPSGNatOriginLong;
@@ -1241,13 +1244,13 @@
case CT_ObliqueMercator:
case CT_HotineObliqueMercatorAzimuthCenter:
- panProjParmId[0] = ProjCenterLatGeoKey;
- panProjParmId[1] = ProjCenterLongGeoKey;
- panProjParmId[2] = ProjAzimuthAngleGeoKey;
- panProjParmId[3] = ProjRectifiedGridAngleGeoKey;
- panProjParmId[4] = ProjScaleAtCenterGeoKey;
- panProjParmId[5] = ProjFalseEastingGeoKey;
- panProjParmId[6] = ProjFalseNorthingGeoKey;
+ panProjParamId[0] = ProjCenterLatGeoKey;
+ panProjParamId[1] = ProjCenterLongGeoKey;
+ panProjParamId[2] = ProjAzimuthAngleGeoKey;
+ panProjParamId[3] = ProjRectifiedGridAngleGeoKey;
+ panProjParamId[4] = ProjScaleAtCenterGeoKey;
+ panProjParamId[5] = ProjFalseEastingGeoKey;
+ panProjParamId[6] = ProjFalseNorthingGeoKey;
panEPSGCodes[0] = EPSGProjCenterLat;
panEPSGCodes[1] = EPSGProjCenterLong;
@@ -1259,12 +1262,12 @@
return TRUE;
case CT_ObliqueMercator_Laborde:
- panProjParmId[0] = ProjCenterLatGeoKey;
- panProjParmId[1] = ProjCenterLongGeoKey;
- panProjParmId[2] = ProjAzimuthAngleGeoKey;
- panProjParmId[4] = ProjScaleAtCenterGeoKey;
- panProjParmId[5] = ProjFalseEastingGeoKey;
- panProjParmId[6] = ProjFalseNorthingGeoKey;
+ panProjParamId[0] = ProjCenterLatGeoKey;
+ panProjParamId[1] = ProjCenterLongGeoKey;
+ panProjParamId[2] = ProjAzimuthAngleGeoKey;
+ panProjParamId[4] = ProjScaleAtCenterGeoKey;
+ panProjParamId[5] = ProjFalseEastingGeoKey;
+ panProjParamId[6] = ProjFalseNorthingGeoKey;
panEPSGCodes[0] = EPSGProjCenterLat;
panEPSGCodes[1] = EPSGProjCenterLong;
@@ -1280,22 +1283,22 @@
case CT_PolarStereographic:
case CT_TransverseMercator:
case CT_TransvMercator_SouthOriented:
- panProjParmId[0] = ProjNatOriginLatGeoKey;
+ panProjParamId[0] = ProjNatOriginLatGeoKey;
if( nCTProjection == CT_PolarStereographic )
{
- panProjParmId[1] = ProjStraightVertPoleLongGeoKey;
+ panProjParamId[1] = ProjStraightVertPoleLongGeoKey;
}
else
{
- panProjParmId[1] = ProjNatOriginLongGeoKey;
+ panProjParamId[1] = ProjNatOriginLongGeoKey;
}
if( nEPSGProjMethod == 9805 ) /* Mercator_2SP */
{
- panProjParmId[2] = ProjStdParallel1GeoKey;
+ panProjParamId[2] = ProjStdParallel1GeoKey;
}
- panProjParmId[4] = ProjScaleAtNatOriginGeoKey;
- panProjParmId[5] = ProjFalseEastingGeoKey;
- panProjParmId[6] = ProjFalseNorthingGeoKey;
+ panProjParamId[4] = ProjScaleAtNatOriginGeoKey;
+ panProjParamId[5] = ProjFalseEastingGeoKey;
+ panProjParamId[6] = ProjFalseNorthingGeoKey;
panEPSGCodes[0] = EPSGNatOriginLat;
panEPSGCodes[1] = EPSGNatOriginLong;
@@ -1309,12 +1312,12 @@
return TRUE;
case CT_LambertConfConic_2SP:
- panProjParmId[0] = ProjFalseOriginLatGeoKey;
- panProjParmId[1] = ProjFalseOriginLongGeoKey;
- panProjParmId[2] = ProjStdParallel1GeoKey;
- panProjParmId[3] = ProjStdParallel2GeoKey;
- panProjParmId[5] = ProjFalseEastingGeoKey;
- panProjParmId[6] = ProjFalseNorthingGeoKey;
+ panProjParamId[0] = ProjFalseOriginLatGeoKey;
+ panProjParamId[1] = ProjFalseOriginLongGeoKey;
+ panProjParamId[2] = ProjStdParallel1GeoKey;
+ panProjParamId[3] = ProjStdParallel2GeoKey;
+ panProjParamId[5] = ProjFalseEastingGeoKey;
+ panProjParamId[6] = ProjFalseNorthingGeoKey;
panEPSGCodes[0] = EPSGFalseOriginLat;
panEPSGCodes[1] = EPSGFalseOriginLong;
@@ -1325,12 +1328,12 @@
return TRUE;
case CT_AlbersEqualArea:
- panProjParmId[0] = ProjStdParallel1GeoKey;
- panProjParmId[1] = ProjStdParallel2GeoKey;
- panProjParmId[2] = ProjNatOriginLatGeoKey;
- panProjParmId[3] = ProjNatOriginLongGeoKey;
- panProjParmId[5] = ProjFalseEastingGeoKey;
- panProjParmId[6] = ProjFalseNorthingGeoKey;
+ panProjParamId[0] = ProjStdParallel1GeoKey;
+ panProjParamId[1] = ProjStdParallel2GeoKey;
+ panProjParamId[2] = ProjNatOriginLatGeoKey;
+ panProjParamId[3] = ProjNatOriginLongGeoKey;
+ panProjParamId[5] = ProjFalseEastingGeoKey;
+ panProjParamId[6] = ProjFalseNorthingGeoKey;
panEPSGCodes[0] = EPSGStdParallel1Lat;
panEPSGCodes[1] = EPSGStdParallel2Lat;
@@ -1341,19 +1344,19 @@
return TRUE;
case CT_SwissObliqueCylindrical:
- panProjParmId[0] = ProjCenterLatGeoKey;
- panProjParmId[1] = ProjCenterLongGeoKey;
- panProjParmId[5] = ProjFalseEastingGeoKey;
- panProjParmId[6] = ProjFalseNorthingGeoKey;
+ panProjParamId[0] = ProjCenterLatGeoKey;
+ panProjParamId[1] = ProjCenterLongGeoKey;
+ panProjParamId[5] = ProjFalseEastingGeoKey;
+ panProjParamId[6] = ProjFalseNorthingGeoKey;
/* EPSG codes? */
return TRUE;
case CT_LambertAzimEqualArea:
- panProjParmId[0] = ProjCenterLatGeoKey;
- panProjParmId[1] = ProjCenterLongGeoKey;
- panProjParmId[5] = ProjFalseEastingGeoKey;
- panProjParmId[6] = ProjFalseNorthingGeoKey;
+ panProjParamId[0] = ProjCenterLatGeoKey;
+ panProjParamId[1] = ProjCenterLongGeoKey;
+ panProjParamId[5] = ProjFalseEastingGeoKey;
+ panProjParamId[6] = ProjFalseNorthingGeoKey;
panEPSGCodes[0] = EPSGNatOriginLat;
panEPSGCodes[1] = EPSGNatOriginLong;
@@ -1362,10 +1365,10 @@
return TRUE;
case CT_CylindricalEqualArea:
- panProjParmId[0] = ProjStdParallel1GeoKey;
- panProjParmId[1] = ProjNatOriginLongGeoKey;
- panProjParmId[5] = ProjFalseEastingGeoKey;
- panProjParmId[6] = ProjFalseNorthingGeoKey;
+ panProjParamId[0] = ProjStdParallel1GeoKey;
+ panProjParamId[1] = ProjNatOriginLongGeoKey;
+ panProjParamId[5] = ProjFalseEastingGeoKey;
+ panProjParamId[6] = ProjFalseNorthingGeoKey;
panEPSGCodes[0] = EPSGStdParallel1Lat;
panEPSGCodes[1] = EPSGFalseOriginLong;
@@ -1374,11 +1377,11 @@
return TRUE;
case CT_Equirectangular:
- panProjParmId[0] = ProjCenterLatGeoKey;
- panProjParmId[1] = ProjCenterLongGeoKey;
- panProjParmId[2] = ProjStdParallel1GeoKey;
- panProjParmId[5] = ProjFalseEastingGeoKey;
- panProjParmId[6] = ProjFalseNorthingGeoKey;
+ panProjParamId[0] = ProjCenterLatGeoKey;
+ panProjParamId[1] = ProjCenterLongGeoKey;
+ panProjParamId[2] = ProjStdParallel1GeoKey;
+ panProjParamId[5] = ProjFalseEastingGeoKey;
+ panProjParamId[6] = ProjFalseNorthingGeoKey;
panEPSGCodes[0] = EPSGNatOriginLat;
panEPSGCodes[1] = EPSGNatOriginLong;
@@ -1388,11 +1391,11 @@
return TRUE;
case CT_Ext_Mercator_2SP:
- panProjParmId[0] = ProjNatOriginLatGeoKey;
- panProjParmId[1] = ProjNatOriginLongGeoKey;
- panProjParmId[2] = ProjStdParallel1GeoKey;
- panProjParmId[5] = ProjFalseEastingGeoKey;
- panProjParmId[6] = ProjFalseNorthingGeoKey;
+ panProjParamId[0] = ProjNatOriginLatGeoKey;
+ panProjParamId[1] = ProjNatOriginLongGeoKey;
+ panProjParamId[2] = ProjStdParallel1GeoKey;
+ panProjParamId[5] = ProjFalseEastingGeoKey;
+ panProjParamId[6] = ProjFalseNorthingGeoKey;
panEPSGCodes[0] = EPSGNatOriginLat;
panEPSGCodes[1] = EPSGNatOriginLong;
@@ -1419,7 +1422,7 @@
int nProjTRFCode,
char **ppszProjTRFName,
short * pnProjMethod,
- double * padfProjParms )
+ double * padfProjParams )
{
PJ_CONTEXT* ctx = (PJ_CONTEXT*)ctxIn;
@@ -1451,15 +1454,15 @@
if (pnProjMethod)
*pnProjMethod = 9807;
- if (padfProjParms)
+ if (padfProjParams)
{
- padfProjParms[0] = 0;
- padfProjParms[1] = -183 + 6 * nZone;
- padfProjParms[2] = 0;
- padfProjParms[3] = 0;
- padfProjParms[4] = 0.9996;
- padfProjParms[5] = 500000;
- padfProjParms[6] = (bNorth) ? 0 : 10000000;
+ padfProjParams[0] = 0;
+ padfProjParams[1] = -183 + 6 * nZone;
+ padfProjParams[2] = 0;
+ padfProjParams[3] = 0;
+ padfProjParams[4] = 0.9996;
+ padfProjParams[5] = 500000;
+ padfProjParams[6] = (bNorth) ? 0 : 10000000;
}
return TRUE;
@@ -1470,7 +1473,7 @@
{
int nProjMethod, i, anEPSGCodes[7];
- double adfProjParms[7];
+ double adfProjParams[7];
char szCode[12];
const char* pszMethodCode = NULL;
int nCTProjMethod;
@@ -1500,10 +1503,10 @@
/* -------------------------------------------------------------------- */
/* Initialize a definition of what EPSG codes need to be loaded */
-/* into what fields in adfProjParms. */
+/* into what fields in adfProjParams. */
/* -------------------------------------------------------------------- */
nCTProjMethod = EPSGProjMethodToCTProjMethod( nProjMethod, TRUE );
- SetGTParmIds( nCTProjMethod, nProjMethod, NULL, anEPSGCodes );
+ SetGTParamIds( nCTProjMethod, nProjMethod, NULL, anEPSGCodes );
/* -------------------------------------------------------------------- */
/* Get the parameters for this projection. */
@@ -1520,13 +1523,13 @@
/* Establish default */
if( nEPSGCode == EPSGAngleRectifiedToSkewedGrid )
- adfProjParms[i] = 90.0;
+ adfProjParams[i] = 90.0;
else if( nEPSGCode == EPSGNatOriginScaleFactor
|| nEPSGCode == EPSGInitialLineScaleFactor
|| nEPSGCode == EPSGPseudoStdParallelScaleFactor )
- adfProjParms[i] = 1.0;
+ adfProjParams[i] = 1.0;
else
- adfProjParms[i] = 0.0;
+ adfProjParams[i] = 0.0;
/* If there is no parameter, skip */
if( nEPSGCode == 0 )
@@ -1604,11 +1607,11 @@
assert(pszUOMCategory);
- adfProjParms[i] = dfValue * dfUnitConvFactor;
+ adfProjParams[i] = dfValue * dfUnitConvFactor;
if( strcmp(pszUOMCategory, "angular") == 0.0 )
{
/* Convert from radians to degrees */
- adfProjParms[i] *= 180 / M_PI;
+ adfProjParams[i] *= 180 / M_PI;
}
}
@@ -1633,10 +1636,10 @@
if( pnProjMethod != NULL )
*pnProjMethod = (short) nProjMethod;
- if( padfProjParms != NULL )
+ if( padfProjParams != NULL )
{
for( i = 0; i < 7; i++ )
- padfProjParms[i] = adfProjParms[i];
+ padfProjParams[i] = adfProjParams[i];
}
proj_destroy(transf);
@@ -1649,11 +1652,11 @@
int nProjTRFCode,
char **ppszProjTRFName,
short * pnProjMethod,
- double * padfProjParms )
+ double * padfProjParams )
{
PJ_CONTEXT* ctx = proj_context_create();
int ret = GTIFGetProjTRFInfoEx(
- ctx, nProjTRFCode, ppszProjTRFName, pnProjMethod, padfProjParms);
+ ctx, nProjTRFCode, ppszProjTRFName, pnProjMethod, padfProjParams);
proj_context_destroy(ctx);
return ret;
}
@@ -1672,7 +1675,7 @@
double dfNatOriginLong = 0.0, dfNatOriginLat = 0.0, dfRectGridAngle = 0.0;
double dfFalseEasting = 0.0, dfFalseNorthing = 0.0, dfNatOriginScale = 1.0;
double dfStdParallel1 = 0.0, dfStdParallel2 = 0.0, dfAzimuth = 0.0;
- int iParm;
+ int iParam;
int bHaveSP1, bHaveNOS;
/* -------------------------------------------------------------------- */
@@ -2249,9 +2252,9 @@
/* the linear projection parameter tags are normally in the */
/* units of the coordinate system described. */
/* -------------------------------------------------------------------- */
- for( iParm = 0; iParm < psDefn->nParms; iParm++ )
+ for( iParam = 0; iParam < psDefn->nParms; iParam++ )
{
- switch( psDefn->ProjParmId[iParm] )
+ switch( psDefn->ProjParmId[iParam] )
{
case ProjFalseEastingGeoKey:
case ProjFalseNorthingGeoKey:
@@ -2262,7 +2265,7 @@
if( psDefn->UOMLengthInMeters != 0
&& psDefn->UOMLengthInMeters != 1.0 )
{
- psDefn->ProjParm[iParm] *= psDefn->UOMLengthInMeters;
+ psDefn->ProjParm[iParam] *= psDefn->UOMLengthInMeters;
}
break;
@@ -2520,7 +2523,7 @@
psDefn->CTProjection = (short)
EPSGProjMethodToCTProjMethod( psDefn->Projection, FALSE );
- SetGTParmIds( EPSGProjMethodToCTProjMethod(psDefn->Projection, TRUE),
+ SetGTParamIds( EPSGProjMethodToCTProjMethod(psDefn->Projection, TRUE),
psDefn->Projection,
psDefn->ProjParmId, NULL);
psDefn->nParms = 7;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libgeotiff-1.6.0/geo_normalize.h new/libgeotiff-1.7.0/geo_normalize.h
--- old/libgeotiff-1.6.0/geo_normalize.h 2019-07-17 17:26:48.000000000
+0200
+++ new/libgeotiff-1.7.0/geo_normalize.h 2021-03-06 18:48:18.000000000
+0100
@@ -155,11 +155,11 @@
int nProjTRFCode,
char **ppszProjTRFName,
short * pnProjMethod,
- double * padfProjParms );
+ double * padfProjParams );
int GTIF_DLL GTIFGetProjTRFInfo( int nProjTRFCode,
char ** ppszProjTRFName,
short * pnProjMethod,
- double * padfProjParms );
+ double * padfProjParams );
int GTIF_DLL GTIFGetGCSInfoEx( void* ctx, /* The void* should be a PJ_CONTEXT*
*/
int nGCSCode, char ** ppszName,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libgeotiff-1.6.0/geokeys.inc new/libgeotiff-1.7.0/geokeys.inc
--- old/libgeotiff-1.6.0/geokeys.inc 2018-12-08 16:27:43.000000000 +0100
+++ new/libgeotiff-1.7.0/geokeys.inc 2021-06-30 10:51:02.000000000 +0200
@@ -74,4 +74,7 @@
ValuePair( VerticalDatumGeoKey, 4098) /* Section 6.3.4.2 codes */
ValuePair( VerticalUnitsGeoKey, 4099) /* Section 6.3.1 (.x) codes */
+/* See https://github.com/opengeospatial/geotiff/pull/99 */
+ValuePair( CoordinateEpochGeoKey, 5120) /* GeoKey of type double */
+
/* End of Data base */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libgeotiff-1.6.0/geotiff.h new/libgeotiff-1.7.0/geotiff.h
--- old/libgeotiff-1.6.0/geotiff.h 2020-04-22 18:48:52.000000000 +0200
+++ new/libgeotiff-1.7.0/geotiff.h 2021-06-30 10:51:02.000000000 +0200
@@ -47,7 +47,7 @@
#define GEOTIFF_SPEC_1_1_MINOR_REVISION 1
/* Library version */
-#define LIBGEOTIFF_VERSION 1600
+#define LIBGEOTIFF_VERSION 1700
#include "geo_config.h"
#include "geokeys.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libgeotiff-1.6.0/m4/libtool.m4 new/libgeotiff-1.7.0/m4/libtool.m4
--- old/libgeotiff-1.6.0/m4/libtool.m4 2020-04-22 20:17:17.000000000 +0200
+++ new/libgeotiff-1.7.0/m4/libtool.m4 2021-06-30 10:44:16.000000000 +0200
@@ -728,7 +728,6 @@
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
@@ -1042,8 +1041,8 @@
_LT_EOF
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
cat > conftest.c << _LT_EOF
@@ -1493,7 +1492,7 @@
m4_defun([_LT_PROG_AR],
[AC_CHECK_TOOLS(AR, [ar], false)
: ${AR=ar}
-: ${AR_FLAGS=cru}
+: ${AR_FLAGS=cr}
_LT_DECL([], [AR], [1], [The archiver])
_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
@@ -4064,7 +4063,8 @@
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe"
\> $nlist) && test -s "$nlist"; then
+ $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext |
$lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
+ if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \>
$nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
@@ -4704,6 +4704,12 @@
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
+ # flang / f18. f95 an alias for gfortran or flang on Debian
+ flang* | f18* | f95*)
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
@@ -6439,7 +6445,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 |
$GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 |
$GREP -v "^Configured with:" | $GREP " \-L"'
else
GXX=no
@@ -6814,7 +6820,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v
conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v
conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "$list"'
;;
*)
if test yes = "$GXX"; then
@@ -6879,7 +6885,7 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v
conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v
conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z
in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac;
done; func_echo_all "$list"'
;;
*)
if test yes = "$GXX"; then
@@ -7218,7 +7224,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext
2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext
2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
# FIXME: insert proper C++ library support
@@ -7302,7 +7308,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v
conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v
conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
else
# g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
@@ -7313,7 +7319,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext
2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext
2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/libgeotiff-1.6.0/missing new/libgeotiff-1.7.0/missing
--- old/libgeotiff-1.6.0/missing 2020-04-22 20:17:18.000000000 +0200
+++ new/libgeotiff-1.7.0/missing 2021-06-30 10:44:17.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
