diff --git a/3rdparty/libjpeg-turbo/CMakeLists.txt b/3rdparty/libjpeg-turbo/CMakeLists.txt index fb5e182b936774dc8e62345b4b1208b1639e0a22..2a3899633c7d2541677335d9051b0febad76914a 100644 --- a/3rdparty/libjpeg-turbo/CMakeLists.txt +++ b/3rdparty/libjpeg-turbo/CMakeLists.txt @@ -1,213 +1,56 @@ -# -# Setup -# +project(${JPEG_LIBRARY} C) -cmake_minimum_required(VERSION 2.8.11) -# Use LINK_INTERFACE_LIBRARIES instead of INTERFACE_LINK_LIBRARIES -if(POLICY CMP0022) - cmake_policy(SET CMP0022 OLD) -endif() - -project(libjpeg-turbo C) -set(VERSION 1.5.3) -string(REPLACE "." ";" VERSION_TRIPLET ${VERSION}) -list(GET VERSION_TRIPLET 0 VERSION_MAJOR) -list(GET VERSION_TRIPLET 1 VERSION_MINOR) -list(GET VERSION_TRIPLET 2 VERSION_REVISION) -function(pad_number NUMBER OUTPUT_LEN) - string(LENGTH "${${NUMBER}}" INPUT_LEN) - if(INPUT_LEN LESS OUTPUT_LEN) - math(EXPR ZEROES "${OUTPUT_LEN} - ${INPUT_LEN} - 1") - set(NUM ${${NUMBER}}) - foreach(C RANGE ${ZEROES}) - set(NUM "0${NUM}") - endforeach() - set(${NUMBER} ${NUM} PARENT_SCOPE) - endif() -endfunction() -pad_number(VERSION_MINOR 3) -pad_number(VERSION_REVISION 3) -set(LIBJPEG_TURBO_VERSION_NUMBER ${VERSION_MAJOR}${VERSION_MINOR}${VERSION_REVISION}) +ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-parameter -Wsign-compare -Wshorten-64-to-32 -Wimplicit-fallthrough) -if(NOT WIN32) - message(FATAL_ERROR "Platform not supported by this build system. Use autotools instead.") -endif() - -string(TIMESTAMP BUILD "%Y%m%d") +set(VERSION_MAJOR 1) +set(VERSION_MINOR 5) +set(VERSION_REVISION 3) +set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}) +set(LIBJPEG_TURBO_VERSION_NUMBER 1005003) -# This does nothing except when using MinGW. CMAKE_BUILD_TYPE has no meaning -# in Visual Studio, and it always defaults to Debug when using NMake. -if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Release) -endif() - -message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}") - -# This only works if building from the command line. There is currently no way -# to set a variable's value based on the build type when using Visual Studio. +string(TIMESTAMP BUILD "opencv-${OPENCV_VERSION}-libjpeg-turbo") if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(BUILD "${BUILD}d") + set(BUILD "${BUILD}-debug") endif() -message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}") +message(STATUS "libjpeg-turbo: VERSION = ${VERSION}, BUILD = ${BUILD}") -option(WITH_SIMD "Include SIMD extensions" TRUE) option(WITH_ARITH_ENC "Include arithmetic encoding support when emulating the libjpeg v6b API/ABI" TRUE) option(WITH_ARITH_DEC "Include arithmetic decoding support when emulating the libjpeg v6b API/ABI" TRUE) -option(WITH_JPEG7 "Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b)" FALSE) -option(WITH_JPEG8 "Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b)" FALSE) -option(WITH_MEM_SRCDST "Include in-memory source/destination manager functions when emulating the libjpeg v6b or v7 API/ABI" TRUE) -option(WITH_TURBOJPEG "Include the TurboJPEG wrapper library and associated test programs" TRUE) -option(WITH_JAVA "Build Java wrapper for the TurboJPEG library" FALSE) -option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_SIMD=0 WITH_TURBOJPEG=0 WITH_ARITH_ENC=0 WITH_ARITH_DEC=0)" FALSE) -option(ENABLE_STATIC "Build static libraries" TRUE) -option(ENABLE_SHARED "Build shared libraries" TRUE) -if(WITH_12BIT) - set(WITH_SIMD FALSE) - set(WITH_TURBOJPEG FALSE) - set(WITH_JAVA FALSE) - set(WITH_ARITH_ENC FALSE) - set(WITH_ARITH_DEC FALSE) - set(BITS_IN_JSAMPLE 12) - message(STATUS "12-bit JPEG support enabled") -else() - set(BITS_IN_JSAMPLE 8) +if(NOT DEFINED SIZEOF_SIZE_T) + if(IOS) # Workaround iOS issues + set(SIZEOF_SIZE_T "${CMAKE_SIZEOF_VOID_P}") + message(STATUS "SIZEOF_SIZE_T = ${SIZEOF_SIZE_T}") + else() + include(CheckTypeSize) + CHECK_TYPE_SIZE("size_t" SIZEOF_SIZE_T) + endif() endif() -if(WITH_JPEG8 OR WITH_JPEG7) - set(WITH_ARITH_ENC 1) - set(WITH_ARITH_DEC 1) -endif() -if(WITH_JPEG8) - set(WITH_MEM_SRCDST 1) -endif() +set(BITS_IN_JSAMPLE 8) if(WITH_ARITH_ENC) set(C_ARITH_CODING_SUPPORTED 1) - message(STATUS "Arithmetic encoding support enabled") -else() - message(STATUS "Arithmetic encoding support disabled") endif() if(WITH_ARITH_DEC) set(D_ARITH_CODING_SUPPORTED 1) - message(STATUS "Arithmetic decoding support enabled") -else() - message(STATUS "Arithmetic decoding support disabled") -endif() - -if(WITH_TURBOJPEG) - message(STATUS "TurboJPEG C wrapper enabled") -else() - message(STATUS "TurboJPEG C wrapper disabled") -endif() - -if(WITH_JAVA) - message(STATUS "TurboJPEG Java wrapper enabled") -else() - message(STATUS "TurboJPEG Java wrapper disabled") -endif() - -set(SO_AGE 0) -if(WITH_MEM_SRCDST) - set(SO_AGE 1) endif() set(JPEG_LIB_VERSION 62) -set(DLL_VERSION ${JPEG_LIB_VERSION}) -set(FULLVERSION ${DLL_VERSION}.${SO_AGE}.0) -if(WITH_JPEG8) - set(JPEG_LIB_VERSION 80) - set(DLL_VERSION 8) - set(FULLVERSION ${DLL_VERSION}.0.2) - message(STATUS "Emulating libjpeg v8 API/ABI") -elseif(WITH_JPEG7) - set(JPEG_LIB_VERSION 70) - set(DLL_VERSION 7) - set(FULLVERSION ${DLL_VERSION}.${SO_AGE}.0) - message(STATUS "Emulating libjpeg v7 API/ABI") -endif(WITH_JPEG8) -if(WITH_MEM_SRCDST) - set(MEM_SRCDST_SUPPORTED 1) - message(STATUS "In-memory source/destination managers enabled") -else() - message(STATUS "In-memory source/destination managers disabled") -endif() +# OpenCV +set(JPEG_LIB_VERSION "${VERSION}-${JPEG_LIB_VERSION}" PARENT_SCOPE) if(MSVC) - option(WITH_CRT_DLL - "Link all libjpeg-turbo libraries and executables with the C run-time DLL (msvcr*.dll) instead of the static C run-time library (libcmt*.lib.) The default is to use the C run-time DLL only with the libraries and executables that need it." - FALSE) - if(NOT WITH_CRT_DLL) - # Use the static C library for all build types - foreach(var CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE - CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO) - if(${var} MATCHES "/MD") - string(REGEX REPLACE "/MD" "/MT" ${var} "${${var}}") - endif() - endforeach() - endif() - add_definitions(-W3 -wd4996) + add_definitions(-W3 -wd4996 -wd4018) endif() -# Detect whether compiler is 64-bit -if(MSVC AND CMAKE_CL_64) - set(SIMD_X86_64 1) - set(64BIT 1) -elseif(CMAKE_SIZEOF_VOID_P MATCHES 8) - set(SIMD_X86_64 1) - set(64BIT 1) -endif() +configure_file(jconfig.h.in jconfig.h) +configure_file(jconfigint.h.in jconfigint.h) -if(64BIT) - message(STATUS "64-bit build") -else() - message(STATUS "32-bit build") -endif() - -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - if(MSVC) - set(CMAKE_INSTALL_PREFIX_DEFAULT ${CMAKE_PROJECT_NAME}) - else() - set(CMAKE_INSTALL_PREFIX_DEFAULT ${CMAKE_PROJECT_NAME}-gcc) - endif() - if(64BIT) - set(CMAKE_INSTALL_PREFIX_DEFAULT ${CMAKE_INSTALL_PREFIX_DEFAULT}64) - endif() - set(CMAKE_INSTALL_PREFIX "c:/${CMAKE_INSTALL_PREFIX_DEFAULT}" CACHE PATH - "Directory into which to install libjpeg-turbo (default: c:/${CMAKE_INSTALL_PREFIX_DEFAULT})" - FORCE) -endif() - -message(STATUS "Install directory = ${CMAKE_INSTALL_PREFIX}") - -configure_file(win/jconfig.h.in jconfig.h) -configure_file(win/jconfigint.h.in jconfigint.h) - -include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) - -string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UC) - -set(EFFECTIVE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UC}}") -message(STATUS "Compiler flags = ${EFFECTIVE_C_FLAGS}") - -set(EFFECTIVE_LD_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UC}}") -message(STATUS "Linker flags = ${EFFECTIVE_LD_FLAGS}") - -if(WITH_JAVA) - find_package(Java) - find_package(JNI) - if(DEFINED JAVACFLAGS) - message(STATUS "Java compiler flags = ${JAVACFLAGS}") - endif() -endif() - - -# -# Targets -# +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src) set(JPEG_SOURCES jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c jcparam.c jcphuff.c @@ -229,734 +72,27 @@ if(WITH_ARITH_DEC) set(JPEG_SOURCES ${JPEG_SOURCES} jdarith.c) endif() -if(WITH_SIMD) - add_definitions(-DWITH_SIMD) - add_subdirectory(simd) - if(SIMD_X86_64) - set(JPEG_SOURCES ${JPEG_SOURCES} simd/jsimd_x86_64.c) - else() - set(JPEG_SOURCES ${JPEG_SOURCES} simd/jsimd_i386.c) - endif() - # This tells CMake that the "source" files haven't been generated yet - set_source_files_properties(${SIMD_OBJS} PROPERTIES GENERATED 1) -else() - set(JPEG_SOURCES ${JPEG_SOURCES} jsimd_none.c) - message(STATUS "Not using SIMD acceleration") -endif() - -if(WITH_JAVA) - add_subdirectory(java) - set(ENABLE_SHARED TRUE) -endif() - -if(ENABLE_SHARED) - add_subdirectory(sharedlib) -endif() - -if(ENABLE_STATIC OR WITH_TURBOJPEG) - add_library(jpeg-static STATIC ${JPEG_SOURCES} ${SIMD_OBJS}) - if(NOT MSVC) - set_target_properties(jpeg-static PROPERTIES OUTPUT_NAME jpeg) - endif() - if(WITH_SIMD) - add_dependencies(jpeg-static simd) - endif() -endif() - -if(WITH_TURBOJPEG) - set(TURBOJPEG_SOURCES turbojpeg.c transupp.c jdatadst-tj.c jdatasrc-tj.c) - if(WITH_JAVA) - set(TURBOJPEG_SOURCES ${TURBOJPEG_SOURCES} turbojpeg-jni.c) - include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) - endif() - - if(ENABLE_SHARED) - add_library(turbojpeg SHARED ${TURBOJPEG_SOURCES}) - set_target_properties(turbojpeg PROPERTIES DEFINE_SYMBOL DLLDEFINE) - if(MINGW) - set_target_properties(turbojpeg PROPERTIES LINK_FLAGS -Wl,--kill-at) - endif() - target_link_libraries(turbojpeg jpeg-static) - set_target_properties(turbojpeg PROPERTIES LINK_INTERFACE_LIBRARIES "") - - add_executable(tjunittest tjunittest.c tjutil.c) - target_link_libraries(tjunittest turbojpeg) - - add_executable(tjbench tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c - wrppm.c) - target_link_libraries(tjbench turbojpeg jpeg-static) - set_property(TARGET tjbench PROPERTY COMPILE_FLAGS - "-DBMP_SUPPORTED -DPPM_SUPPORTED") - endif() - - if(ENABLE_STATIC) - add_library(turbojpeg-static STATIC ${JPEG_SOURCES} ${SIMD_OBJS} - turbojpeg.c transupp.c jdatadst-tj.c jdatasrc-tj.c) - if(NOT MSVC) - set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg) - endif() - if(WITH_SIMD) - add_dependencies(turbojpeg-static simd) - endif() - - add_executable(tjunittest-static tjunittest.c tjutil.c) - target_link_libraries(tjunittest-static turbojpeg-static) - - add_executable(tjbench-static tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c - wrbmp.c wrppm.c) - target_link_libraries(tjbench-static turbojpeg-static jpeg-static) - set_property(TARGET tjbench-static PROPERTY COMPILE_FLAGS - "-DBMP_SUPPORTED -DPPM_SUPPORTED") - endif() -endif() - -if(WITH_12BIT) - set(COMPILE_FLAGS "-DGIF_SUPPORTED -DPPM_SUPPORTED -DUSE_SETMODE") -else() - set(COMPILE_FLAGS "-DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED -DUSE_SETMODE") - set(CJPEG_BMP_SOURCES rdbmp.c rdtarga.c) - set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c) -endif() - -if(ENABLE_STATIC) - add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c - ${CJPEG_BMP_SOURCES}) - set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS}) - target_link_libraries(cjpeg-static jpeg-static) - - add_executable(djpeg-static djpeg.c cdjpeg.c rdcolmap.c rdswitch.c wrgif.c - wrppm.c ${DJPEG_BMP_SOURCES}) - set_property(TARGET djpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS}) - target_link_libraries(djpeg-static jpeg-static) - - add_executable(jpegtran-static jpegtran.c cdjpeg.c rdswitch.c transupp.c) - target_link_libraries(jpegtran-static jpeg-static) - set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "-DUSE_SETMODE") -endif() - -add_executable(rdjpgcom rdjpgcom.c) - -add_executable(wrjpgcom wrjpgcom.c) - - -# -# Tests -# - -add_subdirectory(md5) - -if(MSVC_IDE) - set(OBJDIR "\${CTEST_CONFIGURATION_TYPE}/") -else() - set(OBJDIR "") -endif() - -enable_testing() - -if(WITH_12BIT) - set(TESTORIG testorig12.jpg) - set(MD5_JPEG_RGB_ISLOW 9620f424569594bb9242b48498ad801f) - set(MD5_PPM_RGB_ISLOW f3301d2219783b8b3d942b7239fa50c0) - set(MD5_JPEG_422_IFAST_OPT 7322e3bd2f127f7de4b40d4480ce60e4) - set(MD5_PPM_422_IFAST 79807fa552899e66a04708f533e16950) - set(MD5_PPM_422M_IFAST 07737bfe8a7c1c87aaa393a0098d16b0) - set(MD5_JPEG_420_IFAST_Q100_PROG a1da220b5604081863a504297ed59e55) - set(MD5_PPM_420_Q100_IFAST 1b3730122709f53d007255e8dfd3305e) - set(MD5_PPM_420M_Q100_IFAST 980a1a3c5bf9510022869d30b7d26566) - set(MD5_JPEG_GRAY_ISLOW 235c90707b16e2e069f37c888b2636d9) - set(MD5_PPM_GRAY_ISLOW 7213c10af507ad467da5578ca5ee1fca) - set(MD5_PPM_GRAY_ISLOW_RGB e96ee81c30a6ed422d466338bd3de65d) - set(MD5_JPEG_420S_IFAST_OPT 7af8e60be4d9c227ec63ac9b6630855e) - if(64BIT) - # Windows/x64 uses SSE for floating point - set(MD5_JPEG_3x2_FLOAT_PROG a8c17daf77b457725ec929e215b603f8) - set(MD5_PPM_3x2_FLOAT 42876ab9e5c2f76a87d08db5fbd57956) - else() - # Windows/x86 uses the 387 FPU for floating point - if(MSVC) - set(MD5_JPEG_3x2_FLOAT_PROG e27840755870fa849872e58aa0cd1400) - set(MD5_PPM_3x2_FLOAT 6c2880b83bb1aa41dfe330e7a9768690) - else() - set(MD5_JPEG_3x2_FLOAT_PROG bc6dbbefac2872f6b9d6c4a0ae60c3c0) - set(MD5_PPM_3x2_FLOAT f58119ee294198ac9b4a9f5645a34266) - endif() - endif() - set(MD5_PPM_420M_ISLOW_2_1 4ca6be2a6f326ff9eaab63e70a8259c0) - set(MD5_PPM_420M_ISLOW_15_8 12aa9f9534c1b3d7ba047322226365eb) - set(MD5_PPM_420M_ISLOW_13_8 f7e22817c7b25e1393e4ec101e9d4e96) - set(MD5_PPM_420M_ISLOW_11_8 800a16f9f4dc9b293197bfe11be10a82) - set(MD5_PPM_420M_ISLOW_9_8 06b7a92a9bc69f4dc36ec40f1937d55c) - set(MD5_PPM_420M_ISLOW_7_8 3ec444a14a4ab4eab88ffc49c48eca43) - set(MD5_PPM_420M_ISLOW_3_4 3e726b7ea872445b19437d1c1d4f0d93) - set(MD5_PPM_420M_ISLOW_5_8 a8a771abdc94301d20ffac119b2caccd) - set(MD5_PPM_420M_ISLOW_1_2 b419124dd5568b085787234866102866) - set(MD5_PPM_420M_ISLOW_3_8 343d19015531b7bbe746124127244fa8) - set(MD5_PPM_420M_ISLOW_1_4 35fd59d866e44659edfa3c18db2a3edb) - set(MD5_PPM_420M_ISLOW_1_8 ccaed48ac0aedefda5d4abe4013f4ad7) - set(MD5_PPM_420_ISLOW_SKIP15_31 86664cd9dc956536409e44e244d20a97) - set(MD5_PPM_420_ISLOW_PROG_CROP62x62_71_71 452a21656115a163029cfba5c04fa76a) - set(MD5_PPM_444_ISLOW_SKIP1_6 ef63901f71ef7a75cd78253fc0914f84) - set(MD5_PPM_444_ISLOW_PROG_CROP98x98_13_13 15b173fb5872d9575572fbcc1b05956f) - set(MD5_JPEG_CROP cdb35ff4b4519392690ea040c56ea99c) -else() - set(TESTORIG testorig.jpg) - set(MD5_JPEG_RGB_ISLOW 768e970dd57b340ff1b83c9d3d47c77b) - set(MD5_PPM_RGB_ISLOW 00a257f5393fef8821f2b88ac7421291) - set(MD5_BMP_RGB_ISLOW_565 f07d2e75073e4bb10f6c6f4d36e2e3be) - set(MD5_BMP_RGB_ISLOW_565D 4cfa0928ef3e6bb626d7728c924cfda4) - set(MD5_JPEG_422_IFAST_OPT 2540287b79d913f91665e660303ab2c8) - set(MD5_PPM_422_IFAST 35bd6b3f833bad23de82acea847129fa) - set(MD5_PPM_422M_IFAST 8dbc65323d62cca7c91ba02dd1cfa81d) - set(MD5_BMP_422M_IFAST_565 3294bd4d9a1f2b3d08ea6020d0db7065) - set(MD5_BMP_422M_IFAST_565D da98c9c7b6039511be4a79a878a9abc1) - set(MD5_JPEG_420_IFAST_Q100_PROG 990cbe0329c882420a2094da7e5adade) - set(MD5_PPM_420_Q100_IFAST 5a732542015c278ff43635e473a8a294) - set(MD5_PPM_420M_Q100_IFAST ff692ee9323a3b424894862557c092f1) - set(MD5_JPEG_GRAY_ISLOW 72b51f894b8f4a10b3ee3066770aa38d) - set(MD5_PPM_GRAY_ISLOW 8d3596c56eace32f205deccc229aa5ed) - set(MD5_PPM_GRAY_ISLOW_RGB 116424ac07b79e5e801f00508eab48ec) - set(MD5_BMP_GRAY_ISLOW_565 12f78118e56a2f48b966f792fedf23cc) - set(MD5_BMP_GRAY_ISLOW_565D bdbbd616441a24354c98553df5dc82db) - set(MD5_JPEG_420S_IFAST_OPT 388708217ac46273ca33086b22827ed8) - if(WITH_SIMD) - set(MD5_JPEG_3x2_FLOAT_PROG 343e3f8caf8af5986ebaf0bdc13b5c71) - set(MD5_PPM_3x2_FLOAT 1a75f36e5904d6fc3a85a43da9ad89bb) - else() - if(64BIT) - set(MD5_JPEG_3x2_FLOAT_PROG 9bca803d2042bd1eb03819e2bf92b3e5) - set(MD5_PPM_3x2_FLOAT f6bfab038438ed8f5522fbd33595dcdc) - else() - if(MSVC) - set(MD5_JPEG_3x2_FLOAT_PROG 7999ce9cd0ee9b6c7043b7351ab7639d) - set(MD5_PPM_3x2_FLOAT 28cdc448a6b75e97892f0e0f8d4b21f3) - else() - set(MD5_JPEG_3x2_FLOAT_PROG 1657664a410e0822c924b54f6f65e6e9) - set(MD5_PPM_3x2_FLOAT cb0a1f027f3d2917c902b5640214e025) - endif() - endif() - endif() - set(MD5_JPEG_420_ISLOW_ARI e986fb0a637a8d833d96e8a6d6d84ea1) - set(MD5_JPEG_444_ISLOW_PROGARI 0a8f1c8f66e113c3cf635df0a475a617) - set(MD5_PPM_420M_IFAST_ARI 72b59a99bcf1de24c5b27d151bde2437) - set(MD5_JPEG_420_ISLOW 9a68f56bc76e466aa7e52f415d0f4a5f) - set(MD5_PPM_420M_ISLOW_2_1 9f9de8c0612f8d06869b960b05abf9c9) - set(MD5_PPM_420M_ISLOW_15_8 b6875bc070720b899566cc06459b63b7) - set(MD5_PPM_420M_ISLOW_13_8 bc3452573c8152f6ae552939ee19f82f) - set(MD5_PPM_420M_ISLOW_11_8 d8cc73c0aaacd4556569b59437ba00a5) - set(MD5_PPM_420M_ISLOW_9_8 d25e61bc7eac0002f5b393aa223747b6) - set(MD5_PPM_420M_ISLOW_7_8 ddb564b7c74a09494016d6cd7502a946) - set(MD5_PPM_420M_ISLOW_3_4 8ed8e68808c3fbc4ea764fc9d2968646) - set(MD5_PPM_420M_ISLOW_5_8 a3363274999da2366a024efae6d16c9b) - set(MD5_PPM_420M_ISLOW_1_2 e692a315cea26b988c8e8b29a5dbcd81) - set(MD5_PPM_420M_ISLOW_3_8 79eca9175652ced755155c90e785a996) - set(MD5_PPM_420M_ISLOW_1_4 79cd778f8bf1a117690052cacdd54eca) - set(MD5_PPM_420M_ISLOW_1_8 391b3d4aca640c8567d6f8745eb2142f) - set(MD5_BMP_420_ISLOW_256 4980185e3776e89bd931736e1cddeee6) - set(MD5_BMP_420_ISLOW_565 bf9d13e16c4923b92e1faa604d7922cb) - set(MD5_BMP_420_ISLOW_565D 6bde71526acc44bcff76f696df8638d2) - set(MD5_BMP_420M_ISLOW_565 8dc0185245353cfa32ad97027342216f) - set(MD5_BMP_420M_ISLOW_565D d1be3a3339166255e76fa50a0d70d73e) - set(MD5_PPM_420_ISLOW_SKIP15_31 c4c65c1e43d7275cd50328a61e6534f0) - set(MD5_PPM_420_ISLOW_ARI_SKIP16_139 087c6b123db16ac00cb88c5b590bb74a) - set(MD5_PPM_420_ISLOW_PROG_CROP62x62_71_71 26eb36ccc7d1f0cb80cdabb0ac8b5d99) - set(MD5_PPM_420_ISLOW_ARI_CROP53x53_4_4 886c6775af22370257122f8b16207e6d) - set(MD5_PPM_444_ISLOW_SKIP1_6 5606f86874cf26b8fcee1117a0a436a6) - set(MD5_PPM_444_ISLOW_PROG_CROP98x98_13_13 db87dc7ce26bcdc7a6b56239ce2b9d6c) - set(MD5_PPM_444_ISLOW_ARI_CROP37x37_0_0 cb57b32bd6d03e35432362f7bf184b6d) - set(MD5_JPEG_CROP b4197f377e621c4e9b1d20471432610d) -endif() - -if(WITH_JAVA) - add_test(TJUnitTest - ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar - -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR} - TJUnitTest) - add_test(TJUnitTest-yuv - ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar - -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR} - TJUnitTest -yuv) - add_test(TJUnitTest-yuv-nopad - ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar - -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR} - TJUnitTest -yuv -noyuvpad) - add_test(TJUnitTest-bi - ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar - -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR} - TJUnitTest -bi) - add_test(TJUnitTest-bi-yuv - ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar - -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR} - TJUnitTest -bi -yuv) - add_test(TJUnitTest-bi-yuv-nopad - ${JAVA_RUNTIME} -cp java/${OBJDIR}turbojpeg.jar - -Djava.library.path=${CMAKE_CURRENT_BINARY_DIR}/${OBJDIR} - TJUnitTest -bi -yuv -noyuvpad) -endif() - -set(TEST_LIBTYPES "") -if(ENABLE_SHARED) - set(TEST_LIBTYPES ${TEST_LIBTYPES} shared) -endif() -if(ENABLE_STATIC) - set(TEST_LIBTYPES ${TEST_LIBTYPES} static) -endif() - -set(TESTIMAGES ${CMAKE_SOURCE_DIR}/testimages) -set(MD5CMP ${CMAKE_CURRENT_BINARY_DIR}/md5/md5cmp) -if(CMAKE_CROSSCOMPILING) - file(RELATIVE_PATH TESTIMAGES ${CMAKE_CURRENT_BINARY_DIR} ${TESTIMAGES}) - file(RELATIVE_PATH MD5CMP ${CMAKE_CURRENT_BINARY_DIR} ${MD5CMP}) -endif() - -foreach(libtype ${TEST_LIBTYPES}) - if(libtype STREQUAL "shared") - set(dir sharedlib/) - else() - set(dir "") - set(suffix -static) - endif() - if(WITH_TURBOJPEG) - add_test(tjunittest${suffix} tjunittest${suffix}) - add_test(tjunittest${suffix}-alloc tjunittest${suffix} -alloc) - add_test(tjunittest${suffix}-yuv tjunittest${suffix} -yuv) - add_test(tjunittest${suffix}-yuv-alloc tjunittest${suffix} -yuv -alloc) - add_test(tjunittest${suffix}-yuv-nopad tjunittest${suffix} -yuv -noyuvpad) - endif() - - # These tests are carefully chosen to provide full coverage of as many of the - # underlying algorithms as possible (including all of the SIMD-accelerated - # ones.) - - # CC: null SAMP: fullsize FDCT: islow ENT: huff - add_test(cjpeg${suffix}-rgb-islow - ${dir}cjpeg${suffix} -rgb -dct int - -outfile testout_rgb_islow.jpg ${TESTIMAGES}/testorig.ppm) - add_test(cjpeg${suffix}-rgb-islow-cmp - ${MD5CMP} ${MD5_JPEG_RGB_ISLOW} testout_rgb_islow.jpg) - - # CC: null SAMP: fullsize IDCT: islow ENT: huff - add_test(djpeg${suffix}-rgb-islow - ${dir}djpeg${suffix} -dct int -ppm - -outfile testout_rgb_islow.ppm testout_rgb_islow.jpg) - add_test(djpeg${suffix}-rgb-islow-cmp - ${MD5CMP} ${MD5_PPM_RGB_ISLOW} testout_rgb_islow.ppm) - - if(NOT WITH_12BIT) - # CC: RGB->RGB565 SAMP: fullsize IDCT: islow ENT: huff - add_test(djpeg${suffix}-rgb-islow-565 - ${dir}djpeg${suffix} -dct int -rgb565 -dither none -bmp - -outfile testout_rgb_islow_565.bmp testout_rgb_islow.jpg) - add_test(djpeg${suffix}-rgb-islow-565-cmp - ${MD5CMP} ${MD5_BMP_RGB_ISLOW_565} testout_rgb_islow_565.bmp) - - # CC: RGB->RGB565 (dithered) SAMP: fullsize IDCT: islow ENT: huff - add_test(djpeg${suffix}-rgb-islow-565D - ${dir}djpeg${suffix} -dct int -rgb565 -bmp - -outfile testout_rgb_islow_565D.bmp testout_rgb_islow.jpg) - add_test(djpeg${suffix}-rgb-islow-565D-cmp - ${MD5CMP} ${MD5_BMP_RGB_ISLOW_565D} testout_rgb_islow_565D.bmp) - endif() - - # CC: RGB->YCC SAMP: fullsize/h2v1 FDCT: ifast ENT: 2-pass huff - add_test(cjpeg${suffix}-422-ifast-opt - ${dir}cjpeg${suffix} -sample 2x1 -dct fast -opt - -outfile testout_422_ifast_opt.jpg ${TESTIMAGES}/testorig.ppm) - add_test(cjpeg${suffix}-422-ifast-opt-cmp - ${MD5CMP} ${MD5_JPEG_422_IFAST_OPT} testout_422_ifast_opt.jpg) - - # CC: YCC->RGB SAMP: fullsize/h2v1 fancy IDCT: ifast ENT: huff - add_test(djpeg${suffix}-422-ifast - ${dir}djpeg${suffix} -dct fast - -outfile testout_422_ifast.ppm testout_422_ifast_opt.jpg) - add_test(djpeg${suffix}-422-ifast-cmp - ${MD5CMP} ${MD5_PPM_422_IFAST} testout_422_ifast.ppm) - - # CC: YCC->RGB SAMP: h2v1 merged IDCT: ifast ENT: huff - add_test(djpeg${suffix}-422m-ifast - ${dir}djpeg${suffix} -dct fast -nosmooth - -outfile testout_422m_ifast.ppm testout_422_ifast_opt.jpg) - add_test(djpeg${suffix}-422m-ifast-cmp - ${MD5CMP} ${MD5_PPM_422M_IFAST} testout_422m_ifast.ppm) - - if(NOT WITH_12BIT) - # CC: YCC->RGB565 SAMP: h2v1 merged IDCT: ifast ENT: huff - add_test(djpeg${suffix}-422m-ifast-565 - ${dir}djpeg${suffix} -dct int -nosmooth -rgb565 -dither none -bmp - -outfile testout_422m_ifast_565.bmp testout_422_ifast_opt.jpg) - add_test(djpeg${suffix}-422m-ifast-565-cmp - ${MD5CMP} ${MD5_BMP_422M_IFAST_565} testout_422m_ifast_565.bmp) - - # CC: YCC->RGB565 (dithered) SAMP: h2v1 merged IDCT: ifast ENT: huff - add_test(djpeg${suffix}-422m-ifast-565D - ${dir}djpeg${suffix} -dct int -nosmooth -rgb565 -bmp - -outfile testout_422m_ifast_565D.bmp testout_422_ifast_opt.jpg) - add_test(djpeg${suffix}-422m-ifast-565D-cmp - ${MD5CMP} ${MD5_BMP_422M_IFAST_565D} testout_422m_ifast_565D.bmp) - endif() - - # CC: RGB->YCC SAMP: fullsize/h2v2 FDCT: ifast ENT: prog huff - add_test(cjpeg${suffix}-420-q100-ifast-prog - ${dir}cjpeg${suffix} -sample 2x2 -quality 100 -dct fast -prog - -outfile testout_420_q100_ifast_prog.jpg ${TESTIMAGES}/testorig.ppm) - add_test(cjpeg${suffix}-420-q100-ifast-prog-cmp - ${MD5CMP} ${MD5_JPEG_420_IFAST_Q100_PROG} testout_420_q100_ifast_prog.jpg) - - # CC: YCC->RGB SAMP: fullsize/h2v2 fancy IDCT: ifast ENT: prog huff - add_test(djpeg${suffix}-420-q100-ifast-prog - ${dir}djpeg${suffix} -dct fast - -outfile testout_420_q100_ifast.ppm testout_420_q100_ifast_prog.jpg) - add_test(djpeg${suffix}-420-q100-ifast-prog-cmp - ${MD5CMP} ${MD5_PPM_420_Q100_IFAST} testout_420_q100_ifast.ppm) - - # CC: YCC->RGB SAMP: h2v2 merged IDCT: ifast ENT: prog huff - add_test(djpeg${suffix}-420m-q100-ifast-prog - ${dir}djpeg${suffix} -dct fast -nosmooth - -outfile testout_420m_q100_ifast.ppm testout_420_q100_ifast_prog.jpg) - add_test(djpeg${suffix}-420m-q100-ifast-prog-cmp - ${MD5CMP} ${MD5_PPM_420M_Q100_IFAST} testout_420m_q100_ifast.ppm) - - # CC: RGB->Gray SAMP: fullsize FDCT: islow ENT: huff - add_test(cjpeg${suffix}-gray-islow - ${dir}cjpeg${suffix} -gray -dct int - -outfile testout_gray_islow.jpg ${TESTIMAGES}/testorig.ppm) - add_test(cjpeg${suffix}-gray-islow-cmp - ${MD5CMP} ${MD5_JPEG_GRAY_ISLOW} testout_gray_islow.jpg) - - # CC: Gray->Gray SAMP: fullsize IDCT: islow ENT: huff - add_test(djpeg${suffix}-gray-islow - ${dir}djpeg${suffix} -dct int - -outfile testout_gray_islow.ppm testout_gray_islow.jpg) - add_test(djpeg${suffix}-gray-islow-cmp - ${MD5CMP} ${MD5_PPM_GRAY_ISLOW} testout_gray_islow.ppm) - - # CC: Gray->RGB SAMP: fullsize IDCT: islow ENT: huff - add_test(djpeg${suffix}-gray-islow-rgb - ${dir}djpeg${suffix} -dct int -rgb - -outfile testout_gray_islow_rgb.ppm testout_gray_islow.jpg) - add_test(djpeg${suffix}-gray-islow-rgb-cmp - ${MD5CMP} ${MD5_PPM_GRAY_ISLOW_RGB} testout_gray_islow_rgb.ppm) - - if(NOT WITH_12BIT) - # CC: Gray->RGB565 SAMP: fullsize IDCT: islow ENT: huff - add_test(djpeg${suffix}-gray-islow-565 - ${dir}djpeg${suffix} -dct int -rgb565 -dither none -bmp - -outfile testout_gray_islow_565.bmp testout_gray_islow.jpg) - add_test(djpeg${suffix}-gray-islow-565-cmp - ${MD5CMP} ${MD5_BMP_GRAY_ISLOW_565} testout_gray_islow_565.bmp) - - # CC: Gray->RGB565 (dithered) SAMP: fullsize IDCT: islow ENT: huff - add_test(djpeg${suffix}-gray-islow-565D - ${dir}djpeg${suffix} -dct int -rgb565 -bmp - -outfile testout_gray_islow_565D.bmp testout_gray_islow.jpg) - add_test(djpeg${suffix}-gray-islow-565D-cmp - ${MD5CMP} ${MD5_BMP_GRAY_ISLOW_565D} testout_gray_islow_565D.bmp) - endif() - - # CC: RGB->YCC SAMP: fullsize smooth/h2v2 smooth FDCT: islow - # ENT: 2-pass huff - add_test(cjpeg${suffix}-420s-ifast-opt - ${dir}cjpeg${suffix} -sample 2x2 -smooth 1 -dct int -opt - -outfile testout_420s_ifast_opt.jpg ${TESTIMAGES}/testorig.ppm) - add_test(cjpeg${suffix}-420s-ifast-opt-cmp - ${MD5CMP} ${MD5_JPEG_420S_IFAST_OPT} testout_420s_ifast_opt.jpg) - - # CC: RGB->YCC SAMP: fullsize/int FDCT: float ENT: prog huff - add_test(cjpeg${suffix}-3x2-float-prog - ${dir}cjpeg${suffix} -sample 3x2 -dct float -prog - -outfile testout_3x2_float_prog.jpg ${TESTIMAGES}/testorig.ppm) - add_test(cjpeg${suffix}-3x2-float-prog-cmp - ${MD5CMP} ${MD5_JPEG_3x2_FLOAT_PROG} testout_3x2_float_prog.jpg) - - # CC: YCC->RGB SAMP: fullsize/int IDCT: float ENT: prog huff - add_test(djpeg${suffix}-3x2-float-prog - ${dir}djpeg${suffix} -dct float - -outfile testout_3x2_float.ppm testout_3x2_float_prog.jpg) - add_test(djpeg${suffix}-3x2-float-prog-cmp - ${MD5CMP} ${MD5_PPM_3x2_FLOAT} testout_3x2_float.ppm) - - if(WITH_ARITH_ENC) - # CC: YCC->RGB SAMP: fullsize/h2v2 FDCT: islow ENT: arith - add_test(cjpeg${suffix}-420-islow-ari - ${dir}cjpeg${suffix} -dct int -arithmetic - -outfile testout_420_islow_ari.jpg ${TESTIMAGES}/testorig.ppm) - add_test(cjpeg${suffix}-420-islow-ari-cmp - ${MD5CMP} ${MD5_JPEG_420_ISLOW_ARI} testout_420_islow_ari.jpg) - - add_test(jpegtran${suffix}-420-islow-ari - ${dir}jpegtran${suffix} -arithmetic - -outfile testout_420_islow_ari.jpg ${TESTIMAGES}/testimgint.jpg) - add_test(jpegtran${suffix}-420-islow-ari-cmp - ${MD5CMP} ${MD5_JPEG_420_ISLOW_ARI} testout_420_islow_ari.jpg) - - # CC: YCC->RGB SAMP: fullsize FDCT: islow ENT: prog arith - add_test(cjpeg${suffix}-444-islow-progari - ${dir}cjpeg${suffix} -sample 1x1 -dct int -prog -arithmetic - -outfile testout_444_islow_progari.jpg ${TESTIMAGES}/testorig.ppm) - add_test(cjpeg${suffix}-444-islow-progari-cmp - ${MD5CMP} ${MD5_JPEG_444_ISLOW_PROGARI} testout_444_islow_progari.jpg) - endif() - - if(WITH_ARITH_DEC) - # CC: RGB->YCC SAMP: h2v2 merged IDCT: ifast ENT: arith - add_test(djpeg${suffix}-420m-ifast-ari - ${dir}djpeg${suffix} -fast -ppm - -outfile testout_420m_ifast_ari.ppm ${TESTIMAGES}/testimgari.jpg) - add_test(djpeg${suffix}-420m-ifast-ari-cmp - ${MD5CMP} ${MD5_PPM_420M_IFAST_ARI} testout_420m_ifast_ari.ppm) - - add_test(jpegtran${suffix}-420-islow - ${dir}jpegtran${suffix} - -outfile testout_420_islow.jpg ${TESTIMAGES}/testimgari.jpg) - add_test(jpegtran${suffix}-420-islow-cmp - ${MD5CMP} ${MD5_JPEG_420_ISLOW} testout_420_islow.jpg) - endif() +# No SIMD +set(JPEG_SOURCES ${JPEG_SOURCES} jsimd_none.c) - # 2/1-- CC: YCC->RGB SAMP: h2v2 merged IDCT: 16x16 islow ENT: huff - # 15/8-- CC: YCC->RGB SAMP: h2v2 merged IDCT: 15x15 islow ENT: huff - # 13/8-- CC: YCC->RGB SAMP: h2v2 merged IDCT: 13x13 islow ENT: huff - # 11/8-- CC: YCC->RGB SAMP: h2v2 merged IDCT: 11x11 islow ENT: huff - # 9/8-- CC: YCC->RGB SAMP: h2v2 merged IDCT: 9x9 islow ENT: huff - # 7/8-- CC: YCC->RGB SAMP: h2v2 merged IDCT: 7x7 islow/14x14 islow - # ENT: huff - # 3/4-- CC: YCC->RGB SAMP: h2v2 merged IDCT: 6x6 islow/12x12 islow - # ENT: huff - # 5/8-- CC: YCC->RGB SAMP: h2v2 merged IDCT: 5x5 islow/10x10 islow - # ENT: huff - # 1/2-- CC: YCC->RGB SAMP: h2v2 merged IDCT: 4x4 islow/8x8 islow - # ENT: huff - # 3/8-- CC: YCC->RGB SAMP: h2v2 merged IDCT: 3x3 islow/6x6 islow - # ENT: huff - # 1/4-- CC: YCC->RGB SAMP: h2v2 merged IDCT: 2x2 islow/4x4 islow - # ENT: huff - # 1/8-- CC: YCC->RGB SAMP: h2v2 merged IDCT: 1x1 islow/2x2 islow - # ENT: huff - foreach(scale 2_1 15_8 13_8 11_8 9_8 7_8 3_4 5_8 1_2 3_8 1_4 1_8) - string(REGEX REPLACE "_" "/" scalearg ${scale}) - add_test(djpeg${suffix}-420m-islow-${scale} - ${dir}djpeg${suffix} -dct int -scale ${scalearg} -nosmooth -ppm - -outfile testout_420m_islow_${scale}.ppm ${TESTIMAGES}/${TESTORIG}) - add_test(djpeg${suffix}-420m-islow-${scale}-cmp - ${MD5CMP} ${MD5_PPM_420M_ISLOW_${scale}} testout_420m_islow_${scale}.ppm) - endforeach() +ocv_list_add_prefix(JPEG_SOURCES src/) - if(NOT WITH_12BIT) - # CC: YCC->RGB (dithered) SAMP: h2v2 fancy IDCT: islow ENT: huff - add_test(djpeg${suffix}-420-islow-256 - ${dir}djpeg${suffix} -dct int -colors 256 -bmp - -outfile testout_420_islow_256.bmp ${TESTIMAGES}/${TESTORIG}) - add_test(djpeg${suffix}-420-islow-256-cmp - ${MD5CMP} ${MD5_BMP_420_ISLOW_256} testout_420_islow_256.bmp) +add_library(${JPEG_LIBRARY} STATIC ${JPEG_SOURCES} ${SIMD_OBJS}) - # CC: YCC->RGB565 SAMP: h2v2 fancy IDCT: islow ENT: huff - add_test(djpeg${suffix}-420-islow-565 - ${dir}djpeg${suffix} -dct int -rgb565 -dither none -bmp - -outfile testout_420_islow_565.bmp ${TESTIMAGES}/${TESTORIG}) - add_test(djpeg${suffix}-420-islow-565-cmp - ${MD5CMP} ${MD5_BMP_420_ISLOW_565} testout_420_islow_565.bmp) +set_target_properties(${JPEG_LIBRARY} + PROPERTIES OUTPUT_NAME ${JPEG_LIBRARY} + DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" + COMPILE_PDB_NAME ${JPEG_LIBRARY} + COMPILE_PDB_NAME_DEBUG "${JPEG_LIBRARY}${OPENCV_DEBUG_POSTFIX}" + ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH} + ) - # CC: YCC->RGB565 (dithered) SAMP: h2v2 fancy IDCT: islow ENT: huff - add_test(djpeg${suffix}-420-islow-565D - ${dir}djpeg${suffix} -dct int -rgb565 -bmp - -outfile testout_420_islow_565D.bmp ${TESTIMAGES}/${TESTORIG}) - add_test(djpeg${suffix}-420-islow-565D-cmp - ${MD5CMP} ${MD5_BMP_420_ISLOW_565D} testout_420_islow_565D.bmp) - - # CC: YCC->RGB565 SAMP: h2v2 merged IDCT: islow ENT: huff - add_test(djpeg${suffix}-420m-islow-565 - ${dir}djpeg${suffix} -dct int -nosmooth -rgb565 -dither none -bmp - -outfile testout_420m_islow_565.bmp ${TESTIMAGES}/${TESTORIG}) - add_test(djpeg${suffix}-420m-islow-565-cmp - ${MD5CMP} ${MD5_BMP_420M_ISLOW_565} testout_420m_islow_565.bmp) - - # CC: YCC->RGB565 (dithered) SAMP: h2v2 merged IDCT: islow ENT: huff - add_test(djpeg${suffix}-420m-islow-565D - ${dir}djpeg${suffix} -dct int -nosmooth -rgb565 -bmp - -outfile testout_420m_islow_565D.bmp ${TESTIMAGES}/${TESTORIG}) - add_test(djpeg${suffix}-420m-islow-565D-cmp - ${MD5CMP} ${MD5_BMP_420M_ISLOW_565D} testout_420m_islow_565D.bmp) - endif() - - # Partial decode tests. These tests are designed to cover all of the - # possible code paths in jpeg_skip_scanlines(). - - # Context rows: Yes Intra-iMCU row: Yes iMCU row prefetch: No ENT: huff - add_test(djpeg${suffix}-420-islow-skip15_31 - ${dir}djpeg${suffix} -dct int -skip 15,31 -ppm - -outfile testout_420_islow_skip15,31.ppm ${TESTIMAGES}/${TESTORIG}) - add_test(djpeg${suffix}-420-islow-skip15_31-cmp - ${MD5CMP} ${MD5_PPM_420_ISLOW_SKIP15_31} testout_420_islow_skip15,31.ppm) - - # Context rows: Yes Intra-iMCU row: No iMCU row prefetch: Yes ENT: arith - if(WITH_ARITH_DEC) - add_test(djpeg${suffix}-420-islow-ari-skip16_139 - ${dir}djpeg${suffix} -dct int -skip 16,139 -ppm - -outfile testout_420_islow_ari_skip16,139.ppm - ${TESTIMAGES}/testimgari.jpg) - add_test(djpeg${suffix}-420-islow-ari_skip16_139-cmp - ${MD5CMP} ${MD5_PPM_420_ISLOW_ARI_SKIP16_139} - testout_420_islow_ari_skip16,139.ppm) - endif() - - # Context rows: Yes Intra-iMCU row: No iMCU row prefetch: No ENT: prog huff - add_test(cjpeg${suffix}-420-islow-prog - ${dir}cjpeg${suffix} -dct int -prog - -outfile testout_420_islow_prog.jpg ${TESTIMAGES}/testorig.ppm) - add_test(djpeg${suffix}-420-islow-prog-crop62x62_71_71 - ${dir}djpeg${suffix} -dct int -crop 62x62+71+71 -ppm - -outfile testout_420_islow_prog_crop62x62,71,71.ppm - testout_420_islow_prog.jpg) - add_test(djpeg${suffix}-420-islow-prog-crop62x62_71_71-cmp - ${MD5CMP} ${MD5_PPM_420_ISLOW_PROG_CROP62x62_71_71} - testout_420_islow_prog_crop62x62,71,71.ppm) - - # Context rows: Yes Intra-iMCU row: No iMCU row prefetch: No ENT: arith - if(WITH_ARITH_DEC) - add_test(djpeg${suffix}-420-islow-ari-crop53x53_4_4 - ${dir}djpeg${suffix} -dct int -crop 53x53+4+4 -ppm - -outfile testout_420_islow_ari_crop53x53,4,4.ppm - ${TESTIMAGES}/testimgari.jpg) - add_test(djpeg${suffix}-420-islow-ari-crop53x53_4_4-cmp - ${MD5CMP} ${MD5_PPM_420_ISLOW_ARI_CROP53x53_4_4} - testout_420_islow_ari_crop53x53,4,4.ppm) - endif() - - # Context rows: No Intra-iMCU row: Yes ENT: huff - add_test(cjpeg${suffix}-444-islow - ${dir}cjpeg${suffix} -dct int -sample 1x1 - -outfile testout_444_islow.jpg ${TESTIMAGES}/testorig.ppm) - add_test(djpeg${suffix}-444-islow-skip1_6 - ${dir}djpeg${suffix} -dct int -skip 1,6 -ppm - -outfile testout_444_islow_skip1,6.ppm testout_444_islow.jpg) - add_test(djpeg${suffix}-444-islow-skip1_6-cmp - ${MD5CMP} ${MD5_PPM_444_ISLOW_SKIP1_6} testout_444_islow_skip1,6.ppm) - - # Context rows: No Intra-iMCU row: No ENT: prog huff - add_test(cjpeg${suffix}-444-islow-prog - ${dir}cjpeg${suffix} -dct int -prog -sample 1x1 - -outfile testout_444_islow_prog.jpg ${TESTIMAGES}/testorig.ppm) - add_test(djpeg${suffix}-444-islow-prog-crop98x98_13_13 - ${dir}djpeg${suffix} -dct int -crop 98x98+13+13 -ppm - -outfile testout_444_islow_prog_crop98x98,13,13.ppm - testout_444_islow_prog.jpg) - add_test(djpeg${suffix}-444-islow-prog_crop98x98_13_13-cmp - ${MD5CMP} ${MD5_PPM_444_ISLOW_PROG_CROP98x98_13_13} - testout_444_islow_prog_crop98x98,13,13.ppm) - - # Context rows: No Intra-iMCU row: No ENT: arith - if(WITH_ARITH_ENC) - add_test(cjpeg${suffix}-444-islow-ari - ${dir}cjpeg${suffix} -dct int -arithmetic -sample 1x1 - -outfile testout_444_islow_ari.jpg ${TESTIMAGES}/testorig.ppm) - if(WITH_ARITH_DEC) - add_test(djpeg${suffix}-444-islow-ari-crop37x37_0_0 - ${dir}djpeg${suffix} -dct int -crop 37x37+0+0 -ppm - -outfile testout_444_islow_ari_crop37x37,0,0.ppm - testout_444_islow_ari.jpg) - add_test(djpeg${suffix}-444-islow-ari-crop37x37_0_0-cmp - ${MD5CMP} ${MD5_PPM_444_ISLOW_ARI_CROP37x37_0_0} - testout_444_islow_ari_crop37x37,0,0.ppm) - endif() - endif() - - add_test(jpegtran${suffix}-crop - ${dir}jpegtran${suffix} -crop 120x90+20+50 -transpose -perfect - -outfile testout_crop.jpg ${TESTIMAGES}/${TESTORIG}) - add_test(jpegtran${suffix}-crop-cmp - ${MD5CMP} ${MD5_JPEG_CROP} testout_crop.jpg) - -endforeach() - -add_custom_target(testclean COMMAND ${CMAKE_COMMAND} -P - ${CMAKE_SOURCE_DIR}/cmakescripts/testclean.cmake) - - -# -# Installer -# - -if(MSVC) - set(INST_PLATFORM "Visual C++") - set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}-vc) - set(INST_REG_NAME ${CMAKE_PROJECT_NAME}) -elseif(MINGW) - set(INST_PLATFORM GCC) - set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}-gcc) - set(INST_REG_NAME ${CMAKE_PROJECT_NAME}-gcc) - set(INST_DEFS -DGCC) -endif() - -if(64BIT) - set(INST_PLATFORM "${INST_PLATFORM} 64-bit") - set(INST_NAME ${INST_NAME}64) - set(INST_REG_NAME ${INST_DIR}64) - set(INST_DEFS ${INST_DEFS} -DWIN64) -endif() - -if(WITH_JAVA) - set(INST_DEFS ${INST_DEFS} -DJAVA) -endif() - -if(MSVC_IDE) - set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=${CMAKE_CFG_INTDIR}\\") -else() - set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=") -endif() - -STRING(REGEX REPLACE "/" "\\\\" INST_DIR ${CMAKE_INSTALL_PREFIX}) - -configure_file(release/libjpeg-turbo.nsi.in libjpeg-turbo.nsi @ONLY) - -if(WITH_JAVA) - set(JAVA_DEPEND java) -endif() -add_custom_target(installer - makensis -nocd ${INST_DEFS} libjpeg-turbo.nsi - DEPENDS jpeg jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom - cjpeg djpeg jpegtran tjbench ${JAVA_DEPEND} - SOURCES libjpeg-turbo.nsi) - -if(WITH_TURBOJPEG) - if(ENABLE_SHARED) - install(TARGETS turbojpeg tjbench - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin) - endif() - if(ENABLE_STATIC) - install(TARGETS turbojpeg-static ARCHIVE DESTINATION lib) - if(NOT ENABLE_SHARED) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tjbench-static.exe - DESTINATION bin RENAME tjbench.exe) - endif() - endif() - install(FILES ${CMAKE_SOURCE_DIR}/turbojpeg.h DESTINATION include) +if(ENABLE_SOLUTION_FOLDERS) + set_target_properties(${JPEG_LIBRARY} PROPERTIES FOLDER "3rdparty") endif() -if(ENABLE_STATIC) - install(TARGETS jpeg-static ARCHIVE DESTINATION lib) - if(NOT ENABLE_SHARED) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cjpeg-static.exe - DESTINATION bin RENAME cjpeg.exe) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djpeg-static.exe - DESTINATION bin RENAME djpeg.exe) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jpegtran-static.exe - DESTINATION bin RENAME jpegtran.exe) - endif() +if(NOT BUILD_SHARED_LIBS) + ocv_install_target(${JPEG_LIBRARY} EXPORT OpenCVModules ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT dev) endif() -install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION bin) - -install(FILES ${CMAKE_SOURCE_DIR}/README.ijg ${CMAKE_SOURCE_DIR}/README.md - ${CMAKE_SOURCE_DIR}/example.c ${CMAKE_SOURCE_DIR}/libjpeg.txt - ${CMAKE_SOURCE_DIR}/structure.txt ${CMAKE_SOURCE_DIR}/usage.txt - ${CMAKE_SOURCE_DIR}/wizard.txt - DESTINATION doc) - -install(FILES ${CMAKE_BINARY_DIR}/jconfig.h ${CMAKE_SOURCE_DIR}/jerror.h - ${CMAKE_SOURCE_DIR}/jmorecfg.h ${CMAKE_SOURCE_DIR}/jpeglib.h - DESTINATION include) - -configure_file("${CMAKE_SOURCE_DIR}/cmakescripts/cmake_uninstall.cmake.in" - "cmake_uninstall.cmake" IMMEDIATE @ONLY) - -add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P cmake_uninstall.cmake) +ocv_install_3rdparty_licenses(libjpeg-turbo README.md LICENSE.md README.ijg) diff --git a/3rdparty/libjpeg-turbo/jconfig.h.in b/3rdparty/libjpeg-turbo/jconfig.h.in index 9d35121e8d37df8e9f01cfed89015b220cc8573c..e506d1de92fd0feea1955d83544ed0f90d3d6aa3 100644 --- a/3rdparty/libjpeg-turbo/jconfig.h.in +++ b/3rdparty/libjpeg-turbo/jconfig.h.in @@ -48,4 +48,6 @@ typedef signed int INT32; #undef RIGHT_SHIFT_IS_UNSIGNED +#define SIZEOF_SIZE_T @SIZEOF_SIZE_T@ + #endif /* JPEG_INTERNALS */ diff --git a/3rdparty/libtiff/CMakeLists.txt b/3rdparty/libtiff/CMakeLists.txt index 07365ec59975236be8f80bd45c7f1d611447cc64..0e084d1a2971219d16bc2e2c946c64dcb263d5d8 100644 --- a/3rdparty/libtiff/CMakeLists.txt +++ b/3rdparty/libtiff/CMakeLists.txt @@ -294,6 +294,9 @@ set(PIXARLOG_SUPPORT FALSE) set(JPEG_SUPPORT FALSE) if(HAVE_JPEG) set(JPEG_SUPPORT TRUE) + if(TARGET ${JPEG_LIBRARY} AND DEFINED ${JPEG_LIBRARY}_BINARY_DIR) + include_directories("${${JPEG_LIBRARY}_BINARY_DIR}") + endif() include_directories(${JPEG_INCLUDE_DIR}) endif() diff --git a/3rdparty/readme.txt b/3rdparty/readme.txt index 2d6d3826063c51b216e410cc94b2edec2ea99a99..3b961782b097e7a88502fabf1599e5cd539d804c 100644 --- a/3rdparty/readme.txt +++ b/3rdparty/readme.txt @@ -6,12 +6,20 @@ In order to use these versions of libraries instead of system ones on UNIX syste should use BUILD_ CMake flags (for example, BUILD_PNG for the libpng library). ------------------------------------------------------------------------------------ -libjpeg The Independent JPEG Group's JPEG software. +libjpeg (deprecated) The Independent JPEG Group's JPEG software. Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding. See IGJ home page http://www.ijg.org for details and links to the source code - WITH_JPEG CMake option must be ON to add libjpeg support to imgcodecs. +libjpeg-turbo libjpeg-turbo is covered by three compatible BSD-style open source licenses. + Refer to [LICENSE.md](libjpeg-turbo/LICENSE.md) for a roll-up of license terms. + + Site: https://github.com/libjpeg-turbo/libjpeg-turbo + API is compatible with original libjpeg. + + WITH_JPEG CMake option must be ON to add libjpeg or libjpeg-turbo support to imgcodecs. + BUILD_JPEG=ON selects libjpeg-turbo by default (since OpenCV 3.4.2). + Enable BUILD_JPEG_TURBO_DISABLE=ON to force using of libjpeg (this option is removed in OpenCV 4.0). ------------------------------------------------------------------------------------ libpng Portable Network Graphics library. The license and copyright notes can be found in libpng/LICENSE. diff --git a/CMakeLists.txt b/CMakeLists.txt index d50c92b954b1da8cd85af915e40466b74b74d200..58de99c9c1d1f88e2e6264727e8fcbc497a5b561 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1165,7 +1165,13 @@ status(" Media I/O: ") status(" ZLib:" ZLIB_FOUND THEN "${ZLIB_LIBRARIES} (ver ${ZLIB_VERSION_STRING})" ELSE "build (ver ${ZLIB_VERSION_STRING})") if(WITH_JPEG OR HAVE_JPEG) - status(" JPEG:" JPEG_FOUND THEN "${JPEG_LIBRARY} (ver ${JPEG_LIB_VERSION})" ELSE "build (ver ${JPEG_LIB_VERSION})") + if(NOT HAVE_JPEG) + status(" JPEG:" NO) + elseif(BUILD_JPEG) + status(" JPEG:" "build-${JPEG_LIBRARY} (ver ${JPEG_LIB_VERSION})") + else() + status(" JPEG:" "${JPEG_LIBRARY} (ver ${JPEG_LIB_VERSION})") + endif() endif() if(WITH_WEBP OR HAVE_WEBP) diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake index ab1dcd92c57200f7f6eb36f2f39aaa8feef88f27..c3eb82c537a691ddd43914b9ac94bad6b4d0c0b8 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake @@ -36,13 +36,36 @@ if(WITH_JPEG) if(NOT JPEG_FOUND) ocv_clear_vars(JPEG_LIBRARY JPEG_LIBRARIES JPEG_INCLUDE_DIR) - set(JPEG_LIBRARY libjpeg) - set(JPEG_LIBRARIES ${JPEG_LIBRARY}) - add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg") - set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}") + if(NOT BUILD_JPEG_TURBO_DISABLE) + set(JPEG_LIBRARY libjpeg-turbo) + set(JPEG_LIBRARIES ${JPEG_LIBRARY}) + add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg-turbo") + set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}/src") + else() + set(JPEG_LIBRARY libjpeg) + set(JPEG_LIBRARIES ${JPEG_LIBRARY}) + add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg") + set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}") + endif() endif() - ocv_parse_header("${JPEG_INCLUDE_DIR}/jpeglib.h" JPEG_VERSION_LINES JPEG_LIB_VERSION) + macro(ocv_detect_jpeg_version header_file) + if(NOT DEFINED JPEG_LIB_VERSION AND EXISTS "${header_file}") + ocv_parse_header("${header_file}" JPEG_VERSION_LINES JPEG_LIB_VERSION) + endif() + endmacro() + ocv_detect_jpeg_version("${JPEG_INCLUDE_DIR}/jpeglib.h") + if(DEFINED CMAKE_CXX_LIBRARY_ARCHITECTURE) + ocv_detect_jpeg_version("${JPEG_INCLUDE_DIR}/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/jconfig.h") + endif() + # no needed for strict platform check here, both files 64/32 should contain the same version + ocv_detect_jpeg_version("${JPEG_INCLUDE_DIR}/jconfig-64.h") + ocv_detect_jpeg_version("${JPEG_INCLUDE_DIR}/jconfig-32.h") + ocv_detect_jpeg_version("${JPEG_INCLUDE_DIR}/jconfig.h") + ocv_detect_jpeg_version("${${JPEG_LIBRARY}_BINARY_DIR}/jconfig.h") + if(NOT DEFINED JPEG_LIB_VERSION) + set(JPEG_LIB_VERSION "unknown") + endif() set(HAVE_JPEG YES) endif() diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt index 281b5073286a1817df61eb74928c513c18f47d33..720f5860536e17a85c4282716ec6452f7e6d8cb4 100644 --- a/modules/imgcodecs/CMakeLists.txt +++ b/modules/imgcodecs/CMakeLists.txt @@ -19,7 +19,7 @@ if(HAVE_PNG OR HAVE_TIFF OR HAVE_OPENEXR) endif() if(HAVE_JPEG) - ocv_include_directories(${JPEG_INCLUDE_DIR}) + ocv_include_directories(${JPEG_INCLUDE_DIR} ${${JPEG_LIBRARY}_BINARY_DIR}) list(APPEND GRFMT_LIBS ${JPEG_LIBRARIES}) endif()