Peter Andreas Entschev [Sun, 8 Dec 2013 00:12:13 +0000 (22:12 -0200)]
OCL: including FAST feature detector.
Roman Donchenko [Fri, 6 Dec 2013 13:50:44 +0000 (17:50 +0400)]
Merge pull request #1941 from vhdirk:gst1x_default
Andrey Pavlenko [Fri, 6 Dec 2013 12:40:29 +0000 (16:40 +0400)]
Merge pull request #1936 from ElenaGvozdeva:ocl_flip
Elena Gvozdeva [Fri, 6 Dec 2013 11:53:00 +0000 (15:53 +0400)]
Fixed test for ocl_flip
Andrey Pavlenko [Fri, 6 Dec 2013 11:26:43 +0000 (15:26 +0400)]
Merge pull request #1942 from ilya-lavrenov:warn_fix
Andrey Pavlenko [Fri, 6 Dec 2013 11:25:56 +0000 (15:25 +0400)]
Merge pull request #1937 from ilya-lavrenov:tapi_integral
Ilya Lavrenov [Fri, 6 Dec 2013 09:29:53 +0000 (13:29 +0400)]
fixed warnings
Dirk Van Haerenborgh [Fri, 6 Dec 2013 09:20:29 +0000 (10:20 +0100)]
Enable GStreamer 1.x support by default.
GStreamer 1.x is universally available, and with 0.10 being deprecated,
there should be no reason to default to 0.10 stil.
Ilya Lavrenov [Thu, 5 Dec 2013 15:43:50 +0000 (19:43 +0400)]
added cv::intergal to T-API
Elena Gvozdeva [Thu, 5 Dec 2013 10:36:45 +0000 (14:36 +0400)]
Added cv::flip using Transparent API
Andrey Pavlenko [Thu, 5 Dec 2013 13:02:37 +0000 (17:02 +0400)]
Merge pull request #1925 from vpisarev:ocl_facedetect2
Roman Donchenko [Thu, 5 Dec 2013 08:38:12 +0000 (12:38 +0400)]
Merge pull request #1447 from Siddharthk:master
Vadim Pisarevsky [Wed, 4 Dec 2013 18:22:36 +0000 (22:22 +0400)]
another attempt to fix compile errors
Vadim Pisarevsky [Wed, 4 Dec 2013 17:56:35 +0000 (21:56 +0400)]
trying to eliminate compile problems
Andrey Pavlenko [Wed, 4 Dec 2013 17:41:44 +0000 (21:41 +0400)]
Merge pull request #1908 from ilya-lavrenov:tapi_imgproc
Vadim Pisarevsky [Wed, 4 Dec 2013 15:00:39 +0000 (19:00 +0400)]
refactored CascadeClassifier to hide implementation details (take 2)
siddharth [Wed, 4 Dec 2013 13:42:43 +0000 (19:12 +0530)]
Added comment in demo file
siddharth [Fri, 22 Nov 2013 18:07:41 +0000 (23:37 +0530)]
Errors resolved
Anna Kogan [Thu, 21 Nov 2013 11:45:53 +0000 (15:45 +0400)]
After-merge corrections
siddharth [Wed, 6 Nov 2013 14:59:01 +0000 (20:29 +0530)]
New changes done and removed opencv_extra folder
Removed opencv_extra folder inside opencv folder
New changes done
Removed test images
siddharth [Mon, 21 Oct 2013 14:24:32 +0000 (19:54 +0530)]
Removed build errors and removed test images
Removed conflict
Error fix 1
Error fix 2
Error fix 3
Error fix 3
Error fix 4
Error fix 5
Error fix 6
Error fix 7
Error fix 8
Error fix 9
Error fix 10
Error fix 11
Error fix 12
Errors fixed
Removed opencv_extra folder inside opencv folder
siddharth [Thu, 17 Oct 2013 15:44:31 +0000 (21:14 +0530)]
Changes done in npr module
siddharth [Wed, 9 Oct 2013 16:19:57 +0000 (21:49 +0530)]
Changes done in cloning module
siddharth [Mon, 7 Oct 2013 14:00:13 +0000 (19:30 +0530)]
Changes done in decolorization module
siddharth [Tue, 1 Oct 2013 15:43:41 +0000 (21:13 +0530)]
Revert Back
siddharth [Tue, 1 Oct 2013 14:52:10 +0000 (20:22 +0530)]
Update to remove Android error
siddharth [Tue, 1 Oct 2013 13:05:53 +0000 (18:35 +0530)]
Changed STL in contrast_preserve file
siddharth [Sat, 14 Sep 2013 13:42:25 +0000 (19:12 +0530)]
whitespaces removed and other minor changes to fix build error
Update 1
update 2
Update 3
Update 4
Update 5
update 6
Update 7
Update 8
Update 9
Update 10
Update 11
Update 12
Update 13
Update 14
Update 15
Update 16
Update 17
Update 18
Update 19
Update 20
Update 21
Update 22
Removed Headers
Update 23
Update 24
Update 25
Update 26
Update 27
Update 28
siddharth [Sat, 14 Sep 2013 13:29:55 +0000 (18:59 +0530)]
cloning_gui.cpp updated
siddharth [Sat, 14 Sep 2013 11:36:26 +0000 (17:06 +0530)]
errors in samples/cpp removed
siddharth [Sat, 14 Sep 2013 11:17:44 +0000 (16:47 +0530)]
cloning_demo error removed
siddharth [Fri, 13 Sep 2013 12:58:03 +0000 (18:28 +0530)]
renamed
siddharth [Fri, 13 Sep 2013 12:57:02 +0000 (18:27 +0530)]
remove cloning_example.cpp
siddharth [Fri, 13 Sep 2013 12:55:23 +0000 (18:25 +0530)]
cloning demo added
siddharth [Tue, 3 Sep 2013 15:42:05 +0000 (21:12 +0530)]
new filters added and all the 3 modules updated
All 3 modules Updated
siddharth [Tue, 27 Aug 2013 08:08:38 +0000 (13:38 +0530)]
edge preserve filters added and windows warning removed
update1
siddharth [Mon, 19 Aug 2013 07:46:04 +0000 (13:16 +0530)]
added keyboard control
siddharth [Mon, 5 Aug 2013 06:42:28 +0000 (12:12 +0530)]
new interface added. decolor and cloning module added.
Both modules added
siddharth [Fri, 26 Jul 2013 06:03:27 +0000 (11:33 +0530)]
decolor module updated
siddharth [Fri, 12 Jul 2013 03:48:37 +0000 (09:18 +0530)]
seamless cloning added
update1
update1
update4
siddharth [Mon, 1 Jul 2013 08:49:03 +0000 (14:19 +0530)]
add color_boost + doc
siddharth [Mon, 17 Jun 2013 09:57:52 +0000 (15:27 +0530)]
decolor module updated
update3
update4
update4
update5
added test data
siddharth [Sat, 15 Jun 2013 10:49:31 +0000 (16:19 +0530)]
added new files
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