chore: cleanup

dasch-swiss · Mar 6, 2024 · 89ef5ed · 89ef5ed
1 parent f18dcfc
commit 89ef5ed
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 333 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -359,7 +359,6 @@ include_directories(
         ${PROJECT_SOURCE_DIR}/shttps
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/local/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/local/include/openjpeg-2.1
         /usr/local/include
         /opt/homebrew/include
 )

diff --git a/ext/openjpeg200/CMakeLists.txt b/ext/openjpeg200/CMakeLists.txt
diff --git a/include/SipiImage.h b/include/SipiImage.h
@@ -648,7 +648,6 @@ class SipiImageError final : public std::exception {
         friend class SipiIcc;       //!< We need SipiIcc as friend class
         friend class SipiIOTiff;    //!< I/O class for the TIFF file format
         friend class SipiIOJ2k;     //!< I/O class for the JPEG2000 file format
-        //friend class SipiIOOpenJ2k; //!< I/O class for the JPEG2000 file format
         friend class SipiIOJpeg;    //!< I/O class for the JPEG file format
         friend class SipiIOPng;     //!< I/O class for the PNG file format
     };

diff --git a/include/formats/SipiIOOpenJ2k.h b/include/formats/SipiIOOpenJ2k.h
diff --git a/src/SipiImage.cpp b/src/SipiImage.cpp
@@ -50,7 +50,6 @@ namespace Sipi {
 
     std::unordered_map<std::string, std::shared_ptr<SipiIO> > SipiImage::io = {{"tif", std::make_shared<SipiIOTiff>()},
                                                                                {"jpx", std::make_shared<SipiIOJ2k>()},
-            //{"jpx", std::make_shared<SipiIOOpenJ2k>()},
                                                                                {"jpg", std::make_shared<SipiIOJpeg>()},
                                                                                {"png", std::make_shared<SipiIOPng>()}};
 

diff --git a/src/formats/SipiIOOpenJ2k.cpp b/src/formats/SipiIOOpenJ2k.cpp
diff --git a/test/unit/configuration/CMakeLists.txt b/test/unit/configuration/CMakeLists.txt
@@ -53,7 +53,6 @@ include_directories(
         ${PROJECT_SOURCE_DIR}/include
         ${PROJECT_SOURCE_DIR}/shttps
         ${PROJECT_SOURCE_DIR}/local/include
-        ${PROJECT_SOURCE_DIR}/local/include/openjpeg-2.1
         ${COMMON_INCLUDE_FILES_DIR}
         ${COMMON_INCLUDE_FILES_DIR}/metadata
         ${COMMON_INCLUDE_FILES_DIR}/formats

diff --git a/test/unit/sipiimage/CMakeLists.txt b/test/unit/sipiimage/CMakeLists.txt
@@ -10,7 +10,6 @@ include_directories(
         ${PROJECT_SOURCE_DIR}/include
         ${PROJECT_SOURCE_DIR}/shttps
         ${PROJECT_SOURCE_DIR}/local/include
-        ${PROJECT_SOURCE_DIR}/local/include/openjpeg-2.1
         ${COMMON_INCLUDE_FILES_DIR}
         ${COMMON_INCLUDE_FILES_DIR}/metadata
         ${COMMON_INCLUDE_FILES_DIR}/formats