Ilya Lavrenov [Sun, 2 Mar 2014 12:08:37 +0000 (16:08 +0400)]
ability to merge logs with intersections only
Ilya Lavrenov [Wed, 12 Feb 2014 20:17:15 +0000 (00:17 +0400)]
enabled OpenGL on MacOSX
Roman Donchenko [Wed, 12 Feb 2014 12:27:24 +0000 (16:27 +0400)]
Merge pull request #2320 from asmorkalov:ocv_readme_license_install
Roman Donchenko [Wed, 12 Feb 2014 11:41:28 +0000 (15:41 +0400)]
Merge pull request #2321 from asmorkalov:android_run_all_tests
Alexander Smorkalov [Wed, 12 Feb 2014 06:56:57 +0000 (10:56 +0400)]
opencv_run_all_tests.sh implemented for Android SDK.
Alexander Smorkalov [Wed, 12 Feb 2014 06:29:53 +0000 (10:29 +0400)]
LICENSE and README files installation rules added.
Roman Donchenko [Tue, 11 Feb 2014 13:06:38 +0000 (17:06 +0400)]
Merge pull request #2314 from ilya-lavrenov:typo
Ilya Lavrenov [Tue, 11 Feb 2014 10:25:37 +0000 (14:25 +0400)]
typo
Roman Donchenko [Mon, 10 Feb 2014 11:10:30 +0000 (15:10 +0400)]
Merge pull request #2308 from jet47:gpu-tests-timeout
Roman Donchenko [Mon, 10 Feb 2014 10:59:04 +0000 (14:59 +0400)]
Merge pull request #2309 from Nerei:fixed_cl_exe_hang_with_eigen
Anatoly Baksheev [Mon, 10 Feb 2014 09:41:27 +0000 (13:41 +0400)]
Fixed Cl.exe hang for VS2008 x64 with Eigen::exp() function
Vladislav Vinogradov [Mon, 10 Feb 2014 07:50:14 +0000 (11:50 +0400)]
decrease input size for several gpu tests to fix "timed out" error:
* BruteForceNonLocalMeans
* OpticalFlowBM
Roman Donchenko [Fri, 7 Feb 2014 15:03:14 +0000 (19:03 +0400)]
Merge pull request #2303 from jet47:gpu-canny-fix
Roman Donchenko [Fri, 7 Feb 2014 12:54:49 +0000 (16:54 +0400)]
Merge pull request #2294 from jet47:fix-gpu-issues
Vladislav Vinogradov [Fri, 7 Feb 2014 12:04:29 +0000 (16:04 +0400)]
fixed several bugs in CUDA Canny implementation:
* out of border access in edgesHysteresisLocalKernel
* incorrect usage of atomicAdd
Roman Donchenko [Fri, 7 Feb 2014 11:34:45 +0000 (15:34 +0400)]
Merge pull request #2301 from jet47:fix-nonfree-build
Roman Donchenko [Fri, 7 Feb 2014 11:33:59 +0000 (15:33 +0400)]
Merge pull request #2297 from asmorkalov:ocv_testdata_install_perms_fix
Vladislav Vinogradov [Fri, 7 Feb 2014 10:55:06 +0000 (14:55 +0400)]
Revert "disable gpu Canny and HoughCircles perf tests:"
This reverts commit
dbce90692acd84fbf46bde4da4b1726049f42857.
Alexander Smorkalov [Thu, 6 Feb 2014 19:36:23 +0000 (23:36 +0400)]
Implicit testdata directory permissions setup added.
Roman Donchenko [Fri, 7 Feb 2014 10:39:08 +0000 (14:39 +0400)]
Merge pull request #2300 from asmorkalov:android_no_cuda_not_armeabiv7a
Vladislav Vinogradov [Fri, 7 Feb 2014 09:40:37 +0000 (13:40 +0400)]
fix nonfree module compilation without CUDA
Alexander Smorkalov [Fri, 7 Feb 2014 08:46:24 +0000 (12:46 +0400)]
dynamicuda module disabled in OpenCv.mk for all arches except armeabi-v7a.
Vladislav Vinogradov [Thu, 6 Feb 2014 12:58:40 +0000 (16:58 +0400)]
Revert "disable CUDA generalized Hough Transform"
This reverts commit
33d42b740c6fe938b63a0b25c9ad51741aba48c3.
Vladislav Vinogradov [Thu, 6 Feb 2014 08:41:19 +0000 (12:41 +0400)]
fix epsilons for several gpu tests
Vladislav Vinogradov [Thu, 6 Feb 2014 06:12:20 +0000 (10:12 +0400)]
Revert "disable gpu CvtColor.*2HSV tests:"
This reverts commit
952027a8536215a5e4308c79a59308c6b3426354.
Vladislav Vinogradov [Wed, 5 Feb 2014 11:59:13 +0000 (15:59 +0400)]
Revert "disable gpu Subtract_Array test:"
This reverts commit
e91bf95d5832e87aa70240c50f0bf7fcc587e8c8.
Roman Donchenko [Thu, 6 Feb 2014 12:45:48 +0000 (16:45 +0400)]
Merge pull request #2276 from asmorkalov:android_install_cuda
Alexander Smorkalov [Tue, 4 Feb 2014 09:25:47 +0000 (13:25 +0400)]
Multiple improvements in OpenCV examples build.
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
Roman Donchenko [Thu, 6 Feb 2014 10:59:31 +0000 (14:59 +0400)]
Merge pull request #2292 from asmorkalov:ocv_deb_tests_script_path_fix
Andrey Pavlenko [Thu, 6 Feb 2014 08:52:27 +0000 (12:52 +0400)]
Merge pull request #2285 from KonstantinMatskevich:ocl_test_cascade2.4
Alexander Smorkalov [Thu, 6 Feb 2014 08:35:14 +0000 (12:35 +0400)]
Absolute path to tests in opencv_run_app_tests.sh fixed.
Roman Donchenko [Thu, 6 Feb 2014 08:20:07 +0000 (12:20 +0400)]
Merge pull request #2288 from asmorkalov:android_project_properties_generation_fix
Alexander Smorkalov [Wed, 5 Feb 2014 13:34:19 +0000 (17:34 +0400)]
project.properties file generation fixed for per-component installation.
Roman Donchenko [Wed, 5 Feb 2014 08:36:37 +0000 (12:36 +0400)]
Merge pull request #2277 from asmorkalov:android_test_path_fix
Konstantin Matskevich [Wed, 5 Feb 2014 08:23:36 +0000 (12:23 +0400)]
update test CascadeClassifier
Roman Donchenko [Tue, 4 Feb 2014 14:59:13 +0000 (18:59 +0400)]
Merge pull request #2274 from jet47:android-mk-fix
Alexander Smorkalov [Tue, 4 Feb 2014 12:23:01 +0000 (16:23 +0400)]
Tests install path fix for Android SDK.
Vladislav Vinogradov [Tue, 4 Feb 2014 06:29:43 +0000 (10:29 +0400)]
save previous values of LOCAL_* variables and restore them at the end
Vladislav Vinogradov [Tue, 4 Feb 2014 06:29:15 +0000 (10:29 +0400)]
fix path to CUDA libraries (use targets/armv7-linux-androideabi/lib)
Vadim Pisarevsky [Mon, 3 Feb 2014 12:16:50 +0000 (16:16 +0400)]
Merge pull request #2178 from Nerei:viz_backport
Roman Donchenko [Mon, 3 Feb 2014 11:35:55 +0000 (15:35 +0400)]
Merge pull request #2261 from jet47:stitching-cuda-android
Andrey Pavlenko [Mon, 3 Feb 2014 10:24:36 +0000 (14:24 +0400)]
Merge pull request #2259 from ilya-lavrenov:ocl_surf
Vladislav Vinogradov [Mon, 3 Feb 2014 08:55:03 +0000 (12:55 +0400)]
update stitching sample
Vladislav Vinogradov [Mon, 3 Feb 2014 08:35:24 +0000 (12:35 +0400)]
turn on CUDA part of stitching module on Android for non-dynamic build
Vladislav Vinogradov [Mon, 3 Feb 2014 07:52:43 +0000 (11:52 +0400)]
turn on CUDA part of nonfree module on Android for non-dynamic build
Ilya Lavrenov [Sun, 2 Feb 2014 14:24:21 +0000 (18:24 +0400)]
rewrote perf tests for SURF
Roman Donchenko [Fri, 31 Jan 2014 16:49:04 +0000 (20:49 +0400)]
Merge pull request #2249 from jet47:gpu-tests-disable
Roman Donchenko [Fri, 31 Jan 2014 16:48:52 +0000 (20:48 +0400)]
Merge pull request #2248 from jet47:gpu-npp-disable
Roman Donchenko [Fri, 31 Jan 2014 16:48:37 +0000 (20:48 +0400)]
Merge pull request #2247 from jet47:gpu-test-cufft
Roman Donchenko [Fri, 31 Jan 2014 13:24:21 +0000 (17:24 +0400)]
Merge pull request #2242 from jet47:gpu-test-fix
Vladislav Vinogradov [Fri, 31 Jan 2014 12:20:45 +0000 (16:20 +0400)]
disable gpu CvtColor.*2HSV tests:
possible bug in CPU version
Vladislav Vinogradov [Fri, 31 Jan 2014 12:15:11 +0000 (16:15 +0400)]
disable gpu Subtract_Array test:
possible bug in CPU version
Vladislav Vinogradov [Fri, 31 Jan 2014 12:10:37 +0000 (16:10 +0400)]
disable gpu Canny and HoughCircles perf tests:
it fails because driver terminates CUDA kernels after time out
Vladislav Vinogradov [Fri, 31 Jan 2014 11:52:06 +0000 (15:52 +0400)]
disable NPP for GpuMat methods and for copyMakeBorder
Vladislav Vinogradov [Fri, 31 Jan 2014 11:40:59 +0000 (15:40 +0400)]
disable some gpu tests if library was built without CUFFT
Roman Donchenko [Fri, 31 Jan 2014 10:56:10 +0000 (14:56 +0400)]
Merge pull request #2241 from asmorkalov:ocv_highgui_test_output_fix
Roman Donchenko [Fri, 31 Jan 2014 10:24:04 +0000 (14:24 +0400)]
Merge pull request #2240 from jet47:gpu-generalized-hough
Roman Donchenko [Fri, 31 Jan 2014 09:56:48 +0000 (13:56 +0400)]
Merge pull request #2238 from asmorkalov:ocv_test_package_reports
Vladislav Vinogradov [Fri, 31 Jan 2014 09:19:15 +0000 (13:19 +0400)]
gpu test output files moved from cwd to temp folder
Alexander Smorkalov [Fri, 31 Jan 2014 06:47:01 +0000 (10:47 +0400)]
Reports path fix for opencv_run_all_tests.sh.in script.
Alexander Smorkalov [Fri, 31 Jan 2014 08:49:10 +0000 (12:49 +0400)]
Highgui test output fixes.
Useless output to console fixed;
Test output files moved from cwd to temp folder.
Vladislav Vinogradov [Fri, 31 Jan 2014 08:40:40 +0000 (12:40 +0400)]
disable performance test for gpu generalized hough
Roman Donchenko [Thu, 30 Jan 2014 09:22:10 +0000 (13:22 +0400)]
Merge pull request #2231 from asmorkalov:android_toolchain_update
Roman Donchenko [Thu, 30 Jan 2014 08:43:50 +0000 (12:43 +0400)]
Merge pull request #2224 from SpecLad:obsolete-immediate
Roman Donchenko [Thu, 30 Jan 2014 08:23:20 +0000 (12:23 +0400)]
Merge pull request #2229 from ilya-lavrenov:possible_memory_leak
Alexander Smorkalov [Thu, 30 Jan 2014 07:08:49 +0000 (11:08 +0400)]
Android toolchain file sync with original project.
Original project: https://github.com/taka-no-me/android-cmake/
Revision:
5db45cfb87fec180b74963d3680dd60d4d8d8c3a
Ilya Lavrenov [Wed, 29 Jan 2014 21:14:02 +0000 (01:14 +0400)]
eliminated possible memory leak
Roman Donchenko [Wed, 29 Jan 2014 15:34:02 +0000 (19:34 +0400)]
Removed all use of the obsolete IMMEDIATE parameter to configure_file.
It's not documented, and it does nothing unless CMake 2.0 compatibility
is enabled (and it isn't):
https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx
Roman Donchenko [Wed, 29 Jan 2014 13:09:28 +0000 (17:09 +0400)]
Merge pull request #2221 from asmorkalov:ocv_test_install_custom
Alexander Smorkalov [Wed, 29 Jan 2014 08:01:06 +0000 (12:01 +0400)]
opencv_run_all_tests.sh script added to -tests package.
Roman Donchenko [Tue, 28 Jan 2014 13:51:06 +0000 (17:51 +0400)]
Merge pull request #2215 from asmorkalov:ocv_testpack_fix
Alexander Smorkalov [Tue, 28 Jan 2014 10:05:26 +0000 (14:05 +0400)]
Multiple fixes for tests deb package build.
Added opencv_testing.sh.in file;
opencv_testing.sh installation guarded by OS check.
Roman Donchenko [Tue, 28 Jan 2014 08:23:32 +0000 (12:23 +0400)]
Merge pull request #2205 from jet47:bug-3477-fix
Andrey Pavlenko [Tue, 28 Jan 2014 06:51:11 +0000 (10:51 +0400)]
Merge pull request #2097 from pclove1:blur_border_isolated
Vladislav Vinogradov [Tue, 28 Jan 2014 06:28:00 +0000 (10:28 +0400)]
fix #3477:
CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING property is not supported
by all VideoCapture backends. Some backends can return 0.0 or -1.0.
Seunghoon Park [Tue, 28 Jan 2014 01:57:40 +0000 (20:57 -0500)]
fixing bug #3345. use norm to make sure two matrices are the same.
Seunghoon Park [Tue, 28 Jan 2014 01:44:03 +0000 (20:44 -0500)]
Merge branch '2.4' into blur_border_isolated
Roman Donchenko [Mon, 27 Jan 2014 16:59:53 +0000 (20:59 +0400)]
Merge pull request #2209 from asmorkalov:ocv_test_install
Alexander Smorkalov [Mon, 27 Jan 2014 13:57:11 +0000 (17:57 +0400)]
Code review notes fixed.
Env setup for testing package implemented using /etc/profile.d;
Variable with path for all native samples added;
Path for test binaries and test data updated.
Alexander Smorkalov [Mon, 27 Jan 2014 10:20:30 +0000 (14:20 +0400)]
OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added.
Anatoly Baksheev [Fri, 24 Jan 2014 17:44:59 +0000 (21:44 +0400)]
VTK off by default
Andrey Pavlenko [Fri, 24 Jan 2014 12:13:19 +0000 (16:13 +0400)]
Merge pull request #2194 from apavlenko:2.4_perf_haar_iter
Roman Donchenko [Fri, 24 Jan 2014 10:27:44 +0000 (14:27 +0400)]
Merge pull request #2197 from asmorkalov:ocv_packaging2
Alexander Smorkalov [Thu, 23 Jan 2014 16:57:30 +0000 (20:57 +0400)]
Improvements in package build.
Andrey Pavlenko [Fri, 24 Jan 2014 06:07:21 +0000 (10:07 +0400)]
temporary disabling hanging test
Roman Donchenko [Thu, 23 Jan 2014 13:13:51 +0000 (17:13 +0400)]
Merge pull request #2193 from apavlenko:2.4_lic_remove
Andrey Pavlenko [Wed, 22 Jan 2014 17:47:50 +0000 (21:47 +0400)]
removing duplicated legacy license, the actual instance is in 'opencv/LICENSE'
Anatoly Baksheev [Thu, 23 Jan 2014 10:41:21 +0000 (14:41 +0400)]
added guard to prevent linking VTK with Qt5
Roman Donchenko [Thu, 23 Jan 2014 09:28:12 +0000 (13:28 +0400)]
Merge pull request #2188 from jet47:gpumat-copyto-fix
Roman Donchenko [Thu, 23 Jan 2014 09:27:37 +0000 (13:27 +0400)]
Merge pull request #2175 from vrabaud:2.4
Vincent Rabaud [Wed, 22 Jan 2014 14:26:14 +0000 (15:26 +0100)]
fix message sent to user during cross_compilation
Roman Donchenko [Wed, 22 Jan 2014 07:54:07 +0000 (11:54 +0400)]
Merge pull request #2181 from asmorkalov:ocv_packaging
Vladislav Vinogradov [Wed, 22 Jan 2014 06:40:14 +0000 (10:40 +0400)]
fix GpuMat::copyTo method with mask:
fill destination matrix with zeros if it was reallocated
Alexander Smorkalov [Sat, 18 Jan 2014 19:50:07 +0000 (23:50 +0400)]
Initial Linux packages build rools for CPack.
Alexander Smorkalov [Fri, 17 Jan 2014 12:30:31 +0000 (16:30 +0400)]
All installed files marked with component names for install customization.
Roman Donchenko [Tue, 21 Jan 2014 15:27:54 +0000 (19:27 +0400)]
Merge pull request #2183 from jet47:cuda-hough-fix
Andrey Pavlenko [Tue, 21 Jan 2014 15:11:11 +0000 (19:11 +0400)]
Merge pull request #2107 from nghiaho12:nn_doc
Vladislav Vinogradov [Tue, 21 Jan 2014 10:35:51 +0000 (14:35 +0400)]
disable CUDA generalized Hough Transform
Vladislav Vinogradov [Tue, 21 Jan 2014 10:35:34 +0000 (14:35 +0400)]
split CUDA Hough sources
Vincent Rabaud [Tue, 21 Jan 2014 09:01:52 +0000 (10:01 +0100)]
reorder the if's for clarity