Roman Donchenko
6133aeede8
Merge branch 'master' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
12 years ago
Roman Donchenko
8717281e0e
Merge pull request #1209 from nghiaho12:master
12 years ago
Roman Donchenko
aeedc7adec
Emergency fix: rename a conflicting label in the tutorials.
12 years ago
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
12 years ago
Roman Donchenko
4ec5c04504
Merge pull request #1315 from dbloisi:add_bs_tutorial
12 years ago
Nghia Ho
61f5176bad
Removed trailing whitespace
12 years ago
Nghia Ho
d7bf71c24a
Merge remote-tracking branch 'upstream/master'
12 years ago
Roman Donchenko
e0f5a2e532
Merge pull request #1512 from Exocoder:pre-gtk3
12 years ago
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.
12 years ago
Roman Donchenko
ada858e1c0
Merge pull request #1429 from nzjrs:fix-sketcher
12 years ago
Roman Donchenko
e35bc11504
Merge pull request #1457 from pengx17:2.4_oclsvm
12 years ago
Roman Donchenko
a4b3aa9e1e
Merge pull request #1477 from nzjrs:python-gethardwaresupport
12 years ago
Roman Donchenko
f3f7f70588
Merge pull request #1488 from abidrahmank:py_tutorials
12 years ago
Roman Donchenko
54c902dccd
Merge pull request #1509 from perping:2.4_docs
12 years ago
Nghia Ho
c41a5b9c2c
Merge remote-tracking branch 'upstream/master'
12 years ago
Roman Donchenko
8aa63af5de
Merge pull request #1518 from jet47:bug-3291-tbb-install
12 years ago
Roman Donchenko
4ce0a8a822
Merge pull request #1520 from lluisgomez:scene_text_erGrouping_classifier
12 years ago
Roman Donchenko
42b396c97e
Merge pull request #1522 from nghiaho12:latentsvm
12 years ago
peng xiao
315c054379
Fix new blank line at EOF.
12 years ago
peng xiao
422396ef6a
fix build error
12 years ago
peng xiao
f69ccfa43d
Add opencl svm.
12 years ago
Nghia Ho
b9e542e35e
Missing closedir with opendir
12 years ago
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
12 years ago
Vladislav Vinogradov
d1f3a62832
fix for bug #3291 :
...
add INSTALL command for TBB target
12 years ago
Alexander Smorkalov
178f0272fe
Merge pull request #1515 from asmorkalov:ocv_pr_1464_revert
12 years ago
Alexander Smorkalov
8cb0921252
pr #1464 reverted as breaking the build for Linux without libv4l library.
12 years ago
perping
1bc20ae6f8
fix warning about addWeighted and remove magnitudeSqr().
12 years ago
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.
12 years ago
Alexander Smorkalov
9d626f3005
Merge pull request #1511 from apavlenko:shorten_hdr
12 years ago
Nghia Ho
5921c77613
Merge remote-tracking branch 'upstream/master'
12 years ago
Andrey Pavlenko
0a695eb314
hortening the file names (HighDynamicRange -> HDR)
12 years ago
Alexander Smorkalov
4b203f7b1a
Merge pull request #1470 from IceRage:min_enclosing_triangle
12 years ago
Andrey Pavlenko
3e91350a31
Merge pull request #1503 from ilya-lavrenov:ocl_arithm
12 years ago
Nghia Ho
357e5d55f6
Removed trailing whitespaces
12 years ago
Nghia Ho
e6a9c22b9d
Merge remote-tracking branch 'upstream/master'
12 years ago
Alexander Smorkalov
26a1a93295
Merge pull request #1464 from StevenPuttemans:bugfix_3186_second
12 years ago
perping
074f9e33cb
fix three warning about mog, mog2 and KNearestNeighbour.
12 years ago
Alexander Smorkalov
0d49206a98
Merge pull request #1485 from vpisarev:ipp_fixes
12 years ago
perping
f65286d3c6
Update the OpenCL documents.
12 years ago
Alexander Smorkalov
241aa6e5a8
Merge pull request #1497 from jet47:fix-bug-3277
12 years ago
Alexander Smorkalov
7f819008d9
Merge pull request #1500 from alalek:fix_add_definitions
12 years ago
Alexander Smorkalov
9f19126472
Merge pull request #1502 from melody-rain:2.4_Stereo_Match_Const_Space_BP
12 years ago
Ilya Lavrenov
f5af3ab851
changes in OpenCL matrix operations docs
12 years ago
Alexander Smorkalov
0b41df46ad
Merge pull request #1499 from georgebrindeiro:patch-2
12 years ago
Alexander Smorkalov
c6ab8cb6ee
Merge pull request #1471 from ozantonkal:master
12 years ago
Ilya Lavrenov
c8821bd909
replaced manually new/delete by AutoBuffer
12 years ago
Ilya Lavrenov
0faac595a8
fixed minMaxLoc kernel (removed compilation errors)
12 years ago
Ilya Lavrenov
544c02407e
reverted and generalized original ocl::transpose
12 years ago
Jin Ma
c7c0a41e17
Resolved the bug that the work group size is not valid.
12 years ago
Alexander Alekhin
b4a534a235
cmake: PCH: use DEFINE_SYMBOL target property
12 years ago