Hello community, here is the log from the commit of package gdal for openSUSE:Factory checked in at 2020-06-16 13:46:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdal (Old) and /work/SRC/openSUSE:Factory/.gdal.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdal" Tue Jun 16 13:46:32 2020 rev:51 rq:814858 version:3.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gdal/gdal.changes 2020-04-21 13:12:00.760973284 +0200 +++ /work/SRC/openSUSE:Factory/.gdal.new.3606/gdal.changes 2020-06-16 13:47:12.198418806 +0200 @@ -1,0 +2,25 @@ +Tue Jun 16 08:22:44 UTC 2020 - Guillaume GARDET <[email protected]> + +- Add _constraints to avoid build failure + +------------------------------------------------------------------- +Mon Jun 15 08:32:54 UTC 2020 - Guillaume GARDET <[email protected]> + +- Fix docs and man builds for Tumbleweed with upstream patch: + * gdal-fix-docs.patch +- Disable docs/man on Leap - https://github.com/OSGeo/gdal/issues/2690 + +------------------------------------------------------------------- +Thu Jun 11 16:44:15 UTC 2020 - Guillaume GARDET <[email protected]> + +- Update to 3.1.0: + * New binaries: gdal_viewshed gdalmdiminfo gdalmdimtranslate + * full changelog: + https://github.com/OSGeo/gdal/blob/v3.1.0/gdal/NEWS +- Refresh patch: + * GDALmake.opt.in.patch +- Drop upstream patches: + * gdal-ecwjp2-sdk-5.5_dep1.patch + * gdal-ecwjp2-sdk-5.5.patch + +------------------------------------------------------------------- Old: ---- gdal-3.0.4.tar.xz gdal-3.0.4.tar.xz.md5 gdal-ecwjp2-sdk-5.5.patch gdal-ecwjp2-sdk-5.5_dep1.patch New: ---- _constraints gdal-3.1.0.tar.xz gdal-3.1.0.tar.xz.md5 gdal-fix-docs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdal.spec ++++++ --- /var/tmp/diff_new_pack.CNvNMb/_old 2020-06-16 13:47:13.986424838 +0200 +++ /var/tmp/diff_new_pack.CNvNMb/_new 2020-06-16 13:47:13.986424838 +0200 @@ -16,18 +16,22 @@ # -# Soname should be bumped on API/ABI break -# http://trac.osgeo.org/gdal/ticket/4543 -%define soversion 26 +%define soversion 27 %define sourcename gdal # Uppercase GDAL is the canonical name for this package in Python %define pypi_package_name GDAL +# Enable docs on Tumbleweed only - https://github.com/OSGeo/gdal/issues/2690 +%if 0%{?suse_version} > 1500 +%bcond_without docs +%else +%bcond_with docs +%endif %bcond_with ecw_support %bcond_with ecw5_support %bcond_with fgdb_support %bcond_without python2 Name: gdal -Version: 3.0.4 +Version: 3.1.0 Release: 0 Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats License: MIT AND BSD-3-Clause AND SUSE-Public-Domain @@ -37,9 +41,8 @@ Patch0: gdal-perl.patch # Fix occasional parallel build failure Patch1: GDALmake.opt.in.patch -# PATCH-FIX-UPSTREAM - https://github.com/OSGeo/gdal/commit/e5cb5406ea9090b2f17cffeeb7ba5fb49e7158f2 + dep commit -Patch2: gdal-ecwjp2-sdk-5.5_dep1.patch -Patch3: gdal-ecwjp2-sdk-5.5.patch +# PATCH-FIX-UPSTREAM - https://github.com/OSGeo/gdal/pull/2678 +Patch2: gdal-fix-docs.patch BuildRequires: KEALib-devel BuildRequires: autoconf BuildRequires: automake @@ -61,10 +64,6 @@ BuildRequires: perl-ExtUtils-MakeMaker BuildRequires: perl-macros BuildRequires: pkgconfig -%if %{with python2} -BuildRequires: python-numpy-devel -BuildRequires: python-setuptools -%endif BuildRequires: python3-numpy-devel BuildRequires: python3-setuptools BuildRequires: swig @@ -94,6 +93,21 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xerces-c) BuildRequires: pkgconfig(zlib) >= 1.1.4 +%if %{with docs} +BuildRequires: python3-Sphinx +BuildRequires: python3-breathe +BuildRequires: texlive-dvips-bin +BuildRequires: texlive-latex-bin-bin +BuildRequires: texlive-newunicodechar +%endif +%if %{with python2} +BuildRequires: python-numpy-devel +BuildRequires: python-setuptools +%if %{with docs} +BuildRequires: python-Sphinx +BuildRequires: python-breathe +%endif +%endif %if %{with fgdb_support} BuildRequires: filegdb_api-devel %endif @@ -165,12 +179,16 @@ %patch0 -p1 %patch1 -p1 %patch2 -p2 -%patch3 -p2 # Set the right (build) libproj.so version, use the upper found version. PROJSOVER=$(ls -1 %{_libdir}/libproj.so.?? | tail -n1 | awk -F '.' '{print $3}') sed -i "s,# define LIBNAME \"libproj.so\",# define LIBNAME \"libproj.so.${PROJSOVER}\",g" ogr/ogrct.cpp +# --keep-going option not support on Leap/SLE +%if 0%{?sle_version} && 0%{?sle_version} <= 150200 +sed -i 's/--keep-going//' doc/Makefile +%endif + # Fix mandir sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure @@ -266,7 +284,16 @@ make %{?_smp_mflags} -C swig/${M} generate done -make %{?_smp_mflags} VERBOSE=1 all docs man +# Force Doxygen generation +rm doc/.doxygen_up_to_date +pushd doc/ +make .doxygen_up_to_date +popd + +make %{?_smp_mflags} VERBOSE=1 all \ +%if %{with docs} + docs man \ +%endif # Make Python 3 module pushd swig/python @@ -281,15 +308,18 @@ python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} popd -make %{?_smp_mflags} install install-man \ +make %{?_smp_mflags} install \ +%if %{with docs} + install-man \ +%endif DESTDIR=%{buildroot} INST_MAN=%{_mandir} # Not on buildroot : broke everything with python3 # If done got python3 needing python2 package heretic .. # Futhermore duplicates are only existing in src html dir -%fdupes -s html +%fdupes -s doc/build/html # Empty file -rm -f html/do-not-remove +rm -f doc/build/html/do-not-remove # chrpath must be removed here chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so @@ -317,6 +347,9 @@ # avoid PACKAGE redefines sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_config.h +# Fix wrong /usr/bin/env phyton3 +find %{buildroot}%{_bindir} -iname "*.py" -exec sed -i "s,^#!%{_bindir}/env python3,#!%{_bindir}/python3," {} \; + %post -n lib%{name}%{soversion} -p /sbin/ldconfig %postun -n lib%{name}%{soversion} -p /sbin/ldconfig @@ -348,6 +381,7 @@ %{_bindir}/gdal_retile.py %{_bindir}/gdal_sieve.py %{_bindir}/gdal_translate +%{_bindir}/gdal_viewshed %{_bindir}/gdaladdo %{_bindir}/gdalbuildvrt %{_bindir}/gdalchksum.py @@ -359,6 +393,8 @@ %{_bindir}/gdalinfo %{_bindir}/gdallocationinfo %{_bindir}/gdalmanage +%{_bindir}/gdalmdiminfo +%{_bindir}/gdalmdimtranslate %{_bindir}/gdalmove.py %{_bindir}/gdalserver %{_bindir}/gdalsrsinfo @@ -378,6 +414,7 @@ %{_bindir}/rgb2pct.py %{_bindir}/testepsg %{_datadir}/gdal +%if %{with docs} %{_mandir}/man1/gdal2tiles.1%{?ext_man} %{_mandir}/man1/gdal_calc.1%{?ext_man} %{_mandir}/man1/gdal_contour.1%{?ext_man} @@ -392,7 +429,6 @@ %{_mandir}/man1/gdal_retile.1%{?ext_man} %{_mandir}/man1/gdal_sieve.1%{?ext_man} %{_mandir}/man1/gdal_translate.1%{?ext_man} -%{_mandir}/man1/gdal_utilities.1%{?ext_man} %{_mandir}/man1/gdaladdo.1%{?ext_man} %{_mandir}/man1/gdalbuildvrt.1%{?ext_man} %{_mandir}/man1/gdalcompare.1%{?ext_man} @@ -405,29 +441,32 @@ %{_mandir}/man1/gdaltindex.1%{?ext_man} %{_mandir}/man1/gdaltransform.1%{?ext_man} %{_mandir}/man1/gdalwarp.1%{?ext_man} -%{_mandir}/man1/gnm_utilities.1%{?ext_man} %{_mandir}/man1/gnmanalyse.1%{?ext_man} %{_mandir}/man1/gnmmanage.1%{?ext_man} %{_mandir}/man1/nearblack.1%{?ext_man} %{_mandir}/man1/ogr2ogr.1%{?ext_man} -%{_mandir}/man1/ogr_utilities.1%{?ext_man} %{_mandir}/man1/ogrinfo.1%{?ext_man} %{_mandir}/man1/ogrlineref.1%{?ext_man} %{_mandir}/man1/ogrmerge.1%{?ext_man} %{_mandir}/man1/ogrtindex.1%{?ext_man} %{_mandir}/man1/pct2rgb.1%{?ext_man} %{_mandir}/man1/rgb2pct.1%{?ext_man} +%endif %files devel %license LICENSE.TXT %doc NEWS PROVENANCE.TXT -%doc html +%if %{with docs} +%doc doc/build/html/ +%endif %attr(755,root,root) %{_bindir}/gdal-config %{_libdir}/libgdal.so %{_libdir}/pkgconfig/gdal.pc %dir %{_includedir}/gdal %{_includedir}/gdal/*.h +%if %{with docs} %{_mandir}/man1/gdal-config.1%{?ext_man} +%endif %files -n perl-%{name} %license LICENSE.TXT ++++++ GDALmake.opt.in.patch ++++++ --- /var/tmp/diff_new_pack.CNvNMb/_old 2020-06-16 13:47:14.010424919 +0200 +++ /var/tmp/diff_new_pack.CNvNMb/_new 2020-06-16 13:47:14.014424933 +0200 @@ -1,9 +1,8 @@ -diff -rup a/GDALmake.opt.in b/GDALmake.opt.in ---- a/GDALmake.opt.in 2018-09-21 11:01:50.000000000 +0200 -+++ b/GDALmake.opt.in 2018-09-29 15:21:42.993179662 +0200 -@@ -67,7 +67,7 @@ INST_DOCS = @exec_prefix@/doc +--- a/GDALmake.opt.in 2020-05-25 15:09:29.892069150 +0200 ++++ b/GDALmake.opt.in 2020-05-25 15:09:54.164285244 +0200 +@@ -74,7 +74,7 @@ INST_DOCS = @htmldir@ INST_MAN = @mandir@ - INST_HTML = $(HOME)/www/gdal + INST_WEB = $(HOME)/www/gdal -CPPFLAGS := @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION +CPPFLAGS := @CPPFLAGS@ -I$(GDAL_ROOT)/gcore -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION ++++++ _constraints ++++++ <constraints> <hardware> <memory> <size unit="G">3</size> </memory> <disk> <size unit="G">5</size> </disk> </hardware> </constraints> ++++++ gdal-3.0.4.tar.xz -> gdal-3.1.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/gdal/gdal-3.0.4.tar.xz /work/SRC/openSUSE:Factory/.gdal.new.3606/gdal-3.1.0.tar.xz differ: char 25, line 1 ++++++ gdal-3.0.4.tar.xz.md5 -> gdal-3.1.0.tar.xz.md5 ++++++ --- /work/SRC/openSUSE:Factory/gdal/gdal-3.0.4.tar.xz.md5 2020-02-04 19:52:38.077296451 +0100 +++ /work/SRC/openSUSE:Factory/.gdal.new.3606/gdal-3.1.0.tar.xz.md5 2020-06-16 13:47:10.498413071 +0200 @@ -1 +1 @@ -8996bbee51e73b5a968d8d0f48895ac8 gdal-3.0.4.tar.xz +fe29a41d5813263fc33c1f9130f73e01 gdal-3.1.0.tar.xz ++++++ gdal-fix-docs.patch ++++++ >From 58b9f4eba6bf3bf39350e4c0a9005336cf1b61fc Mon Sep 17 00:00:00 2001 From: Even Rouault <[email protected]> Date: Sat, 13 Jun 2020 23:22:44 +0200 Subject: [PATCH] Doc building: fix warnings when using recent Doxygen and/or Sphinx+Breathe (fixes #2673) --- gdal/Doxyfile | 7 +++- gdal/gcore/gdal.h | 18 ++++++-- gdal/gcore/gdal_priv.h | 7 +--- gdal/ogr/ogr_geometry.h | 87 ++++++++++++++++++++++++++++++++++++++- gdal/ogr/ogr_spatialref.h | 23 +++++++++-- gdal/port/cpl_conv.h | 2 +- 6 files changed, 129 insertions(+), 15 deletions(-) diff --git a/gdal/Doxyfile b/gdal/Doxyfile index e7afd116860..aedffa2e5f7 100644 --- a/gdal/Doxyfile +++ b/gdal/Doxyfile @@ -954,7 +954,12 @@ PREDEFINED = HAVE_DLFCN_H \ HAVE_LONG_LONG=1 \ HAVE_SC_PHYS_PAGES=1 \ final= \ - CPL_RESTRICT= + CPL_RESTRICT= \ + CPL_WARN_UNUSED_RESULT= \ + CPL_RETURNS_NONNULL= \ + CPLSTRING_METHOD_DLL= \ + CPL_NO_RETURN= \ + EXPERIMENTAL_CPL_WARN_UNUSED_RESULT= # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/gdal/gcore/gdal.h b/gdal/gcore/gdal.h index 7a232ee6278..0529d178ce2 100644 --- a/gdal/gcore/gdal.h +++ b/gdal/gcore/gdal.h @@ -956,7 +956,11 @@ CPLErr CPL_DLL CPL_STDCALL GDALGetRasterHistogram( GDALRasterBandH hBand, int nBuckets, int *panHistogram, int bIncludeOutOfRange, int bApproxOK, GDALProgressFunc pfnProgress, - void * pProgressData ) CPL_WARN_DEPRECATED("Use GDALGetRasterHistogramEx() instead"); + void * pProgressData ) +/*! @cond Doxygen_Suppress */ + CPL_WARN_DEPRECATED("Use GDALGetRasterHistogramEx() instead") +/*! @endcond */ + ; CPLErr CPL_DLL CPL_STDCALL GDALGetRasterHistogramEx( GDALRasterBandH hBand, double dfMin, double dfMax, int nBuckets, GUIntBig *panHistogram, @@ -968,7 +972,11 @@ CPLErr CPL_DLL CPL_STDCALL GDALGetDefaultHistogram( GDALRasterBandH hBand, int *pnBuckets, int **ppanHistogram, int bForce, GDALProgressFunc pfnProgress, - void * pProgressData ) CPL_WARN_DEPRECATED("Use GDALGetDefaultHistogramEx() instead"); + void * pProgressData ) +/*! @cond Doxygen_Suppress */ + CPL_WARN_DEPRECATED("Use GDALGetDefaultHistogramEx() instead") +/*! @endcond */ + ; CPLErr CPL_DLL CPL_STDCALL GDALGetDefaultHistogramEx( GDALRasterBandH hBand, double *pdfMin, double *pdfMax, int *pnBuckets, GUIntBig **ppanHistogram, @@ -977,7 +985,11 @@ CPLErr CPL_DLL CPL_STDCALL GDALGetDefaultHistogramEx( GDALRasterBandH hBand, void * pProgressData ); CPLErr CPL_DLL CPL_STDCALL GDALSetDefaultHistogram( GDALRasterBandH hBand, double dfMin, double dfMax, - int nBuckets, int *panHistogram ) CPL_WARN_DEPRECATED("Use GDALSetDefaultHistogramEx() instead"); + int nBuckets, int *panHistogram ) +/*! @cond Doxygen_Suppress */ + CPL_WARN_DEPRECATED("Use GDALSetDefaultHistogramEx() instead") +/*! @endcond */ + ; CPLErr CPL_DLL CPL_STDCALL GDALSetDefaultHistogramEx( GDALRasterBandH hBand, double dfMin, double dfMax, int nBuckets, GUIntBig *panHistogram ); diff --git a/gdal/gcore/gdal_priv.h b/gdal/gcore/gdal_priv.h index 6790daf7110..f30269be6f7 100644 --- a/gdal/gcore/gdal_priv.h +++ b/gdal/gcore/gdal_priv.h @@ -604,7 +604,9 @@ class CPL_DLL GDALDataset : public GDALMajorObject CPLErr BuildOverviews( const char *, int, int *, int, int *, GDALProgressFunc, void * ); +#ifndef DOXYGEN_XML void ReportError(CPLErr eErrClass, CPLErrorNum err_no, const char *fmt, ...) CPL_PRINT_FUNC_FORMAT (4, 5); +#endif char ** GetMetadata(const char * pszDomain = "") override; @@ -612,8 +614,6 @@ class CPL_DLL GDALDataset : public GDALMajorObject #ifdef DOXYGEN_SKIP CPLErr SetMetadata( char ** papszMetadata, const char * pszDomain ) override; - const char *GetMetadataItem( const char * pszName, - const char * pszDomain ) override; CPLErr SetMetadataItem( const char * pszName, const char * pszValue, const char * pszDomain ) override; @@ -1252,11 +1252,8 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject // Only defined when Doxygen enabled #ifdef DOXYGEN_SKIP - char **GetMetadata( const char * pszDomain = "" ) override; CPLErr SetMetadata( char ** papszMetadata, const char * pszDomain ) override; - const char *GetMetadataItem( const char * pszName, - const char * pszDomain ) override; CPLErr SetMetadataItem( const char * pszName, const char * pszValue, const char * pszDomain ) override; diff --git a/gdal/ogr/ogr_geometry.h b/gdal/ogr/ogr_geometry.h index d7de8f07555..ef220d19747 100644 --- a/gdal/ogr/ogr_geometry.h +++ b/gdal/ogr/ogr_geometry.h @@ -421,13 +421,18 @@ class CPL_DLL OGRGeometry OGRwkbVariant=wkbVariantOldOgc ) const = 0; virtual OGRErr importFromWkt( const char ** ppszInput ) = 0; +#ifndef DOXYGEN_XML /** Deprecated. * @deprecated in GDAL 2.3 */ - OGRErr importFromWkt( char ** ppszInput ) CPL_WARN_DEPRECATED("Use importFromWkt(const char**) instead") + OGRErr importFromWkt( char ** ppszInput ) +/*! @cond Doxygen_Suppress */ + CPL_WARN_DEPRECATED("Use importFromWkt(const char**) instead") +/*! @endcond */ { return importFromWkt( const_cast<const char**>(ppszInput) ); } +#endif OGRErr exportToWkt( char ** ppszDstText, OGRwkbVariant=wkbVariantOldOgc ) const; @@ -881,9 +886,16 @@ class CPL_DLL OGRPoint : public OGRGeometry OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, OGRwkbVariant=wkbVariantOldOgc ) const override; + +#ifndef DOXYGEN_XML using OGRGeometry::importFromWkt; /** deprecated */ +#endif + OGRErr importFromWkt( const char ** ) override; + +#ifndef DOXYGEN_XML using OGRGeometry::exportToWkt; +#endif /// Export a point to WKT /// \param opts Output options. @@ -1187,9 +1199,16 @@ class CPL_DLL OGRSimpleCurve: public OGRCurve virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, OGRwkbVariant=wkbVariantOldOgc ) const override; + +#ifndef DOXYGEN_XML using OGRGeometry::importFromWkt; /** deprecated */ +#endif + OGRErr importFromWkt( const char ** ) override; + +#ifndef DOXYGEN_XML using OGRGeometry::exportToWkt; +#endif /// Export a simple curve to WKT /// \param opts Output options. @@ -1481,9 +1500,16 @@ class CPL_DLL OGRCircularString : public OGRSimpleCurve virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, OGRwkbVariant=wkbVariantOldOgc ) const override; + +#ifndef DOXYGEN_XML using OGRGeometry::importFromWkt; /** deprecated */ +#endif + OGRErr importFromWkt( const char ** ) override; + +#ifndef DOXYGEN_XML using OGRGeometry::exportToWkt; +#endif /// Export a circular string to WKT /// \param opts Output options. @@ -1701,9 +1727,16 @@ class CPL_DLL OGRCompoundCurve : public OGRCurve virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, OGRwkbVariant=wkbVariantOldOgc ) const override; + +#ifndef DOXYGEN_XML using OGRGeometry::importFromWkt; /** deprecated */ +#endif + OGRErr importFromWkt( const char ** ) override; + +#ifndef DOXYGEN_XML using OGRGeometry::exportToWkt; +#endif /// Export a compound curve to WKT /// \param opts Output options. @@ -1904,9 +1937,16 @@ class CPL_DLL OGRCurvePolygon : public OGRSurface virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, OGRwkbVariant=wkbVariantOldOgc ) const override; + +#ifndef DOXYGEN_XML using OGRGeometry::importFromWkt; /** deprecated */ +#endif + OGRErr importFromWkt( const char ** ) override; + +#ifndef DOXYGEN_XML using OGRGeometry::exportToWkt; +#endif /// Export a curve polygon to WKT /// \param opts Output options. @@ -2048,10 +2088,16 @@ class CPL_DLL OGRPolygon : public OGRCurvePolygon virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, OGRwkbVariant=wkbVariantOldOgc ) const override; + +#ifndef DOXYGEN_XML using OGRGeometry::importFromWkt; /** deprecated */ +#endif + OGRErr importFromWkt( const char ** ) override; +#ifndef DOXYGEN_XML using OGRGeometry::exportToWkt; +#endif /// Export a polygon to WKT /// \param opts Output options. @@ -2238,10 +2284,16 @@ class CPL_DLL OGRGeometryCollection : public OGRGeometry virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, OGRwkbVariant=wkbVariantOldOgc ) const override; + +#ifndef DOXYGEN_XML using OGRGeometry::importFromWkt; /** deprecated */ +#endif + OGRErr importFromWkt( const char ** ) override; +#ifndef DOXYGEN_XML using OGRGeometry::exportToWkt; +#endif /// Export a geometry collection to WKT /// \param opts Output options. @@ -2341,10 +2393,16 @@ class CPL_DLL OGRMultiSurface : public OGRGeometryCollection // Non standard (OGRGeometry). virtual const char *getGeometryName() const override; virtual OGRwkbGeometryType getGeometryType() const override; + +#ifndef DOXYGEN_XML using OGRGeometry::importFromWkt; /** deprecated */ +#endif + OGRErr importFromWkt( const char ** ) override; +#ifndef DOXYGEN_XML using OGRGeometry::exportToWkt; +#endif /// Export a geometry collection to WKT /// \param opts Output options. @@ -2439,7 +2497,10 @@ class CPL_DLL OGRMultiPolygon : public OGRMultiSurface // Non-standard (OGRGeometry). virtual const char *getGeometryName() const override; virtual OGRwkbGeometryType getGeometryType() const override; + +#ifndef DOXYGEN_XML using OGRGeometry::exportToWkt; +#endif /// Export a multipolygon to WKT /// \param opts Output options. @@ -2538,9 +2599,16 @@ class CPL_DLL OGRPolyhedralSurface : public OGRSurface virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, OGRwkbVariant=wkbVariantOldOgc ) const override; + +#ifndef DOXYGEN_XML using OGRGeometry::importFromWkt; /** deprecated */ +#endif + OGRErr importFromWkt( const char ** ) override; + +#ifndef DOXYGEN_XML using OGRGeometry::exportToWkt; +#endif /// Export a polyhedral surface to WKT /// \param opts Output options. @@ -2718,9 +2786,16 @@ class CPL_DLL OGRMultiPoint : public OGRGeometryCollection // Non-standard (OGRGeometry). virtual const char *getGeometryName() const override; virtual OGRwkbGeometryType getGeometryType() const override; + +#ifndef DOXYGEN_XML using OGRGeometry::importFromWkt; /** deprecated */ +#endif + OGRErr importFromWkt( const char ** ) override; + +#ifndef DOXYGEN_XML using OGRGeometry::exportToWkt; +#endif /// Export a multipoint to WKT /// \param opts Output options. @@ -2803,9 +2878,16 @@ class CPL_DLL OGRMultiCurve : public OGRGeometryCollection // Non standard (OGRGeometry). virtual const char *getGeometryName() const override; virtual OGRwkbGeometryType getGeometryType() const override; + +#ifndef DOXYGEN_XML using OGRGeometry::importFromWkt; /** deprecated */ +#endif + OGRErr importFromWkt( const char ** ) override; + +#ifndef DOXYGEN_XML using OGRGeometry::exportToWkt; +#endif /// Export a multicurve to WKT /// \param opts Output options. @@ -2884,7 +2966,10 @@ class CPL_DLL OGRMultiLineString : public OGRMultiCurve // Non standard (OGRGeometry). virtual const char *getGeometryName() const override; virtual OGRwkbGeometryType getGeometryType() const override; + +#ifndef DOXYGEN_XML using OGRGeometry::exportToWkt; +#endif /// Export a multilinestring to WKT /// \param opts Output options. diff --git a/gdal/ogr/ogr_spatialref.h b/gdal/ogr/ogr_spatialref.h index 23237a62091..a97af16ece7 100644 --- a/gdal/ogr/ogr_spatialref.h +++ b/gdal/ogr/ogr_spatialref.h @@ -293,7 +293,11 @@ class CPL_DLL OGRSpatialReference const char *pszUnitAuthority = nullptr, const char *pszUnitCode = nullptr); - double GetLinearUnits( char ** ) const CPL_WARN_DEPRECATED("Use GetLinearUnits(const char**) instead"); + double GetLinearUnits( char ** ) const +/*! @cond Doxygen_Suppress */ + CPL_WARN_DEPRECATED("Use GetLinearUnits(const char**) instead") +/*! @endcond */ + ; double GetLinearUnits( const char ** = nullptr ) const; /*! @cond Doxygen_Suppress */ double GetLinearUnits( std::nullptr_t ) const @@ -302,7 +306,10 @@ class CPL_DLL OGRSpatialReference double GetTargetLinearUnits( const char *pszTargetKey, char ** ppszRetName ) const - CPL_WARN_DEPRECATED("Use GetTargetLinearUnits(const char*, const char**)"); +/*! @cond Doxygen_Suppress */ + CPL_WARN_DEPRECATED("Use GetTargetLinearUnits(const char*, const char**)") +/*! @endcond */ + ; double GetTargetLinearUnits( const char *pszTargetKey, const char ** ppszRetName = nullptr ) const; /*! @cond Doxygen_Suppress */ @@ -311,14 +318,22 @@ class CPL_DLL OGRSpatialReference /*! @endcond */ OGRErr SetAngularUnits( const char *pszName, double dfInRadians ); - double GetAngularUnits( char ** ) const CPL_WARN_DEPRECATED("Use GetAngularUnits(const char**) instead"); + double GetAngularUnits( char ** ) const +/*! @cond Doxygen_Suppress */ + CPL_WARN_DEPRECATED("Use GetAngularUnits(const char**) instead") +/*! @endcond */ + ; double GetAngularUnits( const char ** = nullptr ) const; /*! @cond Doxygen_Suppress */ double GetAngularUnits( std::nullptr_t ) const { return GetAngularUnits( static_cast<const char**>(nullptr) ); } /*! @endcond */ - double GetPrimeMeridian( char ** ) const CPL_WARN_DEPRECATED("Use GetPrimeMeridian(const char**) instead"); + double GetPrimeMeridian( char ** ) const +/*! @cond Doxygen_Suppress */ + CPL_WARN_DEPRECATED("Use GetPrimeMeridian(const char**) instead") +/*! @endcond */ + ; double GetPrimeMeridian( const char ** = nullptr ) const; /*! @cond Doxygen_Suppress */ double GetPrimeMeridian( std::nullptr_t ) const diff --git a/gdal/port/cpl_conv.h b/gdal/port/cpl_conv.h index a3ee4e7318d..e6f03396e32 100644 --- a/gdal/port/cpl_conv.h +++ b/gdal/port/cpl_conv.h @@ -178,7 +178,7 @@ const char CPL_DLL *CPLLaunderForFilename(const char* pszName, /* -------------------------------------------------------------------- */ /** Callback for CPLPushFileFinder */ -typedef const char *(*CPLFileFinder)(const char *, const char *); +typedef char const *(*CPLFileFinder)(const char *, const char *); const char CPL_DLL *CPLFindFile(const char *pszClass, const char *pszBasename);
