Roman Donchenko
e69d2c1bb1
Merge pull request #1819 from ilya-lavrenov:ocl_resize_AREA
2013-11-19 16:25:47 +04:00
Roman Donchenko
5c77784ac9
Merge pull request #1827 from asmorkalov:android_ndk_r9b
2013-11-19 14:53:16 +04:00
Roman Donchenko
0a90a36a1f
Merge pull request #1793 from SpecLad:external-docs-1
2013-11-19 14:21:48 +04:00
Roman Donchenko
c47190ef90
Merge pull request #1787 from hs3180:2.4
2013-11-19 14:21:25 +04:00
Ilya Lavrenov
198cd1a40d
added area fast mode to ocl::resize
2013-11-19 13:43:50 +04:00
Roman Donchenko
4746a710bb
Merge pull request #1820 from asmorkalov:android_native_camera_44
2013-11-19 12:47:48 +04:00
Roman Donchenko
3e55d705cc
Merge pull request #1823 from ilya-lavrenov:ocl_abs_sum
2013-11-19 12:34:09 +04:00
Roman Donchenko
56f791679b
Merge pull request #1825 from jet47:fix-opengl-mem-leak
2013-11-19 12:31:53 +04:00
Roman Donchenko
68d1110cde
Merge pull request #1821 from SpecLad:watch-your-slashes
2013-11-19 12:29:55 +04:00
Alexander Smorkalov
e08b075db0
Android NDK r9b support added.
2013-11-19 11:46:29 +04:00
Vladislav Vinogradov
66221a32b9
fixed memory leak in ogl::Texture2D
2013-11-19 10:12:22 +04:00
Ilya Lavrenov
c0456df611
workaround for ocl::absSum (eliminated error: unreachable executed)
2013-11-18 20:38:39 +04:00
Roman Donchenko
85f92fabbd
Merge pull request #1815 from asmorkalov:android_native_camera_build_automation
2013-11-18 19:44:33 +04:00
Roman Donchenko
239704f986
Added Visual Studio 2013 detection.
2013-11-18 19:39:39 +04:00
Roman Donchenko
7973594a01
Removed all slashes after ${OpenCV_INSTALL_BINARIES_PREFIX}.
...
If it's followed by a slash and OpenCV_INSTALL_BINARIES_PREFIX is empty,
then the resulting path becomes absolute.
Fixes <http://code.opencv.org/issues/3350 >.
2013-11-18 19:21:31 +04:00
Ilya Lavrenov
f70d63e4c9
added INTER_AREA interpolation to ocl::resize
2013-11-18 18:28:49 +04:00
Alexander Smorkalov
26d3a1a036
Prebuilt libnative_camera_xxx updated.
2013-11-18 18:19:38 +04:00
Alexander Smorkalov
04d293d2c4
Initial NativeCamera support for Android 4.4 KitKat.
2013-11-18 18:07:26 +04:00
Roman Donchenko
cdf4e4e0b5
Merge pull request #1810 from Nerei:2.4
2013-11-18 17:49:40 +04:00
Alexander Smorkalov
e3f450cffb
NativeCamera build with AndroidStub backported from OpenCV master.
2013-11-18 17:43:21 +04:00
Roman Donchenko
8b99a1e850
Merge pull request #1806 from akarsakov:ffmpeg_without_iconv
2013-11-18 17:26:40 +04:00
Roman Donchenko
7703b63cae
Merge pull request #1722 from StevenPuttemans:feature_1631_second
2013-11-18 15:48:27 +04:00
Roman Donchenko
4fd1960425
Merge pull request #1807 from KonstantinMatskevich:intel_bug
2013-11-18 15:16:37 +04:00
Roman Donchenko
3f927abb4d
Merge pull request #1809 from ilya-lavrenov:ocl_resize_nn
2013-11-18 14:55:24 +04:00
Alexander Karsakov
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
Konstantin Matskevich
327d9f274b
fixed Split for device version equals 78712
2013-11-18 13:20:57 +04:00
Konstantin Matskevich
0e1717c14c
fixing bugs for Intel platform CPU device
2013-11-18 13:20:54 +04:00
Roman Donchenko
f5ded41016
Merge pull request #1808 from alalek:ocl_fix_cvtcolor_xyz
2013-11-18 12:20:58 +04:00
StevenPuttemans
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
Anatoly Baksheev
13bb236ad5
fixed some warnings
2013-11-16 21:18:36 +04:00
Anatoly Baksheev
8f6f9c3e58
compilation for VS2008
2013-11-16 20:14:01 +04:00
Alexander Alekhin
0a698bf145
ocl: fix cvtColor XYZ: variables on stack
2013-11-16 13:45:39 +04:00
Ilya Lavrenov
cc237b7aba
generalized ocl::resize for all data types (INTER_NEAREST mode)
2013-11-15 22:52:29 +04:00
Roman Donchenko
f95ff0a352
Merge pull request #1802 from SpecLad:cmake-templates
2013-11-15 16:52:56 +04:00
Roman Donchenko
4e2ec7b97d
Merge pull request #1803 from ilya-lavrenov:ocl_cvtColor
2013-11-15 15:55:29 +04:00
Roman Donchenko
2e79dde357
Merge pull request #1799 from SpecLad:avformat-53-6
2013-11-15 11:51:59 +04:00
moodoki
cebf109d39
Replaced code in .rst file with literalinclude as suggested
2013-11-15 00:27:07 +08:00
Roman Donchenko
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
Roman Donchenko
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
Roman Donchenko
01f8645bc8
Merge pull request #1794 from vrabaud:2.4
2013-11-14 16:43:50 +04:00
Roman Donchenko
be88b20154
Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor
2013-11-14 14:46:43 +04:00
Roman Donchenko
84da6ca265
Merge pull request #1792 from ilya-lavrenov:ocl_warp_eps
2013-11-14 14:46:06 +04:00
Roman Donchenko
19b3064706
Merge pull request #1790 from ilya-lavrenov:ocl_ref
2013-11-14 14:45:50 +04:00
Vincent Rabaud
8e944cfe70
cleaner fix
2013-11-14 11:45:42 +01:00
Ilya Lavrenov
fe76b2116a
added RGBA <-> mRGBA
2013-11-14 12:02:59 +04:00
moodoki
b8de81749c
Slight modification to example code for FLANN matcher with comment on #3344
2013-11-14 00:22:20 +08:00
Ilya Lavrenov
1b7c5b201d
added HLS -> RGB[A][FULL] conversion
2013-11-13 19:35:24 +04:00
Ilya Lavrenov
98915e06bc
added HSV -> RGB[A][FULL] conversion
2013-11-13 19:10:06 +04:00
Ilya Lavrenov
3bdd9626f3
added RGB[A] -> HLS[FULL] conversion
2013-11-13 17:41:40 +04:00
Roman Donchenko
15f4292a1f
Merge pull request #1788 from alalek:perf_test_skip
2013-11-13 17:21:52 +04:00
