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
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
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
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
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
Nghia Ho
5921c77613
Merge remote-tracking branch 'upstream/master'
2013-09-26 23:08:23 +10:00
Andrey Pavlenko
0a695eb314
hortening the file names (HighDynamicRange -> HDR)
2013-09-26 17:06:06 +04:00
Alexander Smorkalov
4b203f7b1a
Merge pull request #1470 from IceRage:min_enclosing_triangle
2013-09-26 16:28:54 +04:00
Andrey Pavlenko
3e91350a31
Merge pull request #1503 from ilya-lavrenov:ocl_arithm
2013-09-26 15:50: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
26a1a93295
Merge pull request #1464 from StevenPuttemans:bugfix_3186_second
2013-09-26 12:16:02 +04:00
perping
074f9e33cb
fix three warning about mog, mog2 and KNearestNeighbour.
2013-09-26 15:30:44 +08:00
Alexander Smorkalov
0d49206a98
Merge pull request #1485 from vpisarev:ipp_fixes
2013-09-26 11:09:59 +04:00
perping
f65286d3c6
Update the OpenCL documents.
2013-09-26 14:04:11 +08:00
Alexander Smorkalov
241aa6e5a8
Merge pull request #1497 from jet47:fix-bug-3277
2013-09-26 09:31:06 +04:00
Ilya Lavrenov
f5af3ab851
changes in OpenCL matrix operations docs
2013-09-25 19:47:15 +04:00
Alexander Smorkalov
c6ab8cb6ee
Merge pull request #1471 from ozantonkal:master
2013-09-25 17:19:39 +04:00
Ilya Lavrenov
c8821bd909
replaced manually new/delete by AutoBuffer
2013-09-25 15:28:12 +04:00
Ilya Lavrenov
0faac595a8
fixed minMaxLoc kernel (removed compilation errors)
2013-09-25 15:14:10 +04:00
Ilya Lavrenov
544c02407e
reverted and generalized original ocl::transpose
2013-09-25 14:22:37 +04:00
Jin Ma
c7c0a41e17
Resolved the bug that the work group size is not valid.
2013-09-25 17:42:56 +08:00
Alexander Smorkalov
6057414a93
Merge pull request #1199 from devernay:2.4-qtkit
2013-09-24 15:36:16 +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
Ilya Lavrenov
c87d2d414d
removed arithm_absdiff.cl
2013-09-24 14:18:42 +04:00
Ilya Lavrenov
8aa3eb817d
refactored arithm.cpp. Extended param list for all the tests
2013-09-24 14:13:10 +04:00
Ilya Lavrenov
b4ad128218
refactoed and extended ocl::transpose
2013-09-24 14:07:54 +04:00
