Ilya Lavrenov
fed7e61879
added cv::repeat to T-API (fix for copyTo -> UMat is needed)
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
e17107e864
added cv::compare to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
a180cebb2d
added cv::polarToCart to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
ba850f0b64
added cv::cartToPolar to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
435028ccee
added cv::transpose to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
6ab297718d
added setIdentity to T-API
2013-12-04 00:50:03 +04:00
Ilya Lavrenov
3e586f42a0
added cv::pow to T-API
2013-12-04 00:50:02 +04:00
Ilya Lavrenov
997ec60839
added OCL-TAPI arithm tests
2013-12-04 00:50:02 +04:00
Roman Donchenko
90c230678e
Merge pull request #1912 from KonstantinMatskevich:ocl_tapi_math
2013-12-03 18:02:44 +04:00
Konstantin Matskevich
eaf620ddde
small fix
2013-12-03 14:57:13 +04:00
Konstantin Matskevich
14dccdf23d
T-API cv::log, cv::exp, cv::magnitude, cv::phase
2013-12-03 14:07:00 +04:00
Roman Donchenko
35ea600c54
Merge pull request #1891 from alalek:cv_error_noreturn
2013-12-03 13:57:35 +04:00
Roman Donchenko
17f53bc301
Merge pull request #1904 from severin-lemaignan:emscripten
2013-12-03 12:14:09 +04:00
Andrey Pavlenko
0a624ee67d
Merge pull request #1901 from vpisarev:ocl_svm3
2013-12-03 11:20:26 +04:00
Vadim Pisarevsky
cd97d789b6
dummy commit to rerun pre-commit tests
2013-12-02 22:15:07 +04:00
Vadim Pisarevsky
161c3b71e6
hopefully, now opencv_test_imgproc should pass
2013-12-02 18:27:08 +04:00
Séverin Lemaignan
efe564e3b3
Ensure compilation to Javascript with Emscripten
2013-12-02 14:06:24 +01:00
Vadim Pisarevsky
5fea17ff0d
still trying to fix failure in opencv_test_imgproc
2013-12-02 13:46:54 +04:00
Roman Donchenko
b27d7d2a61
Merge pull request #1886 from ilya-lavrenov:tapi_lut
2013-12-02 12:28:18 +04:00
Vadim Pisarevsky
82b852c13c
yet another attempt to make Core_UMat.getUMat test work
2013-12-02 00:12:20 +04:00
Vadim Pisarevsky
9be727b1ea
another attempt to fix Core_UMat.getUMat test
2013-12-01 23:14:45 +04:00
Vadim Pisarevsky
f263fe145a
trying to guess and fix strange failure in core test
2013-12-01 22:14:15 +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
Alexander Alekhin
c1cfb4d422
core: added cv::error with CV_NORETURN attr
2013-11-30 03:43:31 +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
4eba74ee19
added cv::LUT to T-API
2013-11-28 12:31:04 +04:00
Ilya Lavrenov
41d046a2db
restored ocl_cvtcolor.cl
2013-11-27 23:46:30 +04:00
Ilya Lavrenov
0b900b54e5
RGB[A] <-> HSV
2013-11-27 23:30:29 +04:00
Andrey Pavlenko
96a228fd7e
Merge pull request #1866 from ilya-lavrenov:ocl_fix2
2013-11-26 23:27:49 +04:00
Andrey Pavlenko
736097a462
Merge pull request #1868 from KonstantinMatskevich:umat_bugfix
2013-11-26 23:24:51 +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
e7339ac11a
Merge pull request #1818 from GregoryMorse:patch-2
2013-11-26 13:00:56 +04:00
Roman Donchenko
e20f7014cf
Merge pull request #1835 from SpecLad:windows-xadd
2013-11-26 11:43:34 +04:00
Roman Donchenko
05e22ee8c9
Merge pull request #1859 from SpecLad:string-plus-equals
2013-11-26 11:40:37 +04:00
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
2013-11-26 00:22:14 +08:00
Konstantin Matskevich
145855767c
bugfix in deallocate
2013-11-25 17:16:22 +04:00
Ilya Lavrenov
9d23a0cb81
fixed ocl_arithm_op; fix for 3-channel images is needed
2013-11-25 14:21:12 +04:00
Roman Donchenko
52e810ed33
Merge pull request #1850 from ilya-lavrenov:pthread_mutex
2013-11-25 12:04:17 +04:00
Alexander Alekhin
fd4a7e7d1f
ocl: disable tests
2013-11-23 18:13:32 +04:00
Andrey Pavlenko
b157cc17e9
Merge pull request #1857 from alalek:ocl_ta_tests_infra
2013-11-23 16:44:58 +04:00
Ilya Lavrenov
1af95ea12c
fixed error in setting kernel arguments
2013-11-22 18:56:03 +04:00
Alexander Alekhin
881e837520
ocl/core: added prototype for tests
2013-11-22 18:37:44 +04:00
Roman Donchenko
fc49d33c8d
Gave cv::String appropriate += operators.
...
Note that since String is a reference to an immutable string,
this doesn't actually change the string; it just replaces *this
with a reference to the concatenated string.
2013-11-22 17:58:40 +04:00
Ilya Lavrenov
c8abb6124f
recursive mutex for linux
2013-11-22 17:30:32 +04:00
Ilya Lavrenov
650f92f9cc
eliminated warning C4267
2013-11-21 18:27:07 +04:00
Ilya Lavrenov
65b7e2018c
fixed kernel compilation
2013-11-21 14:22:24 +04:00