perping
dee584ee15
fix haar
2013-11-12 17:54:03 +08:00
Roman Donchenko
834705490e
Merge pull request #1782 from ilya-lavrenov:ocl_adapBilat
2013-11-12 12:53:34 +04:00
Roman Donchenko
ef4eadd5d3
Merge pull request #1766 from ilya-lavrenov:ocl_remap_linear
2013-11-12 12:40:14 +04:00
Roman Donchenko
46e423d217
Merge pull request #1773 from ilya-lavrenov:ocl_buildWarpPerspectiveMaps
2013-11-12 12:26:37 +04:00
Roman Donchenko
6773914144
Merge pull request #1783 from SpecLad:cap-no-pattern
2013-11-12 11:52:50 +04:00
perping
8af626d295
fix some bug about haar and match_template.
2013-11-12 13:56:47 +08:00
Ilya Lavrenov
eda6360fa3
added RGB5x5 <-> Gray
2013-11-12 00:32:10 +04:00
Philippe FOUBERT
93120775cd
Using four spaces for indentation.
2013-11-11 20:40:18 +01:00
Roman Donchenko
405227d531
Replaced the image used in the Highgui_Video.ffmpeg_image test.
...
Our prebuilt FFmpeg Windows binaries don't have PNG support enabled
(because that requires zlib), so that makes a PNG image a bad choice
for this test.
When FFmpeg doesn't support PNG, VideoCapture falls back to the
"image sequence" implementation, which doesn't work for single images.
2013-11-11 18:30:04 +04:00
Ilya Lavrenov
daedc6f454
removed 2000x2000, 4000x4000 from test sizes of ocl::adaptiveBilateralFilter
2013-11-11 18:14:44 +04:00
Roman Donchenko
eff53e95f9
Fixed the "image sequence" capture not failing when a pattern isn't found.
...
at can't be a null pointer, so the condition was always false, and
a nonsensical pattern like "image.png%00d" was being inferred.
2013-11-11 18:12:49 +04:00
Ilya Lavrenov
3727168b50
added a performance test for ocl::buildWarpPerspectiveMaps; moved warps to a separate file
2013-11-11 18:07:23 +04:00
Roman Donchenko
e4dee5b372
Merge pull request #1780 from ilya-lavrenov:ocl_m_pi
2013-11-11 17:00:31 +04:00
Ilya Lavrenov
1f421fce01
added RGB5x5 <-> RGB conversion
2013-11-11 14:50:44 +04:00
Philippe FOUBERT
05d9375759
Trailing whitespace removal.
2013-11-11 10:26:28 +01:00
perping
73b34e3f85
fix warning.
2013-11-11 15:06:58 +08:00
perping
50579d2524
Make Integral sum support cv_32f, sqsum support cv_64f.
2013-11-11 14:31:02 +08:00
Ilya Lavrenov
5beb887247
replaced custom PI by OpenCL M_PI constant
2013-11-11 00:55:59 +04:00
Ilya Lavrenov
3cc9502c90
added RGB[A] <-> BGR[A] conversion to ocl::cvtColor
2013-11-10 23:14:36 +04:00
Philippe FOUBERT
8b0fc04d93
Fix the build of OpenCV with XIMEA on Windows 64 bits:
...
- crosses initializations in "cap_ximea.cpp" (which also contained some awfull "goto" instructions)
- the "CMAKE_CL_64" variable is not initialized when using mingw
PR#1039 modified to be able to merge on branch 2.4
2013-11-10 17:46:59 +01:00
Ilya Lavrenov
581a3e444d
added XYZ to RGB conversion to ocl::cvtColor
2013-11-10 14:37:21 +04:00
Ilya Lavrenov
5e02b20482
added RGB -> XYZ conversion to ocl::cvtColor
2013-11-10 13:38:09 +04:00
Ilya Lavrenov
33ae64201c
color.cpp refactoring: created generic interface for toRGB and fromRGB callers
2013-11-10 00:44:37 +04:00
Ilya Lavrenov
a57030a0cd
added YCrCb to RGB, BGR, RGBA, BGRA modes to ocl::cvtColor
2013-11-09 17:03:30 +04:00
Ilya Lavrenov
eba6754b06
fixed ocl::cvtColor for CV_YUV2BGRA and CV_YUV2RGBA
2013-11-09 00:40:45 +04:00
Ilya Lavrenov
8b57893e40
added an accuracy test for ocl::buildWarpPerspectiveMaps
2013-11-08 18:42:13 +04:00
Ilya Lavrenov
4248f82211
added ROI support to ocl::buildWarp*Maps functions
2013-11-08 18:40:53 +04:00
Roman Donchenko
0ac61240c5
Merge pull request #1771 from kiranpradeep:2.4
2013-11-08 17:16:20 +04:00
Kiran Pradeep
5852a913a8
CMake's get_filename_component with NAME_WE parameters, interprets first period as start of extension. For. e.g file name with out extension of 'this.is.a.text.file.txt' will be taken as 'this'. Hence using NAME with regex replacement to get 'this.is.a.text.file'
2013-11-08 14:09:34 +05:30
Roman Donchenko
800d53f76b
Merge pull request #1759 from ilya-lavrenov:ocl_distanceToCenters
2013-11-08 12:39:14 +04:00
Roman Donchenko
0be2752366
Merge pull request #1755 from KonstantinMatskevich:dump_info
2013-11-08 12:31:04 +04:00
Roman Donchenko
0fb629915f
Merge pull request #1763 from SpecLad:cv-func
2013-11-08 12:29:50 +04:00
Baichuan Su
9a0d06247a
Fix the whitespace warning.
2013-11-07 15:04:17 -08:00
Ilya Lavrenov
760b718981
added CV_16SC2 && CV_16UC1 map types support to ocl::remap (INTER_LINEAR mode)
2013-11-08 01:42:48 +04:00
Baichuan Su
99a00d3dd9
Fix merge conflicts
2013-11-07 09:56:59 -08:00
Baichuan Su
befcbf56fe
A minor fix.
2013-11-07 08:52:40 -08:00
Baichuan Su
f0de1a08b8
Fix ocl::calcHarris not support CV_32FC1 bug.
2013-11-07 08:52:39 -08:00
Roman Donchenko
07db81a4bb
Merge pull request #1760 from ilya-lavrenov:ocl_remap_nn
2013-11-07 17:29:16 +04:00
Roman Donchenko
2c38be079e
Enabled CV_Assert and such to print the function name with Visual C++.
...
Also, I made a separate macro for the current function name, which
helps simplify a lot of code that uses it.
2013-11-07 17:22:02 +04:00
Konstantin Matskevich
e9edfd1c54
update
2013-11-07 17:21:56 +04:00
Roman Donchenko
641bb7ac6b
Merge pull request #1737 from vrabaud:2.4
2013-11-07 12:03:30 +04:00
Bo Hu
c88fa27b1d
Removed trailing whitespace in cap_qtkit.mm.
2013-11-06 13:33:17 -08:00
Bo Hu
114579c33b
Added proper testing of the end of quicktime video files.
...
CvCaptureFile::grabFrame() always returns 1 regardless, which causes
dead loop when relying on the return value of VideoCapture::read().
2013-11-06 13:32:11 -08:00
Ilya Lavrenov
fa15769f39
added CV_16SC2 && CV_16UC1 maps support to ocl::remap (nearest neighbour only)
2013-11-06 23:14:04 +04:00
Ilya Lavrenov
56d943388d
speeded up ocl::distanceToCenters
2013-11-06 20:02:31 +04:00
Andrey Pavlenko
296f76a135
Merge pull request #1756 from alalek:ocl_workaround_memory_leaks_with_subbuffer
2013-11-06 18:26:39 +04:00
Andrey Pavlenko
9afe65e5c0
Merge pull request #1758 from apavlenko:adaptive_bilateral_filter
2013-11-06 18:09:49 +04:00
Roman Donchenko
bca63083a8
Merge pull request #1757 from asmorkalov:android_manager_version_inc2
2013-11-06 17:50:20 +04:00
Harris Gasparakis
a1de91a4fd
Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs
2013-11-06 16:48:50 +04:00
Konstantin Matskevich
5304e9f259
extending openCL info dump
2013-11-06 15:20:05 +04:00
