Mirrors/libtiff
0
0
Fork 0
mirror of https://gitlab.com/libtiff/libtiff.git synced 2026-01-18 21:51:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Define HAVE_JPEGTURBO_DUAL_MODE_8_12 in tif_config.h

Browse Source 
Remove special-case Autotools and CMake code to define it on the
compiler command line.
This commit is contained in:
Benjamin Gilbert
2024-09-21 13:03:32 -07:00
parent ce85ec85f0
commit dc769d5871
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/JPEGCodec.cmake
View File

@@ -40,7 +40,7 @@ if (old-jpeg AND JPEG_SUPPORT)
endif()
if (JPEG_SUPPORT)
# Check for jpeg12_read_scanlines() which has been added in libjpeg-turbo 2.2
# Check for jpeg12_read_scanlines() which has been added in libjpeg-turbo 3.0
# for dual 8/12 bit mode.
include(CheckCSourceCompiles)
include(CMakePushCheckState)

4
libtiff/CMakeLists.txt
View File

@@ -150,9 +150,7 @@ endif()
if(JPEG_SUPPORT)
target_link_libraries(tiff PRIVATE JPEG::JPEG)
string(APPEND tiff_requires_private " libjpeg")
if(HAVE_JPEGTURBO_DUAL_MODE_8_12)
target_compile_definitions(tiff PRIVATE HAVE_JPEGTURBO_DUAL_MODE_8_12)
elseif(JPEG_DUAL_MODE_8_12)
if(JPEG_DUAL_MODE_8_12 AND NOT HAVE_JPEGTURBO_DUAL_MODE_8_12)
target_include_directories(tiff PRIVATE ${JPEG12_INCLUDE_DIR})
target_link_libraries(tiff PRIVATE ${JPEG12_LIBRARIES})
endif()

8
libtiff/Makefile.am
View File

@@ -151,10 +151,4 @@ mkg3states_LDADD = $(LIBPORT)
faxtable: mkg3states
(rm -f tif_fax3sm.c && ./mkg3states -b -c const tif_fax3sm.c)
if HAVE_JPEGTURBO_DUAL_MODE_8_12
JPEGTURBO_CPPFLAGS = -DHAVE_JPEGTURBO_DUAL_MODE_8_12
else
JPEGTURBO_CPPFLAGS =
endif
AM_CPPFLAGS = -I$(top_srcdir)/libtiff -I$(top_srcdir)/port $(JPEGTURBO_CPPFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/libtiff -I$(top_srcdir)/port

5
libtiff/tif_config.h.cmake.in
View File

@@ -80,7 +80,10 @@
#cmakedefine HAVE_UNISTD_H 1
/* 8/12 bit libjpeg dual mode enabled */
#cmakedefine JPEG_DUAL_MODE_8_12 1 1
#cmakedefine JPEG_DUAL_MODE_8_12 1
/* 8/12 bit dual mode JPEG built into libjpeg-turbo 3.0+ */
#cmakedefine HAVE_JPEGTURBO_DUAL_MODE_8_12 1
/* Support LERC compression */
#cmakedefine LERC_SUPPORT 1

3
libtiff/tif_config.h.in
View File

@@ -85,6 +85,9 @@
/* 8/12 bit libjpeg dual mode enabled */
#undef JPEG_DUAL_MODE_8_12
/* 8/12 bit dual mode JPEG built into libjpeg-turbo 3.0+ */
#undef HAVE_JPEGTURBO_DUAL_MODE_8_12
/* Support LERC compression */
#undef LERC_SUPPORT