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
4c7ecf20d8
Merge pull request #1529 from vpisarev:polyfit_accuracy_2
2013-10-02 12:52:33 +04:00
a71a891b93
Merge pull request #1451 from adrians:neon-pull2
2013-10-02 12:51:30 +04:00
1ac1b9ae35
Merge pull request #1474 from f-morozov:for_pr
2013-10-02 11:49:54 +04:00
184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
2013-10-01 19:49:17 +04:00
6133aeede8
Merge branch 'master' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
2013-10-01 17:37:05 +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
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
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
e35bc11504
Merge pull request #1457 from pengx17:2.4_oclsvm
2013-09-30 17:50:29 +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
54c902dccd
Merge pull request #1509 from perping:2.4_docs
2013-09-30 17:37:19 +04:00
c41a5b9c2c
Merge remote-tracking branch 'upstream/master'
2013-09-30 22:59:29 +10:00
8aa63af5de
Merge pull request #1518 from jet47:bug-3291-tbb-install
2013-09-30 16:21:51 +04:00
4ce0a8a822
Merge pull request #1520 from lluisgomez:scene_text_erGrouping_classifier
2013-09-30 16:08:21 +04:00
42b396c97e
Merge pull request #1522 from nghiaho12:latentsvm
2013-09-30 16:04:59 +04:00
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
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
315c054379
Fix new blank line at EOF.
2013-09-30 16:20:43 +08:00
422396ef6a
fix build error
2013-09-30 16:17:20 +08:00
f69ccfa43d
Add opencl svm.
2013-09-30 16:17:19 +08:00
b9e542e35e
Missing closedir with opendir
2013-09-28 21:46:48 +10: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
d1f3a62832
fix for bug #3291 :
...
add INSTALL command for TBB target
2013-09-27 14:45:08 +04:00
178f0272fe
Merge pull request #1515 from asmorkalov:ocv_pr_1464_revert
2013-09-27 13:25:54 +04:00
8cb0921252
pr #1464 reverted as breaking the build for Linux without libv4l library.
2013-09-27 12:17:55 +04:00
1bc20ae6f8
fix warning about addWeighted and remove magnitudeSqr().
2013-09-27 09:50:37 +08: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
9d626f3005
Merge pull request #1511 from apavlenko:shorten_hdr
2013-09-26 21:09:41 +04:00
c9ace38897
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
5921c77613
Merge remote-tracking branch 'upstream/master'
2013-09-26 23:08:23 +10:00
0a695eb314
hortening the file names (HighDynamicRange -> HDR)
2013-09-26 17:06:06 +04:00
4b203f7b1a
Merge pull request #1470 from IceRage:min_enclosing_triangle
2013-09-26 16:28:54 +04:00
3e91350a31
Merge pull request #1503 from ilya-lavrenov:ocl_arithm
2013-09-26 15:50: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
26a1a93295
Merge pull request #1464 from StevenPuttemans:bugfix_3186_second
2013-09-26 12:16:02 +04:00
074f9e33cb
fix three warning about mog, mog2 and KNearestNeighbour.
2013-09-26 15:30:44 +08:00
0d49206a98
Merge pull request #1485 from vpisarev:ipp_fixes
2013-09-26 11:09:59 +04:00
Roman Donchenko
Nghia Ho
Tony
Vadim Pisarevsky
Alexander Mordvintsev
peng xiao
lluis
Vladislav Vinogradov
Alexander Smorkalov
perping
Fedor Morozov
Andrey Pavlenko