Andrey Pavlenko [Mon, 28 Oct 2013 15:01:51 +0000 (19:01 +0400)]
Merge pull request #1703 from bitwangyaoyao:2.4_fix1480
Andrey Pavlenko [Mon, 28 Oct 2013 15:01:13 +0000 (19:01 +0400)]
Merge pull request #1701 from alalek:ocl_fix_canny
Andrey Pavlenko [Mon, 28 Oct 2013 14:59:08 +0000 (18:59 +0400)]
Merge pull request #1698 from ilya-lavrenov:ocl_warp
Roman Donchenko [Mon, 28 Oct 2013 09:46:31 +0000 (13:46 +0400)]
Merge pull request #1657 from KonstantinMatskevich:ocldistanceToCenters
yao [Mon, 28 Oct 2013 09:36:43 +0000 (17:36 +0800)]
fix bug #1480
Roman Donchenko [Mon, 28 Oct 2013 08:18:41 +0000 (12:18 +0400)]
Merge pull request #1696 from apavlenko:fix_typo_GpuMaterials
Alexander Alekhin [Sun, 27 Oct 2013 20:01:56 +0000 (00:01 +0400)]
ocl: Canny: port CUDA-based implementation of edgesHysteresisLocal
Alexander Alekhin [Sun, 27 Oct 2013 14:55:42 +0000 (18:55 +0400)]
ocl: Canny: replace unsafe buffer to oclMat
Ilya Lavrenov [Sun, 27 Oct 2013 08:58:22 +0000 (12:58 +0400)]
fixed tests for ocl::warpAffine and ocl::warpPerspective
Roman Donchenko [Fri, 25 Oct 2013 16:32:04 +0000 (20:32 +0400)]
Merge pull request #1697 from SpecLad:sdk-redux
Andrey Pavlenko [Fri, 25 Oct 2013 15:47:38 +0000 (19:47 +0400)]
Merge pull request #1655 from pengx17:2.4_opt_superres_ocl
Andrey Pavlenko [Fri, 25 Oct 2013 15:41:56 +0000 (19:41 +0400)]
Merge pull request #1689 from ilya-lavrenov:ocl_bilateralFilter
Andrey Pavlenko [Fri, 25 Oct 2013 15:39:21 +0000 (19:39 +0400)]
Merge pull request #1692 from ilya-lavrenov:ocl_separableFilter
Andrey Pavlenko [Fri, 25 Oct 2013 15:35:18 +0000 (19:35 +0400)]
Merge pull request #1694 from apavlenko:fix_typo
Andrey Pavlenko [Fri, 25 Oct 2013 15:34:33 +0000 (19:34 +0400)]
Merge pull request #1693 from ilya-lavrenov:ocl_adaptiveBilateralFilter
Roman Donchenko [Fri, 25 Oct 2013 15:24:57 +0000 (19:24 +0400)]
Merge pull request #1690 from SpecLad:cmake-2.8.12
Roman Donchenko [Fri, 25 Oct 2013 15:10:13 +0000 (19:10 +0400)]
Fixed Android SDK build - again.
Andrey Pavlenko [Fri, 25 Oct 2013 14:53:24 +0000 (18:53 +0400)]
fixing typo
Andrey Pavlenko [Fri, 25 Oct 2013 14:00:46 +0000 (18:00 +0400)]
fixing typo
Roman Donchenko [Fri, 25 Oct 2013 13:32:33 +0000 (17:32 +0400)]
Merge pull request #1680 from alalek:cmake_fix_android_builds
Ilya Lavrenov [Fri, 25 Oct 2013 13:28:31 +0000 (17:28 +0400)]
fixed extrapolation in ocl::adaptiveBilateralFilter
Alexander Alekhin [Thu, 24 Oct 2013 16:01:29 +0000 (20:01 +0400)]
cmake: fix android installation for different NDK ABIs
Ilya Lavrenov [Fri, 25 Oct 2013 12:41:20 +0000 (16:41 +0400)]
fixed separable filter extrapolation
peng xiao [Tue, 8 Oct 2013 07:49:40 +0000 (15:49 +0800)]
Rewrite distanceToCenters.
It supports NORM_L1 distance types now and can
use user provided indices.
Also fixed a bug of kmeans where distance pointers should be float instead
of double.
NORM_L2 changed to NORM_L2SQR, Accuracy and Perf tests are added
added ROI support in accuracy test of distanceToCenters
Roman Donchenko [Fri, 25 Oct 2013 09:54:55 +0000 (13:54 +0400)]
Replaced our usage of LINK_PRIVATE with that of LINK_INTERFACE_LIBRARIES.
The reasons for that are twofold:
1) LINK_PRIVATE is only available since CMake 2.8.7.
2) The way it was used generated a warning because of CMake policy CMP0023:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0023
Using LINK_INTERFACE_LIBRARIES actually causes another warning - this time
because of CMake policy CMP0022:
http://www.cmake.org/cmake/help/v2.8.12/cmake.html#policy:CMP0022
I set the policy to OLD, because NEW means subtle changes when compiling
with CMake 2.8.12, and I don't want to research that this close to release.
:-)
I also removed the setting of CMP0003, because it's set by
cmake_minimal_version anyway.
Roman Donchenko [Fri, 25 Oct 2013 09:50:22 +0000 (13:50 +0400)]
Removed a stray comma in the Android toolchain file.
It was actually acting as an additional argument, breaking the error message.
Ilya Lavrenov [Fri, 25 Oct 2013 09:32:35 +0000 (13:32 +0400)]
enabled ocl::bilateralFilter ROI testing
Andrey Pavlenko [Fri, 25 Oct 2013 09:19:02 +0000 (13:19 +0400)]
Merge pull request #1683 from alalek:ocl_restore_showdiff
Roman Donchenko [Thu, 24 Oct 2013 18:19:16 +0000 (22:19 +0400)]
Merge pull request #1682 from SpecLad:Wmissing-declarations
Roman Donchenko [Thu, 24 Oct 2013 15:38:43 +0000 (19:38 +0400)]
Merge pull request #1643 from alalek:cmake_fix_java_link_rules
Roman Donchenko [Thu, 24 Oct 2013 15:12:34 +0000 (19:12 +0400)]
Merge pull request #1679 from ilya-lavrenov:ocl_equalizeHist
Alexander Alekhin [Thu, 24 Oct 2013 15:04:41 +0000 (19:04 +0400)]
cmake: fix linker dependencies for opencv_java
Linker dependencies to all OpenCV modules are invalid.
We should not include other bindings in this list (like "opencv_python").
Roman Donchenko [Thu, 24 Oct 2013 14:33:23 +0000 (18:33 +0400)]
Fixed a Wmissing-declarations warning when compiling with MinGW.
Roman Donchenko [Thu, 24 Oct 2013 11:00:27 +0000 (15:00 +0400)]
Merge pull request #1667 from SpecLad:detect-openmp
Roman Donchenko [Thu, 24 Oct 2013 10:18:10 +0000 (14:18 +0400)]
Merge pull request #1623 from ImAlsoGreg:2.4-pkgconfig-dash-l
Ilya Lavrenov [Thu, 24 Oct 2013 09:59:25 +0000 (13:59 +0400)]
fixed bug in ocl::equalizeHist
Roman Donchenko [Thu, 24 Oct 2013 09:55:30 +0000 (13:55 +0400)]
Merge pull request #1678 from wejeus:ios-documentationfix-2.4
Roman Donchenko [Thu, 24 Oct 2013 09:54:31 +0000 (13:54 +0400)]
Merge pull request #1674 from alalek:cmake_fix
Samuel Wejéus [Thu, 24 Oct 2013 08:36:01 +0000 (10:36 +0200)]
Removed incorrect release of obtained colorspace. This fixes bug #3318 (updated commit for 2.4 branch)
Andrey Pavlenko [Thu, 24 Oct 2013 07:23:54 +0000 (11:23 +0400)]
Merge pull request #1676 from ilya-lavrenov:ocl_resize_test
Andrey Pavlenko [Thu, 24 Oct 2013 07:23:35 +0000 (11:23 +0400)]
Merge pull request #1673 from ilya-lavrenov:ocl_norm
Andrey Pavlenko [Thu, 24 Oct 2013 07:23:18 +0000 (11:23 +0400)]
Merge pull request #1672 from ilya-lavrenov:ocl_arithm
Andrey Pavlenko [Thu, 24 Oct 2013 07:23:00 +0000 (11:23 +0400)]
Merge pull request #1669 from ilya-lavrenov:ocl_copyMakeBorder
Alexander Alekhin [Wed, 23 Oct 2013 21:29:39 +0000 (01:29 +0400)]
ocl: show diff
Ilya Lavrenov [Wed, 23 Oct 2013 13:20:10 +0000 (17:20 +0400)]
fixed ocl::copyMakeBorder
Ilya Lavrenov [Wed, 23 Oct 2013 18:11:57 +0000 (22:11 +0400)]
fixed an accuracy test for ocl::resize (in some cases dsize.area() was equal to 0)
Alexander Alekhin [Wed, 23 Oct 2013 16:28:22 +0000 (20:28 +0400)]
cmake: fix bug with installation into OPENCV_LIB_INSTALL_PATH directory
Ilya Lavrenov [Wed, 23 Oct 2013 15:53:04 +0000 (19:53 +0400)]
moved to relative errors in ocl::norm tests
Ilya Lavrenov [Wed, 23 Oct 2013 14:42:55 +0000 (18:42 +0400)]
workaround for cv::multiply bug
Roman Donchenko [Wed, 23 Oct 2013 10:50:55 +0000 (14:50 +0400)]
Merge pull request #1659 from ilya-lavrenov:ocl_examples
Roman Donchenko [Tue, 22 Oct 2013 15:16:09 +0000 (19:16 +0400)]
Merge pull request #1649 from asandwhich:2.4
Roman Donchenko [Tue, 22 Oct 2013 15:02:48 +0000 (19:02 +0400)]
Merge pull request #1666 from SpecLad:cv-cap-openni
Roman Donchenko [Tue, 22 Oct 2013 14:47:37 +0000 (18:47 +0400)]
Add better OpenMP detection and make an option to enable it.
Bug report and inspiration: http://code.opencv.org/issues/3328
Roman Donchenko [Tue, 22 Oct 2013 10:48:25 +0000 (14:48 +0400)]
Fixed incorrectly unprefixed constant names in the OpenNI tutorial.
Bug report: http://code.opencv.org/issues/3329
Andrey Pavlenko [Tue, 22 Oct 2013 09:46:54 +0000 (13:46 +0400)]
Merge pull request #1658 from alalek:ocl_fixes
Ilya Lavrenov [Mon, 21 Oct 2013 16:47:55 +0000 (20:47 +0400)]
OpenCL examples refactoring
Alexander Alekhin [Mon, 21 Oct 2013 15:48:36 +0000 (19:48 +0400)]
ocl: fix FFT initialization
Alexander Alekhin [Mon, 21 Oct 2013 15:15:11 +0000 (19:15 +0400)]
ocl: workaround for ProgramCache cleanup issue, use RAII to print kernel build error
Greg Hale [Mon, 21 Oct 2013 13:27:04 +0000 (09:27 -0400)]
regex doesnt need to match full length of input, so only trying to match the leading -[lL]
Roman Donchenko [Mon, 21 Oct 2013 12:53:24 +0000 (16:53 +0400)]
Merge pull request #1646 from alalek:ocl_fix_msvc11
Roman Donchenko [Mon, 21 Oct 2013 12:27:59 +0000 (16:27 +0400)]
Merge pull request #1556 from jet47:fix-bug-3296
Roman Donchenko [Mon, 21 Oct 2013 12:18:02 +0000 (16:18 +0400)]
Merge pull request #1650 from jet47:fix-gpu-bgsegm-sample
Andrey Pavlenko [Mon, 21 Oct 2013 12:06:35 +0000 (16:06 +0400)]
Merge pull request #1647 from ilya-lavrenov:ocl_tests_demonstrative
Andrey Pavlenko [Mon, 21 Oct 2013 12:00:13 +0000 (16:00 +0400)]
Merge pull request #1645 from ilya-lavrenov:ocl_morph_test_fix
Andrey Pavlenko [Mon, 21 Oct 2013 11:59:19 +0000 (15:59 +0400)]
Merge pull request #1644 from ilya-lavrenov:ocl_matrix_operations
Andrey Pavlenko [Mon, 21 Oct 2013 11:58:59 +0000 (15:58 +0400)]
Merge pull request #1633 from ilya-lavrenov:ocl_imgproc
Ilya Lavrenov [Sat, 19 Oct 2013 08:12:16 +0000 (12:12 +0400)]
fixed ocl::Laplacian for case when scale != 1
Ilya Lavrenov [Fri, 18 Oct 2013 13:57:10 +0000 (17:57 +0400)]
missed initialization of kernel size
Roman Donchenko [Mon, 21 Oct 2013 10:00:22 +0000 (14:00 +0400)]
Merge pull request #1651 from ilya-lavrenov:misprint
peng xiao [Mon, 21 Oct 2013 02:21:37 +0000 (10:21 +0800)]
1. Let btvRegWeights to be constant per `process` call.
2. Let Farneback to be the default optical flow method.
3. Fix a timing method bug for ocl path.
4. Remove useless finish operation in farneback
5. Refactor buffer usage.
Greg Hale [Sat, 19 Oct 2013 21:30:32 +0000 (17:30 -0400)]
fixed wrong regex
Ilya Lavrenov [Fri, 18 Oct 2013 21:00:22 +0000 (01:00 +0400)]
added reflect, reflect101, replicate, wrap border types to ocl::remap
Ilya Lavrenov [Sat, 19 Oct 2013 18:59:47 +0000 (22:59 +0400)]
misprint
Vladislav Vinogradov [Sat, 19 Oct 2013 08:40:10 +0000 (12:40 +0400)]
fix bug in gpu bgsegm sample
create `d_fgimg` matrix before cleaning.
Kevin [Sat, 19 Oct 2013 06:30:03 +0000 (01:30 -0500)]
Change intrinsic camera matrix initialization
In the function cvInitIntrinsicParams2D the principal point for
normalized image coordinates is set to 0/0. This updates the function
to initialize the principal point at 0.5/0.5.
Ilya Lavrenov [Fri, 18 Oct 2013 21:17:46 +0000 (01:17 +0400)]
made more demonstrative message about test fails
Alexander Alekhin [Fri, 18 Oct 2013 16:43:34 +0000 (20:43 +0400)]
ocl: workaround for msvc11 bug
"#error" requires DOS line endings (or fails with fatal error C1004: unexpected end-of-file found)
See: http://connect.microsoft.com/VisualStudio/feedback/details/794991/c-error-directive-and-unix-line-endings-leads-to-an-unexpected-end-of-file
So replace them to #pragma message.
Andrey Pavlenko [Fri, 18 Oct 2013 14:41:12 +0000 (18:41 +0400)]
Merge pull request #1587 from alalek:opencl_khronos_headers
Roman Donchenko [Fri, 18 Oct 2013 14:39:06 +0000 (18:39 +0400)]
Merge pull request #1459 from asmorkalov:ocv_qt_segflt_fix
Roman Donchenko [Fri, 18 Oct 2013 14:22:59 +0000 (18:22 +0400)]
Merge pull request #1641 from jet47:imshow-opengl-fix
Roman Donchenko [Fri, 18 Oct 2013 14:19:35 +0000 (18:19 +0400)]
Merge pull request #1642 from alalek:cmake_cleanup_targets
Ilya Lavrenov [Fri, 18 Oct 2013 13:34:17 +0000 (17:34 +0400)]
refactored ocl matrix operations accuracy tests
Ilya Lavrenov [Fri, 18 Oct 2013 12:46:00 +0000 (16:46 +0400)]
enabled double in copyMakeBorder kernel
Ilya Lavrenov [Fri, 18 Oct 2013 12:41:09 +0000 (16:41 +0400)]
rewrote ocl::remap
Ilya Lavrenov [Fri, 18 Oct 2013 12:39:47 +0000 (16:39 +0400)]
fixed ocl::copyMakeBorder
Ilya Lavrenov [Fri, 18 Oct 2013 12:36:11 +0000 (16:36 +0400)]
added ROI support to ocl::convolve
Ilya Lavrenov [Fri, 18 Oct 2013 12:33:48 +0000 (16:33 +0400)]
added ROI support to ocl::columnSum
Ilya Lavrenov [Fri, 18 Oct 2013 12:31:52 +0000 (16:31 +0400)]
added ROI support to ocl::CLAHE
Ilya Lavrenov [Fri, 18 Oct 2013 12:29:10 +0000 (16:29 +0400)]
refactored all the tests in ocl/test/test_imgproc.cpp
Alexander Alekhin [Fri, 11 Oct 2013 15:32:31 +0000 (19:32 +0400)]
ocl: update autogenerated code
Alexander Alekhin [Fri, 11 Oct 2013 15:30:47 +0000 (19:30 +0400)]
ocl: force to use Khronos OpenCL headers
Alexander Alekhin [Tue, 8 Oct 2013 16:26:54 +0000 (20:26 +0400)]
added Khronos OpenCL 1.2 header files
Andrey Pavlenko [Fri, 18 Oct 2013 09:45:12 +0000 (13:45 +0400)]
Merge pull request #1640 from alalek:ocl_fix_exp_test
Andrey Pavlenko [Fri, 18 Oct 2013 09:44:40 +0000 (13:44 +0400)]
Merge pull request #1626 from ilya-lavrenov:ocl_filters
Roman Donchenko [Thu, 17 Oct 2013 13:16:58 +0000 (17:16 +0400)]
Updated ffmpeg_vesion.cmake after #1516.
Alexander Alekhin [Thu, 17 Oct 2013 19:42:37 +0000 (23:42 +0400)]
cmake: cleanup OpenCVModules_TARGETS from cache
This will allow to disable modules between cmake runs
Greg Hale [Thu, 17 Oct 2013 18:17:49 +0000 (14:17 -0400)]
added backslash
Greg Hale [Thu, 17 Oct 2013 18:12:02 +0000 (14:12 -0400)]
shortened code to not repeat myself
Greg Hale [Thu, 17 Oct 2013 18:05:06 +0000 (14:05 -0400)]
Only append -l to lib entries with no path and no -l or -L of their own
Vladislav Vinogradov [Thu, 17 Oct 2013 16:54:43 +0000 (20:54 +0400)]
fix imshow under Windows with OpenGL support:
we doesn't create OpenGL windows by default
OpenGL window must be created by user via namedWindow