Ilya Lavrenov [Mon, 2 Dec 2013 19:45:16 +0000 (23:45 +0400)]
added cv::copyMakeBorder to T-API
Ilya Lavrenov [Mon, 2 Dec 2013 15:44:09 +0000 (19:44 +0400)]
added tests to imgproc
Andrey Pavlenko [Wed, 4 Dec 2013 07:35:10 +0000 (11:35 +0400)]
Merge pull request #1909 from alalek:ocl_tapi_perf
Andrey Pavlenko [Wed, 4 Dec 2013 07:34:51 +0000 (11:34 +0400)]
Merge pull request #1903 from ilya-lavrenov:tapi_warp
Andrey Pavlenko [Wed, 4 Dec 2013 07:34:34 +0000 (11:34 +0400)]
Merge pull request #1902 from ilya-lavrenov:tapi_arithm
Ilya Lavrenov [Mon, 2 Dec 2013 20:41:07 +0000 (00:41 +0400)]
refactoring
Ilya Lavrenov [Sun, 1 Dec 2013 11:37:56 +0000 (15:37 +0400)]
ability to use cv::PSNR with transparent cv::norm
Ilya Lavrenov [Sun, 1 Dec 2013 10:45:48 +0000 (14:45 +0400)]
added cv::meanStdDev to T-API
Ilya Lavrenov [Sun, 1 Dec 2013 10:23:07 +0000 (14:23 +0400)]
added cv::sum to T-API
Ilya Lavrenov [Sat, 30 Nov 2013 23:02:13 +0000 (03:02 +0400)]
added cv::countNonZero to T-API
Ilya Lavrenov [Sat, 30 Nov 2013 21:57:13 +0000 (01:57 +0400)]
added cv::repeat to T-API (fix for copyTo -> UMat is needed)
Ilya Lavrenov [Sat, 30 Nov 2013 20:59:55 +0000 (00:59 +0400)]
added cv::compare to T-API
Ilya Lavrenov [Sat, 30 Nov 2013 20:17:23 +0000 (00:17 +0400)]
added cv::polarToCart to T-API
Ilya Lavrenov [Sat, 30 Nov 2013 16:05:54 +0000 (20:05 +0400)]
added cv::cartToPolar to T-API
Ilya Lavrenov [Sat, 30 Nov 2013 14:42:09 +0000 (18:42 +0400)]
added cv::transpose to T-API
Ilya Lavrenov [Sat, 30 Nov 2013 13:40:03 +0000 (17:40 +0400)]
added setIdentity to T-API
Ilya Lavrenov [Sat, 30 Nov 2013 13:20:45 +0000 (17:20 +0400)]
added cv::pow to T-API
Ilya Lavrenov [Sat, 30 Nov 2013 12:36:31 +0000 (16:36 +0400)]
added OCL-TAPI arithm tests
Ilya Lavrenov [Sun, 1 Dec 2013 14:56:28 +0000 (18:56 +0400)]
added cv::remap to T-API
Ilya Lavrenov [Sun, 1 Dec 2013 14:09:52 +0000 (18:09 +0400)]
added cv::warpAffine to T-API
Ilya Lavrenov [Fri, 29 Nov 2013 15:16:34 +0000 (19:16 +0400)]
added cv::warpPerspective to T-API
Alexander Alekhin [Mon, 2 Dec 2013 17:37:32 +0000 (21:37 +0400)]
core/ocl: added perf test infra + "Add" perf test
Alexander Alekhin [Mon, 2 Dec 2013 17:36:08 +0000 (21:36 +0400)]
perf: test-based metrics collection strategy
Roman Donchenko [Tue, 3 Dec 2013 14:02:43 +0000 (18:02 +0400)]
Merge pull request #1912 from KonstantinMatskevich:ocl_tapi_math
Konstantin Matskevich [Tue, 3 Dec 2013 10:57:13 +0000 (14:57 +0400)]
small fix
Konstantin Matskevich [Tue, 3 Dec 2013 10:07:00 +0000 (14:07 +0400)]
T-API cv::log, cv::exp, cv::magnitude, cv::phase
Roman Donchenko [Tue, 3 Dec 2013 09:57:34 +0000 (13:57 +0400)]
Merge pull request #1891 from alalek:cv_error_noreturn
Roman Donchenko [Tue, 3 Dec 2013 09:08:44 +0000 (13:08 +0400)]
Merge pull request #1910 from alalek:ts_perf_warmuptype
Alexander Alekhin [Mon, 2 Dec 2013 21:08:12 +0000 (01:08 +0400)]
ts/perf: int -> enum WarmUpType
Roman Donchenko [Tue, 3 Dec 2013 08:14:09 +0000 (12:14 +0400)]
Merge pull request #1904 from severin-lemaignan:emscripten
Roman Donchenko [Tue, 3 Dec 2013 07:56:49 +0000 (11:56 +0400)]
Merge pull request #1890 from alalek:ts_fix_seh_exceptions_handling
Andrey Pavlenko [Tue, 3 Dec 2013 07:20:25 +0000 (11:20 +0400)]
Merge pull request #1901 from vpisarev:ocl_svm3
Alexander Alekhin [Mon, 2 Dec 2013 23:40:56 +0000 (03:40 +0400)]
ts: catch & append general exceptions into log
Vadim Pisarevsky [Mon, 2 Dec 2013 18:15:07 +0000 (22:15 +0400)]
dummy commit to rerun pre-commit tests
Roman Donchenko [Mon, 2 Dec 2013 14:55:47 +0000 (18:55 +0400)]
Merge pull request #1882 from philippefoubert:branch_ocl_instrumentation
Vadim Pisarevsky [Mon, 2 Dec 2013 14:27:08 +0000 (18:27 +0400)]
hopefully, now opencv_test_imgproc should pass
Séverin Lemaignan [Tue, 26 Nov 2013 04:53:44 +0000 (05:53 +0100)]
Ensure compilation to Javascript with Emscripten
Vadim Pisarevsky [Mon, 2 Dec 2013 09:46:54 +0000 (13:46 +0400)]
still trying to fix failure in opencv_test_imgproc
Roman Donchenko [Mon, 2 Dec 2013 08:28:18 +0000 (12:28 +0400)]
Merge pull request #1886 from ilya-lavrenov:tapi_lut
Vadim Pisarevsky [Mon, 2 Dec 2013 08:13:50 +0000 (12:13 +0400)]
try to eliminate failure in opencv_imgproc_test
Vadim Pisarevsky [Sun, 1 Dec 2013 20:12:20 +0000 (00:12 +0400)]
yet another attempt to make Core_UMat.getUMat test work
Vadim Pisarevsky [Sun, 1 Dec 2013 19:14:45 +0000 (23:14 +0400)]
another attempt to fix Core_UMat.getUMat test
Vadim Pisarevsky [Sun, 1 Dec 2013 18:14:15 +0000 (22:14 +0400)]
trying to guess and fix strange failure in core test
Vadim Pisarevsky [Sun, 1 Dec 2013 16:58:30 +0000 (20:58 +0400)]
fixed several compile errors/warnings; reacted on the PR comments
Philippe FOUBERT [Sun, 1 Dec 2013 15:41:17 +0000 (16:41 +0100)]
Using cv::String instead of std::string.
Vadim Pisarevsky [Sat, 30 Nov 2013 23:12:19 +0000 (03:12 +0400)]
fixed many bugs related to Mat::getUMat(), asynchronous kernel execution etc. Also, played a bit with ocl::cvtColor vs cv::cvtColor performance
Alexander Alekhin [Thu, 28 Nov 2013 22:40:10 +0000 (02:40 +0400)]
core: added cv::error with CV_NORETURN attr
Andrey Pavlenko [Fri, 29 Nov 2013 15:21:38 +0000 (19:21 +0400)]
Merge pull request #1878 from ilya-lavrenov:ocl_resize_area_master
Ilya Lavrenov [Wed, 27 Nov 2013 14:30:07 +0000 (18:30 +0400)]
added cv::resize INTER_AREA to T-API
Andrey Pavlenko [Fri, 29 Nov 2013 08:59:08 +0000 (12:59 +0400)]
Merge pull request #1880 from ilya-lavrenov:tapi_cvtColor
Roman Donchenko [Thu, 28 Nov 2013 12:42:53 +0000 (16:42 +0400)]
Merge pull request #1874 from SpecLad:merge-2.4
Ilya Lavrenov [Wed, 27 Nov 2013 20:57:36 +0000 (00:57 +0400)]
added cv::LUT to T-API
Philippe FOUBERT [Wed, 27 Nov 2013 23:26:37 +0000 (00:26 +0100)]
Correction to be able to compile using the directive PRINT_KERNEL_RUN_TIME
Ilya Lavrenov [Wed, 27 Nov 2013 19:42:49 +0000 (23:42 +0400)]
restored ocl_cvtcolor.cl
Ilya Lavrenov [Wed, 27 Nov 2013 19:42:10 +0000 (23:42 +0400)]
RGBA <-> mRGBA
Ilya Lavrenov [Wed, 27 Nov 2013 19:37:58 +0000 (23:37 +0400)]
RGB[A] <-> HLS
Ilya Lavrenov [Wed, 27 Nov 2013 19:30:29 +0000 (23:30 +0400)]
RGB[A] <-> HSV
Ilya Lavrenov [Wed, 27 Nov 2013 18:19:44 +0000 (22:19 +0400)]
BGR5x5 <-> Gray
Ilya Lavrenov [Wed, 27 Nov 2013 16:00:35 +0000 (20:00 +0400)]
RGB[A] <- RGB5x5
Ilya Lavrenov [Wed, 27 Nov 2013 15:52:42 +0000 (19:52 +0400)]
RGB[A] -> RGB5x5
Ilya Lavrenov [Wed, 27 Nov 2013 15:44:37 +0000 (19:44 +0400)]
RGB[A] <-> BGR[A]
Ilya Lavrenov [Wed, 27 Nov 2013 15:37:27 +0000 (19:37 +0400)]
RGB[A] <-> XYZ
Ilya Lavrenov [Wed, 27 Nov 2013 15:25:26 +0000 (19:25 +0400)]
RGB[A] <-> XYZ
Ilya Lavrenov [Wed, 27 Nov 2013 15:24:27 +0000 (19:24 +0400)]
YCrCb -> RGB[A]
Andrey Pavlenko [Wed, 27 Nov 2013 14:08:11 +0000 (18:08 +0400)]
Merge pull request #1867 from ilya-lavrenov:ocl_resize_master
Roman Donchenko [Wed, 27 Nov 2013 13:58:53 +0000 (17:58 +0400)]
Merge pull request #1869 from ilya-lavrenov:ocl_cvtColor_master
Ilya Lavrenov [Mon, 25 Nov 2013 15:15:36 +0000 (19:15 +0400)]
fixed cv::cvtColor
Roman Donchenko [Wed, 27 Nov 2013 08:59:19 +0000 (12:59 +0400)]
Fixed build errors.
Ilya Lavrenov [Fri, 22 Nov 2013 14:56:03 +0000 (18:56 +0400)]
fixed ocl::resize (INTER_LINEAR) and added an accuracy test
Andrey Pavlenko [Tue, 26 Nov 2013 19:27:48 +0000 (23:27 +0400)]
Merge pull request #1866 from ilya-lavrenov:ocl_fix2
Andrey Pavlenko [Tue, 26 Nov 2013 19:24:50 +0000 (23:24 +0400)]
Merge pull request #1868 from KonstantinMatskevich:umat_bugfix
Roman Donchenko [Tue, 26 Nov 2013 11:32:44 +0000 (15:32 +0400)]
Merge remote-tracking branch 'origin/master' into merge-2.4
Conflicts:
modules/ocl/src/arithm.cpp
Roman Donchenko [Tue, 26 Nov 2013 11:05:26 +0000 (15:05 +0400)]
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
Roman Donchenko [Tue, 26 Nov 2013 09:53:47 +0000 (13:53 +0400)]
Merge pull request #1863 from nevion:master
Roman Donchenko [Tue, 26 Nov 2013 09:00:55 +0000 (13:00 +0400)]
Merge pull request #1818 from GregoryMorse:patch-2
Roman Donchenko [Tue, 26 Nov 2013 07:43:34 +0000 (11:43 +0400)]
Merge pull request #1835 from SpecLad:windows-xadd
Roman Donchenko [Tue, 26 Nov 2013 07:40:37 +0000 (11:40 +0400)]
Merge pull request #1859 from SpecLad:string-plus-equals
GregoryMorse [Mon, 18 Nov 2013 12:25:50 +0000 (20:25 +0800)]
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
Ilya Lavrenov [Mon, 25 Nov 2013 14:14:24 +0000 (18:14 +0400)]
cp test_colot.cpp to imgproc ocl tests
Konstantin Matskevich [Mon, 25 Nov 2013 13:16:22 +0000 (17:16 +0400)]
bugfix in deallocate
Ilya Lavrenov [Thu, 21 Nov 2013 19:25:17 +0000 (23:25 +0400)]
fixed ocl_arithm_op; fix for 3-channel images is needed
Roman Donchenko [Mon, 25 Nov 2013 08:38:56 +0000 (12:38 +0400)]
Merge pull request #1842 from StevenPuttemans:bugfix_3315
Roman Donchenko [Mon, 25 Nov 2013 08:19:58 +0000 (12:19 +0400)]
Merge pull request #1822 from SpecLad:msvc12
Roman Donchenko [Mon, 25 Nov 2013 08:19:20 +0000 (12:19 +0400)]
Merge pull request #1837 from asmorkalov:android_opencl
Roman Donchenko [Mon, 25 Nov 2013 08:17:07 +0000 (12:17 +0400)]
Merge pull request #1839 from pmiecielica:memory_leaks
Roman Donchenko [Mon, 25 Nov 2013 08:15:52 +0000 (12:15 +0400)]
Merge pull request #1864 from berak:mouse_and_match
Roman Donchenko [Mon, 25 Nov 2013 08:04:16 +0000 (12:04 +0400)]
Merge pull request #1850 from ilya-lavrenov:pthread_mutex
Roman Donchenko [Mon, 25 Nov 2013 08:00:25 +0000 (12:00 +0400)]
Merge pull request #1860 from alalek:ocl_fix_undef_warn
berak [Sun, 24 Nov 2013 14:58:13 +0000 (15:58 +0100)]
mouse_and_match.py missing import cv2
Jason Newton [Sun, 24 Nov 2013 09:20:07 +0000 (01:20 -0800)]
correct upper bound for maximum number of labels for 8-way connectivity
Andrey Pavlenko [Sat, 23 Nov 2013 14:54:52 +0000 (18:54 +0400)]
Merge pull request #1862 from alalek:ocl_disable_tests
Alexander Alekhin [Sat, 23 Nov 2013 14:13:32 +0000 (18:13 +0400)]
ocl: disable tests
Andrey Pavlenko [Sat, 23 Nov 2013 12:44:58 +0000 (16:44 +0400)]
Merge pull request #1857 from alalek:ocl_ta_tests_infra
Andrey Pavlenko [Sat, 23 Nov 2013 12:44:37 +0000 (16:44 +0400)]
Merge pull request #1861 from ilya-lavrenov:ocl_args_fix
Ilya Lavrenov [Fri, 22 Nov 2013 14:56:03 +0000 (18:56 +0400)]
fixed error in setting kernel arguments
Alexander Alekhin [Fri, 22 Nov 2013 12:51:01 +0000 (16:51 +0400)]
ocl/core: added prototype for tests
Roman Donchenko [Fri, 22 Nov 2013 14:26:16 +0000 (18:26 +0400)]
Merge pull request #1853 from StevenPuttemans:bugfix_3346
Alexander Alekhin [Fri, 22 Nov 2013 14:24:50 +0000 (18:24 +0400)]
ocl: don't disable Undef warnings
Alexander Alekhin [Thu, 21 Nov 2013 08:35:37 +0000 (12:35 +0400)]
ocl: fix cl_platform.h:95: #elif _WIN32 -> #elif defined(_WIN32)
Roman Donchenko [Fri, 22 Nov 2013 14:15:48 +0000 (18:15 +0400)]
Merge pull request #1854 from asmorkalov:android_engine_tegra4i5