platform/upstream/opencv.git
10 years agofixed CUDA_TOOLKIT_TARGET_DIR for android:
Vladislav Vinogradov [Thu, 28 Nov 2013 09:35:23 +0000 (13:35 +0400)]
fixed CUDA_TOOLKIT_TARGET_DIR for android:

use targets/armv7-linux-androideabi is exists

10 years agoadded `-Xptxas;-dlcm=ca` and `-target-os-variant=Android` to nvcc flags
Vladislav Vinogradov [Wed, 30 Oct 2013 06:21:55 +0000 (10:21 +0400)]
added `-Xptxas;-dlcm=ca` and `-target-os-variant=Android` to nvcc flags

10 years agofixed compilation warnings in .cu files
Vladislav Vinogradov [Wed, 30 Oct 2013 06:21:30 +0000 (10:21 +0400)]
fixed compilation warnings in .cu files

10 years agofixed CC arch/pts for android (used sm_32)
Vladislav Vinogradov [Wed, 30 Oct 2013 06:21:13 +0000 (10:21 +0400)]
fixed CC arch/pts for android (used sm_32)

10 years agoenable CUDA support for android
Vladislav Vinogradov [Wed, 30 Oct 2013 06:20:45 +0000 (10:20 +0400)]
enable CUDA support for android

10 years agoMerge pull request #1858 from StevenPuttemans:updates_traincascade
Roman Donchenko [Wed, 27 Nov 2013 13:37:36 +0000 (17:37 +0400)]
Merge pull request #1858 from StevenPuttemans:updates_traincascade

10 years agoMerge pull request #1877 from tim36272:patch-2
Roman Donchenko [Wed, 27 Nov 2013 13:35:52 +0000 (17:35 +0400)]
Merge pull request #1877 from tim36272:patch-2

10 years agoFixed minor documentation typo
tim36272 [Wed, 27 Nov 2013 12:09:40 +0000 (04:09 -0800)]
Fixed minor documentation typo

In section "How do we get an Affine Transformation" subsection 2 there was a ' where there should have been a ` which caused the math to be rendered incorrectly.

10 years agoAdded extras to traincascade functionality
StevenPuttemans [Thu, 21 Nov 2013 13:07:53 +0000 (14:07 +0100)]
Added extras to traincascade functionality

10 years agoMerge pull request #1849 from StevenPuttemans:feature_3375_documentation
Roman Donchenko [Wed, 27 Nov 2013 09:22:31 +0000 (13:22 +0400)]
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation

10 years agoMerge pull request #1875 from asmorkalov:android_bin_compat_fix
Andrey Pavlenko [Tue, 26 Nov 2013 19:17:28 +0000 (23:17 +0400)]
Merge pull request #1875 from asmorkalov:android_bin_compat_fix

10 years agoBuild error fix for binary-complience-checker tool.
Alexander Smorkalov [Tue, 26 Nov 2013 13:39:40 +0000 (17:39 +0400)]
Build error fix for binary-complience-checker tool.

10 years agoMerge pull request #1856 from alalek:ocl_fix_mt
Andrey Pavlenko [Tue, 26 Nov 2013 05:58:21 +0000 (09:58 +0400)]
Merge pull request #1856 from alalek:ocl_fix_mt

10 years agoApplied feature #3375 and fix of pull 1842 to avoid merging problems later
StevenPuttemans [Thu, 21 Nov 2013 15:45:48 +0000 (16:45 +0100)]
Applied feature #3375 and fix of pull 1842 to avoid merging problems later

10 years agoMerge pull request #1842 from StevenPuttemans:bugfix_3315
Roman Donchenko [Mon, 25 Nov 2013 08:38:56 +0000 (12:38 +0400)]
Merge pull request #1842 from StevenPuttemans:bugfix_3315

10 years agoMerge pull request #1822 from SpecLad:msvc12
Roman Donchenko [Mon, 25 Nov 2013 08:19:58 +0000 (12:19 +0400)]
Merge pull request #1822 from SpecLad:msvc12

10 years agoMerge pull request #1837 from asmorkalov:android_opencl
Roman Donchenko [Mon, 25 Nov 2013 08:19:20 +0000 (12:19 +0400)]
Merge pull request #1837 from asmorkalov:android_opencl

10 years agoMerge pull request #1839 from pmiecielica:memory_leaks
Roman Donchenko [Mon, 25 Nov 2013 08:17:07 +0000 (12:17 +0400)]
Merge pull request #1839 from pmiecielica:memory_leaks

10 years agoMerge pull request #1860 from alalek:ocl_fix_undef_warn
Roman Donchenko [Mon, 25 Nov 2013 08:00:25 +0000 (12:00 +0400)]
Merge pull request #1860 from alalek:ocl_fix_undef_warn

10 years agoMerge pull request #1853 from StevenPuttemans:bugfix_3346
Roman Donchenko [Fri, 22 Nov 2013 14:26:16 +0000 (18:26 +0400)]
Merge pull request #1853 from StevenPuttemans:bugfix_3346

10 years agoocl: don't disable Undef warnings
Alexander Alekhin [Fri, 22 Nov 2013 14:24:50 +0000 (18:24 +0400)]
ocl: don't disable Undef warnings

10 years agoocl: fix cl_platform.h:95: #elif _WIN32 -> #elif defined(_WIN32)
Alexander Alekhin [Thu, 21 Nov 2013 08:35:37 +0000 (12:35 +0400)]
ocl: fix cl_platform.h:95: #elif _WIN32 -> #elif defined(_WIN32)

10 years agoMerge pull request #1854 from asmorkalov:android_engine_tegra4i5
Roman Donchenko [Fri, 22 Nov 2013 14:15:48 +0000 (18:15 +0400)]
Merge pull request #1854 from asmorkalov:android_engine_tegra4i5

10 years agoAdded pointer initialization
Piotr Miecielica [Fri, 22 Nov 2013 12:33:33 +0000 (13:33 +0100)]
Added pointer initialization

10 years agoSome hacks to build and run OpenCL on Qualcomm S800.
Alexander Smorkalov [Thu, 19 Sep 2013 07:49:49 +0000 (11:49 +0400)]
Some hacks to build and run OpenCL on Qualcomm S800.

Some of functions were enabled on Qualcomm S800 by changing grid size;
OpenCL kernel grid size unification for different platfroms;
Test pass rate improvements by inclreasing threshold;
Some tests were disabled for Android;
run.py was adopted for devices with brackets in in name.

10 years agoocl: multi-threading: opencl buffer memory guard
Alexander Alekhin [Fri, 22 Nov 2013 10:38:12 +0000 (14:38 +0400)]
ocl: multi-threading: opencl buffer memory guard

10 years agoocl: multi-threading: fix bug in intialization
Alexander Alekhin [Fri, 22 Nov 2013 10:31:54 +0000 (14:31 +0400)]
ocl: multi-threading: fix bug in intialization

10 years agoVFPv4 detection implemented. Some Tegra5 related updates.
Alexander Smorkalov [Fri, 22 Nov 2013 09:59:36 +0000 (13:59 +0400)]
VFPv4 detection implemented. Some Tegra5 related updates.

10 years agoWrong example at the visual studio tutorial. Fixed link, fixed sample
StevenPuttemans [Thu, 21 Nov 2013 12:32:21 +0000 (13:32 +0100)]
Wrong example at the visual studio tutorial. Fixed link, fixed sample
content and renamed to a more sensible name. Also fixed a wrong link in the
actual display_image tutorial.

10 years agoFixed bug in report #3346
StevenPuttemans [Fri, 22 Nov 2013 08:57:47 +0000 (09:57 +0100)]
Fixed bug in report #3346

10 years agoPackage selection for Tegra 4i fixed. Initial Tegra5 support added.
Alexander Smorkalov [Fri, 22 Nov 2013 07:12:51 +0000 (11:12 +0400)]
Package selection for Tegra 4i fixed. Initial Tegra5 support added.

10 years agoFixes of some memory leaks
Piotr Miecielica [Tue, 19 Nov 2013 16:35:27 +0000 (17:35 +0100)]
Fixes of some memory leaks

10 years agoMerge pull request #1840 from ilya-lavrenov:ocl_cvtColor
Andrey Pavlenko [Thu, 21 Nov 2013 13:32:53 +0000 (17:32 +0400)]
Merge pull request #1840 from ilya-lavrenov:ocl_cvtColor

10 years agoMerge pull request #1838 from alekcac:ios64_fix
Roman Donchenko [Thu, 21 Nov 2013 13:11:29 +0000 (17:11 +0400)]
Merge pull request #1838 from alekcac:ios64_fix

10 years agoadded extra parameters to ocl::cvtColor performance test
Ilya Lavrenov [Thu, 21 Nov 2013 08:53:21 +0000 (12:53 +0400)]
added extra parameters to ocl::cvtColor performance test

10 years agoMerge pull request #1795 from alalek:perf_report_progress
Roman Donchenko [Thu, 21 Nov 2013 08:31:36 +0000 (12:31 +0400)]
Merge pull request #1795 from alalek:perf_report_progress

10 years agoMerge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea
Roman Donchenko [Thu, 21 Nov 2013 08:03:01 +0000 (12:03 +0400)]
Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea

10 years agoMerge pull request #1834 from SpecLad:svm-copy-ctor
Roman Donchenko [Thu, 21 Nov 2013 07:55:20 +0000 (11:55 +0400)]
Merge pull request #1834 from SpecLad:svm-copy-ctor

10 years agoperf report: summary.py: added --progress mode
Alexander Alekhin [Wed, 20 Nov 2013 15:57:20 +0000 (19:57 +0400)]
perf report: summary.py: added --progress mode

10 years agoMerge pull request #1836 from ilya-lavrenov:ocl_norm_workaround
Roman Donchenko [Wed, 20 Nov 2013 14:19:07 +0000 (18:19 +0400)]
Merge pull request #1836 from ilya-lavrenov:ocl_norm_workaround

10 years agofix for supporting 64-bit architecture
Alexander Shishkov [Wed, 20 Nov 2013 14:08:05 +0000 (18:08 +0400)]
fix for supporting 64-bit architecture

10 years agoMerge pull request #1833 from SpecLad:fix-qt-sample
Roman Donchenko [Wed, 20 Nov 2013 13:59:35 +0000 (17:59 +0400)]
Merge pull request #1833 from SpecLad:fix-qt-sample

10 years agoMerge pull request #1829 from SpecLad:config-components-libs
Roman Donchenko [Wed, 20 Nov 2013 11:57:14 +0000 (15:57 +0400)]
Merge pull request #1829 from SpecLad:config-components-libs

10 years agoworkaround for AMD bug: UNREACHABLE EXECUTED
Ilya Lavrenov [Wed, 20 Nov 2013 11:40:56 +0000 (15:40 +0400)]
workaround for AMD bug: UNREACHABLE EXECUTED

10 years agoGave CvSVM a private copy constructor & assignment operator.
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>.

10 years agoFix the Qt sample, broken after #1722.
Roman Donchenko [Wed, 20 Nov 2013 10:57:21 +0000 (14:57 +0400)]
Fix the Qt sample, broken after #1722.

10 years agoMerge pull request #1761 from bhuroc:qtkit-video-file-2.4
Roman Donchenko [Wed, 20 Nov 2013 09:36:37 +0000 (13:36 +0400)]
Merge pull request #1761 from bhuroc:qtkit-video-file-2.4

10 years agoBack to the previous coding way (using the macro with the goto).
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).

10 years agoFixed OpenCV_LIBS when find_package has been used with explicit components.
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/>.

10 years agoMerge pull request #1819 from ilya-lavrenov:ocl_resize_AREA
Roman Donchenko [Tue, 19 Nov 2013 12:25:46 +0000 (16:25 +0400)]
Merge pull request #1819 from ilya-lavrenov:ocl_resize_AREA

10 years agoMerge pull request #1827 from asmorkalov:android_ndk_r9b
Roman Donchenko [Tue, 19 Nov 2013 10:53:16 +0000 (14:53 +0400)]
Merge pull request #1827 from asmorkalov:android_ndk_r9b

10 years agoMerge pull request #1793 from SpecLad:external-docs-1
Roman Donchenko [Tue, 19 Nov 2013 10:21:48 +0000 (14:21 +0400)]
Merge pull request #1793 from SpecLad:external-docs-1

10 years agoMerge pull request #1787 from hs3180:2.4
Roman Donchenko [Tue, 19 Nov 2013 10:21:25 +0000 (14:21 +0400)]
Merge pull request #1787 from hs3180:2.4

10 years agoadded area fast mode to ocl::resize
Ilya Lavrenov [Mon, 18 Nov 2013 14:46:59 +0000 (18:46 +0400)]
added area fast mode to ocl::resize

10 years agoMerge pull request #1820 from asmorkalov:android_native_camera_44
Roman Donchenko [Tue, 19 Nov 2013 08:47:47 +0000 (12:47 +0400)]
Merge pull request #1820 from asmorkalov:android_native_camera_44

10 years agoMerge pull request #1823 from ilya-lavrenov:ocl_abs_sum
Roman Donchenko [Tue, 19 Nov 2013 08:34:09 +0000 (12:34 +0400)]
Merge pull request #1823 from ilya-lavrenov:ocl_abs_sum

10 years agoMerge pull request #1825 from jet47:fix-opengl-mem-leak
Roman Donchenko [Tue, 19 Nov 2013 08:31:53 +0000 (12:31 +0400)]
Merge pull request #1825 from jet47:fix-opengl-mem-leak

10 years agoMerge pull request #1821 from SpecLad:watch-your-slashes
Roman Donchenko [Tue, 19 Nov 2013 08:29:55 +0000 (12:29 +0400)]
Merge pull request #1821 from SpecLad:watch-your-slashes

10 years agoAndroid NDK r9b support added.
Alexander Smorkalov [Tue, 19 Nov 2013 07:46:29 +0000 (11:46 +0400)]
Android NDK r9b support added.

10 years agofixed memory leak in ogl::Texture2D
Vladislav Vinogradov [Tue, 19 Nov 2013 06:12:22 +0000 (10:12 +0400)]
fixed memory leak in ogl::Texture2D

10 years agoworkaround for ocl::absSum (eliminated error: unreachable executed)
Ilya Lavrenov [Mon, 18 Nov 2013 14:50:40 +0000 (18:50 +0400)]
workaround for ocl::absSum (eliminated error: unreachable executed)

10 years agoMerge pull request #1815 from asmorkalov:android_native_camera_build_automation
Roman Donchenko [Mon, 18 Nov 2013 15:44:32 +0000 (19:44 +0400)]
Merge pull request #1815 from asmorkalov:android_native_camera_build_automation

10 years agoAdded Visual Studio 2013 detection.
Roman Donchenko [Mon, 18 Nov 2013 15:39:39 +0000 (19:39 +0400)]
Added Visual Studio 2013 detection.

10 years agoRemoved all slashes after ${OpenCV_INSTALL_BINARIES_PREFIX}.
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>.

10 years agoadded INTER_AREA interpolation to ocl::resize
Ilya Lavrenov [Mon, 18 Nov 2013 12:33:54 +0000 (16:33 +0400)]
added INTER_AREA interpolation to ocl::resize

10 years agoPrebuilt libnative_camera_xxx updated.
Alexander Smorkalov [Mon, 18 Nov 2013 14:19:38 +0000 (18:19 +0400)]
Prebuilt libnative_camera_xxx updated.

10 years agoInitial NativeCamera support for Android 4.4 KitKat.
Alexander Smorkalov [Sun, 17 Nov 2013 07:42:13 +0000 (11:42 +0400)]
Initial NativeCamera support for Android 4.4 KitKat.

10 years agoMerge pull request #1810 from Nerei:2.4
Roman Donchenko [Mon, 18 Nov 2013 13:49:40 +0000 (17:49 +0400)]
Merge pull request #1810 from Nerei:2.4

10 years agoNativeCamera build with AndroidStub backported from OpenCV master.
Alexander Smorkalov [Mon, 18 Nov 2013 05:30:12 +0000 (09:30 +0400)]
NativeCamera build with AndroidStub backported from OpenCV 

10 years agoMerge pull request #1806 from akarsakov:ffmpeg_without_iconv
Roman Donchenko [Mon, 18 Nov 2013 13:26:38 +0000 (17:26 +0400)]
Merge pull request #1806 from akarsakov:ffmpeg_without_iconv

10 years agoMerge pull request #1722 from StevenPuttemans:feature_1631_second
Roman Donchenko [Mon, 18 Nov 2013 11:48:27 +0000 (15:48 +0400)]
Merge pull request #1722 from StevenPuttemans:feature_1631_second

10 years agoMerge pull request #1807 from KonstantinMatskevich:intel_bug
Roman Donchenko [Mon, 18 Nov 2013 11:16:36 +0000 (15:16 +0400)]
Merge pull request #1807 from KonstantinMatskevich:intel_bug

10 years agoMerge pull request #1809 from ilya-lavrenov:ocl_resize_nn
Roman Donchenko [Mon, 18 Nov 2013 10:55:24 +0000 (14:55 +0400)]
Merge pull request #1809 from ilya-lavrenov:ocl_resize_nn

10 years agoFFmpeg 2.0.2 32-bit builded with mingw (4.6.1) with following additional options...
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)

10 years agofixed Split for device version equals 78712
Konstantin Matskevich [Mon, 18 Nov 2013 08:55:15 +0000 (12:55 +0400)]
fixed Split for device version equals 78712

10 years agofixing bugs for Intel platform CPU device
Konstantin Matskevich [Fri, 15 Nov 2013 13:26:18 +0000 (17:26 +0400)]
fixing bugs for Intel platform CPU device

10 years agoMerge pull request #1808 from alalek:ocl_fix_cvtcolor_xyz
Roman Donchenko [Mon, 18 Nov 2013 08:20:58 +0000 (12:20 +0400)]
Merge pull request #1808 from alalek:ocl_fix_cvtcolor_xyz

10 years agoApplied all fixes related to translating C to C++ code
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

10 years agofixed some warnings
Anatoly Baksheev [Sat, 16 Nov 2013 17:06:13 +0000 (21:06 +0400)]
fixed some warnings

10 years agocompilation for VS2008
Anatoly Baksheev [Sat, 16 Nov 2013 16:14:01 +0000 (20:14 +0400)]
compilation for VS2008

10 years agoocl: fix cvtColor XYZ: variables on stack
Alexander Alekhin [Fri, 15 Nov 2013 14:49:11 +0000 (18:49 +0400)]
ocl: fix cvtColor XYZ: variables on stack

10 years agogeneralized ocl::resize for all data types (INTER_NEAREST mode)
Ilya Lavrenov [Fri, 15 Nov 2013 09:48:14 +0000 (13:48 +0400)]
generalized ocl::resize for all data types (INTER_NEAREST mode)

10 years agoMerge pull request #1802 from SpecLad:cmake-templates
Roman Donchenko [Fri, 15 Nov 2013 12:52:55 +0000 (16:52 +0400)]
Merge pull request #1802 from SpecLad:cmake-templates

10 years agoMerge pull request #1803 from ilya-lavrenov:ocl_cvtColor
Roman Donchenko [Fri, 15 Nov 2013 11:55:29 +0000 (15:55 +0400)]
Merge pull request #1803 from ilya-lavrenov:ocl_cvtColor

10 years agoMerge pull request #1799 from SpecLad:avformat-53-6
Roman Donchenko [Fri, 15 Nov 2013 07:51:59 +0000 (11:51 +0400)]
Merge pull request #1799 from SpecLad:avformat-53-6

10 years agoMade the generated file templates' naming more consistent.
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".

10 years agoFix building with FFmpeg 0.8.
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.

10 years agoMerge pull request #1794 from vrabaud:2.4
Roman Donchenko [Thu, 14 Nov 2013 12:43:50 +0000 (16:43 +0400)]
Merge pull request #1794 from vrabaud:2.4

10 years agoMerge pull request #1796 from ilya-lavrenov:ocl_cvtColor
Roman Donchenko [Thu, 14 Nov 2013 10:46:42 +0000 (14:46 +0400)]
Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor

10 years agoMerge pull request #1792 from ilya-lavrenov:ocl_warp_eps
Roman Donchenko [Thu, 14 Nov 2013 10:46:06 +0000 (14:46 +0400)]
Merge pull request #1792 from ilya-lavrenov:ocl_warp_eps

10 years agoMerge pull request #1790 from ilya-lavrenov:ocl_ref
Roman Donchenko [Thu, 14 Nov 2013 10:45:50 +0000 (14:45 +0400)]
Merge pull request #1790 from ilya-lavrenov:ocl_ref

10 years agocleaner fix
Vincent Rabaud [Thu, 14 Nov 2013 10:45:42 +0000 (11:45 +0100)]
cleaner fix

10 years agoadded RGBA <-> mRGBA
Ilya Lavrenov [Thu, 14 Nov 2013 08:02:32 +0000 (12:02 +0400)]
added RGBA <-> mRGBA

10 years agoadded HLS -> RGB[A][FULL] conversion
Ilya Lavrenov [Wed, 13 Nov 2013 15:35:24 +0000 (19:35 +0400)]
added HLS -> RGB[A][FULL] conversion

10 years agoadded HSV -> RGB[A][FULL] conversion
Ilya Lavrenov [Wed, 13 Nov 2013 15:08:37 +0000 (19:08 +0400)]
added HSV -> RGB[A][FULL] conversion

10 years agoadded RGB[A] -> HLS[FULL] conversion
Ilya Lavrenov [Wed, 13 Nov 2013 13:41:40 +0000 (17:41 +0400)]
added RGB[A] -> HLS[FULL] conversion

10 years agoMerge pull request #1788 from alalek:perf_test_skip
Roman Donchenko [Wed, 13 Nov 2013 13:21:52 +0000 (17:21 +0400)]
Merge pull request #1788 from alalek:perf_test_skip

10 years agoreturn when OpenCV is found
Vincent Rabaud [Wed, 13 Nov 2013 13:20:09 +0000 (14:20 +0100)]
return when OpenCV is found

10 years agoadded RGB[A] -> HSV[FULL] conversion
Ilya Lavrenov [Wed, 13 Nov 2013 13:09:05 +0000 (17:09 +0400)]
added RGB[A] -> HSV[FULL] conversion

10 years agoMerge pull request #1786 from SpecLad:cap-images-file-pattern
Roman Donchenko [Wed, 13 Nov 2013 13:00:20 +0000 (17:00 +0400)]
Merge pull request #1786 from SpecLad:cap-images-file-pattern