Nghia Ho
5921c77613
Merge remote-tracking branch 'upstream/master'
2013-09-26 23:08:23 +10:00
Alexander Smorkalov
4b203f7b1a
Merge pull request #1470 from IceRage:min_enclosing_triangle
2013-09-26 16:28:54 +04:00
Nghia Ho
357e5d55f6
Removed trailing whitespaces
2013-09-26 19:14:59 +10:00
Nghia Ho
e6a9c22b9d
Merge remote-tracking branch 'upstream/master'
2013-09-26 19:13:01 +10:00
Alexander Smorkalov
0d49206a98
Merge pull request #1485 from vpisarev:ipp_fixes
2013-09-26 11:09:59 +04:00
Alexander Smorkalov
241aa6e5a8
Merge pull request #1497 from jet47:fix-bug-3277
2013-09-26 09:31:06 +04:00
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
Vladislav Vinogradov
e675684c81
fix bug #3277 (findCirclesGrid failures):
...
findHomagraphy can return empty Mat in master branch
2013-09-24 14:45:13 +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
Nghia Ho
b4ffb0878d
Merge remote-tracking branch 'upstream/master'
2013-09-23 20:05:51 +10: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
Nghia Ho
4171767d19
Merge remote-tracking branch 'upstream/master'
2013-09-21 02:20:25 +10:00
Vadim Pisarevsky
8e7eb79f6e
fixed compile errors and warnings when building master branch with IPP enabled
2013-09-20 16:02:15 +04: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
Ovidiu Parvu
2bf36c312f
Removed static variables which were not read-only and used more function parameters instead.
2013-09-19 18:32:03 +01:00
Ovidiu Parvu
e324446c70
Changed the signature of the minEnclosingTriangle function such that it returns the area automatically. Moreover, the overloaded function was no longer required so it was removed. Sample code, documentation and unit tests were updated correspondingly.
2013-09-19 16:22:30 +01:00
Ovidiu Parvu
52cdae6e2b
Removed the cvMinEnclosingTriangle function since the C API will be deprecated starting with OpenCV 3.0
2013-09-19 15:37:10 +01:00
Ovidiu Parvu
21390d806f
Removed non-ASCII characters from the comments
2013-09-19 15:12:07 +01:00
Nghia Ho
8e8ff4dd33
Merge remote-tracking branch 'upstream/master'
2013-09-19 23:58:19 +10: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
Ovidiu Parvu
73f476bd4b
Added a namespace and prefixed global variables with "G_" in order to prevent variable shadowing problems.
2013-09-18 15:51:10 +01:00
Ozan Tonkal
5780b418c9
delete duplicate bunny.ply, remove tabs and extra lines
2013-09-18 13:46:43 +01:00
Ovidiu Parvu
737c5fe781
Updated the return type of the cvMinEnclosingTriangle function in the documentation
2013-09-18 13:09:55 +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
Ovidiu Parvu
dc64dd7315
Made the following changes after code inspection (min_enclosing_triangle.cpp):
...
* Corrected minor typos in comments/function signatures
* Added new details to copyright statement
* Removed unreferenced macros
* Removed the assert statement which was checking the type of the OutputArray triangle
* When returning results using Mat::copyTo instead of Mat::convertTo
* Changed C-style casts to static_casts
* Added division by zero check to distanceFromPointToLine() function
* Updated reference webpages last access dates
* Moved the declaration of the gammaOfA variable outside the while loop in moveAIfLowAndBIfHigh() function for efficiency reasons
2013-09-18 12:21:24 +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
Ovidiu Parvu
b570a4ac47
Added the C interface function signature and the overloaded minEnclosingTriangle Python function to the documentation.
2013-09-15 23:40:40 +01:00
Ovidiu Parvu
130b4d8e26
Changed the return type of cvMinEnclosingTriangle to CVAPI(void). Added the implementation of the function to the min_enclosing_triangle.cpp source file.
2013-09-15 23:25:36 +01:00
Ovidiu Parvu
7ac768651f
Added the signature cvMinEnclosingTriangle (C version) to the imgproc_c.h header
2013-09-15 22:40:57 +01:00
