diff --git a/.jenkins/rules/codespell/sensitive.allow b/.jenkins/rules/codespell/sensitive.allow index 3e817b177c13bc4eaa79b4803d3c2bf59df4ae13..b281405582b74b68c3967aee365a8ca176f947ff 100644 --- a/.jenkins/rules/codespell/sensitive.allow +++ b/.jenkins/rules/codespell/sensitive.allow @@ -26,4 +26,5 @@ IBM Corporation, 1981 198020 19805, 198016 -0.1980 \ No newline at end of file +0.1980 +198091665f \ No newline at end of file diff --git a/Third_Party_Open_Source_Software_Notice b/Third_Party_Open_Source_Software_Notice index e9f191dc49734fbf424d6391f149159d55b63298..0d54742e9f2c1062f952d08046ad39beb135393f 100644 --- a/Third_Party_Open_Source_Software_Notice +++ b/Third_Party_Open_Source_Software_Notice @@ -4967,7 +4967,7 @@ Copyright 2015 gRPC authors. Copyright 2016 gRPC authors. Copyright 2020 The gRPC Authors -Software: opencv 4.5.2 +Software: opencv 4.11.0 Copyright notice: Copyright 2015-2017 Philippe Tillet Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding. diff --git a/cmake/external_libs/opencv.cmake b/cmake/external_libs/opencv.cmake index 87c86ac68e1fefeaa80b14e852be237d7ccf0800..2f6be1526bba972f2633bf157971110a0e9e4ad4 100644 --- a/cmake/external_libs/opencv.cmake +++ b/cmake/external_libs/opencv.cmake @@ -32,19 +32,19 @@ if(ENABLE_GITEE_EULER) __download_pkg_with_git(opencv ${GIT_REPOSITORY} ${GIT_TAG} ${SHA256}) execute_process(COMMAND tar -xf ${OPENCV_SRC}/opencv-4.5.2.tar.gz --strip-components 1 -C ${OPENCV_SRC}) else() -if(ENABLE_GITEE) - set(REQ_URL "https://gitee.com/mirrors/opencv/repository/archive/4.5.2.tar.gz") - set(SHA256 "ae258ed50aa039279c3d36afdea5c6ecf762515836b27871a8957c610d0424f8") -else() - set(REQ_URL "https://github.com/opencv/opencv/archive/4.5.2.tar.gz") - set(SHA256 "ae258ed50aa039279c3d36afdea5c6ecf762515836b27871a8957c610d0424f8") -endif() + if(ENABLE_GITEE) + set(REQ_URL "https://gitee.com/mirrors/opencv/repository/archive/4.11.0.tar.gz") + set(SHA256 "9a7c11f924eff5f8d8070e297b322ee68b9227e003fd600d4b8122198091665f") + else() + set(REQ_URL "https://github.com/opencv/opencv/archive/refs/tags/4.11.0.tar.gz") + set(SHA256 "9a7c11f924eff5f8d8070e297b322ee68b9227e003fd600d4b8122198091665f") + endif() endif() if(MSVC) mindspore_add_pkg(opencv - VER 4.5.2 - LIBS opencv_core452 opencv_imgcodecs452 opencv_imgproc452 + VER 4.11.0 + LIBS opencv_core4110 opencv_imgcodecs4110 opencv_imgproc4110 LIB_PATH x64/*/lib URL ${REQ_URL} SHA256 ${SHA256} @@ -67,17 +67,12 @@ if(MSVC) -DBUILD_JASPER=OFF -DCV_TRACE=OFF # cause memory usage increacing -DWITH_OPENJPEG=OFF - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2022-0561_and_CVE-2022-0562.patch001 - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2022-0908.patch002 - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2022-3970.patch - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2023-3316.patch - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2023-26966.patch PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2024-7006.patch PATCHES ${TOP_DIR}/third_party/patch/opencv/Fix_Binary.patch) elseif(WIN32) mindspore_add_pkg(opencv - VER 4.5.2 - LIBS libopencv_core452.dll.a libopencv_imgcodecs452.dll.a libopencv_imgproc452.dll.a + VER 4.11.0 + LIBS libopencv_core4110.dll.a libopencv_imgcodecs4110.dll.a libopencv_imgproc4110.dll.a LIB_PATH x64/mingw/lib URL ${REQ_URL} SHA256 ${SHA256} @@ -101,16 +96,40 @@ elseif(WIN32) -DCV_TRACE=OFF # cause memory usage increacing -DWITH_LAPACK=OFF -DWITH_OPENJPEG=OFF - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2022-0561_and_CVE-2022-0562.patch001 - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2022-0908.patch002 - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2022-3970.patch - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2023-3316.patch - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2023-26966.patch PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2024-7006.patch PATCHES ${TOP_DIR}/third_party/patch/opencv/Fix_Binary.patch) +elseif(APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") + mindspore_add_pkg(opencv + VER 4.11.0 + LIBS opencv_core opencv_imgcodecs opencv_imgproc + URL ${REQ_URL} + SHA256 ${SHA256} + CMAKE_OPTION -DCMAKE_BUILD_TYPE=Release -DWITH_PROTOBUF=OFF -DWITH_WEBP=OFF -DWITH_IPP=OFF + -DWITH_ADE=OFF + -DBUILD_ZLIB=ON + -DBUILD_JPEG=ON + -DBUILD_PNG=ON + -DWITH_OPENEXR=OFF + -DBUILD_TESTS=OFF + -DBUILD_PERF_TESTS=OFF + -DBUILD_opencv_apps=OFF + -DCMAKE_SKIP_RPATH=TRUE + -DBUILD_opencv_python3=OFF + -DWITH_FFMPEG=OFF + -DWITH_TIFF=ON + -DBUILD_TIFF=ON + -DWITH_JASPER=OFF + -DBUILD_JASPER=OFF + -DCV_TRACE=OFF # cause memory usage increacing + -DWITH_LAPACK=OFF + -DWITH_OPENJPEG=OFF + -DCPU_BASELINE=NEON,FP16,NEON_FP16 # The environment does not support the "NEON_DOTPROD" instruction set. + -DCPU_DISPATCH= # The environment does not support the "NEON_DOTPROD" instruction set. + PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2024-7006.patch + PATCHES ${TOP_DIR}/third_party/patch/opencv/Fix_Binary.patch) else() mindspore_add_pkg(opencv - VER 4.5.2 + VER 4.11.0 LIBS opencv_core opencv_imgcodecs opencv_imgproc URL ${REQ_URL} SHA256 ${SHA256} @@ -133,25 +152,20 @@ else() -DCV_TRACE=OFF # cause memory usage increacing -DWITH_LAPACK=OFF -DWITH_OPENJPEG=OFF - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2022-0561_and_CVE-2022-0562.patch001 - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2022-0908.patch002 - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2022-3970.patch - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2023-3316.patch - PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2023-26966.patch PATCHES ${TOP_DIR}/third_party/patch/opencv/libtiff/CVE-2024-7006.patch PATCHES ${TOP_DIR}/third_party/patch/opencv/Fix_Binary.patch) endif() if(MSVC) include_directories(${opencv_INC}) - add_library(mindspore::opencv_core ALIAS opencv::opencv_core452) - add_library(mindspore::opencv_imgcodecs ALIAS opencv::opencv_imgcodecs452) - add_library(mindspore::opencv_imgproc ALIAS opencv::opencv_imgproc452) + add_library(mindspore::opencv_core ALIAS opencv::opencv_core4110) + add_library(mindspore::opencv_imgcodecs ALIAS opencv::opencv_imgcodecs4110) + add_library(mindspore::opencv_imgproc ALIAS opencv::opencv_imgproc4110) elseif(WIN32) include_directories(${opencv_INC}) - add_library(mindspore::opencv_core ALIAS opencv::libopencv_core452.dll.a) - add_library(mindspore::opencv_imgcodecs ALIAS opencv::libopencv_imgcodecs452.dll.a) - add_library(mindspore::opencv_imgproc ALIAS opencv::libopencv_imgproc452.dll.a) + add_library(mindspore::opencv_core ALIAS opencv::libopencv_core4110.dll.a) + add_library(mindspore::opencv_imgcodecs ALIAS opencv::libopencv_imgcodecs4110.dll.a) + add_library(mindspore::opencv_imgproc ALIAS opencv::libopencv_imgproc4110.dll.a) else() include_directories(${opencv_INC}/opencv4) add_library(mindspore::opencv_core ALIAS opencv::opencv_core) diff --git a/cmake/package_lite.cmake b/cmake/package_lite.cmake index 6b705457eec0c17c0c3bd518475f3bc08ee67957..5695ec647b73445d6f93f2b166c5979b87c15d01 100644 --- a/cmake/package_lite.cmake +++ b/cmake/package_lite.cmake @@ -503,14 +503,14 @@ if(PLATFORM_ARM64) install(TARGETS mindspore_core mindspore_ops DESTINATION ${CONVERTER_ROOT_DIR}/lib COMPONENT ${RUNTIME_COMPONENT_NAME}) if(MSLITE_ENABLE_OPENCV) - install(FILES ${opencv_LIBPATH}/libopencv_core.so.4.5.2 - DESTINATION ${CONVERTER_ROOT_DIR}/lib RENAME libopencv_core.so.4.5 + install(FILES ${opencv_LIBPATH}/libopencv_core.so.4.11.0 + DESTINATION ${CONVERTER_ROOT_DIR}/lib RENAME libopencv_core.so.411 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${opencv_LIBPATH}/libopencv_imgcodecs.so.4.5.2 - DESTINATION ${CONVERTER_ROOT_DIR}/lib RENAME libopencv_imgcodecs.so.4.5 + install(FILES ${opencv_LIBPATH}/libopencv_imgcodecs.so.4.11.0 + DESTINATION ${CONVERTER_ROOT_DIR}/lib RENAME libopencv_imgcodecs.so.411 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${opencv_LIBPATH}/libopencv_imgproc.so.4.5.2 - DESTINATION ${CONVERTER_ROOT_DIR}/lib RENAME libopencv_imgproc.so.4.5 + install(FILES ${opencv_LIBPATH}/libopencv_imgproc.so.4.11.0 + DESTINATION ${CONVERTER_ROOT_DIR}/lib RENAME libopencv_imgproc.so.411 COMPONENT ${RUNTIME_COMPONENT_NAME}) endif() if(MSLITE_ENABLE_ACL) @@ -548,14 +548,14 @@ if(PLATFORM_ARM64) install(FILES ${BUILD_DIR}/tools/converter/registry/libmslite_converter_plugin.so DESTINATION ${RUNTIME_LIB_DIR} COMPONENT ${RUNTIME_COMPONENT_NAME}) if(MSLITE_ENABLE_OPENCV) - install(FILES ${opencv_LIBPATH}/libopencv_core.so.4.5.2 - DESTINATION ${RUNTIME_LIB_DIR} RENAME libopencv_core.so.4.5 + install(FILES ${opencv_LIBPATH}/libopencv_core.so.4.11.0 + DESTINATION ${RUNTIME_LIB_DIR} RENAME libopencv_core.so.411 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${opencv_LIBPATH}/libopencv_imgcodecs.so.4.5.2 - DESTINATION ${RUNTIME_LIB_DIR} RENAME libopencv_imgcodecs.so.4.5 + install(FILES ${opencv_LIBPATH}/libopencv_imgcodecs.so.4.11.0 + DESTINATION ${RUNTIME_LIB_DIR} RENAME libopencv_imgcodecs.so.411 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${opencv_LIBPATH}/libopencv_imgproc.so.4.5.2 - DESTINATION ${RUNTIME_LIB_DIR} RENAME libopencv_imgproc.so.4.5 + install(FILES ${opencv_LIBPATH}/libopencv_imgproc.so.4.11.0 + DESTINATION ${RUNTIME_LIB_DIR} RENAME libopencv_imgproc.so.411 COMPONENT ${RUNTIME_COMPONENT_NAME}) endif() endif() @@ -929,14 +929,14 @@ else() install(TARGETS mindspore_core mindspore_ops DESTINATION ${CONVERTER_ROOT_DIR}/lib COMPONENT ${RUNTIME_COMPONENT_NAME}) if(MSLITE_ENABLE_OPENCV) - install(FILES ${opencv_LIBPATH}/libopencv_core.so.4.5.2 - DESTINATION ${CONVERTER_ROOT_DIR}/lib RENAME libopencv_core.so.4.5 + install(FILES ${opencv_LIBPATH}/libopencv_core.so.4.11.0 + DESTINATION ${CONVERTER_ROOT_DIR}/lib RENAME libopencv_core.so.411 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${opencv_LIBPATH}/libopencv_imgcodecs.so.4.5.2 - DESTINATION ${CONVERTER_ROOT_DIR}/lib RENAME libopencv_imgcodecs.so.4.5 + install(FILES ${opencv_LIBPATH}/libopencv_imgcodecs.so.4.11.0 + DESTINATION ${CONVERTER_ROOT_DIR}/lib RENAME libopencv_imgcodecs.so.411 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${opencv_LIBPATH}/libopencv_imgproc.so.4.5.2 - DESTINATION ${CONVERTER_ROOT_DIR}/lib RENAME libopencv_imgproc.so.4.5 + install(FILES ${opencv_LIBPATH}/libopencv_imgproc.so.4.11.0 + DESTINATION ${CONVERTER_ROOT_DIR}/lib RENAME libopencv_imgproc.so.411 COMPONENT ${RUNTIME_COMPONENT_NAME}) endif() @@ -976,14 +976,14 @@ else() DESTINATION ${RUNTIME_LIB_DIR} COMPONENT ${RUNTIME_COMPONENT_NAME}) if(MSLITE_ENABLE_OPENCV) - install(FILES ${opencv_LIBPATH}/libopencv_core.so.4.5.2 - DESTINATION ${RUNTIME_LIB_DIR} RENAME libopencv_core.so.4.5 + install(FILES ${opencv_LIBPATH}/libopencv_core.so.4.11.0 + DESTINATION ${RUNTIME_LIB_DIR} RENAME libopencv_core.so.411 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${opencv_LIBPATH}/libopencv_imgcodecs.so.4.5.2 - DESTINATION ${RUNTIME_LIB_DIR} RENAME libopencv_imgcodecs.so.4.5 + install(FILES ${opencv_LIBPATH}/libopencv_imgcodecs.so.4.11.0 + DESTINATION ${RUNTIME_LIB_DIR} RENAME libopencv_imgcodecs.so.411 COMPONENT ${RUNTIME_COMPONENT_NAME}) - install(FILES ${opencv_LIBPATH}/libopencv_imgproc.so.4.5.2 - DESTINATION ${RUNTIME_LIB_DIR} RENAME libopencv_imgproc.so.4.5 + install(FILES ${opencv_LIBPATH}/libopencv_imgproc.so.4.11.0 + DESTINATION ${RUNTIME_LIB_DIR} RENAME libopencv_imgproc.so.411 COMPONENT ${RUNTIME_COMPONENT_NAME}) endif() endif() diff --git a/mindspore-lite/tools/converter/adapter/dpico/CMakeLists.txt b/mindspore-lite/tools/converter/adapter/dpico/CMakeLists.txt index 59165f535b50967164d9caa391c17f78d78c9ece..4e7d8aa7b97ac5b76d56bce5795a00adfdfe7df6 100644 --- a/mindspore-lite/tools/converter/adapter/dpico/CMakeLists.txt +++ b/mindspore-lite/tools/converter/adapter/dpico/CMakeLists.txt @@ -51,9 +51,9 @@ add_dependencies(dpico_atc_adapter fbs_src fbs_inner_src) target_link_libraries(dpico_atc_adapter ${PICO_MAPPER_PATH}/lib/libsvp_atc_api.so ${PROTOBUF_PATH}/lib/libprotobuf.so.3.13.0.0 - ${OPENCV_PATH}/lib/libopencv_core.so.4.5.2 - ${OPENCV_PATH}/lib/libopencv_imgcodecs.so.4.5.2 - ${OPENCV_PATH}/lib/libopencv_imgproc.so.4.5.2 + ${OPENCV_PATH}/lib/libopencv_core.so.4.11.0 + ${OPENCV_PATH}/lib/libopencv_imgcodecs.so.4.11.0 + ${OPENCV_PATH}/lib/libopencv_imgproc.so.4.11.0 stdc++fs) if((NOT WIN32) AND ${CMAKE_BUILD_TYPE} STREQUAL "Release") diff --git a/third_party/patch/opencv/Fix_Binary.patch b/third_party/patch/opencv/Fix_Binary.patch index 50b31fb1cf3162fb1a71e16d503d0bf48c907447..b5f496e3b4c965b1cdc708511bf3df51f3b3dfca 100644 --- a/third_party/patch/opencv/Fix_Binary.patch +++ b/third_party/patch/opencv/Fix_Binary.patch @@ -1,7 +1,7 @@ -diff -Npur opencv-4.5.2/CMakeLists.txt opencv-4.5.2-change/CMakeLists.txt ---- opencv-4.5.2/CMakeLists.txt 2021-04-02 19:23:54.000000000 +0800 -+++ opencv-4.5.2-change/CMakeLists.txt 2023-02-08 03:40:02.807178015 +0800 -@@ -1050,7 +1050,7 @@ endif() +diff -Npur opencv-4.11.0/CMakeLists.txt opencv-4.11.0-change/CMakeLists.txt +--- opencv-4.11.0/CMakeLists.txt 2025-01-08 20:47:46.000000000 +0800 ++++ opencv-4.11.0-change/CMakeLists.txt 2025-08-16 10:53:44.135736520 +0800 +@@ -1211,7 +1211,7 @@ endif() if(OPENCV_TIMESTAMP) status(" Timestamp:" ${OPENCV_TIMESTAMP}) endif() @@ -10,11 +10,11 @@ diff -Npur opencv-4.5.2/CMakeLists.txt opencv-4.5.2-change/CMakeLists.txt if(CMAKE_CROSSCOMPILING) status(" Target:" ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}) endif() -@@ -1639,7 +1639,6 @@ status(" Python (for build):" PYTHON_D +@@ -1952,7 +1952,6 @@ status(" Python (for build):" PYTHON_D if(BUILD_JAVA) status("") status(" Java:" BUILD_FAT_JAVA_LIB THEN "export all functions" ELSE "") - status(" ant:" ANT_EXECUTABLE THEN "${ANT_EXECUTABLE} (ver ${ANT_VERSION})" ELSE NO) if(NOT ANDROID) + status(" Java:" Java_FOUND THEN "YES (ver ${Java_VERSION})" ELSE NO) status(" JNI:" JNI_INCLUDE_DIRS THEN "${JNI_INCLUDE_DIRS}" ELSE NO) - endif() diff --git a/third_party/patch/opencv/libtiff/CVE-2022-0561_and_CVE-2022-0562.patch001 b/third_party/patch/opencv/libtiff/CVE-2022-0561_and_CVE-2022-0562.patch001 deleted file mode 100644 index 948b05779f9365284d28bd91af26838ecdcac36a..0000000000000000000000000000000000000000 --- a/third_party/patch/opencv/libtiff/CVE-2022-0561_and_CVE-2022-0562.patch001 +++ /dev/null @@ -1,25 +0,0 @@ -diff -Npur opencv-4.5.2/3rdparty/libtiff/tif_dirread.c opencv-4.5.2-new/3rdparty/libtiff/tif_dirread.c ---- opencv-4.5.2/3rdparty/libtiff/tif_dirread.c 2021-04-02 19:23:54.000000000 +0800 -+++ opencv-4.5.2-new/3rdparty/libtiff/tif_dirread.c 2022-05-21 14:44:25.639756094 +0800 -@@ -4173,7 +4173,8 @@ TIFFReadDirectory(TIFF* tif) - goto bad; - } - -- memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16)); -+ if (old_extrasamples > 0) -+ memcpy(new_sampleinfo, tif->tif_dir.td_sampleinfo, old_extrasamples * sizeof(uint16)); - _TIFFsetShortArray(&tif->tif_dir.td_sampleinfo, new_sampleinfo, tif->tif_dir.td_extrasamples); - _TIFFfree(new_sampleinfo); - } -@@ -5765,8 +5766,9 @@ TIFFFetchStripThing(TIFF* tif, TIFFDirEn - _TIFFfree(data); - return(0); - } -- _TIFFmemcpy(resizeddata,data,(uint32)dir->tdir_count*sizeof(uint64)); -- _TIFFmemset(resizeddata+(uint32)dir->tdir_count,0,(nstrips-(uint32)dir->tdir_count)*sizeof(uint64)); -+ if( dir->tdir_count ) -+ _TIFFmemcpy(resizeddata,data, (uint32)dir->tdir_count * sizeof(uint64)); -+ _TIFFmemset(resizeddata+(uint32)dir->tdir_count, 0, (nstrips - (uint32)dir->tdir_count) * sizeof(uint64)); - _TIFFfree(data); - data=resizeddata; - } diff --git a/third_party/patch/opencv/libtiff/CVE-2022-0908.patch002 b/third_party/patch/opencv/libtiff/CVE-2022-0908.patch002 deleted file mode 100644 index 53f29746d757d8af0e3df00840b2dcc99acd8197..0000000000000000000000000000000000000000 --- a/third_party/patch/opencv/libtiff/CVE-2022-0908.patch002 +++ /dev/null @@ -1,15 +0,0 @@ -diff -Npur opencv-4.5.2/3rdparty/libtiff/tif_dirread.c opencv-4.5.2-new/3rdparty/libtiff/tif_dirread.c ---- opencv-4.5.2/3rdparty/libtiff/tif_dirread.c 2021-04-02 19:23:54.000000000 +0800 -+++ opencv-4.5.2-new/3rdparty/libtiff/tif_dirread.c 2022-05-21 14:36:31.761285562 +0800 -@@ -5079,7 +5079,10 @@ TIFFFetchNormalTag(TIFF* tif, TIFFDirEnt - _TIFFfree(data); - return(0); - } -- _TIFFmemcpy(o,data,(uint32)dp->tdir_count); -+ if (dp->tdir_count > 0 ) -+ { -+ _TIFFmemcpy(o,data,(uint32)dp->tdir_count); -+ } - o[(uint32)dp->tdir_count]=0; - if (data!=0) - _TIFFfree(data); diff --git a/third_party/patch/opencv/libtiff/CVE-2022-3970.patch b/third_party/patch/opencv/libtiff/CVE-2022-3970.patch deleted file mode 100644 index 2f7695435e544c1e02f41b1dc46a69f2c25a39d1..0000000000000000000000000000000000000000 --- a/third_party/patch/opencv/libtiff/CVE-2022-3970.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Npur opencv-4.5.2/3rdparty/libtiff/tif_getimage.c opencv-4.5.2-change/3rdparty/libtiff/tif_getimage.c ---- opencv-4.5.2/3rdparty/libtiff/tif_getimage.c 2021-04-02 19:23:54.000000000 +0800 -+++ opencv-4.5.2-change/3rdparty/libtiff/tif_getimage.c 2023-01-05 04:35:54.050388130 +0800 -@@ -3058,15 +3058,15 @@ TIFFReadRGBATileExt(TIFF* tif, uint32 co - return( ok ); - - for( i_row = 0; i_row < read_ysize; i_row++ ) { -- memmove( raster + (tile_ysize - i_row - 1) * tile_xsize, -- raster + (read_ysize - i_row - 1) * read_xsize, -+ memmove( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize, -+ raster + (size_t)(read_ysize - i_row - 1) * read_xsize, - read_xsize * sizeof(uint32) ); -- _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize+read_xsize, -+ _TIFFmemset( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize+read_xsize, - 0, sizeof(uint32) * (tile_xsize - read_xsize) ); - } - - for( i_row = read_ysize; i_row < tile_ysize; i_row++ ) { -- _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize, -+ _TIFFmemset( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize, - 0, sizeof(uint32) * tile_xsize ); - } - diff --git a/third_party/patch/opencv/libtiff/CVE-2023-26966.patch b/third_party/patch/opencv/libtiff/CVE-2023-26966.patch deleted file mode 100644 index 2b8ea99d8ca4b186346ac8f9be90bc67d5bf1fef..0000000000000000000000000000000000000000 --- a/third_party/patch/opencv/libtiff/CVE-2023-26966.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Npur opencv-4.5.2/3rdparty/libtiff/tif_luv.c opencv-4.5.2-change/3rdparty/libtiff/tif_luv.c ---- opencv-4.5.2/3rdparty/libtiff/tif_luv.c 2021-04-02 19:23:54.000000000 +0800 -+++ opencv-4.5.2-change/3rdparty/libtiff/tif_luv.c 2024-06-18 11:23:19.705487892 +0800 -@@ -929,6 +929,13 @@ uv_encode(double u, double v, int em) /* - { - register int vi, ui; - -+ /* check for NaN */ -+ if (u != u || v != v) -+ { -+ u = U_NEU; -+ v = V_NEU; -+ } -+ - if (v < UV_VSTART) - return oog_encode(u, v); - vi = tiff_itrunc((v - UV_VSTART)*(1./UV_SQSIZ), em); diff --git a/third_party/patch/opencv/libtiff/CVE-2023-3316.patch b/third_party/patch/opencv/libtiff/CVE-2023-3316.patch deleted file mode 100644 index 93db41ae64b08b0e47d5d6826413ac5f29558912..0000000000000000000000000000000000000000 --- a/third_party/patch/opencv/libtiff/CVE-2023-3316.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Npur opencv-4.5.2/3rdparty/libtiff/tif_close.c opencv-4.5.2-change/3rdparty/libtiff/tif_close.c ---- opencv-4.5.2/3rdparty/libtiff/tif_close.c 2021-04-02 19:23:54.000000000 +0800 -+++ opencv-4.5.2-change/3rdparty/libtiff/tif_close.c 2023-07-29 15:15:10.175435233 +0800 -@@ -120,11 +120,14 @@ TIFFCleanup(TIFF* tif) - void - TIFFClose(TIFF* tif) - { -- TIFFCloseProc closeproc = tif->tif_closeproc; -- thandle_t fd = tif->tif_clientdata; -+ if (tif != NULL) -+ { -+ TIFFCloseProc closeproc = tif->tif_closeproc; -+ thandle_t fd = tif->tif_clientdata; - -- TIFFCleanup(tif); -- (void) (*closeproc)(fd); -+ TIFFCleanup(tif); -+ (void) (*closeproc)(fd); -+ } - } - - /* vim: set ts=8 sts=8 sw=8 noet: */ - - diff --git a/third_party/patch/opencv/libtiff/CVE-2024-7006.patch b/third_party/patch/opencv/libtiff/CVE-2024-7006.patch index 86693af72ee919c07053f166eaa003d95d9883d8..278f9d4006809de4f98bf13e9789fdb4bbc02640 100644 --- a/third_party/patch/opencv/libtiff/CVE-2024-7006.patch +++ b/third_party/patch/opencv/libtiff/CVE-2024-7006.patch @@ -1,11 +1,10 @@ -diff -Npur opencv-4.5.2/3rdparty/libtiff/tif_dirinfo.c opencv-4.5.2-change/3rdparty/libtiff/tif_dirinfo.c ---- opencv-4.5.2/3rdparty/libtiff/tif_dirinfo.c 2021-04-02 19:23:54.000000000 +0800 -+++ opencv-4.5.2-change/3rdparty/libtiff/tif_dirinfo.c 2024-09-09 10:16:11.727063113 +0800 -@@ -471,7 +471,20 @@ _TIFFMergeFields(TIFF* tif, const TIFFFi - /* TIFFField** tp; */ - uint32 i; +diff -Npur opencv-4.11.0/3rdparty/libtiff/tif_dirinfo.c opencv-4.11.0-change/3rdparty/libtiff/tif_dirinfo.c +--- opencv-4.11.0/3rdparty/libtiff/tif_dirinfo.c 2025-01-08 20:47:46.000000000 +0800 ++++ opencv-4.11.0-change/3rdparty/libtiff/tif_dirinfo.c 2025-08-16 10:42:32.955749336 +0800 +@@ -577,6 +577,19 @@ int _TIFFMergeFields(TIFF *tif, const TI + /* TIFFField** tp; */ + uint32_t i; -- tif->tif_foundfield = NULL; + /* Check input */ + if (tif == NULL || info == NULL) + { @@ -19,7 +18,6 @@ diff -Npur opencv-4.5.2/3rdparty/libtiff/tif_dirinfo.c opencv-4.5.2-change/3rdpa + } + + -+ tif->tif_foundfield = NULL; + tif->tif_foundfield = NULL; - if (tif->tif_fields && tif->tif_nfields > 0) { - tif->tif_fields = (TIFFField**) + if (tif->tif_fields && tif->tif_nfields > 0)