侯骥 [Wed, 11 Jun 2014 08:29:30 +0000 (10:29 +0200)]
Update MatchTemplate_Demo.cpp
Alexander Alekhin [Tue, 10 Jun 2014 18:21:09 +0000 (22:21 +0400)]
Merge pull request #2837 from ilya-lavrenov:tapi_norm_relative
Alexander Alekhin [Tue, 10 Jun 2014 15:32:03 +0000 (19:32 +0400)]
Merge pull request #2844 from ilya-lavrenov:tapi_perf_pow
Alexander Alekhin [Tue, 10 Jun 2014 15:30:26 +0000 (19:30 +0400)]
Merge pull request #2839 from ilya-lavrenov:tapi_fix
Alexander Alekhin [Tue, 10 Jun 2014 15:29:46 +0000 (19:29 +0400)]
Merge pull request #2835 from ilya-lavrenov:defects
Ilya Lavrenov [Tue, 10 Jun 2014 13:25:31 +0000 (17:25 +0400)]
changed power in cv::pow test to test actual kernel
Ilya Lavrenov [Fri, 6 Jun 2014 15:29:51 +0000 (19:29 +0400)]
fixed defects found by coverity scan
Roman Donchenko [Tue, 10 Jun 2014 07:50:12 +0000 (11:50 +0400)]
Merge pull request #2841 from SpecLad:merge-2.4
Alexander Alekhin [Mon, 9 Jun 2014 16:25:28 +0000 (20:25 +0400)]
Merge pull request #2838 from ilya-lavrenov:tapi_warnings
Ilya Lavrenov [Mon, 9 Jun 2014 11:32:35 +0000 (15:32 +0400)]
added norm_inf support to minmaxloc kernel
Roman Donchenko [Mon, 9 Jun 2014 14:03:03 +0000 (18:03 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/spinimages.cpp
Ilya Lavrenov [Mon, 9 Jun 2014 13:09:44 +0000 (17:09 +0400)]
bixed cv::boxFilter
Ilya Lavrenov [Mon, 9 Jun 2014 12:48:59 +0000 (16:48 +0400)]
fixed possible runtime error
Roman Donchenko [Mon, 9 Jun 2014 11:58:24 +0000 (15:58 +0400)]
Merge pull request #2813 from 23pointsNorth:patch-2
Ilya Lavrenov [Mon, 9 Jun 2014 11:54:10 +0000 (15:54 +0400)]
fixed warnings
Roman Donchenko [Mon, 9 Jun 2014 11:06:06 +0000 (15:06 +0400)]
Merge pull request #2817 from bf:patch-1
Roman Donchenko [Mon, 9 Jun 2014 10:29:44 +0000 (14:29 +0400)]
Merge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4
Roman Donchenko [Mon, 9 Jun 2014 10:27:51 +0000 (14:27 +0400)]
Merge pull request #2822 from timedia:akaze-java
Roman Donchenko [Mon, 9 Jun 2014 10:26:31 +0000 (14:26 +0400)]
Merge pull request #2831 from alalek:android_examples
Roman Donchenko [Mon, 9 Jun 2014 09:37:38 +0000 (13:37 +0400)]
Merge pull request #2818 from StevenPuttemans:fix_linux_tutorial
Ilya Lavrenov [Sun, 8 Jun 2014 20:50:14 +0000 (00:50 +0400)]
fixes
Ilya Lavrenov [Sat, 7 Jun 2014 16:53:20 +0000 (20:53 +0400)]
optimized cv::norm with NORM_RELATIVE
Ilya Lavrenov [Sat, 7 Jun 2014 11:51:41 +0000 (15:51 +0400)]
optimized cv::norm with 2 args
atinfinity [Fri, 6 Jun 2014 22:29:22 +0000 (07:29 +0900)]
fixed calculation method of "cv::TickMeter"
Ilya Lavrenov [Fri, 6 Jun 2014 13:15:19 +0000 (17:15 +0400)]
optimized cv::norm with NORM_INF
Alexander Alekhin [Fri, 6 Jun 2014 14:53:14 +0000 (18:53 +0400)]
Merge pull request #2785 from akarsakov:ocl_pyrDown_borders
Alexander Alekhin [Fri, 6 Jun 2014 14:52:39 +0000 (18:52 +0400)]
Merge pull request #2755 from vbystricky:oclopt_LUT
Ilya Lavrenov [Wed, 4 Jun 2014 14:22:55 +0000 (18:22 +0400)]
minmaxloc
Alexander Alekhin [Fri, 6 Jun 2014 14:38:21 +0000 (18:38 +0400)]
Merge pull request #2801 from ilya-lavrenov:tapi_reduction
Alexander Alekhin [Thu, 5 Jun 2014 08:29:36 +0000 (12:29 +0400)]
android: allow to build & run examples without Android OpenCV Manager
VBystricky [Thu, 5 Jun 2014 15:31:31 +0000 (19:31 +0400)]
If lut table has one channel and src aligned to 4, work with src as with one channel matrix
VBystricky [Wed, 4 Jun 2014 19:50:23 +0000 (23:50 +0400)]
Read 4 pixel for aligned data with 1 channel
VBystricky [Wed, 4 Jun 2014 16:13:42 +0000 (20:13 +0400)]
Fix kernel by comments
Alexander Alekhin [Wed, 4 Jun 2014 14:10:13 +0000 (18:10 +0400)]
Merge pull request #2808 from ilya-lavrenov:tapi_normalize_mask
Alexander Alekhin [Wed, 4 Jun 2014 12:36:37 +0000 (16:36 +0400)]
Merge pull request #2794 from mletavin:pullreq/140516-median
Alexander Alekhin [Wed, 4 Jun 2014 11:22:06 +0000 (15:22 +0400)]
Merge pull request #2820 from ilya-lavrenov:tapi_flip
Ilya Lavrenov [Mon, 2 Jun 2014 10:21:03 +0000 (14:21 +0400)]
optimized cv::flip (CV_8UC1)
Alexander Alekhin [Wed, 4 Jun 2014 08:23:35 +0000 (12:23 +0400)]
Merge pull request #2810 from ilya-lavrenov:tapi_copytomask
Alexander Alekhin [Wed, 4 Jun 2014 08:22:51 +0000 (12:22 +0400)]
Merge pull request #2798 from ilya-lavrenov:tapi_copymakeborder
Alexander Alekhin [Wed, 4 Jun 2014 08:20:54 +0000 (12:20 +0400)]
Merge pull request #2812 from arkunze:pullreq/140520-filter2D
Alexander Alekhin [Wed, 4 Jun 2014 08:18:29 +0000 (12:18 +0400)]
Merge pull request #2821 from ilya-lavrenov:tapi_reduce
Alexander Alekhin [Wed, 4 Jun 2014 08:11:54 +0000 (12:11 +0400)]
Merge pull request #2826 from ilya-lavrenov:tapi_perf_warp
Roman Donchenko [Wed, 4 Jun 2014 08:07:17 +0000 (12:07 +0400)]
Merge pull request #1552 from Exocoder:gtk3
Tony [Tue, 3 Jun 2014 20:29:54 +0000 (21:29 +0100)]
On branch gtk3
Changes to be committed:
modified: CMakeLists.txt
Corrected merge error from last resync
Tony [Tue, 3 Jun 2014 19:55:49 +0000 (20:55 +0100)]
Merge branch 'gtk3' of https://github.com/Exocoder/opencv into gtk3
resyncing gtk3 with remote.
Ilya Lavrenov [Tue, 3 Jun 2014 09:35:49 +0000 (13:35 +0400)]
added missed INTER_CUBIC
Alexander Alekhin [Tue, 3 Jun 2014 12:36:48 +0000 (16:36 +0400)]
Merge pull request #2750 from ilya-lavrenov:tapi_convertto
Muto Masayuki [Fri, 30 May 2014 07:46:47 +0000 (16:46 +0900)]
Add AKAZE support for the Java wrapper
Alexander Alekhin [Tue, 3 Jun 2014 09:21:05 +0000 (13:21 +0400)]
Merge pull request #2795 from ilya-lavrenov:tapi_setto
Alexander Alekhin [Tue, 3 Jun 2014 09:19:42 +0000 (13:19 +0400)]
Merge pull request #2757 from ElenaGvozdeva:ocl_flip
Ilya Lavrenov [Mon, 2 Jun 2014 14:27:40 +0000 (18:27 +0400)]
merged 2 kernels
Alexander Alekhin [Mon, 2 Jun 2014 16:37:17 +0000 (20:37 +0400)]
Merge pull request #2761 from ilya-lavrenov:tapi_warpers
Roman Donchenko [Mon, 2 Jun 2014 13:12:06 +0000 (17:12 +0400)]
Merge pull request #2819 from SpecLad:merge-2.4
mletavin [Mon, 2 Jun 2014 11:58:59 +0000 (15:58 +0400)]
Added condition to use optimized kernels for images of size that multiple of 4 only
Ilya Lavrenov [Tue, 27 May 2014 12:12:52 +0000 (16:12 +0400)]
optimized cv::copyMakeBorder
Ilya Lavrenov [Tue, 27 May 2014 08:07:26 +0000 (12:07 +0400)]
optimized UMat::setTo
Ilya Lavrenov [Thu, 29 May 2014 13:46:34 +0000 (17:46 +0400)]
optimized cv::normalize in case of mask
Alexander Alekhin [Mon, 2 Jun 2014 09:57:56 +0000 (13:57 +0400)]
Merge pull request #2778 from vbystricky:oclopt_reduce
Alexander Alekhin [Mon, 2 Jun 2014 09:54:31 +0000 (13:54 +0400)]
Merge pull request #2751 from akarsakov:ocl_thresh_opt
Roman Donchenko [Mon, 2 Jun 2014 09:43:28 +0000 (13:43 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
StevenPuttemans [Mon, 2 Jun 2014 07:35:19 +0000 (09:35 +0200)]
fix typo in linux tutorial
Benjamin Flesch [Sun, 1 Jun 2014 22:27:32 +0000 (00:27 +0200)]
perspectiveTransform simplify assert() for better debuggin
When using perspectiveTransform in rather complicated settings, it would be easier for developers to have two separate assertions for each part of the boolean expression in order to pinpoint problems more efficiently. In my case I am struggling in Python2.7 with finding out whether scn+1 == m.cols or the depth == CV_32F || depth == CV_64F is making a problem, which is kind of hard.
Alexander Alekhin [Sat, 31 May 2014 22:30:39 +0000 (02:30 +0400)]
Merge pull request #2811 from arkunze:pullreq/140516-erode
Alexander Alekhin [Sat, 31 May 2014 18:50:44 +0000 (22:50 +0400)]
Merge pull request #2781 from ilya-lavrenov:tapi_meanstddev
Alexander Alekhin [Sat, 31 May 2014 18:48:15 +0000 (22:48 +0400)]
Merge pull request #2809 from ilya-lavrenov:tapi_copy_perf
Alexander Alekhin [Sat, 31 May 2014 18:46:20 +0000 (22:46 +0400)]
Merge pull request #2787 from ilya-lavrenov:tapi_repeat
Daniel Angelov [Fri, 30 May 2014 22:59:32 +0000 (23:59 +0100)]
Fixed inconsistency with flag names
Fixed inconsistency with flag names for solvePnP.
The default value for the function lacks the CV_ prefix. The code checks against "ITERATIVE". The suggested values for the parameters *include* the prefix.
Even though the enum CV_ITERATIVE (+ CV_P3P, CV_EPNP) = ITERATIVE (& P3P, EPNP), lets show to the users only one of them.
Now the user sees only {ITERATIVE, P3P, EPNP}.
Alexander Alekhin [Fri, 30 May 2014 15:11:08 +0000 (19:11 +0400)]
Merge pull request #2807 from alalek:disable_tests_KAZE
Ilya Lavrenov [Fri, 30 May 2014 14:34:04 +0000 (18:34 +0400)]
added performance test
Ilya Lavrenov [Fri, 30 May 2014 14:01:49 +0000 (18:01 +0400)]
optimized UMat::copyTo with mask
Alexander Alekhin [Fri, 30 May 2014 12:35:23 +0000 (16:35 +0400)]
Merge pull request #2800 from krodyush:pullreq/140516-opticalflow-imgext-fix
krodyush [Fri, 30 May 2014 11:44:51 +0000 (15:44 +0400)]
fix according review
Alexander Alekhin [Thu, 29 May 2014 20:42:42 +0000 (00:42 +0400)]
Merge pull request #2638 from mlyashko:floodfill_perftest
Alexander Alekhin [Thu, 29 May 2014 20:38:11 +0000 (00:38 +0400)]
Merge pull request #2804 from ilya-lavrenov:tapi_perf
Alexander Alekhin [Thu, 22 May 2014 08:01:55 +0000 (12:01 +0400)]
KAZE: disable tests (too many crashes)
Ilya Lavrenov [Thu, 29 May 2014 10:09:22 +0000 (14:09 +0400)]
added missed tests for cv::norm, cv::normalize
Roman Donchenko [Thu, 29 May 2014 10:51:45 +0000 (14:51 +0400)]
Merge pull request #2773 from abidrahmank:pycascade
Roman Donchenko [Thu, 29 May 2014 10:50:42 +0000 (14:50 +0400)]
Merge pull request #2771 from SpecLad:pvs-checks-opencv
Roman Donchenko [Thu, 29 May 2014 10:43:30 +0000 (14:43 +0400)]
Merge pull request #2777 from alexstadnik:master
Roman Donchenko [Thu, 29 May 2014 10:40:38 +0000 (14:40 +0400)]
Merge pull request #2782 from HapeMask:py3_flann
mlyashko [Thu, 29 May 2014 09:36:13 +0000 (13:36 +0400)]
perftest for floodfill
Ilya Lavrenov [Thu, 29 May 2014 09:12:37 +0000 (13:12 +0400)]
optimized cv::UMat::dot
Ilya Lavrenov [Wed, 28 May 2014 15:23:13 +0000 (19:23 +0400)]
optimized cv::sum (CV_8UC1)
Ilya Lavrenov [Wed, 28 May 2014 14:39:02 +0000 (18:39 +0400)]
optimized cv::countNonZero
Ilya Lavrenov [Wed, 28 May 2014 12:43:58 +0000 (16:43 +0400)]
optimized index calculation
Ilya Lavrenov [Wed, 21 May 2014 14:12:26 +0000 (18:12 +0400)]
optimized cv::meanStdDev
Elena Gvozdeva [Tue, 27 May 2014 13:27:24 +0000 (17:27 +0400)]
optimized index access
Alexander Alekhin [Wed, 28 May 2014 09:39:48 +0000 (13:39 +0400)]
Merge pull request #2797 from ElenaGvozdeva:ocl_MT
mletavin [Wed, 28 May 2014 09:30:50 +0000 (13:30 +0400)]
Adding explicit variable conversion in ocl_medianFilter() to suppress build errors on Linux & Mac
Alexander Alekhin [Wed, 28 May 2014 09:28:30 +0000 (13:28 +0400)]
Merge pull request #2796 from berak:b_3674_24
berak [Wed, 28 May 2014 08:37:16 +0000 (10:37 +0200)]
2 fixed unassigned reshapes in em (#3674)
krodyush [Wed, 28 May 2014 06:34:11 +0000 (10:34 +0400)]
opencl opticaflow fix that enables buffer2image extension
Alexander Alekhin [Tue, 27 May 2014 14:52:01 +0000 (18:52 +0400)]
Merge pull request #2788 from alalek:icv_public
mletavin [Tue, 27 May 2014 12:16:00 +0000 (16:16 +0400)]
Moved new kernels under conditional compilation to disable their build for 3-channel images; added condition to use new kernels only for images that are big enough
Elena Gvozdeva [Tue, 27 May 2014 10:31:11 +0000 (14:31 +0400)]
OCL: matchTemplate: changed perf test
Roman Donchenko [Tue, 27 May 2014 09:35:10 +0000 (13:35 +0400)]
Merge pull request #2793 from alalek:run_android_env
Roman Donchenko [Tue, 27 May 2014 08:44:23 +0000 (12:44 +0400)]
Merge pull request #2792 from SpecLad:merge-2.4
vbystricky [Mon, 26 May 2014 12:55:31 +0000 (16:55 +0400)]
Fix some errors
vbystricky [Fri, 23 May 2014 07:09:57 +0000 (11:09 +0400)]
fix code in the kernel
vbystricky [Thu, 22 May 2014 07:39:36 +0000 (11:39 +0400)]
Change buffer cols count from 64 to 32
projects / platform / upstream / opencv.git / log