Skip to content

Commit 0d7666a

Browse files
mshabuninmshabunin
authored
Merge branch 'master' into master
2 parents 89a0a46 + dcbed8d commit 0d7666a

File tree

607 files changed

+67213
-20039
lines changed

Some content is hidden

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

607 files changed

+67213
-20039
lines changed

‎3rdparty/ffmpeg/ffmpeg.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Binary branch name: ffmpeg/master_20160908
2-
# Binaries were created for OpenCV: 11a65475d8d460a01c8818c5a2d0544ec49d7d68
3-
set(FFMPEG_BINARIES_COMMIT "03835134465888981e066434dc95009e8328d4ea")
4-
set(FFMPEG_FILE_HASH_BIN32 "32ba7790b0ac7a6dc66be91603637a7d")
5-
set(FFMPEG_FILE_HASH_BIN64 "068ecaa459a5571e7909cff90999a420")
6-
set(FFMPEG_FILE_HASH_CMAKE "f99941d10c1e87bf16b9055e8fc91ab2")
1+
# Binary branch name: ffmpeg/master_20161202
2+
# Binaries were created for OpenCV: 594c136d1fcbb5816c57516e50f9cbeffbd90835
3+
set(FFMPEG_BINARIES_COMMIT "2a19d0006415955c79431116e4634f04d5eb5a74")
4+
set(FFMPEG_FILE_HASH_BIN32 "f081abd9d6ca7e425d340ce586f9c090")
5+
set(FFMPEG_FILE_HASH_BIN64 "a423363a6eb76d362ca6c406c96c8db6")
6+
set(FFMPEG_FILE_HASH_CMAKE "5346ae1854fc7aa569a722e85af480ec")
77

88
set(FFMPEG_DOWNLOAD_URL ${OPENCV_FFMPEG_URL};$ENV{OPENCV_FFMPEG_URL};https://raw.githubusercontent.com/opencv/opencv_3rdparty/${FFMPEG_BINARIES_COMMIT}/ffmpeg/)
99

‎3rdparty/ippicv/downloader.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function(_icv_downloader)
3131
return() # Not supported
3232
endif()
3333

34-
set(OPENCV_ICV_UNPACK_PATH "${CMAKE_CURRENT_LIST_DIR}/unpack")
34+
set(OPENCV_ICV_UNPACK_PATH "${CMAKE_BINARY_DIR}/3rdparty/ippicv")
3535
set(OPENCV_ICV_PATH "${OPENCV_ICV_UNPACK_PATH}${OPENCV_ICV_PACKAGE_SUBDIR}")
3636

3737
if(DEFINED OPENCV_ICV_PACKAGE_DOWNLOADED

‎3rdparty/libtiff/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ check_include_file(assert.h HAVE_ASSERT_H)
1111
check_include_file(fcntl.h HAVE_FCNTL_H)
1212
check_include_file(io.h HAVE_IO_H)
1313
check_function_exists(jbg_newlen HAVE_JBG_NEWLEN)
14-
check_function_exists(mmap HAVE_MMAP)
1514
check_include_file(search.h HAVE_SEARCH_H)
1615
check_include_file(string.h HAVE_STRING_H)
1716
check_include_file(sys/types.h HAVE_SYS_TYPES_H)
18-
check_include_file(unistd.h HAVE_UNISTD_H)
17+
if(NOT MSVC)
18+
check_include_file(unistd.h HAVE_UNISTD_H)
19+
check_function_exists(mmap HAVE_MMAP)
20+
endif()
1921

2022
if(WIN32 AND NOT WINRT)
2123
set(USE_WIN32_FILEIO 1)
@@ -86,7 +88,9 @@ else()
8688
endif()
8789

8890
ocv_warnings_disable(CMAKE_C_FLAGS -Wno-unused-but-set-variable -Wmissing-prototypes -Wmissing-declarations -Wundef -Wunused -Wsign-compare
89-
-Wcast-align -Wshadow -Wno-maybe-uninitialized -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast)
91+
-Wcast-align -Wshadow -Wno-maybe-uninitialized -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
92+
-Wmisleading-indentation
93+
)
9094
ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-parameter) # clang
9195
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wmissing-declarations -Wunused-parameter)
9296
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4018 /wd4100 /wd4127 /wd4311 /wd4701 /wd4706) # vs2005

‎3rdparty/libwebp/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ project(${WEBP_LIBRARY})
77
ocv_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
88
ocv_include_directories("${CMAKE_CURRENT_SOURCE_DIR}/cpu-features")
99

10-
file(GLOB lib_srcs dec/*.c dsp/*.c enc/*.c mux/*.c utils/*.c webp/*.c)
11-
file(GLOB lib_hdrs dec/*.h dsp/*.h enc/*.h mux/*.h utils/*.h webp/*.h)
10+
file(GLOB lib_srcs dec/*.c demux/*.c dsp/*.c enc/*.c mux/*.c utils/*.c webp/*.c)
11+
file(GLOB lib_hdrs dec/*.h demux/*.h dsp/*.h enc/*.h mux/*.h utils/*.h webp/*.h)
1212

1313
# FIXIT
1414
if(ANDROID AND ARMEABI_V7A AND NOT NEON)

‎3rdparty/libwebp/dec/Makefile.am

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
noinst_LTLIBRARIES = libwebpdecode.la
2+
3+
libwebpdecode_la_SOURCES =
4+
libwebpdecode_la_SOURCES += alpha_dec.c
5+
libwebpdecode_la_SOURCES += alphai_dec.h
6+
libwebpdecode_la_SOURCES += buffer_dec.c
7+
libwebpdecode_la_SOURCES += common_dec.h
8+
libwebpdecode_la_SOURCES += vp8_dec.h
9+
libwebpdecode_la_SOURCES += frame_dec.c
10+
libwebpdecode_la_SOURCES += idec_dec.c
11+
libwebpdecode_la_SOURCES += io_dec.c
12+
libwebpdecode_la_SOURCES += quant_dec.c
13+
libwebpdecode_la_SOURCES += tree_dec.c
14+
libwebpdecode_la_SOURCES += vp8_dec.c
15+
libwebpdecode_la_SOURCES += vp8i_dec.h
16+
libwebpdecode_la_SOURCES += vp8l_dec.c
17+
libwebpdecode_la_SOURCES += vp8li_dec.h
18+
libwebpdecode_la_SOURCES += webp_dec.c
19+
libwebpdecode_la_SOURCES += webpi_dec.h
20+
21+
libwebpdecodeinclude_HEADERS =
22+
libwebpdecodeinclude_HEADERS += ../webp/decode.h
23+
libwebpdecodeinclude_HEADERS += ../webp/types.h
24+
noinst_HEADERS =
25+
noinst_HEADERS += ../webp/format_constants.h
26+
27+
libwebpdecode_la_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE)
28+
libwebpdecodeincludedir = $(includedir)/webp

‎3rdparty/libwebp/dec/alpha.c

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

0 commit comments

Comments
 (0)