Nghia Ho [Tue, 1 Oct 2013 11:03:54 +0000 (21:03 +1000)]
Removed trailing whitespace
Nghia Ho [Tue, 1 Oct 2013 09:56:47 +0000 (19:56 +1000)]
Merge remote-tracking branch 'upstream/master'
Roman Donchenko [Tue, 1 Oct 2013 08:09:11 +0000 (12:09 +0400)]
Merge pull request #1512 from Exocoder:pre-gtk3
Tony [Mon, 30 Sep 2013 20:04:43 +0000 (21:04 +0100)]
Change true for TRUE
The second parameter of gtk_widget_set_realized is of type gboolean
(gint). This is to ensure compatibility on alternative compilers and
platforms.
Roman Donchenko [Mon, 30 Sep 2013 14:06:53 +0000 (18:06 +0400)]
Merge pull request #1429 from nzjrs:fix-sketcher
Roman Donchenko [Mon, 30 Sep 2013 13:44:42 +0000 (17:44 +0400)]
Merge pull request #1477 from nzjrs:python-gethardwaresupport
Roman Donchenko [Mon, 30 Sep 2013 13:39:42 +0000 (17:39 +0400)]
Merge pull request #1488 from abidrahmank:py_tutorials
Nghia Ho [Mon, 30 Sep 2013 12:59:29 +0000 (22:59 +1000)]
Merge remote-tracking branch 'upstream/master'
Roman Donchenko [Mon, 30 Sep 2013 12:08:20 +0000 (16:08 +0400)]
Merge pull request #1520 from lluisgomez:scene_text_erGrouping_classifier
lluis [Fri, 27 Sep 2013 14:28:47 +0000 (16:28 +0200)]
erGrouping now uses a classifier for group validation instead of a set of heuristical ifos.
Updated documentation and sample to use the new function API
Tony [Thu, 26 Sep 2013 17:31:44 +0000 (18:31 +0100)]
Replace obsolete Gtk symbols
This update replaces depreciated Gtk1.x symbols with Gtk2.x symbols in
preparation for adding Gtk3 support. These edits aim to be fully
compatible with Gtk2.x, allowing backward compatibility.
The following symbols have been replaced in this commit:
Gtk symbols that have been moved to the Gdk library:
- GtkType -> Gtype
- GTK_CHECK_CAST -> G_TYPE_CHECK_INSTANCE_CAST
- GTK_CHECK_TYPE -> G_TYPE_CHECK_INSTANCE_TYPE
- gtk_signal_connect -> g_signal_connect
- GTK_SIGNAL_FUNC -> G_CALLBACK
- gtk_type_class -> g_type_class_peek
- gtk_type_new-> g_object_new
- GtkTypeInfo -> GtypeInfo (Not required for
g_type_register_static_simple)
- gtk_type_unique -> g_type_register_static_simple
- gdk_draw_image_rgb -> replaced by gdk_cairo_source_pixbuf
NB: This requires porting to use cairo contexts and GdkPixbufs.
The following gtk symbols are changed for their modern equivalent:
- GTK_WIDGET_REALIZED -> gtk_widget_get_realized
- GTK_OBJECT_FLAGS -> gtk_widget_set_realized
Symbols without replacement:
- gtk_range_set_update_policy -> No replacement; as default policy is
set to continuous we can delete this line.
Nghia Ho [Thu, 26 Sep 2013 13:08:23 +0000 (23:08 +1000)]
Merge remote-tracking branch 'upstream/master'
Alexander Smorkalov [Thu, 26 Sep 2013 12:28:52 +0000 (16:28 +0400)]
Merge pull request #1470 from IceRage:min_enclosing_triangle
Nghia Ho [Thu, 26 Sep 2013 09:14:59 +0000 (19:14 +1000)]
Removed trailing whitespaces
Nghia Ho [Thu, 26 Sep 2013 09:13:01 +0000 (19:13 +1000)]
Merge remote-tracking branch 'upstream/master'
Alexander Smorkalov [Thu, 26 Sep 2013 07:09:57 +0000 (11:09 +0400)]
Merge pull request #1485 from vpisarev:ipp_fixes
Alexander Smorkalov [Thu, 26 Sep 2013 05:31:06 +0000 (09:31 +0400)]
Merge pull request #1497 from jet47:fix-bug-3277
Alexander Smorkalov [Wed, 25 Sep 2013 13:19:37 +0000 (17:19 +0400)]
Merge pull request #1471 from ozantonkal:master
Alexander Smorkalov [Wed, 25 Sep 2013 07:29:46 +0000 (11:29 +0400)]
Merge pull request #1496 from shawke:patch-1
Vladislav Vinogradov [Tue, 24 Sep 2013 10:45:13 +0000 (14:45 +0400)]
fix bug #3277 (findCirclesGrid failures):
findHomagraphy can return empty Mat in master branch
shawke [Tue, 24 Sep 2013 09:48:04 +0000 (11:48 +0200)]
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.
Alexander Smorkalov [Mon, 23 Sep 2013 12:34:14 +0000 (16:34 +0400)]
Merge pull request #1430 from nzjrs:add-brisk-to-demos
Nghia Ho [Mon, 23 Sep 2013 10:05:51 +0000 (20:05 +1000)]
Merge remote-tracking branch 'upstream/master'
Alexander Smorkalov [Mon, 23 Sep 2013 10:00:04 +0000 (14:00 +0400)]
Merge pull request #1484 from lluisgomez:scene_text_detection_documentation
lluis [Mon, 23 Sep 2013 08:17:47 +0000 (10:17 +0200)]
fixed typos
abidrahmank [Sat, 21 Sep 2013 18:44:27 +0000 (00:14 +0530)]
GSoC Python Tutorials
GSoC Python Tutorials
removed white spaces
removed blank lines at EOF
removed duplicate labels
Alexander Smorkalov [Mon, 23 Sep 2013 06:31:46 +0000 (10:31 +0400)]
Merge pull request #1299 from jet47:gpu-cuda-rename
lluis [Fri, 20 Sep 2013 12:19:59 +0000 (14:19 +0200)]
added rst documentation for the Class-specific Extremal Regions for Scene Text Detection
John Stowers [Tue, 10 Sep 2013 11:36:57 +0000 (13:36 +0200)]
Add brisk features to python demos
John Stowers [Tue, 10 Sep 2013 11:35:57 +0000 (13:35 +0200)]
Fix mouse handling in python demos
John Stowers [Wed, 18 Sep 2013 20:52:37 +0000 (22:52 +0200)]
Redefine CPU_xx constants in cv::namespace
This makes them visible from the python bindings
Nghia Ho [Fri, 20 Sep 2013 16:20:25 +0000 (02:20 +1000)]
Merge remote-tracking branch 'upstream/master'
Vadim Pisarevsky [Fri, 20 Sep 2013 12:02:15 +0000 (16:02 +0400)]
fixed compile errors and warnings when building master branch with IPP enabled
Alexander Smorkalov [Fri, 20 Sep 2013 07:08:09 +0000 (11:08 +0400)]
Merge pull request #1481 from Human:master
Alexander Smorkalov [Fri, 20 Sep 2013 06:54:52 +0000 (10:54 +0400)]
Merge pull request #1469 from lluisgomez:scene_text_detection_erGrouping
Bob Igo [Thu, 19 Sep 2013 20:32:32 +0000 (16:32 -0400)]
fixed malformed XML
Ovidiu Parvu [Thu, 19 Sep 2013 17:32:03 +0000 (18:32 +0100)]
Removed static variables which were not read-only and used more function parameters instead.
Ovidiu Parvu [Thu, 19 Sep 2013 15:22:30 +0000 (16:22 +0100)]
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.
Ovidiu Parvu [Thu, 19 Sep 2013 14:37:10 +0000 (15:37 +0100)]
Removed the cvMinEnclosingTriangle function since the C API will be deprecated starting with OpenCV 3.0
Ovidiu Parvu [Thu, 19 Sep 2013 14:12:07 +0000 (15:12 +0100)]
Removed non-ASCII characters from the comments
Nghia Ho [Thu, 19 Sep 2013 13:58:19 +0000 (23:58 +1000)]
Merge remote-tracking branch 'upstream/master'
Alexander Smorkalov [Thu, 19 Sep 2013 10:41:55 +0000 (14:41 +0400)]
Merge pull request #1472 from alalek:master_fix_debug_builds_on_win
lluis [Tue, 17 Sep 2013 21:45:23 +0000 (23:45 +0200)]
Added erGrouping function: Find groups of Extremal Regions that are organized as text blocks. Updated sample/cpp to use the complete text detection pipeline
Alexander Smorkalov [Thu, 19 Sep 2013 06:25:02 +0000 (10:25 +0400)]
Merge pull request #1384 from hbristow:matlab_public
Ovidiu Parvu [Wed, 18 Sep 2013 14:51:10 +0000 (15:51 +0100)]
Added a namespace and prefixed global variables with "G_" in order to prevent variable shadowing problems.
Ozan Tonkal [Wed, 18 Sep 2013 12:46:43 +0000 (13:46 +0100)]
delete duplicate bunny.ply, remove tabs and extra lines
Ovidiu Parvu [Wed, 18 Sep 2013 12:09:55 +0000 (13:09 +0100)]
Updated the return type of the cvMinEnclosingTriangle function in the documentation
Alexander Alekhin [Tue, 17 Sep 2013 22:08:53 +0000 (02:08 +0400)]
fix for broken debug builds (MSVS2010/2012)
Ozan Tonkal [Wed, 18 Sep 2013 11:50:55 +0000 (12:50 +0100)]
removed trailing spaces
Ovidiu Parvu [Wed, 18 Sep 2013 11:21:24 +0000 (12:21 +0100)]
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
hbristow [Wed, 18 Sep 2013 08:52:23 +0000 (18:52 +1000)]
Updated documentation
Ozan Tonkal [Wed, 18 Sep 2013 07:44:37 +0000 (08:44 +0100)]
Merge remote-tracking branch 'itseez/master'
hbristow [Wed, 18 Sep 2013 07:10:54 +0000 (17:10 +1000)]
Fixed a memory leak in mxarray
Alexander Smorkalov [Wed, 18 Sep 2013 06:39:52 +0000 (10:39 +0400)]
Merge pull request #1465 from jet47:cudev-old-cc
Alexander Smorkalov [Tue, 17 Sep 2013 18:50:48 +0000 (22:50 +0400)]
Merge pull request #1458 from look4pritam:my-branch
Ozan Tonkal [Tue, 17 Sep 2013 18:17:13 +0000 (20:17 +0200)]
include viz tutorials in the main tutorials file. ignore viz samples
Ozan Tonkal [Tue, 17 Sep 2013 16:55:10 +0000 (18:55 +0200)]
ignore viz tutorials when BUILD_opencv_viz is not set
Ozan Tonkal [Tue, 17 Sep 2013 15:50:14 +0000 (17:50 +0200)]
Merge remote-tracking branch 'itseezstream/master'
Andrey Pavlenko [Tue, 17 Sep 2013 13:50:46 +0000 (17:50 +0400)]
Merge pull request #1446 from lluisgomez:scene_text_detection_NM_fix2
Vladislav Vinogradov [Tue, 17 Sep 2013 13:43:12 +0000 (17:43 +0400)]
fixed cudev compilation for old pre-Fermi archs
look4pritam [Mon, 16 Sep 2013 08:09:11 +0000 (13:39 +0530)]
The thin prism distortion coefficient related small bug is fixed.
Ovidiu Parvu [Sun, 15 Sep 2013 22:40:40 +0000 (23:40 +0100)]
Added the C interface function signature and the overloaded minEnclosingTriangle Python function to the documentation.
Ovidiu Parvu [Sun, 15 Sep 2013 22:25:36 +0000 (23:25 +0100)]
Changed the return type of cvMinEnclosingTriangle to CVAPI(void). Added the implementation of the function to the min_enclosing_triangle.cpp source file.
Ovidiu Parvu [Sun, 15 Sep 2013 21:40:57 +0000 (22:40 +0100)]
Added the signature cvMinEnclosingTriangle (C version) to the imgproc_c.h header
Ovidiu Parvu [Sun, 15 Sep 2013 21:25:58 +0000 (22:25 +0100)]
Added the tests for the minEnclosingTriangle function in the existing test_convhull.cpp file.
Ozan Tonkal [Sun, 15 Sep 2013 14:32:56 +0000 (16:32 +0200)]
merge with Itseez/opencv
hbristow [Sun, 15 Sep 2013 14:48:07 +0000 (00:48 +1000)]
Added TODO for the future of Matlab version sorting
Ozan Tonkal [Sun, 15 Sep 2013 14:26:53 +0000 (16:26 +0200)]
rename widgets from *Widgets to W*
Ovidiu Parvu [Sun, 15 Sep 2013 14:07:17 +0000 (15:07 +0100)]
- Wrote the documentation for the minEnclosingTriangle function (+1 extra picture depicting a sample output)
hbristow [Sun, 15 Sep 2013 13:53:29 +0000 (23:53 +1000)]
Streamlined mexext detection, with removal of trailing whitespace/newlines handled by execute_process
Ozan Tonkal [Sun, 15 Sep 2013 09:24:20 +0000 (11:24 +0200)]
cmake check if VTK version is lower than 5, and give fatal error if it is
hbristow [Sun, 15 Sep 2013 07:31:34 +0000 (17:31 +1000)]
Moved Jinja2 into 3rdparty. Now using latest stable version from pypi (2.7.1)
hbristow [Sat, 14 Sep 2013 03:32:15 +0000 (13:32 +1000)]
Made changes to OpenCVFindMatlab suggested by SpecLad
lluis [Fri, 13 Sep 2013 14:29:21 +0000 (16:29 +0200)]
first parameter of createERFilterNM1/createERFilterNM2 is now mandatory. changed the sample program to use the new prototypes
lluis [Fri, 13 Sep 2013 14:19:52 +0000 (16:19 +0200)]
renamed getDefaultClassifierNM{1,2}() to loadClassifierNM{1,2}() and added "const std::string& filename" parameter (mandatory).
Roman Donchenko [Fri, 13 Sep 2013 11:01:14 +0000 (15:01 +0400)]
Merge pull request #1445 from vpisarev:stereocalib_quick_fix
lluis [Fri, 13 Sep 2013 10:54:23 +0000 (12:54 +0200)]
functions getDefaultClassifierNM1() and getDefaultClassifierNM2() allow to implicitly load the default classifiers when creating a ERFilter object
Roman Donchenko [Fri, 13 Sep 2013 10:31:01 +0000 (14:31 +0400)]
Merge pull request #1330 from lenlen:plantuml
Vadim Pisarevsky [Fri, 13 Sep 2013 09:32:42 +0000 (13:32 +0400)]
fix thin-prism coefficients at 0's in the stereo calibration function unless the flag CALIB_THIN_PRISM_MODEL is explicitly set
Roman Donchenko [Fri, 13 Sep 2013 09:31:14 +0000 (13:31 +0400)]
Merge pull request #1414 from lluisgomez:scene_text_detection_computeNMChannels
Roman Donchenko [Fri, 13 Sep 2013 09:27:01 +0000 (13:27 +0400)]
Merge pull request #1426 from nailbiter:optimPD
Roman Donchenko [Fri, 13 Sep 2013 09:17:05 +0000 (13:17 +0400)]
Merge pull request #1441 from look4pritam:prism-stereo
Roman Donchenko [Fri, 13 Sep 2013 09:16:30 +0000 (13:16 +0400)]
Merge pull request #1442 from SpecLad:version-status
hbristow [Fri, 13 Sep 2013 08:08:33 +0000 (18:08 +1000)]
Updated OpenCVFindMatlab with changes suggested by SpecLad
hbristow [Fri, 13 Sep 2013 07:22:12 +0000 (17:22 +1000)]
Added fixes to CMakeLists.txt
Ovidiu Parvu [Thu, 12 Sep 2013 22:47:48 +0000 (23:47 +0100)]
Overloaded the minEnclosingTriangle function such that there is an alternative function with the same name which does not require the output parameter ``area''.
Changed the sample source file minarea.cpp to use the overloaded version of the function.
Updated some comments in the min_enclosing_triangle.cpp source file.
Ozan Tonkal [Thu, 12 Sep 2013 17:23:05 +0000 (19:23 +0200)]
re-render the scene after changing camera properties
Ovidiu Parvu [Thu, 12 Sep 2013 14:01:21 +0000 (15:01 +0100)]
Optimised one assert statement in the min_enclosing_triangle.cpp file. Added the minEnclosingTriangle functionality to the existing minarea.cpp sample file.
Ovidiu Parvu [Thu, 12 Sep 2013 13:34:08 +0000 (14:34 +0100)]
Added some assert statements to constrain the type of the input and output parameters. Convert the input set of points to vector<Point2f> before passing it to the findMinimumAreaEnclosingTriangle function.
Roman Donchenko [Thu, 12 Sep 2013 12:40:14 +0000 (16:40 +0400)]
Bumped version to 3.0.
Roman Donchenko [Thu, 12 Sep 2013 12:39:14 +0000 (16:39 +0400)]
Updated the Java bindings and docs to support the version status.
Roman Donchenko [Thu, 12 Sep 2013 12:37:30 +0000 (16:37 +0400)]
Updated the build config files to deal with the version status.
I didn't make the status part of the version variables here, because
letters don't play too well with version comparison algorithms
(especially with CMake's, which only supports numbers).
Roman Donchenko [Thu, 12 Sep 2013 12:37:05 +0000 (16:37 +0400)]
Added version status support into the build system.
Ovidiu Parvu [Thu, 12 Sep 2013 12:29:10 +0000 (13:29 +0100)]
Changed the semantics of the minEnclosingTriangle function such that:
1. The function receives a set of points as input instead of a convex polygon with more than three vertices
2. The convex hull P is computed inside the function
3.1. If the number of vertices of P is greater than three then the algorithm which was implemented before executes
3.2. Otherwise the vertices of the triangle are picked from the vertices of the given polygon and the area computed
Roman Donchenko [Thu, 12 Sep 2013 12:20:09 +0000 (16:20 +0400)]
Added an additional version component - the development status.
This will allow us to distinguish between regular releases, prereleases
and development versions.
antonella [Wed, 4 Sep 2013 14:00:50 +0000 (16:00 +0200)]
Added plantuml extension
Aligned strings in CMakeList
Modified the check on plantuml extension
Some fixes
Moved find_host_program for plantuml script
look4pritam [Thu, 12 Sep 2013 09:47:11 +0000 (15:17 +0530)]
The prism distortion coefficients are added for the stereo calibration.
Ovidiu Parvu [Thu, 12 Sep 2013 09:11:38 +0000 (10:11 +0100)]
- Changed the type of the minEnclosingTriangle function parameters by using proxy classes InputArray/OutputArray instead of std::vector<T>
- Adapted the source code to accommodate this change
Ovidiu Parvu [Wed, 11 Sep 2013 17:02:10 +0000 (18:02 +0100)]
- Added the minEnclosingTriangle function declaration to the imgproc header
- Added the source code for the function in the separate file min_enclosing_triangle.cpp
Roman Donchenko [Wed, 11 Sep 2013 15:06:50 +0000 (19:06 +0400)]
Merge pull request #1436 from SpecLad:host-git