Vladimir Bystricky [Fri, 6 Dec 2013 10:21:51 +0000 (14:21 +0400)]
Add check for depths of destination and source image. Fix warning C4127.
Vladimir Bystricky [Thu, 5 Dec 2013 10:25:15 +0000 (14:25 +0400)]
Fix issue in boxFilter with destination depth not equal to source depth.
Vladimir Bystricky [Thu, 5 Dec 2013 07:47:17 +0000 (11:47 +0400)]
Add ocl version of boxFilter to the module img_proc
Andrey Pavlenko [Wed, 4 Dec 2013 17:41:44 +0000 (21:41 +0400)]
Merge pull request #1908 from ilya-lavrenov:tapi_imgproc
Roman Donchenko [Wed, 4 Dec 2013 12:30:55 +0000 (16:30 +0400)]
Merge pull request #1914 from SpecLad:merge-2.4
Ilya Lavrenov [Mon, 2 Dec 2013 20:13:05 +0000 (00:13 +0400)]
added cv::threshold to T-API
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
Roman Donchenko [Tue, 3 Dec 2013 11:50:44 +0000 (15:50 +0400)]
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
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:32:30 +0000 (11:32 +0400)]
Merge pull request #1899 from berak:b_3171_24
Andrey Pavlenko [Tue, 3 Dec 2013 07:20:48 +0000 (11:20 +0400)]
Merge pull request #1906 from asmorkalov:android_ocl_warn_fix
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
Andrey Pavlenko [Mon, 2 Dec 2013 16:38:48 +0000 (20:38 +0400)]
Merge pull request #1744 from liuxing6666:2.4_fix_harris_test
Andrey Pavlenko [Mon, 2 Dec 2013 16:07:46 +0000 (20:07 +0400)]
Merge pull request #1590 from ilya-lavrenov:cmd_parser_fix
Roman Donchenko [Mon, 2 Dec 2013 14:55:47 +0000 (18:55 +0400)]
Merge pull request #1882 from philippefoubert:branch_ocl_instrumentation
Roman Donchenko [Mon, 2 Dec 2013 14:53:26 +0000 (18:53 +0400)]
Merge pull request #1887 from jet47:android-cuda-6.0
Vadim Pisarevsky [Mon, 2 Dec 2013 14:27:08 +0000 (18:27 +0400)]
hopefully, now opencv_test_imgproc should pass
Roman Donchenko [Mon, 2 Dec 2013 13:53:33 +0000 (17:53 +0400)]
Merge pull request #1797 from moodoki:bugfix_3344
Alexander Smorkalov [Mon, 2 Dec 2013 13:48:27 +0000 (17:48 +0400)]
Warning fixes and suppression in ocl module for gcc 4.6 from Android NDK.
Roman Donchenko [Mon, 2 Dec 2013 13:11:55 +0000 (17:11 +0400)]
Merge pull request #1897 from berak:b_3393_24
Séverin Lemaignan [Tue, 26 Nov 2013 04:53:44 +0000 (05:53 +0100)]
Ensure compilation to Javascript with Emscripten
Roman Donchenko [Mon, 2 Dec 2013 10:14:41 +0000 (14:14 +0400)]
Merge pull request #1898 from berak:b_3349_24
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
Roman Donchenko [Mon, 2 Dec 2013 08:27:50 +0000 (12:27 +0400)]
Merge pull request #1884 from asmorkalov:winrt_img_proc_sample
Roman Donchenko [Mon, 2 Dec 2013 08:17:29 +0000 (12:17 +0400)]
Merge pull request #1894 from asmorkalov:ocv_debug_build
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
berak [Sat, 30 Nov 2013 12:35:23 +0000 (13:35 +0100)]
CV_WRAP for BackgroundSubtractorMOG2
berak [Sat, 30 Nov 2013 12:09:42 +0000 (13:09 +0100)]
corrected initialization of output_folder in facereco examples
berak [Sat, 30 Nov 2013 11:00:22 +0000 (12:00 +0100)]
swapped x,y in elbp_
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 19:08:20 +0000 (23:08 +0400)]
Merge pull request #1845 from StevenPuttemans:bugfix_3306
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
Alexander Smorkalov [Fri, 29 Nov 2013 11:34:50 +0000 (15:34 +0400)]
Some debug options are removed because they are installed by Cmake automatically.
Also forcing -ggdb3 on android leads to debuging issues.
Roman Donchenko [Fri, 29 Nov 2013 11:10:12 +0000 (15:10 +0400)]
Merge pull request #1892 from asmorkalov:android_native_camera_close_fix
Vladislav Vinogradov [Fri, 29 Nov 2013 10:53:33 +0000 (14:53 +0400)]
fixed compilation of gpu-basics-similarity tutorial:
initialize TIMES variable with some default value (10)
Andrey Pavlenko [Fri, 29 Nov 2013 08:59:08 +0000 (12:59 +0400)]
Merge pull request #1880 from ilya-lavrenov:tapi_cvtColor
Alexander Smorkalov [Fri, 29 Nov 2013 06:38:26 +0000 (10:38 +0400)]
Android native camera destruction fixed for Android 4.4.
Alexander Smorkalov [Mon, 30 Sep 2013 04:22:18 +0000 (08:22 +0400)]
Filter selection and several filters implemented for WinRT sample.
Roman Donchenko [Thu, 28 Nov 2013 12:42:53 +0000 (16:42 +0400)]
Merge pull request #1874 from SpecLad:merge-2.4
Roman Donchenko [Thu, 28 Nov 2013 10:11:39 +0000 (14:11 +0400)]
Merge pull request #1885 from jet47:gpu-bgfg-test-fix
Vladislav Vinogradov [Thu, 28 Nov 2013 09:35:23 +0000 (13:35 +0400)]
fixed CUDA_TOOLKIT_TARGET_DIR for android:
use targets/armv7-linux-androideabi is exists
Ilya Lavrenov [Wed, 27 Nov 2013 20:57:36 +0000 (00:57 +0400)]
added cv::LUT to T-API
Roman Donchenko [Thu, 28 Nov 2013 08:24:44 +0000 (12:24 +0400)]
Merge pull request #1879 from LeszekSwirski:traincascade-2.4
Roman Donchenko [Thu, 28 Nov 2013 08:11:24 +0000 (12:11 +0400)]
Merge pull request #1873 from abak:hough_24
Vladislav Vinogradov [Wed, 30 Oct 2013 06:21:55 +0000 (10:21 +0400)]
added `-Xptxas;-dlcm=ca` and `-target-os-variant=Android` to nvcc flags
Vladislav Vinogradov [Wed, 30 Oct 2013 06:21:30 +0000 (10:21 +0400)]
fixed compilation warnings in .cu files
Vladislav Vinogradov [Wed, 30 Oct 2013 06:21:13 +0000 (10:21 +0400)]
fixed CC arch/pts for android (used sm_32)
Vladislav Vinogradov [Wed, 30 Oct 2013 06:20:45 +0000 (10:20 +0400)]
enable CUDA support for android
Alexander Smorkalov [Thu, 29 Aug 2013 10:42:30 +0000 (03:42 -0700)]
Image processing sample for WinRT added.
Vladislav Vinogradov [Wed, 27 Nov 2013 13:36:58 +0000 (17:36 +0400)]
disabled MOG2 performance test (sanity check fails on CUDA 6.0)
Vladislav Vinogradov [Wed, 27 Nov 2013 13:32:00 +0000 (17:32 +0400)]
fixed perf tests for bgfg segmentation
Adrien BAK [Thu, 28 Nov 2013 03:09:17 +0000 (12:09 +0900)]
fix exception being thrown when no arguments are passed
Adrien BAK [Thu, 28 Nov 2013 02:42:44 +0000 (11:42 +0900)]
build fix
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