Brian Park
5de5f26223
Merge remote-tracking branch 'upstream/master'
2014-10-29 23:15:22 -07:00
Alexander Alekhin
cae89a7a88
Merge pull request #3318 from akarsakov:ocl_cvtcolor
2014-10-29 14:25:09 +00:00
Alexander Alekhin
fd59551ff0
Merge pull request #3354 from vbystricky:oclopt_convertScaleAbs
2014-10-29 13:53:56 +00:00
Alexander Alekhin
efebd83bc8
Merge pull request #3159 from ElenaGvozdeva:ocl_gemm
2014-10-29 11:18:06 +00:00
Alexander Alekhin
4a9cfbf806
Merge pull request #3379 from akarsakov:gftt_empty_src
2014-10-28 17:19:57 +00:00
Alexander Karsakov
967a88759f
Don't process empty src image in GFTT
2014-10-28 16:06:36 +03:00
ElenaGvozdeva
d88fdd0378
use LOCAL_SIZE+1
2014-10-28 15:18:31 +03:00
Alexander Karsakov
643c906f3d
Added optimized loading to YUV2RGB_422 kernel
2014-10-28 15:07:51 +03:00
Alexander Alekhin
fae2eb8a1a
Merge pull request #3353 from Chuanbo-Weng:master
2014-10-28 10:23:18 +00:00
Alexander Alekhin
30222c7be8
Merge pull request #3359 from akarsakov:ocl_buildMaps
2014-10-28 09:18:31 +00:00
Jose-Luis Blanco-Claraco
539acaf348
OpenCVConfig.cmake: Fix CMake CMP0012 warning
...
"TRUE"/"FALSE" should not be used as literals, as CMake has to decide
whether they are literals or variable names (sigh).
This patch should make it work with any version of CMake and with any
user-side decision on old vs. new policy behavior.
2014-10-28 09:46:18 +01:00
Alexander Karsakov
1466621f99
Added loading 4 pixels in line instead of 2 to RGB[A] -> YUV(420) kernel
2014-10-27 16:00:34 +03:00
Alexander Karsakov
ebfaf4c5d8
Added checking that z is non zero to buildWarpPlaneMaps kernel
2014-10-27 15:38:44 +03:00
Alexander Karsakov
0aab779532
Overload PlaneWarper::buildMaps method from base class
2014-10-27 15:36:52 +03:00
ElenaGvozdeva
65b8a1cb37
Some small fixes
2014-10-27 14:38:22 +03:00
Elena Gvozdeva
c5a2879ce0
use vectors
2014-10-27 14:38:22 +03:00
Elena Gvozdeva
2d89df1804
use local memory
2014-10-27 14:38:21 +03:00
Elena Gvozdeva
d78bc3c321
naive implementation
2014-10-27 14:38:21 +03:00
Alexander Alekhin
dee56598e9
Merge pull request #3369 from vbystricky:fix_scaleAdd
2014-10-27 10:03:29 +00:00
Pat O'Keefe
83ccdabe7e
Add test for calib3d function decomposeProjectionMatrix(...)
2014-10-25 19:11:02 -06:00
Alexander Alekhin
1f08d8cb6f
Merge pull request #3367 from akarsakov:ocl_image2d
2014-10-24 16:01:21 +00:00
Alexander Alekhin
1fbad26fe3
Merge pull request #3342 from alalek:perf_stability_check
2014-10-24 16:00:20 +00:00
vbystricky
8466911ad0
Move _dst.create() to the begining of scaleAdd function
2014-10-24 18:27:47 +04:00
Alexander Alekhin
caba92f2b8
Merge pull request #3284 from vbystricky:oclopt_stereoBM
2014-10-24 12:59:13 +00:00
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