Andrey Pavlenko [Fri, 31 Jan 2014 15:08:26 +0000 (19:08 +0400)]
Merge pull request #2243 from ilya-lavrenov:ocl2trash
Andrey Pavlenko [Fri, 31 Jan 2014 15:04:49 +0000 (19:04 +0400)]
Merge pull request #2236 from ilya-lavrenov:tapi_boxfilter
Andrey Pavlenko [Fri, 31 Jan 2014 15:04:30 +0000 (19:04 +0400)]
Merge pull request #2244 from ilya-lavrenov:tapi_device_cache
Andrey Pavlenko [Fri, 31 Jan 2014 15:04:07 +0000 (19:04 +0400)]
Merge pull request #2245 from ilya-lavrenov:redundant_sync
Andrey Pavlenko [Fri, 31 Jan 2014 14:58:01 +0000 (18:58 +0400)]
Merge pull request #2246 from alalek:intersection_loop_bug
Alexander Alekhin [Fri, 31 Jan 2014 10:42:38 +0000 (14:42 +0400)]
imgproc/intersection: fix loop index
Ilya Lavrenov [Fri, 31 Jan 2014 10:39:03 +0000 (14:39 +0400)]
redundant clFinish in upload since clEnqueueWriteBuffer above is already blocked
Ilya Lavrenov [Fri, 31 Jan 2014 10:00:05 +0000 (14:00 +0400)]
cached commonly used device properties
Ilya Lavrenov [Fri, 31 Jan 2014 09:19:16 +0000 (13:19 +0400)]
OCL module 2 trash
Roman Donchenko [Fri, 31 Jan 2014 08:49:18 +0000 (12:49 +0400)]
Merge pull request #2223 from cosminBoaca:add_prob_result_bayes_classifier
Roman Donchenko [Fri, 31 Jan 2014 08:22:24 +0000 (12:22 +0400)]
Merge pull request #2237 from ivylee:lbph_chi_square_alt
Ilya Lavrenov [Thu, 30 Jan 2014 15:37:01 +0000 (19:37 +0400)]
simplified cv::boxFilter OpenCL impl
Ivy Lee [Thu, 30 Jan 2014 21:53:05 +0000 (21:53 +0000)]
Fixed Bug #3514 Incorrect Chi-Square distance used in LBPH FaceRecognizer
Cosmin Boaca [Thu, 30 Jan 2014 14:43:56 +0000 (16:43 +0200)]
Fixed alignment
Cosmin Boaca [Thu, 30 Jan 2014 14:41:38 +0000 (16:41 +0200)]
Fixed alignment
Cosmin Boaca [Thu, 30 Jan 2014 14:38:15 +0000 (16:38 +0200)]
Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier
Andrey Pavlenko [Thu, 30 Jan 2014 13:33:06 +0000 (17:33 +0400)]
Merge pull request #2220 from ilya-lavrenov:tapi_accumulate
Andrey Pavlenko [Thu, 30 Jan 2014 13:28:43 +0000 (17:28 +0400)]
Merge pull request #2226 from ilya-lavrenov:tapi_calcHist
Cosmin Boaca [Thu, 30 Jan 2014 11:37:53 +0000 (13:37 +0200)]
Fixed broken alignment
Cosmin Boaca [Thu, 30 Jan 2014 11:32:32 +0000 (13:32 +0200)]
Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier
Ilya Lavrenov [Wed, 29 Jan 2014 19:00:33 +0000 (23:00 +0400)]
added conditional compilation
Ilya Lavrenov [Wed, 29 Jan 2014 12:33:44 +0000 (16:33 +0400)]
added performance test
Ilya Lavrenov [Wed, 29 Jan 2014 16:34:37 +0000 (20:34 +0400)]
added performance test
Ilya Lavrenov [Wed, 29 Jan 2014 16:19:15 +0000 (20:19 +0400)]
added cv::calcHist to T-API (only for CV_8UC1 with 256 bins)
Roman Donchenko [Wed, 29 Jan 2014 13:20:25 +0000 (17:20 +0400)]
Merge pull request #2212 from SpecLad:hog-sample-const-mat
Roman Donchenko [Wed, 29 Jan 2014 13:12:48 +0000 (17:12 +0400)]
Merge pull request #2214 from cosminBoaca:add_returnDFVal_parallel_predict
Cosmin Boaca [Wed, 29 Jan 2014 11:57:51 +0000 (13:57 +0200)]
Added result_probabilities parameter to CvNormalBayesClassifier::predict method. Issue #3401
Ilya Lavrenov [Tue, 28 Jan 2014 20:10:06 +0000 (00:10 +0400)]
implemented OpenCL version of cv::accumulate****
Andrey Pavlenko [Tue, 28 Jan 2014 12:31:29 +0000 (16:31 +0400)]
Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid
Cosmin Boaca [Tue, 28 Jan 2014 09:54:39 +0000 (11:54 +0200)]
Added returnDFVal parameter to parallel CvSVM::predict function
Roman Donchenko [Tue, 28 Jan 2014 08:44:29 +0000 (12:44 +0400)]
Merge pull request #2211 from SpecLad:merge-2.4
Andrey Pavlenko [Mon, 27 Jan 2014 14:56:05 +0000 (18:56 +0400)]
Merge pull request #2207 from ilya-lavrenov:tapi_macro
Ilya Lavrenov [Mon, 27 Jan 2014 09:25:21 +0000 (13:25 +0400)]
refactored imgproc
Ilya Lavrenov [Mon, 27 Jan 2014 14:34:19 +0000 (18:34 +0400)]
OpenCL version of cv::buildPyramid
Andrey Pavlenko [Mon, 27 Jan 2014 14:24:13 +0000 (18:24 +0400)]
Merge pull request #2208 from alalek:ocl_dynload_warn
Roman Donchenko [Mon, 27 Jan 2014 13:39:33 +0000 (17:39 +0400)]
Fixed build for samples/cpp/train_HOG.cpp.
get_hogdescriptor_visu is passed img->clone(), which is not usable
as a non-const reference (and it doesn't modify the argument, anyway).
Andrey Pavlenko [Mon, 27 Jan 2014 12:06:12 +0000 (16:06 +0400)]
Merge pull request #2203 from ilya-lavrenov:tapi_umat_vectors
Andrey Pavlenko [Mon, 27 Jan 2014 12:05:54 +0000 (16:05 +0400)]
Merge pull request #2206 from ilya-lavrenov:ocl_warn_fix
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
Alexander Alekhin [Mon, 27 Jan 2014 09:38:47 +0000 (13:38 +0400)]
core/ocl: added warning about incompatible configuration
Ilya Lavrenov [Mon, 27 Jan 2014 08:34:30 +0000 (12:34 +0400)]
warn fix
Ilya Lavrenov [Mon, 27 Jan 2014 08:32:26 +0000 (12:32 +0400)]
added macro with ability of returning values
Ilya Lavrenov [Fri, 24 Jan 2014 21:58:55 +0000 (01:58 +0400)]
fixed condition
Ilya Lavrenov [Fri, 24 Jan 2014 20:43:32 +0000 (00:43 +0400)]
fixed cv::split; enabled test
Ilya Lavrenov [Fri, 24 Jan 2014 20:27:33 +0000 (00:27 +0400)]
added STD_VECTOR_UMAT support to _OutputArray::create
Andrey Pavlenko [Mon, 27 Jan 2014 05:49:46 +0000 (09:49 +0400)]
Merge pull request #2027 from AD-530:brief_cl
Andrey Pavlenko [Sat, 25 Jan 2014 13:08:06 +0000 (17:08 +0400)]
Merge pull request #2155 from vbystricky:ocl_calcOpticalFlowPyrLK
Andrey Pavlenko [Sat, 25 Jan 2014 12:53:59 +0000 (16:53 +0400)]
Merge pull request #2204 from ilya-lavrenov:tapi_stitch_perf_fix
Andrey Pavlenko [Sat, 25 Jan 2014 12:32:54 +0000 (16:32 +0400)]
Merge pull request #2191 from ilya-lavrenov:tapi_macro
Ilya Lavrenov [Sat, 25 Jan 2014 07:50:28 +0000 (11:50 +0400)]
fix
Ilya Lavrenov [Fri, 24 Jan 2014 17:03:31 +0000 (21:03 +0400)]
refactored core using new macro
vbystricky [Thu, 23 Jan 2014 13:35:44 +0000 (17:35 +0400)]
Unused code removed
vbystricky [Thu, 23 Jan 2014 08:17:25 +0000 (12:17 +0400)]
Change type of result vector of ocl version from row to column
vbystricky [Mon, 20 Jan 2014 13:22:39 +0000 (17:22 +0400)]
Fix build error
vbystricky [Mon, 20 Jan 2014 12:21:08 +0000 (16:21 +0400)]
Change method of setting arguments to kernel to safe one
vbystricky [Mon, 20 Jan 2014 10:50:47 +0000 (14:50 +0400)]
Grow up epsilon for sanity checks
vbystricky [Mon, 20 Jan 2014 08:39:04 +0000 (12:39 +0400)]
Add perfomance test
vbystricky [Thu, 16 Jan 2014 12:24:10 +0000 (16:24 +0400)]
Fix builds errors
vbystricky [Thu, 16 Jan 2014 12:24:10 +0000 (16:24 +0400)]
Fix builds errors
vbystricky [Thu, 16 Jan 2014 11:44:35 +0000 (15:44 +0400)]
Validate parameters for using OpenCL version, before upload UMat
vbystricky [Thu, 16 Jan 2014 09:35:10 +0000 (13:35 +0400)]
Fix error with some opencl functions on the build WITH_OPENCL=OFF
vbystricky [Thu, 16 Jan 2014 07:57:57 +0000 (11:57 +0400)]
Move OpticalFlowPyrLK from ocl module to video module
Andrey Pavlenko [Fri, 24 Jan 2014 13:33:05 +0000 (17:33 +0400)]
Merge pull request #2149 from ElenaGvozdeva:ocl_matchTemplate
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
Andrey Pavlenko [Fri, 24 Jan 2014 13:03:42 +0000 (17:03 +0400)]
Merge pull request #2182 from KonstantinMatskevich:ocl_tapi_samples
Andrey Pavlenko [Fri, 24 Jan 2014 12:50:03 +0000 (16:50 +0400)]
Merge pull request #2142 from KonstantinMatskevich:ocl_tapi_bfmatcher
Andrey Pavlenko [Fri, 24 Jan 2014 12:44:19 +0000 (16:44 +0400)]
Merge pull request #2190 from KonstantinMatskevich:ocl_dumpinfo
Konstantin Matskevich [Fri, 24 Jan 2014 12:35:51 +0000 (16:35 +0400)]
add brackets
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
Konstantin Matskevich [Fri, 24 Jan 2014 10:01:31 +0000 (14:01 +0400)]
fixes
Konstantin Matskevich [Fri, 24 Jan 2014 09:37:19 +0000 (13:37 +0400)]
fixes
Konstantin Matskevich [Mon, 20 Jan 2014 06:25:05 +0000 (10:25 +0400)]
samples
Alexander Smorkalov [Thu, 23 Jan 2014 16:57:30 +0000 (20:57 +0400)]
Improvements in package build.
Elena Gvozdeva [Fri, 24 Jan 2014 07:41:23 +0000 (11:41 +0400)]
fixed
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'
Elena Gvozdeva [Thu, 23 Jan 2014 11:31:32 +0000 (15:31 +0400)]
Fixed merge conflicts
Elena Gvozdeva [Wed, 22 Jan 2014 09:34:40 +0000 (13:34 +0400)]
fixed
Elena Gvozdeva [Tue, 21 Jan 2014 12:57:01 +0000 (16:57 +0400)]
fixed pref test
Elena Gvozdeva [Mon, 20 Jan 2014 11:48:16 +0000 (15:48 +0400)]
Added perf test for ocl_matchTemplate
Elena Gvozdeva [Fri, 17 Jan 2014 14:37:57 +0000 (18:37 +0400)]
fixed trailing whitespace
Elena Gvozdeva [Fri, 17 Jan 2014 12:26:11 +0000 (16:26 +0400)]
fixed
Elena Gvozdeva [Fri, 17 Jan 2014 11:01:22 +0000 (15:01 +0400)]
fixed
Elena Gvozdeva [Thu, 16 Jan 2014 10:26:48 +0000 (14:26 +0400)]
fixed
Elena Gvozdeva [Wed, 15 Jan 2014 06:24:14 +0000 (10:24 +0400)]
Fixed test_match_template
Elena Gvozdeva [Tue, 14 Jan 2014 13:34:05 +0000 (17:34 +0400)]
Fixed trailing whitespace
Elena Gvozdeva [Tue, 14 Jan 2014 12:31:04 +0000 (16:31 +0400)]
Fixed warnings
Elena Gvozdeva [Tue, 14 Jan 2014 10:45:01 +0000 (14:45 +0400)]
Added ocl_matchTemplate( without dft)
Andrey Pavlenko [Thu, 23 Jan 2014 10:37:33 +0000 (14:37 +0400)]
Merge pull request #2110 from hmax:master
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
Konstantin Matskevich [Fri, 17 Jan 2014 07:23:00 +0000 (11:23 +0400)]
added perf test
Andrey Pavlenko [Wed, 22 Jan 2014 15:13:05 +0000 (19:13 +0400)]
Merge pull request #2189 from ilya-lavrenov:tapi_sepFilter2D_fix
Andrey Pavlenko [Wed, 22 Jan 2014 15:09:34 +0000 (19:09 +0400)]
Merge pull request #2186 from ilya-lavrenov:tapi_precornerdetect
Andrey Pavlenko [Wed, 22 Jan 2014 14:57:33 +0000 (18:57 +0400)]
Merge pull request #2134 from vbystricky:ocl_calcOpticalFlowFarneback
Vincent Rabaud [Wed, 22 Jan 2014 14:26:14 +0000 (15:26 +0100)]
fix message sent to user during cross_compilation
Konstantin Matskevich [Wed, 22 Jan 2014 06:08:42 +0000 (10:08 +0400)]
dumpinfo
Konstantin Matskevich [Fri, 17 Jan 2014 06:09:44 +0000 (10:09 +0400)]
removed unnecessary functions and variables
projects / platform / upstream / opencv.git / log