perping [Fri, 1 Nov 2013 09:53:35 +0000 (17:53 +0800)]
remove whitespace.
perping [Fri, 1 Nov 2013 06:07:10 +0000 (14:07 +0800)]
fixed a bug of haar.
Andrey Pavlenko [Thu, 31 Oct 2013 11:32:33 +0000 (15:32 +0400)]
Merge pull request #1727 from ilya-lavrenov:ocl_warpPerspective
Andrey Pavlenko [Thu, 31 Oct 2013 10:03:36 +0000 (14:03 +0400)]
Merge pull request #1726 from melody-rain:2.4_tvl1_ocl
Andrey Pavlenko [Thu, 31 Oct 2013 09:55:03 +0000 (13:55 +0400)]
Merge pull request #1724 from ilya-lavrenov:ocl_thresh
Andrey Pavlenko [Thu, 31 Oct 2013 09:54:45 +0000 (13:54 +0400)]
Merge pull request #1710 from melody-rain:2.4_moments_ocl
Ilya Lavrenov [Thu, 31 Oct 2013 08:23:57 +0000 (12:23 +0400)]
fixed ocl::warpPerspective
Jin Ma [Thu, 31 Oct 2013 08:25:50 +0000 (16:25 +0800)]
fixed a typo.
Jin Ma [Thu, 31 Oct 2013 08:21:08 +0000 (16:21 +0800)]
removed test for double since not all platforms support double, thus the sanity check cannot pass on all the platforms.
Jin Ma [Thu, 31 Oct 2013 08:09:33 +0000 (16:09 +0800)]
Resolved a bug and used ocl::multiply.
Ilya Lavrenov [Wed, 30 Oct 2013 15:02:51 +0000 (19:02 +0400)]
vectorized ocl::threshold for single channel images
Jin Ma [Thu, 31 Oct 2013 00:47:59 +0000 (08:47 +0800)]
modified the copyright info.
Andrey Pavlenko [Wed, 30 Oct 2013 20:22:37 +0000 (00:22 +0400)]
Merge pull request #1709 from ilya-lavrenov:ocl_cornerharris
Andrey Pavlenko [Wed, 30 Oct 2013 20:21:28 +0000 (00:21 +0400)]
Merge pull request #1723 from ilya-lavrenov:ocl_norm
Andrey Pavlenko [Wed, 30 Oct 2013 20:21:09 +0000 (00:21 +0400)]
Merge pull request #1721 from alalek:ocl_fix_filter2D_64F_kernel
Andrey Pavlenko [Wed, 30 Oct 2013 20:20:51 +0000 (00:20 +0400)]
Merge pull request #1719 from ilya-lavrenov:ocl_gaussianBlur
Andrey Pavlenko [Wed, 30 Oct 2013 20:20:34 +0000 (00:20 +0400)]
Merge pull request #1717 from alalek:ocl_adjust_worksize
Andrey Pavlenko [Wed, 30 Oct 2013 20:04:03 +0000 (00:04 +0400)]
Merge pull request #1715 from asmorkalov:android_java_bincompat_fix
Roman Donchenko [Wed, 30 Oct 2013 13:46:33 +0000 (17:46 +0400)]
Merge pull request #1720 from SpecLad:cmp0017
Roman Donchenko [Wed, 30 Oct 2013 13:33:03 +0000 (17:33 +0400)]
Merge pull request #1718 from SpecLad:have-opencv-ocl
Ilya Lavrenov [Wed, 30 Oct 2013 13:08:57 +0000 (17:08 +0400)]
disabled upload and download perf tests
Ilya Lavrenov [Wed, 30 Oct 2013 12:48:12 +0000 (16:48 +0400)]
fixed ocl::norm (with NORM_RELATIVE specified) when norm(src2) == 0
Alexander Alekhin [Wed, 30 Oct 2013 12:26:36 +0000 (16:26 +0400)]
ocl: filter2D: fix processing of kernel with double datatype
Roman Donchenko [Wed, 30 Oct 2013 12:10:02 +0000 (16:10 +0400)]
Fixed CMake warnings/bugs caused by #1670 and #1714
include() doesn't create a variable scope, so the settings of
CMAKE_MODULE_PATH and CMAKE_FIND_ROOT_PATH_MODE_* were polluting
everything included after OpenCVDetectCUDA.cmake.
Also, FindCUDA includes FindPackageHandleStandardArgs, which includes
CMakeParseArguments, which causes warnings related to policy CMP0017.
Setting it to NEW seems safe enough.
Roman Donchenko [Wed, 30 Oct 2013 12:18:49 +0000 (16:18 +0400)]
Merge pull request #1712 from alalek:ocl_split
Ilya Lavrenov [Wed, 30 Oct 2013 12:04:48 +0000 (16:04 +0400)]
changed eps in ocl::GaussianBlur test
Alexander Alekhin [Wed, 30 Oct 2013 10:57:46 +0000 (14:57 +0400)]
ocl: adjust worksize for filter2D and boxFilter
Roman Donchenko [Wed, 30 Oct 2013 11:11:25 +0000 (15:11 +0400)]
Merge pull request #1652 from nghiaho12:kalman
Alexander Alekhin [Tue, 29 Oct 2013 16:35:42 +0000 (20:35 +0400)]
ocl: split: update tests and implementation
Roman Donchenko [Wed, 30 Oct 2013 10:02:08 +0000 (14:02 +0400)]
Fixed building with OpenCL, but without the ocl module.
HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
Roman Donchenko [Wed, 30 Oct 2013 09:27:40 +0000 (13:27 +0400)]
Merge pull request #1714 from jet47:find-cuda-fix
Alexander Smorkalov [Wed, 30 Oct 2013 08:45:44 +0000 (12:45 +0400)]
Bug #3276 Java bindings binary compatibility is broken in branch 2.4 fixed.
New version of Java wrappers' generator uses different wrappers for VideoCapture
on Android and desktop to prevent binary compatibility issues.
Roman Donchenko [Wed, 30 Oct 2013 08:28:31 +0000 (12:28 +0400)]
Merge pull request #1675 from krodyush:opencl-optimization
Roman Donchenko [Wed, 30 Oct 2013 08:27:09 +0000 (12:27 +0400)]
Merge pull request #1713 from pengx17:patch-2
Vladislav Vinogradov [Wed, 30 Oct 2013 08:10:35 +0000 (12:10 +0400)]
fixed find package CUDA for cross-compilation
replaced find_host_package with find_package and
set CMAKE_FIND_ROOT_PATH_MODE_LIBRARY to BOTH, because NEVER
doesn't work for CUDA_CUDA_LIBRARY, which is located in
/usr/arm-linux-gnueabihf/lib/libcuda.so for ARM
Jin Ma [Wed, 30 Oct 2013 06:37:13 +0000 (14:37 +0800)]
fixed a bug when double is not supported.
Peng Xiao [Wed, 30 Oct 2013 02:36:28 +0000 (10:36 +0800)]
Fix a typo
Ilya Lavrenov [Tue, 29 Oct 2013 08:10:20 +0000 (12:10 +0400)]
fixed extrapolation for ocl::cornerMinEigenVal and ocl::cornerHarris; enabled CV_32FC1 for the first function
Jin Ma [Tue, 29 Oct 2013 10:05:29 +0000 (18:05 +0800)]
Rewrote moments of opencl version.
Roman Donchenko [Tue, 29 Oct 2013 09:24:14 +0000 (13:24 +0400)]
Merge pull request #1670 from jet47:cuda-cmake-fix
Andrey Pavlenko [Tue, 29 Oct 2013 07:07:03 +0000 (11:07 +0400)]
Merge pull request #1702 from alalek:ocl_memory_corruption_check
Andrey Pavlenko [Tue, 29 Oct 2013 07:05:10 +0000 (11:05 +0400)]
Merge pull request #1688 from alalek:ocl_fix_filters
Andrey Pavlenko [Tue, 29 Oct 2013 07:03:33 +0000 (11:03 +0400)]
Merge pull request #1687 from bitwangyaoyao:2.4_fix
Andrey Pavlenko [Tue, 29 Oct 2013 07:00:26 +0000 (11:00 +0400)]
Merge pull request #1677 from pengx17:patch-1
Andrey Pavlenko [Tue, 29 Oct 2013 06:51:00 +0000 (10:51 +0400)]
Merge pull request #1495 from StevenPuttemans:bugfix_3282
Andrey Pavlenko [Tue, 29 Oct 2013 06:49:46 +0000 (10:49 +0400)]
Merge pull request #1544 from ilya-lavrenov:ocl_blendLinear
Andrey Pavlenko [Tue, 29 Oct 2013 06:43:44 +0000 (10:43 +0400)]
Merge pull request #1708 from ilya-lavrenov:ocl_threshold
Andrey Pavlenko [Tue, 29 Oct 2013 06:43:26 +0000 (10:43 +0400)]
Merge pull request #1700 from ilya-lavrenov:ocl_bitwise_perf
Andrey Pavlenko [Tue, 29 Oct 2013 06:38:23 +0000 (10:38 +0400)]
Merge pull request #1707 from ilya-lavrenov:ocl_morph
Andrey Pavlenko [Tue, 29 Oct 2013 06:35:58 +0000 (10:35 +0400)]
Merge pull request #1699 from ilya-lavrenov:ocl_minMax
Andrey Pavlenko [Tue, 29 Oct 2013 06:35:42 +0000 (10:35 +0400)]
Merge pull request #1695 from ilya-lavrenov:ocl_showDiff
Ilya Lavrenov [Mon, 28 Oct 2013 19:49:19 +0000 (23:49 +0400)]
fixed and generalized ocl::blendLinear
Ilya Lavrenov [Mon, 28 Oct 2013 12:46:41 +0000 (16:46 +0400)]
fixed OpenCL morph operations for case when kernel does not have zero element
Alexander Alekhin [Mon, 28 Oct 2013 14:22:31 +0000 (18:22 +0400)]
ocl: filters: update documentation
Alexander Alekhin [Sat, 26 Oct 2013 07:15:53 +0000 (11:15 +0400)]
ocl: fix morph filters
Alexander Alekhin [Sat, 26 Oct 2013 01:06:22 +0000 (05:06 +0400)]
ocl: rewrite filter2D
Alexander Alekhin [Sat, 26 Oct 2013 19:31:51 +0000 (23:31 +0400)]
ocl: rewrite boxFilter
Alexander Alekhin [Sat, 26 Oct 2013 07:37:02 +0000 (11:37 +0400)]
ocl: update filter tests
Roman Donchenko [Mon, 28 Oct 2013 15:35:08 +0000 (19:35 +0400)]
Merge pull request #1691 from SpecLad:ffmpeg-test
Alexander Alekhin [Sat, 26 Oct 2013 11:03:23 +0000 (15:03 +0400)]
ocl: memory corruption check
Roman Donchenko [Mon, 28 Oct 2013 15:05:18 +0000 (19:05 +0400)]
Merge pull request #1706 from ilya-lavrenov:example_fix
Andrey Pavlenko [Mon, 28 Oct 2013 15:02:24 +0000 (19:02 +0400)]
Merge pull request #1705 from ilya-lavrenov:ocl_flip
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
Ilya Lavrenov [Sun, 27 Oct 2013 11:55:40 +0000 (15:55 +0400)]
fixed ocl::minMax for FP-types
Ilya Lavrenov [Fri, 25 Oct 2013 14:48:39 +0000 (18:48 +0400)]
ocl tests: show diff when cv::countNonZero(diff) > 0
Ilya Lavrenov [Mon, 28 Oct 2013 14:04:34 +0000 (18:04 +0400)]
rewrote and generalized ocl::threshold
Ilya Lavrenov [Mon, 28 Oct 2013 12:46:41 +0000 (16:46 +0400)]
fixed OpenCL morph operations for case when kernel does not have zero element
Ilya Lavrenov [Mon, 28 Oct 2013 10:09:30 +0000 (14:09 +0400)]
ocl example typo
Ilya Lavrenov [Sat, 26 Oct 2013 19:43:44 +0000 (23:43 +0400)]
fixed ocl::flip
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
yao [Mon, 28 Oct 2013 08:32:46 +0000 (16:32 +0800)]
fix the mismatch running on cpu devices
Roman Donchenko [Mon, 28 Oct 2013 08:18:41 +0000 (12:18 +0400)]
Merge pull request #1696 from apavlenko:fix_typo_GpuMaterials
Peng Xiao [Mon, 28 Oct 2013 06:17:59 +0000 (14:17 +0800)]
Fixed a missing barrier.
Vladislav Vinogradov [Mon, 28 Oct 2013 06:09:16 +0000 (10:09 +0400)]
added own version of FindCUDA.cmake
konstantin [Sun, 27 Oct 2013 20:14:07 +0000 (00:14 +0400)]
fix bugs on host and device sides for imgprog_sobel3.cl
Alexander Alekhin [Sun, 27 Oct 2013 20:01:56 +0000 (00:01 +0400)]
ocl: Canny: port CUDA-based implementation of edgesHysteresisLocal
Ilya Lavrenov [Sun, 27 Oct 2013 12:25:38 +0000 (16:25 +0400)]
added performance tests for ocl::bitwise_or and ocl::bitwose_xor
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
konstantin [Fri, 25 Oct 2013 17:44:01 +0000 (21:44 +0400)]
rename imageproc_sobel2.cl -> imageproc_sobel3.cl for consistency
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
Roman Donchenko [Fri, 25 Oct 2013 11:48:01 +0000 (15:48 +0400)]
Another FFmpeg fix from master.
From commit
dd74a851, to be exact. Now cap_ffmpeg.cpp should actually
build if HAVE_FFMPEG is true.
Also modified some gpu sources in a similar manner.
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 10:37:54 +0000 (14:37 +0400)]
Fixed indentation in CV_FFmpegWriteBigVideoTest::run.
projects / platform / upstream / opencv.git / log