mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-02 16:00:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,996 Commits 6 Branches 126 Tags 3 GiB
59bf2a34fa
Commit Graph

1517 Commits

Author SHA1 Message Date
Kuang Fangjun
9ae28415ec fix doc. 2018-06-03 17:44:24 +08:00
Alexander Alekhin
b934702c7f cmake: support find_package(FFMPEG) 
Use "OPENCV_FFMPEG_USE_FIND_PACKAGE" variable to specify find_package() parameters
 2018-05-31 18:27:01 +03:00
Dmitry Kurtaev
f96f934426 Update Intel's Inference Engine deep learning backend (#11587) 
* Update Intel's Inference Engine deep learning backend

* Remove cpu_extension dependency

* Update Darknet accuracy tests
 2018-05-31 14:05:21 +03:00
Alexander Alekhin
5e68f35500 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-22 19:02:01 +03:00
Alexander Enaldiev
84584002f2 Merge pull request #11417 from Turim:imgcodecs_cmake_decoders_customize_formats 
* imgcodecs cmake: the option to customize supported formats list (WITH_IMGCODEC_HDR, WITH_IMGCODEC_SUNRASTER, WITH_IMGCODEC_PXM)

* imgcodecs: fixes

- fixed CMake scripts (=OFF doesn't really work)
- restore dropped GDCM block
- added _IMGCODEC_ prefix
- fixed tests
- include PAM format under WITH_IMGCODEC_PXM option
 2018-05-22 15:10:15 +00:00
Alexander Alekhin
573e790107 Merge pull request #11558 from alalek:issue_11552 2018-05-22 14:19:13 +00:00
Maksim Shabunin
020ad1ac76 dnn: allow setting IE paths via command line 2018-05-22 14:40:03 +03:00
Alexander Alekhin
ba1bd64bf9 Merge pull request #11532 from paroj:realsense 2018-05-21 15:59:46 +00:00
Alexander Alekhin
d4a8a9ee96 cmake: filter NVCC compiler flags (Wimplicit-fallthrough, OPENCV_CUDA_NVCC_FILTEROUT_OPTIONS) 
issue 11552
 2018-05-21 17:54:11 +03:00
Pavel Rojtberg
936d2963a2 videoio: add rudimentary librealsense 1.x support 
it is reusing CAP_INTELPERC* enums as Intel PerC is deprecated and
librealsense replaces it.
 2018-05-17 11:56:52 +02:00
Alexander Alekhin
68c92908d5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-14 15:17:35 +03:00
Alexander Alekhin
c6a9de812b Merge pull request #11497 from alalek:libjpeg-turbo 2018-05-14 12:17:10 +00:00
Alexander Alekhin
f8252702a8 3rdparty: integrate libjpeg-turbo build scripts into OpenCV 2018-05-11 18:29:57 +03:00
Alexander Alekhin
43177b1f6f cmake: added check_flake8 target 2018-05-11 17:32:22 +03:00
Alexander Alekhin
000a13b6a3 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-05-03 14:30:38 +00:00
Sayed Adel
788d6a7105 cmake: Disable -Wsuggest-override option in case of using PCH #11433 2018-05-02 09:12:55 +00:00
Alexander Alekhin
80934dc488 cmake: update 'git describe' information 2018-04-28 17:17:31 +03:00
Alexander Alekhin
e7adce851c
Merge pull request #11314 from terfendail:msmf_camera 2018-04-27 19:34:29 +03:00
Alexander Alekhin
1031dfe4e8 Merge pull request #11402 from alalek:build_warnings 2018-04-26 19:04:37 +00:00
Alexander Alekhin
56222f35bb cmake: fix CPU_BASELINE_FINAL filling 
- remove duplicates
- restore "always on" missing entries
- fix FP16 detection on MSVC
 2018-04-26 17:13:42 +03:00
Alexander Alekhin
2a330e3006 cuda: eliminate warnings 2018-04-26 15:06:59 +03:00
Alexander Enaldiev
677dc802ae protobuf build documenting: move the WITH_PROTOBUF option to the top level 2018-04-26 13:58:13 +03:00
Alexander Alekhin
cd2b188c9a Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-04-24 18:13:06 +03:00
Alexander Alekhin
ef2548778c build: -Wimplicit-fallthrough warning for GCC 7+ only 2018-04-24 16:03:40 +03:00
Vitaly Tuzov
80600e5cdc Added DXVA hardware acceleration to MSMF-based VideoCapture 2018-04-24 13:42:49 +03:00
Alexander Alekhin
a2d6fc7ac0 cmake: fix popcnt detection 
via GCC/Clang __POPCNT__ define
 2018-04-24 12:40:25 +03:00
Alexander Alekhin
ff6ce6cd01 cmake: change CPU_BASELINE=DETECT for MacOSX 2018-04-23 19:42:49 +03:00
Alexander Alekhin
4d7d630e92 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-04-23 18:45:02 +03:00
Alexander Alekhin
dca9ca1cac Merge pull request #11363 from mshabunin:compat-vc2017 2018-04-23 09:24:39 +00:00
Alexander Alekhin
29b4fd2774 Merge pull request #11351 from dkurt:dnn_enable_inf_engine_tests 2018-04-23 09:16:39 +00:00
Maksim Shabunin
abce51fb7b cmake config: adding fallback to VS 2015 if distribution does not have VS 2017 binaries 2018-04-23 09:33:27 +03:00
Dmitry Kurtaev
bd77d100e1 Enable some tests for clDNN plugin from Intel's Inference Engine 2018-04-20 10:47:46 +03:00
Alexander Alekhin
12e8e33144 build: enable -Wimplicit-fallthrough warning for OpenCV modules 2018-04-19 19:54:03 +03:00
Alexander Alekhin
97882d03cc core: fix FP16 conversion with CV_DISABLE_OPTIMIZATION option 
Reproducer:
    cmake -DCPU_BASELINE=AVX2 -DCV_DISABLE_OPTIMIZATION=ON ...
 2018-04-18 14:13:03 +03:00
Alexander Alekhin
5b867b6f1f cmake: fix CPU_BASELINE=NATIVE on MSVS 2018-04-17 19:34:35 +03:00
Alexander Alekhin
4b2d1aaeea Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-04-16 12:41:47 +03:00
Alexander Alekhin
a2d6ee2d31 Merge pull request #11305 from tomoaki0705:typoNVIDIA 2018-04-13 12:56:42 +00:00
Tomoaki Teshima
a40354d16f use correct name for NVIDIA 
* remove NVidia and Nvidia
  * replace Cuda with CUDA
  * keep the letters for API
 2018-04-13 20:33:19 +09:00
Tomoaki Teshima
779a42678d fix CUDA build crash 
* add --std=c++11 flag to nvcc definition
  * remove not used abs functions
 2018-04-11 17:19:09 +09:00
Alexander Alekhin
c6aa97c9aa next(android): java3 -> java4 2018-04-10 18:09:54 +03:00
Alexander Alekhin
250941bd47 next: drop WITH_CSTRIPES 2018-04-10 18:09:54 +03:00
Alexander Alekhin
d4688e6474 cmake: require C++11 and CMake 3.5.1+ 2018-04-10 18:09:54 +03:00
Vladislav Sovrasov
e7e29cb63c cmake: add compilation test for VTK 2018-04-10 18:09:54 +03:00
Alexander Alekhin
73f4907dc0 Merge pull request #11280 from alalek:fix_cmake_warning_ninja_pylintrc 2018-04-10 14:36:12 +00:00
Alexander Alekhin
333973b846 Merge pull request #11276 from alalek:install_pdb 2018-04-10 14:35:32 +00:00
Alexander Alekhin
5e03011496 cmake: fix Ninja generator warning about pylintrc 
CMake generated files is a part of target depends list.
Details: `cmake --help-policy CMP0058`
 2018-04-10 12:23:10 +03:00
Alexander Alekhin
b76ce0e0a4 Merge pull request #11253 from mshabunin:decrease-tbb-dependency 2018-04-09 16:03:34 +00:00
Alexander Alekhin
784c8436fd cmake: update PDB installation 2018-04-09 18:50:58 +03:00
Vladislav Sovrasov
0d9c63744e Add CPU default extensions loading in IE dnn backend (#11252) 
* Add CPU default extensions loading in IE dnn backend

* Load cpu_extensions for the future Intel's Inference Engine
 2018-04-09 16:22:19 +03:00
Vadim Pisarevsky
29869c5b91 Merge pull request #11243 from alalek:with_cuda_default_off 2018-04-09 09:46:34 +00:00
Maksim Shabunin
b88609a921 Reduced direct TBB dependencies 2018-04-06 14:21:15 +03:00
Alexander Alekhin
4990506948 cuda: WITH_CUDA=OFF by default (need to enable it explicitly) 2018-04-05 19:23:58 +00:00
Alexander Alekhin
6abfc6761e android: refactor Android SDK detection 
- properly detect Android SDK support of Ant/Gradle projects
- divide processing of And/Gradle based projects
 2018-04-05 19:19:31 +00:00
Alexander Alekhin
87498bc6d4 cmake: workaround CPATH ipp_iw issue 
CPATH entries are processed before any -isystem:
https://gcc.gnu.org/onlinedocs/cpp/Environment-Variables.html
 2018-03-28 18:43:28 +03:00
Alexander Alekhin
0ede1b5b22 cmake: enable override warnings (requires C++11 compilation mode) 2018-03-28 18:43:28 +03:00
Alexander Alekhin
6c8014e7d1 cmake: disable checks for protobuf generated files 2018-03-28 18:43:28 +03:00
Alexander Alekhin
6bd80ba71b cmake: use SYSTEM include directories 2018-03-28 17:57:58 +03:00
Alexander Alekhin
167034fb04 Merge pull request #11098 from dkurt:dnn_native_inf_engine 2018-03-28 14:52:08 +00:00
Dmitry Kurtaev
2f3a9ba1d4 Update OpenCVDetectInferenceEngine.cmake 2018-03-28 16:34:37 +03:00
Alexander Alekhin
8388b630ac Merge pull request #11167 from alalek:cmake_compiler_vars 2018-03-28 12:38:31 +00:00
Alexander Alekhin
5da7805623 cmake: add module/src include dir in case of enabled precompiled headers 2018-03-27 17:38:54 +03:00
Alexander Alekhin
08941b7890 cmake: avoid amending of CMAKE_COMPILER_IS_[GNUCXX|CLANGCXX|CCACHE] vars 
- Recommended compiler checks:
  - GCC: CV_GCC
  - Clang: CV_CLANG
- fixed problem with CMAKE_CXX_COMPILER_ID=Clang/AppleClang mess on MacOSX
  Details: cmake --help-policy CMP0025
- do not declare Clang as GCC compiler
 2018-03-27 16:16:59 +03:00
Alexander Alekhin
6c051a55e5 cmake: don't add include <module>/src directory to avoid conflicts 
during opencv_world builds
 2018-03-19 11:14:15 +03:00
Alexander Alekhin
47dea29e4e Merge pull request #11081 from alalek:cmake_fix_android_examples_dependencies 2018-03-16 16:32:49 +00:00
Alexander Alekhin
1e808a495d cmake: fix android examples dependencies 
add_dependencies(${target}) doesn't control regeneration of .apk file,
because "${target}" is dummy target.
 2018-03-15 14:17:02 +03:00
Sonny Kurniawan
c11eaeec49 Help Cmake find OpenNI2 include path 
When compiling with OpenNI2 flag active, CMake will not be able to find OpenNI.h due to the environment path not set in OpenCVFindOpenNI2.cmake. This PR rectifies this issue.
 2018-03-15 18:39:07 +09:00
jchazalon
bf5f7380cf
Update OpenCVDownload.cmake to fix log crash 
This suppresses the interpretation of string literals by switching the ocv_download_log from a macro to a function.
This avoid crashes when the string to log contains escape characters.

More details about the problem this PR fixes are available at: https://github.com/opencv/opencv_contrib/issues/1131
 2018-03-07 15:35:37 +01:00
Alexander Alekhin
514f4193db Merge pull request #10959 from alalek:cmake_ocl4dnn 2018-03-07 10:26:14 +00:00
Maksim Shabunin
7bbe002a2f Add install component for 3rdparty libraries licenses 2018-03-06 16:32:30 +03:00
Alexander Alekhin
560ca8c5aa Merge pull request #10961 from alalek:fix_clang_avx512 2018-03-02 11:36:57 +00:00
Alexander Alekhin
1b83bc48a1 dnn: make OpenCL DNN code optional 2018-03-01 12:12:40 +03:00
Alexander Alekhin
0b4428e92f cmake: AVX512 with clang 2018-02-27 15:46:09 +03:00
Maksim Shabunin
f0c0e0c6fa CPU dispatching: additional AVX-512 check for mingw-w64 2018-02-25 15:12:53 +03:00
Maksim Shabunin
3fd2384b81 Fixed mingw compilation on Windows 2018-02-22 17:11:18 +03:00
Vadim Pisarevsky
88b689bcf1 Merge pull request #10876 from alalek:android_static_libs 2018-02-19 14:16:06 +00:00
Alexander Alekhin
ddb482b14a android: move .a files into 'staticlibs' directory 
to reduce overhead of gradle builds
 2018-02-15 16:31:49 +03:00
Alexander Alekhin
36f11a54e1 cmake: customize OpenCV build via CMake script hooks 2018-02-15 14:03:38 +03:00
Alexander Alekhin
c434198ee5 Merge pull request #10864 from alalek:cmake_update_debug_info 2018-02-14 12:47:43 +00:00
Alexander Alekhin
95014f311d cmake: debug info 2018-02-14 13:44:10 +03:00
Maksim Shabunin
2d1350a9d6 Added group targets for samples (opencv_samples, opencv_samples_<group>), install samples/data inseparate component 'samples_data' 2018-02-12 18:42:36 +03:00
Maksim Shabunin
2200e13c71 cmake: refactored scripts with samples building: 
- allow installing samples sources on all platforms
  even if BUILD_EXAMPLES is disabled,  fixed minor
  issues in sources installation process
- use 'example_<group>_<name>' scheme for target and binary file naming
- use single function for sample executable creation
 2018-02-12 18:42:36 +03:00
Alexander Alekhin
14032c6653 cmake: reset __content variable if file doesn't exist 
Resolves CMake error after relaunch with updated source code:
Cannot find source file:
    modules/dnn/layers/layers_common.avx512_skx.cpp
 2018-02-12 17:30:53 +03:00
Alexander Alekhin
5a791e6e06 cmake: update reporting of excluded dispatching files (#10711) 
* cmake: add ocv_get_smart_file_name() macro

* cmake: avoid adding files for unavailable dispatch modes
 2018-02-12 14:48:20 +03:00
Vadim Pisarevsky
51b5fdba25 Merge pull request #10805 from dkurt:dnn_inf_engine_tf_ssd 2018-02-12 11:40:00 +00:00
Alexander Alekhin
65ba2e0adf cmake: update adding of extra compiler flags 
Read flags from 'cache' instead of resetting them
 2018-02-09 17:09:35 +03:00
Dmitry Kurtaev
7fe97376c2 MobileNet-SSD from TensorFlow 1.3 and Inception-V2-SSD using Inference Engine backend 2018-02-09 13:45:45 +03:00
Vadim Pisarevsky
0c07836fba Merge pull request #10807 from luzpaz:misc-typos 2018-02-07 13:43:10 +00:00
luz.paz
413fba14ab Some mist. typo fixes 
Found via `codespell -i 3 -w --skip="./3rdparty" -I ../opencv-whitelist.txt`
 2018-02-07 06:59:15 -05:00
Dmitry Kurtaev
ed94136548 OpenCV face detection network using Inference Engine backend 2018-02-06 17:53:24 +03:00
Dmitry Kurtaev
10e1de74d2 Intel Inference Engine deep learning backend (#10608) 
* Intel Inference Engine deep learning backend.

* OpenFace network using Inference Engine backend
 2018-02-06 11:57:35 +03:00
Alexander Alekhin
06455fc0cd Merge pull request #10764 from sturkmen72:update_cmake 2018-02-05 14:07:40 +00:00
Suleyman TURKMEN
3b191bf2dd update CMakeList.txt 2018-02-05 16:23:52 +03:00
Alexander Alekhin
19a914be16 Merge pull request #10759 from mshabunin:fix-msvc-lto-debug 2018-02-05 09:33:03 +00:00
Alexander Alekhin
e801e336ed Merge pull request #10769 from mshabunin:add-tbb-cmake-support 2018-02-03 19:48:19 +00:00
Maksim Shabunin
108d07c655 TBB: added workaround for linking issue with conflicting system and custom libraries 2018-02-03 14:27:46 +03:00
Maksim Shabunin
34a9ce6eb3 cmake: support searching for TBB via cmake package mechanism 2018-02-03 13:51:54 +03:00
Alexander Alekhin
3d6659112f cmake: fix includes processing 2018-02-02 21:52:54 +03:00
Alexander Alekhin
403c3c3d03 Merge pull request #10766 from mshabunin:fix-world-interface-include 2018-02-02 16:25:17 +00:00
Alexander Alekhin
877b175565 Merge pull request #10758 from mshabunin:allow-many-contrib 2018-02-02 16:07:48 +00:00
Maksim Shabunin
7eb37bd1dd Fixed components INTERFACE_INCLUDE_DIRECTORY property in "world" builds 2018-02-02 18:14:25 +03:00