Roman Donchenko [Mon, 3 Feb 2014 09:23:59 +0000 (13:23 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
Roman Donchenko [Mon, 3 Feb 2014 08:12:11 +0000 (12:12 +0400)]
Merge pull request #2253 from ilya-lavrenov:cuda
Roman Donchenko [Mon, 3 Feb 2014 08:11:27 +0000 (12:11 +0400)]
Merge pull request #2254 from ilya-lavrenov:opengl
Andrey Pavlenko [Sat, 1 Feb 2014 18:32:39 +0000 (22:32 +0400)]
Merge pull request #2230 from ilya-lavrenov:tapi_openc_on-off_game
Ilya Lavrenov [Sat, 1 Feb 2014 14:14:10 +0000 (18:14 +0400)]
unused function in case of unavailable OpenGL
Ilya Lavrenov [Sat, 1 Feb 2014 14:11:19 +0000 (18:11 +0400)]
fixed unused function in case of unavailable CUDA
Roman Donchenko [Fri, 31 Jan 2014 16:49:04 +0000 (20:49 +0400)]
Merge pull request #2249 from jet47:gpu-tests-disable
Roman Donchenko [Fri, 31 Jan 2014 16:48:52 +0000 (20:48 +0400)]
Merge pull request #2248 from jet47:gpu-npp-disable
Roman Donchenko [Fri, 31 Jan 2014 16:48:37 +0000 (20:48 +0400)]
Merge pull request #2247 from jet47:gpu-test-cufft
Andrey Pavlenko [Fri, 31 Jan 2014 15:38:57 +0000 (19:38 +0400)]
Merge pull request #2219 from ilya-lavrenov:createHanningWindow
Ilya Lavrenov [Tue, 28 Jan 2014 19:10:43 +0000 (23:10 +0400)]
optimized createHanningWindow
Andrey Pavlenko [Fri, 31 Jan 2014 15:25:00 +0000 (19:25 +0400)]
Merge pull request #2219 from ilya-lavrenov:createHanningWindow
Andrey Pavlenko [Fri, 31 Jan 2014 15:23:01 +0000 (19:23 +0400)]
Merge pull request #2218 from alalek:fix_defects_code_coverity
Andrey Pavlenko [Fri, 31 Jan 2014 15:22:37 +0000 (19:22 +0400)]
Merge pull request #2216 from ElenaGvozdeva:ocl_MOG2
Andrey Pavlenko [Fri, 31 Jan 2014 15:22:18 +0000 (19:22 +0400)]
Merge pull request #2202 from ilya-lavrenov:tapi_GFTTDetector
Andrey Pavlenko [Fri, 31 Jan 2014 15:17:16 +0000 (19:17 +0400)]
Merge pull request #2232 from ilya-lavrenov:ABF_drop
Ilya Lavrenov [Thu, 30 Jan 2014 09:13:33 +0000 (13:13 +0400)]
removed ABF
Andrey Pavlenko [Fri, 31 Jan 2014 15:14:18 +0000 (19:14 +0400)]
Merge pull request #2228 from ilya-lavrenov:tapi_experiments
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
Roman Donchenko [Fri, 31 Jan 2014 13:24:21 +0000 (17:24 +0400)]
Merge pull request #2242 from jet47:gpu-test-fix
Vladislav Vinogradov [Fri, 31 Jan 2014 12:20:45 +0000 (16:20 +0400)]
disable gpu CvtColor.*2HSV tests:
possible bug in CPU version
Vladislav Vinogradov [Fri, 31 Jan 2014 12:15:11 +0000 (16:15 +0400)]
disable gpu Subtract_Array test:
possible bug in CPU version
Vladislav Vinogradov [Fri, 31 Jan 2014 12:10:37 +0000 (16:10 +0400)]
disable gpu Canny and HoughCircles perf tests:
it fails because driver terminates CUDA kernels after time out
Vladislav Vinogradov [Fri, 31 Jan 2014 11:52:06 +0000 (15:52 +0400)]
disable NPP for GpuMat methods and for copyMakeBorder
Vladislav Vinogradov [Fri, 31 Jan 2014 11:40:59 +0000 (15:40 +0400)]
disable some gpu tests if library was built without CUFFT
Roman Donchenko [Fri, 31 Jan 2014 10:56:10 +0000 (14:56 +0400)]
Merge pull request #2241 from asmorkalov:ocv_highgui_test_output_fix
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
Roman Donchenko [Fri, 31 Jan 2014 10:24:04 +0000 (14:24 +0400)]
Merge pull request #2240 from jet47:gpu-generalized-hough
Ilya Lavrenov [Fri, 31 Jan 2014 10:00:05 +0000 (14:00 +0400)]
cached commonly used device properties
Roman Donchenko [Fri, 31 Jan 2014 09:56:48 +0000 (13:56 +0400)]
Merge pull request #2238 from asmorkalov:ocv_test_package_reports
Ilya Lavrenov [Fri, 31 Jan 2014 09:19:16 +0000 (13:19 +0400)]
OCL module 2 trash
Vladislav Vinogradov [Fri, 31 Jan 2014 09:19:15 +0000 (13:19 +0400)]
gpu test output files moved from cwd to temp folder
Alexander Smorkalov [Fri, 31 Jan 2014 06:47:01 +0000 (10:47 +0400)]
Reports path fix for opencv_run_all_tests.sh.in script.
Roman Donchenko [Fri, 31 Jan 2014 08:49:18 +0000 (12:49 +0400)]
Merge pull request #2223 from cosminBoaca:add_prob_result_bayes_classifier
Alexander Smorkalov [Fri, 31 Jan 2014 08:49:10 +0000 (12:49 +0400)]
Highgui test output fixes.
Useless output to console fixed;
Test output files moved from cwd to temp folder.
Vladislav Vinogradov [Fri, 31 Jan 2014 08:40:40 +0000 (12:40 +0400)]
disable performance test for gpu generalized hough
Roman Donchenko [Fri, 31 Jan 2014 08:22:24 +0000 (12:22 +0400)]
Merge pull request #2237 from ivylee:lbph_chi_square_alt
Elena Gvozdeva [Fri, 31 Jan 2014 06:46:29 +0000 (10:46 +0400)]
fixed test
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
Ilya Lavrenov [Thu, 30 Jan 2014 13:23:56 +0000 (17:23 +0400)]
workaround
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 [Thu, 30 Jan 2014 11:23:11 +0000 (15:23 +0400)]
moved kernelToStr to ocl.hpp
Roman Donchenko [Thu, 30 Jan 2014 09:22:10 +0000 (13:22 +0400)]
Merge pull request #2231 from asmorkalov:android_toolchain_update
Ilya Lavrenov [Wed, 29 Jan 2014 19:00:33 +0000 (23:00 +0400)]
added conditional compilation
Roman Donchenko [Thu, 30 Jan 2014 08:43:50 +0000 (12:43 +0400)]
Merge pull request #2224 from SpecLad:obsolete-immediate
Roman Donchenko [Thu, 30 Jan 2014 08:23:20 +0000 (12:23 +0400)]
Merge pull request #2229 from ilya-lavrenov:possible_memory_leak
Alexander Smorkalov [Thu, 30 Jan 2014 07:08:49 +0000 (11:08 +0400)]
Android toolchain file sync with original project.
Original project: https://github.com/taka-no-me/android-cmake/
Revision:
5db45cfb87fec180b74963d3680dd60d4d8d8c3a
Ilya Lavrenov [Thu, 30 Jan 2014 01:48:15 +0000 (05:48 +0400)]
fixed fp problem
Ilya Lavrenov [Wed, 29 Jan 2014 12:33:44 +0000 (16:33 +0400)]
added performance test
Ilya Lavrenov [Wed, 29 Jan 2014 21:47:25 +0000 (01:47 +0400)]
fix for PR 2196
Ilya Lavrenov [Wed, 29 Jan 2014 21:14:02 +0000 (01:14 +0400)]
eliminated possible memory leak
Ilya Lavrenov [Wed, 29 Jan 2014 20:19:18 +0000 (00:19 +0400)]
async
Ilya Lavrenov [Wed, 29 Jan 2014 20:12:59 +0000 (00:12 +0400)]
some experiments
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)
Alexander Alekhin [Wed, 29 Jan 2014 14:58:27 +0000 (18:58 +0400)]
fix unintialized fields
Alexander Alekhin [Wed, 29 Jan 2014 13:37:52 +0000 (17:37 +0400)]
fix memory management problem
Roman Donchenko [Wed, 29 Jan 2014 15:34:02 +0000 (19:34 +0400)]
Removed all use of the obsolete IMMEDIATE parameter to configure_file.
It's not documented, and it does nothing unless CMake 2.0 compatibility
is enabled (and it isn't):
https://github.com/Kitware/CMake/blob/v2.6.0/Source/cmConfigureFileCommand.cxx
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
Roman Donchenko [Wed, 29 Jan 2014 13:09:28 +0000 (17:09 +0400)]
Merge pull request #2221 from asmorkalov:ocv_test_install_custom
Alexander Smorkalov [Wed, 29 Jan 2014 08:01:06 +0000 (12:01 +0400)]
opencv_run_all_tests.sh script added to -tests package.
Cosmin Boaca [Wed, 29 Jan 2014 11:57:51 +0000 (13:57 +0200)]
Added result_probabilities parameter to CvNormalBayesClassifier::predict method. Issue #3401
Elena Gvozdeva [Wed, 29 Jan 2014 10:10:36 +0000 (14:10 +0400)]
fixed
Ilya Lavrenov [Tue, 28 Jan 2014 20:10:06 +0000 (00:10 +0400)]
implemented OpenCL version of cv::accumulate****
Elena Gvozdeva [Wed, 29 Jan 2014 07:05:05 +0000 (11:05 +0400)]
fixed warnings
Ilya Lavrenov [Tue, 28 Jan 2014 19:10:43 +0000 (23:10 +0400)]
optimized createHanningWindow
Alexander Alekhin [Tue, 28 Jan 2014 16:22:56 +0000 (20:22 +0400)]
fixes for defects from code coverity
Roman Donchenko [Tue, 28 Jan 2014 13:51:06 +0000 (17:51 +0400)]
Merge pull request #2215 from asmorkalov:ocv_testpack_fix
Alexander Smorkalov [Tue, 28 Jan 2014 10:05:26 +0000 (14:05 +0400)]
Multiple fixes for tests deb package build.
Added opencv_testing.sh.in file;
opencv_testing.sh installation guarded by OS check.
Andrey Pavlenko [Tue, 28 Jan 2014 12:31:29 +0000 (16:31 +0400)]
Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid
Elena Gvozdeva [Tue, 28 Jan 2014 12:22:42 +0000 (16:22 +0400)]
fixed
Elena Gvozdeva [Mon, 27 Jan 2014 13:32:51 +0000 (17:32 +0400)]
Added ocl_Mog2
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
Roman Donchenko [Tue, 28 Jan 2014 08:23:32 +0000 (12:23 +0400)]
Merge pull request #2205 from jet47:bug-3477-fix
Andrey Pavlenko [Tue, 28 Jan 2014 06:51:11 +0000 (10:51 +0400)]
Merge pull request #2097 from pclove1:blur_border_isolated
Vladislav Vinogradov [Tue, 28 Jan 2014 06:28:00 +0000 (10:28 +0400)]
fix #3477:
CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING property is not supported
by all VideoCapture backends. Some backends can return 0.0 or -1.0.
Seunghoon Park [Tue, 28 Jan 2014 01:57:40 +0000 (20:57 -0500)]
fixing bug #3345. use norm to make sure two matrices are the same.
Seunghoon Park [Tue, 28 Jan 2014 01:44:03 +0000 (20:44 -0500)]
Merge branch '2.4' into blur_border_isolated
Roman Donchenko [Mon, 27 Jan 2014 16:59:53 +0000 (20:59 +0400)]
Merge pull request #2209 from asmorkalov:ocv_test_install
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
Alexander Smorkalov [Mon, 27 Jan 2014 13:57:11 +0000 (17:57 +0400)]
Code review notes fixed.
Env setup for testing package implemented using /etc/profile.d;
Variable with path for all native samples added;
Path for test binaries and test data updated.
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
projects / profile / ivi / opencv.git / log