Vladislav Vinogradov
7537521f53
disabled MOG2 performance test (sanity check fails on CUDA 6.0)
2013-11-28 09:50:05 +04:00
Vladislav Vinogradov
7c43daccba
fixed perf tests for bgfg segmentation
2013-11-28 09:49:50 +04:00
Adrien BAK
38904c9a11
fix exception being thrown when no arguments are passed
2013-11-28 12:09:17 +09:00
Adrien BAK
094d7c4926
build fix
2013-11-28 11:42:44 +09:00
Philippe FOUBERT
22ad487328
Comment correction
2013-11-28 00:45:58 +01:00
Philippe FOUBERT
735f704b3e
Add on optional parameter to the matx invert function to know if this operation is successfull without having to analyse the matrix (it may fail in case of bad preconditioning or inappropriate decomposition method)
2013-11-28 00:42:19 +01:00
Philippe FOUBERT
c056e7fc61
Correction to be able to compile using the directive PRINT_KERNEL_RUN_TIME
2013-11-28 00:26:37 +01:00
Ilya Lavrenov
41d046a2db
restored ocl_cvtcolor.cl
2013-11-27 23:46:30 +04:00
Ilya Lavrenov
d2e1318341
RGBA <-> mRGBA
2013-11-27 23:42:10 +04:00
Ilya Lavrenov
f771a0ba81
RGB[A] <-> HLS
2013-11-27 23:37:58 +04:00
Ilya Lavrenov
0b900b54e5
RGB[A] <-> HSV
2013-11-27 23:30:29 +04:00
Ilya Lavrenov
727a5e6df4
BGR5x5 <-> Gray
2013-11-27 22:19:44 +04:00
Ilya Lavrenov
8a23646897
RGB[A] <- RGB5x5
2013-11-27 20:00:35 +04:00
Ilya Lavrenov
81b9c9c104
RGB[A] -> RGB5x5
2013-11-27 19:52:42 +04:00
Ilya Lavrenov
af367c4f85
RGB[A] <-> BGR[A]
2013-11-27 19:44:37 +04:00
Ilya Lavrenov
ab9b883c69
RGB[A] <-> XYZ
2013-11-27 19:37:27 +04:00
Ilya Lavrenov
65ee06eb2b
RGB[A] <-> XYZ
2013-11-27 19:25:26 +04:00
Ilya Lavrenov
506c19616d
YCrCb -> RGB[A]
2013-11-27 19:24:27 +04:00
Anatoly Baksheev
37a754621a
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
2013-11-27 14:53:21 +00:00
Andrey Kamaev
bef34093aa
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 2a6fb2867e
)
(only cherry picked "apps/trancascade")
2013-11-27 14:46:47 +00:00
Andrey Pavlenko
41ae5d5f66
Merge pull request #1867 from ilya-lavrenov:ocl_resize_master
2013-11-27 18:08:11 +04:00
Roman Donchenko
28242f09d0
Merge pull request #1869 from ilya-lavrenov:ocl_cvtColor_master
2013-11-27 17:58:54 +04:00
Roman Donchenko
d5ead208b7
Merge pull request #1858 from StevenPuttemans:updates_traincascade
2013-11-27 17:37:36 +04:00
Roman Donchenko
935f973575
Merge pull request #1877 from tim36272:patch-2
2013-11-27 17:35:53 +04:00
Ilya Lavrenov
90d62cacc9
fixed cv::cvtColor
2013-11-27 16:43:31 +04:00
tim36272
7539156109
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.
2013-11-27 04:09:40 -08:00
StevenPuttemans
a4239f972b
Added extras to traincascade functionality
2013-11-27 12:54:11 +01:00
Roman Donchenko
10aec14a4d
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation
2013-11-27 13:22:31 +04:00
Roman Donchenko
2fed668390
Fixed build errors.
2013-11-27 12:59:19 +04:00
Ilya Lavrenov
6679aed61e
fixed ocl::resize (INTER_LINEAR) and added an accuracy test
2013-11-27 02:52:02 +04:00
Andrey Pavlenko
96a228fd7e
Merge pull request #1866 from ilya-lavrenov:ocl_fix2
2013-11-26 23:27:49 +04:00
Andrey Pavlenko
736097a462
Merge pull request #1868 from KonstantinMatskevich:umat_bugfix
2013-11-26 23:24:51 +04:00
Andrey Pavlenko
1253c2101b
Merge pull request #1875 from asmorkalov:android_bin_compat_fix
2013-11-26 23:17:28 +04:00
Alexander Smorkalov
8fe4ab280b
Build error fix for binary-complience-checker tool.
2013-11-26 17:39:40 +04:00
Roman Donchenko
920fd48228
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
modules/ocl/src/arithm.cpp
2013-11-26 15:32:44 +04:00
Roman Donchenko
9c2272d520
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
2013-11-26 15:05:26 +04:00
Roman Donchenko
aaf97c4548
Merge pull request #1863 from nevion:master
2013-11-26 13:53:48 +04:00
Roman Donchenko
e7339ac11a
Merge pull request #1818 from GregoryMorse:patch-2
2013-11-26 13:00:56 +04:00
Roman Donchenko
e20f7014cf
Merge pull request #1835 from SpecLad:windows-xadd
2013-11-26 11:43:34 +04:00
Roman Donchenko
05e22ee8c9
Merge pull request #1859 from SpecLad:string-plus-equals
2013-11-26 11:40:37 +04:00
Adrien BAK
dda3b534ad
fix indent
2013-11-26 16:09:59 +09:00
Adrien BAK
1c025be068
fix typos
2013-11-26 16:09:42 +09:00
Adrien BAK
514f1fae95
improved error handling
2013-11-26 16:09:29 +09:00
Adrien BAK
8a2de2ecca
modified HoughCircleDemo to introduce variable params via trackbars
...
Conflicts:
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
2013-11-26 16:09:04 +09:00
Andrey Pavlenko
d45ce086c1
Merge pull request #1856 from alalek:ocl_fix_mt
2013-11-26 09:58:22 +04:00
Eric Sommerlade
3b4f65b186
fixed comparison to stop integer wrap around
2013-11-26 00:12:30 +00:00
GregoryMorse
e4793e3d5e
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
2013-11-26 00:22:14 +08:00
Ilya Lavrenov
16a3067afc
cp test_colot.cpp to imgproc ocl tests
2013-11-25 19:19:17 +04:00
Konstantin Matskevich
145855767c
bugfix in deallocate
2013-11-25 17:16:22 +04:00
Ilya Lavrenov
9d23a0cb81
fixed ocl_arithm_op; fix for 3-channel images is needed
2013-11-25 14:21:12 +04:00