Merge pull request #11120 from rouault/remove_jp2lura

Remove JP2Lura driver
OSGeo · Nov 13, 2024 · d9b65d7 · d9b65d7
2 parents a0f5127 + 655128f
commit d9b65d7
Show file tree

Hide file tree

Showing 22 changed files with 5 additions and 6,713 deletions.
diff --git a/autotest/gdrivers/jp2lura.py b/autotest/gdrivers/jp2lura.py
diff --git a/autotest/gdrivers/jp2metadata.py b/autotest/gdrivers/jp2metadata.py
@@ -22,7 +22,7 @@
 
 def have_jpeg2000_capable_driver():
     # JP2MrSID doesn't manage to open data/jpeg2000/IMG_md_ple_R1C1.jp2
-    for drv_name in ["JP2KAK", "JP2LURA", "JP2ECW", "JP2OpenJPEG"]:
+    for drv_name in ["JP2KAK", "JP2ECW", "JP2OpenJPEG"]:
         if gdal.GetDriverByName(drv_name):
             return True
     return False

diff --git a/autotest/pymod/gdaltest.py b/autotest/pymod/gdaltest.py
@@ -40,13 +40,11 @@
 jp2ecw_drv = None
 jp2mrsid_drv = None
 jp2openjpeg_drv = None
-jp2lura_drv = None
 jp2kak_drv_unregistered = False
 jpeg2000_drv_unregistered = False
 jp2ecw_drv_unregistered = False
 jp2mrsid_drv_unregistered = False
 jp2openjpeg_drv_unregistered = False
-jp2lura_drv_unregistered = False
 
 ###############################################################################
 
@@ -1264,8 +1262,8 @@ def compare_ds(ds1, ds2, xoff=0, yoff=0, width=0, height=0, verbose=1):
 
 
 def deregister_all_jpeg2000_drivers_but(name_of_driver_to_keep):
-    global jp2kak_drv, jpeg2000_drv, jp2ecw_drv, jp2mrsid_drv, jp2openjpeg_drv, jp2lura_drv
-    global jp2kak_drv_unregistered, jpeg2000_drv_unregistered, jp2ecw_drv_unregistered, jp2mrsid_drv_unregistered, jp2openjpeg_drv_unregistered, jp2lura_drv_unregistered
+    global jp2kak_drv, jpeg2000_drv, jp2ecw_drv, jp2mrsid_drv, jp2openjpeg_drv
+    global jp2kak_drv_unregistered, jpeg2000_drv_unregistered, jp2ecw_drv_unregistered, jp2mrsid_drv_unregistered, jp2openjpeg_drv_unregistered
 
     # Deregister other potential conflicting JPEG2000 drivers that will
     # be re-registered in the cleanup
@@ -1299,12 +1297,6 @@ def deregister_all_jpeg2000_drivers_but(name_of_driver_to_keep):
         jp2openjpeg_drv.Deregister()
         jp2openjpeg_drv_unregistered = True
 
-    jp2lura_drv = gdal.GetDriverByName("JP2Lura")
-    if name_of_driver_to_keep != "JP2Lura" and jp2lura_drv:
-        gdal.Debug("gdaltest.", "Deregistering JP2Lura")
-        jp2lura_drv.Deregister()
-        jp2lura_drv_unregistered = True
-
     return True
 
 
@@ -1314,8 +1306,8 @@ def deregister_all_jpeg2000_drivers_but(name_of_driver_to_keep):
 
 
 def reregister_all_jpeg2000_drivers():
-    global jp2kak_drv, jpeg2000_drv, jp2ecw_drv, jp2mrsid_drv, jp2openjpeg_drv, jp2lura_drv
-    global jp2kak_drv_unregistered, jpeg2000_drv_unregistered, jp2ecw_drv_unregistered, jp2mrsid_drv_unregistered, jp2openjpeg_drv_unregistered, jp2lura_drv_unregistered
+    global jp2kak_drv, jpeg2000_drv, jp2ecw_drv, jp2mrsid_drv, jp2openjpeg_drv
+    global jp2kak_drv_unregistered, jpeg2000_drv_unregistered, jp2ecw_drv_unregistered, jp2mrsid_drv_unregistered, jp2openjpeg_drv_unregistered
 
     if jp2kak_drv_unregistered:
         jp2kak_drv.Register()
@@ -1342,11 +1334,6 @@ def reregister_all_jpeg2000_drivers():
         jp2openjpeg_drv_unregistered = False
         gdal.Debug("gdaltest", "Registering JP2OpenJPEG")
 
-    if jp2lura_drv_unregistered:
-        jp2lura_drv.Register()
-        jp2lura_drv_unregistered = False
-        gdal.Debug("gdaltest", "Registering JP2Lura")
-
     return True
 
 

diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake
@@ -489,7 +489,6 @@ option(GDAL_USE_PUBLICDECOMPWT
 
 # proprietary libraries KAKADU
 include(CheckDependentLibrariesKakadu)
-gdal_check_package(LURATECH "Enable JP2Lura driver" CAN_DISABLE)
 
 include(CheckDependentLibrariesArrowParquet)
 

diff --git a/cmake/modules/packages/FindLURATECH.cmake b/cmake/modules/packages/FindLURATECH.cmake
diff --git a/doc/source/development/building_from_source.rst b/doc/source/development/building_from_source.rst
@@ -1232,27 +1232,6 @@ capabilities in GMLJP2v2 generation.
     Control whether to use LibXml2. Defaults to ON when LibXml2 is found.
 
 
-LURATECH
-********
-
-The Luratech JPEG2000 SDK (closed source/proprietary) is required for the
-:ref:`raster.jp2lura` driver.
-
-LURATECH_ROOT or CMAKE_PREFIX_PATH should point to the directory of the SDK.
-
-.. option:: LURATECH_INCLUDE_DIR
-
-    Path to the include directory with the ``lwf_jp2.h`` header file.
-
-.. option:: LURATECH_LIBRARY
-
-    Path to library file lib_lwf_jp2.a / lwf_jp2.lib
-
-.. option:: GDAL_USE_LURATECH=ON/OFF
-
-    Control whether to use LURATECH. Defaults to ON when LURATECH is found.
-
-
 LZ4
 ***
 

diff --git a/doc/source/drivers/raster/index.rst b/doc/source/drivers/raster/index.rst
@@ -96,7 +96,6 @@ Raster drivers
    jdem
    jp2ecw
    jp2kak
-   jp2lura
    jp2mrsid
    jp2openjpeg
    jpeg