GDAL 3.12.2__tar.gz → 3.12.4__tar.gz

{gdal-3.12.2 → gdal-3.12.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GDAL
-Version: 3.12.2
+Version: 3.12.4
 Summary: GDAL: Geospatial Data Abstraction Library
 Home-page: http://www.gdal.org
 Author: Frank Warmerdam, Howard Butler, Even Rouault
@@ -65,7 +65,7 @@ special about gdal.)
 
  * SWIG (4 or greater).
 
- * libgdal (3.12.2 or greater).
+ * libgdal (3.12.4 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.12.2 → gdal-3.12.4}/README.rst

@@ -31,7 +31,7 @@ special about gdal.)
 
  * SWIG (4 or greater).
 
- * libgdal (3.12.2 or greater).
+ * libgdal (3.12.4 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.12.2 → gdal-3.12.4}/extensions/gdal_wrap.cpp

@@ -4388,14 +4388,22 @@ void CPL_STDCALL PyCPLErrorHandler(CPLErr eErrClass, CPLErrorNum err_no, const c
         return;
     }
 
-    void* user_data = CPLGetErrorHandlerUserData();
+    PyObject* callable = (PyObject*)CPLGetErrorHandlerUserData();
     PyObject *psArgs;
 
     SWIG_PYTHON_THREAD_BEGIN_BLOCK;
 
-    psArgs = Py_BuildValue("(iis)", eErrClass, err_no, pszErrorMsg );
-    PyObject_CallObject( (PyObject*)user_data, psArgs);
-    Py_XDECREF(psArgs);
+    if (!PyCallable_Check(callable))
+    {
+        PyErr_SetString( PyExc_RuntimeError,
+                         "PyCPLErrorHandler: Critical error: callback is not callable" );
+    }
+    else
+    {
+        psArgs = Py_BuildValue("(iis)", eErrClass, err_no, pszErrorMsg );
+        PyObject_CallObject( callable, psArgs);
+        Py_XDECREF(psArgs);
+    }
 
     SWIG_PYTHON_THREAD_END_BLOCK;
 }
@@ -4416,7 +4424,9 @@ void CPL_STDCALL PyCPLErrorHandler(CPLErr eErrClass, CPLErrorNum err_no, const c
      void* user_data = CPLGetErrorHandlerUserData();
      if( user_data != NULL )
      {
+         SWIG_PYTHON_THREAD_BEGIN_BLOCK;
          Py_XDECREF((PyObject*)user_data);
+         SWIG_PYTHON_THREAD_END_BLOCK;
      }
      CPLPopErrorHandler();
   }

{gdal-3.12.2 → gdal-3.12.4}/gdal-utils/GDAL.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GDAL
-Version: 3.12.2
+Version: 3.12.4
 Summary: GDAL: Geospatial Data Abstraction Library
 Home-page: http://www.gdal.org
 Author: Frank Warmerdam, Howard Butler, Even Rouault
@@ -65,7 +65,7 @@ special about gdal.)
 
  * SWIG (4 or greater).
 
- * libgdal (3.12.2 or greater).
+ * libgdal (3.12.4 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.12.2 → gdal-3.12.4}/gdal-utils/osgeo_utils/__init__.py

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

{gdal-3.12.2 → gdal-3.12.4}/gdal-utils/osgeo_utils/gdal2tiles.py

@@ -2406,7 +2406,7 @@ class GDAL2Tiles:
         )
         self.omaxy = self.out_gt[3]
         self.ominy = (
-            self.out_gt[3] - self.warped_input_dataset.RasterYSize * self.out_gt[1]
+            self.out_gt[3] + self.warped_input_dataset.RasterYSize * self.out_gt[5]
         )
         # Note: maybe round(x, 14) to avoid the gdal_translate behavior, when 0 becomes -1e-15
 

{gdal-3.12.2 → gdal-3.12.4}/gdal-utils/osgeo_utils/ogrmerge.py

@@ -92,8 +92,13 @@ def _GetGeomType(src_geom_type_name):
 #############################################################################
 
 
-def _Esc(x):
-    return gdal.EscapeString(x, gdal.CPLES_XML).decode("UTF-8")
+def _Esc(x, element_value=False):
+    x = gdal.EscapeString(x, gdal.CPLES_XML).decode("UTF-8")
+    # Un-encoded leading or trailing spaces are remove by the CPLMiniXML parser
+    if element_value and len(x) > 0 and (ord(x[0]) <= 32 or ord(x[-1]) <= 32):
+        x = x.replace(" ", "&#x20;")  # space
+        x = x.replace("\t", "&#x09;")  # tabulation
+    return x
 
 
 class XMLWriter:
@@ -131,7 +136,7 @@ class XMLWriter:
             self._indent(),
             name,
             xml_attrs,
-            _Esc(value.encode("utf-8")),
+            _Esc(value.encode("utf-8"), element_value=True),
             name,
         )
         x = x.encode("utf-8")
@@ -961,7 +966,7 @@ def ogrmerge(
             if not update and not overwrite_ds:
                 print(
                     "ERROR: Destination dataset already exists, "
-                    + "but -update nor -overwrite_ds are specified",
+                    + "but neither -update nor -overwrite_ds are specified",
                     file=sys.stderr,
                 )
                 return 1
@@ -990,7 +995,7 @@ def ogrmerge(
         if gdal.VSIStatL(dst_filename) and not overwrite_ds:
             print(
                 "ERROR: Destination dataset already exists, "
-                + "but -overwrite_ds are specified",
+                + "but -overwrite_ds is not specified",
                 file=sys.stderr,
             )
             return 1

{gdal-3.12.2 → gdal-3.12.4}/osgeo/gdal.py

@@ -9968,13 +9968,13 @@ class Band(MajorObject):
            ----------
            pixel : float
            line : float
-           interpolation : str
+           interpolation : int
                Resampling algorithm to use. One of:
 
-               - ``nearest``
-               - ``bilinear``
-               - ``cubic``
-               - ``cubicspline``
+               - :py:const:`GRIORA_NearestNeighbour`
+               - :py:const:`GRIORA_Bilinear`
+               - :py:const:`GRIORA_Cubic`
+               - :py:const:`GRIORA_CubicSpline`
 
            Returns
            -------
@@ -10030,13 +10030,13 @@ class Band(MajorObject):
                taking into account the data-axis-to-crs-axis mapping
            srs : object
                :py:class:`osr.SpatialReference`. If set, override the natural CRS in which geolocX, geolocY are expressed
-           interpolation : str
+           interpolation : int
                Resampling algorithm to use. One of:
 
-               - ``nearest``
-               - ``bilinear``
-               - ``cubic``
-               - ``cubicspline``
+               - :py:const:`GRIORA_NearestNeighbour`
+               - :py:const:`GRIORA_Bilinear`
+               - :py:const:`GRIORA_Cubic`
+               - :py:const:`GRIORA_CubicSpline`
 
            Returns
            -------
@@ -10051,10 +10051,7 @@ class Band(MajorObject):
            >>> with gdal.Open("byte.tif") as ds:
            ...    wgs84_srs = osr.SpatialReference("WGS84")
            ...    wgs84_srs.SetAxisMappingStrategy(osr.OAMS_TRADITIONAL_GIS_ORDER)
-           ...    ds.GetRasterBand(1).InterpolateAtGeolocation(longitude_degree, \
-                                                               latitude_degree, \
-                                                               wgs84_srs, \
-                                                               gdal.GRIORA_Bilinear)
+           ...    ds.GetRasterBand(1).InterpolateAtGeolocation(longitude_degree, latitude_degree, wgs84_srs, gdal.GRIORA_Bilinear)
            135.62  # interpolated value, rtol: 1e-3
         """
 

{gdal-3.12.2 → gdal-3.12.4}/setup.py

@@ -18,7 +18,7 @@ from setuptools import setup
 from setuptools import find_packages
 from setuptools import Extension
 
-version = '3.12.2'
+version = '3.12.4'
 
 # 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++'