GDAL 3.9.0__tar.gz → 3.9.2__tar.gz

{GDAL-3.9.0 → gdal-3.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GDAL
-Version: 3.9.0
+Version: 3.9.2
 Summary: GDAL: Geospatial Data Abstraction Library
 Home-page: http://www.gdal.org
 Author: Frank Warmerdam, Howard Butler, Even Rouault
@@ -44,7 +44,7 @@ reference documentation, but the https://gdal.org/api/python_bindings.html#tutor
 Dependencies
 ------------
 
- * libgdal (3.9.0 or greater) and header files (gdal-devel)
+ * libgdal (3.9.2 or greater) and header files (gdal-devel)
  * numpy (1.0.0 or greater) and header files (numpy-devel) (not explicitly
    required, but many examples and utilities will not work without it)
 
@@ -111,6 +111,7 @@ This is most often due to pip reusing a cached GDAL installation.
 Verify that the necessary dependencies have been installed and then run the following to force a clean build:
 
 ::
+
     pip install --no-cache --force-reinstall gdal[numpy]=="$(gdal-config --version).*"
 
 

{GDAL-3.9.0 → gdal-3.9.2}/README.rst

@@ -13,7 +13,7 @@ reference documentation, but the https://gdal.org/api/python_bindings.html#tutor
 Dependencies
 ------------
 
- * libgdal (3.9.0 or greater) and header files (gdal-devel)
+ * libgdal (3.9.2 or greater) and header files (gdal-devel)
  * numpy (1.0.0 or greater) and header files (numpy-devel) (not explicitly
    required, but many examples and utilities will not work without it)
 
@@ -80,6 +80,7 @@ This is most often due to pip reusing a cached GDAL installation.
 Verify that the necessary dependencies have been installed and then run the following to force a clean build:
 
 ::
+
     pip install --no-cache --force-reinstall gdal[numpy]=="$(gdal-config --version).*"
 
 

{GDAL-3.9.0 → gdal-3.9.2}/extensions/gdal_array_wrap.cpp

@@ -3552,7 +3552,7 @@ void _DontUseExceptions() {
 
 static int _UserHasSpecifiedIfUsingExceptions()
 {
-    return bUserHasSpecifiedIfUsingExceptions;
+    return bUserHasSpecifiedIfUsingExceptions || bUseExceptionsLocal >= 0;
 }
 
 
@@ -6456,7 +6456,7 @@ SWIGINTERN PyObject *_wrap_GetUseExceptions(PyObject *self, PyObject *args) {
   if (!SWIG_Python_UnpackTuple(args, "GetUseExceptions", 0, 0, 0)) SWIG_fail;
   {
 #ifdef SED_HACKS
-    if( bUseExceptions ) bLocalUseExceptionsCode = FALSE;
+    if( ReturnSame(TRUE) ) bLocalUseExceptionsCode = FALSE;
 #endif
     result = GetUseExceptions();
   }
@@ -6475,7 +6475,7 @@ SWIGINTERN PyObject *_wrap__GetExceptionsLocal(PyObject *self, PyObject *args) {
   if (!SWIG_Python_UnpackTuple(args, "_GetExceptionsLocal", 0, 0, 0)) SWIG_fail;
   {
 #ifdef SED_HACKS
-    if( bUseExceptions ) bLocalUseExceptionsCode = FALSE;
+    if( ReturnSame(TRUE) ) bLocalUseExceptionsCode = FALSE;
 #endif
     {
       SWIG_PYTHON_THREAD_BEGIN_ALLOW;
@@ -6507,7 +6507,7 @@ SWIGINTERN PyObject *_wrap__SetExceptionsLocal(PyObject *self, PyObject *args) {
   arg1 = static_cast< int >(val1);
   {
 #ifdef SED_HACKS
-    if( bUseExceptions ) bLocalUseExceptionsCode = FALSE;
+    if( ReturnSame(TRUE) ) bLocalUseExceptionsCode = FALSE;
 #endif
     {
       SWIG_PYTHON_THREAD_BEGIN_ALLOW;
@@ -6564,7 +6564,7 @@ SWIGINTERN PyObject *_wrap__UserHasSpecifiedIfUsingExceptions(PyObject *self, Py
   if (!SWIG_Python_UnpackTuple(args, "_UserHasSpecifiedIfUsingExceptions", 0, 0, 0)) SWIG_fail;
   {
 #ifdef SED_HACKS
-    if( bUseExceptions ) bLocalUseExceptionsCode = FALSE;
+    if( ReturnSame(TRUE) ) bLocalUseExceptionsCode = FALSE;
 #endif
     {
       SWIG_PYTHON_THREAD_BEGIN_ALLOW;

{GDAL-3.9.0 → gdal-3.9.2}/extensions/gdal_wrap.cpp

@@ -3509,7 +3509,7 @@ void _DontUseExceptions() {
 
 static int _UserHasSpecifiedIfUsingExceptions()
 {
-    return bUserHasSpecifiedIfUsingExceptions;
+    return bUserHasSpecifiedIfUsingExceptions || bUseExceptionsLocal >= 0;
 }
 
 
@@ -5033,9 +5033,6 @@ void GDAL_GCP_Id_set( GDAL_GCP *gcp, const char * pszId ) {
 }
 
 
-#define t_output_helper SWIG_Python_AppendOutput
-
-
 static PyObject *
 CreateTupleFromDoubleArray( const double *first, size_t size ) {
   PyObject *out = PyTuple_New( size );
@@ -6625,8 +6622,8 @@ SWIGINTERN CPLErr GDALMDArrayHS_Read(GDALMDArrayHS *self,int nDims1,GUIntBig *ar
 SWIGINTERN CPLErr GDALMDArrayHS_WriteStringArray(GDALMDArrayHS *self,int nDims1,GUIntBig *array_start_idx,int nDims2,GUIntBig *count,int nDims3,GIntBig *array_step,GDALExtendedDataTypeHS *buffer_datatype,char **options){
 
     const int nExpectedDims = (int)GDALMDArrayGetDimensionCount(self);
-    std::vector<size_t> count_internal(nExpectedDims);
-    if( nExpectedDims != 1 )
+    std::vector<size_t> count_internal(nExpectedDims + 1);
+    if( nExpectedDims > 1 )
     {
         CPLError(CE_Failure, CPLE_AppDefined,
             "Unsupported number of dimensions");
@@ -6641,23 +6638,26 @@ SWIGINTERN CPLErr GDALMDArrayHS_WriteStringArray(GDALMDArrayHS *self,int nDims1,
             return CE_Failure;
         }
     }
-    if( nDims1 != 1 )
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-            "Wrong number of values in array_start_idx");
-        return CE_Failure;
-    }
-    if( nDims2 != 1 )
+    if( nExpectedDims == 1 )
     {
-        CPLError(CE_Failure, CPLE_AppDefined,
-            "Wrong number of values in count");
-        return CE_Failure;
-    }
-    if( nDims3 != 1 )
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-            "Wrong number of values in array_step");
-        return CE_Failure;
+        if( nDims1 != 1 )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                "Wrong number of values in array_start_idx");
+            return CE_Failure;
+        }
+        if( nDims2 != 1 )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                "Wrong number of values in count");
+            return CE_Failure;
+        }
+        if( nDims3 != 1 )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                "Wrong number of values in array_step");
+            return CE_Failure;
+        }
     }
 
     CPLErr eErr = GDALMDArrayWrite(self,
@@ -9422,7 +9422,7 @@ SWIGINTERN PyObject *_wrap_GetUseExceptions(PyObject *self, PyObject *args) {
   if (!SWIG_Python_UnpackTuple(args, "GetUseExceptions", 0, 0, 0)) SWIG_fail;
   {
 #ifdef SED_HACKS
-    if( bUseExceptions ) bLocalUseExceptionsCode = FALSE;
+    if( ReturnSame(TRUE) ) bLocalUseExceptionsCode = FALSE;
 #endif
     result = GetUseExceptions();
   }
@@ -9441,7 +9441,7 @@ SWIGINTERN PyObject *_wrap__GetExceptionsLocal(PyObject *self, PyObject *args) {
   if (!SWIG_Python_UnpackTuple(args, "_GetExceptionsLocal", 0, 0, 0)) SWIG_fail;
   {
 #ifdef SED_HACKS
-    if( bUseExceptions ) bLocalUseExceptionsCode = FALSE;
+    if( ReturnSame(TRUE) ) bLocalUseExceptionsCode = FALSE;
 #endif
     {
       SWIG_PYTHON_THREAD_BEGIN_ALLOW;
@@ -9473,7 +9473,7 @@ SWIGINTERN PyObject *_wrap__SetExceptionsLocal(PyObject *self, PyObject *args) {
   arg1 = static_cast< int >(val1);
   {
 #ifdef SED_HACKS
-    if( bUseExceptions ) bLocalUseExceptionsCode = FALSE;
+    if( ReturnSame(TRUE) ) bLocalUseExceptionsCode = FALSE;
 #endif
     {
       SWIG_PYTHON_THREAD_BEGIN_ALLOW;
@@ -9530,7 +9530,7 @@ SWIGINTERN PyObject *_wrap__UserHasSpecifiedIfUsingExceptions(PyObject *self, Py
   if (!SWIG_Python_UnpackTuple(args, "_UserHasSpecifiedIfUsingExceptions", 0, 0, 0)) SWIG_fail;
   {
 #ifdef SED_HACKS
-    if( bUseExceptions ) bLocalUseExceptionsCode = FALSE;
+    if( ReturnSame(TRUE) ) bLocalUseExceptionsCode = FALSE;
 #endif
     {
       SWIG_PYTHON_THREAD_BEGIN_ALLOW;
@@ -19546,7 +19546,11 @@ SWIGINTERN PyObject *_wrap_GCPsToGeoTransform(PyObject *self, PyObject *args) {
   {
     /* %typemap(argout) (double argout[ANY]) */
     PyObject *out = CreateTupleFromDoubleArray( arg3, 6 );
-    resultobj = t_output_helper(resultobj,out);
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,out,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,out);
+#endif
   }
   {
     /* %typemap(freearg) (int nGCPs, GDAL_GCP const *pGCPs ) */
@@ -20799,7 +20803,11 @@ SWIGINTERN PyObject *_wrap_Dataset_GetGeoTransform(PyObject *self, PyObject *arg
     else {
       r = CreateTupleFromDoubleArray(arg2, 6);
     }
-    resultobj = t_output_helper(resultobj,r);
+#if 0x040101 >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -23399,14 +23407,19 @@ SWIGINTERN PyObject *_wrap_Dataset_GetNextFeature(PyObject *self, PyObject *args
         PyList_SetItem(resultobj, 0, Py_None);
       }
       
+      PyObject* r;
       if ( !*arg4 ) {
+        r = Py_None;
         Py_INCREF(Py_None);
-        resultobj = SWIG_Python_AppendOutput(resultobj, Py_None);
       }
       else {
-        resultobj = SWIG_Python_AppendOutput(resultobj,
-          SWIG_NewPointerObj(SWIG_as_voidptr( *arg4), SWIGTYPE_p_OGRLayerShadow, 0 ));
+        r = SWIG_NewPointerObj(SWIG_as_voidptr( *arg4), SWIGTYPE_p_OGRLayerShadow, 0 );
       }
+#if SWIG_VERSION >= 0x040300
+      resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+      resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
     }
     
     if( arg3 )
@@ -23416,7 +23429,12 @@ SWIGINTERN PyObject *_wrap_Dataset_GetNextFeature(PyObject *self, PyObject *args
         resultobj = PyList_New(1);
         PyList_SetItem(resultobj, 0, Py_None);
       }
-      resultobj = SWIG_Python_AppendOutput(resultobj, PyFloat_FromDouble( *arg5));
+      PyObject* r = PyFloat_FromDouble( *arg5);
+#if SWIG_VERSION >= 0x040300
+      resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+      resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
     }
     
   }
@@ -31135,12 +31153,15 @@ SWIGINTERN PyObject *_wrap_MDArray_GetNoDataValueAsDouble(PyObject *self, PyObje
     if ( !*arg3 ) {
       Py_INCREF(Py_None);
       r = Py_None;
-      resultobj = t_output_helper(resultobj,r);
     }
     else {
       r = PyFloat_FromDouble( *arg2 );
-      resultobj = t_output_helper(resultobj,r);
     }
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -31201,12 +31222,15 @@ SWIGINTERN PyObject *_wrap_MDArray_GetNoDataValueAsInt64(PyObject *self, PyObjec
     if ( !*arg3 ) {
       Py_INCREF(Py_None);
       r = Py_None;
-      resultobj = t_output_helper(resultobj,r);
     }
     else {
       r = PyLong_FromLongLong( *arg2 );
-      resultobj = t_output_helper(resultobj,r);
     }
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -31267,12 +31291,15 @@ SWIGINTERN PyObject *_wrap_MDArray_GetNoDataValueAsUInt64(PyObject *self, PyObje
     if ( !*arg3 ) {
       Py_INCREF(Py_None);
       r = Py_None;
-      resultobj = t_output_helper(resultobj,r);
     }
     else {
       r = PyLong_FromUnsignedLongLong( *arg2 );
-      resultobj = t_output_helper(resultobj,r);
     }
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -31714,12 +31741,15 @@ SWIGINTERN PyObject *_wrap_MDArray_GetOffset(PyObject *self, PyObject *args) {
     if ( !*arg3 ) {
       Py_INCREF(Py_None);
       r = Py_None;
-      resultobj = t_output_helper(resultobj,r);
     }
     else {
       r = PyFloat_FromDouble( *arg2 );
-      resultobj = t_output_helper(resultobj,r);
     }
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -31825,12 +31855,15 @@ SWIGINTERN PyObject *_wrap_MDArray_GetScale(PyObject *self, PyObject *args) {
     if ( !*arg3 ) {
       Py_INCREF(Py_None);
       r = Py_None;
-      resultobj = t_output_helper(resultobj,r);
     }
     else {
       r = PyFloat_FromDouble( *arg2 );
-      resultobj = t_output_helper(resultobj,r);
     }
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -36405,7 +36438,11 @@ SWIGINTERN PyObject *_wrap_Band_GetActualBlockSize(PyObject *self, PyObject *arg
       PyTuple_SetItem( r, 0, PyLong_FromLong(*arg4) );
       PyTuple_SetItem( r, 1, PyLong_FromLong(*arg5) );
     }
-    resultobj = t_output_helper(resultobj,r);
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -36660,12 +36697,15 @@ SWIGINTERN PyObject *_wrap_Band_GetNoDataValue(PyObject *self, PyObject *args) {
     if ( !*arg3 ) {
       Py_INCREF(Py_None);
       r = Py_None;
-      resultobj = t_output_helper(resultobj,r);
     }
     else {
       r = PyFloat_FromDouble( *arg2 );
-      resultobj = t_output_helper(resultobj,r);
     }
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -36726,12 +36766,15 @@ SWIGINTERN PyObject *_wrap_Band_GetNoDataValueAsInt64(PyObject *self, PyObject *
     if ( !*arg3 ) {
       Py_INCREF(Py_None);
       r = Py_None;
-      resultobj = t_output_helper(resultobj,r);
     }
     else {
       r = PyLong_FromLongLong( *arg2 );
-      resultobj = t_output_helper(resultobj,r);
     }
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -36792,12 +36835,15 @@ SWIGINTERN PyObject *_wrap_Band_GetNoDataValueAsUInt64(PyObject *self, PyObject
     if ( !*arg3 ) {
       Py_INCREF(Py_None);
       r = Py_None;
-      resultobj = t_output_helper(resultobj,r);
     }
     else {
       r = PyLong_FromUnsignedLongLong( *arg2 );
-      resultobj = t_output_helper(resultobj,r);
     }
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -37280,12 +37326,15 @@ SWIGINTERN PyObject *_wrap_Band_GetMinimum(PyObject *self, PyObject *args) {
     if ( !*arg3 ) {
       Py_INCREF(Py_None);
       r = Py_None;
-      resultobj = t_output_helper(resultobj,r);
     }
     else {
       r = PyFloat_FromDouble( *arg2 );
-      resultobj = t_output_helper(resultobj,r);
     }
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -37346,12 +37395,15 @@ SWIGINTERN PyObject *_wrap_Band_GetMaximum(PyObject *self, PyObject *args) {
     if ( !*arg3 ) {
       Py_INCREF(Py_None);
       r = Py_None;
-      resultobj = t_output_helper(resultobj,r);
     }
     else {
       r = PyFloat_FromDouble( *arg2 );
-      resultobj = t_output_helper(resultobj,r);
     }
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -37412,12 +37464,15 @@ SWIGINTERN PyObject *_wrap_Band_GetOffset(PyObject *self, PyObject *args) {
     if ( !*arg3 ) {
       Py_INCREF(Py_None);
       r = Py_None;
-      resultobj = t_output_helper(resultobj,r);
     }
     else {
       r = PyFloat_FromDouble( *arg2 );
-      resultobj = t_output_helper(resultobj,r);
     }
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -37478,12 +37533,15 @@ SWIGINTERN PyObject *_wrap_Band_GetScale(PyObject *self, PyObject *args) {
     if ( !*arg3 ) {
       Py_INCREF(Py_None);
       r = Py_None;
-      resultobj = t_output_helper(resultobj,r);
     }
     else {
       r = PyFloat_FromDouble( *arg2 );
-      resultobj = t_output_helper(resultobj,r);
     }
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -38221,7 +38279,11 @@ SWIGINTERN PyObject *_wrap_Band_ComputeRasterMinMax(PyObject *self, PyObject *ar
     else {
       r = CreateTupleFromDoubleArray(arg2, 2);
     }
-    resultobj = t_output_helper(resultobj,r);
+#if 0x040101 >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -38286,7 +38348,11 @@ SWIGINTERN PyObject *_wrap_Band_ComputeBandStats(PyObject *self, PyObject *args)
   {
     /* %typemap(argout) (double argout[ANY]) */
     PyObject *out = CreateTupleFromDoubleArray( arg2, 2 );
-    resultobj = t_output_helper(resultobj,out);
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,out,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,out);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -46134,7 +46200,11 @@ SWIGINTERN PyObject *_wrap_IsLineOfSightVisible(PyObject *self, PyObject *args,
     PyTuple_SetItem( r, 0, PyBool_FromLong(*arg8) );
     PyTuple_SetItem( r, 1, PyLong_FromLong(*arg9) );
     PyTuple_SetItem( r, 2, PyLong_FromLong(*arg10) );
-    resultobj = t_output_helper(resultobj,r);
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,r,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,r);
+#endif
   }
   {
     /* %typemap(freearg) char **dict */
@@ -46469,7 +46539,11 @@ SWIGINTERN PyObject *_wrap_GDALTransformerInfoShadow_TransformPoint__SWIG_0(PyOb
   {
     /* %typemap(argout) (double argout[ANY]) */
     PyObject *out = CreateTupleFromDoubleArray( arg3, 3 );
-    resultobj = t_output_helper(resultobj,out);
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,out,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,out);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -46558,7 +46632,11 @@ SWIGINTERN PyObject *_wrap_GDALTransformerInfoShadow_TransformPoint__SWIG_1(PyOb
   {
     /* %typemap(argout) (double argout[ANY]) */
     PyObject *out = CreateTupleFromDoubleArray( arg2, 3 );
-    resultobj = t_output_helper(resultobj,out);
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,out,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,out);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -47307,7 +47385,11 @@ SWIGINTERN PyObject *_wrap_SuggestedWarpOutputRes_GetGeotransform(PyObject *self
   {
     /* %typemap(argout) (double argout[ANY]) */
     PyObject *out = CreateTupleFromDoubleArray( arg2, 6 );
-    resultobj = t_output_helper(resultobj,out);
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,out,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,out);
+#endif
   }
   if ( ReturnSame(bLocalUseExceptionsCode) ) { CPLErr eclass = CPLGetLastErrorType(); if ( eclass == CE_Failure || eclass == CE_Fatal ) { Py_XDECREF(resultobj); SWIG_Error( SWIG_RuntimeError, CPLGetLastErrorMsg() ); return NULL; } }
   return resultobj;
@@ -47750,7 +47832,11 @@ SWIGINTERN PyObject *_wrap_InvGeoTransform(PyObject *self, PyObject *args) {
   {
     /* %typemap(argout) (double argout[ANY]) */
     PyObject *out = CreateTupleFromDoubleArray( arg2, 6 );
-    resultobj = t_output_helper(resultobj,out);
+#if SWIG_VERSION >= 0x040300
+    resultobj = SWIG_Python_AppendOutput(resultobj,out,$isvoid);
+#else
+    resultobj = SWIG_Python_AppendOutput(resultobj,out);
+#endif
   }
   {
     /* %typemap(ret) IF_FALSE_RETURN_NONE */

{GDAL-3.9.0 → gdal-3.9.2}/extensions/gnm_wrap.cpp

@@ -3287,7 +3287,7 @@ void _DontUseExceptions() {
 
 static int _UserHasSpecifiedIfUsingExceptions()
 {
-    return bUserHasSpecifiedIfUsingExceptions;
+    return bUserHasSpecifiedIfUsingExceptions || bUseExceptionsLocal >= 0;
 }
 
 
@@ -4215,7 +4215,7 @@ SWIGINTERN PyObject *_wrap_GetUseExceptions(PyObject *self, PyObject *args) {
   if (!SWIG_Python_UnpackTuple(args, "GetUseExceptions", 0, 0, 0)) SWIG_fail;
   {
 #ifdef SED_HACKS
-    if( bUseExceptions ) bLocalUseExceptionsCode = FALSE;
+    if( ReturnSame(TRUE) ) bLocalUseExceptionsCode = FALSE;
 #endif
     result = GetUseExceptions();
   }
@@ -4234,7 +4234,7 @@ SWIGINTERN PyObject *_wrap__GetExceptionsLocal(PyObject *self, PyObject *args) {
   if (!SWIG_Python_UnpackTuple(args, "_GetExceptionsLocal", 0, 0, 0)) SWIG_fail;
   {
 #ifdef SED_HACKS
-    if( bUseExceptions ) bLocalUseExceptionsCode = FALSE;
+    if( ReturnSame(TRUE) ) bLocalUseExceptionsCode = FALSE;
 #endif
     {
       SWIG_PYTHON_THREAD_BEGIN_ALLOW;
@@ -4266,7 +4266,7 @@ SWIGINTERN PyObject *_wrap__SetExceptionsLocal(PyObject *self, PyObject *args) {
   arg1 = static_cast< int >(val1);
   {
 #ifdef SED_HACKS
-    if( bUseExceptions ) bLocalUseExceptionsCode = FALSE;
+    if( ReturnSame(TRUE) ) bLocalUseExceptionsCode = FALSE;
 #endif
     {
       SWIG_PYTHON_THREAD_BEGIN_ALLOW;
@@ -4323,7 +4323,7 @@ SWIGINTERN PyObject *_wrap__UserHasSpecifiedIfUsingExceptions(PyObject *self, Py
   if (!SWIG_Python_UnpackTuple(args, "_UserHasSpecifiedIfUsingExceptions", 0, 0, 0)) SWIG_fail;
   {
 #ifdef SED_HACKS
-    if( bUseExceptions ) bLocalUseExceptionsCode = FALSE;
+    if( ReturnSame(TRUE) ) bLocalUseExceptionsCode = FALSE;
 #endif
     {
       SWIG_PYTHON_THREAD_BEGIN_ALLOW;