Merge pull request #11684 from rouault/remove_ozi

Remove OZI OZF2/OZFX3 raster driver
OSGeo · Jan 18, 2025 · 32a8089 · 32a8089
2 parents 48756a0 + a9b8346
commit 32a8089
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 802 deletions.
diff --git a/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt b/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt
@@ -127,7 +127,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   SAGA -raster- (rw+v): SAGA GIS Binary Grid (.sdat, .sg-grd-z) (*.sdat, *.sg-grd-z)
   XYZ -raster- (rwv): ASCII Gridded XYZ (*.xyz)
   HF2 -raster- (rwv): HF2/HFZ heightfield raster (*.hf2)
-  OZI -raster- (rov): OziExplorer Image File
   CTG -raster- (rov): USGS LULC Composite Theme Grid
   ZMap -raster- (rwv): ZMap Plus Grid (*.dat)
   NGSGEOID -raster- (rov): NOAA NGS Geoid Height Grids (*.bin)

diff --git a/.github/workflows/windows_conda_expected_gdalinfo_formats.txt b/.github/workflows/windows_conda_expected_gdalinfo_formats.txt
@@ -128,7 +128,6 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   SAGA -raster- (rw+v): SAGA GIS Binary Grid (.sdat, .sg-grd-z) (*.sdat, *.sg-grd-z)
   XYZ -raster- (rwv): ASCII Gridded XYZ (*.xyz)
   HF2 -raster- (rwv): HF2/HFZ heightfield raster (*.hf2)
-  OZI -raster- (rov): OziExplorer Image File
   CTG -raster- (rov): USGS LULC Composite Theme Grid
   ZMap -raster- (rwv): ZMap Plus Grid (*.dat)
   NGSGEOID -raster- (rov): NOAA NGS Geoid Height Grids (*.bin)

diff --git a/autotest/gdrivers/ozi.py b/autotest/gdrivers/ozi.py
diff --git a/doc/source/drivers/raster/index.rst b/doc/source/drivers/raster/index.rst
@@ -131,7 +131,6 @@ Raster drivers
    nwtgrd
    ogcapi
    openfilegdb
-   ozi
    palsar
    paux
    pcidsk

diff --git a/doc/source/drivers/raster/ozi.rst b/doc/source/drivers/raster/ozi.rst
diff --git a/frmts/CMakeLists.txt b/frmts/CMakeLists.txt
@@ -147,7 +147,6 @@ gdal_optional_format(bsb "Maptech/NOAA BSB Nautical Chart Format")
 gdal_dependent_format(aigrid "Arc/Info Binary Grid Format" "OGR_ENABLE_DRIVER_AVC")
 gdal_optional_format(usgsdem "USGS ASCII DEM (and CDED)")
 gdal_optional_format(airsar "AirSAR Polarimetric Format")
-gdal_optional_format(ozi "OZF2/OZFX3 raster")
 gdal_optional_format(pcidsk "PCI Geomatics Database File")
 gdal_optional_format(sigdem "Scaled Integer Gridded DEM .sigdem Driver")
 gdal_dependent_format(msg "Meteosat Second Generation" "GDAL_USE_PUBLICDECOMPWT")

diff --git a/frmts/drivers.ini b/frmts/drivers.ini
@@ -152,7 +152,6 @@ PostGISRaster
 SAGA
 XYZ
 HF2
-OZI
 CTG
 ZMap
 NGSGEOID

diff --git a/frmts/gdalallregister.cpp b/frmts/gdalallregister.cpp
@@ -716,10 +716,6 @@ void CPL_STDCALL GDALAllRegister()
     GDALRegister_HF2();
 #endif
 
-#ifdef FRMT_ozi
-    GDALRegister_OZI();
-#endif
-
 #ifdef FRMT_ctg
     GDALRegister_CTG();
 #endif

diff --git a/frmts/ozi/CMakeLists.txt b/frmts/ozi/CMakeLists.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -131,7 +131,6 @@ Raster drivers @@
        nwtgrd
        ogcapi
        openfilegdb
-       ozi
        palsar
        paux
        pcidsk
@@ Expand Down @@