mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed jpeg-turbo diagnostics and build options in default configuration.

Browse Source
This commit is contained in:
Alexander Smorkalov 2024-04-10 16:19:59 +03:00
parent 5bad694b7f
commit bbd9059334
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3rdparty/libjpeg-turbo/CMakeLists.txt vendored
View File

@ -56,8 +56,7 @@ if(MSVC_IDE AND CMAKE_GENERATOR_PLATFORM MATCHES "arm64")
set(CPU_TYPE arm64) set(CPU_TYPE arm64)
endif() endif()
OCV_OPTION(ENABLE_LIBJPEG_TURBO_SIMD "Include SIMD extensions for libjpeg-turbo, if available for this platform" (NOT CV_DISABLE_OPTIMIZATION) OCV_OPTION(ENABLE_LIBJPEG_TURBO_SIMD "Include SIMD extensions for libjpeg-turbo, if available for this platform" (NOT CV_DISABLE_OPTIMIZATION))
VISIBLE_IF BUILD_JPEG)
option(WITH_ARITH_ENC "Include arithmetic encoding support when emulating the libjpeg v6b API/ABI" 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_ARITH_DEC "Include arithmetic decoding support when emulating the libjpeg v6b API/ABI" TRUE)
set(WITH_SIMD 1) set(WITH_SIMD 1)

2
CMakeLists.txt
View File

@ -1438,7 +1438,7 @@ status(" ZLib:" ZLIB_FOUND THEN "${ZLIB_LIBRARIES} (ver ${ZLIB_VERSION_STRI
if(WITH_JPEG OR HAVE_JPEG) if(WITH_JPEG OR HAVE_JPEG)
if(NOT HAVE_JPEG) if(NOT HAVE_JPEG)
status(" JPEG:" NO) status(" JPEG:" NO)
elseif(BUILD_JPEG) elseif(BUILD_JPEG OR NOT JPEG_FOUND)
status(" JPEG:" "build-${JPEG_LIBRARY} (ver ${JPEG_LIB_VERSION})") status(" JPEG:" "build-${JPEG_LIBRARY} (ver ${JPEG_LIB_VERSION})")
if(ENABLE_LIBJPEG_TURBO_SIMD) if(ENABLE_LIBJPEG_TURBO_SIMD)
status(" SIMD Support Request:" "YES") status(" SIMD Support Request:" "YES")