Skip to content

Commit

Permalink
Merge pull request opencv#24274 from vrabaud:webp_1.3.2
Browse files Browse the repository at this point in the history
Merge pull request opencv#24274 from vrabaud:webp_1.3.2
 
Bump libwebp to 1.3.2 opencv#24274

This is version [c1ffd9a](https://chromium.googlesource.com/webm/libwebp/+/c1ffd9ac7593894c40a1de99d03f0b7af8af2577)
It is 1.3.2 with a few patches that were made right after to help compilation.
No need for patches on the OpenCV side!

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
  • Loading branch information
vrabaud authored Sep 15, 2023
1 parent 5e91915 commit 687fc11
Show file tree
Hide file tree
Showing 115 changed files with 5,354 additions and 2,784 deletions.
10 changes: 2 additions & 8 deletions 3rdparty/libwebp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ if(ANDROID)
ocv_include_directories(${CPUFEATURES_INCLUDE_DIRS})
endif()

file(GLOB lib_srcs src/dec/*.c src/demux/*.c src/dsp/*.c src/enc/*.c src/mux/*.c src/utils/*.c src/webp/*.c)
file(GLOB lib_hdrs src/dec/*.h src/demux/*.h src/dsp/*.h src/enc/*.h src/mux/*.h src/utils/*.h src/webp/*.h)
file(GLOB lib_srcs sharpyuv/*.c src/dec/*.c src/demux/*.c src/dsp/*.c src/enc/*.c src/mux/*.c src/utils/*.c src/webp/*.c)
file(GLOB lib_hdrs sharpyuv/*.h src/dec/*.h src/demux/*.h src/dsp/*.h src/enc/*.h src/mux/*.h src/utils/*.h src/webp/*.h)

# FIXIT
if(ANDROID AND ARMEABI_V7A AND NOT NEON)
Expand All @@ -21,12 +21,6 @@ if(ANDROID AND ARMEABI_V7A AND NOT NEON)
endforeach()
endif()

# FIX for quant.h - requires C99 for() loops
ocv_check_flag_support(C "-std=c99" _varname "${CMAKE_C_FLAGS}")
if(${_varname})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
endif()


# ----------------------------------------------------------------------------------
# Define the library target:
Expand Down
22 changes: 0 additions & 22 deletions 3rdparty/libwebp/patches/20190910-msa-asm-patch.diff

This file was deleted.

Loading

0 comments on commit 687fc11

Please sign in to comment.