Andrey Pavlenko [Tue, 3 Dec 2013 07:20:48 +0000 (11:20 +0400)]
Merge pull request #1906 from asmorkalov:android_ocl_warn_fix
Andrey Pavlenko [Mon, 2 Dec 2013 16:38:48 +0000 (20:38 +0400)]
Merge pull request #1744 from liuxing6666:2.4_fix_harris_test
Andrey Pavlenko [Mon, 2 Dec 2013 16:07:46 +0000 (20:07 +0400)]
Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix
Roman Donchenko [Mon, 2 Dec 2013 14:53:26 +0000 (18:53 +0400)]
Merge pull request #1887 from jet47:android-cuda-6.0
Roman Donchenko [Mon, 2 Dec 2013 13:53:33 +0000 (17:53 +0400)]
Merge pull request #1797 from moodoki:bugfix_3344
Alexander Smorkalov [Mon, 2 Dec 2013 13:48:27 +0000 (17:48 +0400)]
Warning fixes and suppression in ocl module for gcc 4.6 from Android NDK.
Roman Donchenko [Mon, 2 Dec 2013 13:11:55 +0000 (17:11 +0400)]
Merge pull request #1897 from berak:b_3393_24
Roman Donchenko [Mon, 2 Dec 2013 10:14:41 +0000 (14:14 +0400)]
Merge pull request #1898 from berak:b_3349_24
Roman Donchenko [Mon, 2 Dec 2013 08:27:50 +0000 (12:27 +0400)]
Merge pull request #1884 from asmorkalov:winrt_img_proc_sample
Roman Donchenko [Mon, 2 Dec 2013 08:17:29 +0000 (12:17 +0400)]
Merge pull request #1894 from asmorkalov:ocv_debug_build
berak [Sat, 30 Nov 2013 12:09:42 +0000 (13:09 +0100)]
corrected initialization of output_folder in facereco examples
berak [Sat, 30 Nov 2013 11:00:22 +0000 (12:00 +0100)]
swapped x,y in elbp_
Andrey Pavlenko [Fri, 29 Nov 2013 19:08:20 +0000 (23:08 +0400)]
Merge pull request #1845 from StevenPuttemans:bugfix_3306
Alexander Smorkalov [Fri, 29 Nov 2013 11:34:50 +0000 (15:34 +0400)]
Some debug options are removed because they are installed by Cmake automatically.
Also forcing -ggdb3 on android leads to debuging issues.
Roman Donchenko [Fri, 29 Nov 2013 11:10:12 +0000 (15:10 +0400)]
Merge pull request #1892 from asmorkalov:android_native_camera_close_fix
Vladislav Vinogradov [Fri, 29 Nov 2013 10:53:33 +0000 (14:53 +0400)]
fixed compilation of gpu-basics-similarity tutorial:
initialize TIMES variable with some default value (10)
Alexander Smorkalov [Fri, 29 Nov 2013 06:38:26 +0000 (10:38 +0400)]
Android native camera destruction fixed for Android 4.4.
Alexander Smorkalov [Mon, 30 Sep 2013 04:22:18 +0000 (08:22 +0400)]
Filter selection and several filters implemented for WinRT sample.
Roman Donchenko [Thu, 28 Nov 2013 10:11:39 +0000 (14:11 +0400)]
Merge pull request #1885 from jet47:gpu-bgfg-test-fix
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
Roman Donchenko [Thu, 28 Nov 2013 08:24:44 +0000 (12:24 +0400)]
Merge pull request #1879 from LeszekSwirski:traincascade-2.4
Roman Donchenko [Thu, 28 Nov 2013 08:11:24 +0000 (12:11 +0400)]
Merge pull request #1873 from abak:hough_24
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
Vladislav Vinogradov [Wed, 30 Oct 2013 06:21:30 +0000 (10:21 +0400)]
fixed compilation warnings in .cu files
Vladislav Vinogradov [Wed, 30 Oct 2013 06:21:13 +0000 (10:21 +0400)]
fixed CC arch/pts for android (used sm_32)
Vladislav Vinogradov [Wed, 30 Oct 2013 06:20:45 +0000 (10:20 +0400)]
enable CUDA support for android
Alexander Smorkalov [Thu, 29 Aug 2013 10:42:30 +0000 (03:42 -0700)]
Image processing sample for WinRT added.
Vladislav Vinogradov [Wed, 27 Nov 2013 13:36:58 +0000 (17:36 +0400)]
disabled MOG2 performance test (sanity check fails on CUDA 6.0)
Vladislav Vinogradov [Wed, 27 Nov 2013 13:32:00 +0000 (17:32 +0400)]
fixed perf tests for bgfg segmentation
Adrien BAK [Thu, 28 Nov 2013 03:09:17 +0000 (12:09 +0900)]
fix exception being thrown when no arguments are passed
Adrien BAK [Thu, 28 Nov 2013 02:42:44 +0000 (11:42 +0900)]
build fix
Anatoly Baksheev [Sat, 16 Nov 2013 15:56:08 +0000 (19:56 +0400)]
Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h'
Conflicts:
apps/traincascade/boost.cpp
Andrey Kamaev [Sun, 24 Feb 2013 16:14:01 +0000 (20:14 +0400)]
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
(cherry picked from commit
2a6fb2867e2fc639e0675eed8abb1688de4539ec)
(only cherry picked "apps/trancascade")
Roman Donchenko [Wed, 27 Nov 2013 13:37:36 +0000 (17:37 +0400)]
Merge pull request #1858 from StevenPuttemans:updates_traincascade
Roman Donchenko [Wed, 27 Nov 2013 13:35:52 +0000 (17:35 +0400)]
Merge pull request #1877 from tim36272:patch-2
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.
StevenPuttemans [Thu, 21 Nov 2013 13:07:53 +0000 (14:07 +0100)]
Added extras to traincascade functionality
Roman Donchenko [Wed, 27 Nov 2013 09:22:31 +0000 (13:22 +0400)]
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation
Andrey Pavlenko [Tue, 26 Nov 2013 19:17:28 +0000 (23:17 +0400)]
Merge pull request #1875 from asmorkalov:android_bin_compat_fix
Alexander Smorkalov [Tue, 26 Nov 2013 13:39:40 +0000 (17:39 +0400)]
Build error fix for binary-complience-checker tool.
Adrien BAK [Wed, 13 Nov 2013 07:21:09 +0000 (16:21 +0900)]
fix indent
Adrien BAK [Wed, 13 Nov 2013 07:13:47 +0000 (16:13 +0900)]
fix typos
Adrien BAK [Mon, 11 Nov 2013 05:55:12 +0000 (14:55 +0900)]
improved error handling
Adrien BAK [Mon, 11 Nov 2013 05:47:54 +0000 (14:47 +0900)]
modified HoughCircleDemo to introduce variable params via trackbars
Conflicts:
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
Andrey Pavlenko [Tue, 26 Nov 2013 05:58:21 +0000 (09:58 +0400)]
Merge pull request #1856 from alalek:ocl_fix_mt
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
Roman Donchenko [Mon, 25 Nov 2013 08:38:56 +0000 (12:38 +0400)]
Merge pull request #1842 from StevenPuttemans:bugfix_3315
StevenPuttemans [Thu, 21 Nov 2013 14:03:49 +0000 (15:03 +0100)]
Added fixes mentioned in bugreport 3306
- Added author provided fixes
- Added code example
- Added documentation fixes
Roman Donchenko [Mon, 25 Nov 2013 08:19:58 +0000 (12:19 +0400)]
Merge pull request #1822 from SpecLad:msvc12
Roman Donchenko [Mon, 25 Nov 2013 08:19:20 +0000 (12:19 +0400)]
Merge pull request #1837 from asmorkalov:android_opencl
Roman Donchenko [Mon, 25 Nov 2013 08:17:07 +0000 (12:17 +0400)]
Merge pull request #1839 from pmiecielica:memory_leaks
Roman Donchenko [Mon, 25 Nov 2013 08:00:25 +0000 (12:00 +0400)]
Merge pull request #1860 from alalek:ocl_fix_undef_warn
Roman Donchenko [Fri, 22 Nov 2013 14:26:16 +0000 (18:26 +0400)]
Merge pull request #1853 from StevenPuttemans:bugfix_3346
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)
Roman Donchenko [Fri, 22 Nov 2013 14:15:48 +0000 (18:15 +0400)]
Merge pull request #1854 from asmorkalov:android_engine_tegra4i5
Piotr Miecielica [Fri, 22 Nov 2013 12:33:33 +0000 (13:33 +0100)]
Added pointer initialization
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.
Alexander Alekhin [Fri, 22 Nov 2013 10:38:12 +0000 (14:38 +0400)]
ocl: multi-threading: opencl buffer memory guard
Alexander Alekhin [Fri, 22 Nov 2013 10:31:54 +0000 (14:31 +0400)]
ocl: multi-threading: fix bug in intialization
Alexander Smorkalov [Fri, 22 Nov 2013 09:59:36 +0000 (13:59 +0400)]
VFPv4 detection implemented. Some Tegra5 related updates.
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.
StevenPuttemans [Fri, 22 Nov 2013 08:57:47 +0000 (09:57 +0100)]
Fixed bug in report #3346
Alexander Smorkalov [Fri, 22 Nov 2013 07:12:51 +0000 (11:12 +0400)]
Package selection for Tegra 4i fixed. Initial Tegra5 support added.
Piotr Miecielica [Tue, 19 Nov 2013 16:35:27 +0000 (17:35 +0100)]
Fixes of some memory leaks
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:39:39 +0000 (19:39 +0400)]
Added Visual Studio 2013 detection.
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.