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
Ilya Lavrenov
fee3d6931b
corners
2014-07-10 17:17:24 +04:00
Ilya Lavrenov
c949845a6b
fixed perf test
2014-07-10 16:03:31 +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
Roman Donchenko
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +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
b449bd5150
Clarified code.
2014-07-03 22:45:11 +03:00
Adi Shavit
e25dca21d1
Fixed indentation.
2014-07-03 22:29:45 +03:00
Adi Shavit
d44e3c369d
Added documentation.
2014-07-03 22:29:44 +03:00
Adi Shavit
68827072c9
[HighGUI] On Windows: Support Ctrl+C to copy image to clipboard.
2014-07-03 22:29:43 +03:00
David Bradley
b71744082b
cudabgsegm module was not compiling. Changing all references of opencv2/legacy.hpp to opencv2/cudalegacy.hpp seemed to work.
...
I'm new at this so it would be good to have someone familiar with the build system confirm the change.
2014-07-03 15:15:23 -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
Alexander Alekhin
e6c305cb75
Merge pull request #2897 from vbystricky:oclopt_sepFilter2D
2014-07-03 09:26:05 +00:00
Alexander Alekhin
c5d3c08256
ocl: add try-catch for OpenCL device getter
2014-07-03 12:18:19 +04:00
Ilya Lavrenov
93f8581b69
fixed warnings
2014-07-03 11:10:28 +04:00
Ilya Lavrenov
e5b63d43f2
sse2 optimization of inv_sqrt_64f
2014-07-03 01:33:49 +04:00
Alexander Alekhin
effff27c4e
Merge pull request #2928 from ilya-lavrenov:tapi_warp_fix
2014-07-02 19:06:46 +00:00
Ilya Lavrenov
46e2216165
fixed cv::warpPerspective
2014-07-02 19:32:10 +04:00
Ilya Lavrenov
10c772fa7f
minor optimization of cv::LUT
2014-07-02 18:50:21 +04:00
Vadim Pisarevsky
133d861d65
Merge pull request #2915 from SpecLad:core-useless-casts
2014-07-02 14:25:52 +00:00
Vadim Pisarevsky
8539d424b2
Merge pull request #2071 from pemmanuelviel:LshOrthogonalSubvectors
2014-07-02 14:24:09 +00:00
Vadim Pisarevsky
c3329ff79d
Merge pull request #2856 from sanchom:master
2014-07-02 14:22:56 +00:00
Alexander Alekhin
dcf96b2da7
Merge pull request #2922 from ilya-lavrenov:mac_fix
2014-07-02 12:18:11 +00:00