Vadim Pisarevsky [Tue, 20 Feb 2018 14:50:16 +0000 (14:50 +0000)]
Merge pull request #10406 from seiko2plus:coreUnvintrinCopy
Vadim Pisarevsky [Tue, 20 Feb 2018 14:47:13 +0000 (14:47 +0000)]
Merge pull request #10745 from terfendail:tiff_fix
PalkoNazar [Tue, 20 Feb 2018 13:55:25 +0000 (15:55 +0200)]
make tmpRow proper size before copyTo to avoid reallocated tmpCol (#10860)
* make tmpRow proper size before copyTo to avoid reallocated tmpCol
* do the transposition without creating temporary array; replace TAB with spaces.
* revert the previous commit
Vadim Pisarevsky [Tue, 20 Feb 2018 13:26:59 +0000 (13:26 +0000)]
Merge pull request #10902 from alalek:port_10695
Vadim Pisarevsky [Tue, 20 Feb 2018 13:25:58 +0000 (13:25 +0000)]
Merge pull request #10903 from alalek:ml_ann_test
Vadim Pisarevsky [Tue, 20 Feb 2018 12:22:09 +0000 (12:22 +0000)]
Merge pull request #10908 from alalek:fix_ffmpeg_uchar
Alexander Alekhin [Tue, 20 Feb 2018 10:15:41 +0000 (13:15 +0300)]
ffmpeg: fix 'uchar' error
> cap_ffmpeg_impl.hpp:1710:11: error: 'uchar' does not name a type
Alexander Alekhin [Tue, 20 Feb 2018 08:59:07 +0000 (08:59 +0000)]
Merge pull request #10891 from pengli:dnn
Li Peng [Fri, 16 Feb 2018 07:37:59 +0000 (15:37 +0800)]
ReLU6 layer ocl support
include relu6 ocl kernel and layer fusion support
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Mon, 19 Feb 2018 16:45:04 +0000 (19:45 +0300)]
ml: refactor ML_ANN test
Vitaly Tuzov [Wed, 31 Jan 2018 13:24:24 +0000 (16:24 +0300)]
Fix for vertically flipped tiff files reading
mworchel [Thu, 25 Jan 2018 12:34:12 +0000 (13:34 +0100)]
Add mask support to SimpleBlobDetector
Dmitry Kurtaev [Mon, 19 Feb 2018 14:25:18 +0000 (17:25 +0300)]
Use only absolute prior boxes explicit sizes. Remove scales attributes. (#10874)
* Use only absolute prior boxes explicit sizes. Remove scales attributes.
* Simplified PriorBox layer forward pass
Vadim Pisarevsky [Mon, 19 Feb 2018 14:16:06 +0000 (14:16 +0000)]
Merge pull request #10876 from alalek:android_static_libs
Vadim Pisarevsky [Mon, 19 Feb 2018 14:13:43 +0000 (14:13 +0000)]
Merge pull request #10880 from StevenPuttemans:fix_10594
Vadim Pisarevsky [Mon, 19 Feb 2018 14:11:11 +0000 (14:11 +0000)]
Merge pull request #10893 from alalek:fix_cpu_disable_flags
Vadim Pisarevsky [Mon, 19 Feb 2018 14:08:58 +0000 (14:08 +0000)]
Merge pull request #10896 from dkurt:tensorflow_tests_generator
Alexander Alekhin [Mon, 19 Feb 2018 13:59:20 +0000 (13:59 +0000)]
Merge pull request #10900 from tomoaki0705:fixPerfVideoioGstreamer
Tomoaki Teshima [Mon, 19 Feb 2018 09:33:05 +0000 (18:33 +0900)]
read in gray scale mode when writing a gray scale video
Dmitry Kurtaev [Sun, 18 Feb 2018 09:45:43 +0000 (12:45 +0300)]
Fix DNN flatten test
Alexander Alekhin [Sun, 18 Feb 2018 07:45:01 +0000 (07:45 +0000)]
Merge pull request #10895 from tomoaki0705:fixBuildVS2013sprintf
Tomoaki Teshima [Sun, 18 Feb 2018 00:29:38 +0000 (09:29 +0900)]
fix test error on VS2013
Alexander Alekhin [Sun, 18 Feb 2018 00:03:04 +0000 (00:03 +0000)]
core: remove '-' from separators list of disabled CPU flags
To allow runtime disabling of AVX512-SKX via 'OPENCV_CPU_DISABLE' parameter
Maksim Shabunin [Sat, 17 Feb 2018 12:04:14 +0000 (15:04 +0300)]
Merge pull request #10868 from mshabunin:sample-bgsegm
* Samples: reworked bgfg_bgsegm
* fixup! Samples: reworked bgfg_bgsegm
Alexander Alekhin [Sat, 17 Feb 2018 12:02:48 +0000 (12:02 +0000)]
Merge pull request #10890 from Reputeless:patch-1
Florian Echtler [Sat, 17 Feb 2018 12:01:24 +0000 (13:01 +0100)]
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
Alexander Alekhin [Sat, 17 Feb 2018 11:58:51 +0000 (11:58 +0000)]
Merge pull request #10885 from alalek:issue_10881
Patrik Huber [Sat, 17 Feb 2018 11:53:30 +0000 (11:53 +0000)]
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
Ryo Suzuki [Sat, 17 Feb 2018 10:35:25 +0000 (19:35 +0900)]
Fix typo in core/base.hpp
Alexander Alekhin [Fri, 16 Feb 2018 11:08:51 +0000 (14:08 +0300)]
core: fix parallel_for data race
Alexander Alekhin [Fri, 16 Feb 2018 11:17:32 +0000 (11:17 +0000)]
Merge pull request #10867 from dkurt:dnn_fix_ave_pooling_area
Alexander Alekhin [Fri, 16 Feb 2018 10:29:39 +0000 (10:29 +0000)]
Merge pull request #10883 from alalek:portable_stdint
Alexander Alekhin [Thu, 15 Feb 2018 20:19:02 +0000 (23:19 +0300)]
build: portable integer types
Alexander Alekhin [Thu, 15 Feb 2018 15:52:52 +0000 (15:52 +0000)]
Merge pull request #10793 from denmatfoton:master
Alexander Alekhin [Thu, 15 Feb 2018 15:48:12 +0000 (15:48 +0000)]
Merge pull request #10879 from StevenPuttemans:fix_10650
Alexander Alekhin [Thu, 15 Feb 2018 15:46:12 +0000 (15:46 +0000)]
Merge pull request #10727 from alalek:cmake_hook_system
Alexander Alekhin [Thu, 15 Feb 2018 15:14:03 +0000 (15:14 +0000)]
Merge pull request #10145 from allnes:vedeoio_avi_container
Steven [Thu, 15 Feb 2018 14:59:14 +0000 (15:59 +0100)]
add missing DNN header to opencv2/opencv.hpp
Steven [Thu, 15 Feb 2018 14:44:51 +0000 (15:44 +0100)]
fix tutorial on real time pose estimation
Alexander Nesterov [Wed, 14 Feb 2018 15:04:54 +0000 (18:04 +0300)]
Added avi-container with tests
Alexander Alekhin [Thu, 15 Feb 2018 12:49:31 +0000 (15:49 +0300)]
android: move .a files into 'staticlibs' directory
to reduce overhead of gradle builds
Alexander Alekhin [Thu, 15 Feb 2018 12:17:42 +0000 (15:17 +0300)]
calib3d: add regression test for stereoCalibrate
Alexander Alekhin [Mon, 29 Jan 2018 15:02:00 +0000 (18:02 +0300)]
cmake: customize OpenCV build via CMake script hooks
Dmitry Kurtaev [Wed, 14 Feb 2018 13:56:31 +0000 (16:56 +0300)]
Add a flag to manage average pooling with padding
Alexander Alekhin [Wed, 14 Feb 2018 12:49:53 +0000 (12:49 +0000)]
Merge pull request #10854 from pengli:dnn
Alexander Alekhin [Wed, 14 Feb 2018 12:47:43 +0000 (12:47 +0000)]
Merge pull request #10864 from alalek:cmake_update_debug_info
Vadim Pisarevsky [Wed, 14 Feb 2018 12:25:18 +0000 (12:25 +0000)]
Merge pull request #10865 from dkurt:dnn_inf_engine_getInputsInfo
Vadim Pisarevsky [Wed, 14 Feb 2018 11:36:50 +0000 (11:36 +0000)]
Merge pull request #10678 from terfendail:OutputArray_recreate
Vadim Pisarevsky [Wed, 14 Feb 2018 11:33:15 +0000 (11:33 +0000)]
Merge pull request #10856 from tomoaki0705:fixVisualStudioFixedWidthInt
Dmitry Kurtaev [Wed, 14 Feb 2018 11:17:44 +0000 (14:17 +0300)]
Add const getInputsInfo
Vadim Pisarevsky [Wed, 14 Feb 2018 10:50:05 +0000 (10:50 +0000)]
Merge pull request #10861 from nglee:dev_cudaDftAlgorithmTest
Vadim Pisarevsky [Wed, 14 Feb 2018 10:49:05 +0000 (10:49 +0000)]
Merge pull request #10863 from mshabunin:fix-viz-samples-build
Alexander Alekhin [Tue, 13 Feb 2018 14:34:40 +0000 (17:34 +0300)]
cmake: debug info
Vadim Pisarevsky [Wed, 14 Feb 2018 10:35:14 +0000 (10:35 +0000)]
Merge pull request #10850 from dkurt:dnn_tf_deconv_tests
Alexander Alekhin [Wed, 14 Feb 2018 09:56:11 +0000 (09:56 +0000)]
Merge pull request #10859 from luzpaz:misc-modules-typos-cont-2
Maksim Shabunin [Wed, 14 Feb 2018 09:45:10 +0000 (12:45 +0300)]
Samples: fixed samples build in case the viz module is disabled
Namgoo Lee [Wed, 14 Feb 2018 00:54:13 +0000 (09:54 +0900)]
Fix for CUDA_Arithm/Dft.Algorithm/0 test
Li Peng [Mon, 12 Feb 2018 11:14:41 +0000 (19:14 +0800)]
re-enable tensor flow mobilenet ssd ocl test
Signed-off-by: Li Peng <peng.li@intel.com>
luz.paz [Tue, 13 Feb 2018 16:28:11 +0000 (11:28 -0500)]
Misc. modules/ cont. pt2
Found via `codespell`
Alexander Alekhin [Tue, 13 Feb 2018 16:12:28 +0000 (16:12 +0000)]
Merge pull request #10846 from luzpaz:misc-modules-typos-cont
Alexander Alekhin [Tue, 13 Feb 2018 16:08:48 +0000 (16:08 +0000)]
Merge pull request #10821 from dkurt:dnn_layers_fusion
Li Peng [Mon, 12 Feb 2018 14:52:37 +0000 (22:52 +0800)]
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>
Li Peng [Sun, 11 Feb 2018 10:12:25 +0000 (18:12 +0800)]
ocl fix for detection_output and prior_box layer
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Tue, 13 Feb 2018 14:37:38 +0000 (14:37 +0000)]
Merge pull request #10818 from mshabunin:install-samples-src
Alexander Alekhin [Tue, 13 Feb 2018 13:56:22 +0000 (13:56 +0000)]
Merge pull request #10852 from alalek:fix_cpuid
Alexander Alekhin [Mon, 12 Feb 2018 19:34:18 +0000 (19:34 +0000)]
core: generalize and fix x86 'cpuid' calls
Dmitry Kurtaev [Tue, 13 Feb 2018 09:07:56 +0000 (12:07 +0300)]
Refactored deep learning layers fusion
Tomoaki Teshima [Tue, 13 Feb 2018 09:30:02 +0000 (18:30 +0900)]
fix build error on Visual Studio 2013 and earlier
Dmitry Kurtaev [Mon, 12 Feb 2018 15:55:27 +0000 (18:55 +0300)]
Fix deconvolution layer. Add batch norm layer with mean-variance normalization from TensorFlow.
Maksim Shabunin [Mon, 12 Feb 2018 15:39:32 +0000 (18:39 +0300)]
Samples: fixed viz tutorials building with enabled opencv_world
Maksim Shabunin [Fri, 9 Feb 2018 13:17:01 +0000 (16:17 +0300)]
Added group targets for samples (opencv_samples, opencv_samples_<group>), install samples/data inseparate component 'samples_data'
Maksim Shabunin [Fri, 9 Feb 2018 10:30:04 +0000 (13:30 +0300)]
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
Maksim Shabunin [Fri, 9 Feb 2018 10:24:18 +0000 (13:24 +0300)]
Fixed compilation warnings in samples:
- use per-module includes instead of "opencv.hpp"
- unused function warnings
- undefined macro warning
Maksim Shabunin [Fri, 9 Feb 2018 10:21:17 +0000 (13:21 +0300)]
Fixed OpenGL-specific compilation warning (unused function)
Alexander Alekhin [Mon, 12 Feb 2018 15:39:24 +0000 (15:39 +0000)]
Merge pull request #10845 from alalek:cpu_dispatch_fix_file_generation
luz.paz [Mon, 12 Feb 2018 15:15:36 +0000 (10:15 -0500)]
Misc. modules/ typos (cont.)
Found via `codespell`
Alexander Alekhin [Mon, 12 Feb 2018 14:30:53 +0000 (17:30 +0300)]
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
Alexander Alekhin [Mon, 12 Feb 2018 13:49:53 +0000 (13:49 +0000)]
Merge pull request #10797 from mshabunin:split-convert
Alexander Alekhin [Mon, 12 Feb 2018 13:49:41 +0000 (13:49 +0000)]
Merge pull request #10798 from mshabunin:split-stat
Alexander Alekhin [Mon, 12 Feb 2018 13:48:06 +0000 (13:48 +0000)]
Merge pull request #10822 from alalek:ocl_fix_imgproc_amd
Alexander Alekhin [Mon, 12 Feb 2018 13:47:12 +0000 (13:47 +0000)]
Merge pull request #10843 from luzpaz:misc-modules-typos
Sui Libin [Mon, 12 Feb 2018 13:07:56 +0000 (21:07 +0800)]
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
Maksim Shabunin [Tue, 6 Feb 2018 12:02:51 +0000 (15:02 +0300)]
Split convert.cpp into smaller pieces
luz.paz [Mon, 12 Feb 2018 12:07:39 +0000 (07:07 -0500)]
Misc. modules/ typos
Found via `codespell`
Rémi Ratajczak [Mon, 12 Feb 2018 11:51:07 +0000 (12:51 +0100)]
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
Alexander Alekhin [Mon, 12 Feb 2018 11:48:20 +0000 (14:48 +0300)]
cmake: update reporting of excluded dispatching files (#10711)
* cmake: add ocv_get_smart_file_name() macro
* cmake: avoid adding files for unavailable dispatch modes
Namgoo Lee [Mon, 12 Feb 2018 11:41:23 +0000 (20:41 +0900)]
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
Vadim Pisarevsky [Mon, 12 Feb 2018 11:39:59 +0000 (11:39 +0000)]
Merge pull request #10805 from dkurt:dnn_inf_engine_tf_ssd
yuki takehara [Mon, 12 Feb 2018 11:36:54 +0000 (20:36 +0900)]
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
Maksim Shabunin [Tue, 6 Feb 2018 12:54:14 +0000 (15:54 +0300)]
Split stat.cpp into smaller pieces
Alexander Alekhin [Fri, 9 Feb 2018 15:22:08 +0000 (18:22 +0300)]
ocl: disable Laplacian5 and sepFilter2D_SinglePass kernels for AMD OpenCL
Alexander Alekhin [Mon, 12 Feb 2018 09:24:28 +0000 (09:24 +0000)]
Merge pull request #10839 from csukuangfj:fix-9486
Alexander Alekhin [Mon, 12 Feb 2018 09:23:55 +0000 (09:23 +0000)]
Merge pull request #10836 from csukuangfj:fix-10826
Alexander Alekhin [Mon, 12 Feb 2018 09:19:51 +0000 (09:19 +0000)]
Merge pull request #10835 from csukuangfj:fix-10827
Alexander Alekhin [Mon, 12 Feb 2018 09:19:25 +0000 (09:19 +0000)]
Merge pull request #10834 from csukuangfj:fix-issue-9387
Alexander Alekhin [Mon, 12 Feb 2018 09:12:39 +0000 (09:12 +0000)]
Merge pull request #10833 from csukuangfj:improve-viz3d
Fangjun Kuang [Sun, 11 Feb 2018 07:49:33 +0000 (15:49 +0800)]
fix issue #9387 and #9575.
Fangjun Kuang [Sun, 11 Feb 2018 12:08:53 +0000 (20:08 +0800)]
fix issue #9486.
Fangjun Kuang [Sun, 11 Feb 2018 06:15:50 +0000 (14:15 +0800)]
improve the doc for the viz module.
Fangjun Kuang [Sun, 11 Feb 2018 08:01:21 +0000 (16:01 +0800)]
Fix issue 10826.