Vadim Pisarevsky [Tue, 5 Dec 2017 10:32:28 +0000 (13:32 +0300)]
Merge pull request #10223 from vpisarev:ocl_mac_fixes
* fixed OpenCL functions on Mac, so that the tests pass
* fixed compile warnings; temporarily disabled OCL branch of TV L1 optical flow on mac
* fixed other few warnings on macos
Alexander Alekhin [Mon, 4 Dec 2017 16:24:41 +0000 (16:24 +0000)]
Merge pull request #10176 from sturkmen72:update_train_hog
Vadim Pisarevsky [Mon, 4 Dec 2017 13:14:51 +0000 (13:14 +0000)]
Merge pull request #10216 from dkurt:dnn_face_detector_extra_paddings
Suleyman TURKMEN [Sat, 18 Nov 2017 22:41:24 +0000 (01:41 +0300)]
Update train_HOG.cpp
Dmitry Kurtaev [Sun, 3 Dec 2017 14:03:31 +0000 (17:03 +0300)]
Extra paddings for face detector layers
Alexander Alekhin [Fri, 1 Dec 2017 15:42:28 +0000 (15:42 +0000)]
Merge pull request #10212 from alalek:ocl_cache_with_address_bits
Alexander Alekhin [Fri, 1 Dec 2017 15:26:50 +0000 (15:26 +0000)]
Merge pull request #10199 from alalek:fix_calib3d_fisheye_rectify_test
Alexander Alekhin [Fri, 1 Dec 2017 11:02:20 +0000 (14:02 +0300)]
ocl: fix usage of invalid OpenCL cache on mixed 64/32-bit platforms
Observed during launch of 32/64-bit applications on Windows.
Added '32-bit' prefix for 32-bit OpenCL devices. No prefix on 64-bit configurations.
Maksim Shabunin [Fri, 1 Dec 2017 09:38:19 +0000 (09:38 +0000)]
Merge pull request #10060 from allnes:videoio_tests_backend
Alexander Alekhin [Wed, 29 Nov 2017 16:20:55 +0000 (19:20 +0300)]
calib3d: fix fisheye stereoRectify test
- don't write into testdata directory
- check matrices instead of result images
Alexander Alekhin [Thu, 30 Nov 2017 12:38:01 +0000 (15:38 +0300)]
Revert "Adapted estimateNewCameraMatrix to make it work with pincushion-like distortion."
This reverts commit
5384a2205a01c413dfd2c1c86675f093885f9157.
Vadim Pisarevsky [Thu, 30 Nov 2017 10:02:47 +0000 (10:02 +0000)]
Merge pull request #10171 from ElenaGvozdeva:Threshold
Vadim Pisarevsky [Thu, 30 Nov 2017 10:00:51 +0000 (10:00 +0000)]
Merge pull request #10200 from alalek:cmake_fix_dependencies
Alexander Alekhin [Thu, 30 Nov 2017 07:16:12 +0000 (07:16 +0000)]
Merge pull request #10190 from seiko2plus:issue10189
Alexander Alekhin [Wed, 29 Nov 2017 13:52:42 +0000 (16:52 +0300)]
cmake: fix WITH_VTK usage
'WITH_' variables is intended to enable CMake scripts with some autodetection logic.
'WITH_' can be off, but components is really enabled via command-line options
with proper variables setup (including 'HAVE_').
Alexander Alekhin [Wed, 29 Nov 2017 13:49:24 +0000 (16:49 +0300)]
cmake: update BUILD_DOCS / ENABLE_PYLINT options, add BUILD_JAVA
Alexander Alekhin [Wed, 29 Nov 2017 13:25:11 +0000 (16:25 +0300)]
cmake: don't try to detect Python libraries for iOS builds
Python executable is not used to generate code for iOS builds
Alexander Alekhin [Wed, 29 Nov 2017 13:21:00 +0000 (16:21 +0300)]
cmake: don't use Eigen auto-detection in cross-compiling modes
Sometimes it tries to use host '/usr/include' directory and garbages
compiler flags with invalid '-I /usr/include'
Alexander Alekhin [Wed, 29 Nov 2017 18:24:04 +0000 (18:24 +0000)]
Merge pull request #10184 from catree:solvePnP_iterative_guess_3_pts
Alexander Alekhin [Wed, 29 Nov 2017 18:22:40 +0000 (18:22 +0000)]
Merge pull request #10194 from mshabunin:fix-gcc7-warnings
Alexander Alekhin [Wed, 29 Nov 2017 16:32:31 +0000 (16:32 +0000)]
Merge pull request #10193 from alalek:fix_ios_cmake_3.10
Maksim Shabunin [Wed, 29 Nov 2017 13:51:50 +0000 (16:51 +0300)]
Fixed/disabled warnings produced by GCC 7
Alexander Alekhin [Wed, 29 Nov 2017 12:57:32 +0000 (15:57 +0300)]
cmake: fix iOS build with CMake 3.10
Alexander Alekhin [Wed, 29 Nov 2017 12:05:10 +0000 (12:05 +0000)]
Merge pull request #10164 from pengli:dnn
Vadim Pisarevsky [Wed, 29 Nov 2017 11:42:22 +0000 (11:42 +0000)]
Merge pull request #10180 from alalek:ocl_avoid_unnecessary_initialization
Vadim Pisarevsky [Wed, 29 Nov 2017 10:01:58 +0000 (10:01 +0000)]
Merge pull request #10182 from romanc:fix/divByZeroSimdDouble
Vadim Pisarevsky [Wed, 29 Nov 2017 09:51:20 +0000 (09:51 +0000)]
Merge pull request #10170 from LaurentBerger:Issue10166
Sayed Adel [Wed, 29 Nov 2017 07:38:55 +0000 (07:38 +0000)]
core:ppc Fixed compilation with xlc, clang.
- Use EXPECT_TRUE instead of EXPECT_EQ for comparing NULL in xlc
- Added support for int64 to vec_promote in xlc, clang
- Fixed v_rotate_right in xlc
Alexander Alekhin [Tue, 28 Nov 2017 18:42:17 +0000 (18:42 +0000)]
Merge pull request #10185 from alalek:fix_build_xcode_9.1
Alexander Alekhin [Tue, 28 Nov 2017 14:03:40 +0000 (17:03 +0300)]
build: eliminate Xcode 9.1 warnings
- 3rdparty/libjasper/jas_getopt.c:129:25: warning: this function declaration is not a prototype [-Wstrict-prototypes]
- clang: warning: optimization flag '-fomit-frame-pointer' is not supported for target 'armv7' [-Wignored-optimization-argument]
elenagvo [Tue, 28 Nov 2017 14:42:29 +0000 (17:42 +0300)]
fix threshold HAL
catree [Tue, 28 Nov 2017 14:04:59 +0000 (15:04 +0100)]
Allow to use 3 points in SolvePnP if SOLVEPNP_ITERATIVE and useExtrinsicGuess==true. Add bibtex citations for P3P. Update SolvPnP tests.
Vadim Pisarevsky [Tue, 28 Nov 2017 13:19:05 +0000 (13:19 +0000)]
Merge pull request #9986 from terfendail:drawcontours_docfix
Vadim Pisarevsky [Tue, 28 Nov 2017 13:17:43 +0000 (13:17 +0000)]
Merge pull request #10141 from LaurentBerger:MLP_ReLU
Vadim Pisarevsky [Tue, 28 Nov 2017 13:17:10 +0000 (13:17 +0000)]
Merge pull request #10149 from mshabunin:fix-saturate-intrin
elenagvo [Tue, 28 Nov 2017 12:55:58 +0000 (15:55 +0300)]
define adaptiveMethod and thresholdType for HAL
Roman Cattaneo [Tue, 28 Nov 2017 12:48:40 +0000 (13:48 +0100)]
Fixes Issue #10181
This PR fixes incorrect division by zero handling in template
specialization of `Div_SIMD` for type `double`.
Alexander Alekhin [Fri, 24 Nov 2017 14:34:02 +0000 (17:34 +0300)]
ocl: avoid unnecessary loading/initializing OpenCL subsystem
If there are no OpenCL/UMat methods calls from application.
OpenCL subsystem is initialized:
- haveOpenCL() is called from application
- useOpenCL() is called from application
- access to OpenCL allocator: UMat is created (empty UMat is ignored) or UMat <-> Mat conversions are called
Don't call OpenCL functions if OPENCV_OPENCL_RUNTIME=disabled
(independent from OpenCL linkage type)
Vadim Pisarevsky [Tue, 28 Nov 2017 10:53:00 +0000 (10:53 +0000)]
Merge pull request #10124 from zhongwuzw:master
Vadim Pisarevsky [Tue, 28 Nov 2017 10:51:06 +0000 (10:51 +0000)]
Merge pull request #10173 from dkurt:update_priorbox_layer
Vadim Pisarevsky [Tue, 28 Nov 2017 10:46:41 +0000 (10:46 +0000)]
Merge pull request #10152 from alalek:py_fix_isalgorithm
Alexander Alekhin [Tue, 28 Nov 2017 10:35:33 +0000 (10:35 +0000)]
Merge pull request #9247 from paroj:wrap_alog_rw
Maksim Shabunin [Thu, 23 Nov 2017 14:58:34 +0000 (17:58 +0300)]
Universal Intrinsics: aligned v_pack behavior on different platforms, fixed 64-bit register on ARM, added more saturate_cast variants
LaurentBerger [Wed, 22 Nov 2017 21:07:23 +0000 (22:07 +0100)]
Add ReLU and LeakyReLU activation function in ml module
Alexander Alekhin [Tue, 28 Nov 2017 09:17:42 +0000 (09:17 +0000)]
Merge pull request #10177 from alalek:cmake_update_optimization_filter
Alexander Alekhin [Tue, 28 Nov 2017 05:39:29 +0000 (05:39 +0000)]
Merge pull request #10178 from alalek:ts_message
Alexander Alekhin [Fri, 13 Oct 2017 13:08:51 +0000 (16:08 +0300)]
ts: detailed message
Pavel Rojtberg [Fri, 4 Aug 2017 15:12:20 +0000 (17:12 +0200)]
add test_algorithm_rw using AKAZE
Pavel Rojtberg [Thu, 27 Jul 2017 12:34:32 +0000 (14:34 +0200)]
Python: wrap Algorithm::read and Algorithm::write
Alexander Alekhin [Mon, 27 Nov 2017 15:16:01 +0000 (18:16 +0300)]
cmake: update optimization filter
Wu Zhiwen [Mon, 27 Nov 2017 04:57:36 +0000 (12:57 +0800)]
dnn(ocl4dnn): fuseLayer() use umat_input/outputBlobs for OpenCL target
Also, fix bug when use OPENCL target but no OpenCL runtime
Signed-off-by: Wu Zhiwen <zhiwen.wu@intel.com>
Li Peng [Fri, 24 Nov 2017 10:22:59 +0000 (18:22 +0800)]
Add ocl accuracy test for a few dnn nets
They are alexnet, mobilenet-ssd, resnet50, squeezeNet_v1_1,
yolo and fast_neural_style.
Signed-off-by: Li Peng <peng.li@intel.com>
Dmitry Kurtaev [Mon, 27 Nov 2017 12:59:31 +0000 (15:59 +0300)]
Update PriorBox layer
elenagvo [Mon, 27 Nov 2017 12:11:19 +0000 (15:11 +0300)]
add HAL for threshold
elenagvo [Thu, 23 Nov 2017 08:40:54 +0000 (11:40 +0300)]
add HAL for adaptiveThreshold
LaurentBerger [Mon, 27 Nov 2017 12:13:05 +0000 (13:13 +0100)]
Try to solve issue 10166
Alexander Alekhin [Mon, 27 Nov 2017 11:05:07 +0000 (11:05 +0000)]
Merge pull request #10167 from alalek:ocl_fix_issue_contrib1467
Vadim Pisarevsky [Mon, 27 Nov 2017 10:42:10 +0000 (13:42 +0300)]
Update imgproc.hpp
rewrote the added note in perhaps a cleaner way
Vadim Pisarevsky [Mon, 27 Nov 2017 10:12:15 +0000 (10:12 +0000)]
Merge pull request #10107 from ElenaGvozdeva:medianBlur_HAL
Vadim Pisarevsky [Mon, 27 Nov 2017 10:04:03 +0000 (10:04 +0000)]
Merge pull request #10154 from alalek:ocl_cleanup_obsolete_cache
Vadim Pisarevsky [Mon, 27 Nov 2017 10:03:31 +0000 (10:03 +0000)]
Merge pull request #10155 from alalek:ocl_update_loader
Alexander Alekhin [Mon, 27 Nov 2017 09:43:29 +0000 (12:43 +0300)]
ocl: fix null pointer access crash
Alexander Alekhin [Mon, 27 Nov 2017 09:24:49 +0000 (09:24 +0000)]
Merge pull request #10156 from dkurt:refresh_torch_enet_sample
Alexander Alekhin [Mon, 27 Nov 2017 07:56:06 +0000 (07:56 +0000)]
Merge pull request #10163 from windhw:patch-1
Wei Hao [Mon, 27 Nov 2017 06:36:51 +0000 (14:36 +0800)]
Update houghlines.py
Fix a code indent bug: cv2.imshow("detected lines", cdst)
Alexander Alekhin [Sun, 26 Nov 2017 12:00:16 +0000 (12:00 +0000)]
Merge pull request #10055 from mabdullahrafique:patch-1
Alexander Alekhin [Sat, 25 Nov 2017 12:31:47 +0000 (12:31 +0000)]
Merge pull request #10095 from alalek:fix_canny_intrinsics
Dmitry Kurtaev [Fri, 24 Nov 2017 18:20:18 +0000 (21:20 +0300)]
Update Torch ENet sample
Alexander Alekhin [Fri, 24 Nov 2017 16:09:05 +0000 (19:09 +0300)]
ocl: update OpenCL runtime loader
- fix compilation on Apple (undefined 'oclpath')
- don't warn on OPENCV_OPENCL_RUNTIME=disabled
Alexander Alekhin [Fri, 24 Nov 2017 16:17:28 +0000 (16:17 +0000)]
Merge pull request #10153 from dkurt:specify_mobilenet_version
Alexander Alekhin [Fri, 24 Nov 2017 09:52:29 +0000 (12:52 +0300)]
ocl: drop obsolete cache directories after upgrade of OpenCL driver
Entries with the same platform name, the same device name and with different driver versions
are assumed obsolete.
Vadim Pisarevsky [Fri, 24 Nov 2017 11:51:03 +0000 (11:51 +0000)]
Merge pull request #10150 from alalek:dnn_ocl_refactor_pooling
Dmitry Kurtaev [Fri, 24 Nov 2017 10:40:35 +0000 (13:40 +0300)]
Specific version of MobileNet-SSD from TensorFlow
Alexander Alekhin [Mon, 28 Aug 2017 12:29:33 +0000 (15:29 +0300)]
bindings(py): fix handling of 'isalgorithm'
Alexander Alekhin [Thu, 23 Nov 2017 20:45:44 +0000 (20:45 +0000)]
dnn(ocl4dnn): drop unused batch_size_ in pooling
Alexander Alekhin [Thu, 23 Nov 2017 20:10:53 +0000 (20:10 +0000)]
dnn(ocl4dnn): refactor pooling OpenCL calls
Muhammad Abdullah [Wed, 8 Nov 2017 23:46:35 +0000 (15:46 -0800)]
update digits_video.py
Following were the errors in the digits_video.py
1 ) The code was not working because data type of x was float however in "cv2.rectangle" we require integer .
2 ) After pressing the "esc" button the image windows did not destroy
So I amended following things:
1 ) ~converted data type of x to int.~ Used Python integer division (//)
2 ) used cv2.destroyAllWindows() to close all windows after the press of "esc" by user.
Alexander Alekhin [Thu, 23 Nov 2017 18:47:14 +0000 (18:47 +0000)]
Merge pull request #10143 from pengli:ocl4dnn
Maksim Shabunin [Thu, 23 Nov 2017 18:34:59 +0000 (18:34 +0000)]
Merge pull request #10148 from alalek:fix_ffmpeg_sws_scale_crash
Arthur Pastel [Thu, 23 Nov 2017 18:27:11 +0000 (19:27 +0100)]
Merge pull request #9895 from art049:parrallel_calibration_py
* Adding threading in calibrate.py
* samples: update calibrate.py
Alexander Alekhin [Thu, 23 Nov 2017 18:22:37 +0000 (18:22 +0000)]
Merge pull request #9996 from dkurt:dnn_multiple_inputs
Li Peng [Thu, 16 Nov 2017 03:20:08 +0000 (11:20 +0800)]
use OutputArrayOfArrays in net forward interface
It allows umat buffers used in net forward interface
Signed-off-by: Li Peng <peng.li@intel.com>
Wu, Zhiwen [Tue, 31 Oct 2017 01:21:08 +0000 (09:21 +0800)]
cleanup ocl4dnn spatial convolution kernels
remove unused macros and half definition macros,
also remove unused ocl::Queue
Signed-off-by: Li Peng <peng.li@intel.com>
Alexander Alekhin [Thu, 23 Nov 2017 14:48:01 +0000 (17:48 +0300)]
videoio(ffmpeg): more workarounds for sws_scale() crash
Prevents access data after the end of input buffer near 4K page boundaries
Alexander Alekhin [Thu, 23 Nov 2017 15:09:35 +0000 (15:09 +0000)]
Merge pull request #9893 from mshabunin:add-modules-whitelist
Alexander Alekhin [Thu, 23 Nov 2017 14:10:42 +0000 (14:10 +0000)]
Merge pull request #10139 from alalek:dnn_rename_caffe_proto_package
Alexander Alekhin [Thu, 23 Nov 2017 13:37:32 +0000 (13:37 +0000)]
Merge pull request #10018 from alalek:ocl_binary_cache
Maksim Shabunin [Thu, 19 Oct 2017 14:37:36 +0000 (17:37 +0300)]
Added BUILD_LIST feature
Vadim Pisarevsky [Thu, 23 Nov 2017 12:51:55 +0000 (12:51 +0000)]
Merge pull request #10142 from alalek:pytests_update
Vadim Pisarevsky [Thu, 23 Nov 2017 12:50:25 +0000 (12:50 +0000)]
Merge pull request #10144 from mshabunin:fix-videocapture-open-order
Maksim Shabunin [Thu, 23 Nov 2017 12:03:20 +0000 (15:03 +0300)]
Fixed GStreamer pipeline building on Ubuntu 17
Alexander Nesterov [Thu, 23 Nov 2017 11:42:20 +0000 (14:42 +0300)]
Update videoio tests
Maksim Shabunin [Thu, 23 Nov 2017 10:31:07 +0000 (13:31 +0300)]
videoio: fixed capture open order, added apiPrefernce to FFMPEG tests
elenagvo [Thu, 23 Nov 2017 10:30:00 +0000 (13:30 +0300)]
fix the parameters order
Alexander Alekhin [Thu, 23 Nov 2017 10:08:26 +0000 (13:08 +0300)]
python(test): don't write bytecode
Tests are usually lauched from source directory, so additional unnecessary
files should be eliminated.
Alternative ways (command line):
- python -B ...
- PYTHONDONTWRITEBYTECODE=1 python ...
Alexander Alekhin [Mon, 28 Aug 2017 14:26:49 +0000 (17:26 +0300)]
python(test): add tests filter
Usage example (bash):
$ OPENCV_PYTEST_FILTER=test_digits python test.py -v
Alexander Alekhin [Wed, 22 Nov 2017 18:39:47 +0000 (18:39 +0000)]
Merge pull request #10136 from alalek:issue_10134
Alexander Alekhin [Wed, 22 Nov 2017 18:15:00 +0000 (18:15 +0000)]
Merge pull request #9994 from r2d3:dnn_memory_load
Alexander Alekhin [Wed, 22 Nov 2017 18:03:51 +0000 (18:03 +0000)]
Merge pull request #10126 from alalek:dnn_issue_10125
Alexander Alekhin [Wed, 22 Nov 2017 15:31:55 +0000 (18:31 +0300)]
dnn: autogenerated files