Skip to content

Commit cd41761

Browse files
alalekalalek
committed
3rdparty: update libwebp 0.6.1
1 parent 5c709f4 commit cd41761

File tree

172 files changed

+7546
-6347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+7546
-6347
lines changed

‎3rdparty/libwebp/CMakeLists.txt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ if(ANDROID)
99
ocv_include_directories(${CPUFEATURES_INCLUDE_DIRS})
1010
endif()
1111

12-
file(GLOB lib_srcs dec/*.c demux/*.c dsp/*.c enc/*.c mux/*.c utils/*.c webp/*.c)
13-
file(GLOB lib_hdrs dec/*.h demux/*.h dsp/*.h enc/*.h mux/*.h utils/*.h webp/*.h)
12+
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)
13+
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)
1414

1515
# FIXIT
1616
if(ANDROID AND ARMEABI_V7A AND NOT NEON)
@@ -34,13 +34,10 @@ if(ANDROID)
3434
target_link_libraries(${WEBP_LIBRARY} ${CPUFEATURES_LIBRARIES})
3535
endif()
3636

37-
if(UNIX)
38-
if(CMAKE_COMPILER_IS_GNUCXX OR CV_ICC)
39-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
40-
endif()
41-
endif()
42-
43-
ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-variable -Wunused-function -Wshadow -Wmaybe-uninitialized)
37+
ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-variable -Wunused-function -Wshadow -Wmaybe-uninitialized
38+
-Wmissing-prototypes # clang
39+
-Wmissing-declarations # gcc
40+
)
4441
ocv_warnings_disable(CMAKE_C_FLAGS /wd4244 /wd4267) # vs2005
4542

4643
set_target_properties(${WEBP_LIBRARY}

‎3rdparty/libwebp/dec/Makefile.am

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎3rdparty/libwebp/demux/Makefile.am

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎3rdparty/libwebp/demux/libwebpdemux.pc.in

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎3rdparty/libwebp/demux/libwebpdemux.rc

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎3rdparty/libwebp/dsp/Makefile.am

Lines changed: 0 additions & 153 deletions
This file was deleted.

‎3rdparty/libwebp/enc/Makefile.am

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)