platform/upstream/opencv.git
7 years agomade flann dependency for features2d optional
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

7 years agoMerge pull request #9834 from mshabunin:mediasdk-win-support
Maksim Shabunin [Thu, 12 Oct 2017 12:08:53 +0000 (12:08 +0000)]
Merge pull request #9834 from mshabunin:mediasdk-win-support

7 years agoMerge pull request #9829 from pengli:ocl4dnn
Alexander Alekhin [Thu, 12 Oct 2017 11:26:20 +0000 (11:26 +0000)]
Merge pull request #9829 from pengli:ocl4dnn

7 years agoMerge pull request #9841 from alalek:naming_issue
Alexander Alekhin [Thu, 12 Oct 2017 11:22:54 +0000 (11:22 +0000)]
Merge pull request #9841 from alalek:naming_issue

7 years agobuild: resolve naming issue
Alexander Alekhin [Thu, 12 Oct 2017 10:28:30 +0000 (13:28 +0300)]
build: resolve naming issue

7 years agoMerge pull request #9838 from alalek:fix_ocl_world_build
Alexander Alekhin [Thu, 12 Oct 2017 09:40:32 +0000 (09:40 +0000)]
Merge pull request #9838 from alalek:fix_ocl_world_build

7 years agodnn(ocl4dnn): support log softmax in ocl4dnn
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>
7 years agoMerge pull request #9835 from sovrasov:blob_from_img_crop_opt
Vadim Pisarevsky [Wed, 11 Oct 2017 17:18:40 +0000 (17:18 +0000)]
Merge pull request #9835 from sovrasov:blob_from_img_crop_opt

7 years agoMerge pull request #9824 from sturkmen72:upd_minEnclosingTriangle
Vadim Pisarevsky [Wed, 11 Oct 2017 17:11:15 +0000 (17:11 +0000)]
Merge pull request #9824 from sturkmen72:upd_minEnclosingTriangle

7 years agoocl: fix world compilation on Windows
Alexander Alekhin [Wed, 11 Oct 2017 13:19:29 +0000 (16:19 +0300)]
ocl: fix world compilation on Windows

7 years agoMerge pull request #9836 from lupustr3:pvlasov/external_ipp-iw_fix
Alexander Alekhin [Wed, 11 Oct 2017 15:21:05 +0000 (15:21 +0000)]
Merge pull request #9836 from lupustr3:pvlasov/external_ipp-iw_fix

7 years agoMerge pull request #9818 from tz70s:issue#9570
Alexander Alekhin [Wed, 11 Oct 2017 15:19:17 +0000 (15:19 +0000)]
Merge pull request #9818 from tz70s:issue#9570

7 years agoUpdate minarea.cpp
Suleyman TURKMEN [Wed, 11 Oct 2017 14:52:23 +0000 (17:52 +0300)]
Update minarea.cpp

7 years agoUpdate min_enclosing_triangle.cpp
Suleyman TURKMEN [Wed, 11 Oct 2017 14:48:19 +0000 (17:48 +0300)]
Update min_enclosing_triangle.cpp

7 years agoUpdate imgproc.hpp
Suleyman TURKMEN [Wed, 11 Oct 2017 14:37:38 +0000 (17:37 +0300)]
Update imgproc.hpp

7 years agoMerge pull request #9636 from dkurt:duplicate_lp_norm_layer
Vadim Pisarevsky [Wed, 11 Oct 2017 13:36:14 +0000 (13:36 +0000)]
Merge pull request #9636 from dkurt:duplicate_lp_norm_layer

7 years agoMediaSDK video backend: Windows support
Maksim Shabunin [Tue, 10 Oct 2017 14:21:27 +0000 (17:21 +0300)]
MediaSDK video backend: Windows support

7 years agoMerge pull request #9820 from sovrasov:text_detector_dnn
Vadim Pisarevsky [Wed, 11 Oct 2017 13:31:46 +0000 (13:31 +0000)]
Merge pull request #9820 from sovrasov:text_detector_dnn

7 years agoMerge pull request #9828 from berak:fix_c++17_9572
Vadim Pisarevsky [Wed, 11 Oct 2017 13:31:17 +0000 (13:31 +0000)]
Merge pull request #9828 from berak:fix_c++17_9572

7 years agoMerge pull request #9823 from alalek:dnn_halide_bypass_tbb_threads
Vadim Pisarevsky [Wed, 11 Oct 2017 13:28:38 +0000 (13:28 +0000)]
Merge pull request #9823 from alalek:dnn_halide_bypass_tbb_threads

7 years agodnn: add crop flag to blobFromImage
Vladislav Sovrasov [Wed, 11 Oct 2017 12:46:20 +0000 (15:46 +0300)]
dnn: add crop flag to blobFromImage

7 years agoStandalone IPP with IW fix;
Pavel Vlasov [Wed, 11 Oct 2017 12:30:01 +0000 (15:30 +0300)]
Standalone IPP with IW fix;

7 years agodnn: fix additional text boxes handling after the latest adaptations for TF
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

7 years agoMerge pull request #9827 from ryanfox:patch-2
Alexander Alekhin [Wed, 11 Oct 2017 10:58:04 +0000 (10:58 +0000)]
Merge pull request #9827 from ryanfox:patch-2

7 years agoMerge pull request #9826 from p0wdrdotcom:master
Alexander Alekhin [Wed, 11 Oct 2017 08:55:15 +0000 (08:55 +0000)]
Merge pull request #9826 from p0wdrdotcom:master

7 years agodnn: modify priorBox layer
Vladislav Sovrasov [Tue, 10 Oct 2017 09:03:05 +0000 (12:03 +0300)]
dnn: modify priorBox layer

7 years agofix c++17 namsespace issues
berak [Wed, 11 Oct 2017 07:50:22 +0000 (09:50 +0200)]
fix c++17 namsespace issues

7 years agofix some grammatical errors
Ryan Fox [Wed, 11 Oct 2017 02:37:26 +0000 (21:37 -0500)]
fix some grammatical errors

7 years agoThis statement was keeping HAAR cascades from leveraging opencl on nvidia devices...
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

7 years agoUpdates min_enclosing_triangle.cpp
Suleyman TURKMEN [Sun, 8 Oct 2017 10:22:13 +0000 (13:22 +0300)]
Updates min_enclosing_triangle.cpp

7 years agoRemoved LPNormalize layer.
Dmitry Kurtaev [Mon, 28 Aug 2017 14:37:09 +0000 (17:37 +0300)]
Removed LPNormalize layer.

7 years agodnn(halide): don't compile Halide via parallel_for_()
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.

7 years agoMerge pull request #9816 from opalmirror:fix_stereobm_mindisp_truncation_1
Vadim Pisarevsky [Tue, 10 Oct 2017 14:23:02 +0000 (14:23 +0000)]
Merge pull request #9816 from opalmirror:fix_stereobm_mindisp_truncation_1

7 years agoMerge pull request #9822 from alalek:fix_tbb_search
Vadim Pisarevsky [Tue, 10 Oct 2017 14:22:00 +0000 (14:22 +0000)]
Merge pull request #9822 from alalek:fix_tbb_search

7 years agoMerge pull request #8940 from 678098:nonblocking_haar_detector_parallel_for
Vadim Pisarevsky [Tue, 10 Oct 2017 13:51:39 +0000 (13:51 +0000)]
Merge pull request #8940 from 678098:nonblocking_haar_detector_parallel_for

7 years agofix#9570: implement mat ptr for generic types
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.

7 years agoMerge pull request #9705 from AlexeyAB:dnn_darknet_yolo_v2
Vadim Pisarevsky [Tue, 10 Oct 2017 12:02:03 +0000 (12:02 +0000)]
Merge pull request #9705 from AlexeyAB:dnn_darknet_yolo_v2

7 years agotbb: don't search library in ENV{LD_LIBRARY_PATH}
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

7 years agoMerge pull request #9786 from LaurentBerger:Histo3d
Vadim Pisarevsky [Tue, 10 Oct 2017 10:58:34 +0000 (10:58 +0000)]
Merge pull request #9786 from LaurentBerger:Histo3d

7 years agoMerge pull request #9750 from dkurt:feature_dnn_tf_text_graph
Vadim Pisarevsky [Tue, 10 Oct 2017 10:06:24 +0000 (10:06 +0000)]
Merge pull request #9750 from dkurt:feature_dnn_tf_text_graph

7 years agoMerge pull request #9763 from seiko2plus:addVsxCore
Vadim Pisarevsky [Tue, 10 Oct 2017 10:00:31 +0000 (10:00 +0000)]
Merge pull request #9763 from seiko2plus:addVsxCore

7 years agoMerge pull request #9811 from dkurt:prelu_with_shared_channels
Vadim Pisarevsky [Tue, 10 Oct 2017 09:57:51 +0000 (09:57 +0000)]
Merge pull request #9811 from dkurt:prelu_with_shared_channels

7 years agoMerge pull request #9805 from alalek:ffmpeg_update
Maksim Shabunin [Tue, 10 Oct 2017 09:02:02 +0000 (09:02 +0000)]
Merge pull request #9805 from alalek:ffmpeg_update

7 years agofix StereoBM disparity map right margin truncation when minDisparities > 0
James Perkins [Thu, 5 Oct 2017 22:42:20 +0000 (15:42 -0700)]
fix StereoBM disparity map right margin truncation when minDisparities > 0

7 years agoIt's done
LaurentBerger [Mon, 9 Oct 2017 20:25:57 +0000 (22:25 +0200)]
It's done

7 years agoMerge pull request #9815 from alalek:issue_9813
Alexander Alekhin [Mon, 9 Oct 2017 20:08:00 +0000 (20:08 +0000)]
Merge pull request #9815 from alalek:issue_9813

7 years agoqt: fix non-world builds
Alexander Alekhin [Mon, 9 Oct 2017 19:12:52 +0000 (22:12 +0300)]
qt: fix non-world builds

7 years agoAdded DNN Darknet Yolo v2 for object detection
AlexeyAB [Sun, 24 Sep 2017 20:34:08 +0000 (23:34 +0300)]
Added DNN Darknet Yolo v2 for object detection

7 years agoPReLU layer from Caffe
Dmitry Kurtaev [Mon, 9 Oct 2017 14:47:46 +0000 (17:47 +0300)]
PReLU layer from Caffe

7 years agoMerge pull request #9810 from alalek:fix_js_build
Alexander Alekhin [Mon, 9 Oct 2017 16:19:09 +0000 (16:19 +0000)]
Merge pull request #9810 from alalek:fix_js_build

7 years agojs: skip 'utils' headers
Alexander Alekhin [Mon, 9 Oct 2017 13:14:01 +0000 (16:14 +0300)]
js: skip 'utils' headers

7 years agoMerge pull request #9792 from alalek:port_9776
Vadim Pisarevsky [Mon, 9 Oct 2017 12:46:06 +0000 (12:46 +0000)]
Merge pull request #9792 from alalek:port_9776

7 years agoMerge pull request #9799 from alalek:ocl_program
Vadim Pisarevsky [Mon, 9 Oct 2017 12:43:46 +0000 (12:43 +0000)]
Merge pull request #9799 from alalek:ocl_program

7 years agoMerge pull request #9800 from alalek:fix_build_msvs2010
Vadim Pisarevsky [Mon, 9 Oct 2017 12:33:08 +0000 (12:33 +0000)]
Merge pull request #9800 from alalek:fix_build_msvs2010

7 years agoMerge pull request #9803 from wzw-intel:ocl_timer
Vadim Pisarevsky [Mon, 9 Oct 2017 12:11:22 +0000 (12:11 +0000)]
Merge pull request #9803 from wzw-intel:ocl_timer

7 years agoMerge pull request #9806 from mshabunin:fix-static-7
Vadim Pisarevsky [Mon, 9 Oct 2017 12:09:55 +0000 (12:09 +0000)]
Merge pull request #9806 from mshabunin:fix-static-7

7 years agoFixed and suppressed warnings produced by GCC 6.3.0
Maksim Shabunin [Mon, 9 Oct 2017 10:52:07 +0000 (13:52 +0300)]
Fixed and suppressed warnings produced by GCC 6.3.0

7 years agoMerge pull request #9790 from mevatron:patch-1
Alexander Alekhin [Mon, 9 Oct 2017 10:46:50 +0000 (10:46 +0000)]
Merge pull request #9790 from mevatron:patch-1

7 years agoffmpeg: update 3.3.4
Alexander Alekhin [Mon, 9 Oct 2017 10:17:17 +0000 (13:17 +0300)]
ffmpeg: update 3.3.4

7 years agoFixed warnings produced by static analyzer
Maksim Shabunin [Mon, 9 Oct 2017 10:33:55 +0000 (13:33 +0300)]
Fixed warnings produced by static analyzer

7 years agoUse @snippet
LaurentBerger [Mon, 9 Oct 2017 08:59:30 +0000 (10:59 +0200)]
Use @snippet

7 years agoocl: simplify ocl::Timer
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>
7 years agoAdded universal intrinsic for VSX
Sayed Adel [Mon, 2 Oct 2017 22:55:59 +0000 (22:55 +0000)]
Added universal intrinsic for VSX

7 years agoAdded support for VSX
Sayed Adel [Mon, 2 Oct 2017 22:54:31 +0000 (22:54 +0000)]
Added support for VSX

7 years agobuild: fix MSVS2010
Alexander Alekhin [Sun, 8 Oct 2017 20:32:22 +0000 (23:32 +0300)]
build: fix MSVS2010

7 years agoText TensorFlow graphs parsing. MobileNet-SSD for 90 classes.
Dmitry Kurtaev [Thu, 28 Sep 2017 13:51:47 +0000 (16:51 +0300)]
Text TensorFlow graphs parsing. MobileNet-SSD for 90 classes.

7 years agoMerge pull request #9796 from lzx1413:patch-1
Alexander Alekhin [Sun, 8 Oct 2017 17:32:49 +0000 (17:32 +0000)]
Merge pull request #9796 from lzx1413:patch-1

7 years agoocl: refactor program compilation
Alexander Alekhin [Thu, 7 Sep 2017 13:41:19 +0000 (16:41 +0300)]
ocl: refactor program compilation

7 years agoocl: define ProgramSource before program
Alexander Alekhin [Thu, 7 Sep 2017 13:40:03 +0000 (16:40 +0300)]
ocl: define ProgramSource before program

no changes in code

7 years agodnn(samples): fix python syntax (false -> False)
Alexander Alekhin [Sun, 8 Oct 2017 16:17:40 +0000 (19:17 +0300)]
dnn(samples): fix python syntax (false -> False)

7 years agoin python, false should be False
lzx1413 [Sun, 8 Oct 2017 13:10:25 +0000 (21:10 +0800)]
in python, false should be False

7 years agoMerge pull request #9795 from IgWod:refactor-scalar-to-raw-data
Alexander Alekhin [Sun, 8 Oct 2017 09:48:46 +0000 (09:48 +0000)]
Merge pull request #9795 from IgWod:refactor-scalar-to-raw-data

7 years agoExtract code from scalarToRawData
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.

7 years agoFix a memory leak in the Mat copying constructor
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.

7 years agoSmall fix for using Qt 5.x with opencv_world
mevatron [Fri, 6 Oct 2017 21:03:39 +0000 (16:03 -0500)]
Small fix for using Qt 5.x with opencv_world

7 years ago3D histogram
LaurentBerger [Thu, 5 Oct 2017 08:06:40 +0000 (10:06 +0200)]
3D histogram

7 years agoMerge pull request #9761 from Jazmann:ellipseFitAMS&Direct
Vadim Pisarevsky [Fri, 6 Oct 2017 14:35:42 +0000 (14:35 +0000)]
Merge pull request #9761 from Jazmann:ellipseFitAMS&Direct

7 years agoMerge pull request #9424 from Cartucho:update_imgproc_tutorials
Vadim Pisarevsky [Fri, 6 Oct 2017 14:02:58 +0000 (14:02 +0000)]
Merge pull request #9424 from Cartucho:update_imgproc_tutorials

7 years agoMerge pull request #9772 from dkurt:fix_caffe_eltwise_and_fc_layers
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

7 years agoMerge pull request #9787 from dkurt:feature_dnn_resize_nearest_neighbor
Vadim Pisarevsky [Fri, 6 Oct 2017 13:46:50 +0000 (13:46 +0000)]
Merge pull request #9787 from dkurt:feature_dnn_resize_nearest_neighbor

7 years agoMerge pull request #9778 from dkurt:dnn_colorization
Vadim Pisarevsky [Fri, 6 Oct 2017 11:48:05 +0000 (11:48 +0000)]
Merge pull request #9778 from dkurt:dnn_colorization

7 years agoMerge pull request #9779 from Lightricks:feature/assetslibrary-remove-link
Vadim Pisarevsky [Fri, 6 Oct 2017 11:45:35 +0000 (11:45 +0000)]
Merge pull request #9779 from Lightricks:feature/assetslibrary-remove-link

7 years agoNearest neighbor resize layer
Dmitry Kurtaev [Fri, 6 Oct 2017 11:24:01 +0000 (14:24 +0300)]
Nearest neighbor resize layer

7 years agoMerge pull request #9773 from shoeffner:feature/doxygen-tag-file
Maksim Shabunin [Fri, 6 Oct 2017 10:44:58 +0000 (10:44 +0000)]
Merge pull request #9773 from shoeffner:feature/doxygen-tag-file

7 years agoGrayscale colorization model (https://github.com/richzhang/colorization) test.
Dmitry Kurtaev [Thu, 5 Oct 2017 10:04:22 +0000 (13:04 +0300)]
Grayscale colorization model (https://github.com/richzhang/colorization) test.

7 years agovideoio: remove AssetsLibrary dependency.
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.

7 years agoTutorial Hough Lines
tribta [Sat, 26 Aug 2017 23:02:29 +0000 (00:02 +0100)]
Tutorial Hough Lines

7 years agoTutorial Hough Circles
tribta [Sat, 26 Aug 2017 14:11:46 +0000 (15:11 +0100)]
Tutorial Hough Circles

7 years agoTutorial Make Border
tribta [Fri, 25 Aug 2017 18:44:55 +0000 (19:44 +0100)]
Tutorial Make Border

7 years agoTutorial Filter2D
tribta [Thu, 24 Aug 2017 15:22:27 +0000 (16:22 +0100)]
Tutorial Filter2D

7 years agoTutorial Image Pyramids
tribta [Wed, 23 Aug 2017 14:37:11 +0000 (15:37 +0100)]
Tutorial Image Pyramids

7 years agoTutorial Sobel Derivatives
tribta [Tue, 22 Aug 2017 11:28:23 +0000 (12:28 +0100)]
Tutorial Sobel Derivatives

7 years agoTutorial Laplace Operator
tribta [Mon, 21 Aug 2017 23:17:09 +0000 (00:17 +0100)]
Tutorial Laplace Operator

7 years agoTutorial Morph Lines Detection
tribta [Mon, 21 Aug 2017 17:51:50 +0000 (18:51 +0100)]
Tutorial Morph Lines Detection

7 years agoTutorial Hit-or-Miss
tribta [Sun, 20 Aug 2017 21:54:38 +0000 (22:54 +0100)]
Tutorial Hit-or-Miss

7 years agoTutorial Smoothing Images
tribta [Sun, 20 Aug 2017 16:14:12 +0000 (17:14 +0100)]
Tutorial Smoothing Images

7 years agoMerge pull request #9762 from dkurt:fix_tensorflow_split_layer
Vadim Pisarevsky [Thu, 5 Oct 2017 10:51:49 +0000 (10:51 +0000)]
Merge pull request #9762 from dkurt:fix_tensorflow_split_layer

7 years agoMerge pull request #9771 from Bisaloo:patch-1
Vadim Pisarevsky [Thu, 5 Oct 2017 10:48:20 +0000 (10:48 +0000)]
Merge pull request #9771 from Bisaloo:patch-1

7 years agoConfiguring Doxygen to generate a tag file.
Sebastian Höffner [Wed, 4 Oct 2017 13:52:12 +0000 (15:52 +0200)]
Configuring Doxygen to generate a tag file.

Additionally adds a tutorial on how to use the tag file in other
projects to link back to the OpenCV documentation.

The tutorial is also the only place which links to the tag file as of
now.

For more information on tag files and external documentation, check
https://www.stack.nl/~dimitri/doxygen/manual/external.html

7 years agoMerge pull request #9769 from pstieber:FixPrivateIncludeInSaturateCast
Alexander Alekhin [Wed, 4 Oct 2017 12:49:44 +0000 (12:49 +0000)]
Merge pull request #9769 from pstieber:FixPrivateIncludeInSaturateCast