Alexander Alekhin [Wed, 29 Oct 2014 13:53:56 +0000 (13:53 +0000)]
Merge pull request #3354 from vbystricky:oclopt_convertScaleAbs
Alexander Alekhin [Wed, 29 Oct 2014 11:18:06 +0000 (11:18 +0000)]
Merge pull request #3159 from ElenaGvozdeva:ocl_gemm
Alexander Alekhin [Tue, 28 Oct 2014 17:19:57 +0000 (17:19 +0000)]
Merge pull request #3379 from akarsakov:gftt_empty_src
Alexander Karsakov [Tue, 28 Oct 2014 13:06:36 +0000 (16:06 +0300)]
Don't process empty src image in GFTT
ElenaGvozdeva [Tue, 28 Oct 2014 12:18:31 +0000 (15:18 +0300)]
use LOCAL_SIZE+1
Alexander Alekhin [Tue, 28 Oct 2014 10:23:18 +0000 (10:23 +0000)]
Merge pull request #3353 from Chuanbo-Weng:master
Alexander Alekhin [Tue, 28 Oct 2014 09:18:31 +0000 (09:18 +0000)]
Merge pull request #3359 from akarsakov:ocl_buildMaps
Alexander Karsakov [Mon, 27 Oct 2014 12:38:44 +0000 (15:38 +0300)]
Added checking that z is non zero to buildWarpPlaneMaps kernel
Alexander Karsakov [Fri, 24 Oct 2014 08:03:10 +0000 (11:03 +0300)]
Overload PlaneWarper::buildMaps method from base class
ElenaGvozdeva [Thu, 16 Oct 2014 07:24:44 +0000 (10:24 +0300)]
Some small fixes
Elena Gvozdeva [Thu, 4 Sep 2014 08:36:23 +0000 (12:36 +0400)]
use vectors
Elena Gvozdeva [Wed, 27 Aug 2014 10:58:01 +0000 (14:58 +0400)]
use local memory
Elena Gvozdeva [Fri, 22 Aug 2014 11:05:29 +0000 (15:05 +0400)]
naive implementation
Alexander Alekhin [Mon, 27 Oct 2014 10:03:29 +0000 (10:03 +0000)]
Merge pull request #3369 from vbystricky:fix_scaleAdd
Alexander Alekhin [Fri, 24 Oct 2014 16:01:21 +0000 (16:01 +0000)]
Merge pull request #3367 from akarsakov:ocl_image2d
Alexander Alekhin [Fri, 24 Oct 2014 16:00:20 +0000 (16:00 +0000)]
Merge pull request #3342 from alalek:perf_stability_check
vbystricky [Fri, 24 Oct 2014 10:05:39 +0000 (14:05 +0400)]
Move _dst.create() to the begining of scaleAdd function
Alexander Alekhin [Fri, 24 Oct 2014 12:59:13 +0000 (12:59 +0000)]
Merge pull request #3284 from vbystricky:oclopt_stereoBM
Alexander Alekhin [Fri, 24 Oct 2014 12:58:21 +0000 (12:58 +0000)]
Merge pull request #3368 from alalek:amd_clfinish
Alexander Karsakov [Fri, 24 Oct 2014 10:55:16 +0000 (13:55 +0300)]
Added extra checks to ocl::Image2D
Alexander Alekhin [Fri, 24 Oct 2014 10:29:38 +0000 (14:29 +0400)]
ocl: restore clFinish() in unmap() for AMD devices
This reverts commit
7d91b8efcd053304e5b0fb5afff06e151b2d4096.
vbystricky [Mon, 29 Sep 2014 08:46:56 +0000 (12:46 +0400)]
Optimize OpenCL version of StereoBM function
Fix problems on NVidia devices.
Alexander Karsakov [Thu, 23 Oct 2014 11:23:37 +0000 (14:23 +0300)]
Added tests for Image2D
Alexander Karsakov [Wed, 22 Oct 2014 14:43:29 +0000 (17:43 +0300)]
Small optimization for buildMaps kernels in case rowsPerWI > 1
Vadim Pisarevsky [Wed, 22 Oct 2014 01:55:23 +0000 (01:55 +0000)]
Merge pull request #3352 from alucarded:BackgroundSubtractorMOG2_optimization
vbystricky [Mon, 20 Oct 2014 13:43:18 +0000 (17:43 +0400)]
Optimize OpenCL version of conversScaleAbs function
Alexander Alekhin [Tue, 21 Oct 2014 11:23:19 +0000 (15:23 +0400)]
added performance validation check
Alexander Alekhin [Tue, 21 Oct 2014 11:23:06 +0000 (11:23 +0000)]
Merge pull request #3355 from ElenaGvozdeva:predictOptimalVectorWidth
ElenaGvozdeva [Tue, 21 Oct 2014 10:13:15 +0000 (13:13 +0300)]
Changed predictOptimalVectorWidth function, now it is possible to choose vector size.
Alexander Alekhin [Tue, 21 Oct 2014 08:59:23 +0000 (08:59 +0000)]
Merge pull request #3256 from vbystricky:oclopt_BFMatcher
Tomasz Posłuszny [Sun, 19 Oct 2014 21:50:37 +0000 (23:50 +0200)]
BackgroundSubtractorMOG2, learningRate=0 optimization
Chuanbo Weng [Mon, 20 Oct 2014 10:14:38 +0000 (18:14 +0800)]
Update hog.cpp
Update according to vbystricky's comments
Vadim Pisarevsky [Mon, 20 Oct 2014 06:50:34 +0000 (06:50 +0000)]
Merge pull request #3344 from mshabunin:java_automation
Vadim Pisarevsky [Mon, 20 Oct 2014 06:49:18 +0000 (06:49 +0000)]
Merge pull request #3349 from a-wi:DShow_Strsafe_header_v3
Vadim Pisarevsky [Mon, 20 Oct 2014 06:41:51 +0000 (06:41 +0000)]
Merge pull request #3292 from mshabunin:fix-ios-warnings
Chuanbo Weng [Mon, 20 Oct 2014 03:50:46 +0000 (11:50 +0800)]
Correctly enable OpenCL mode in tapi's hog example.
For current OpenCV-CL architecture, if the data buffer
allocated in UMat are cpu buffer(not ocl buffer) under
cpu mode, and then pass this UMat to an OpenCL kernel
as an argument, the OpenCL path will fail and fallback
to cpu mode. Take HOGDescriptor::oclSvmDetector as an example:
ocl::setUseOpenCL(false);
//data allocated in hog.oclSvmDetector will be cpu buffer
hog.setSVMDetector(HOGDescriptor::getDaimlerPeopleDetector());
ocl::setUseOpenCL(true);
//We enabled OpenCL, but hog.oclSvmDetector are cpu buffer,
//so it will fail in the function ocl_classify_hists
//when reach to this line
//idx = k.set(idx, ocl::KernelArg::PtrReadOnly(detector));
hog.detectMultiScale(img, found, hit_threshold, win_stride,
Size(0, 0), scale, gr_threshold);
Similar problems heppen on img_aux and img. So we should re-define
or re-set these UMat when do mode switch (CPU -> OpenCL) in order
to make their data be allocated by ocl and then OpenCL path will
succeed.
Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>
Vadim Pisarevsky [Sat, 18 Oct 2014 18:52:35 +0000 (18:52 +0000)]
Merge pull request #3348 from vpisarev:refactor_algorithms2
Artur Wieczorek [Sat, 18 Oct 2014 18:27:49 +0000 (20:27 +0200)]
Include strsafe.h to compile successfully under MinGW in Debug mode.
Vadim Pisarevsky [Sat, 18 Oct 2014 17:58:34 +0000 (21:58 +0400)]
fixed MSVC warnings and iOS framework compile error
Vadim Pisarevsky [Sat, 18 Oct 2014 17:00:31 +0000 (17:00 +0000)]
Merge pull request #3345 from D-Alex:master
Vadim Pisarevsky [Sat, 18 Oct 2014 16:57:35 +0000 (16:57 +0000)]
Merge pull request #3347 from Nerei:memory_leak_in_viz_opencv30
Vadim Pisarevsky [Sat, 18 Oct 2014 16:53:39 +0000 (20:53 +0400)]
fixed bug in automatic SVM training
Vadim Pisarevsky [Sat, 18 Oct 2014 16:44:26 +0000 (20:44 +0400)]
quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)
Anatoly Baksheev [Sat, 18 Oct 2014 14:17:42 +0000 (18:17 +0400)]
viz: fixed memory leak
Alexander Duda [Sat, 18 Oct 2014 12:22:27 +0000 (14:22 +0200)]
fix warning in template Scalar::mul gcc < 4.8
In this particular case t shadows transpose of the base class Matx:
types.hpp:1805:14: warning: declaration of ‘t’ shadows a member of
'this' [-Wshadow]
Changelog gcc 4.8: The option -Wshadow no longer warns if a declaration
shadows a function declaration.
This warning is problematic because it prevents the module
opencv_contrib/modules/ruby to pass the build process
vbystricky [Tue, 23 Sep 2014 11:13:46 +0000 (15:13 +0400)]
Optimize OpenCL version of BFMatcher
Maksim Shabunin [Fri, 17 Oct 2014 15:36:24 +0000 (19:36 +0400)]
Refactoring in gen_java.py script
Maksim Shabunin [Fri, 17 Oct 2014 14:29:30 +0000 (18:29 +0400)]
final fix
Maksim Shabunin [Fri, 17 Oct 2014 12:46:47 +0000 (16:46 +0400)]
Fixing iOS clang warnings, part 3
Maksim Shabunin [Fri, 17 Oct 2014 12:32:53 +0000 (16:32 +0400)]
Fixing iOS clang warnings, part 2
Maksim Shabunin [Fri, 17 Oct 2014 11:50:57 +0000 (15:50 +0400)]
Forgotten punctuation
Maksim Shabunin [Fri, 17 Oct 2014 11:45:13 +0000 (15:45 +0400)]
Fixing iOS clang warnings, part 1
Maksim Shabunin [Fri, 17 Oct 2014 10:37:25 +0000 (14:37 +0400)]
Extracted repeated cmake instruction block
Maksim Shabunin [Wed, 1 Oct 2014 07:44:28 +0000 (11:44 +0400)]
Suppressed some iOS framework compilation warnings
Vadim Pisarevsky [Fri, 17 Oct 2014 14:07:06 +0000 (14:07 +0000)]
Merge pull request #3339 from vpisarev:refactor_features2d_take4
Vadim Pisarevsky [Fri, 17 Oct 2014 13:01:39 +0000 (17:01 +0400)]
fixed incorrect array access in solvepnp (which affected debug builds only)
Vadim Pisarevsky [Fri, 17 Oct 2014 12:09:09 +0000 (16:09 +0400)]
another fix in opencv_world
Vadim Pisarevsky [Fri, 17 Oct 2014 12:05:38 +0000 (16:05 +0400)]
fixed opencv_world build
Vadim Pisarevsky [Fri, 17 Oct 2014 11:56:27 +0000 (15:56 +0400)]
fixed msvc compile warning
Vadim Pisarevsky [Fri, 17 Oct 2014 11:13:35 +0000 (15:13 +0400)]
Merge branch 'refactor_features2d_take4' of https://github.com/vpisarev/opencv into refactor_features2d_take4
Conflicts:
modules/features2d/src/orb.cpp
Vadim Pisarevsky [Fri, 17 Oct 2014 10:30:12 +0000 (14:30 +0400)]
fixed error in OpenCL ORB
Vadim Pisarevsky [Fri, 17 Oct 2014 10:22:02 +0000 (14:22 +0400)]
fixed some more compile errors and test failures
Vadim Pisarevsky [Thu, 16 Oct 2014 19:10:00 +0000 (23:10 +0400)]
trying to fix strange compiler bug
Vadim Pisarevsky [Thu, 16 Oct 2014 18:52:04 +0000 (22:52 +0400)]
fixed opencv_java build
Vadim Pisarevsky [Thu, 16 Oct 2014 17:59:38 +0000 (21:59 +0400)]
ok; all the tests now pass
Vadim Pisarevsky [Thu, 16 Oct 2014 16:58:29 +0000 (20:58 +0400)]
all the tests now pass except for MSER
Vadim Pisarevsky [Thu, 16 Oct 2014 13:00:40 +0000 (17:00 +0400)]
fixed several test failures; currently 9 out of 73 tests fail
Vadim Pisarevsky [Thu, 16 Oct 2014 12:34:22 +0000 (16:34 +0400)]
now all the samples and opencv_contrib compile!
Vadim Pisarevsky [Wed, 15 Oct 2014 18:49:17 +0000 (22:49 +0400)]
OpenCV with the refactored features2d compiles! contrib is broken for now; the tests are not tried yet
Vadim Pisarevsky [Mon, 13 Oct 2014 19:01:45 +0000 (23:01 +0400)]
yet another attempt to refactor features2d; the first commit, features2d does not even compile
Vadim Pisarevsky [Fri, 17 Oct 2014 10:46:08 +0000 (14:46 +0400)]
trying to resolve the merge conflict
Vadim Pisarevsky [Fri, 17 Oct 2014 10:30:12 +0000 (14:30 +0400)]
fixed error in OpenCL ORB
Vadim Pisarevsky [Fri, 17 Oct 2014 10:22:02 +0000 (14:22 +0400)]
fixed some more compile errors and test failures
Vadim Pisarevsky [Thu, 16 Oct 2014 19:10:00 +0000 (23:10 +0400)]
trying to fix strange compiler bug
Vadim Pisarevsky [Thu, 16 Oct 2014 18:52:04 +0000 (22:52 +0400)]
fixed opencv_java build
Vadim Pisarevsky [Thu, 16 Oct 2014 17:59:38 +0000 (21:59 +0400)]
ok; all the tests now pass
Vadim Pisarevsky [Thu, 16 Oct 2014 16:58:29 +0000 (20:58 +0400)]
all the tests now pass except for MSER
Alexander Alekhin [Thu, 16 Oct 2014 14:51:53 +0000 (14:51 +0000)]
Merge pull request #3332 from lupustr3:pvlasov/implementation_detector
Vadim Pisarevsky [Thu, 16 Oct 2014 13:00:40 +0000 (17:00 +0400)]
fixed several test failures; currently 9 out of 73 tests fail
Vadim Pisarevsky [Thu, 16 Oct 2014 12:34:22 +0000 (16:34 +0400)]
now all the samples and opencv_contrib compile!
Alexander Alekhin [Thu, 16 Oct 2014 11:53:41 +0000 (11:53 +0000)]
Merge pull request #3338 from ilya-lavrenov:ios_fixes
Vadim Pisarevsky [Thu, 16 Oct 2014 10:09:28 +0000 (10:09 +0000)]
Merge pull request #3270 from boaz001:patch-1
Ilya Lavrenov [Wed, 15 Oct 2014 20:23:39 +0000 (00:23 +0400)]
fixes
Boaz Stolk [Wed, 15 Oct 2014 18:40:04 +0000 (20:40 +0200)]
Applied proposed fix
Vadim Pisarevsky [Wed, 15 Oct 2014 18:49:17 +0000 (22:49 +0400)]
OpenCV with the refactored features2d compiles! contrib is broken for now; the tests are not tried yet
Vadim Pisarevsky [Wed, 15 Oct 2014 10:32:16 +0000 (10:32 +0000)]
Merge pull request #3334 from micha137:patch-2
Vadim Pisarevsky [Wed, 15 Oct 2014 10:31:58 +0000 (10:31 +0000)]
Merge pull request #3333 from micha137:patch-1
Vadim Pisarevsky [Wed, 15 Oct 2014 10:29:53 +0000 (10:29 +0000)]
Merge pull request #3335 from ilya-lavrenov:neon_ios
Pavel Vlasov [Fri, 3 Oct 2014 11:17:28 +0000 (15:17 +0400)]
Implementation detector and selector for IPP and OpenCL;
IPP can be switched on and off on runtime;
Optional implementation collector was added (switched off by default in CMake). Gathers data of implementation used in functions and report this info through performance TS;
TS modifications for implementations control;
Vadim Pisarevsky [Mon, 13 Oct 2014 19:01:45 +0000 (23:01 +0400)]
yet another attempt to refactor features2d; the first commit, features2d does not even compile
Ilya Lavrenov [Mon, 13 Oct 2014 18:34:15 +0000 (22:34 +0400)]
ability to compile for iOS with Neon
micha137 [Mon, 13 Oct 2014 14:31:37 +0000 (16:31 +0200)]
Update table_of_content_introduction.rst
micha137 [Mon, 13 Oct 2014 14:20:47 +0000 (16:20 +0200)]
Update tutorials.rst
Change some wording
Vadim Pisarevsky [Sun, 12 Oct 2014 04:46:26 +0000 (04:46 +0000)]
Merge pull request #3330 from vpisarev:fix_upnp_perf
Vadim Pisarevsky [Sat, 11 Oct 2014 18:57:22 +0000 (22:57 +0400)]
this is trivial change; the main change is in opencv_extra - added regression data for perf tests
Vadim Pisarevsky [Sat, 11 Oct 2014 17:58:23 +0000 (17:58 +0000)]
Merge pull request #3326 from ilya-lavrenov:neon_canny
Vadim Pisarevsky [Sat, 11 Oct 2014 17:39:55 +0000 (17:39 +0000)]
Merge pull request #3276 from asmorkalov:abidrk/pyStitching
Vadim Pisarevsky [Sat, 11 Oct 2014 17:33:28 +0000 (17:33 +0000)]
Merge pull request #3308 from edgarriba:master
Vadim Pisarevsky [Sat, 11 Oct 2014 17:19:52 +0000 (17:19 +0000)]
Merge pull request #3328 from ilya-lavrenov:warp_tests
Vadim Pisarevsky [Sat, 11 Oct 2014 16:04:02 +0000 (16:04 +0000)]
Merge pull request #3325 from a-wi:Dshow_capture_v3