1dee705074
Merge branch '3.4' into merge-3.4
2018-12-22 05:40:15 +00:00
578ea4bae9
Merge pull request #13386 from alalek:android_gradle
2018-12-21 13:56:03 +00:00
832217907f
Merge pull request #13435 from alalek:issue_13434
2018-12-21 11:01:04 +00:00
bbdc987fc6
dnn: add OpenVINO 2018R5 defines
...
https://software.intel.com/en-us/openvino-toolkit
2018-12-21 05:52:27 +00:00
2b35c1708b
android: gradle-based package and samples
...
- drop hello-android sample
2018-12-19 14:59:48 +03:00
7fb70e1701
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-18 19:07:43 +00:00
b0a08cced9
Merge pull request #13466 from pstieber:AddTuringCudaGeneration
2018-12-18 18:35:47 +00:00
50ef9830e2
Added Turing to the _generations list.
2018-12-18 08:52:15 -08:00
bb8c19aad3
cmake: fix python install paths
2018-12-17 14:32:29 +03:00
8d907d2e32
cmake(java): add OPENCV_JAVA_SOURCE_VERSION/OPENCV_JAVA_TARGET_VERSION
2018-12-14 00:15:57 +00:00
0c16d8f6c3
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-13 15:12:26 +03:00
b7bb79c7c8
videoio(MSMF): backport WITH_MSMF_DXVA flag
2018-12-13 14:56:20 +03:00
aa666dfa9c
Merge pull request #13430 from tomoaki0705:fixCudaJetsonTX2file
2018-12-13 09:14:26 +00:00
3e710d8eec
use correct CC value for Jetson Xavier
2018-12-13 13:35:19 +09:00
6fa23f330f
cmake: fix compiler flags filtering
2018-12-12 13:35:43 +03:00
ea64e860de
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-12-09 13:21:58 +00:00
e5f298cca5
Merge pull request #13385 from alalek:cmake_cleanup_build_junk_dir
2018-12-08 17:51:09 +00:00
85b1750660
Merge pull request #13316 from alalek:cmake_fix_baseline_detect
2018-12-08 17:50:03 +00:00
05131af8da
Merge pull request #13367 from mshabunin:cmake-verify
...
* Added dependency verification mechanism for cmake
2018-12-07 15:57:25 +03:00
d77612fe70
cmake: hide 'junk' dir from the root of build directory
...
moved to CMakeFiles (no conflicts are expected)
2018-12-07 05:14:08 +00:00
80a3d7bffa
Fix comment marker in OpenCVDetectCudaArch.cu
2018-12-04 11:47:28 -08:00
487f631243
Merge pull request #13320 from alalek:api_checks_4.0.0
2018-11-28 19:51:29 +00:00
59fa477edb
opencv4: fix abi-checker (to enable API/source checks only)
2018-11-28 18:42:19 +03:00
fab0eb0d75
cmake: fix compiler flags (CPU_BASELINE_REQUIRED=xxx + CPU_BASELINE=DETECT)
2018-11-28 14:04:03 +03:00
8f4e5c2fb8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-26 15:37:45 +03:00
c0016d7fe9
Merge pull request #13253 from alalek:fix_13201
...
* cmake: install 'legacy/constants_c.h' files
* samples: add compatibility test code
2018-11-23 20:02:46 +03:00
adf2013052
Merge pull request #13209 from alalek:issue_12865
2018-11-21 14:30:32 +00:00
7fa7fa0226
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-21 08:33:39 +00:00
474a0dac49
core: several improves and fixes on ppc64le infrastructure
...
- add infrastructure support for Power9/VSX3
- fix missing VSX flags on GCC4.9 and CLANG4(#13210 , #13222 )
- fix disable VSX optimzation on GCC by using flag ENABLE_VSX
- flag ENABLE_VSX is deprecated now, use CPU_BASELINE, CPU_DISPATCH instead
- add VSX3 to arithmetic dispatchable flags
2018-11-20 15:28:46 +00:00
1317c3d178
cmake: don't generate dllmain for cudev module
2018-11-19 19:11:52 +03:00
22dbcf98c5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-17 14:17:35 +00:00
53af811530
cmake: emit warnings about unsupported options if turned ON only
2018-11-16 20:24:31 +00:00
a4b21d9e2e
Merge pull request #13177 from alalek:update_win32_scripts
2018-11-16 22:45:57 +03:00
b321851e53
Merge pull request #12977 from alalek:python_package
2018-11-16 22:45:33 +03:00
ce6acd3ecd
python: bindings loader package
...
Configures and loads OpenCV bindings extension including 3rdparty dependencies
Based on running Python specify:
- configure PYTHON_PATH (via "sys.path")
- configure LD_LIBRARY_PATH / PATH
2018-11-16 00:51:16 +00:00
8792bddb0a
win32: update setupvars.cmd
...
- drop EnableDelayedExpansion
- pause on failed commands (non-interactive mode)
2018-11-15 23:36:26 +00:00
b5c54e447c
Extra hyperparameters for Intel's Inference Engine layers
2018-11-15 20:06:37 +03:00
5f2074d757
Merge pull request #13140 from alalek:opencv3_opencv4
2018-11-12 22:34:10 +03:00
fc3fc6005e
Merge pull request #13126 from mshabunin:remove_libv4l
2018-11-12 22:10:49 +03:00
27fd913c86
build: fix version 3->4
2018-11-12 19:05:58 +00:00
e0e828ef5c
videoio: remove using of HAVE_CAMV4L
2018-11-12 18:53:19 +00:00
f5b212a9d4
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-12 17:58:45 +03:00
c54676d625
cmake: fix supporting of legacy flags
2018-11-12 14:11:57 +03:00
0d65397ae7
videoio: remove cap_libv4l in favour of cap_v4l
...
cap_libv4l depends on an external library (libv4l) yet is still larger
(1966 loc vs 1822 loc).
It was initially introduced copy pasting cap_v4l in order to offload
various color conversions to libv4l.
However nowadays we handle most of the needed color conversions inside
OpenCV. Our own implementation is better tested and (probably) also
better performing. (as it can optionally leverage IPP/ OpenCL)
Currently cap_v4l is better maintained and generally the code is in
better shape. There is however an API
difference in getting unconverted frames:
* on cap_libv4l one need to set `CV_CAP_MODE_GRAY=1` or
`CV_CAP_MODE_YUYV=1`
* on cap_v4l one needs to set `CV_CAP_PROP_CONVERT_RGB=0`
the latter is more flexible though as it also allows accessing undecoded
JPEG images.
fixes #4563
2018-11-12 13:38:59 +03:00
1913482cf5
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-10 20:50:26 +00:00
ebc8015638
Merge pull request #13074 from alalek:cleanup_videoio
2018-11-08 19:09:32 +03:00
467eb4d240
Merge pull request #12901 from alalek:cmake_unsupported_option_warning
2018-11-08 12:21:38 +00:00
5869415a57
videoio: drop obsolete backends
...
- VFW
- QuickTime/QtKit
- Unicap - GPL, no active support: https://github.com/unicap/unicap
- DC1394 (1st version) / CMU1394
2018-11-07 19:49:09 +03:00
b059a361dd
highgui: drop obsolete Carbon API
...
https://en.wikipedia.org/wiki/Carbon_(API)
In 2012, with the release of OS X 10.8 Mountain Lion, most Carbon APIs were considered deprecated.
2018-11-07 19:21:33 +03:00
d9be552bbc
Merge pull request #13006 from alalek:cmake_setup_vars
...
cmake: introduce setup_vars scripts
2018-11-06 23:52:00 +03:00
Alexander Alekhin
Alexander Alekhin
Peter J. Stieber
Tomoaki Teshima
Maksim Shabunin
Kartik Mohta
Sayed Adel
Dmitry Kurtaev
Pavel Rojtberg