Commit Graph

10158 Commits

Author SHA1 Message Date
Alexander Smorkalov c6ab8cb6ee Merge pull request #1471 from ozantonkal:master 2013-09-25 17:19:39 +04:00
Alexander Smorkalov e1f55c3fcc Merge pull request #1496 from shawke:patch-1 2013-09-25 11:29:46 +04:00
shawke 720241de87 Make similar default typedefs for Point_, Size_ and Rect_
Currently, there are different default typedefs for Point_, Size_, and Rect_. This pull request at least makes sure that default typedefs exist for int, float and double variants of each of these types.
2013-09-24 11:48:04 +02:00
Alexander Smorkalov c8b97271cc Merge pull request #1430 from nzjrs:add-brisk-to-demos 2013-09-23 16:34:19 +04:00
Alexander Smorkalov b5f3709ab9 Merge pull request #1484 from lluisgomez:scene_text_detection_documentation 2013-09-23 14:00:08 +04:00
lluis 5670e4f6cd fixed typos 2013-09-23 10:17:47 +02:00
Alexander Smorkalov 298a1d50d2 Merge pull request #1299 from jet47:gpu-cuda-rename 2013-09-23 10:31:51 +04:00
lluis 5556f051f1 added rst documentation for the Class-specific Extremal Regions for Scene Text Detection 2013-09-20 21:39:11 +02:00
John Stowers 4b19fda1d6 Add brisk features to python demos 2013-09-20 21:12:49 +02:00
Alexander Smorkalov c0c575d68e Merge pull request #1481 from Human:master 2013-09-20 11:08:09 +04:00
Alexander Smorkalov 1445a29e1c Merge pull request #1469 from lluisgomez:scene_text_detection_erGrouping 2013-09-20 10:54:53 +04:00
Bob Igo 2eb5ca0024 fixed malformed XML 2013-09-19 16:32:32 -04:00
Alexander Smorkalov 0ecd7913f8 Merge pull request #1472 from alalek:master_fix_debug_builds_on_win 2013-09-19 14:41:55 +04:00
lluis 2837bfd9fa Added erGrouping function: Find groups of Extremal Regions that are organized as text blocks. Updated sample/cpp to use the complete text detection pipeline 2013-09-19 10:30:25 +02:00
Alexander Smorkalov c550e452f9 Merge pull request #1384 from hbristow:matlab_public 2013-09-19 10:25:02 +04:00
Ozan Tonkal 5780b418c9 delete duplicate bunny.ply, remove tabs and extra lines 2013-09-18 13:46:43 +01:00
Alexander Alekhin 81ac97c6bd fix for broken debug builds (MSVS2010/2012) 2013-09-18 16:05:21 +04:00
Ozan Tonkal 8de46e1f81 removed trailing spaces 2013-09-18 12:50:55 +01:00
hbristow d84ab09ab7 Updated documentation 2013-09-18 18:52:23 +10:00
Ozan Tonkal 824c28a588 Merge remote-tracking branch 'itseez/master' 2013-09-18 08:44:37 +01:00
hbristow 1dd017e9d0 Fixed a memory leak in mxarray 2013-09-18 17:10:54 +10:00
Alexander Smorkalov 99a43257d5 Merge pull request #1465 from jet47:cudev-old-cc 2013-09-18 10:39:53 +04:00
Alexander Smorkalov 3fa3722641 Merge pull request #1458 from look4pritam:my-branch 2013-09-17 22:50:48 +04:00
Ozan Tonkal 223fb39d94 include viz tutorials in the main tutorials file. ignore viz samples 2013-09-17 20:17:13 +02:00
Ozan Tonkal a117400577 ignore viz tutorials when BUILD_opencv_viz is not set 2013-09-17 18:55:10 +02:00
Ozan Tonkal e3e5fd5baa Merge remote-tracking branch 'itseezstream/master' 2013-09-17 17:50:14 +02:00
Andrey Pavlenko ad404ef44f Merge pull request #1446 from lluisgomez:scene_text_detection_NM_fix2 2013-09-17 17:50:46 +04:00
Vladislav Vinogradov 20f636fcee fixed cudev compilation for old pre-Fermi archs 2013-09-17 17:43:12 +04:00
look4pritam a430abd02e The thin prism distortion coefficient related small bug is fixed. 2013-09-16 13:39:11 +05:30
Ozan Tonkal 3165b526f2 merge with Itseez/opencv 2013-09-15 17:51:27 +02:00
hbristow eb3a83209c Added TODO for the future of Matlab version sorting 2013-09-16 00:48:07 +10:00
Ozan Tonkal c31fb8ffff rename widgets from *Widgets to W* 2013-09-15 16:26:53 +02:00
hbristow 31c58d23e0 Streamlined mexext detection, with removal of trailing whitespace/newlines handled by execute_process 2013-09-15 23:53:29 +10:00
Ozan Tonkal f570b3e18d cmake check if VTK version is lower than 5, and give fatal error if it is 2013-09-15 11:24:20 +02:00
hbristow 86b7e3d15d Moved Jinja2 into 3rdparty. Now using latest stable version from pypi (2.7.1) 2013-09-15 17:36:13 +10:00
hbristow 224f44a255 Made changes to OpenCVFindMatlab suggested by SpecLad 2013-09-14 13:32:15 +10:00
lluis d25309f82e first parameter of createERFilterNM1/createERFilterNM2 is now mandatory. changed the sample program to use the new prototypes 2013-09-13 16:29:21 +02:00
lluis 75fdfba281 renamed getDefaultClassifierNM{1,2}() to loadClassifierNM{1,2}() and added "const std::string& filename" parameter (mandatory). 2013-09-13 16:19:52 +02:00
Roman Donchenko eff21788a8 Merge pull request #1445 from vpisarev:stereocalib_quick_fix 2013-09-13 15:01:14 +04:00
lluis 95d92c099c functions getDefaultClassifierNM1() and getDefaultClassifierNM2() allow to implicitly load the default classifiers when creating a ERFilter object 2013-09-13 12:54:23 +02:00
Roman Donchenko 160ab8415e Merge pull request #1330 from lenlen:plantuml 2013-09-13 14:31:01 +04:00
Vadim Pisarevsky 84022b0c19 fix thin-prism coefficients at 0's in the stereo calibration function unless the flag CALIB_THIN_PRISM_MODEL is explicitly set 2013-09-13 13:32:42 +04:00
Roman Donchenko c511d5d649 Merge pull request #1414 from lluisgomez:scene_text_detection_computeNMChannels 2013-09-13 13:31:14 +04:00
Roman Donchenko 0033d453f2 Merge pull request #1426 from nailbiter:optimPD 2013-09-13 13:27:02 +04:00
Roman Donchenko e3b92a9591 Merge pull request #1441 from look4pritam:prism-stereo 2013-09-13 13:17:06 +04:00
Roman Donchenko 4082a0c64e Merge pull request #1442 from SpecLad:version-status 2013-09-13 13:16:30 +04:00
hbristow 232f11e256 Updated OpenCVFindMatlab with changes suggested by SpecLad 2013-09-13 18:08:33 +10:00
hbristow 530ad447bc Added fixes to CMakeLists.txt 2013-09-13 17:22:12 +10:00
Ozan Tonkal 3f27ba54e0 re-render the scene after changing camera properties 2013-09-12 19:23:05 +02:00
Roman Donchenko d669559ec3 Bumped version to 3.0. 2013-09-12 16:40:14 +04:00