Lars Glud [Sun, 20 Jul 2014 12:28:10 +0000 (14:28 +0200)]
Merge remote-tracking branch 'origin/master' into Openni2Support
Conflicts:
modules/highgui/CMakeLists.txt
modules/highgui/include/opencv2/highgui.hpp
modules/highgui/include/opencv2/highgui/highgui_c.h
Vadim Pisarevsky [Sat, 19 Jul 2014 18:04:14 +0000 (18:04 +0000)]
Merge pull request #2925 from BloodAxe:osx-framework-script
Vadim Pisarevsky [Fri, 18 Jul 2014 09:58:06 +0000 (09:58 +0000)]
Merge pull request #2979 from PhilLab:patch-2
Vadim Pisarevsky [Fri, 18 Jul 2014 09:25:22 +0000 (09:25 +0000)]
Merge pull request #2933 from ilya-lavrenov:sse_moments
PhilLab [Thu, 17 Jul 2014 07:19:31 +0000 (09:19 +0200)]
Function for drawing arrows
Porting the [PR 2970](https://github.com/Itseez/opencv/pull/2970) To the new InputOutputArray type
Vadim Pisarevsky [Wed, 16 Jul 2014 19:29:36 +0000 (19:29 +0000)]
Merge pull request #2964 from vbystricky:highgui_split
Lars Glud [Tue, 1 Jul 2014 08:07:01 +0000 (10:07 +0200)]
Openni2 support
Vadim Pisarevsky [Tue, 15 Jul 2014 09:46:28 +0000 (09:46 +0000)]
Merge pull request #2910 from ilya-lavrenov:sse2_canny
Vadim Pisarevsky [Tue, 15 Jul 2014 08:57:31 +0000 (08:57 +0000)]
Merge pull request #2765 from pradeep-pyro:kullback_leibler
Vadim Pisarevsky [Tue, 15 Jul 2014 08:09:04 +0000 (08:09 +0000)]
Merge pull request #2939 from adishavit:sample-fix_stitching_pipeline
pradeep [Tue, 15 Jul 2014 04:32:53 +0000 (12:32 +0800)]
Changed cv::log to std::log
VBystricky [Mon, 14 Jul 2014 19:30:50 +0000 (23:30 +0400)]
Refresh code. Fix merge conflict
Vadim Pisarevsky [Mon, 14 Jul 2014 19:21:14 +0000 (19:21 +0000)]
Merge pull request #2953 from gongzg:master
vbystricky [Thu, 10 Jul 2014 14:27:32 +0000 (18:27 +0400)]
Split highgui module to videoio and highgui
Vadim Pisarevsky [Mon, 14 Jul 2014 18:53:25 +0000 (18:53 +0000)]
Merge pull request #2947 from vbystricky:capDShow
Alexander Alekhin [Mon, 14 Jul 2014 18:48:28 +0000 (18:48 +0000)]
Merge pull request #2882 from akarsakov:ocl_pyrDown_opt
Roman Donchenko [Mon, 14 Jul 2014 08:20:54 +0000 (08:20 +0000)]
Merge pull request #2962 from alalek:fix_v4l_build
Alexander Alekhin [Sat, 12 Jul 2014 05:00:57 +0000 (05:00 +0000)]
Merge pull request #2918 from vbystricky:oclopt_reduce2
Alexander Alekhin [Fri, 11 Jul 2014 14:55:13 +0000 (14:55 +0000)]
Merge pull request #2963 from ilya-lavrenov:tapi_bufferpool
Alexander Alekhin [Fri, 11 Jul 2014 14:53:46 +0000 (14:53 +0000)]
Merge pull request #2935 from vbystricky:oclopt_meanStdDev
Alexander Alekhin [Fri, 11 Jul 2014 10:00:15 +0000 (10:00 +0000)]
Merge pull request #2851 from ilya-lavrenov:tapi_set_identity
Alexander Alekhin [Fri, 11 Jul 2014 09:59:26 +0000 (09:59 +0000)]
Merge pull request #2888 from ilya-lavrenov:tapi_remap
Ilya Lavrenov [Thu, 10 Jul 2014 14:13:01 +0000 (18:13 +0400)]
enabled BufferPool
Alexander Alekhin [Thu, 10 Jul 2014 13:59:37 +0000 (17:59 +0400)]
fix build
Alexander Alekhin [Thu, 10 Jul 2014 09:38:37 +0000 (09:38 +0000)]
Merge pull request #2927 from ilya-lavrenov:tapi_lut
Vadim Pisarevsky [Thu, 10 Jul 2014 05:28:44 +0000 (05:28 +0000)]
Merge pull request #2943 from vbystricky:highgui_imgcodecs
Zhigang Gong [Wed, 9 Jul 2014 08:04:22 +0000 (16:04 +0800)]
Avoid unmap an umat(ocl) which hasn't been mapped at all.
According to opencl 1.2 spec 5.4.2:
enqueues a command to unmap a previously mapped region of a memory object.
...
CL_INVALID_VALUE if mapped_ptr is not a valid pointer returned by
clEnqueueMapBuffer, or clEnqueueMapImage for memobj.
So if the u->data is not from a clEnqueueMapBuffer call, we should not
call clEnqueueUnmapMemObject() unmap it. With this patch, the cases
./opencv_test_video --gtest_filter=OCL_Video/FarnebackOpticalFlow.Mat/*
could work well with beignet 0.9.1, Otherwise, it will get a
CL_INVALID_VALUE at the clEnqueueUnmapMemObject().
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
pradeep [Wed, 9 Jul 2014 07:29:47 +0000 (15:29 +0800)]
Fixed truncation warning
pradeep [Wed, 9 Jul 2014 05:39:40 +0000 (13:39 +0800)]
Fixed test errors, added support for C data types.
Alexander Alekhin [Tue, 8 Jul 2014 15:21:35 +0000 (15:21 +0000)]
Merge pull request #2951 from ilya-lavrenov:tapi_ipp_filter2d
Ilya Lavrenov [Tue, 8 Jul 2014 14:51:27 +0000 (18:51 +0400)]
OpenCL before IPP
vbystricky [Tue, 8 Jul 2014 09:29:28 +0000 (13:29 +0400)]
Remove unused variable
vbystricky [Tue, 8 Jul 2014 08:21:54 +0000 (12:21 +0400)]
DShow camera as IVideoCapture object
Alexander Alekhin [Tue, 8 Jul 2014 07:30:48 +0000 (07:30 +0000)]
Merge pull request #2936 from ilya-lavrenov:tapi_minmaxloc_opt
Vadim Pisarevsky [Mon, 7 Jul 2014 13:35:08 +0000 (13:35 +0000)]
Merge pull request #2669 from Adil-Ibragimov:flann_distance_fix
vbystricky [Fri, 4 Jul 2014 14:48:15 +0000 (18:48 +0400)]
Extract imgcodecs module from highgui
Vadim Pisarevsky [Mon, 7 Jul 2014 11:22:26 +0000 (11:22 +0000)]
Merge pull request #2929 from ilya-lavrenov:sse_pow
Vadim Pisarevsky [Mon, 7 Jul 2014 11:20:30 +0000 (11:20 +0000)]
Merge pull request #2937 from ilya-lavrenov:sse_patch_nans
Vadim Pisarevsky [Mon, 7 Jul 2014 11:19:54 +0000 (11:19 +0000)]
Merge pull request #2941 from ilya-lavrenov:sse_inrange
Alexander Alekhin [Mon, 7 Jul 2014 11:18:31 +0000 (11:18 +0000)]
Merge pull request #2944 from bkueng:fix_compiler_error
Beat Küng [Sat, 5 Jul 2014 07:27:11 +0000 (09:27 +0200)]
imgproc: fix compiler error for gcc 4.8
this bug was introduced in
a73809e6.
Ilya Lavrenov [Thu, 3 Jul 2014 17:28:54 +0000 (21:28 +0400)]
SSE2 optimization of cv::patchNaNs
Ilya Lavrenov [Thu, 3 Jul 2014 20:36:32 +0000 (00:36 +0400)]
SSE2 optimization of cv::inRange
Adi Shavit [Thu, 3 Jul 2014 19:14:58 +0000 (22:14 +0300)]
Added call to clone() to avoid unexpected change to external data.
- Fix both stitching_detailed.cpp sample and cv::Stitcher.
Alexander Alekhin [Thu, 3 Jul 2014 13:02:40 +0000 (13:02 +0000)]
Merge pull request #2932 from ilya-lavrenov:tapi_other_vendors
Ilya Lavrenov [Thu, 3 Jul 2014 12:16:23 +0000 (16:16 +0400)]
optimization of cv::minMaxLoc - used min/max
vbystricky [Thu, 3 Jul 2014 11:50:56 +0000 (15:50 +0400)]
Change groups count for Intel
Ilya Lavrenov [Thu, 3 Jul 2014 09:45:55 +0000 (13:45 +0400)]
use vectors for devices of all vendors
Ilya Lavrenov [Tue, 1 Jul 2014 21:32:45 +0000 (01:32 +0400)]
SSE4.1 optimiation of cv::Moments CV_16U
Alexander Alekhin [Thu, 3 Jul 2014 09:26:52 +0000 (09:26 +0000)]
Merge pull request #2931 from alalek:mac_fix_master
Alexander Alekhin [Thu, 3 Jul 2014 09:26:05 +0000 (09:26 +0000)]
Merge pull request #2897 from vbystricky:oclopt_sepFilter2D
Alexander Alekhin [Thu, 3 Jul 2014 08:18:19 +0000 (12:18 +0400)]
ocl: add try-catch for OpenCL device getter
Ilya Lavrenov [Tue, 1 Jul 2014 10:31:25 +0000 (14:31 +0400)]
fixed warnings
Ilya Lavrenov [Wed, 2 Jul 2014 21:28:31 +0000 (01:28 +0400)]
sse2 optimization of inv_sqrt_64f
Alexander Alekhin [Wed, 2 Jul 2014 19:06:45 +0000 (19:06 +0000)]
Merge pull request #2928 from ilya-lavrenov:tapi_warp_fix
Ilya Lavrenov [Wed, 2 Jul 2014 15:32:10 +0000 (19:32 +0400)]
fixed cv::warpPerspective
Ilya Lavrenov [Wed, 2 Jul 2014 13:06:34 +0000 (17:06 +0400)]
minor optimization of cv::LUT
Vadim Pisarevsky [Wed, 2 Jul 2014 14:22:55 +0000 (14:22 +0000)]
Merge pull request #2856 from sanchom:master
Vadim Pisarevsky [Wed, 2 Jul 2014 09:56:59 +0000 (09:56 +0000)]
Merge pull request #2923 from alalek:ocl_default_device_ignore_cpu
Vadim Pisarevsky [Wed, 2 Jul 2014 09:55:51 +0000 (09:55 +0000)]
Merge pull request #2913 from ilya-lavrenov:sse2_precornerdetect
Alexander Alekhin [Wed, 2 Jul 2014 09:14:48 +0000 (09:14 +0000)]
Merge pull request #2830 from mlyashko:moments
vbystricky [Tue, 1 Jul 2014 07:58:58 +0000 (11:58 +0400)]
Change global buffer to local
Ilya Lavrenov [Sun, 29 Jun 2014 14:32:15 +0000 (18:32 +0400)]
SSE2 optimization of magnitude calculation
Ievgen Khvedchenia [Tue, 1 Jul 2014 19:31:57 +0000 (22:31 +0300)]
Fix cmake to build OpenCV framework on OSX
Vadim Pisarevsky [Tue, 1 Jul 2014 17:31:37 +0000 (17:31 +0000)]
Merge pull request #2911 from ilya-lavrenov:sse2_convert_scale_abs
Vadim Pisarevsky [Tue, 1 Jul 2014 17:16:22 +0000 (17:16 +0000)]
Merge pull request #2895 from fradelg:master
Alexander Alekhin [Tue, 1 Jul 2014 13:21:35 +0000 (13:21 +0000)]
Merge pull request #2906 from ilya-lavrenov:tapi_transpose
Alexander Alekhin [Tue, 1 Jul 2014 10:24:14 +0000 (14:24 +0400)]
ocl: don't use OpenCL CPU device in default setup
Ilya Lavrenov [Sun, 29 Jun 2014 17:03:16 +0000 (21:03 +0400)]
sse2 optimization of cv::convertScaleAbs
Ilya Lavrenov [Fri, 27 Jun 2014 10:03:05 +0000 (14:03 +0400)]
optimized cv::transpose inplace
Ilya Lavrenov [Fri, 27 Jun 2014 08:44:32 +0000 (12:44 +0400)]
cv::transpose
Alexander Alekhin [Mon, 30 Jun 2014 14:59:36 +0000 (14:59 +0000)]
Merge pull request #2907 from ilya-lavrenov:tapi_perf_transpose
Ilya Lavrenov [Fri, 27 Jun 2014 10:06:32 +0000 (14:06 +0400)]
added perf test for transpose inplace
Alexander Alekhin [Mon, 30 Jun 2014 11:59:13 +0000 (11:59 +0000)]
Merge pull request #2869 from ilya-lavrenov:tapi_warps
Alexander Alekhin [Mon, 30 Jun 2014 10:06:54 +0000 (10:06 +0000)]
Merge pull request #2876 from vbystricky:oclopt_integralsum
Alexander Alekhin [Mon, 30 Jun 2014 10:05:24 +0000 (10:05 +0000)]
Merge pull request #2899 from ilya-lavrenov:tapi_ex
Alexander Alekhin [Mon, 30 Jun 2014 10:04:04 +0000 (10:04 +0000)]
Merge pull request #2886 from ilya-lavrenov:tapi_inrange
Alexander Alekhin [Mon, 30 Jun 2014 10:02:41 +0000 (10:02 +0000)]
Merge pull request #2829 from ilya-lavrenov:tapi_cvtcolor
Ilya Lavrenov [Sun, 29 Jun 2014 21:47:51 +0000 (01:47 +0400)]
SSE2 optimization of cv::preCornerDetect
Alexander Karsakov [Mon, 23 Jun 2014 06:18:11 +0000 (10:18 +0400)]
Use fma only for Intel devices
Ilya Lavrenov [Thu, 26 Jun 2014 14:15:13 +0000 (18:15 +0400)]
optimized some operations
Alexander Alekhin [Fri, 27 Jun 2014 08:21:06 +0000 (08:21 +0000)]
Merge pull request #2852 from ilya-lavrenov:tapi_abs
Roman Donchenko [Thu, 26 Jun 2014 13:40:25 +0000 (17:40 +0400)]
Merge pull request #2626 from KayKwon:matlab_formatter
Roman Donchenko [Thu, 26 Jun 2014 13:35:07 +0000 (17:35 +0400)]
Merge pull request #2672 from a-wi:findContours
Roman Donchenko [Thu, 26 Jun 2014 13:29:25 +0000 (17:29 +0400)]
Merge pull request #2774 from 23pointsNorth:lsd-nfa-fix
Roman Donchenko [Thu, 26 Jun 2014 13:24:24 +0000 (17:24 +0400)]
Merge pull request #2858 from 23pointsNorth:patch-3
Roman Donchenko [Thu, 26 Jun 2014 13:22:53 +0000 (17:22 +0400)]
Merge pull request #2824 from abidrahmank:pylsd
vbystricky [Thu, 26 Jun 2014 11:43:40 +0000 (15:43 +0400)]
Change local size
Ilya Lavrenov [Thu, 26 Jun 2014 09:25:24 +0000 (13:25 +0400)]
ported changes from PR #2867
Ilya Lavrenov [Thu, 26 Jun 2014 09:18:03 +0000 (13:18 +0400)]
added ocl_** function
Ilya Lavrenov [Thu, 26 Jun 2014 09:13:01 +0000 (13:13 +0400)]
reverted to original plain C++ code
mlyashko [Wed, 25 Jun 2014 12:07:33 +0000 (16:07 +0400)]
added perftest for moments
vbystricky [Thu, 26 Jun 2014 08:46:03 +0000 (12:46 +0400)]
Optimize OpenCL version of sepFilter2D
Andrey Pavlenko [Wed, 25 Jun 2014 17:12:20 +0000 (17:12 +0000)]
Merge pull request #2894 from vpisarev:cleanup_project_tree1
Vadim Pisarevsky [Wed, 25 Jun 2014 16:22:56 +0000 (20:22 +0400)]
fixed some more compile warnings on Windows
Vadim Pisarevsky [Wed, 25 Jun 2014 12:17:52 +0000 (16:17 +0400)]
fixed compile warnings on Windows
Fco. Javier Delgado del Hoyo [Wed, 25 Jun 2014 09:49:26 +0000 (11:49 +0200)]
Change comment according to fix
Fco. Javier Delgado del Hoyo [Wed, 25 Jun 2014 09:46:05 +0000 (11:46 +0200)]
Fix GCC 4.9 compiler warning
Vadim Pisarevsky [Tue, 24 Jun 2014 19:05:24 +0000 (23:05 +0400)]
removed extra whitespaces
Vadim Pisarevsky [Tue, 24 Jun 2014 17:16:09 +0000 (21:16 +0400)]
put the detection-based tracker back (to objdetect module), so that the Android face detection sample builds fine. The patch by Konstantin Matskevich that adds C++11 threads support has been merged in too. Also, fixed compile error in the doc builder.
projects / profile / ivi / opencv.git / log