Roman Donchenko [Mon, 30 Dec 2013 12:50:09 +0000 (16:50 +0400)]
Merge commit '
719149877e' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:49:39 +0000 (16:49 +0400)]
Merge commit '
ee36717d' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:48:45 +0000 (16:48 +0400)]
Merge commit '
4b885e206' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:48:30 +0000 (16:48 +0400)]
Merge commit '
709e8e8e0' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:47:05 +0000 (16:47 +0400)]
Merge commit '
60906d917' into merge-2.4
Conflicts:
modules/ts/src/cuda_perf.cpp
Roman Donchenko [Mon, 30 Dec 2013 12:41:10 +0000 (16:41 +0400)]
Merge commit '
8fe79738c' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:39:51 +0000 (16:39 +0400)]
Merge commit '
b94963d38' into merge-2.4
Conflicts:
cmake/OpenCVGenAndroidMK.cmake
Roman Donchenko [Mon, 30 Dec 2013 12:38:52 +0000 (16:38 +0400)]
Merge commit '
24be7b26c' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:37:39 +0000 (16:37 +0400)]
Merge commit '
1acc1085d' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:37:26 +0000 (16:37 +0400)]
Merge commit '
edce617a5' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:36:35 +0000 (16:36 +0400)]
Merge commit '
83cdd43a' into merge-2.4
Conflicts:
modules/core/include/opencv2/core/version.hpp
Roman Donchenko [Mon, 30 Dec 2013 12:34:59 +0000 (16:34 +0400)]
Merge commit '
f22d9a23' into merge-2.4 (-s ours)
Andrey Pavlenko [Sat, 28 Dec 2013 18:06:12 +0000 (22:06 +0400)]
Merge pull request #2081 from ilya-lavrenov:tapi_perf
Andrey Pavlenko [Sat, 28 Dec 2013 18:05:49 +0000 (22:05 +0400)]
Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels
Andrey Pavlenko [Fri, 27 Dec 2013 18:38:08 +0000 (22:38 +0400)]
Merge pull request #2055 from vbystricky:ocl_sepFilter2D
Ilya Lavrenov [Fri, 27 Dec 2013 17:57:20 +0000 (21:57 +0400)]
disabled cv::split perf test
Roman Donchenko [Fri, 27 Dec 2013 16:23:56 +0000 (20:23 +0400)]
Merge pull request #2077 from ilya-lavrenov:tapi_context
Ilya Lavrenov [Fri, 27 Dec 2013 12:33:18 +0000 (16:33 +0400)]
added new perf tests to core
vbystricky [Fri, 27 Dec 2013 12:26:34 +0000 (16:26 +0400)]
Change threshold from 2.0 to 1.0 in the test
vbystricky [Fri, 27 Dec 2013 12:21:32 +0000 (16:21 +0400)]
Change sprintf to cv::format, and EXPECT_MAT_NEAR to OCL_EXPECT_MATS_NEAR
Andrey Pavlenko [Fri, 27 Dec 2013 11:49:27 +0000 (15:49 +0400)]
Merge pull request #2034 from pentschev:ocl_features2d_orb_master
Andrey Pavlenko [Fri, 27 Dec 2013 11:44:11 +0000 (15:44 +0400)]
Merge pull request #2063 from vpisarev:ocl_moments
Andrey Pavlenko [Fri, 27 Dec 2013 11:38:51 +0000 (15:38 +0400)]
Merge pull request #2076 from ilya-lavrenov:tapi_dft
Ilya Lavrenov [Fri, 27 Dec 2013 10:02:03 +0000 (14:02 +0400)]
this commit prevents segfaults in case of opencl disabled
Ilya Lavrenov [Fri, 27 Dec 2013 09:59:55 +0000 (13:59 +0400)]
some fixes of cv::mixChannels
Ilya Lavrenov [Fri, 27 Dec 2013 09:39:29 +0000 (13:39 +0400)]
disabled cv::dft opencl impl for CPU devices
Ilya Lavrenov [Fri, 27 Dec 2013 09:18:31 +0000 (13:18 +0400)]
fixed getUMatIndex
Ilya Lavrenov [Thu, 26 Dec 2013 14:48:43 +0000 (18:48 +0400)]
added cv::mixChannels to T-API
Roman Donchenko [Fri, 27 Dec 2013 08:43:49 +0000 (12:43 +0400)]
Merge pull request #2074 from asmorkalov:android_nonfree_cuda
Roman Donchenko [Fri, 27 Dec 2013 08:11:51 +0000 (12:11 +0400)]
Merge pull request #2037 from GregoryMorse:patch-2
Alexander Smorkalov [Fri, 27 Dec 2013 07:18:10 +0000 (11:18 +0400)]
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
Peter Andreas Entschev [Sat, 21 Dec 2013 01:04:58 +0000 (23:04 -0200)]
OCL: included ORB featured detector/descriptor extractor.
Vadim Pisarevsky [Thu, 26 Dec 2013 19:29:04 +0000 (23:29 +0400)]
improved performance of moments (on 720p or larger images)
Andrey Pavlenko [Thu, 26 Dec 2013 19:07:24 +0000 (23:07 +0400)]
Merge pull request #2069 from asmorkalov:android_ocl_1_1_fix
Andrey Pavlenko [Thu, 26 Dec 2013 18:41:52 +0000 (22:41 +0400)]
Merge pull request #2068 from akarsakov:disable_ipp
Vadim Pisarevsky [Thu, 26 Dec 2013 18:00:29 +0000 (22:00 +0400)]
hopefully fixed test failures and complains from the doc builder
Alexander Smorkalov [Thu, 26 Dec 2013 17:20:32 +0000 (21:20 +0400)]
static function qualifier replaced on inline to enable kernel compilation with OpenCL 1.1 embedded profile.
Andrey Pavlenko [Thu, 26 Dec 2013 16:37:33 +0000 (20:37 +0400)]
Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject
Alexander Karsakov [Thu, 26 Dec 2013 15:53:53 +0000 (19:53 +0400)]
Disabled some IPP implementation since it breaks tests
Andrey Pavlenko [Thu, 26 Dec 2013 15:38:56 +0000 (19:38 +0400)]
Merge pull request #2061 from apavlenko:2.4_fix_build_vs12
Andrey Pavlenko [Thu, 26 Dec 2013 15:38:01 +0000 (19:38 +0400)]
Merge pull request #2066 from ilya-lavrenov:tapi_ocl
Andrey Pavlenko [Thu, 26 Dec 2013 15:20:12 +0000 (19:20 +0400)]
Merge pull request #2028 from KonstantinMatskevich:ocl_tapi_morphology
Ilya Lavrenov [Thu, 26 Dec 2013 12:17:06 +0000 (16:17 +0400)]
added cv::calcBackProject for 2-dimensional histograms
Roman Donchenko [Thu, 26 Dec 2013 13:47:09 +0000 (17:47 +0400)]
Merge pull request #2064 from dpen2000:patch-2
Andrey Pavlenko [Thu, 26 Dec 2013 13:27:05 +0000 (17:27 +0400)]
Merge pull request #2054 from alalek:ocl_tapi_dev_selection
Konstantin Matskevich [Thu, 26 Dec 2013 13:16:55 +0000 (17:16 +0400)]
hope last fix
Ilya Lavrenov [Thu, 26 Dec 2013 13:14:20 +0000 (17:14 +0400)]
fixed warning [ -Wreorder ]
Ilya Lavrenov [Thu, 26 Dec 2013 13:13:26 +0000 (17:13 +0400)]
removed unnecessary data copying
Roman Donchenko [Thu, 26 Dec 2013 12:59:56 +0000 (16:59 +0400)]
Merge pull request #2057 from asmorkalov:android_cuda_sample
Andrey Pavlenko [Thu, 26 Dec 2013 11:49:12 +0000 (15:49 +0400)]
removing legacy stuff
GregoryMorse [Sun, 22 Dec 2013 16:28:50 +0000 (00:28 +0800)]
Update CMakeLists.txt
WinRT native C++ support allowing building of static libraries
Update CMakeLists.txt
Update OpenCVCRTLinkage.cmake
Update OpenCVCRTLinkage.cmake
Ilya Lavrenov [Mon, 23 Dec 2013 13:37:41 +0000 (17:37 +0400)]
ported cv::calcBackProject to T-API
Alexander Smorkalov [Wed, 25 Dec 2013 13:50:15 +0000 (17:50 +0400)]
CUDA support check added.
Alexander Smorkalov [Mon, 23 Dec 2013 11:20:09 +0000 (15:20 +0400)]
New sample for CUDA on Android added.
Roman Donchenko [Thu, 26 Dec 2013 10:39:51 +0000 (14:39 +0400)]
Merge pull request #2060 from asmorkalov:ocv_ts_cuda
dpen2000 [Thu, 26 Dec 2013 10:36:24 +0000 (10:36 +0000)]
Fix python sample path
Roman Donchenko [Thu, 26 Dec 2013 10:21:21 +0000 (14:21 +0400)]
Merge pull request #2056 from asmorkalov:java_core_cuda_wrappers
Roman Donchenko [Thu, 26 Dec 2013 10:16:29 +0000 (14:16 +0400)]
Merge pull request #2050 from asmorkalov:android_mk_fix2
Andrey Pavlenko [Thu, 26 Dec 2013 09:35:59 +0000 (13:35 +0400)]
eliminating VS2013 build warnings
Vadim Pisarevsky [Thu, 26 Dec 2013 09:25:00 +0000 (13:25 +0400)]
tuned the speed for OpenCL-based moments (still slower than the single-thread SSE2 CPU code :( )
Alexander Smorkalov [Tue, 24 Dec 2013 12:36:11 +0000 (16:36 +0400)]
Fake dependency from CUDA in case of satic linkage with OpenCV removed.
Roman Donchenko [Thu, 26 Dec 2013 08:22:45 +0000 (12:22 +0400)]
Merge pull request #2052 from SpecLad:seporate
Alexander Smorkalov [Wed, 25 Dec 2013 13:10:50 +0000 (17:10 +0400)]
Java wrappers for functions from cv::gpu namespace in core module added.
Roman Donchenko [Thu, 26 Dec 2013 08:07:00 +0000 (12:07 +0400)]
Merge pull request #2049 from asmorkalov:android_cuda_warning_fix
Alexander Smorkalov [Thu, 26 Dec 2013 07:36:00 +0000 (11:36 +0400)]
ts dependency from CUDA runtime removed. All implicit CUDA calls replaced by calls from core module.
Konstantin Matskevich [Thu, 26 Dec 2013 06:45:09 +0000 (10:45 +0400)]
not synchronous kernel's run
Alexander Smorkalov [Tue, 24 Dec 2013 08:23:50 +0000 (12:23 +0400)]
CUDA warning fix/supporession for Android.
Alexander Smorkalov [Thu, 26 Dec 2013 06:16:29 +0000 (10:16 +0400)]
Dynamic CUDA support library name fixed. Additional error messages added.
Konstantin Matskevich [Mon, 23 Dec 2013 08:27:39 +0000 (12:27 +0400)]
some fixes
Konstantin Matskevich [Wed, 18 Dec 2013 05:37:57 +0000 (09:37 +0400)]
morphology
Alexander Alekhin [Wed, 25 Dec 2013 14:41:24 +0000 (18:41 +0400)]
fixes
Vadim Pisarevsky [Wed, 25 Dec 2013 22:57:08 +0000 (02:57 +0400)]
moments work now and work more or less fast
Andrey Pavlenko [Wed, 25 Dec 2013 20:14:23 +0000 (00:14 +0400)]
Merge pull request #2046 from ilya-lavrenov:tapi_inrange
Andrey Pavlenko [Wed, 25 Dec 2013 20:13:28 +0000 (00:13 +0400)]
Merge pull request #1984 from ilya-lavrenov:tapi_perf
Andrey Pavlenko [Wed, 25 Dec 2013 20:05:13 +0000 (00:05 +0400)]
Merge pull request #2053 from KonstantinMatskevich:ocl_bugfix_eqhist
Vadim Pisarevsky [Wed, 25 Dec 2013 17:09:23 +0000 (21:09 +0400)]
experimental moments implementation (does not work yet)
Roman Donchenko [Wed, 25 Dec 2013 15:36:49 +0000 (19:36 +0400)]
Merge pull request #2017 from pemmanuelviel:flannMemoryLeak
Andrey Pavlenko [Wed, 25 Dec 2013 15:00:25 +0000 (19:00 +0400)]
Merge pull request #2043 from ilya-lavrenov:tapi_hack
Andrey Pavlenko [Wed, 25 Dec 2013 15:00:06 +0000 (19:00 +0400)]
Merge pull request #2042 from vpisarev:ocl_facedetect8
Ilya Lavrenov [Mon, 23 Dec 2013 15:37:59 +0000 (19:37 +0400)]
added cv::inRange to T-API
Ilya Lavrenov [Fri, 13 Dec 2013 15:35:30 +0000 (19:35 +0400)]
added perf tests for T-API core functions
vbystricky [Wed, 25 Dec 2013 14:05:07 +0000 (18:05 +0400)]
Fix compilation warnings
vbystricky [Wed, 25 Dec 2013 11:39:30 +0000 (15:39 +0400)]
Add ocl implementation of the sepFilter2D into img_proc module.
Roman Donchenko [Wed, 25 Dec 2013 12:18:00 +0000 (16:18 +0400)]
Merge pull request #2045 from SpecLad:merge-2.4
Alexander Alekhin [Wed, 25 Dec 2013 10:39:21 +0000 (14:39 +0400)]
core/ocl: temporary move device selection from ocl module
Konstantin Matskevich [Wed, 25 Dec 2013 11:02:56 +0000 (15:02 +0400)]
bugfix in equalizeHist
Roman Donchenko [Wed, 25 Dec 2013 10:04:44 +0000 (14:04 +0400)]
Fixed the seporate/seporator typo everywhere.
Roman Donchenko [Wed, 25 Dec 2013 09:14:13 +0000 (13:14 +0400)]
Merge pull request #2051 from AlexWillisson:patch-2
Alex Willisson [Wed, 25 Dec 2013 00:53:50 +0000 (19:53 -0500)]
Fixed typo in comment
Ilya Lavrenov [Mon, 23 Dec 2013 11:49:45 +0000 (15:49 +0400)]
removed unnecessary assert
Vadim Pisarevsky [Mon, 23 Dec 2013 17:29:31 +0000 (21:29 +0400)]
workaround for some strange bug on old Mac.
Andrey Pavlenko [Mon, 23 Dec 2013 15:19:00 +0000 (19:19 +0400)]
Merge pull request #2033 from ilya-lavrenov:tapi_normalize
Ilya Lavrenov [Fri, 20 Dec 2013 16:10:43 +0000 (20:10 +0400)]
added cv::normalize to T-API; implemented missed UMat::copyTo with mask
Andrey Pavlenko [Mon, 23 Dec 2013 15:09:59 +0000 (19:09 +0400)]
Merge pull request #2041 from ilya-lavrenov:tapi_mul_div
Roman Donchenko [Mon, 23 Dec 2013 14:50:17 +0000 (18:50 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
Vadim Pisarevsky [Mon, 23 Dec 2013 14:41:54 +0000 (18:41 +0400)]
removed extra whitespaces and hopefully fixed the test failures
Roman Donchenko [Mon, 23 Dec 2013 14:02:18 +0000 (18:02 +0400)]
Merge pull request #2040 from asmorkalov:android_mk_fix
Alexander Smorkalov [Mon, 23 Dec 2013 10:42:00 +0000 (14:42 +0400)]
OCV option ENABLE_DYNAMIC_CUDA mistake fix.
Roman Donchenko [Mon, 23 Dec 2013 11:53:11 +0000 (15:53 +0400)]
Merge pull request #2039 from asmorkalov:ocv_version_inc3
Vadim Pisarevsky [Mon, 23 Dec 2013 11:28:50 +0000 (15:28 +0400)]
added OpenCL optimization for LBP-based face detector
projects / platform / upstream / opencv.git / log