1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Commit Graph

23397 Commits

Author SHA1 Message Date
Alexander Alekhin cf31243c74 android: add build.grade into Android SDK
For using 'OpenCV for Android SDK' with Android Studio projects.
2018-02-19 17:19:26 +03:00
Vadim Pisarevsky 88b689bcf1 Merge pull request #10876 from alalek:android_static_libs 2018-02-19 14:16:06 +00:00
Vadim Pisarevsky f589237e23 Merge pull request #10880 from StevenPuttemans:fix_10594 2018-02-19 14:13:43 +00:00
Vadim Pisarevsky 7da6e9086c Merge pull request #10893 from alalek:fix_cpu_disable_flags 2018-02-19 14:11:11 +00:00
Vadim Pisarevsky 68043f4de9 Merge pull request #10896 from dkurt:tensorflow_tests_generator 2018-02-19 14:08:58 +00:00
Alexander Alekhin c0eaff3608 Merge pull request #10900 from tomoaki0705:fixPerfVideoioGstreamer 2018-02-19 13:59:20 +00:00
Tomoaki Teshima bcce25900b read in gray scale mode when writing a gray scale video 2018-02-19 18:33:05 +09:00
Dmitry Kurtaev 34ba32ff27 Fix DNN flatten test 2018-02-18 12:45:43 +03:00
Alexander Alekhin 857007372d Merge pull request #10895 from tomoaki0705:fixBuildVS2013sprintf 2018-02-18 07:45:01 +00:00
Tomoaki Teshima 6a661e1e28 fix test error on VS2013 2018-02-18 09:29:38 +09:00
Alexander Alekhin cc5a6f3b86 core: remove '-' from separators list of disabled CPU flags
To allow runtime disabling of AVX512-SKX via 'OPENCV_CPU_DISABLE' parameter
2018-02-18 00:03:04 +00:00
Maksim Shabunin aa7a964139 Merge pull request #10868 from mshabunin:sample-bgsegm
* Samples: reworked bgfg_bgsegm

* fixup! Samples: reworked bgfg_bgsegm
2018-02-17 15:04:14 +03:00
Alexander Alekhin 73a8369631 Merge pull request #10890 from Reputeless:patch-1 2018-02-17 12:02:48 +00:00
Florian Echtler 6a8f57e5d7 Merge pull request #10081 from floe:java-camera2-view
* add (untested) JavaCamera2View class

* initial fixes

* minor cleanup

* exclude JavaCamera2View from build for older SDK version

* fix method name typo

* add asserts + sanity checks

* fix preview format checks

* fix the memory leak

* export cvtTwoPlaneYUVtoBGR for Java usage

* add handling for two-plane YUV frames (C wrapper still missing)

* add two-plane cvtColor helper function

* fix warnings

* actually use the new cvtColorTwoPlane helper func

* fix wrong output matrix size

* fix wrong conversion type

* simplify method signature, add error condition

* minor fixes to Mat types

* remove leftover semaphore from camera api 1

* android: JavaCamera2View minor refactoring

- re-apply Java code style
- imports cleanup
- dump exceptions information

* android: JavaCamera2View: pause/resume fixes

* android: JavaCamera2View: fix mScale
2018-02-17 15:01:24 +03:00
Alexander Alekhin eb94dfb442 Merge pull request #10885 from alalek:issue_10881 2018-02-17 11:58:51 +00:00
Patrik Huber 7be0c78533 Merge pull request #10589 from patrikhuber:patch-1
* Make <array> #ifdef true for MSVC

I think MSVC had `std::array` for quite a while (possibly going back as far as VS 2012, but it's definitely there in 2015 and 2017. So I think `_MSC_VER` `1900` is a safe bet. Probably `1800` and maybe even `1700` could work as well but I can't test that locally.

* fix test
2018-02-17 14:53:30 +03:00
Ryo Suzuki 97d9ea00fe Fix typo in core/base.hpp 2018-02-17 19:35:25 +09:00
Alexander Alekhin 491502a349 core: fix parallel_for data race 2018-02-16 21:13:48 +03:00
Alexander Alekhin 0e4eed0ba1 Merge pull request #10867 from dkurt:dnn_fix_ave_pooling_area 2018-02-16 11:17:32 +00:00
Alexander Alekhin 8ffcc76011 Merge pull request #10883 from alalek:portable_stdint 2018-02-16 10:29:39 +00:00
Alexander Alekhin c020a7bb67 build: portable integer types 2018-02-15 23:43:02 +03:00
Alexander Alekhin e268fdc0ed Merge pull request #10793 from denmatfoton:master 2018-02-15 15:52:52 +00:00
Alexander Alekhin bb925fe488 Merge pull request #10879 from StevenPuttemans:fix_10650 2018-02-15 15:48:12 +00:00
Alexander Alekhin 1dbdb1cfc9 Merge pull request #10727 from alalek:cmake_hook_system 2018-02-15 15:46:12 +00:00
Alexander Alekhin 30b33a4413 Merge pull request #10145 from allnes:vedeoio_avi_container 2018-02-15 15:14:03 +00:00
Steven 945ad277ea add missing DNN header to opencv2/opencv.hpp 2018-02-15 15:59:14 +01:00
Steven 6f4e35cc0e fix tutorial on real time pose estimation 2018-02-15 15:48:52 +01:00
Alexander Nesterov df8f61877e Added avi-container with tests 2018-02-15 17:34:49 +03: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 f378f1d585 calib3d: add regression test for stereoCalibrate 2018-02-15 15:24:09 +03:00
Alexander Alekhin 36f11a54e1 cmake: customize OpenCV build via CMake script hooks 2018-02-15 14:03:38 +03:00
Dmitry Kurtaev f8d0d6365e Add a flag to manage average pooling with padding 2018-02-14 16:56:31 +03:00
Alexander Alekhin cff79609c8 Merge pull request #10854 from pengli:dnn 2018-02-14 12:49:53 +00:00
Alexander Alekhin c434198ee5 Merge pull request #10864 from alalek:cmake_update_debug_info 2018-02-14 12:47:43 +00:00
Vadim Pisarevsky ef70b0baa4 Merge pull request #10865 from dkurt:dnn_inf_engine_getInputsInfo 2018-02-14 12:25:18 +00:00
Vadim Pisarevsky b4ddf3d8c5 Merge pull request #10678 from terfendail:OutputArray_recreate 2018-02-14 11:36:51 +00:00
Vadim Pisarevsky 42b25d747b Merge pull request #10856 from tomoaki0705:fixVisualStudioFixedWidthInt 2018-02-14 11:33:15 +00:00
Dmitry Kurtaev a66b5e2c13 Add const getInputsInfo 2018-02-14 14:17:44 +03:00
Vadim Pisarevsky 8f0b72be9e Merge pull request #10861 from nglee:dev_cudaDftAlgorithmTest 2018-02-14 10:50:05 +00:00
Vadim Pisarevsky 15dc6f70dc Merge pull request #10863 from mshabunin:fix-viz-samples-build 2018-02-14 10:49:05 +00:00
Alexander Alekhin 95014f311d cmake: debug info 2018-02-14 13:44:10 +03:00
Vadim Pisarevsky 6dfd7e3da2 Merge pull request #10850 from dkurt:dnn_tf_deconv_tests 2018-02-14 10:35:14 +00:00
Alexander Alekhin cfe84b953c Merge pull request #10859 from luzpaz:misc-modules-typos-cont-2 2018-02-14 09:56:11 +00:00
Maksim Shabunin f78b9468dd Samples: fixed samples build in case the viz module is disabled 2018-02-14 12:45:10 +03:00
Namgoo Lee 034dc3b0dd Fix for CUDA_Arithm/Dft.Algorithm/0 test 2018-02-14 09:54:13 +09:00
Li Peng 80d1f2ddfa re-enable tensor flow mobilenet ssd ocl test
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-14 01:04:58 +08:00
luz.paz d05714995c Misc. modules/ cont. pt2
Found via `codespell`
2018-02-13 11:28:11 -05:00
Alexander Alekhin 252e871a8b Merge pull request #10846 from luzpaz:misc-modules-typos-cont 2018-02-13 16:12:28 +00:00
Alexander Alekhin 59b91d6c31 Merge pull request #10821 from dkurt:dnn_layers_fusion 2018-02-13 16:08:48 +00:00
Li Peng 5992c46606 add fallback case for ocl convolution
The ocl convolution doesn't support tensorflow padMode well.
Add fallback check if we meet this situation, it could fix the
tensorflow MobileNet SSD failure.

Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-14 00:04:38 +08:00