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
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
Andrey Pavlenko
8752414718
Merge pull request #1911 from apavlenko:2.4_fix_vc12
2013-12-03 19:20:05 +04:00
Alexander Alekhin
7d9150460a
core/ocl: added perf test infra + "Add" perf test
2013-12-03 18:43:50 +04:00
Alexander Alekhin
fe01bc21c0
perf: test-based metrics collection strategy
2013-12-03 18:43:50 +04:00
Roman Donchenko
90c230678e
Merge pull request #1912 from KonstantinMatskevich:ocl_tapi_math
2013-12-03 18:02:44 +04:00
Roman Donchenko
3509018bd6
Merge pull request #1916 from alalek:ocl_moments_fix_perf
2013-12-03 17:58:04 +04:00
Andrey Pavlenko
1966e7cea9
fixing compilation on Linux
2013-12-03 17:46:09 +04:00
Roman Donchenko
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
2013-12-03 17:35:21 +04:00
Roman Donchenko
2b31055914
Fixed the "platfrom" typo everywhere.
2013-12-03 17:33:28 +04:00
Andrey Pavlenko
b5dbe9e04b
Added patch from master for fixing VS2013 in 3rd party lib OpenEXR
2013-12-03 16:08:57 +04:00
Alexander Alekhin
c962a9d61c
ocl:perf: fix moments test for plain impl
2013-12-03 16:02:55 +04:00
Vladislav Vinogradov
adb2040980
added additional check in cv::gpu::demosaicing that source is not empty
2013-12-03 15:55:47 +04:00
Vladislav Vinogradov
14ee306b9e
fix gpu test for Demosaicing:
...
check that input images was loaded correctly
2013-12-03 15:55:10 +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
df136339ff
Merge pull request #1907 from severin-lemaignan:emscripten-2.4
2013-12-03 13:38:10 +04:00
Andrey Pavlenko
bd9d3dd561
fixing build of 2.4 branch with VC12 (aka 2013)
...
(master branch was fixed before, no need to merge this to master!)
- disable openexr (numerous undefined std::min & std::max)
- workaround for two compilator bugs
2013-12-03 13:16:44 +04:00
Roman Donchenko
d2b46d421f
Merge pull request #1910 from alalek:ts_perf_warmuptype
2013-12-03 13:08:44 +04:00
Alexander Alekhin
cb4267cb38
ts/perf: int -> enum WarmUpType
2013-12-03 12:40:31 +04:00
Séverin Lemaignan
9ce9fc3361
Ensure compilation to Javascript with Emscripten
2013-12-03 09:18:59 +01:00
Roman Donchenko
17f53bc301
Merge pull request #1904 from severin-lemaignan:emscripten
2013-12-03 12:14:09 +04:00
Roman Donchenko
6e9a7706ce
Merge pull request #1890 from alalek:ts_fix_seh_exceptions_handling
2013-12-03 11:56:49 +04:00
Andrey Pavlenko
3ff1620086
Merge pull request #1899 from berak:b_3171_24
2013-12-03 11:32:31 +04:00
Andrey Pavlenko
8db6d9f9b2
Merge pull request #1906 from asmorkalov:android_ocl_warn_fix
2013-12-03 11:20:48 +04:00
Andrey Pavlenko
0a624ee67d
Merge pull request #1901 from vpisarev:ocl_svm3
2013-12-03 11:20:26 +04:00
Alexander Alekhin
206b56ed39
ts: catch & append general exceptions into log
2013-12-03 03:40:56 +04:00
Vadim Pisarevsky
cd97d789b6
dummy commit to rerun pre-commit tests
2013-12-02 22:15:07 +04:00
Andrey Pavlenko
368bac7af6
Merge pull request #1744 from liuxing6666:2.4_fix_harris_test
2013-12-02 20:38:49 +04:00
Andrey Pavlenko
19ceab13f2
Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix
2013-12-02 20:07:47 +04:00
Roman Donchenko
aed69cc458
Merge pull request #1882 from philippefoubert:branch_ocl_instrumentation
2013-12-02 18:55:47 +04:00
Roman Donchenko
790f53f12a
Merge pull request #1887 from jet47:android-cuda-6.0
2013-12-02 18:53:26 +04:00
Vadim Pisarevsky
161c3b71e6
hopefully, now opencv_test_imgproc should pass
2013-12-02 18:27:08 +04:00
Roman Donchenko
f7f194e5dd
Merge pull request #1797 from moodoki:bugfix_3344
2013-12-02 17:53:34 +04:00
Alexander Smorkalov
eab7603096
Warning fixes and suppression in ocl module for gcc 4.6 from Android NDK.
2013-12-02 17:51:29 +04:00
Roman Donchenko
838961a289
Merge pull request #1897 from berak:b_3393_24
2013-12-02 17:11:56 +04:00
Séverin Lemaignan
efe564e3b3
Ensure compilation to Javascript with Emscripten
2013-12-02 14:06:24 +01:00
Roman Donchenko
fb568755a1
Merge pull request #1898 from berak:b_3349_24
2013-12-02 14:14:41 +04: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
Roman Donchenko
0bbd768d9d
Merge pull request #1884 from asmorkalov:winrt_img_proc_sample
2013-12-02 12:27:51 +04:00
Roman Donchenko
f20af817d4
Merge pull request #1894 from asmorkalov:ocv_debug_build
2013-12-02 12:17:30 +04:00
Vadim Pisarevsky
7626a8e8de
try to eliminate failure in opencv_imgproc_test
2013-12-02 12:13:50 +04:00