platform/upstream/opencv.git
10 years agofixed
Elena Gvozdeva [Tue, 28 Jan 2014 12:22:42 +0000 (16:22 +0400)]
fixed

10 years agoAdded ocl_Mog2
Elena Gvozdeva [Mon, 27 Jan 2014 13:32:51 +0000 (17:32 +0400)]
Added ocl_Mog2

10 years agoMerge pull request #2211 from SpecLad:merge-2.4
Roman Donchenko [Tue, 28 Jan 2014 08:44:29 +0000 (12:44 +0400)]
Merge pull request #2211 from SpecLad:merge-2.4

10 years agoMerge pull request #2207 from ilya-lavrenov:tapi_macro
Andrey Pavlenko [Mon, 27 Jan 2014 14:56:05 +0000 (18:56 +0400)]
Merge pull request #2207 from ilya-lavrenov:tapi_macro

10 years agorefactored imgproc
Ilya Lavrenov [Mon, 27 Jan 2014 09:25:21 +0000 (13:25 +0400)]
refactored imgproc

10 years agoMerge pull request #2208 from alalek:ocl_dynload_warn
Andrey Pavlenko [Mon, 27 Jan 2014 14:24:13 +0000 (18:24 +0400)]
Merge pull request #2208 from alalek:ocl_dynload_warn

10 years agoMerge pull request #2203 from ilya-lavrenov:tapi_umat_vectors
Andrey Pavlenko [Mon, 27 Jan 2014 12:06:12 +0000 (16:06 +0400)]
Merge pull request #2203 from ilya-lavrenov:tapi_umat_vectors

10 years agoMerge pull request #2206 from ilya-lavrenov:ocl_warn_fix
Andrey Pavlenko [Mon, 27 Jan 2014 12:05:54 +0000 (16:05 +0400)]
Merge pull request #2206 from ilya-lavrenov:ocl_warn_fix

10 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
Roman Donchenko [Mon, 27 Jan 2014 11:28:14 +0000 (15:28 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt

10 years agocore/ocl: added warning about incompatible configuration
Alexander Alekhin [Mon, 27 Jan 2014 09:38:47 +0000 (13:38 +0400)]
core/ocl: added warning about incompatible configuration

10 years agowarn fix
Ilya Lavrenov [Mon, 27 Jan 2014 08:34:30 +0000 (12:34 +0400)]
warn fix

10 years agoadded macro with ability of returning values
Ilya Lavrenov [Mon, 27 Jan 2014 08:32:26 +0000 (12:32 +0400)]
added macro with ability of returning values

10 years agofixed condition
Ilya Lavrenov [Fri, 24 Jan 2014 21:58:55 +0000 (01:58 +0400)]
fixed condition

10 years agofixed cv::split; enabled test
Ilya Lavrenov [Fri, 24 Jan 2014 20:43:32 +0000 (00:43 +0400)]
fixed cv::split; enabled test

10 years agoadded STD_VECTOR_UMAT support to _OutputArray::create
Ilya Lavrenov [Fri, 24 Jan 2014 20:27:33 +0000 (00:27 +0400)]
added STD_VECTOR_UMAT support to _OutputArray::create

10 years agoMerge pull request #2027 from AD-530:brief_cl
Andrey Pavlenko [Mon, 27 Jan 2014 05:49:46 +0000 (09:49 +0400)]
Merge pull request #2027 from AD-530:brief_cl

10 years agoMerge pull request #2155 from vbystricky:ocl_calcOpticalFlowPyrLK
Andrey Pavlenko [Sat, 25 Jan 2014 13:08:06 +0000 (17:08 +0400)]
Merge pull request #2155 from vbystricky:ocl_calcOpticalFlowPyrLK

10 years agoMerge pull request #2204 from ilya-lavrenov:tapi_stitch_perf_fix
Andrey Pavlenko [Sat, 25 Jan 2014 12:53:59 +0000 (16:53 +0400)]
Merge pull request #2204 from ilya-lavrenov:tapi_stitch_perf_fix

10 years agoMerge pull request #2191 from ilya-lavrenov:tapi_macro
Andrey Pavlenko [Sat, 25 Jan 2014 12:32:54 +0000 (16:32 +0400)]
Merge pull request #2191 from ilya-lavrenov:tapi_macro

10 years agofix
Ilya Lavrenov [Sat, 25 Jan 2014 07:50:28 +0000 (11:50 +0400)]
fix

10 years agorefactored core using new macro
Ilya Lavrenov [Fri, 24 Jan 2014 17:03:31 +0000 (21:03 +0400)]
refactored core using new macro

10 years agoUnused code removed
vbystricky [Thu, 23 Jan 2014 13:35:44 +0000 (17:35 +0400)]
Unused code removed

10 years agoChange type of result vector of ocl version from row to column
vbystricky [Thu, 23 Jan 2014 08:17:25 +0000 (12:17 +0400)]
Change type of result vector of ocl version from row to column

10 years agoFix build error
vbystricky [Mon, 20 Jan 2014 13:22:39 +0000 (17:22 +0400)]
Fix build error

10 years agoChange method of setting arguments to kernel to safe one
vbystricky [Mon, 20 Jan 2014 12:21:08 +0000 (16:21 +0400)]
Change method of setting arguments to kernel to safe one

10 years agoGrow up epsilon for sanity checks
vbystricky [Mon, 20 Jan 2014 10:50:47 +0000 (14:50 +0400)]
Grow up epsilon for sanity checks

10 years agoAdd perfomance test
vbystricky [Mon, 20 Jan 2014 08:39:04 +0000 (12:39 +0400)]
Add perfomance test

10 years agoFix builds errors
vbystricky [Thu, 16 Jan 2014 12:24:10 +0000 (16:24 +0400)]
Fix builds errors

10 years agoFix builds errors
vbystricky [Thu, 16 Jan 2014 12:24:10 +0000 (16:24 +0400)]
Fix builds errors

10 years agoValidate parameters for using OpenCL version, before upload UMat
vbystricky [Thu, 16 Jan 2014 11:44:35 +0000 (15:44 +0400)]
Validate parameters for using OpenCL version, before upload UMat

10 years agoFix error with some opencl functions on the build WITH_OPENCL=OFF
vbystricky [Thu, 16 Jan 2014 09:35:10 +0000 (13:35 +0400)]
Fix error with some opencl functions on the build WITH_OPENCL=OFF

10 years agoMove OpticalFlowPyrLK from ocl module to video module
vbystricky [Thu, 16 Jan 2014 07:57:57 +0000 (11:57 +0400)]
Move OpticalFlowPyrLK from ocl module to video module

10 years agoMerge pull request #2149 from ElenaGvozdeva:ocl_matchTemplate
Andrey Pavlenko [Fri, 24 Jan 2014 13:33:05 +0000 (17:33 +0400)]
Merge pull request #2149 from ElenaGvozdeva:ocl_matchTemplate

10 years agoadded new macros useful for tracking whether OpenCL impl run or not
Ilya Lavrenov [Wed, 22 Jan 2014 11:51:28 +0000 (15:51 +0400)]
added new macros useful for tracking whether OpenCL impl run or not

10 years agoMerge pull request #2182 from KonstantinMatskevich:ocl_tapi_samples
Andrey Pavlenko [Fri, 24 Jan 2014 13:03:42 +0000 (17:03 +0400)]
Merge pull request #2182 from KonstantinMatskevich:ocl_tapi_samples

10 years agoMerge pull request #2142 from KonstantinMatskevich:ocl_tapi_bfmatcher
Andrey Pavlenko [Fri, 24 Jan 2014 12:50:03 +0000 (16:50 +0400)]
Merge pull request #2142 from KonstantinMatskevich:ocl_tapi_bfmatcher

10 years agoMerge pull request #2190 from KonstantinMatskevich:ocl_dumpinfo
Andrey Pavlenko [Fri, 24 Jan 2014 12:44:19 +0000 (16:44 +0400)]
Merge pull request #2190 from KonstantinMatskevich:ocl_dumpinfo

10 years agoadd brackets
Konstantin Matskevich [Fri, 24 Jan 2014 12:35:51 +0000 (16:35 +0400)]
add brackets

10 years agoMerge pull request #2194 from apavlenko:2.4_perf_haar_iter
Andrey Pavlenko [Fri, 24 Jan 2014 12:13:19 +0000 (16:13 +0400)]
Merge pull request #2194 from apavlenko:2.4_perf_haar_iter

10 years agoMerge pull request #2197 from asmorkalov:ocv_packaging2
Roman Donchenko [Fri, 24 Jan 2014 10:27:44 +0000 (14:27 +0400)]
Merge pull request #2197 from asmorkalov:ocv_packaging2

10 years agofixes
Konstantin Matskevich [Fri, 24 Jan 2014 10:01:31 +0000 (14:01 +0400)]
fixes

10 years agofixes
Konstantin Matskevich [Fri, 24 Jan 2014 09:37:19 +0000 (13:37 +0400)]
fixes

10 years agosamples
Konstantin Matskevich [Mon, 20 Jan 2014 06:25:05 +0000 (10:25 +0400)]
samples

10 years agoImprovements in package build.
Alexander Smorkalov [Thu, 23 Jan 2014 16:57:30 +0000 (20:57 +0400)]
Improvements in package build.

10 years agofixed
Elena Gvozdeva [Fri, 24 Jan 2014 07:41:23 +0000 (11:41 +0400)]
fixed

10 years agotemporary disabling hanging test
Andrey Pavlenko [Fri, 24 Jan 2014 06:07:21 +0000 (10:07 +0400)]
temporary disabling hanging test

10 years agoMerge pull request #2193 from apavlenko:2.4_lic_remove
Roman Donchenko [Thu, 23 Jan 2014 13:13:51 +0000 (17:13 +0400)]
Merge pull request #2193 from apavlenko:2.4_lic_remove

10 years agoremoving duplicated legacy license, the actual instance is in 'opencv/LICENSE'
Andrey Pavlenko [Wed, 22 Jan 2014 17:47:50 +0000 (21:47 +0400)]
removing duplicated legacy license, the actual instance is in 'opencv/LICENSE'

10 years agoFixed merge conflicts
Elena Gvozdeva [Thu, 23 Jan 2014 11:31:32 +0000 (15:31 +0400)]
Fixed merge conflicts

10 years agofixed
Elena Gvozdeva [Wed, 22 Jan 2014 09:34:40 +0000 (13:34 +0400)]
fixed

10 years agofixed pref test
Elena Gvozdeva [Tue, 21 Jan 2014 12:57:01 +0000 (16:57 +0400)]
fixed pref test

10 years agoAdded perf test for ocl_matchTemplate
Elena Gvozdeva [Mon, 20 Jan 2014 11:48:16 +0000 (15:48 +0400)]
Added perf test for ocl_matchTemplate

10 years agofixed trailing whitespace
Elena Gvozdeva [Fri, 17 Jan 2014 14:37:57 +0000 (18:37 +0400)]
fixed trailing whitespace

10 years agofixed
Elena Gvozdeva [Fri, 17 Jan 2014 12:26:11 +0000 (16:26 +0400)]
fixed

10 years agofixed
Elena Gvozdeva [Fri, 17 Jan 2014 11:01:22 +0000 (15:01 +0400)]
fixed

10 years agofixed
Elena Gvozdeva [Thu, 16 Jan 2014 10:26:48 +0000 (14:26 +0400)]
fixed

10 years agoFixed test_match_template
Elena Gvozdeva [Wed, 15 Jan 2014 06:24:14 +0000 (10:24 +0400)]
Fixed test_match_template

10 years agoFixed trailing whitespace
Elena Gvozdeva [Tue, 14 Jan 2014 13:34:05 +0000 (17:34 +0400)]
Fixed trailing whitespace

10 years agoFixed warnings
Elena Gvozdeva [Tue, 14 Jan 2014 12:31:04 +0000 (16:31 +0400)]
Fixed warnings

10 years agoAdded ocl_matchTemplate( without dft)
Elena Gvozdeva [Tue, 14 Jan 2014 10:45:01 +0000 (14:45 +0400)]
Added ocl_matchTemplate( without dft)

10 years agoMerge pull request #2110 from hmax:master
Andrey Pavlenko [Thu, 23 Jan 2014 10:37:33 +0000 (14:37 +0400)]
Merge pull request #2110 from hmax:master

10 years agoMerge pull request #2188 from jet47:gpumat-copyto-fix
Roman Donchenko [Thu, 23 Jan 2014 09:28:12 +0000 (13:28 +0400)]
Merge pull request #2188 from jet47:gpumat-copyto-fix

10 years agoMerge pull request #2175 from vrabaud:2.4
Roman Donchenko [Thu, 23 Jan 2014 09:27:37 +0000 (13:27 +0400)]
Merge pull request #2175 from vrabaud:2.4

10 years agoadded perf test
Konstantin Matskevich [Fri, 17 Jan 2014 07:23:00 +0000 (11:23 +0400)]
added perf test

10 years agoMerge pull request #2189 from ilya-lavrenov:tapi_sepFilter2D_fix
Andrey Pavlenko [Wed, 22 Jan 2014 15:13:05 +0000 (19:13 +0400)]
Merge pull request #2189 from ilya-lavrenov:tapi_sepFilter2D_fix

10 years agoMerge pull request #2186 from ilya-lavrenov:tapi_precornerdetect
Andrey Pavlenko [Wed, 22 Jan 2014 15:09:34 +0000 (19:09 +0400)]
Merge pull request #2186 from ilya-lavrenov:tapi_precornerdetect

10 years agoMerge pull request #2134 from vbystricky:ocl_calcOpticalFlowFarneback
Andrey Pavlenko [Wed, 22 Jan 2014 14:57:33 +0000 (18:57 +0400)]
Merge pull request #2134 from vbystricky:ocl_calcOpticalFlowFarneback

10 years agofix message sent to user during cross_compilation
Vincent Rabaud [Wed, 22 Jan 2014 14:26:14 +0000 (15:26 +0100)]
fix message sent to user during cross_compilation

10 years agodumpinfo
Konstantin Matskevich [Wed, 22 Jan 2014 06:08:42 +0000 (10:08 +0400)]
dumpinfo

10 years agoremoved unnecessary functions and variables
Konstantin Matskevich [Fri, 17 Jan 2014 06:09:44 +0000 (10:09 +0400)]
removed unnecessary functions and variables

10 years agofixed docs
Konstantin Matskevich [Wed, 15 Jan 2014 06:01:40 +0000 (10:01 +0400)]
fixed docs

10 years agoBFMatcher
Konstantin Matskevich [Fri, 27 Dec 2013 09:04:02 +0000 (13:04 +0400)]
BFMatcher

match

radiusMatch

10 years agoimplemented OpenCL version of cv::preCornerDetect
Ilya Lavrenov [Mon, 20 Jan 2014 14:35:32 +0000 (18:35 +0400)]
implemented OpenCL version of cv::preCornerDetect

10 years agofixed cv::sepFilter2D
Ilya Lavrenov [Wed, 22 Jan 2014 09:40:48 +0000 (13:40 +0400)]
fixed cv::sepFilter2D

10 years agoMerge pull request #2161 from SpecLad:doc-req
Roman Donchenko [Wed, 22 Jan 2014 08:04:47 +0000 (12:04 +0400)]
Merge pull request #2161 from SpecLad:doc-req

10 years agoMerge pull request #2181 from asmorkalov:ocv_packaging
Roman Donchenko [Wed, 22 Jan 2014 07:54:07 +0000 (11:54 +0400)]
Merge pull request #2181 from asmorkalov:ocv_packaging

10 years agofix GpuMat::copyTo method with mask:
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

10 years agoChange the sanity checking type to ERROR_RELATIVE
vbystricky [Wed, 22 Jan 2014 06:34:27 +0000 (10:34 +0400)]
Change the sanity checking type to ERROR_RELATIVE

10 years agoMerge pull request #2185 from ilya-lavrenov:tapi_corners
Andrey Pavlenko [Wed, 22 Jan 2014 06:25:40 +0000 (10:25 +0400)]
Merge pull request #2185 from ilya-lavrenov:tapi_corners

10 years agoMerge pull request #2168 from ilya-lavrenov:tapi_perf_stitching
Andrey Pavlenko [Wed, 22 Jan 2014 06:14:38 +0000 (10:14 +0400)]
Merge pull request #2168 from ilya-lavrenov:tapi_perf_stitching

10 years agoMerge pull request #2156 from ilya-lavrenov:tapi_reduce
Andrey Pavlenko [Wed, 22 Jan 2014 06:12:07 +0000 (10:12 +0400)]
Merge pull request #2156 from ilya-lavrenov:tapi_reduce

10 years agoMerge pull request #2184 from ilya-lavrenov:bioinspired2contrib
Andrey Pavlenko [Tue, 21 Jan 2014 19:27:15 +0000 (23:27 +0400)]
Merge pull request #2184 from ilya-lavrenov:bioinspired2contrib

10 years agoMerge pull request #2166 from ilya-lavrenov:tapi_gftt
Andrey Pavlenko [Tue, 21 Jan 2014 18:29:41 +0000 (22:29 +0400)]
Merge pull request #2166 from ilya-lavrenov:tapi_gftt

10 years agoInitial Linux packages build rools for CPack.
Alexander Smorkalov [Sat, 18 Jan 2014 19:50:07 +0000 (23:50 +0400)]
Initial Linux packages build rools for CPack.

10 years agoAll installed files marked with component names for install customization.
Alexander Smorkalov [Fri, 17 Jan 2014 12:30:31 +0000 (16:30 +0400)]
All installed files marked with component names for install customization.

10 years agoported corners to T-API
Ilya Lavrenov [Mon, 20 Jan 2014 14:35:32 +0000 (18:35 +0400)]
ported corners to T-API

10 years agoMerge pull request #2183 from jet47:cuda-hough-fix
Roman Donchenko [Tue, 21 Jan 2014 15:27:54 +0000 (19:27 +0400)]
Merge pull request #2183 from jet47:cuda-hough-fix

10 years agoMerge pull request #1320 from mbarnach:svm_hog
Andrey Pavlenko [Tue, 21 Jan 2014 15:23:04 +0000 (19:23 +0400)]
Merge pull request #1320 from mbarnach:svm_hog

10 years agoMerge pull request #1290 from mbarnach:bow_desc
Andrey Pavlenko [Tue, 21 Jan 2014 15:22:46 +0000 (19:22 +0400)]
Merge pull request #1290 from mbarnach:bow_desc

10 years agoMerge pull request #2107 from nghiaho12:nn_doc
Andrey Pavlenko [Tue, 21 Jan 2014 15:11:11 +0000 (19:11 +0400)]
Merge pull request #2107 from nghiaho12:nn_doc

10 years agoremoved TOC
Ilya Lavrenov [Tue, 21 Jan 2014 14:47:22 +0000 (18:47 +0400)]
removed TOC

10 years agoChange epsilon value to 0.01
vbystricky [Tue, 21 Jan 2014 14:46:26 +0000 (18:46 +0400)]
Change epsilon value to 0.01

10 years agomoved bioinspired to opencv_contrib
Ilya Lavrenov [Tue, 21 Jan 2014 14:02:53 +0000 (18:02 +0400)]
moved bioinspired to opencv_contrib

10 years agoMerge pull request #2177 from ilya-lavrenov:ocl_superres
Andrey Pavlenko [Tue, 21 Jan 2014 13:05:50 +0000 (17:05 +0400)]
Merge pull request #2177 from ilya-lavrenov:ocl_superres

10 years agodisable CUDA generalized Hough Transform
Vladislav Vinogradov [Tue, 21 Jan 2014 10:35:51 +0000 (14:35 +0400)]
disable CUDA generalized Hough Transform

10 years agosplit CUDA Hough sources
Vladislav Vinogradov [Tue, 21 Jan 2014 10:35:34 +0000 (14:35 +0400)]
split CUDA Hough sources

10 years agofixed copying UMat -> std::vector
Ilya Lavrenov [Mon, 20 Jan 2014 12:46:20 +0000 (16:46 +0400)]
fixed copying UMat -> std::vector

10 years agoadded perf tests for cv::reduce
Ilya Lavrenov [Thu, 16 Jan 2014 21:05:59 +0000 (01:05 +0400)]
added perf tests for cv::reduce

10 years agoreorder the if's for clarity
Vincent Rabaud [Tue, 21 Jan 2014 09:01:52 +0000 (10:01 +0100)]
reorder the if's for clarity

10 years agoskip OCL tests if OpenCL isn't available
Ilya Lavrenov [Mon, 20 Jan 2014 13:52:32 +0000 (17:52 +0400)]
skip OCL tests if OpenCL isn't available