diff --git a/deps/webp/include/webp/decode.h b/deps/webp/include/webp/decode.h index 44fcd64a..d9824750 100644 --- a/deps/webp/include/webp/decode.h +++ b/deps/webp/include/webp/decode.h @@ -85,7 +85,7 @@ WEBP_EXTERN uint8_t* WebPDecodeBGR(const uint8_t* data, size_t data_size, // Upon return, the Y buffer has a stride returned as '*stride', while U and V // have a common stride returned as '*uv_stride'. // Return NULL in case of error. -// (*) Also named Y'CbCr. See: http://en.wikipedia.org/wiki/YCbCr +// (*) Also named Y'CbCr. See: https://en.wikipedia.org/wiki/YCbCr WEBP_EXTERN uint8_t* WebPDecodeYUV(const uint8_t* data, size_t data_size, int* width, int* height, uint8_t** u, uint8_t** v, diff --git a/deps/webp/lib/cmake/WebP/WebPConfig.cmake b/deps/webp/lib/cmake/WebP/WebPConfig.cmake index 0afd270f..53193c0b 100644 --- a/deps/webp/lib/cmake/WebP/WebPConfig.cmake +++ b/deps/webp/lib/cmake/WebP/WebPConfig.cmake @@ -1,4 +1,4 @@ -set(WebP_VERSION 1.2.0) +set(WebP_VERSION 1.2.2) set(WEBP_VERSION ${WebP_VERSION}) diff --git a/deps/webp/lib/cmake/WebP/WebPConfigVersion.cmake b/deps/webp/lib/cmake/WebP/WebPConfigVersion.cmake index ddae3102..be2a43a3 100644 --- a/deps/webp/lib/cmake/WebP/WebPConfigVersion.cmake +++ b/deps/webp/lib/cmake/WebP/WebPConfigVersion.cmake @@ -7,14 +7,25 @@ # PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version. # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "1.2.0") +set(PACKAGE_VERSION "1.2.2") -if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) - set(PACKAGE_VERSION_COMPATIBLE FALSE) +if (PACKAGE_FIND_VERSION_RANGE) + # Package version must be in the requested version range + if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN) + OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX) + OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX))) + set(PACKAGE_VERSION_COMPATIBLE FALSE) + else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + endif() else() - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) - set(PACKAGE_VERSION_EXACT TRUE) + if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) + set(PACKAGE_VERSION_COMPATIBLE FALSE) + else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) + set(PACKAGE_VERSION_EXACT TRUE) + endif() endif() endif() diff --git a/deps/webp/lib/cmake/WebP/WebPTargets.cmake b/deps/webp/lib/cmake/WebP/WebPTargets.cmake index 781ef74e..1b4a1dc2 100644 --- a/deps/webp/lib/cmake/WebP/WebPTargets.cmake +++ b/deps/webp/lib/cmake/WebP/WebPTargets.cmake @@ -4,7 +4,7 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) message(FATAL_ERROR "CMake >= 2.6.0 required") endif() cmake_policy(PUSH) -cmake_policy(VERSION 2.6...3.17) +cmake_policy(VERSION 2.6...3.19) #---------------------------------------------------------------- # Generated CMake target import file. #---------------------------------------------------------------- diff --git a/deps/webp/lib/libwebp.a b/deps/webp/lib/libwebp.a index 114d4fa0..479942cd 100644 Binary files a/deps/webp/lib/libwebp.a and b/deps/webp/lib/libwebp.a differ diff --git a/deps/webp/lib/pkgconfig/libwebp.pc b/deps/webp/lib/pkgconfig/libwebp.pc index b12c18aa..793b46a3 100644 --- a/deps/webp/lib/pkgconfig/libwebp.pc +++ b/deps/webp/lib/pkgconfig/libwebp.pc @@ -5,7 +5,7 @@ includedir=${prefix}/include Name: libwebp Description: Library for the WebP graphics format -Version: 1.2.0 +Version: 1.2.2 Cflags: -I${prefix}/include Libs: -L${prefix}/lib -lwebp Libs.private: