Commit Graph

13869 Commits

Author SHA1 Message Date
Alexander Alekhin
315c80f793 Merge pull request #2986 from vbystricky:videoio_fix 2014-07-21 08:21:18 +00:00
VBystricky
cc703b01df Fix build errors with cap_v4l on Linux 2014-07-20 18:27:14 +04:00
Vadim Pisarevsky
9a58b1a3a0 Merge pull request #2925 from BloodAxe:osx-framework-script 2014-07-19 18:04:15 +00:00
Vadim Pisarevsky
a7006ac21c Merge pull request #2979 from PhilLab:patch-2 2014-07-18 09:58:07 +00:00
Vadim Pisarevsky
17d69be902 Merge pull request #2933 from ilya-lavrenov:sse_moments 2014-07-18 09:25:22 +00:00
PhilLab
e82241cba5 Function for drawing arrows
Porting the [PR 2970](https://github.com/Itseez/opencv/pull/2970) To the new InputOutputArray type
2014-07-18 10:04:44 +02:00
Vadim Pisarevsky
8f8450793a Merge pull request #2964 from vbystricky:highgui_split 2014-07-16 19:29:36 +00:00
Vadim Pisarevsky
dbefbbc522 Merge pull request #2910 from ilya-lavrenov:sse2_canny 2014-07-15 09:46:28 +00:00
Vadim Pisarevsky
40370345c5 Merge pull request #2765 from pradeep-pyro:kullback_leibler 2014-07-15 08:57:31 +00:00
Vadim Pisarevsky
b1793e2fb9 Merge pull request #2939 from adishavit:sample-fix_stitching_pipeline 2014-07-15 08:09:04 +00:00
pradeep
7171431e7c Changed cv::log to std::log 2014-07-15 12:32:53 +08:00
VBystricky
ca307669d4 Refresh code. Fix merge conflict 2014-07-14 23:30:50 +04:00
Vadim Pisarevsky
b63a7e66db Merge pull request #2953 from gongzg:master 2014-07-14 19:21:15 +00:00
vbystricky
d58f736935 Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
Vadim Pisarevsky
f773cd9a3e Merge pull request #2947 from vbystricky:capDShow 2014-07-14 18:53:25 +00:00
Alexander Alekhin
381986d044 Merge pull request #2882 from akarsakov:ocl_pyrDown_opt 2014-07-14 18:48:28 +00:00
Roman Donchenko
3490a5aded Merge pull request #2962 from alalek:fix_v4l_build 2014-07-14 08:20:54 +00:00
Alexander Alekhin
e169083fed Merge pull request #2918 from vbystricky:oclopt_reduce2 2014-07-12 05:00:57 +00:00
Alexander Alekhin
df74a266cf Merge pull request #2963 from ilya-lavrenov:tapi_bufferpool 2014-07-11 14:55:13 +00:00
Alexander Alekhin
0876ec7a67 Merge pull request #2935 from vbystricky:oclopt_meanStdDev 2014-07-11 14:53:46 +00:00
Alexander Alekhin
cbf63b0709 Merge pull request #2851 from ilya-lavrenov:tapi_set_identity 2014-07-11 10:00:16 +00:00
Alexander Alekhin
910d8f8e0b Merge pull request #2888 from ilya-lavrenov:tapi_remap 2014-07-11 09:59:27 +00:00
Ilya Lavrenov
f2a2467de3 enabled BufferPool 2014-07-11 12:21:10 +04:00
Alexander Alekhin
6dd3244019 fix build 2014-07-10 18:08:38 +04:00
Alexander Alekhin
a0816c6d15 Merge pull request #2927 from ilya-lavrenov:tapi_lut 2014-07-10 09:38:37 +00:00
Vadim Pisarevsky
347eaa8685 Merge pull request #2943 from vbystricky:highgui_imgcodecs 2014-07-10 05:28:44 +00:00
Zhigang Gong
2e49ca4903 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>
2014-07-09 16:21:20 +08:00
pradeep
0d49f97128 Fixed truncation warning 2014-07-09 15:29:47 +08:00
pradeep
f8b23cff18 Fixed test errors, added support for C data types. 2014-07-09 13:39:40 +08:00
Alexander Alekhin
0f1a0a9818 Merge pull request #2951 from ilya-lavrenov:tapi_ipp_filter2d 2014-07-08 15:21:35 +00:00
Ilya Lavrenov
e8f5c2fcf6 OpenCL before IPP 2014-07-08 18:51:27 +04:00
vbystricky
7fe7facfee Remove unused variable 2014-07-08 13:29:28 +04:00
vbystricky
eb8366bb0a DShow camera as IVideoCapture object 2014-07-08 12:28:34 +04:00
Alexander Alekhin
e79ceb4b45 Merge pull request #2936 from ilya-lavrenov:tapi_minmaxloc_opt 2014-07-08 07:30:49 +00:00
Vadim Pisarevsky
d05d235c01 Merge pull request #2669 from Adil-Ibragimov:flann_distance_fix 2014-07-07 13:35:09 +00:00
vbystricky
4286f60387 Extract imgcodecs module from highgui 2014-07-07 16:28:08 +04:00
Vadim Pisarevsky
e1553d5da3 Merge pull request #2929 from ilya-lavrenov:sse_pow 2014-07-07 11:22:26 +00:00
Vadim Pisarevsky
b2ab1b758a Merge pull request #2937 from ilya-lavrenov:sse_patch_nans 2014-07-07 11:20:30 +00:00
Vadim Pisarevsky
41dcd0ac03 Merge pull request #2941 from ilya-lavrenov:sse_inrange 2014-07-07 11:19:54 +00:00
Alexander Alekhin
7d9f79b130 Merge pull request #2944 from bkueng:fix_compiler_error 2014-07-07 11:18:31 +00:00
Beat Küng
90dce84314 imgproc: fix compiler error for gcc 4.8
this bug was introduced in a73809e6.
2014-07-05 09:27:11 +02:00
Ilya Lavrenov
e2b86974ae SSE2 optimization of cv::patchNaNs 2014-07-04 10:27:44 +04:00
Ilya Lavrenov
e04c39b089 SSE2 optimization of cv::inRange 2014-07-04 10:11:18 +04:00
Adi Shavit
7674f3ddbf Added call to clone() to avoid unexpected change to external data.
- Fix both stitching_detailed.cpp sample and cv::Stitcher.
2014-07-03 22:14:58 +03:00
Alexander Alekhin
964b260937 Merge pull request #2932 from ilya-lavrenov:tapi_other_vendors 2014-07-03 13:02:41 +00:00
Ilya Lavrenov
55d84cf815 optimization of cv::minMaxLoc - used min/max 2014-07-03 16:56:22 +04:00
vbystricky
690c932d7f Change groups count for Intel 2014-07-03 15:50:56 +04:00
Ilya Lavrenov
2fe07abf83 use vectors for devices of all vendors 2014-07-03 15:32:34 +04:00
Ilya Lavrenov
8fdbdb131d SSE4.1 optimiation of cv::Moments CV_16U 2014-07-03 15:04:06 +04:00
Alexander Alekhin
d183554600 Merge pull request #2931 from alalek:mac_fix_master 2014-07-03 09:26:52 +00:00