Vadim Pisarevsky [Mon, 16 Oct 2017 10:45:16 +0000 (10:45 +0000)]
Merge pull request #9848 from jet47:features2d-optional-flann-dep
Vadim Pisarevsky [Mon, 16 Oct 2017 10:44:07 +0000 (10:44 +0000)]
Merge pull request #9859 from ryanfox:patch-3
Vadim Pisarevsky [Mon, 16 Oct 2017 10:43:37 +0000 (10:43 +0000)]
Merge pull request #9857 from americast:mat_fix
Gregory Morse [Mon, 16 Oct 2017 09:12:35 +0000 (11:12 +0200)]
Merge pull request #9856 from GregoryMorse:patch-1
* Update OpenCVCompilerOptimizations.cmake
Neon not supported on MSVC ARM breaking build fix
* Update OpenCVCompilerOptimizations.cmake
Whitespace
* Update intrin.hpp
Many problems in MSVC ARM builds (at least on VS2017) being fixed in this PR now.
C:\Users\Gregory\DOCUME~1\MYLIBR~1\OPENCV~3\opencv\sources\modules\core\include\opencv2/core/hal/intrin.hpp(444): error C3861: '_tzcnt_u32': identifier not found
* Update hal_replacement.hpp
Passing variadic expansion in a macro to another macro does not work properly in MSVC and a famous known workaround is hereby applied. Discussion of it: https://stackoverflow.com/questions/5134523/msvc-doesnt-expand-va-args-correctly
Only needed the fix for ARM builds: TEGRA_ macros are used for cv_hal_ functions in the carotene library.
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): warning C4003: not enough actual parameters for macro 'TEGRA_ADD'
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): error C2143: syntax error: missing ')' before ','
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\core\src\arithm.cpp(2378): error C2059: syntax error: ')'
* Update hal_replacement.hpp
All hal_replacement's using carotene\hal\tegra_hal.hpp TEGRA_ functions as macros preprocessed by variadic macros should be changed, identical as was done in core.
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\imgproc\src\color.cpp(9604): warning C4003: not enough actual parameters for macro 'TEGRA_CVTBGRTOBGR'
C:\Users\Gregory\Documents\My Libraries\opencv330\opencv\sources\modules\imgproc\src\color.cpp(9604): error C2059: syntax error: '=='
* Update OpenCVCompilerOptimizations.cmake
* Update hal_replacement.hpp
* Update hal_replacement.hpp
Ryan Fox [Mon, 16 Oct 2017 03:59:48 +0000 (22:59 -0500)]
Fix up grammatical errors in python tutorial
Alexander Alekhin [Sun, 15 Oct 2017 14:29:20 +0000 (14:29 +0000)]
Merge pull request #9855 from IgWod:extract-vector-typedefs
Igor Wodiany [Fri, 13 Oct 2017 23:27:37 +0000 (00:27 +0100)]
Move vector_size_t and vector_vector_Mat
These two typdefs are not compiled when BUILD_opencv_dnn is set to
false, however there are other modules that uses these typedef so
it may cause build errors. Moving typedef to the python module
ensures they are always defined.
Sayan Sinha [Sat, 14 Oct 2017 16:16:11 +0000 (21:46 +0530)]
Fix typo in mat.hpp
Alexander Alekhin [Fri, 13 Oct 2017 15:33:36 +0000 (15:33 +0000)]
Merge pull request #9851 from alalek:cmake_fix_lapack_mkl_detection
Alexander Alekhin [Fri, 13 Oct 2017 15:25:06 +0000 (15:25 +0000)]
Merge pull request #9842 from alalek:fix_dnn_experimental
Alexander Alekhin [Fri, 13 Oct 2017 12:40:37 +0000 (15:40 +0300)]
cmake: fix LAPACK/MKL detection
Vladislav Vinogradov [Fri, 13 Oct 2017 08:01:48 +0000 (11:01 +0300)]
made flann dependency for features2d optional
it will allow to build features2d even if flann module is not available
Alexander Alekhin [Thu, 12 Oct 2017 15:15:20 +0000 (18:15 +0300)]
dnn: don't use "experimental_dnn_v1" namespace directly
Maksim Shabunin [Thu, 12 Oct 2017 12:08:53 +0000 (12:08 +0000)]
Merge pull request #9834 from mshabunin:mediasdk-win-support
Alexander Alekhin [Thu, 12 Oct 2017 11:26:20 +0000 (11:26 +0000)]
Merge pull request #9829 from pengli:ocl4dnn
Alexander Alekhin [Thu, 12 Oct 2017 11:22:54 +0000 (11:22 +0000)]
Merge pull request #9841 from alalek:naming_issue
Alexander Alekhin [Thu, 12 Oct 2017 10:28:30 +0000 (13:28 +0300)]
build: resolve naming issue
Alexander Alekhin [Thu, 12 Oct 2017 09:40:32 +0000 (09:40 +0000)]
Merge pull request #9838 from alalek:fix_ocl_world_build
Li Peng [Wed, 11 Oct 2017 07:29:39 +0000 (15:29 +0800)]
dnn(ocl4dnn): support log softmax in ocl4dnn
Signed-off-by: Li Peng <peng.li@intel.com>
Vadim Pisarevsky [Wed, 11 Oct 2017 17:18:40 +0000 (17:18 +0000)]
Merge pull request #9835 from sovrasov:blob_from_img_crop_opt
Vadim Pisarevsky [Wed, 11 Oct 2017 17:11:15 +0000 (17:11 +0000)]
Merge pull request #9824 from sturkmen72:upd_minEnclosingTriangle
Alexander Alekhin [Wed, 11 Oct 2017 13:19:29 +0000 (16:19 +0300)]
ocl: fix world compilation on Windows
Alexander Alekhin [Wed, 11 Oct 2017 15:21:05 +0000 (15:21 +0000)]
Merge pull request #9836 from lupustr3:pvlasov/external_ipp-iw_fix
Alexander Alekhin [Wed, 11 Oct 2017 15:19:17 +0000 (15:19 +0000)]
Merge pull request #9818 from tz70s:issue#9570
Suleyman TURKMEN [Wed, 11 Oct 2017 14:52:23 +0000 (17:52 +0300)]
Update minarea.cpp
Suleyman TURKMEN [Wed, 11 Oct 2017 14:48:19 +0000 (17:48 +0300)]
Update min_enclosing_triangle.cpp
Suleyman TURKMEN [Wed, 11 Oct 2017 14:37:38 +0000 (17:37 +0300)]
Update imgproc.hpp
Vadim Pisarevsky [Wed, 11 Oct 2017 13:36:14 +0000 (13:36 +0000)]
Merge pull request #9636 from dkurt:duplicate_lp_norm_layer
Maksim Shabunin [Tue, 10 Oct 2017 14:21:27 +0000 (17:21 +0300)]
MediaSDK video backend: Windows support
Vadim Pisarevsky [Wed, 11 Oct 2017 13:31:46 +0000 (13:31 +0000)]
Merge pull request #9820 from sovrasov:text_detector_dnn
Vadim Pisarevsky [Wed, 11 Oct 2017 13:31:17 +0000 (13:31 +0000)]
Merge pull request #9828 from berak:fix_c++17_9572
Vadim Pisarevsky [Wed, 11 Oct 2017 13:28:38 +0000 (13:28 +0000)]
Merge pull request #9823 from alalek:dnn_halide_bypass_tbb_threads
Vladislav Sovrasov [Wed, 11 Oct 2017 12:46:20 +0000 (15:46 +0300)]
dnn: add crop flag to blobFromImage
Pavel Vlasov [Wed, 11 Oct 2017 12:30:01 +0000 (15:30 +0300)]
Standalone IPP with IW fix;
Vladislav Sovrasov [Wed, 11 Oct 2017 11:04:48 +0000 (14:04 +0300)]
dnn: fix additional text boxes handling after the latest adaptations for TF
Alexander Alekhin [Wed, 11 Oct 2017 10:58:04 +0000 (10:58 +0000)]
Merge pull request #9827 from ryanfox:patch-2
Alexander Alekhin [Wed, 11 Oct 2017 08:55:15 +0000 (08:55 +0000)]
Merge pull request #9826 from p0wdrdotcom:master
Vladislav Sovrasov [Tue, 10 Oct 2017 09:03:05 +0000 (12:03 +0300)]
dnn: modify priorBox layer
berak [Wed, 11 Oct 2017 07:50:22 +0000 (09:50 +0200)]
fix c++17 namsespace issues
Ryan Fox [Wed, 11 Oct 2017 02:37:26 +0000 (21:37 -0500)]
fix some grammatical errors
Geoff McIver [Tue, 10 Oct 2017 20:32:38 +0000 (09:32 +1300)]
This statement was keeping HAAR cascades from leveraging opencl on nvidia devices. "localSize" on the featureEvaluator remains Size(0, 0) which sets the bool "use_ocl" to false. Adding this allows NVidia GPUs to leverage opencl HAAR Cascades
Suleyman TURKMEN [Sun, 8 Oct 2017 10:22:13 +0000 (13:22 +0300)]
Updates min_enclosing_triangle.cpp
Dmitry Kurtaev [Mon, 28 Aug 2017 14:37:09 +0000 (17:37 +0300)]
Removed LPNormalize layer.
Alexander Alekhin [Tue, 10 Oct 2017 14:52:55 +0000 (17:52 +0300)]
dnn(halide): don't compile Halide via parallel_for_()
To avoid problem with reduced stack size of inner threads.
Vadim Pisarevsky [Tue, 10 Oct 2017 14:23:02 +0000 (14:23 +0000)]
Merge pull request #9816 from opalmirror:fix_stereobm_mindisp_truncation_1
Vadim Pisarevsky [Tue, 10 Oct 2017 14:22:00 +0000 (14:22 +0000)]
Merge pull request #9822 from alalek:fix_tbb_search
Vadim Pisarevsky [Tue, 10 Oct 2017 13:51:39 +0000 (13:51 +0000)]
Merge pull request #8940 from 678098:nonblocking_haar_detector_parallel_for
tz70s [Tue, 10 Oct 2017 05:28:07 +0000 (13:28 +0800)]
fix#9570: implement mat ptr for generic types
The original template based mat ptr for indexing is not implemented,
add the similar implementation as uchar type, but cast to
user-defined type from the uchar pointer.
Vadim Pisarevsky [Tue, 10 Oct 2017 12:02:03 +0000 (12:02 +0000)]
Merge pull request #9705 from AlexeyAB:dnn_darknet_yolo_v2
Alexander Alekhin [Tue, 10 Oct 2017 11:18:28 +0000 (14:18 +0300)]
tbb: don't search library in ENV{LD_LIBRARY_PATH}
ENV{LIBRARY_PATH} is enough
Vadim Pisarevsky [Tue, 10 Oct 2017 10:58:34 +0000 (10:58 +0000)]
Merge pull request #9786 from LaurentBerger:Histo3d
Vadim Pisarevsky [Tue, 10 Oct 2017 10:06:24 +0000 (10:06 +0000)]
Merge pull request #9750 from dkurt:feature_dnn_tf_text_graph
Vadim Pisarevsky [Tue, 10 Oct 2017 10:00:31 +0000 (10:00 +0000)]
Merge pull request #9763 from seiko2plus:addVsxCore
Vadim Pisarevsky [Tue, 10 Oct 2017 09:57:51 +0000 (09:57 +0000)]
Merge pull request #9811 from dkurt:prelu_with_shared_channels
Maksim Shabunin [Tue, 10 Oct 2017 09:02:02 +0000 (09:02 +0000)]
Merge pull request #9805 from alalek:ffmpeg_update
James Perkins [Thu, 5 Oct 2017 22:42:20 +0000 (15:42 -0700)]
fix StereoBM disparity map right margin truncation when minDisparities > 0
LaurentBerger [Mon, 9 Oct 2017 20:25:57 +0000 (22:25 +0200)]
It's done
Alexander Alekhin [Mon, 9 Oct 2017 20:08:00 +0000 (20:08 +0000)]
Merge pull request #9815 from alalek:issue_9813
Alexander Alekhin [Mon, 9 Oct 2017 19:12:52 +0000 (22:12 +0300)]
qt: fix non-world builds
AlexeyAB [Sun, 24 Sep 2017 20:34:08 +0000 (23:34 +0300)]
Added DNN Darknet Yolo v2 for object detection
Dmitry Kurtaev [Mon, 9 Oct 2017 14:47:46 +0000 (17:47 +0300)]
PReLU layer from Caffe
Alexander Alekhin [Mon, 9 Oct 2017 16:19:09 +0000 (16:19 +0000)]
Merge pull request #9810 from alalek:fix_js_build
Alexander Alekhin [Mon, 9 Oct 2017 13:14:01 +0000 (16:14 +0300)]
js: skip 'utils' headers
Vadim Pisarevsky [Mon, 9 Oct 2017 12:46:06 +0000 (12:46 +0000)]
Merge pull request #9792 from alalek:port_9776
Vadim Pisarevsky [Mon, 9 Oct 2017 12:43:46 +0000 (12:43 +0000)]
Merge pull request #9799 from alalek:ocl_program
Vadim Pisarevsky [Mon, 9 Oct 2017 12:33:08 +0000 (12:33 +0000)]
Merge pull request #9800 from alalek:fix_build_msvs2010
Vadim Pisarevsky [Mon, 9 Oct 2017 12:11:22 +0000 (12:11 +0000)]
Merge pull request #9803 from wzw-intel:ocl_timer
Vadim Pisarevsky [Mon, 9 Oct 2017 12:09:55 +0000 (12:09 +0000)]
Merge pull request #9806 from mshabunin:fix-static-7
Maksim Shabunin [Mon, 9 Oct 2017 10:52:07 +0000 (13:52 +0300)]
Fixed and suppressed warnings produced by GCC 6.3.0
Alexander Alekhin [Mon, 9 Oct 2017 10:46:50 +0000 (10:46 +0000)]
Merge pull request #9790 from mevatron:patch-1
Alexander Alekhin [Mon, 9 Oct 2017 10:17:17 +0000 (13:17 +0300)]
ffmpeg: update 3.3.4
Maksim Shabunin [Mon, 9 Oct 2017 10:33:55 +0000 (13:33 +0300)]
Fixed warnings produced by static analyzer
LaurentBerger [Mon, 9 Oct 2017 08:59:30 +0000 (10:59 +0200)]
Use @snippet
Wu Zhiwen [Mon, 2 Oct 2017 11:22:28 +0000 (19:22 +0800)]
ocl: simplify ocl::Timer
Use clFinish to gurantee commands completed, instead of waiting for events.
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
Sayed Adel [Mon, 2 Oct 2017 22:55:59 +0000 (22:55 +0000)]
Added universal intrinsic for VSX
Sayed Adel [Mon, 2 Oct 2017 22:54:31 +0000 (22:54 +0000)]
Added support for VSX
Alexander Alekhin [Sun, 8 Oct 2017 20:32:22 +0000 (23:32 +0300)]
build: fix MSVS2010
Dmitry Kurtaev [Thu, 28 Sep 2017 13:51:47 +0000 (16:51 +0300)]
Text TensorFlow graphs parsing. MobileNet-SSD for 90 classes.
Alexander Alekhin [Sun, 8 Oct 2017 17:32:49 +0000 (17:32 +0000)]
Merge pull request #9796 from lzx1413:patch-1
Alexander Alekhin [Thu, 7 Sep 2017 13:41:19 +0000 (16:41 +0300)]
ocl: refactor program compilation
Alexander Alekhin [Thu, 7 Sep 2017 13:40:03 +0000 (16:40 +0300)]
ocl: define ProgramSource before program
no changes in code
Alexander Alekhin [Sun, 8 Oct 2017 16:17:40 +0000 (19:17 +0300)]
dnn(samples): fix python syntax (false -> False)
lzx1413 [Sun, 8 Oct 2017 13:10:25 +0000 (21:10 +0800)]
in python, false should be False
Alexander Alekhin [Sun, 8 Oct 2017 09:48:46 +0000 (09:48 +0000)]
Merge pull request #9795 from IgWod:refactor-scalar-to-raw-data
Igor Wodiany [Sat, 7 Oct 2017 18:46:45 +0000 (19:46 +0100)]
Extract code from scalarToRawData
The same code was repeated several time for different data types, so
it was extracted as a templated function to improve maintability and
make a code more clear.
Igor Wodiany [Wed, 4 Oct 2017 21:54:40 +0000 (22:54 +0100)]
Fix a memory leak in the Mat copying constructor
Exception may be rasied inside the body of a copying constructor after
refcount has been increased, and beacause in the case of the exception
destrcutor is never called what causes memory leak. This commit adds a
workaround that calls the release() function before the exception is
thrown outside the contructor.
mevatron [Fri, 6 Oct 2017 21:03:39 +0000 (16:03 -0500)]
Small fix for using Qt 5.x with opencv_world
LaurentBerger [Thu, 5 Oct 2017 08:06:40 +0000 (10:06 +0200)]
3D histogram
Vadim Pisarevsky [Fri, 6 Oct 2017 14:35:42 +0000 (14:35 +0000)]
Merge pull request #9761 from Jazmann:ellipseFitAMS&Direct
Vadim Pisarevsky [Fri, 6 Oct 2017 14:02:58 +0000 (14:02 +0000)]
Merge pull request #9424 from Cartucho:update_imgproc_tutorials
Vadim Pisarevsky [Fri, 6 Oct 2017 13:47:54 +0000 (13:47 +0000)]
Merge pull request #9772 from dkurt:fix_caffe_eltwise_and_fc_layers
Vadim Pisarevsky [Fri, 6 Oct 2017 13:46:50 +0000 (13:46 +0000)]
Merge pull request #9787 from dkurt:feature_dnn_resize_nearest_neighbor
Vadim Pisarevsky [Fri, 6 Oct 2017 11:48:05 +0000 (11:48 +0000)]
Merge pull request #9778 from dkurt:dnn_colorization
Vadim Pisarevsky [Fri, 6 Oct 2017 11:45:35 +0000 (11:45 +0000)]
Merge pull request #9779 from Lightricks:feature/assetslibrary-remove-link
Dmitry Kurtaev [Fri, 6 Oct 2017 11:24:01 +0000 (14:24 +0300)]
Nearest neighbor resize layer
Maksim Shabunin [Fri, 6 Oct 2017 10:44:58 +0000 (10:44 +0000)]
Merge pull request #9773 from shoeffner:feature/doxygen-tag-file
Dmitry Kurtaev [Thu, 5 Oct 2017 10:04:22 +0000 (13:04 +0300)]
Grayscale colorization model (https://github.com/richzhang/colorization) test.
Yaron Inger [Thu, 5 Oct 2017 17:22:56 +0000 (20:22 +0300)]
videoio: remove AssetsLibrary dependency.
The entire AssetsLibrary framework is deprecated since iOS 8.0. The code
used in the camera example code can use UIKit to save videos to the
camera instead, which allows to avoid linking with PhotoKit instead to
prevent increasing the iOS deployment target.
tribta [Sat, 26 Aug 2017 23:02:29 +0000 (00:02 +0100)]
Tutorial Hough Lines
tribta [Sat, 26 Aug 2017 14:11:46 +0000 (15:11 +0100)]
Tutorial Hough Circles