Alexander Alekhin [Thu, 13 Aug 2015 14:59:07 +0000 (14:59 +0000)]
Merge pull request #5164 from vladimir-dudnik:test-umat-copyTo-issue
Alexander Alekhin [Thu, 13 Aug 2015 12:21:37 +0000 (12:21 +0000)]
Merge pull request #5167 from ruslo:suppress.vs.error
Alexander Alekhin [Thu, 13 Aug 2015 12:02:30 +0000 (12:02 +0000)]
Merge pull request #5179 from alalek:update_android_samples
Alexander Alekhin [Wed, 12 Aug 2015 15:36:09 +0000 (18:36 +0300)]
tutorial-4-opencl: enable build with OpenCV
Alexander Alekhin [Thu, 13 Aug 2015 10:03:43 +0000 (10:03 +0000)]
Merge pull request #5180 from boatx:bugfix/proper-conversion-of-numpy-array-to-mat
Alexander Alekhin [Thu, 13 Aug 2015 09:19:09 +0000 (09:19 +0000)]
Merge pull request #5170 from mshabunin:add-android-pack
boatx [Wed, 12 Aug 2015 20:50:05 +0000 (20:50 +0000)]
Fixing typo in variable name.
Maksim Shabunin [Wed, 12 Aug 2015 15:50:03 +0000 (15:50 +0000)]
Merge pull request #5140 from PhilLab:patch-3
Alexander Alekhin [Wed, 12 Aug 2015 14:06:36 +0000 (17:06 +0300)]
android samples: update way to attach native part of OpenCV
OPENCV_ANDROID_SDK - OpenCV Android SDK location (or OpenCV build dir)
Can be passed via ndk-build parameter or environment variable.
Alexander Alekhin [Wed, 12 Aug 2015 14:00:36 +0000 (14:00 +0000)]
Merge pull request #4239 from apavlenko:android_ocl_sample2
Maksim Shabunin [Wed, 12 Aug 2015 13:11:57 +0000 (13:11 +0000)]
Merge pull request #5168 from alalek:fix_5067
Maksim Shabunin [Wed, 12 Aug 2015 11:57:49 +0000 (14:57 +0300)]
Fixed whitespace issue
Maksim Shabunin [Mon, 10 Aug 2015 15:02:41 +0000 (18:02 +0300)]
Android SDK build Initial
Alexander Alekhin [Tue, 11 Aug 2015 19:49:19 +0000 (22:49 +0300)]
fix opengl sample build on Linux (#5067)
Ruslan Baratov [Tue, 11 Aug 2015 17:39:24 +0000 (20:39 +0300)]
Suppress error message of execute_process
Command 'execute_process' from OpenCVFindMatlab module can omit error message
to the standard output. This can break build of the OpenCV package in
ExternalProject_Add (Windows/Visual Studio).
Vladimir Dudnik [Tue, 11 Aug 2015 13:01:05 +0000 (16:01 +0300)]
fixed typo in OpenCLAllocator.upload method (wrong step used)
Vladimir Dudnik [Tue, 11 Aug 2015 11:19:14 +0000 (14:19 +0300)]
enabled test UMat copyTo. Now it will detect FAIL on Intel platform for ROI (issue with clEnqueueCopyBufferRect)
Vladimir Dudnik [Mon, 10 Aug 2015 22:33:46 +0000 (01:33 +0300)]
fixed download/upload for non contiguous umat
Alexander Alekhin [Mon, 10 Aug 2015 14:46:30 +0000 (14:46 +0000)]
Merge pull request #5135 from alalek:issue_4468
Alexander Alekhin [Thu, 6 Aug 2015 10:52:35 +0000 (13:52 +0300)]
more test loops (and disable tests - tests pass but require a lot of time)
Alexander Alekhin [Sun, 9 Aug 2015 11:27:43 +0000 (11:27 +0000)]
Merge pull request #5132 from hewj03:master
Alexander Alekhin [Sat, 8 Aug 2015 16:52:25 +0000 (16:52 +0000)]
Merge pull request #5125 from StevenPuttemans:fix_annotation_tool
Alexander Alekhin [Fri, 7 Aug 2015 10:55:08 +0000 (10:55 +0000)]
Merge pull request #5146 from avershov:fix-issue-5122
Alexander Alekhin [Fri, 7 Aug 2015 10:13:56 +0000 (10:13 +0000)]
Merge pull request #5149 from Nerei:minor_comment_fix
Anatoly Baksheev [Fri, 7 Aug 2015 09:55:10 +0000 (12:55 +0300)]
minor comment fix
Alexey Ershov [Thu, 6 Aug 2015 17:55:41 +0000 (20:55 +0300)]
applied changes proposed in 5122
Philipp Hasper [Thu, 6 Aug 2015 12:00:24 +0000 (14:00 +0200)]
Update README.md
Alexander Alekhin [Wed, 5 Aug 2015 14:27:18 +0000 (17:27 +0300)]
add tests from issue 4468 (#5062)
StevenPuttemans [Tue, 4 Aug 2015 11:59:53 +0000 (13:59 +0200)]
add checks for valid input data given to parameters
make the software system dependent
add LICENSE on top
Wenju He [Thu, 6 Aug 2015 02:23:31 +0000 (10:23 +0800)]
fix adaptiveThreshold mean
Vadim Pisarevsky [Wed, 5 Aug 2015 17:27:38 +0000 (17:27 +0000)]
Merge pull request #5117 from mshabunin:adding-google-search
Vadim Pisarevsky [Wed, 5 Aug 2015 17:25:34 +0000 (17:25 +0000)]
Merge pull request #5128 from ageitgey:ag-prevent-demos-from-autorunning
Vadim Pisarevsky [Wed, 5 Aug 2015 17:25:01 +0000 (17:25 +0000)]
Merge pull request #4149 from LaurentBerger:ThreshGaussianFloat
Vadim Pisarevsky [Wed, 5 Aug 2015 17:19:55 +0000 (17:19 +0000)]
Merge pull request #5130 from alalek:issue_4380
Alexander Alekhin [Wed, 5 Aug 2015 13:08:48 +0000 (16:08 +0300)]
tapi: add test from issue 4380 (#5010)
Adam Geitgey [Tue, 4 Aug 2015 21:01:51 +0000 (14:01 -0700)]
Prevent grabcut, houghcircles and houghlines python2 demos from running automatically while browsing demos in the demo list viewer
LaurentBerger [Tue, 4 Aug 2015 20:58:22 +0000 (22:58 +0200)]
remove test
Alexander Alekhin [Tue, 4 Aug 2015 10:28:43 +0000 (10:28 +0000)]
Merge pull request #5118 from alalek:fix_viz_build
Alexander Alekhin [Mon, 3 Aug 2015 16:09:07 +0000 (19:09 +0300)]
vtk: disable on cross-compilation
Alexander Alekhin [Mon, 3 Aug 2015 11:36:58 +0000 (14:36 +0300)]
viz: fix precompiled headers definitions
Maksim Shabunin [Mon, 3 Aug 2015 11:01:02 +0000 (14:01 +0300)]
Documentation: adding Google Custom search block to each header
Alexander Alekhin [Mon, 3 Aug 2015 09:57:06 +0000 (09:57 +0000)]
Merge pull request #5106 from vladimir-dudnik:opencl-opengl-upd
Alexander Alekhin [Mon, 3 Aug 2015 09:56:37 +0000 (09:56 +0000)]
Merge pull request #5107 from vladimir-dudnik:d3d-interop-upd
Vadim Pisarevsky [Mon, 3 Aug 2015 05:46:29 +0000 (05:46 +0000)]
Merge pull request #4233 from alalek:fix_4006
Vadim Pisarevsky [Mon, 3 Aug 2015 05:42:33 +0000 (05:42 +0000)]
Merge pull request #5087 from alexst07:cuda_contrib
Vadim Pisarevsky [Mon, 3 Aug 2015 05:40:23 +0000 (05:40 +0000)]
Merge pull request #5102 from nzjrs:fix-python-digits
Vladimir Dudnik [Fri, 31 Jul 2015 23:10:05 +0000 (02:10 +0300)]
fixed not initialized nv12_cpu_copy surface, remove odd code
Vladimir Dudnik [Fri, 31 Jul 2015 22:16:06 +0000 (01:16 +0300)]
update opencl-opengl interop sample (remove odd no processing branch)
Alexander Alekhin [Fri, 31 Jul 2015 15:35:42 +0000 (15:35 +0000)]
Merge pull request #5097 from alalek:fix_build
John Stowers [Fri, 31 Jul 2015 07:17:16 +0000 (09:17 +0200)]
remove picloud from digits_adjust
the service has been closed since 2013/2014
John Stowers [Fri, 31 Jul 2015 07:14:20 +0000 (09:14 +0200)]
fix digits.py to not ignore model parameters
otherwise model is only ever trained with default
parameters, and digits_adjust does nothing (for example)
Andrey Pavlenko [Fri, 31 Jul 2015 00:39:26 +0000 (03:39 +0300)]
adding mode switching via menu
Andrey Pavlenko [Thu, 30 Jul 2015 22:52:10 +0000 (01:52 +0300)]
adding displaying FPS
Alexander Alekhin [Thu, 30 Jul 2015 17:03:03 +0000 (20:03 +0300)]
fix build with Win7 SDK
Andrey Pavlenko [Thu, 30 Jul 2015 20:18:45 +0000 (23:18 +0300)]
excluding libOpenCL.so from the APK
Alexey Ershov [Thu, 30 Jul 2015 16:57:11 +0000 (19:57 +0300)]
change displaying of fps to time (ms)
Alexander Alekhin [Thu, 30 Jul 2015 13:02:58 +0000 (16:02 +0300)]
tapi: enable some disabled tests
Maksim Shabunin [Thu, 30 Jul 2015 16:12:38 +0000 (16:12 +0000)]
Merge pull request #5081 from sbokov:Adding_HAL_v_extract
Maksim Shabunin [Thu, 30 Jul 2015 13:04:48 +0000 (13:04 +0000)]
Merge pull request #5093 from sturkmen72:patch-5
Alexander Alekhin [Thu, 30 Jul 2015 10:36:25 +0000 (10:36 +0000)]
Merge pull request #4238 from vladimir-dudnik:d3d11-nv12-interop
Suleyman TURKMEN [Thu, 30 Jul 2015 10:17:17 +0000 (13:17 +0300)]
Update how_to_scan_images.cpp
Alex Torres [Tue, 28 Jul 2015 18:49:24 +0000 (15:49 -0300)]
Fixes namespace error on cudaoptflow
Vladimir Dudnik [Wed, 29 Jul 2015 10:31:10 +0000 (14:31 +0400)]
finished with NV12 support for D3D11-interop. Now, if texture is in NV12 format then it will be converted to/from BGR UMat.
Vladimir Dudnik [Wed, 29 Jul 2015 16:52:03 +0000 (19:52 +0300)]
d3d11-nv12 interop
fixed issues with ocl nv12 cvt kernel
finisged ocl nv12-to-rgba kernel, update dx-interop samples. (ocl rgba-to-nv12 kernel will be added later)
an attempt to fix build issue
fix for non opencl build issue
fix typo
fix compilation warnings
fix compile issue for Mac (OpenCL)
add convertion from rgba to nv12 (still need to debug kernel)
remove empty line at the EOF
fixed compilation warning
Alex Torres [Tue, 28 Jul 2015 18:49:24 +0000 (15:49 -0300)]
Fixes compilation errors when BUILD_CUDA_STUBS is ON
Alexey Ershov [Wed, 29 Jul 2015 10:51:03 +0000 (13:51 +0300)]
added command line processing
Alexey Ershov [Wed, 29 Jul 2015 08:07:11 +0000 (11:07 +0300)]
fixed memory leaks
Andrey Pavlenko [Tue, 28 Jul 2015 21:13:35 +0000 (00:13 +0300)]
minor fixes
Alexander Alekhin [Tue, 28 Jul 2015 08:48:20 +0000 (11:48 +0300)]
tapi: datarace fixup for cvtColor
Alexander Alekhin [Mon, 27 Jul 2015 14:04:19 +0000 (17:04 +0300)]
fixes
Alexander Alekhin [Mon, 27 Jul 2015 11:55:06 +0000 (14:55 +0300)]
ocl: add map tests
Alexander Alekhin [Fri, 24 Jul 2015 16:10:31 +0000 (19:10 +0300)]
fix OpenCV code (bug 4006: #4862)
Vladimir Dudnik [Mon, 20 Jul 2015 12:22:23 +0000 (15:22 +0300)]
add test for bug 4006: #4862
sbokov [Mon, 27 Jul 2015 16:49:25 +0000 (19:49 +0300)]
Replacing SSE with v_extract
sbokov [Mon, 27 Jul 2015 15:39:58 +0000 (18:39 +0300)]
Merge pull request #1 from Itseez/master
Update
Alexander Alekhin [Mon, 27 Jul 2015 15:08:29 +0000 (15:08 +0000)]
Merge pull request #4213 from mshabunin:hal-vextq
Alexander Alekhin [Mon, 27 Jul 2015 15:05:57 +0000 (15:05 +0000)]
Merge pull request #4210 from wangyan42164:ocl_umat_convert
Maksim Shabunin [Mon, 27 Jul 2015 08:15:10 +0000 (08:15 +0000)]
Merge pull request #4232 from berak:patch-2
Andrey Pavlenko [Mon, 27 Jul 2015 01:04:56 +0000 (04:04 +0300)]
adding OpenCV with TAPI (UMats)
Andrey Pavlenko [Sun, 26 Jul 2015 23:57:01 +0000 (02:57 +0300)]
adding OpenCL processing (Image2D-to-Image2D only, others will be added later)
Andrey Pavlenko [Sun, 26 Jul 2015 22:07:56 +0000 (01:07 +0300)]
Camera and Camera2 preview is rendered via OpenGL textures and can be modified on CPU via C++ code. No OpenCL yet.
berak [Thu, 23 Jul 2015 16:38:18 +0000 (18:38 +0200)]
Update ml.hpp
misplaced CV_WRAP statement lead to not exposing EM::getCovs() to python/java/matlab wrappers
add a CV_OUT to return the covs properly
Maksim Shabunin [Fri, 24 Jul 2015 21:12:56 +0000 (21:12 +0000)]
Merge pull request #4179 from sbokov:improvingStereoSGBM
Maksim Shabunin [Fri, 24 Jul 2015 11:43:00 +0000 (11:43 +0000)]
Merge pull request #4196 from alalek:fix_python
Maksim Shabunin [Tue, 21 Jul 2015 14:23:58 +0000 (17:23 +0300)]
v_extract universal intrinsic
sbokov [Fri, 17 Jul 2015 14:12:01 +0000 (17:12 +0300)]
Fixing StereoSGBM ROI
Now StereoSGBM behaves similarly to StereoBM in terms of ROI handling.
sbokov [Tue, 7 Jul 2015 20:23:51 +0000 (23:23 +0300)]
Adding new HAL-accelerated MODE_SGBM_3WAY
New mode is approximately 2-3 times faster than MODE_SGBM
with minimal degradation in quality and uses universal
HAL intrinsics. A performance test was added. The accuracy
test was updated to support the new mode.
Alexander Alekhin [Thu, 23 Jul 2015 12:38:14 +0000 (12:38 +0000)]
Merge pull request #4222 from mshabunin:fix-android-warnings
Yan Wang [Tue, 21 Jul 2015 08:20:15 +0000 (16:20 +0800)]
It is unnecessary to use fma() if no scaling.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
Maksim Shabunin [Wed, 22 Jul 2015 14:54:42 +0000 (17:54 +0300)]
Fixed loop check
Maksim Shabunin [Wed, 22 Jul 2015 13:12:31 +0000 (16:12 +0300)]
Fixing GCC 4.9 warnings
Vadim Pisarevsky [Wed, 22 Jul 2015 11:01:23 +0000 (11:01 +0000)]
Merge pull request #4183 from paroj:8point
Vadim Pisarevsky [Wed, 22 Jul 2015 11:00:00 +0000 (11:00 +0000)]
Merge pull request #4217 from wangyan42164:ocl_pyrlk_mul
Vadim Pisarevsky [Wed, 22 Jul 2015 10:55:23 +0000 (10:55 +0000)]
Merge pull request #4215 from renatoGarcia:master
Yan Wang [Wed, 22 Jul 2015 03:25:18 +0000 (11:25 +0800)]
Move coefficient (32.0f) to the end of every iteration.
It could reduce 7 multiplications every iteration.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
Renato Florentino Garcia [Tue, 21 Jul 2015 17:54:06 +0000 (14:54 -0300)]
Remove an unneeded semicolon.
Alexander Alekhin [Tue, 21 Jul 2015 15:58:20 +0000 (15:58 +0000)]
Merge pull request #4209 from vladimir-dudnik:fix-opencl-opencv-interop-sample
Alexander Alekhin [Tue, 21 Jul 2015 15:57:47 +0000 (15:57 +0000)]
Merge pull request #4004 from paroj:camera-api
Alexander Alekhin [Tue, 21 Jul 2015 14:10:00 +0000 (14:10 +0000)]
Merge pull request #4192 from avershov:opencl-opengl-buffer
Vadim Pisarevsky [Tue, 21 Jul 2015 12:06:45 +0000 (12:06 +0000)]
Merge pull request #4181 from themightyoarfish:findEssMatDocTypoFix