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
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_
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
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]
Anatoly Baksheev [Sat, 16 Nov 2013 15:56:08 +0000 (19:56 +0400)]
Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h'
Conflicts:
apps/traincascade/boost.cpp
Andrey Kamaev [Sun, 24 Feb 2013 16:14:01 +0000 (20:14 +0400)]
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
(cherry picked from commit
2a6fb2867e2fc639e0675eed8abb1688de4539ec)
(only cherry picked "apps/trancascade")
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
Roman Donchenko [Wed, 27 Nov 2013 13:37:36 +0000 (17:37 +0400)]
Merge pull request #1858 from StevenPuttemans:updates_traincascade
Roman Donchenko [Wed, 27 Nov 2013 13:35:52 +0000 (17:35 +0400)]
Merge pull request #1877 from tim36272:patch-2
Ilya Lavrenov [Mon, 25 Nov 2013 15:15:36 +0000 (19:15 +0400)]
fixed cv::cvtColor
tim36272 [Wed, 27 Nov 2013 12:09:40 +0000 (04:09 -0800)]
Fixed minor documentation typo
In section "How do we get an Affine Transformation" subsection 2 there was a ' where there should have been a ` which caused the math to be rendered incorrectly.
StevenPuttemans [Thu, 21 Nov 2013 13:07:53 +0000 (14:07 +0100)]
Added extras to traincascade functionality
Roman Donchenko [Wed, 27 Nov 2013 09:22:31 +0000 (13:22 +0400)]
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation
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
Andrey Pavlenko [Tue, 26 Nov 2013 19:17:28 +0000 (23:17 +0400)]
Merge pull request #1875 from asmorkalov:android_bin_compat_fix
Alexander Smorkalov [Tue, 26 Nov 2013 13:39:40 +0000 (17:39 +0400)]
Build error fix for binary-complience-checker tool.
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
Adrien BAK [Wed, 13 Nov 2013 07:21:09 +0000 (16:21 +0900)]
fix indent
Adrien BAK [Wed, 13 Nov 2013 07:13:47 +0000 (16:13 +0900)]
fix typos
Adrien BAK [Mon, 11 Nov 2013 05:55:12 +0000 (14:55 +0900)]
improved error handling
Adrien BAK [Mon, 11 Nov 2013 05:47:54 +0000 (14:47 +0900)]
modified HoughCircleDemo to introduce variable params via trackbars
Conflicts:
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
Andrey Pavlenko [Tue, 26 Nov 2013 05:58:21 +0000 (09:58 +0400)]
Merge pull request #1856 from alalek:ocl_fix_mt
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
StevenPuttemans [Thu, 21 Nov 2013 15:45:48 +0000 (16:45 +0100)]
Applied feature #3375 and fix of pull 1842 to avoid merging problems later