184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
2013-10-01 19:49:17 +04:00
8717281e0e
Merge pull request #1209 from nghiaho12:master
2013-10-01 17:07:39 +04:00
aeedc7adec
Emergency fix: rename a conflicting label in the tutorials.
2013-10-01 16:10:40 +04:00
4ec5c04504
Merge pull request #1315 from dbloisi:add_bs_tutorial
2013-10-01 15:29:38 +04:00
61f5176bad
Removed trailing whitespace
2013-10-01 21:03:54 +10:00
d7bf71c24a
Merge remote-tracking branch 'upstream/master'
2013-10-01 19:56:47 +10:00
e0f5a2e532
Merge pull request #1512 from Exocoder:pre-gtk3
2013-10-01 12:09:17 +04:00
0d06b1dced
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.
2013-09-30 21:04:43 +01:00
ada858e1c0
Merge pull request #1429 from nzjrs:fix-sketcher
2013-09-30 18:06:56 +04:00
a4b3aa9e1e
Merge pull request #1477 from nzjrs:python-gethardwaresupport
2013-09-30 17:44:45 +04:00
f3f7f70588
Merge pull request #1488 from abidrahmank:py_tutorials
2013-09-30 17:39:45 +04:00
c41a5b9c2c
Merge remote-tracking branch 'upstream/master'
2013-09-30 22:59:29 +10:00
4ce0a8a822
Merge pull request #1520 from lluisgomez:scene_text_erGrouping_classifier
2013-09-30 16:08:21 +04:00
bc1f9d6268
fixed description of createLineSegmentDetector
2013-09-30 15:07:32 +04:00
851a8a1cd0
fixed whitespace error
2013-09-30 14:31:39 +04:00
20fe614c2f
createLineSegmentDetectorPtr -> createLineSegmentDetector in tests and samples
2013-09-30 14:30:01 +04:00
0a8d62e5fd
createLineSegmentDetectorPtr -> createLineSegmentDetector
2013-09-30 14:30:01 +04:00
f0b050fa88
exposed LineSegemntDetector to python
2013-09-30 14:30:00 +04:00
047b568f6d
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
2013-09-27 19:19:45 +02:00
97fc1e10a7
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.
2013-09-26 18:31:44 +01:00
5921c77613
Merge remote-tracking branch 'upstream/master'
2013-09-26 23:08:23 +10:00
4b203f7b1a
Merge pull request #1470 from IceRage:min_enclosing_triangle
2013-09-26 16:28:54 +04:00
357e5d55f6
Removed trailing whitespaces
2013-09-26 19:14:59 +10:00
e6a9c22b9d
Merge remote-tracking branch 'upstream/master'
2013-09-26 19:13:01 +10:00
0d49206a98
Merge pull request #1485 from vpisarev:ipp_fixes
2013-09-26 11:09:59 +04:00
241aa6e5a8
Merge pull request #1497 from jet47:fix-bug-3277
2013-09-26 09:31:06 +04:00
c6ab8cb6ee
Merge pull request #1471 from ozantonkal:master
2013-09-25 17:19:39 +04:00
e1f55c3fcc
Merge pull request #1496 from shawke:patch-1
2013-09-25 11:29:46 +04:00
e675684c81
fix bug #3277 (findCirclesGrid failures):
...
findHomagraphy can return empty Mat in master branch
2013-09-24 14:45:13 +04:00
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
c8b97271cc
Merge pull request #1430 from nzjrs:add-brisk-to-demos
2013-09-23 16:34:19 +04:00
b4ffb0878d
Merge remote-tracking branch 'upstream/master'
2013-09-23 20:05:51 +10:00
b5f3709ab9
Merge pull request #1484 from lluisgomez:scene_text_detection_documentation
2013-09-23 14:00:08 +04:00
5670e4f6cd
fixed typos
2013-09-23 10:17:47 +02:00
899781b3d6
GSoC Python Tutorials
...
GSoC Python Tutorials
removed white spaces
removed blank lines at EOF
removed duplicate labels
2013-09-23 13:41:14 +05:30
298a1d50d2
Merge pull request #1299 from jet47:gpu-cuda-rename
2013-09-23 10:31:51 +04:00
5556f051f1
added rst documentation for the Class-specific Extremal Regions for Scene Text Detection
2013-09-20 21:39:11 +02:00
4b19fda1d6
Add brisk features to python demos
2013-09-20 21:12:49 +02:00
42faaa8b39
Fix mouse handling in python demos
2013-09-20 21:04:07 +02:00
14d225134d
Redefine CPU_xx constants in cv::namespace
...
This makes them visible from the python bindings
2013-09-20 20:04:33 +02:00
4171767d19
Merge remote-tracking branch 'upstream/master'
2013-09-21 02:20:25 +10:00
8e7eb79f6e
fixed compile errors and warnings when building master branch with IPP enabled
2013-09-20 16:02:15 +04:00
c0c575d68e
Merge pull request #1481 from Human:master
2013-09-20 11:08:09 +04:00
1445a29e1c
Merge pull request #1469 from lluisgomez:scene_text_detection_erGrouping
2013-09-20 10:54:53 +04:00
2eb5ca0024
fixed malformed XML
2013-09-19 16:32:32 -04:00
2bf36c312f
Removed static variables which were not read-only and used more function parameters instead.
2013-09-19 18:32:03 +01:00
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
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
21390d806f
Removed non-ASCII characters from the comments
2013-09-19 15:12:07 +01:00
8e8ff4dd33
Merge remote-tracking branch 'upstream/master'
2013-09-19 23:58:19 +10:00
Roman Donchenko
Nghia Ho
Tony
Vadim Pisarevsky
Alexander Mordvintsev
lluis
Alexander Smorkalov
Vladislav Vinogradov
shawke
abidrahmank
John Stowers
Bob Igo
Ovidiu Parvu