Andrey Pavlenko
|
d802b4d143
|
Merge pull request #1967 from ilya-lavrenov:tapi_blendLinear
|
2013-12-10 18:49:42 +04:00 |
|
Roman Donchenko
|
90c28d254f
|
Merge pull request #1961 from SpecLad:merge-2.4
|
2013-12-10 14:39:35 +04:00 |
|
Ilya Lavrenov
|
c9e6ed7a29
|
added cv::blendLinear
|
2013-12-10 13:07:52 +04:00 |
|
Roman Donchenko
|
464a010f53
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
|
2013-12-10 12:51:00 +04:00 |
|
Ilya Lavrenov
|
93c6fe66ce
|
added cv::bilateralFilter to T-API
|
2013-12-09 16:03:25 +04:00 |
|
Vladimir Bystricky
|
179a43ef63
|
Fix build errors on Linux system
|
2013-12-09 11:10:48 +04:00 |
|
Vladimir Bystricky
|
29ba7730ed
|
Add ocl version of filter2D to the module img_proc
|
2013-12-09 10:45:23 +04:00 |
|
Ilya Lavrenov
|
73aa43d2ca
|
fixed warnings
|
2013-12-07 01:05:07 +04:00 |
|
Vladimir Bystricky
|
44126e350a
|
Change while(true) to for(;;) for fix compiler warning.
|
2013-12-06 15:11:26 +04:00 |
|
Vladimir Bystricky
|
591b1a7e70
|
Another fix for disable "conditional expression is constant"
|
2013-12-06 14:42:06 +04:00 |
|
Vladimir Bystricky
|
3013b469fe
|
Add check for depths of destination and source image. Fix warning C4127.
|
2013-12-06 14:21:51 +04:00 |
|
Ilya Lavrenov
|
3eaa8f149b
|
added cv::intergal to T-API
|
2013-12-06 13:18:25 +04:00 |
|
Vladimir Bystricky
|
af6134b4b6
|
Fix issue in boxFilter with destination depth not equal to source depth.
|
2013-12-05 14:25:15 +04:00 |
|
Vladimir Bystricky
|
968a898a1b
|
Add ocl version of boxFilter to the module img_proc
|
2013-12-05 11:47:17 +04:00 |
|
Ilya Lavrenov
|
eb7ff99f80
|
fixed cv::remap and cv::convertMaps for map types CV_16SC2 && CV_16UC1
|
2013-12-04 22:04:31 +04:00 |
|
Ilya Lavrenov
|
e2b99a32b2
|
added cv::threshold to T-API
|
2013-12-04 13:45:44 +04:00 |
|
Ilya Lavrenov
|
474fc887a6
|
added cv::copyMakeBorder to T-API
|
2013-12-04 13:41:35 +04:00 |
|
Ilya Lavrenov
|
803672feea
|
added cv::remap to T-API
|
2013-12-04 00:43:43 +04:00 |
|
Ilya Lavrenov
|
dcce9d7088
|
added cv::warpAffine to T-API
|
2013-12-04 00:43:43 +04:00 |
|
Ilya Lavrenov
|
55af7857b9
|
added cv::warpPerspective to T-API
|
2013-12-04 00:43:42 +04:00 |
|
Vadim Pisarevsky
|
7626a8e8de
|
try to eliminate failure in opencv_imgproc_test
|
2013-12-02 12:13:50 +04:00 |
|
Vadim Pisarevsky
|
d7f4a223cf
|
fixed several compile errors/warnings; reacted on the PR comments
|
2013-12-01 20:58:30 +04:00 |
|
Vadim Pisarevsky
|
6da5d21331
|
fixed many bugs related to Mat::getUMat(), asynchronous kernel execution etc. Also, played a bit with ocl::cvtColor vs cv::cvtColor performance
|
2013-12-01 03:12:19 +04:00 |
|
Ilya Lavrenov
|
09795e3265
|
added cv::resize INTER_AREA to T-API
|
2013-11-29 17:57:37 +04:00 |
|
Andrey Pavlenko
|
d83094b412
|
Merge pull request #1880 from ilya-lavrenov:tapi_cvtColor
|
2013-11-29 12:59:09 +04:00 |
|
Roman Donchenko
|
9ca80961fd
|
Merge pull request #1874 from SpecLad:merge-2.4
|
2013-11-28 16:43:00 +04:00 |
|
Ilya Lavrenov
|
41d046a2db
|
restored ocl_cvtcolor.cl
|
2013-11-27 23:46:30 +04:00 |
|
Ilya Lavrenov
|
d2e1318341
|
RGBA <-> mRGBA
|
2013-11-27 23:42:10 +04:00 |
|
Ilya Lavrenov
|
f771a0ba81
|
RGB[A] <-> HLS
|
2013-11-27 23:37:58 +04:00 |
|
Ilya Lavrenov
|
0b900b54e5
|
RGB[A] <-> HSV
|
2013-11-27 23:30:29 +04:00 |
|
Ilya Lavrenov
|
727a5e6df4
|
BGR5x5 <-> Gray
|
2013-11-27 22:19:44 +04:00 |
|
Ilya Lavrenov
|
8a23646897
|
RGB[A] <- RGB5x5
|
2013-11-27 20:00:35 +04:00 |
|
Ilya Lavrenov
|
81b9c9c104
|
RGB[A] -> RGB5x5
|
2013-11-27 19:52:42 +04:00 |
|
Ilya Lavrenov
|
af367c4f85
|
RGB[A] <-> BGR[A]
|
2013-11-27 19:44:37 +04:00 |
|
Ilya Lavrenov
|
ab9b883c69
|
RGB[A] <-> XYZ
|
2013-11-27 19:37:27 +04:00 |
|
Ilya Lavrenov
|
65ee06eb2b
|
RGB[A] <-> XYZ
|
2013-11-27 19:25:26 +04:00 |
|
Ilya Lavrenov
|
506c19616d
|
YCrCb -> RGB[A]
|
2013-11-27 19:24:27 +04:00 |
|
Andrey Pavlenko
|
41ae5d5f66
|
Merge pull request #1867 from ilya-lavrenov:ocl_resize_master
|
2013-11-27 18:08:11 +04:00 |
|
Roman Donchenko
|
28242f09d0
|
Merge pull request #1869 from ilya-lavrenov:ocl_cvtColor_master
|
2013-11-27 17:58:54 +04:00 |
|
Ilya Lavrenov
|
90d62cacc9
|
fixed cv::cvtColor
|
2013-11-27 16:43:31 +04:00 |
|
Ilya Lavrenov
|
6679aed61e
|
fixed ocl::resize (INTER_LINEAR) and added an accuracy test
|
2013-11-27 02:52:02 +04:00 |
|
Roman Donchenko
|
920fd48228
|
Merge remote-tracking branch 'origin/master' into merge-2.4
Conflicts:
modules/ocl/src/arithm.cpp
|
2013-11-26 15:32:44 +04:00 |
|
Roman Donchenko
|
9c2272d520
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
|
2013-11-26 15:05:26 +04:00 |
|
Roman Donchenko
|
aaf97c4548
|
Merge pull request #1863 from nevion:master
|
2013-11-26 13:53:48 +04:00 |
|
Eric Sommerlade
|
3b4f65b186
|
fixed comparison to stop integer wrap around
|
2013-11-26 00:12:30 +00:00 |
|
Jason Newton
|
88b2fe9dbb
|
correct upper bound for maximum number of labels for 8-way connectivity
|
2013-11-24 01:20:07 -08:00 |
|
StevenPuttemans
|
7a8bd31657
|
Fixed bug in report #3346
|
2013-11-22 09:57:47 +01:00 |
|
Ilya Lavrenov
|
561a7f5782
|
fixed kernel compilation in imgproc module
|
2013-11-21 18:23:57 +04:00 |
|
Vadim Pisarevsky
|
677c7f27cb
|
fixed failure in Tonemap test
|
2013-11-19 19:20:24 -05:00 |
|
Vadim Pisarevsky
|
241002384c
|
fixed some more compile errors
|
2013-11-18 14:26:19 -05:00 |
|