Roman Donchenko
f04cade607
Merge pull request #1559 from SpecLad:Wnull-conversion
2013-10-04 16:08:54 +04:00
Roman Donchenko
b03c19a8ac
Merge pull request #1554 from pablospe:fix_viz_module_compilation
2013-10-04 14:02:17 +04:00
Roman Donchenko
1817a07a5e
Fixed a -Wnull-conversion Clang warning in cap_gstreamer.cpp.
2013-10-03 12:11:50 +04:00
Roman Donchenko
a1e239d2bf
Merge pull request #1527 from vpisarev:shape_module
2013-10-03 11:54:41 +04:00
Pablo Speciale
f47afe5799
Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297)
2013-10-03 02:10:27 +02:00
Roman Donchenko
447e03bc28
Merge pull request #1543 from SpecLad:name-enum
2013-10-02 19:22:35 +04:00
Roman Donchenko
58da54cb7a
Cherry-picked mariusmuja/flann@8c8b0e0cb8 .
...
Original author: me.
2013-10-02 16:09:45 +04:00
Roman Donchenko
4c19e0273a
Cherry-picked mariusmuja/flann@b615f26947 .
...
Original author: Alex Wilson.
2013-10-02 16:06:56 +04:00
Roman Donchenko
78c4ffec99
Revert "Fixed a bug in FLANN resulting in uninitialized accesses."
...
This reverts commit a9975b144a
2013-10-02 16:02:11 +04:00
Roman Donchenko
30d7e1c33d
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~
2013-10-02 13:37:33 +04:00
Roman Donchenko
4c7ecf20d8
Merge pull request #1529 from vpisarev:polyfit_accuracy_2
2013-10-02 12:52:33 +04:00
Roman Donchenko
1ac1b9ae35
Merge pull request #1474 from f-morozov:for_pr
2013-10-02 11:49:54 +04:00
Roman Donchenko
184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
2013-10-01 19:49:17 +04:00
Roman Donchenko
bcb6f0386e
Named FastFeatureDetector::Type to allow its use in makePtr.
...
It has actually worked before (likely because it's inside a class),
but C++03 does disallow unnamed types as template arguments,
and there's a report that at least in one version of GCC it's
enforced: <http://code.opencv.org/issues/3278 >.
2013-10-01 18:22:03 +04:00
Roman Donchenko
6133aeede8
Merge branch 'master' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
2013-10-01 17:37:05 +04:00
Roman Donchenko
81eb4bd8be
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
Nghia Ho
61f5176bad
Removed trailing whitespace
2013-10-01 21:03:54 +10:00
Nghia Ho
d7bf71c24a
Merge remote-tracking branch 'upstream/master'
2013-10-01 19:56:47 +10:00
Roman Donchenko
e0f5a2e532
Merge pull request #1512 from Exocoder:pre-gtk3
2013-10-01 12:09:17 +04:00
Tony
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
Vadim Pisarevsky
c810d03d5c
some more attempts to fix compile bug on Android
2013-09-30 19:28:11 +04:00
Roman Donchenko
e35bc11504
Merge pull request #1457 from pengx17:2.4_oclsvm
2013-09-30 17:50:29 +04:00
Roman Donchenko
a4b3aa9e1e
Merge pull request #1477 from nzjrs:python-gethardwaresupport
2013-09-30 17:44:45 +04:00
Roman Donchenko
54c902dccd
Merge pull request #1509 from perping:2.4_docs
2013-09-30 17:37:19 +04:00
Nghia Ho
c41a5b9c2c
Merge remote-tracking branch 'upstream/master'
2013-09-30 22:59:29 +10:00
Vadim Pisarevsky
c3748a5f95
fixed the trailing whitespaces
2013-09-30 16:06:48 +04:00
Vadim Pisarevsky
ca0956a7e2
this is rewrite of the github patch #674 by chouclee; the goal is to improve polyfit accuracy
2013-09-30 16:00:39 +04:00
Vadim Pisarevsky
bc1f9d6268
fixed description of createLineSegmentDetector
2013-09-30 15:07:32 +04:00
Vadim Pisarevsky
cd84742556
attempts to fix build errors on Android
2013-09-30 14:53:48 +04:00
Juan Manuel Perez
f6fc39ce8f
Putting definitions of SCD and SCDMatcher separated from sc_dis.cpp file
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
4672a70c1f
Replaced dynamic_cas with Ptr::dynamicCast<>, and & with &&
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
1bf4298251
Macro removal
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
aa73dafbbb
2 Compile error fix for Win
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
752d88f5d2
Compile error fix for Win
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
5a1e9876fc
Corrected compilation errors Win
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
ead966709d
Remove ~ file
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
fe7bab499f
Corrections for compiling issues in Win, And and Doc
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
61c27ac81e
Shape module added
2013-09-30 14:39:17 +04:00
Vadim Pisarevsky
851a8a1cd0
fixed whitespace error
2013-09-30 14:31:39 +04:00
Alexander Mordvintsev
20fe614c2f
createLineSegmentDetectorPtr -> createLineSegmentDetector in tests and samples
2013-09-30 14:30:01 +04:00
Alexander Mordvintsev
0a8d62e5fd
createLineSegmentDetectorPtr -> createLineSegmentDetector
2013-09-30 14:30:01 +04:00
Alexander Mordvintsev
f0b050fa88
exposed LineSegemntDetector to python
2013-09-30 14:30:00 +04:00
peng xiao
315c054379
Fix new blank line at EOF.
2013-09-30 16:20:43 +08:00
peng xiao
422396ef6a
fix build error
2013-09-30 16:17:20 +08:00
peng xiao
f69ccfa43d
Add opencl svm.
2013-09-30 16:17:19 +08:00
lluis
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
Alexander Smorkalov
8cb0921252
pr #1464 reverted as breaking the build for Linux without libv4l library.
2013-09-27 12:17:55 +04:00
perping
1bc20ae6f8
fix warning about addWeighted and remove magnitudeSqr().
2013-09-27 09:50:37 +08:00
Tony
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
Fedor Morozov
c9ace38897
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
