Skip to content

Commit 22dbcf9

Browse files
alalekalalek
committed
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2 parents d7540c9 + 183bc5c commit 22dbcf9

File tree

237 files changed

+2986
-1656
lines changed

Some content is hidden

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

237 files changed

+2986
-1656
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ OCV_OPTION(BUILD_ANDROID_EXAMPLES "Build examples for Android platform"
295295
OCV_OPTION(BUILD_DOCS "Create build rules for OpenCV Documentation" OFF IF (NOT WINRT AND NOT APPLE_FRAMEWORK))
296296
OCV_OPTION(BUILD_EXAMPLES "Build all examples" OFF )
297297
OCV_OPTION(BUILD_PACKAGE "Enables 'make package_source' command" ON IF NOT WINRT)
298-
OCV_OPTION(BUILD_PERF_TESTS "Build performance tests" ON IF (NOT APPLE_FRAMEWORK) )
299-
OCV_OPTION(BUILD_TESTS "Build accuracy & regression tests" ON IF (NOT APPLE_FRAMEWORK) )
298+
OCV_OPTION(BUILD_PERF_TESTS "Build performance tests" NOT INSTALL_CREATE_DISTRIB IF (NOT APPLE_FRAMEWORK) )
299+
OCV_OPTION(BUILD_TESTS "Build accuracy & regression tests" NOT INSTALL_CREATE_DISTRIB IF (NOT APPLE_FRAMEWORK) )
300300
OCV_OPTION(BUILD_WITH_DEBUG_INFO "Include debug info into release binaries ('OFF' means default settings)" OFF )
301301
OCV_OPTION(BUILD_WITH_STATIC_CRT "Enables use of statically linked CRT for statically linked OpenCV" ON IF MSVC )
302302
OCV_OPTION(BUILD_WITH_DYNAMIC_IPP "Enables dynamic linking of IPP (only for standalone IPP)" OFF )
@@ -461,6 +461,7 @@ else()
461461
ocv_update(OPENCV_OTHER_INSTALL_PATH "${CMAKE_INSTALL_DATAROOTDIR}/opencv4")
462462
ocv_update(OPENCV_LICENSES_INSTALL_PATH "${CMAKE_INSTALL_DATAROOTDIR}/licenses/opencv4")
463463
endif()
464+
ocv_update(OPENCV_PYTHON_INSTALL_PATH "python")
464465
endif()
465466

466467
ocv_update(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}")

‎cmake/OpenCVDetectInferenceEngine.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ endif()
7878

7979
if(INF_ENGINE_TARGET)
8080
if(NOT INF_ENGINE_RELEASE)
81-
message(WARNING "InferenceEngine version have not been set, 2018R3 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.")
81+
message(WARNING "InferenceEngine version have not been set, 2018R4 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.")
8282
endif()
83-
set(INF_ENGINE_RELEASE "2018030000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2018R2.0.2 -> 2018020002)")
83+
set(INF_ENGINE_RELEASE "2018040000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2018R2.0.2 -> 2018020002)")
8484
set_target_properties(${INF_ENGINE_TARGET} PROPERTIES
8585
INTERFACE_COMPILE_DEFINITIONS "HAVE_INF_ENGINE=1;INF_ENGINE_RELEASE=${INF_ENGINE_RELEASE}"
8686
)

‎cmake/OpenCVGenSetupVars.cmake‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ else()
4343
endif()
4444
file(RELATIVE_PATH OPENCV_PYTHON_DIR_RELATIVE_CMAKECONFIG
4545
"${CMAKE_INSTALL_PREFIX}/${OPENCV_SETUPVARS_INSTALL_PATH}/" "${CMAKE_INSTALL_PREFIX}/")
46-
ocv_path_join(OPENCV_PYTHON_DIR_RELATIVE_CMAKECONFIG "${OPENCV_PYTHON_DIR_RELATIVE_CMAKECONFIG}" "python_loader") # https://github.com/opencv/opencv/pull/12977
46+
if(IS_ABSOLUTE "${OPENCV_PYTHON_INSTALL_PATH}")
47+
set(OPENCV_PYTHON_DIR_RELATIVE_CMAKECONFIG "${OPENCV_PYTHON_INSTALL_PATH}")
48+
message(WARNING "CONFIGURATION IS NOT SUPPORTED: validate setupvars script in install directory")
49+
else()
50+
ocv_path_join(OPENCV_PYTHON_DIR_RELATIVE_CMAKECONFIG "${OPENCV_PYTHON_DIR_RELATIVE_CMAKECONFIG}" "${OPENCV_PYTHON_INSTALL_PATH}")
51+
endif()
4752
configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/${OPENCV_SETUPVARS_TEMPLATE}" "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/install/${OPENCV_SETUPVARS_FILENAME}" @ONLY)
4853
install(FILES "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/install/${OPENCV_SETUPVARS_FILENAME}"
4954
DESTINATION "${OPENCV_SETUPVARS_INSTALL_PATH}"

‎cmake/OpenCVUtils.cmake‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,9 @@ macro(OCV_OPTION variable description value)
605605
option(${variable} "${description}" ${__value})
606606
endif()
607607
else()
608-
if(DEFINED ${variable} AND NOT OPENCV_HIDE_WARNING_UNSUPPORTED_OPTION)
608+
if(DEFINED ${variable} AND "${${variable}}" # emit warnings about turned ON options only.
609+
AND NOT (OPENCV_HIDE_WARNING_UNSUPPORTED_OPTION OR "$ENV{OPENCV_HIDE_WARNING_UNSUPPORTED_OPTION}")
610+
)
609611
message(WARNING "Unexpected option: ${variable} (=${${variable}})\nCondition: IF (${__condition})")
610612
endif()
611613
if(OPENCV_UNSET_UNSUPPORTED_OPTION)

‎cmake/templates/setup_vars_win32.cmd.in‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,36 @@
11
@ECHO OFF
2-
SETLOCAL EnableDelayedExpansion
32

43
SET "SCRIPT_DIR=%~dp0"
54

65
IF NOT DEFINED OPENCV_QUIET ( ECHO Setting vars for OpenCV @OPENCV_VERSION@ )
7-
SET "PATH=!SCRIPT_DIR!\@OPENCV_LIB_RUNTIME_DIR_RELATIVE_CMAKECONFIG@;%PATH%"
6+
SET "PATH=%SCRIPT_DIR%\@OPENCV_LIB_RUNTIME_DIR_RELATIVE_CMAKECONFIG@;%PATH%"
87

9-
IF NOT DEFINED OPENCV_SKIP_PYTHON (
10-
SET "PYTHONPATH_OPENCV=!SCRIPT_DIR!\@OPENCV_PYTHON_DIR_RELATIVE_CMAKECONFIG@"
11-
IF NOT DEFINED OPENCV_QUIET ( ECHO Append PYTHONPATH: !PYTHONPATH_OPENCV! )
12-
SET "PYTHONPATH=!PYTHONPATH_OPENCV!;%PYTHONPATH%"
13-
)
8+
IF NOT DEFINED OPENCV_SKIP_PYTHON CALL :SET_PYTHON
9+
10+
SET SCRIPT_DIR=
11+
12+
IF NOT [%1] == [] GOTO :RUN_COMMAND
13+
14+
GOTO :EOF
1415

15-
IF NOT [%1] == [] (
16-
%*
17-
EXIT /B !errorlevel!
16+
:RUN_COMMAND
17+
SET RUN_INTERACTIVE=1
18+
echo %CMDCMDLINE% | find /i "%~0" >nul
19+
IF NOT errorlevel 1 set RUN_INTERACTIVE=0
20+
21+
%*
22+
SET RESULT=%ERRORLEVEL%
23+
IF %RESULT% NEQ 0 (
24+
IF _%RUN_INTERACTIVE%_==_0_ ( IF NOT DEFINED OPENCV_BATCH_MODE ( pause ) )
1825
)
26+
EXIT /B %RESULT%
27+
28+
:SET_PYTHON
29+
SET "PYTHONPATH_OPENCV=%SCRIPT_DIR%\@OPENCV_PYTHON_DIR_RELATIVE_CMAKECONFIG@"
30+
IF NOT DEFINED OPENCV_QUIET ( ECHO Append PYTHONPATH: %PYTHONPATH_OPENCV% )
31+
SET "PYTHONPATH=%PYTHONPATH_OPENCV%;%PYTHONPATH%"
32+
SET PYTHONPATH_OPENCV=
33+
EXIT /B
34+
35+
36+
:EOF

‎doc/Doxyfile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ PREDEFINED = __cplusplus=1 \
257257
CV_SSE2=1 \
258258
CV__DEBUG_NS_BEGIN= \
259259
CV__DEBUG_NS_END= \
260+
CV_DEPRECATED_EXTERNAL= \
260261
CV_DEPRECATED=
261262
EXPAND_AS_DEFINED =
262263
SKIP_FUNCTION_MACROS = YES

‎doc/tutorials/dnn/dnn_android/dnn_android.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Tutorial was written for the following versions of corresponding software:
1212

1313
- Download and install Android Studio from https://developer.android.com/studio.
1414

15-
- Get the latest pre-built OpenCV for Android release from https://github.com/opencv/opencv/releases and unpack it (for example, `opencv-3.4.3-android-sdk.zip`).
15+
- Get the latest pre-built OpenCV for Android release from https://github.com/opencv/opencv/releases and unpack it (for example, `opencv-3.4.4-android-sdk.zip`).
1616

1717
- Download MobileNet object detection model from https://github.com/chuanqi305/MobileNet-SSD. We need a configuration file `MobileNetSSD_deploy.prototxt` and weights `MobileNetSSD_deploy.caffemodel`.
1818

‎doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ Open your Doxyfile using your favorite text editor and search for the key
3636
`TAGFILES`. Change it as follows:
3737

3838
@code
39-
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.3
39+
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.0.0
4040
@endcode
4141

4242
If you had other definitions already, you can append the line using a `\`:
4343

4444
@code
4545
TAGFILES = ./docs/doxygen-tags/libstdc++.tag=https://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen \
46-
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.3
46+
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/4.0.0
4747
@endcode
4848

4949
Doxygen can now use the information from the tag file to link to the OpenCV

‎doc/tutorials/videoio/intelperc.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,5 @@ there are two flags that should be used to set/get property of the needed genera
7878
flag value is assumed by default if neither of the two possible values of the property is set.
7979

8080
For more information please refer to the example of usage
81-
[intelperc_capture.cpp](https://github.com/opencv/opencv/tree/master/samples/cpp/intelperc_capture.cpp)
81+
[videocapture_intelperc.cpp](https://github.com/opencv/opencv/tree/master/samples/cpp/videocapture_intelperc.cpp)
8282
in opencv/samples/cpp folder.

‎doc/tutorials/videoio/kinect_openni.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,5 @@ property. The following properties of cameras available through OpenNI interface
134134
- CAP_OPENNI_DEPTH_GENERATOR_REGISTRATION = CAP_OPENNI_DEPTH_GENERATOR + CAP_PROP_OPENNI_REGISTRATION
135135

136136
For more information please refer to the example of usage
137-
[openni_capture.cpp](https://github.com/opencv/opencv/tree/master/samples/cpp/openni_capture.cpp) in
137+
[videocapture_openni.cpp](https://github.com/opencv/opencv/tree/master/samples/cpp/videocapture_openni.cpp) in
138138
opencv/samples/cpp folder.

0 commit comments

Comments
 (0)