Alexander Alekhin [Fri, 22 Nov 2013 14:24:50 +0000 (18:24 +0400)]
ocl: don't disable Undef warnings
Alexander Alekhin [Thu, 21 Nov 2013 08:35:37 +0000 (12:35 +0400)]
ocl: fix cl_platform.h:95: #elif _WIN32 -> #elif defined(_WIN32)
Andrey Pavlenko [Thu, 21 Nov 2013 13:32:53 +0000 (17:32 +0400)]
Merge pull request #1840 from ilya-lavrenov:ocl_cvtColor
Roman Donchenko [Thu, 21 Nov 2013 13:11:29 +0000 (17:11 +0400)]
Merge pull request #1838 from alekcac:ios64_fix
Ilya Lavrenov [Thu, 21 Nov 2013 08:53:21 +0000 (12:53 +0400)]
added extra parameters to ocl::cvtColor performance test
Roman Donchenko [Thu, 21 Nov 2013 08:31:36 +0000 (12:31 +0400)]
Merge pull request #1795 from alalek:perf_report_progress
Roman Donchenko [Thu, 21 Nov 2013 08:03:01 +0000 (12:03 +0400)]
Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea
Roman Donchenko [Thu, 21 Nov 2013 07:55:20 +0000 (11:55 +0400)]
Merge pull request #1834 from SpecLad:svm-copy-ctor
Alexander Alekhin [Wed, 20 Nov 2013 15:57:20 +0000 (19:57 +0400)]
perf report: summary.py: added --progress mode
Roman Donchenko [Wed, 20 Nov 2013 14:19:07 +0000 (18:19 +0400)]
Merge pull request #1836 from ilya-lavrenov:ocl_norm_workaround
Alexander Shishkov [Wed, 20 Nov 2013 14:08:05 +0000 (18:08 +0400)]
fix for supporting 64-bit architecture
Roman Donchenko [Wed, 20 Nov 2013 13:59:35 +0000 (17:59 +0400)]
Merge pull request #1833 from SpecLad:fix-qt-sample
Roman Donchenko [Wed, 20 Nov 2013 11:57:14 +0000 (15:57 +0400)]
Merge pull request #1829 from SpecLad:config-components-libs
Ilya Lavrenov [Wed, 20 Nov 2013 11:40:56 +0000 (15:40 +0400)]
workaround for AMD bug: UNREACHABLE EXECUTED
Roman Donchenko [Wed, 20 Nov 2013 10:59:42 +0000 (14:59 +0400)]
Gave CvSVM a private copy constructor & assignment operator.
The implicitly generated ones don't work properly, and I don't want to
write proper ones. :-)
"Fixes" <http://code.opencv.org/issues/3358>.
Roman Donchenko [Wed, 20 Nov 2013 10:57:21 +0000 (14:57 +0400)]
Fix the Qt sample, broken after #1722.
Roman Donchenko [Wed, 20 Nov 2013 09:36:37 +0000 (13:36 +0400)]
Merge pull request #1761 from bhuroc:qtkit-video-file-2.4
Philippe FOUBERT [Tue, 19 Nov 2013 20:51:47 +0000 (21:51 +0100)]
Back to the previous coding way (using the macro with the goto).
Roman Donchenko [Tue, 19 Nov 2013 14:36:58 +0000 (18:36 +0400)]
Fixed OpenCV_LIBS when find_package has been used with explicit components.
Fixes <http://answers.opencv.org/question/23997/opencv-247-cmake-includes-all-modules-even-if-i/>.
Roman Donchenko [Tue, 19 Nov 2013 12:25:46 +0000 (16:25 +0400)]
Merge pull request #1819 from ilya-lavrenov:ocl_resize_AREA
Roman Donchenko [Tue, 19 Nov 2013 10:53:16 +0000 (14:53 +0400)]
Merge pull request #1827 from asmorkalov:android_ndk_r9b
Roman Donchenko [Tue, 19 Nov 2013 10:21:48 +0000 (14:21 +0400)]
Merge pull request #1793 from SpecLad:external-docs-1
Roman Donchenko [Tue, 19 Nov 2013 10:21:25 +0000 (14:21 +0400)]
Merge pull request #1787 from hs3180:2.4
Ilya Lavrenov [Mon, 18 Nov 2013 14:46:59 +0000 (18:46 +0400)]
added area fast mode to ocl::resize
Roman Donchenko [Tue, 19 Nov 2013 08:47:47 +0000 (12:47 +0400)]
Merge pull request #1820 from asmorkalov:android_native_camera_44
Roman Donchenko [Tue, 19 Nov 2013 08:34:09 +0000 (12:34 +0400)]
Merge pull request #1823 from ilya-lavrenov:ocl_abs_sum
Roman Donchenko [Tue, 19 Nov 2013 08:31:53 +0000 (12:31 +0400)]
Merge pull request #1825 from jet47:fix-opengl-mem-leak
Roman Donchenko [Tue, 19 Nov 2013 08:29:55 +0000 (12:29 +0400)]
Merge pull request #1821 from SpecLad:watch-your-slashes
Alexander Smorkalov [Tue, 19 Nov 2013 07:46:29 +0000 (11:46 +0400)]
Android NDK r9b support added.
Vladislav Vinogradov [Tue, 19 Nov 2013 06:12:22 +0000 (10:12 +0400)]
fixed memory leak in ogl::Texture2D
Ilya Lavrenov [Mon, 18 Nov 2013 14:50:40 +0000 (18:50 +0400)]
workaround for ocl::absSum (eliminated error: unreachable executed)
Roman Donchenko [Mon, 18 Nov 2013 15:44:32 +0000 (19:44 +0400)]
Merge pull request #1815 from asmorkalov:android_native_camera_build_automation
Roman Donchenko [Mon, 18 Nov 2013 15:17:23 +0000 (19:17 +0400)]
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>.
Ilya Lavrenov [Mon, 18 Nov 2013 12:33:54 +0000 (16:33 +0400)]
added INTER_AREA interpolation to ocl::resize
Alexander Smorkalov [Mon, 18 Nov 2013 14:19:38 +0000 (18:19 +0400)]
Prebuilt libnative_camera_xxx updated.
Alexander Smorkalov [Sun, 17 Nov 2013 07:42:13 +0000 (11:42 +0400)]
Initial NativeCamera support for Android 4.4 KitKat.
Roman Donchenko [Mon, 18 Nov 2013 13:49:40 +0000 (17:49 +0400)]
Merge pull request #1810 from Nerei:2.4
Alexander Smorkalov [Mon, 18 Nov 2013 05:30:12 +0000 (09:30 +0400)]
NativeCamera build with AndroidStub backported from OpenCV
Roman Donchenko [Mon, 18 Nov 2013 13:26:38 +0000 (17:26 +0400)]
Merge pull request #1806 from akarsakov:ffmpeg_without_iconv
Roman Donchenko [Mon, 18 Nov 2013 11:48:27 +0000 (15:48 +0400)]
Merge pull request #1722 from StevenPuttemans:feature_1631_second
Roman Donchenko [Mon, 18 Nov 2013 11:16:36 +0000 (15:16 +0400)]
Merge pull request #1807 from KonstantinMatskevich:intel_bug
Roman Donchenko [Mon, 18 Nov 2013 10:55:24 +0000 (14:55 +0400)]
Merge pull request #1809 from ilya-lavrenov:ocl_resize_nn
Alexander Karsakov [Mon, 18 Nov 2013 09:56:02 +0000 (13:56 +0400)]
FFmpeg 2.0.2 32-bit builded with mingw (4.6.1) with following additional options: --enable-w32threads --disable-iconv --cpu=i686 (workaroud for trac.ffmpeg.org/ticket/2363)
Konstantin Matskevich [Mon, 18 Nov 2013 08:55:15 +0000 (12:55 +0400)]
fixed Split for device version equals 78712
Konstantin Matskevich [Fri, 15 Nov 2013 13:26:18 +0000 (17:26 +0400)]
fixing bugs for Intel platform CPU device
Roman Donchenko [Mon, 18 Nov 2013 08:20:58 +0000 (12:20 +0400)]
Merge pull request #1808 from alalek:ocl_fix_cvtcolor_xyz
StevenPuttemans [Wed, 30 Oct 2013 12:34:27 +0000 (13:34 +0100)]
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
Anatoly Baksheev [Sat, 16 Nov 2013 17:06:13 +0000 (21:06 +0400)]
fixed some warnings
Anatoly Baksheev [Sat, 16 Nov 2013 16:14:01 +0000 (20:14 +0400)]
compilation for VS2008
Alexander Alekhin [Fri, 15 Nov 2013 14:49:11 +0000 (18:49 +0400)]
ocl: fix cvtColor XYZ: variables on stack
Ilya Lavrenov [Fri, 15 Nov 2013 09:48:14 +0000 (13:48 +0400)]
generalized ocl::resize for all data types (INTER_NEAREST mode)
Roman Donchenko [Fri, 15 Nov 2013 12:52:55 +0000 (16:52 +0400)]
Merge pull request #1802 from SpecLad:cmake-templates
Roman Donchenko [Fri, 15 Nov 2013 11:55:29 +0000 (15:55 +0400)]
Merge pull request #1803 from ilya-lavrenov:ocl_cvtColor
Roman Donchenko [Fri, 15 Nov 2013 07:51:59 +0000 (11:51 +0400)]
Merge pull request #1799 from SpecLad:avformat-53-6
Roman Donchenko [Thu, 14 Nov 2013 15:14:38 +0000 (19:14 +0400)]
Made the generated file templates' naming more consistent.
The general convention is <output file name> + ".in".
Roman Donchenko [Thu, 14 Nov 2013 13:25:46 +0000 (17:25 +0400)]
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.
Roman Donchenko [Thu, 14 Nov 2013 12:43:50 +0000 (16:43 +0400)]
Merge pull request #1794 from vrabaud:2.4
Roman Donchenko [Thu, 14 Nov 2013 10:46:42 +0000 (14:46 +0400)]
Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor
Roman Donchenko [Thu, 14 Nov 2013 10:46:06 +0000 (14:46 +0400)]
Merge pull request #1792 from ilya-lavrenov:ocl_warp_eps
Roman Donchenko [Thu, 14 Nov 2013 10:45:50 +0000 (14:45 +0400)]
Merge pull request #1790 from ilya-lavrenov:ocl_ref
Vincent Rabaud [Thu, 14 Nov 2013 10:45:42 +0000 (11:45 +0100)]
cleaner fix
Ilya Lavrenov [Thu, 14 Nov 2013 08:02:32 +0000 (12:02 +0400)]
added RGBA <-> mRGBA
Ilya Lavrenov [Wed, 13 Nov 2013 15:35:24 +0000 (19:35 +0400)]
added HLS -> RGB[A][FULL] conversion
Ilya Lavrenov [Wed, 13 Nov 2013 15:08:37 +0000 (19:08 +0400)]
added HSV -> RGB[A][FULL] conversion
Ilya Lavrenov [Wed, 13 Nov 2013 13:41:40 +0000 (17:41 +0400)]
added RGB[A] -> HLS[FULL] conversion
Roman Donchenko [Wed, 13 Nov 2013 13:21:52 +0000 (17:21 +0400)]
Merge pull request #1788 from alalek:perf_test_skip
Vincent Rabaud [Wed, 13 Nov 2013 13:20:09 +0000 (14:20 +0100)]
return when OpenCV is found
Ilya Lavrenov [Wed, 13 Nov 2013 13:09:05 +0000 (17:09 +0400)]
added RGB[A] -> HSV[FULL] conversion
Roman Donchenko [Wed, 13 Nov 2013 13:00:20 +0000 (17:00 +0400)]
Merge pull request #1786 from SpecLad:cap-images-file-pattern
Roman Donchenko [Wed, 13 Nov 2013 11:53:42 +0000 (15:53 +0400)]
Merge pull request #1779 from perping:integral_2.4
Roman Donchenko [Wed, 13 Nov 2013 11:52:42 +0000 (15:52 +0400)]
Merge pull request #1784 from SpecLad:ffmpeg-no-png
Vincent Rabaud [Wed, 13 Nov 2013 11:25:44 +0000 (12:25 +0100)]
fixes http://code.opencv.org/issues/3367
Alexander Alekhin [Tue, 12 Nov 2013 14:59:43 +0000 (18:59 +0400)]
ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize
Alexander Alekhin [Tue, 12 Nov 2013 14:15:50 +0000 (18:15 +0400)]
perf tests: allow to skip performance tests
Ilya Lavrenov [Tue, 12 Nov 2013 12:50:42 +0000 (16:50 +0400)]
refactored some functions from ocl arithm
Ilya Lavrenov [Wed, 13 Nov 2013 09:04:02 +0000 (13:04 +0400)]
added eps to ocl::buildWarpPerspectiveMaps perf test
Roman Donchenko [Wed, 13 Nov 2013 08:20:08 +0000 (12:20 +0400)]
Merge pull request #1785 from ilya-lavrenov:ocl_kern_warn
Roman Donchenko [Wed, 13 Nov 2013 08:16:01 +0000 (12:16 +0400)]
Merge pull request #1789 from ilya-lavrenov:ocl_minMaxLoc
perping [Wed, 13 Nov 2013 02:19:09 +0000 (10:19 +0800)]
fix haar
perping [Wed, 13 Nov 2013 02:09:39 +0000 (10:09 +0800)]
fix match_template and haar
Roman Donchenko [Tue, 12 Nov 2013 15:38:59 +0000 (19:38 +0400)]
Reworked documentation building to work with extra modules.
The main problem with extra modules is that they're located outside
of the OpenCV root, while Sphinx requires that all documents are
within the documentation root. To circumvent this, we create a
"fake root" and copy all documentation (as well as all files that
it depends on) there. It's a bit messy, but what can you do.
As a bonus, this eliminates the need to generate modules/refman.rst
inside the source tree.
Ilya Lavrenov [Tue, 12 Nov 2013 15:14:40 +0000 (19:14 +0400)]
fixed compilation of ocl::minMaxLoc for Intel device
huangs [Tue, 12 Nov 2013 14:37:23 +0000 (22:37 +0800)]
minX1 should be max(-maxD,0) not max(maxD,0), avoid black band at left
Roman Donchenko [Tue, 12 Nov 2013 12:15:41 +0000 (16:15 +0400)]
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.
Ilya Lavrenov [Mon, 11 Nov 2013 16:08:40 +0000 (20:08 +0400)]
kernel warnings on AMD
Roman Donchenko [Tue, 12 Nov 2013 10:26:50 +0000 (14:26 +0400)]
Merge pull request #1775 from ilya-lavrenov:ocl_cvtColor
perping [Tue, 12 Nov 2013 10:13:44 +0000 (18:13 +0800)]
fix linux warning.
perping [Tue, 12 Nov 2013 09:54:03 +0000 (17:54 +0800)]
fix haar
Roman Donchenko [Tue, 12 Nov 2013 08:53:33 +0000 (12:53 +0400)]
Merge pull request #1782 from ilya-lavrenov:ocl_adapBilat
Roman Donchenko [Tue, 12 Nov 2013 08:40:13 +0000 (12:40 +0400)]
Merge pull request #1766 from ilya-lavrenov:ocl_remap_linear
Roman Donchenko [Tue, 12 Nov 2013 08:26:37 +0000 (12:26 +0400)]
Merge pull request #1773 from ilya-lavrenov:ocl_buildWarpPerspectiveMaps
Roman Donchenko [Tue, 12 Nov 2013 07:52:49 +0000 (11:52 +0400)]
Merge pull request #1783 from SpecLad:cap-no-pattern
perping [Tue, 12 Nov 2013 05:56:47 +0000 (13:56 +0800)]
fix some bug about haar and match_template.
Ilya Lavrenov [Mon, 11 Nov 2013 12:30:23 +0000 (16:30 +0400)]
added RGB5x5 <-> Gray
Philippe FOUBERT [Mon, 11 Nov 2013 19:40:18 +0000 (20:40 +0100)]
Using four spaces for indentation.
Roman Donchenko [Mon, 11 Nov 2013 14:30:04 +0000 (18:30 +0400)]
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.
Ilya Lavrenov [Mon, 11 Nov 2013 13:53:21 +0000 (17:53 +0400)]
removed 2000x2000, 4000x4000 from test sizes of ocl::adaptiveBilateralFilter
Roman Donchenko [Mon, 11 Nov 2013 14:02:56 +0000 (18:02 +0400)]
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.
Ilya Lavrenov [Fri, 8 Nov 2013 14:43:15 +0000 (18:43 +0400)]
added a performance test for ocl::buildWarpPerspectiveMaps; moved warps to a separate file
Roman Donchenko [Mon, 11 Nov 2013 13:00:31 +0000 (17:00 +0400)]
Merge pull request #1780 from ilya-lavrenov:ocl_m_pi