Skip to content

Commit 44926e2

Browse files
palemieuxpalemieux
committed
Remove KDU
1 parent dd0c9a7 commit 44926e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+4
-467
lines changed

‎BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ cc_library(
190190
"src/lib/OpenEXRCore/internal_file.h",
191191
"src/lib/OpenEXRCore/internal_float_vector.h",
192192
"src/lib/OpenEXRCore/internal_ht.cpp",
193-
"src/lib/OpenEXRCore/internal_htk.cpp",
194193
"src/lib/OpenEXRCore/internal_ht_common.h",
195194
"src/lib/OpenEXRCore/internal_ht_common.cpp",
196195
"src/lib/OpenEXRCore/internal_huf.c",

‎Dockerfile_KDU‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎cmake/LibraryDefine.cmake‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ function(OPENEXR_DEFINE_LIBRARY libname)
2727
# we are embedding OpenJPH
2828
target_include_directories(${objlib} PRIVATE ${openjph_SOURCE_DIR}/src/core/common)
2929

30-
# we are including KDU
31-
if( KDU_INCLUDE_DIR )
32-
target_include_directories(${objlib} PRIVATE ${KDU_INCLUDE_DIR})
33-
endif()
34-
3530
# we are embedding libdeflate
3631
target_include_directories(${objlib} PRIVATE ${EXR_DEFLATE_INCLUDE_DIR})
3732

@@ -49,15 +44,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
4944
target_include_directories(${objlib} PRIVATE $<BUILD_INTERFACE:${OPENEXR_CURLIB_CURBINDIR}>)
5045
endif()
5146

52-
if(KDU_LIBRARY)
53-
target_compile_definitions(${objlib} PRIVATE KDU_AVAILABLE=1)
54-
endif()
47+
target_link_libraries(${objlib} PUBLIC ${PROJECT_NAME}::Config ${OPENEXR_CURLIB_DEPENDENCIES} ${CMAKE_DL_LIBS} openjph)
5548

56-
if(KDU_LIBRARY)
57-
target_link_libraries(${objlib} PUBLIC ${PROJECT_NAME}::Config ${OPENEXR_CURLIB_DEPENDENCIES} ${KDU_LIBRARY} ${CMAKE_DL_LIBS} openjph)
58-
else()
59-
target_link_libraries(${objlib} PUBLIC ${PROJECT_NAME}::Config ${OPENEXR_CURLIB_DEPENDENCIES} ${CMAKE_DL_LIBS} openjph)
60-
endif()
6149
if(OPENEXR_CURLIB_PRIVATE_DEPS)
6250
target_link_libraries(${objlib} PRIVATE ${OPENEXR_CURLIB_PRIVATE_DEPS})
6351
endif()

‎cmake/OpenEXRSetup.cmake‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -329,18 +329,6 @@ set_target_properties(openjph PROPERTIES
329329
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
330330
)
331331

332-
#######################################
333-
# Get KDU
334-
#######################################
335-
336-
message(STATUS "Fetching KDU")
337-
find_path(KDU_INCLUDE_DIR kdu_args.h PATH_SUFFIXES kakadu kdu)
338-
find_library(KDU_LIBRARY NAMES kdu_a84R PATH_SUFFIXES kakadu kdu)
339-
340-
if(NOT(KDU_INCLUDE_DIR) OR NOT(KDU_LIBRARY))
341-
message("Kakadu SDK not found: ${KDU_LIBRARY} and ${KDU_INCLUDE_DIR}.")
342-
endif()
343-
344332
#######################################
345333
# Find or install Imath
346334
#######################################

‎share/ci/install_manifest/install_manifest.macos.1.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ include/OpenEXR/openexr_part.h
157157
include/OpenEXR/openexr_std_attr.h
158158
include/OpenEXR/openexr_version.h
159159
include/OpenEXR/ImfHTCompressor.h
160-
include/OpenEXR/ImfHTKCompressor.h
161160
include/openjph/ojph_arch.h
162161
include/openjph/ojph_arg.h
163162
include/openjph/ojph_base.h

‎share/ci/install_manifest/install_manifest.macos.2.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ include/OpenEXR/openexr_part.h
157157
include/OpenEXR/openexr_std_attr.h
158158
include/OpenEXR/openexr_version.h
159159
include/OpenEXR/ImfHTCompressor.h
160-
include/OpenEXR/ImfHTKCompressor.h
161160
include/openjph/ojph_arch.h
162161
include/openjph/ojph_arg.h
163162
include/openjph/ojph_base.h

‎share/ci/install_manifest/install_manifest.macos.3.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ include/OpenEXR/openexr_part.h
157157
include/OpenEXR/openexr_std_attr.h
158158
include/OpenEXR/openexr_version.h
159159
include/OpenEXR/ImfHTCompressor.h
160-
include/OpenEXR/ImfHTKCompressor.h
161160
include/openjph/ojph_arch.h
162161
include/openjph/ojph_arg.h
163162
include/openjph/ojph_base.h

‎share/ci/install_manifest/install_manifest.macos.4.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ include/OpenEXR/openexr_part.h
157157
include/OpenEXR/openexr_std_attr.h
158158
include/OpenEXR/openexr_version.h
159159
include/OpenEXR/ImfHTCompressor.h
160-
include/OpenEXR/ImfHTKCompressor.h
161160
include/openjph/ojph_arch.h
162161
include/openjph/ojph_arg.h
163162
include/openjph/ojph_base.h

‎share/ci/install_manifest/install_manifest.macos.5.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ include/OpenEXR/openexr_part.h
181181
include/OpenEXR/openexr_std_attr.h
182182
include/OpenEXR/openexr_version.h
183183
include/OpenEXR/ImfHTCompressor.h
184-
include/OpenEXR/ImfHTKCompressor.h
185184
include/openjph/ojph_arch.h
186185
include/openjph/ojph_arg.h
187186
include/openjph/ojph_base.h

‎share/ci/install_manifest/install_manifest.macos.6.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ include/OpenEXR/openexr_part.h
157157
include/OpenEXR/openexr_std_attr.h
158158
include/OpenEXR/openexr_version.h
159159
include/OpenEXR/ImfHTCompressor.h
160-
include/OpenEXR/ImfHTKCompressor.h
161160
include/openjph/ojph_arch.h
162161
include/openjph/ojph_arg.h
163162
include/openjph/ojph_base.h

0 commit comments

Comments
 (0)