Roman Donchenko
b27d7d2a61
Merge pull request #1886 from ilya-lavrenov:tapi_lut
11 years ago
Andrey Pavlenko
daefe6983f
Merge pull request #1878 from ilya-lavrenov:ocl_resize_area_master
11 years ago
Ilya Lavrenov
09795e3265
added cv::resize INTER_AREA to T-API
11 years ago
Andrey Pavlenko
d83094b412
Merge pull request #1880 from ilya-lavrenov:tapi_cvtColor
11 years ago
Roman Donchenko
9ca80961fd
Merge pull request #1874 from SpecLad:merge-2.4
11 years ago
Ilya Lavrenov
4eba74ee19
added cv::LUT to T-API
11 years ago
Ilya Lavrenov
41d046a2db
restored ocl_cvtcolor.cl
11 years ago
Ilya Lavrenov
d2e1318341
RGBA <-> mRGBA
11 years ago
Ilya Lavrenov
f771a0ba81
RGB[A] <-> HLS
11 years ago
Ilya Lavrenov
0b900b54e5
RGB[A] <-> HSV
11 years ago
Ilya Lavrenov
727a5e6df4
BGR5x5 <-> Gray
11 years ago
Ilya Lavrenov
8a23646897
RGB[A] <- RGB5x5
11 years ago
Ilya Lavrenov
81b9c9c104
RGB[A] -> RGB5x5
11 years ago
Ilya Lavrenov
af367c4f85
RGB[A] <-> BGR[A]
11 years ago
Ilya Lavrenov
ab9b883c69
RGB[A] <-> XYZ
11 years ago
Ilya Lavrenov
65ee06eb2b
RGB[A] <-> XYZ
11 years ago
Ilya Lavrenov
506c19616d
YCrCb -> RGB[A]
11 years ago
Andrey Pavlenko
41ae5d5f66
Merge pull request #1867 from ilya-lavrenov:ocl_resize_master
11 years ago
Roman Donchenko
28242f09d0
Merge pull request #1869 from ilya-lavrenov:ocl_cvtColor_master
11 years ago
Ilya Lavrenov
90d62cacc9
fixed cv::cvtColor
11 years ago
Roman Donchenko
2fed668390
Fixed build errors.
11 years ago
Ilya Lavrenov
6679aed61e
fixed ocl::resize (INTER_LINEAR) and added an accuracy test
11 years ago
Andrey Pavlenko
96a228fd7e
Merge pull request #1866 from ilya-lavrenov:ocl_fix2
11 years ago
Andrey Pavlenko
736097a462
Merge pull request #1868 from KonstantinMatskevich:umat_bugfix
11 years ago
Roman Donchenko
920fd48228
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
modules/ocl/src/arithm.cpp
11 years ago
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
11 years ago
Roman Donchenko
aaf97c4548
Merge pull request #1863 from nevion:master
11 years ago
Roman Donchenko
e7339ac11a
Merge pull request #1818 from GregoryMorse:patch-2
11 years ago
Roman Donchenko
e20f7014cf
Merge pull request #1835 from SpecLad:windows-xadd
11 years ago
Roman Donchenko
05e22ee8c9
Merge pull request #1859 from SpecLad:string-plus-equals
11 years ago
GregoryMorse
e4793e3d5e
Update system.cpp
...
Fixed to use native C++ instead of C++/CX although it does require significantly more code, it goes along with the spirit of keeping the project in native C++
Update system.cpp
Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
Update system.cpp
Fixed compiler warning over comma operator clause
Update system.cpp
NULL initialization
Update system.cpp
Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
Update system.cpp
Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference.
Update system.cpp
Fixed conditional compilation around include and library
Update system.cpp
Fixed trailing space
Update system.cpp
Cleaned up whitespace, removed redundant code and added edge cases for string cleanup
Update system.cpp
Fixed compiler warning over comma operator clause
Update system.cpp
NULL initialization
Update system.cpp
Fixed use of WindowsGetStringRawBuffer which returns internal pointer to buffer
Update system.cpp
Support C++/CX and native C++ through conditional compilation. Fixed style - long lines, comma operators, long conditional. Optimized string usage to use reference.
Update system.cpp
Fixed conditional compilation around include and library
Update system.cpp
Fixed trailing space
11 years ago
Ilya Lavrenov
16a3067afc
cp test_colot.cpp to imgproc ocl tests
11 years ago
Konstantin Matskevich
145855767c
bugfix in deallocate
11 years ago
Ilya Lavrenov
9d23a0cb81
fixed ocl_arithm_op; fix for 3-channel images is needed
11 years ago
Roman Donchenko
16a11cfb27
Merge pull request #1842 from StevenPuttemans:bugfix_3315
11 years ago
Roman Donchenko
75fba08042
Merge pull request #1822 from SpecLad:msvc12
11 years ago
Roman Donchenko
4c5593b633
Merge pull request #1837 from asmorkalov:android_opencl
11 years ago
Roman Donchenko
06f6f74e61
Merge pull request #1839 from pmiecielica:memory_leaks
11 years ago
Roman Donchenko
684ff70308
Merge pull request #1864 from berak:mouse_and_match
11 years ago
Roman Donchenko
52e810ed33
Merge pull request #1850 from ilya-lavrenov:pthread_mutex
11 years ago
Roman Donchenko
59aa516ca5
Merge pull request #1860 from alalek:ocl_fix_undef_warn
11 years ago
berak
10639d63f5
mouse_and_match.py missing import cv2
11 years ago
Jason Newton
88b2fe9dbb
correct upper bound for maximum number of labels for 8-way connectivity
11 years ago
Andrey Pavlenko
3ab47300ce
Merge pull request #1862 from alalek:ocl_disable_tests
11 years ago
Alexander Alekhin
fd4a7e7d1f
ocl: disable tests
11 years ago
Andrey Pavlenko
b157cc17e9
Merge pull request #1857 from alalek:ocl_ta_tests_infra
11 years ago
Andrey Pavlenko
b82c55de12
Merge pull request #1861 from ilya-lavrenov:ocl_args_fix
11 years ago
Ilya Lavrenov
1af95ea12c
fixed error in setting kernel arguments
11 years ago
Alexander Alekhin
881e837520
ocl/core: added prototype for tests
11 years ago
Roman Donchenko
0537747f79
Merge pull request #1853 from StevenPuttemans:bugfix_3346
11 years ago