GDAL 3.11.0__tar.gz → 3.11.2__tar.gz

{gdal-3.11.0 → gdal-3.11.2}/PKG-INFO

@@ -1,13 +1,13 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: GDAL
-Version: 3.11.0
+Version: 3.11.2
 Summary: GDAL: Geospatial Data Abstraction Library
 Home-page: http://www.gdal.org
 Author: Frank Warmerdam, Howard Butler, Even Rouault
 Author-email: warmerdam@pobox.com
 Maintainer: GDAL contributors
 Maintainer-email: GDAL contributors <gdal-dev@lists.osgeo.org>
-License: MIT
+License-Expression: MIT
 Project-URL: Homepage, https://gdal.org
 Project-URL: Documentation, https://gdal.org
 Project-URL: Repository, https://github.com/OSGeo/GDAL.git
@@ -17,7 +17,6 @@ Keywords: gis,raster,vector
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: C
@@ -28,6 +27,10 @@ Requires-Python: >=3.8.0
 Description-Content-Type: text/x-rst
 Provides-Extra: numpy
 Requires-Dist: numpy>1.0.0; extra == "numpy"
+Dynamic: author-email
+Dynamic: home-page
+Dynamic: maintainer
+Dynamic: requires-python
 
 
 GDAL/OGR in Python
@@ -60,7 +63,7 @@ special about gdal.)
 
  * SWIG (4 or greater).
 
- * libgdal (3.11.0 or greater).
+ * libgdal (3.11.2 or greater).
 
  * numpy (1.0.0 or greater).  This is not force-required by the build,
    but many examples and utilities will not work without it.  At least

{gdal-3.11.0 → gdal-3.11.2}/README.rst

@@ -29,7 +29,7 @@ special about gdal.)
 
  * SWIG (4 or greater).
 
- * libgdal (3.11.0 or greater).
+ * libgdal (3.11.2 or greater).
 
  * numpy (1.0.0 or greater).  This is not force-required by the build,
    but many examples and utilities will not work without it.  At least

{gdal-3.11.0 → gdal-3.11.2}/extensions/gdal_array_wrap.cpp

@@ -8703,7 +8703,11 @@ SWIG_init(void) {
   SWIG_InstallConstants(d,swig_const_table);
   
   
+#if SWIG_VERSION >= 0x040400
+  import_array1(-1);
+#else
   import_array();
+#endif
   PyDateTime_IMPORT;
   GDALRegister_NUMPY();
   

{gdal-3.11.0 → gdal-3.11.2}/extensions/gdal_wrap.cpp

@@ -6242,7 +6242,14 @@ SWIGINTERN OGRFieldDomainShadow *GDALDatasetShadow_GetFieldDomain(GDALDatasetSha
     return (OGRFieldDomainShadow*) GDALDatasetGetFieldDomain(self, name);
   }
 SWIGINTERN bool GDALDatasetShadow_AddFieldDomain(GDALDatasetShadow *self,OGRFieldDomainShadow *fieldDomain){
-      return GDALDatasetAddFieldDomain(self, (OGRFieldDomainH)fieldDomain, NULL);
+      char* pszReason = NULL;
+      if( !GDALDatasetAddFieldDomain(self, (OGRFieldDomainH)fieldDomain, &pszReason) )
+      {
+          CPLError(CE_Failure, CPLE_AppDefined, "%s", pszReason);
+          CPLFree(pszReason);
+          return false;
+      }
+      return true;
   }
 SWIGINTERN bool GDALDatasetShadow_DeleteFieldDomain(GDALDatasetShadow *self,char const *name){
       return GDALDatasetDeleteFieldDomain(self, name, NULL);
@@ -7948,7 +7955,7 @@ SWIGINTERN GDALRasterBandShadow *GDALRasterBandShadow_GetOverview(GDALRasterBand
     return (GDALRasterBandShadow*) GDALGetOverview( self, i );
   }
 SWIGINTERN GDALRasterBandShadow *GDALRasterBandShadow_GetSampleOverview(GDALRasterBandShadow *self,GUIntBig nDesiredSamples){
-    return (GDALRasterBandShadow*) GDALGetRasterSampleOverview( self, nDesiredSamples );
+    return (GDALRasterBandShadow*) GDALGetRasterSampleOverviewEx( self, nDesiredSamples );
   }
 SWIGINTERN int GDALRasterBandShadow_Checksum(GDALRasterBandShadow *self,int xoff=0,int yoff=0,int *xsize=0,int *ysize=0){
     int nxsize = (xsize!=0) ? *xsize : GDALGetRasterBandXSize( self );
@@ -43252,10 +43259,8 @@ SWIGINTERN PyObject *_wrap_Band_GetDefaultHistogram(PyObject *self, PyObject *ar
   void *arg8 = (void *) NULL ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  void *argp2 = 0 ;
-  int res2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  double val2 ;
+  double val3 ;
   void *argp4 = 0 ;
   int res4 = 0 ;
   void *argp5 = 0 ;
@@ -43298,18 +43303,34 @@ SWIGINTERN PyObject *_wrap_Band_GetDefaultHistogram(PyObject *self, PyObject *ar
   }
   arg1 = reinterpret_cast< GDALRasterBandShadow * >(argp1);
   if (obj1) {
-    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_double, 0 |  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Band_GetDefaultHistogram" "', argument " "2"" of type '" "double *""'"); 
+    {
+      /* %typemap(in) (double *optional_##double) */
+      if ( obj1 == Py_None ) {
+        arg2 = 0;
+      }
+      else if ( PyArg_Parse( obj1,"d" ,&val2 ) ) {
+        arg2 = (double *) &val2;
+      }
+      else {
+        PyErr_SetString( PyExc_TypeError, "Invalid Parameter" );
+        SWIG_fail;
+      }
     }
-    arg2 = reinterpret_cast< double * >(argp2);
   }
   if (obj2) {
-    res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_double, 0 |  0 );
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Band_GetDefaultHistogram" "', argument " "3"" of type '" "double *""'"); 
+    {
+      /* %typemap(in) (double *optional_##double) */
+      if ( obj2 == Py_None ) {
+        arg3 = 0;
+      }
+      else if ( PyArg_Parse( obj2,"d" ,&val3 ) ) {
+        arg3 = (double *) &val3;
+      }
+      else {
+        PyErr_SetString( PyExc_TypeError, "Invalid Parameter" );
+        SWIG_fail;
+      }
     }
-    arg3 = reinterpret_cast< double * >(argp3);
   }
   if (obj3) {
     res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_int, 0 |  0 );

{gdal-3.11.0 → gdal-3.11.2}/extensions/ogr_wrap.cpp

@@ -6824,35 +6824,42 @@ OGRFieldDomainShadow* CreateRangeFieldDomain( const char *name,
                                               const char* description,
                                               OGRFieldType type,
                                               OGRFieldSubType subtype,
-                                              double min,
+                                              double* min,
                                               bool minIsInclusive,
-                                              double max,
-                                              double maxIsInclusive) {
+                                              double* max,
+                                              bool maxIsInclusive) {
   OGRField sMin;
-  if( type == OFTInteger )
-      sMin.Integer = static_cast<int>(min);
-  else if( type == OFTInteger64 )
-      sMin.Integer64 = static_cast<GIntBig>(min);
-  else if( type == OFTReal )
-      sMin.Real = min;
-  else
-      return NULL;
+  if (min )
+  {
+      if( type == OFTInteger )
+          sMin.Integer = static_cast<int>(*min);
+      else if( type == OFTInteger64 )
+          sMin.Integer64 = static_cast<GIntBig>(*min);
+      else if( type == OFTReal )
+          sMin.Real = *min;
+      else
+          return NULL;
+  }
+
   OGRField sMax;
-  if( type == OFTInteger )
-      sMax.Integer = static_cast<int>(max);
-  else if( type == OFTInteger64 )
-      sMax.Integer64 = static_cast<GIntBig>(max);
-  else if( type == OFTReal )
-      sMax.Real = max;
-  else
-      return NULL;
+  if( max )
+  {
+      if( type == OFTInteger )
+          sMax.Integer = static_cast<int>(*max);
+      else if( type == OFTInteger64 )
+          sMax.Integer64 = static_cast<GIntBig>(*max);
+      else if( type == OFTReal )
+          sMax.Real = *max;
+      else
+          return NULL;
+  }
   return (OGRFieldDomainShadow*) OGR_RangeFldDomain_Create( name,
                                                             description,
                                                             type,
                                                             subtype,
-                                                            &sMin,
+                                                            min ? &sMin : NULL,
                                                             minIsInclusive,
-                                                            &sMax,
+                                                            max ? &sMax : NULL,
                                                             maxIsInclusive );
 }
 
@@ -6866,14 +6873,14 @@ OGRFieldDomainShadow* CreateRangeFieldDomainDateTime( const char *name,
                                               double maxIsInclusive) {
   OGRField sMin;
   OGRField sMax;
-  if( !OGRParseXMLDateTime(min, &sMin))
+  if( min && !OGRParseXMLDateTime(min, &sMin))
   {
     CPLError(CE_Failure, CPLE_AppDefined,
              "Invalid min: %s",
              min);
     return NULL;
   }
-  if( !OGRParseXMLDateTime(max, &sMax))
+  if( max && !OGRParseXMLDateTime(max, &sMax))
   {
     CPLError(CE_Failure, CPLE_AppDefined,
              "Invalid max: %s",
@@ -6884,9 +6891,9 @@ OGRFieldDomainShadow* CreateRangeFieldDomainDateTime( const char *name,
                                                             description,
                                                             OFTDateTime,
                                                             OFSTNone,
-                                                            &sMin,
+                                                            min ? &sMin : NULL,
                                                             minIsInclusive,
-                                                            &sMax,
+                                                            max ? &sMax : NULL,
                                                             maxIsInclusive );
 }
 
@@ -34046,10 +34053,10 @@ SWIGINTERN PyObject *_wrap_CreateRangeFieldDomain(PyObject *self, PyObject *args
   char *arg2 = (char *) 0 ;
   OGRFieldType arg3 ;
   OGRFieldSubType arg4 ;
-  double arg5 ;
+  double *arg5 = (double *) 0 ;
   bool arg6 ;
-  double arg7 ;
-  double arg8 ;
+  double *arg7 = (double *) 0 ;
+  bool arg8 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -34061,12 +34068,10 @@ SWIGINTERN PyObject *_wrap_CreateRangeFieldDomain(PyObject *self, PyObject *args
   int val4 ;
   int ecode4 = 0 ;
   double val5 ;
-  int ecode5 = 0 ;
   bool val6 ;
   int ecode6 = 0 ;
   double val7 ;
-  int ecode7 = 0 ;
-  double val8 ;
+  bool val8 ;
   int ecode8 = 0 ;
   PyObject *swig_obj[8] ;
   OGRFieldDomainShadow *result = 0 ;
@@ -34093,26 +34098,42 @@ SWIGINTERN PyObject *_wrap_CreateRangeFieldDomain(PyObject *self, PyObject *args
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CreateRangeFieldDomain" "', argument " "4"" of type '" "OGRFieldSubType""'");
   } 
   arg4 = static_cast< OGRFieldSubType >(val4);
-  ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
-  if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "CreateRangeFieldDomain" "', argument " "5"" of type '" "double""'");
-  } 
-  arg5 = static_cast< double >(val5);
+  {
+    /* %typemap(in) (double *optional_##double) */
+    if ( swig_obj[4] == Py_None ) {
+      arg5 = 0;
+    }
+    else if ( PyArg_Parse( swig_obj[4],"d" ,&val5 ) ) {
+      arg5 = (double *) &val5;
+    }
+    else {
+      PyErr_SetString( PyExc_TypeError, "Invalid Parameter" );
+      SWIG_fail;
+    }
+  }
   ecode6 = SWIG_AsVal_bool(swig_obj[5], &val6);
   if (!SWIG_IsOK(ecode6)) {
     SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "CreateRangeFieldDomain" "', argument " "6"" of type '" "bool""'");
   } 
   arg6 = static_cast< bool >(val6);
-  ecode7 = SWIG_AsVal_double(swig_obj[6], &val7);
-  if (!SWIG_IsOK(ecode7)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "CreateRangeFieldDomain" "', argument " "7"" of type '" "double""'");
-  } 
-  arg7 = static_cast< double >(val7);
-  ecode8 = SWIG_AsVal_double(swig_obj[7], &val8);
+  {
+    /* %typemap(in) (double *optional_##double) */
+    if ( swig_obj[6] == Py_None ) {
+      arg7 = 0;
+    }
+    else if ( PyArg_Parse( swig_obj[6],"d" ,&val7 ) ) {
+      arg7 = (double *) &val7;
+    }
+    else {
+      PyErr_SetString( PyExc_TypeError, "Invalid Parameter" );
+      SWIG_fail;
+    }
+  }
+  ecode8 = SWIG_AsVal_bool(swig_obj[7], &val8);
   if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CreateRangeFieldDomain" "', argument " "8"" of type '" "double""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CreateRangeFieldDomain" "', argument " "8"" of type '" "bool""'");
   } 
-  arg8 = static_cast< double >(val8);
+  arg8 = static_cast< bool >(val8);
   {
     if (!arg1) {
       SWIG_exception(SWIG_NullReferenceError,"Received a NULL pointer.");
@@ -40062,7 +40083,8 @@ static PyMethodDef SwigMethods[] = {
 		"Returns\n"
 		"--------\n"
 		"int:\n"
-		"    True if the geometry has no points, otherwise False.\n"
+		"    True if the coordinates of the geometry form a ring, by checking length\n"
+		"    and closure (self-intersection is not checked), otherwise False.\n"
 		"\n"
 		""},
 	 { "Geometry_Intersects", _wrap_Geometry_Intersects, METH_VARARGS, "\n"
@@ -40797,7 +40819,7 @@ static PyMethodDef SwigMethods[] = {
 		"\n"
 		""},
 	 { "CreateRangeFieldDomain", _wrap_CreateRangeFieldDomain, METH_VARARGS, "\n"
-		"CreateRangeFieldDomain(char const * name, char const * description, OGRFieldType type, OGRFieldSubType subtype, double min, bool minIsInclusive, double max, double maxIsInclusive) -> FieldDomain\n"
+		"CreateRangeFieldDomain(char const * name, char const * description, OGRFieldType type, OGRFieldSubType subtype, double * min, bool minIsInclusive, double * max, bool maxIsInclusive) -> FieldDomain\n"
 		"\n"
 		"Creates a new range field domain.\n"
 		"\n"

{gdal-3.11.0 → gdal-3.11.2}/gdal-utils/GDAL.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: GDAL
-Version: 3.11.0
+Version: 3.11.2
 Summary: GDAL: Geospatial Data Abstraction Library
 Home-page: http://www.gdal.org
 Author: Frank Warmerdam, Howard Butler, Even Rouault
 Author-email: warmerdam@pobox.com
 Maintainer: GDAL contributors
 Maintainer-email: GDAL contributors <gdal-dev@lists.osgeo.org>
-License: MIT
+License-Expression: MIT
 Project-URL: Homepage, https://gdal.org
 Project-URL: Documentation, https://gdal.org
 Project-URL: Repository, https://github.com/OSGeo/GDAL.git
@@ -17,7 +17,6 @@ Keywords: gis,raster,vector
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: C
@@ -28,6 +27,10 @@ Requires-Python: >=3.8.0
 Description-Content-Type: text/x-rst
 Provides-Extra: numpy
 Requires-Dist: numpy>1.0.0; extra == "numpy"
+Dynamic: author-email
+Dynamic: home-page
+Dynamic: maintainer
+Dynamic: requires-python
 
 
 GDAL/OGR in Python
@@ -60,7 +63,7 @@ special about gdal.)
 
  * SWIG (4 or greater).
 
- * libgdal (3.11.0 or greater).
+ * libgdal (3.11.2 or greater).
 
  * numpy (1.0.0 or greater).  This is not force-required by the build,
    but many examples and utilities will not work without it.  At least

{gdal-3.11.0 → gdal-3.11.2}/gdal-utils/osgeo_utils/__init__.py

@@ -1,5 +1,5 @@
 __package_name__ = "gdal-utils"
-gdal_utils_version = (3, 11, 0, 0)
+gdal_utils_version = (3, 11, 2, 0)
 __version__ = ".".join(str(i) for i in gdal_utils_version)
 __author__ = "Frank Warmerdam"
 __author_email__ = "warmerdam@pobox.com"

{gdal-3.11.0 → gdal-3.11.2}/gdal-utils/osgeo_utils/gdal2tiles.py

@@ -76,7 +76,7 @@ def isfile(path):
     """Wrapper for os.path.isfile() that can work with /vsi files too"""
     if path.startswith("/vsi"):
         stat_res = gdal.VSIStatL(path)
-        if stat is None:
+        if stat_res is None:
             return False
         return stat.S_ISREG(stat_res.mode)
     else:

{gdal-3.11.0 → gdal-3.11.2}/gdal-utils/osgeo_utils/ogrmerge.py

@@ -211,12 +211,27 @@ def process(argv, progress=None, progress_arg=None):
         elif arg == "-a_srs" and i + 1 < len(argv):
             i = i + 1
             a_srs = argv[i]
+            srs = osr.SpatialReference()
+            try:
+                srs.SetFromUserInput(a_srs)
+            except Exception:
+                raise ValueError("Invalid value for -a_srs")
         elif arg == "-s_srs" and i + 1 < len(argv):
             i = i + 1
             s_srs = argv[i]
+            srs = osr.SpatialReference()
+            try:
+                srs.SetFromUserInput(s_srs)
+            except Exception:
+                raise ValueError("Invalid value for -s_srs")
         elif arg == "-t_srs" and i + 1 < len(argv):
             i = i + 1
             t_srs = argv[i]
+            srs = osr.SpatialReference()
+            try:
+                srs.SetFromUserInput(t_srs)
+            except Exception:
+                raise ValueError("Invalid value for -t_srs")
         elif arg == "-nln" and i + 1 < len(argv):
             i = i + 1
             layer_name_template = argv[i]

{gdal-3.11.0 → gdal-3.11.2}/osgeo/ogr.py

@@ -6084,7 +6084,8 @@ class Geometry(object):
         Returns
         --------
         int:
-            True if the geometry has no points, otherwise False.
+            True if the coordinates of the geometry form a ring, by checking length
+            and closure (self-intersection is not checked), otherwise False.
 
         """
         return _ogr.Geometry_IsRing(self, *args)
@@ -7060,7 +7061,7 @@ def CreateCodedFieldDomain(*args):
 
 def CreateRangeFieldDomain(*args):
     r"""
-    CreateRangeFieldDomain(char const * name, char const * description, OGRFieldType type, OGRFieldSubType subtype, double min, bool minIsInclusive, double max, double maxIsInclusive) -> FieldDomain
+    CreateRangeFieldDomain(char const * name, char const * description, OGRFieldType type, OGRFieldSubType subtype, double * min, bool minIsInclusive, double * max, bool maxIsInclusive) -> FieldDomain
 
     Creates a new range field domain.
 

{gdal-3.11.0 → gdal-3.11.2}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=67.0.0",
+requires = ["setuptools>=77.0.3",
             "wheel",
             "oldest-supported-numpy; python_version=='3.8'",
             "numpy >=2.0.0rc1; python_version>='3.9'"]
@@ -19,12 +19,11 @@ maintainers = [
 description = "GDAL: Geospatial Data Abstraction Library"
 readme = "README.rst"
 keywords = ["gis", "raster", "vector"]
-license = {text = "MIT"}
+license = "MIT"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: C",

{gdal-3.11.0 → gdal-3.11.2}/setup.py

@@ -12,12 +12,13 @@ import sys
 from glob import glob
 from pathlib import Path
 
+import setuptools
 from setuptools.command.build_ext import build_ext
 from setuptools import setup
 from setuptools import find_packages
 from setuptools import Extension
 
-version = '3.11.0'
+version = '3.11.2'
 
 # If CXX is defined in the environment, it will be used to link the .so
 # but setuptools will be confused if it is made of several words like 'ccache g++'
@@ -157,7 +158,7 @@ def has_flag(compiler, flagname):
 # since they may be directly used by users. So we do a monkey patching of
 # easy_install.install_wrapper_scripts to install a modified
 # easy_install.delete_blockers method that does NOT remove .py files
-if sys.platform == 'win32':
+if sys.platform == 'win32' and int(setuptools.__version__.split('.')[0]) < 80:
     from setuptools.command.easy_install import easy_install
 
     original_install_wrapper_scripts = easy_install.install_wrapper_scripts
@@ -345,6 +346,12 @@ class gdal_ext(build_ext):
         else:
             ext.extra_compile_args.append("-DSWIG_PYTHON_SILENT_MEMLEAK")
 
+        # Add -isysroot on osx if used in cmake
+        if '':
+            ext.extra_compile_args.extend(['-isysroot', ''])
+            ext.extra_link_args.extend(['-isysroot', ''])
+
+
         return build_ext.build_extension(self, ext)