Alexander Alekhin
63383ef1d8
Merge pull request #3368 from alalek:amd_clfinish
2014-10-24 12:58:21 +00:00
Alexander Karsakov
237cb93143
Added extra checks to ocl::Image2D
2014-10-24 15:04:42 +03:00
Alexander Alekhin
579a7fff6d
ocl: restore clFinish() in unmap() for AMD devices
...
This reverts commit 7d91b8efcd
.
2014-10-24 14:29:38 +04:00
Maksim Shabunin
071e78d02e
Disabled videoio_video_prop_fps test
...
This test does not return correct values with some software configurations.
Possible problem with ffmpeg on buildbot's linux-slave.
2014-10-24 11:37:15 +04:00
vbystricky
21ad8e92d4
Optimize OpenCL version of StereoBM function
...
Fix problems on NVidia devices.
2014-10-23 20:18:53 +04:00
Alexander Karsakov
3a263c6326
Added tests for Image2D
2014-10-23 14:23:37 +03:00
Maksim Shabunin
e85ae5f2f0
Fixed imgcodecs tests
...
- Imgcodecs_Image, write_imageseq - assuming JPEG images have losses
- Imgcodecs_Drawing, c_regression - replaced assert calls
- Imgcodecs_Drawing - exact comparison with reference image
2014-10-23 12:38:42 +04:00
Miroslav Benes
5b1fd739d9
Add Triangle thresholding algorithm
...
Add Triangle method for automatic threshold computation next to the existing
Otsu's method. Triangle deals better with images whose histogram does not
contain dominant peak.
See paper Zack GW, Rogers WE, Latt SA.: Automatic measurement of sister
chromatid exchange frequency. J Histochem Cytochem. 1977 Jul;25(7):741-53.
2014-10-22 16:54:39 +02:00
Alexander Karsakov
62d4393883
Small optimization for buildMaps kernels in case rowsPerWI > 1
2014-10-22 17:43:29 +03:00
Maksim Shabunin
ba5f343c38
Basic doxygen documentation support
...
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
2014-10-22 15:24:15 +04:00
Brian Park
f83a76cdeb
add input paramter checking that verifies the existance of the input files to stero_match example
2014-10-21 22:47:49 -07:00
Vadim Pisarevsky
e40567eaee
Merge pull request #3352 from alucarded:BackgroundSubtractorMOG2_optimization
2014-10-22 01:55:23 +00:00
vbystricky
a8aa6381d9
Optimize OpenCL version of conversScaleAbs function
2014-10-21 19:20:20 +04:00
Alexander Karsakov
60367907fe
Used direct float calculations
2014-10-21 17:18:03 +03:00
Alexander Karsakov
5aa9ac9a77
Added OCL code for YUV422 -> RGB[A]|BGR[A] color conversion
2014-10-21 17:18:03 +03:00
Alexander Karsakov
c8707b891b
Added OCL code for RGB[A]|BGR[A] -> YUV_[YV12|IYUV] color conversion
2014-10-21 17:18:03 +03:00
Alexander Karsakov
8c91604f5a
Added OCL code for YUV2GRAY_420 color conversion
2014-10-21 17:18:02 +03:00
Alexander Karsakov
1cc17a7186
Added OCL code for YUV2BGR_YV12 and YUV2BGR_IYUV color conversions
2014-10-21 17:18:02 +03:00
Alexander Karsakov
85b60ee3cb
Added support for YUV2RGB[A]_NV21 and YUV2BGR[A]_NV21 conversion
2014-10-21 17:18:02 +03:00
Alexander Alekhin
8ab6852927
added performance validation check
2014-10-21 15:23:19 +04:00
Alexander Alekhin
54b59c3cfb
Merge pull request #3355 from ElenaGvozdeva:predictOptimalVectorWidth
2014-10-21 11:23:06 +00:00
ElenaGvozdeva
070e5ec042
Changed predictOptimalVectorWidth function, now it is possible to choose vector size.
2014-10-21 13:13:15 +03:00
Alexander Alekhin
322593e89f
Merge pull request #3256 from vbystricky:oclopt_BFMatcher
2014-10-21 08:59:23 +00:00
Tomasz Posłuszny
8dd213c829
BackgroundSubtractorMOG2, learningRate=0 optimization
2014-10-20 19:45:31 +02:00
Chuanbo Weng
2b52bb092a
Update hog.cpp
...
Update according to vbystricky's comments
2014-10-20 18:14:38 +08:00
Vadim Pisarevsky
4de9605b7b
Merge pull request #3344 from mshabunin:java_automation
2014-10-20 06:50:34 +00:00
Vadim Pisarevsky
d767c9df58
Merge pull request #3349 from a-wi:DShow_Strsafe_header_v3
2014-10-20 06:49:18 +00:00
Vadim Pisarevsky
926b64fff7
Merge pull request #3292 from mshabunin:fix-ios-warnings
2014-10-20 06:41:51 +00:00
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>
2014-10-20 11:50:46 +08:00
Vadim Pisarevsky
55f490485b
Merge pull request #3348 from vpisarev:refactor_algorithms2
2014-10-18 18:52:35 +00:00
Artur Wieczorek
dcbe797980
Include strsafe.h to compile successfully under MinGW in Debug mode.
2014-10-18 20:38:34 +02:00
Vadim Pisarevsky
dcee883961
fixed MSVC warnings and iOS framework compile error
2014-10-18 21:58:34 +04:00
Vadim Pisarevsky
e4418e186e
Merge pull request #3345 from D-Alex:master
2014-10-18 17:00:31 +00:00
Vadim Pisarevsky
c45d2642ca
Merge pull request #3347 from Nerei:memory_leak_in_viz_opencv30
2014-10-18 16:57:35 +00:00
Vadim Pisarevsky
b37a641cc9
fixed bug in automatic SVM training
2014-10-18 20:53:39 +04:00
Vadim Pisarevsky
d2b9dc5530
quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)
2014-10-18 20:44:26 +04:00
Anatoly Baksheev
cb95d1df35
viz: fixed memory leak
2014-10-18 18:17:42 +04:00
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
2014-10-18 14:22:27 +02:00
vbystricky
3787388eac
Optimize OpenCL version of BFMatcher
2014-10-17 19:48:45 +04:00
Maksim Shabunin
c5a1650ac0
Refactoring in gen_java.py script
2014-10-17 19:36:24 +04:00
Maksim Shabunin
276bed3e4a
final fix
2014-10-17 18:29:30 +04:00
Maksim Shabunin
571ebb2373
Fixing iOS clang warnings, part 3
2014-10-17 18:15:21 +04:00
Maksim Shabunin
ef3d02214b
Fixing iOS clang warnings, part 2
2014-10-17 18:14:54 +04:00
Maksim Shabunin
d3821e8cd7
Forgotten punctuation
2014-10-17 18:14:54 +04:00
Maksim Shabunin
420737e098
Fixing iOS clang warnings, part 1
2014-10-17 18:14:54 +04:00
Maksim Shabunin
630eddf25a
Extracted repeated cmake instruction block
2014-10-17 18:14:53 +04:00
Maksim Shabunin
f379bcc6d3
Suppressed some iOS framework compilation warnings
2014-10-17 18:14:53 +04:00
Vadim Pisarevsky
22ff1e8826
Merge pull request #3339 from vpisarev:refactor_features2d_take4
2014-10-17 14:07:06 +00:00
Vadim Pisarevsky
4038beb67e
fixed incorrect array access in solvepnp (which affected debug builds only)
2014-10-17 17:01:39 +04:00
Vadim Pisarevsky
3f37e034a0
another fix in opencv_world
2014-10-17 16:09:09 +04:00