Commit Graph

13530 Commits

Author SHA1 Message Date
Roman Donchenko
0ebde64701 Merge pull request #2743 from StevenPuttemans:bugfix_3549 2014-05-14 19:49:27 +04:00
Alexander Mordvintsev
a52979c37f exposed TVL1 optical flow to python 2014-05-14 17:45:21 +04:00
Alexander Mordvintsev
2756ae2051 exposed OpenCL-control functions to python 2014-05-14 17:42:21 +04:00
Roman Donchenko
cafcfc4d0f Merge pull request #2749 from jet47:fix-bug-3678 2014-05-14 17:25:19 +04:00
Roman Donchenko
55bff44810 Merge pull request #2747 from jet47:gpu-resize-stream-fix 2014-05-14 16:34:48 +04:00
ZlodeiBaal
00e3c246fe Create haarcascade_russian_plate_number.xml
Detector for russsian vehicle registration plate
2014-05-14 15:18:56 +04:00
Vladislav Vinogradov
f1e44fa5ca fix bug #3678 (cuda::integral failures) 2014-05-14 12:48:12 +04:00
Roman Donchenko
f13e05cdcb Merge pull request #2740 from ilya-lavrenov:tapi_norm_fix 2014-05-14 12:40:19 +04:00
Roman Donchenko
75a1743f35 Merge pull request #2745 from yashdv:patch-3 2014-05-14 12:38:43 +04:00
Roman Donchenko
83b7fe1b82 Merge pull request #2748 from jet47:fix-bug-3690 2014-05-14 12:35:04 +04:00
Alexander Alekhin
46d672dcc3 Merge pull request #2663 from ilya-lavrenov:ipp_slow 2014-05-14 12:30:05 +04:00
Vladislav Vinogradov
7e2f7f45d7 fix bug #3690
removed invalid condition, it is always false
2014-05-14 10:47:28 +04:00
Vladislav Vinogradov
1f72873c55 fix cv::gpu::resize function
add missing stream parameter to call_resize_linear_glob
2014-05-14 10:31:28 +04:00
Ievgen Khvedchenia
12e1d7fc2b Fix "WARNING: Block quote ends without a blank line" 2014-05-13 21:07:30 +03:00
Roman Donchenko
ed5d71b45f Merge pull request #2724 from znah:python_autowrap 2014-05-13 19:50:01 +04:00
Yash Vadalia
7e56cfafbc fixed a syntax error in cap_giganetix.cpp
Ticket 3458 (http://code.opencv.org/issues/3458)
2014-05-13 19:59:37 +05:30
Alexander Alekhin
6f798b1ba7 icv: android x86 build 2014-05-13 18:28:13 +04:00
Yash Vadalia
6ecd553810 Added doc for LinearPolar Transform 2014-05-13 19:36:43 +05:30
Vladislav Vinogradov
55a714c83b fix cv::kmeans function
reshape input matrix, since the function works with data
as with [N x dims] matrix
2014-05-13 18:00:17 +04:00
Alexander Mordvintsev
dd67ea0210 find -> rindex 2014-05-13 17:55:57 +04:00
StevenPuttemans
1d557e6702 adding bugfix 3549 2014-05-13 15:34:30 +02:00
Ilya Lavrenov
d16e0b377f disabled IPP functions that slower than OpenCV 2014-05-13 15:06:38 +04:00
Roman Donchenko
10f89b9c8b Merge pull request #2737 from jet47:fix-opencv-cmake-config 2014-05-13 14:39:10 +04:00
Roman Donchenko
4a24ecd176 Merge pull request #2731 from StevenPuttemans:bug_2626 2014-05-13 14:21:36 +04:00
Ilya Lavrenov
f64dfeb222 fix for cv::norm (norm_inf) 2014-05-13 14:21:07 +04:00
Roman Donchenko
2cf6cea90f Merge pull request #2730 from StevenPuttemans:bug_2740 2014-05-13 14:19:42 +04:00
Roman Donchenko
c607dadc49 Merge pull request #2729 from StevenPuttemans:bug_3252 2014-05-13 14:17:09 +04:00
Roman Donchenko
83e2731c94 Merge pull request #2728 from StevenPuttemans:bug_3434 2014-05-13 14:15:38 +04:00
Ievgen Khvedchenia
87972d0d7c Fix "WARNING: Block quote ends without a blank line" 2014-05-13 13:15:24 +03:00
Kevin Mitchell
63e508abd2 doc: update/clarify behaviour of mask in floodFill
Clarify how the mask parameter is set on output and how this is
affected by the flags parameter.

resolves Feature #2942
2014-05-13 02:26:59 -07:00
StevenPuttemans
006956c324 Fixing as suggested in bug 2626, made naming same for both C, C++ and python API 2014-05-13 11:02:01 +02:00
Roman Donchenko
ff2d76ec0d Merge pull request #2699 from GregoryMorse:patch-1 2014-05-13 11:58:25 +04:00
Roman Donchenko
bc7b21609a Merge pull request #2692 from 1Hyena:2.4 2014-05-13 11:56:12 +04:00
Roman Donchenko
f0547e5e05 Merge pull request #2727 from StevenPuttemans:bug_3484 2014-05-13 11:55:17 +04:00
Roman Donchenko
ea5b411c0f Merge pull request #2725 from SpecLad:merge-2.4 2014-05-13 11:53:30 +04:00
Vladislav Vinogradov
67b562d543 fix OpenCVConfig.cmake template - missing parentheses 2014-05-13 11:37:21 +04:00
1Hyena
6c118ebc51 Changed ostringstream to ostream for new print_params and added the old
version of print_params for backwards compatibility.
2014-05-12 23:01:44 +03:00
Roman Donchenko
09674623cf Merge pull request #2714 from asmorkalov:ocv_cmake_config 2014-05-12 18:53:10 +04:00
Roman Donchenko
ecfb1ab4f8 Merge pull request #2721 from zarrabeitia:2.4 2014-05-12 18:48:01 +04:00
StevenPuttemans
a0a8fb4fd9 fixed bug 2626 2014-05-12 16:43:07 +02:00
StevenPuttemans
6c59e39f7c fix bug 3434 2014-05-12 16:41:22 +02:00
Roman Donchenko
313a0ad255 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/arithm.cpp
	modules/imgproc/src/imgwarp.cpp
	modules/objdetect/src/hog.cpp
2014-05-12 17:38:07 +04:00
StevenPuttemans
e96de8821c bug 2740 added fix 2014-05-12 15:26:56 +02:00
StevenPuttemans
b382984810 fix bug 3252 2014-05-12 15:01:15 +02:00
StevenPuttemans
2b4241c10b fixed bug 3484 2014-05-12 14:40:12 +02:00
Ilya Lavrenov
1e5694e082 heuristic for Intel 2014-05-12 16:08:39 +04:00
Alexander Mordvintsev
120b3a1e77 Work on python wrapped generation automation:
- all parsed headers are included into "cv2.cpp" with "pyopencv_generated_include.h"
 - types starting with "Ptr_" converted to "Ptr<...>" form (avoids many typedefs in "cv2.cpp")
2014-05-12 15:49:54 +04:00
Alexander Smorkalov
e8376c789d Fix non-Android cross compilation with OpenCVConfig.cmake 2014-05-12 15:45:02 +04:00
Alexander Alekhin
1f638a3e5b icv: enable functions 2014-05-12 15:38:38 +04:00
Roman Donchenko
5e47aa6300 Merge pull request #2717 from StevenPuttemans:2.4 2014-05-12 15:14:53 +04:00