GDAL 3.8.3__tar.gz → 3.8.5__tar.gz

{GDAL-3.8.3 → GDAL-3.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GDAL
-Version: 3.8.3
+Version: 3.8.5
 Summary: GDAL: Geospatial Data Abstraction Library
 Home-page: http://www.gdal.org
 Author: Frank Warmerdam
@@ -38,7 +38,7 @@ reference documentation, but the https://gdal.org/api/python_bindings.html#tutor
 Dependencies
 ------------
 
- * libgdal (3.8.3 or greater) and header files (gdal-devel)
+ * libgdal (3.8.5 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)
 

{GDAL-3.8.3 → GDAL-3.8.5}/README.rst

@@ -13,7 +13,7 @@ reference documentation, but the https://gdal.org/api/python_bindings.html#tutor
 Dependencies
 ------------
 
- * libgdal (3.8.3 or greater) and header files (gdal-devel)
+ * libgdal (3.8.5 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)
 

{GDAL-3.8.3 → GDAL-3.8.5}/extensions/gdal_wrap.cpp

@@ -49966,6 +49966,11 @@ SWIGINTERN PyObject *_wrap_wrapper_GDALWarpDestDS(PyObject *self, PyObject *args
       psProgressInfo->psPyCallbackData = swig_obj[4] ;
     }
   }
+  {
+    if (!arg1) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
   {
     const int bLocalUseExceptions = GetUseExceptions();
     if ( bLocalUseExceptions ) {

{GDAL-3.8.3 → GDAL-3.8.5}/gdal-utils/GDAL.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GDAL
-Version: 3.8.3
+Version: 3.8.5
 Summary: GDAL: Geospatial Data Abstraction Library
 Home-page: http://www.gdal.org
 Author: Frank Warmerdam
@@ -38,7 +38,7 @@ reference documentation, but the https://gdal.org/api/python_bindings.html#tutor
 Dependencies
 ------------
 
- * libgdal (3.8.3 or greater) and header files (gdal-devel)
+ * libgdal (3.8.5 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)
 

{GDAL-3.8.3 → GDAL-3.8.5}/gdal-utils/osgeo_utils/__init__.py

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

{GDAL-3.8.3 → GDAL-3.8.5}/gdal-utils/osgeo_utils/gdal2tiles.py

@@ -1573,7 +1573,10 @@ def create_overview_tile(
             gdal.Unlink(aux_xml)
 
     if options.verbose:
-        logger.debug(f"\tbuild from zoom {base_tz}, tiles: %s" % ",".join(base_tiles))
+        logger.debug(
+            f"\tbuild from zoom {base_tz}, tiles: %s"
+            % ",".join(["(%d, %d)" % (t[0], t[1]) for t in base_tiles])
+        )
 
     # Create a KML file for this tile.
     if tile_job_info.kml:

{GDAL-3.8.3 → GDAL-3.8.5}/gdal-utils/osgeo_utils/gdalattachpct.py

@@ -111,39 +111,47 @@ def doit(
         print("No color table on file ", pct_filename)
         return None, 1
 
-    # =============================================================================
-    # Create a MEM clone of the source file.
-    # =============================================================================
-
-    src_ds = open_ds(src_filename)
-
-    mem_ds = gdal.GetDriverByName("MEM").CreateCopy("mem", src_ds)
-
-    # =============================================================================
-    # Assign the color table in memory.
-    # =============================================================================
-
-    mem_ds.GetRasterBand(1).SetRasterColorTable(ct)
-    mem_ds.GetRasterBand(1).SetRasterColorInterpretation(gdal.GCI_PaletteIndex)
-
-    # =============================================================================
-    # Write the dataset to the output file.
-    # =============================================================================
-
+    # Figure out destination driver
     if not driver_name:
         driver_name = GetOutputDriverFor(dst_filename)
 
     dst_driver = gdal.GetDriverByName(driver_name)
     if dst_driver is None:
-        print('"%s" driver not registered.' % driver_name)
+        print(f'"{driver_name}" driver not registered.')
+        return None, 1
+
+    src_ds = open_ds(src_filename)
+    if src_ds is None:
+        print(f"Cannot open {src_filename}")
         return None, 1
 
-    if driver_name.upper() == "MEM":
-        out_ds = mem_ds
+    if driver_name.upper() == "VRT":
+        # For VRT, create the VRT first from the source dataset, so it
+        # correctly refers to it
+        out_ds = dst_driver.CreateCopy(dst_filename or "", src_ds)
+        if out_ds is None:
+            print(f"Cannot create {dst_filename}")
+            return None, 1
+
+        # And now assign the color table to the VRT
+        out_ds.GetRasterBand(1).SetRasterColorTable(ct)
+        out_ds.GetRasterBand(1).SetRasterColorInterpretation(gdal.GCI_PaletteIndex)
     else:
-        out_ds = dst_driver.CreateCopy(dst_filename or "", mem_ds)
+        # Create a MEM clone of the source file.
+        mem_ds = gdal.GetDriverByName("MEM").CreateCopy("mem", src_ds)
+
+        # Assign the color table in memory.
+        mem_ds.GetRasterBand(1).SetRasterColorTable(ct)
+        mem_ds.GetRasterBand(1).SetRasterColorInterpretation(gdal.GCI_PaletteIndex)
+
+        # Write the dataset to the output file.
+        if driver_name.upper() == "MEM":
+            out_ds = mem_ds
+        else:
+            out_ds = dst_driver.CreateCopy(dst_filename or "", mem_ds)
+
+        mem_ds = None
 
-    mem_ds = None
     src_ds = None
 
     return out_ds, 0

{GDAL-3.8.3 → GDAL-3.8.5}/osgeo/gdal.py

@@ -336,7 +336,8 @@ def InfoOptions(options=None, format='text', deserialize=True,
         if '-json' in new_options:
             format = 'json'
     else:
-        new_options = options
+        import copy
+        new_options = copy.copy(options)
         if format == 'json':
             new_options += ['-json']
         elif format != "text":
@@ -455,7 +456,8 @@ def VectorInfoOptions(options=None,
         if '-json' in new_options:
             format = 'json'
     else:
-        new_options = options
+        import copy
+        new_options = copy.copy(options)
         if format == 'json':
             new_options += ['-json']
         elif format != "text":
@@ -530,7 +532,8 @@ def MultiDimInfoOptions(options=None, detailed=False, array=None, arrayoptions=N
     if isinstance(options, str):
         new_options = ParseCommandLine(options)
     else:
-        new_options = options
+        import copy
+        new_options = copy.copy(options)
         if detailed:
             new_options += ['-detailed']
         if array:
@@ -687,7 +690,8 @@ def TranslateOptions(options=None, format=None,
     if isinstance(options, str):
         new_options = ParseCommandLine(options)
     else:
-        new_options = options
+        import copy
+        new_options = copy.copy(options)
         if format is not None:
             new_options += ['-of', format]
         if outputType != gdalconst.GDT_Unknown:
@@ -942,7 +946,8 @@ def WarpOptions(options=None, format=None,
     if isinstance(options, str):
         new_options = ParseCommandLine(options)
     else:
-        new_options = options
+        import copy
+        new_options = copy.copy(options)
         if srcBands:
             for b in srcBands:
                 new_options += ['-srcband', str(b)]
@@ -1288,7 +1293,8 @@ def VectorTranslateOptions(options=None, format=None,
     if isinstance(options, str):
         new_options = ParseCommandLine(options)
     else:
-        new_options = options
+        import copy
+        new_options = copy.copy(options)
         if format is not None:
             new_options += ['-f', format]
         if srcSRS is not None:
@@ -1557,7 +1563,8 @@ def DEMProcessingOptions(options=None, colorFilename=None, format=None,
     if isinstance(options, str):
         new_options = ParseCommandLine(options)
     else:
-        new_options = options
+        import copy
+        new_options = copy.copy(options)
         if format is not None:
             new_options += ['-of', format]
         if creationOptions is not None:
@@ -1689,7 +1696,8 @@ def NearblackOptions(options=None, format=None,
     if isinstance(options, str):
         new_options = ParseCommandLine(options)
     else:
-        new_options = options
+        import copy
+        new_options = copy.copy(options)
         if format is not None:
             new_options += ['-of', format]
         if creationOptions is not None:
@@ -1834,7 +1842,8 @@ def GridOptions(options=None, format=None,
     if isinstance(options, str):
         new_options = ParseCommandLine(options)
     else:
-        new_options = options
+        import copy
+        new_options = copy.copy(options)
         if format is not None:
             new_options += ['-of', format]
         if outputType != gdalconst.GDT_Unknown:
@@ -2001,7 +2010,8 @@ def RasterizeOptions(options=None, format=None,
     if isinstance(options, str):
         new_options = ParseCommandLine(options)
     else:
-        new_options = options
+        import copy
+        new_options = copy.copy(options)
         if format is not None:
             new_options += ['-of', format]
         if outputType != gdalconst.GDT_Unknown:
@@ -2184,7 +2194,8 @@ def FootprintOptions(options=None,
     if isinstance(options, str):
         new_options = ParseCommandLine(options)
     else:
-        new_options = options
+        import copy
+        new_options = copy.copy(options)
         if format is not None:
             new_options += ['-of', format]
         if bands is not None:
@@ -2400,7 +2411,8 @@ def BuildVRTOptions(options=None,
     if isinstance(options, str):
         new_options = ParseCommandLine(options)
     else:
-        new_options = options
+        import copy
+        new_options = copy.copy(options)
         if resolution is not None:
             new_options += ['-resolution', str(resolution)]
         if outputBounds is not None:
@@ -2528,7 +2540,8 @@ def MultiDimTranslateOptions(options=None, format=None, creationOptions=None,
     if isinstance(options, str):
         new_options = ParseCommandLine(options)
     else:
-        new_options = options
+        import copy
+        new_options = copy.copy(options)
         if format is not None:
             new_options += ['-of', format]
         if creationOptions is not None:

{GDAL-3.8.3 → GDAL-3.8.5}/setup.py

@@ -16,7 +16,7 @@ from setuptools import setup
 from setuptools import find_packages
 from setuptools import Extension
 
-version = '3.8.3'
+version = '3.8.5'
 
 # 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++'