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
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 Nesterov
df8f61877e
Added avi-container with tests
2018-02-15 17:34:49 +03:00
Alexander Alekhin
f378f1d585
calib3d: add regression test for stereoCalibrate
2018-02-15 15:24:09 +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
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
6dfd7e3da2
Merge pull request #10850 from dkurt:dnn_tf_deconv_tests
2018-02-14 10:35:14 +00: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
Li Peng
00d2f34888
ocl fix for detection_output and prior_box layer
...
Signed-off-by: Li Peng <peng.li@intel.com>
2018-02-13 23:09:14 +08:00
Alexander Alekhin
a91a11e533
Merge pull request #10818 from mshabunin:install-samples-src
2018-02-13 14:37:38 +00:00
Alexander Alekhin
eb54e5c55c
core: generalize and fix x86 'cpuid' calls
2018-02-13 15:35:04 +03:00
Dmitry Kurtaev
514e6df460
Refactored deep learning layers fusion
2018-02-13 14:35:58 +03:00
Tomoaki Teshima
94253e8b83
fix build error on Visual Studio 2013 and earlier
2018-02-13 18:30:02 +09:00
Dmitry Kurtaev
a6baedd02c
Fix deconvolution layer. Add batch norm layer with mean-variance normalization from TensorFlow.
2018-02-13 11:00:27 +03:00
Maksim Shabunin
8393d755f6
Fixed OpenGL-specific compilation warning (unused function)
2018-02-12 18:42:36 +03:00
luz.paz
e805a55a5b
Misc. modules/ typos (cont.)
...
Found via `codespell`
2018-02-12 10:15:36 -05:00
Alexander Alekhin
17233c687e
Merge pull request #10797 from mshabunin:split-convert
2018-02-12 13:49:53 +00:00
Alexander Alekhin
57cbde3393
Merge pull request #10798 from mshabunin:split-stat
2018-02-12 13:49:41 +00:00
Alexander Alekhin
579781e35e
Merge pull request #10822 from alalek:ocl_fix_imgproc_amd
2018-02-12 13:48:06 +00:00
Alexander Alekhin
66f3c1ae79
Merge pull request #10843 from luzpaz:misc-modules-typos
2018-02-12 13:47:12 +00:00
Sui Libin
1ad814a191
fix faster_rcnn sample crashed at PoolingInvoker on Windows7(x64). ( #10724 )
...
* fix faster_rcnn sample crashed at PoolingInvoker operator() of pooling_layer.
* find_odj onmouse bug about find matched point status.
* reverted AutoBuffer back to std::vector
2018-02-12 16:07:56 +03:00
Maksim Shabunin
221342fb25
Split convert.cpp into smaller pieces
2018-02-12 15:17:19 +03:00
luz.paz
5718d09e39
Misc. modules/ typos
...
Found via `codespell`
2018-02-12 07:09:43 -05:00
Rémi Ratajczak
b67523550f
dnn : Added an imagesFromBlob method to the dnn module ( #10607 )
...
* Added the imagesFromBlob method to the dnn module.
* Rewritten imagesFromBlob based on first dkurt comments
* Updated code with getPlane()
* Modify comment of imagesFromBlob() in dnn module
* modified comments, removed useless assertions & added OutputArrayOfArray
* replaced tabs with whitespaces & put vectorOfChannels instantiation outside the loop
* Changed pre-commit.sample to pre-commit in .git/hooks/
* Added a test for imagesFromBlob in test_misc.cpp (dnn)
* Changed nbOfImages, robustified test with cv::randu, modified assertion
2018-02-12 14:51:07 +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
Namgoo Lee
61e76e767d
Update BufferReader documentation with some example code ( #10803 )
...
* Update BufferReader documentation with some example code
* Add warning to BufferPool doc regarding deallocation of StackAllocator
* Added a sample code that satisfies LIFO rule for StackAllocator
2018-02-12 14:41:23 +03:00
Vadim Pisarevsky
51b5fdba25
Merge pull request #10805 from dkurt:dnn_inf_engine_tf_ssd
2018-02-12 11:40:00 +00:00
yuki takehara
379ea15d16
Add new Mat constructor ( #10808 )
...
* Add new Mat constructor
* Fix build error
* Fix build error
* Fixed the code about 4 comments
* Fixed three comments
* delete previous local declaration
* fix build error
2018-02-12 14:36:54 +03:00
Maksim Shabunin
4437e0c3b9
Split stat.cpp into smaller pieces
2018-02-12 14:14:08 +03:00
Alexander Alekhin
fad3a6bf15
ocl: disable Laplacian5 and sepFilter2D_SinglePass kernels for AMD OpenCL
2018-02-12 14:06:57 +03:00
Alexander Alekhin
ab0f0f26a1
Merge pull request #10839 from csukuangfj:fix-9486
2018-02-12 09:24:29 +00:00
Alexander Alekhin
b7ad95beaa
Merge pull request #10836 from csukuangfj:fix-10826
2018-02-12 09:23:55 +00:00
Alexander Alekhin
2c8da29f3a
Merge pull request #10835 from csukuangfj:fix-10827
2018-02-12 09:19:52 +00:00
