cdf4e4e0b5
Merge pull request #1810 from Nerei:2.4
2013-11-18 17:49:40 +04:00
8b99a1e850
Merge pull request #1806 from akarsakov:ffmpeg_without_iconv
2013-11-18 17:26:40 +04:00
7703b63cae
Merge pull request #1722 from StevenPuttemans:feature_1631_second
2013-11-18 15:48:27 +04:00
4fd1960425
Merge pull request #1807 from KonstantinMatskevich:intel_bug
2013-11-18 15:16:37 +04:00
3f927abb4d
Merge pull request #1809 from ilya-lavrenov:ocl_resize_nn
2013-11-18 14:55:24 +04:00
83cefcb92a
FFmpeg 2.0.2 32-bit builded with mingw (4.6.1) with following additional options: --enable-w32threads --disable-iconv --cpu=i686 (workaroud for http://trac.ffmpeg.org/ticket/2363 )
2013-11-18 13:56:02 +04:00
327d9f274b
fixed Split for device version equals 78712
2013-11-18 13:20:57 +04:00
0e1717c14c
fixing bugs for Intel platform CPU device
2013-11-18 13:20:54 +04:00
f5ded41016
Merge pull request #1808 from alalek:ocl_fix_cvtcolor_xyz
2013-11-18 12:20:58 +04:00
2b106db02f
Applied all fixes related to translating C to C++ code
...
Also fixed some typos and code alignment
Also adapted tutorial CPP samples
Fixed some identation problems
2013-11-17 20:34:50 +01:00
13bb236ad5
fixed some warnings
2013-11-16 21:18:36 +04:00
8f6f9c3e58
compilation for VS2008
2013-11-16 20:14:01 +04:00
0a698bf145
ocl: fix cvtColor XYZ: variables on stack
2013-11-16 13:45:39 +04:00
cc237b7aba
generalized ocl::resize for all data types (INTER_NEAREST mode)
2013-11-15 22:52:29 +04:00
f95ff0a352
Merge pull request #1802 from SpecLad:cmake-templates
2013-11-15 16:52:56 +04:00
4e2ec7b97d
Merge pull request #1803 from ilya-lavrenov:ocl_cvtColor
2013-11-15 15:55:29 +04:00
2e79dde357
Merge pull request #1799 from SpecLad:avformat-53-6
2013-11-15 11:51:59 +04:00
428fb72625
Made the generated file templates' naming more consistent.
...
The general convention is <output file name> + ".in".
2013-11-14 19:14:38 +04:00
3b7acf2657
Fix building with FFmpeg 0.8.
...
avformat_find_stream_info was introduced in Libav avformat 53.3,
but it was only merged to FFmpeg in avformat 53.6.
In Libav avformat 53.3-53.5 av_find_stream_info is not removed
(only deprecated), so this shouldn't break building with that.
2013-11-14 17:25:46 +04:00
01f8645bc8
Merge pull request #1794 from vrabaud:2.4
2013-11-14 16:43:50 +04:00
be88b20154
Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor
2013-11-14 14:46:43 +04:00
84da6ca265
Merge pull request #1792 from ilya-lavrenov:ocl_warp_eps
2013-11-14 14:46:06 +04:00
19b3064706
Merge pull request #1790 from ilya-lavrenov:ocl_ref
2013-11-14 14:45:50 +04:00
8e944cfe70
cleaner fix
2013-11-14 11:45:42 +01:00
fe76b2116a
added RGBA <-> mRGBA
2013-11-14 12:02:59 +04:00
1b7c5b201d
added HLS -> RGB[A][FULL] conversion
2013-11-13 19:35:24 +04:00
98915e06bc
added HSV -> RGB[A][FULL] conversion
2013-11-13 19:10:06 +04:00
3bdd9626f3
added RGB[A] -> HLS[FULL] conversion
2013-11-13 17:41:40 +04:00
15f4292a1f
Merge pull request #1788 from alalek:perf_test_skip
2013-11-13 17:21:52 +04:00
ee7c74ceeb
return when OpenCV is found
2013-11-13 14:20:09 +01:00
af7c614438
added RGB[A] -> HSV[FULL] conversion
2013-11-13 17:09:05 +04:00
411629a57d
Merge pull request #1786 from SpecLad:cap-images-file-pattern
2013-11-13 17:00:20 +04:00
54ea5bbac7
Merge pull request #1779 from perping:integral_2.4
2013-11-13 15:53:42 +04:00
28e0d3d771
Merge pull request #1784 from SpecLad:ffmpeg-no-png
2013-11-13 15:52:42 +04:00
9007a02302
fixes http://code.opencv.org/issues/3367
2013-11-13 12:25:44 +01:00
fb326a58fc
ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize
2013-11-13 14:17:57 +04:00
f1873bbca1
perf tests: allow to skip performance tests
2013-11-13 14:17:56 +04:00
6770c04073
refactored some functions from ocl arithm
2013-11-13 13:56:49 +04:00
c38e4f9639
added eps to ocl::buildWarpPerspectiveMaps perf test
2013-11-13 13:04:02 +04:00
376993be4c
Merge pull request #1785 from ilya-lavrenov:ocl_kern_warn
2013-11-13 12:20:09 +04:00
df6bce372b
Merge pull request #1789 from ilya-lavrenov:ocl_minMaxLoc
2013-11-13 12:16:02 +04:00
185059959b
fix haar
2013-11-13 10:19:09 +08:00
1e2fb6de30
fix match_template and haar
2013-11-13 10:09:39 +08:00
0bf7350615
fixed compilation of ocl::minMaxLoc for Intel device
2013-11-12 19:14:40 +04:00
b8e3d3f791
In the image sequence capture, only search for the ordinal in the file name.
...
Searching in directory names can yield confusing results; e.g. if
the input is "jpeg2000/image1.jp2", it will infer the pattern
"jpeg%04d/image1.jp2", which is likely not what the user intended.
If the user really desires for the variable part to be in the
directory name, it can always use an explicit pattern.
2013-11-12 16:26:21 +04:00
96121a66c5
kernel warnings on AMD
2013-11-12 15:06:46 +04:00
a81efdbb25
Merge pull request #1775 from ilya-lavrenov:ocl_cvtColor
2013-11-12 14:26:50 +04:00
d6e0ef2710
fix linux warning.
2013-11-12 18:13:44 +08:00
dee584ee15
fix haar
2013-11-12 17:54:03 +08:00
834705490e
Merge pull request #1782 from ilya-lavrenov:ocl_adapBilat
2013-11-12 12:53:34 +04:00
Roman Donchenko