Alexander Alekhin
322593e89f
Merge pull request #3256 from vbystricky:oclopt_BFMatcher
10 years ago
Tomasz Posłuszny
8dd213c829
BackgroundSubtractorMOG2, learningRate=0 optimization
10 years ago
Chuanbo Weng
2b52bb092a
Update hog.cpp
...
Update according to vbystricky's comments
10 years ago
Vadim Pisarevsky
4de9605b7b
Merge pull request #3344 from mshabunin:java_automation
10 years ago
Vadim Pisarevsky
d767c9df58
Merge pull request #3349 from a-wi:DShow_Strsafe_header_v3
10 years ago
Vadim Pisarevsky
926b64fff7
Merge pull request #3292 from mshabunin:fix-ios-warnings
10 years ago
Chuanbo Weng
7452eef6e9
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>
10 years ago
Vadim Pisarevsky
55f490485b
Merge pull request #3348 from vpisarev:refactor_algorithms2
10 years ago
Artur Wieczorek
dcbe797980
Include strsafe.h to compile successfully under MinGW in Debug mode.
10 years ago
Vadim Pisarevsky
dcee883961
fixed MSVC warnings and iOS framework compile error
10 years ago
Vadim Pisarevsky
e4418e186e
Merge pull request #3345 from D-Alex:master
10 years ago
Vadim Pisarevsky
c45d2642ca
Merge pull request #3347 from Nerei:memory_leak_in_viz_opencv30
10 years ago
Vadim Pisarevsky
b37a641cc9
fixed bug in automatic SVM training
10 years ago
Vadim Pisarevsky
d2b9dc5530
quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)
10 years ago
Anatoly Baksheev
cb95d1df35
viz: fixed memory leak
10 years ago
Alexander Duda
11ebaf673f
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
10 years ago
vbystricky
3787388eac
Optimize OpenCL version of BFMatcher
10 years ago
Maksim Shabunin
c5a1650ac0
Refactoring in gen_java.py script
10 years ago
Maksim Shabunin
276bed3e4a
final fix
10 years ago
Maksim Shabunin
571ebb2373
Fixing iOS clang warnings, part 3
10 years ago
Maksim Shabunin
ef3d02214b
Fixing iOS clang warnings, part 2
10 years ago
Maksim Shabunin
d3821e8cd7
Forgotten punctuation
10 years ago
Maksim Shabunin
420737e098
Fixing iOS clang warnings, part 1
10 years ago
Maksim Shabunin
630eddf25a
Extracted repeated cmake instruction block
10 years ago
Maksim Shabunin
f379bcc6d3
Suppressed some iOS framework compilation warnings
10 years ago
Vadim Pisarevsky
22ff1e8826
Merge pull request #3339 from vpisarev:refactor_features2d_take4
10 years ago
Vadim Pisarevsky
4038beb67e
fixed incorrect array access in solvepnp (which affected debug builds only)
10 years ago
Vadim Pisarevsky
3f37e034a0
another fix in opencv_world
10 years ago
Vadim Pisarevsky
8d9e619412
fixed opencv_world build
10 years ago
Vadim Pisarevsky
1a809ca89b
fixed msvc compile warning
10 years ago
Vadim Pisarevsky
cc11a8d183
Merge branch 'refactor_features2d_take4' of https://github.com/vpisarev/opencv into refactor_features2d_take4
...
Conflicts:
modules/features2d/src/orb.cpp
10 years ago
Vadim Pisarevsky
54e65598bd
fixed error in OpenCL ORB
10 years ago
Vadim Pisarevsky
1176d4ef84
fixed some more compile errors and test failures
10 years ago
Vadim Pisarevsky
d36b546df8
trying to fix strange compiler bug
10 years ago
Vadim Pisarevsky
9c9ecc22e2
fixed opencv_java build
10 years ago
Vadim Pisarevsky
fa76c634ec
ok; all the tests now pass
10 years ago
Vadim Pisarevsky
01d3848f17
all the tests now pass except for MSER
10 years ago
Vadim Pisarevsky
162384a838
fixed several test failures; currently 9 out of 73 tests fail
10 years ago
Vadim Pisarevsky
06d4aa6060
now all the samples and opencv_contrib compile!
10 years ago
Vadim Pisarevsky
09df1a286b
OpenCV with the refactored features2d compiles! contrib is broken for now; the tests are not tried yet
10 years ago
Vadim Pisarevsky
2e915026a0
yet another attempt to refactor features2d; the first commit, features2d does not even compile
10 years ago
Vadim Pisarevsky
f6f839eb3c
trying to resolve the merge conflict
10 years ago
Vadim Pisarevsky
c5292c2549
fixed error in OpenCL ORB
10 years ago
Vadim Pisarevsky
c422bdc3f8
fixed some more compile errors and test failures
10 years ago
Vadim Pisarevsky
48a860a335
trying to fix strange compiler bug
10 years ago
Vadim Pisarevsky
61cddd8b63
fixed opencv_java build
10 years ago
Vadim Pisarevsky
25a7d023dd
ok; all the tests now pass
10 years ago
Vadim Pisarevsky
c5261ea3d2
all the tests now pass except for MSER
10 years ago
Alexander Alekhin
af1d29db83
Merge pull request #3332 from lupustr3:pvlasov/implementation_detector
10 years ago
Vadim Pisarevsky
97a5dd0ead
fixed several test failures; currently 9 out of 73 tests fail
10 years ago