Roman Donchenko [Wed, 2 Oct 2013 15:22:35 +0000 (19:22 +0400)]
Merge pull request #1543 from SpecLad:name-enum
Roman Donchenko [Wed, 2 Oct 2013 14:52:37 +0000 (18:52 +0400)]
Merge pull request #1550 from SpecLad:flann-uninit-master
Roman Donchenko [Wed, 2 Oct 2013 12:09:45 +0000 (16:09 +0400)]
Cherry-picked mariusmuja/flann@
8c8b0e0cb879666797ab2ac51b9ee438bf84a183.
Original author: me.
Roman Donchenko [Wed, 2 Oct 2013 12:06:56 +0000 (16:06 +0400)]
Cherry-picked mariusmuja/flann@
b615f2694723fe402b8bbe50d77e622beff7f171.
Original author: Alex Wilson.
Roman Donchenko [Wed, 2 Oct 2013 12:02:11 +0000 (16:02 +0400)]
Revert "Fixed a bug in FLANN resulting in uninitialized accesses."
This reverts commit
a9975b144a22e76228125eb0a25f78ec13db6815, to prepare
for cherry-picking upstream's solution.
Roman Donchenko [Wed, 2 Oct 2013 10:47:29 +0000 (14:47 +0400)]
Merge pull request #1541 from SpecLad:merge-2.4
Roman Donchenko [Wed, 2 Oct 2013 09:37:33 +0000 (13:37 +0400)]
Merge remote-tracking branch 'origin/master' into merge-2.4
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~
Roman Donchenko [Wed, 2 Oct 2013 08:52:32 +0000 (12:52 +0400)]
Merge pull request #1529 from vpisarev:polyfit_accuracy_2
Roman Donchenko [Wed, 2 Oct 2013 08:51:27 +0000 (12:51 +0400)]
Merge pull request #1451 from adrians:neon-pull2
Roman Donchenko [Wed, 2 Oct 2013 07:49:51 +0000 (11:49 +0400)]
Merge pull request #1474 from f-morozov:for_pr
Roman Donchenko [Tue, 1 Oct 2013 15:49:16 +0000 (19:49 +0400)]
Merge pull request #1526 from vpisarev:linedetector_python
Roman Donchenko [Tue, 1 Oct 2013 13:31:26 +0000 (17:31 +0400)]
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>.
Roman Donchenko [Tue, 1 Oct 2013 13:37:05 +0000 (17:37 +0400)]
Merge branch 'master' into merge-2.4
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
Roman Donchenko [Tue, 1 Oct 2013 13:07:39 +0000 (17:07 +0400)]
Merge pull request #1209 from nghiaho12:master
Roman Donchenko [Tue, 1 Oct 2013 12:10:40 +0000 (16:10 +0400)]
Emergency fix: rename a conflicting label in the tutorials.
Roman Donchenko [Tue, 1 Oct 2013 11:57:33 +0000 (15:57 +0400)]
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
Roman Donchenko [Tue, 1 Oct 2013 11:29:33 +0000 (15:29 +0400)]
Merge pull request #1315 from dbloisi:add_bs_tutorial
Nghia Ho [Tue, 1 Oct 2013 11:03:54 +0000 (21:03 +1000)]
Removed trailing whitespace
Nghia Ho [Tue, 1 Oct 2013 09:56:47 +0000 (19:56 +1000)]
Merge remote-tracking branch 'upstream/master'
Roman Donchenko [Tue, 1 Oct 2013 08:09:11 +0000 (12:09 +0400)]
Merge pull request #1512 from Exocoder:pre-gtk3
Tony [Mon, 30 Sep 2013 20:04:43 +0000 (21:04 +0100)]
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.
Roman Donchenko [Mon, 30 Sep 2013 14:06:53 +0000 (18:06 +0400)]
Merge pull request #1429 from nzjrs:fix-sketcher
Roman Donchenko [Mon, 30 Sep 2013 13:50:29 +0000 (17:50 +0400)]
Merge pull request #1457 from pengx17:2.4_oclsvm
Roman Donchenko [Mon, 30 Sep 2013 13:44:42 +0000 (17:44 +0400)]
Merge pull request #1477 from nzjrs:python-gethardwaresupport
Roman Donchenko [Mon, 30 Sep 2013 13:39:42 +0000 (17:39 +0400)]
Merge pull request #1488 from abidrahmank:py_tutorials
Roman Donchenko [Mon, 30 Sep 2013 13:37:18 +0000 (17:37 +0400)]
Merge pull request #1509 from perping:2.4_docs
Nghia Ho [Mon, 30 Sep 2013 12:59:29 +0000 (22:59 +1000)]
Merge remote-tracking branch 'upstream/master'
Roman Donchenko [Mon, 30 Sep 2013 12:21:51 +0000 (16:21 +0400)]
Merge pull request #1518 from jet47:bug-3291-tbb-install
Roman Donchenko [Mon, 30 Sep 2013 12:08:20 +0000 (16:08 +0400)]
Merge pull request #1520 from lluisgomez:scene_text_erGrouping_classifier
Roman Donchenko [Mon, 30 Sep 2013 12:04:58 +0000 (16:04 +0400)]
Merge pull request #1522 from nghiaho12:latentsvm
Vadim Pisarevsky [Mon, 30 Sep 2013 12:00:39 +0000 (16:00 +0400)]
this is rewrite of the github patch #674 by chouclee; the goal is to improve polyfit accuracy
Vadim Pisarevsky [Mon, 30 Sep 2013 11:07:32 +0000 (15:07 +0400)]
fixed description of createLineSegmentDetector
Vadim Pisarevsky [Mon, 30 Sep 2013 10:31:39 +0000 (14:31 +0400)]
fixed whitespace error
Alexander Mordvintsev [Thu, 19 Sep 2013 15:06:48 +0000 (19:06 +0400)]
createLineSegmentDetectorPtr -> createLineSegmentDetector in tests and samples
Alexander Mordvintsev [Thu, 19 Sep 2013 14:44:11 +0000 (18:44 +0400)]
createLineSegmentDetectorPtr -> createLineSegmentDetector
Alexander Mordvintsev [Thu, 19 Sep 2013 14:41:08 +0000 (18:41 +0400)]
exposed LineSegemntDetector to python
peng xiao [Tue, 17 Sep 2013 00:50:13 +0000 (08:50 +0800)]
Fix new blank line at EOF.
peng xiao [Mon, 16 Sep 2013 05:52:56 +0000 (13:52 +0800)]
fix build error
peng xiao [Mon, 16 Sep 2013 03:23:53 +0000 (11:23 +0800)]
Add opencl svm.
Nghia Ho [Sat, 28 Sep 2013 11:46:48 +0000 (21:46 +1000)]
Missing closedir with opendir
lluis [Fri, 27 Sep 2013 14:28:47 +0000 (16:28 +0200)]
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
Vladislav Vinogradov [Fri, 27 Sep 2013 10:44:58 +0000 (14:44 +0400)]
fix for bug #3291:
add INSTALL command for TBB target
Alexander Smorkalov [Fri, 27 Sep 2013 09:25:53 +0000 (13:25 +0400)]
Merge pull request #1515 from asmorkalov:ocv_pr_1464_revert
Alexander Smorkalov [Fri, 27 Sep 2013 08:17:55 +0000 (12:17 +0400)]
pr #1464 reverted as breaking the build for Linux without libv4l library.
perping [Fri, 27 Sep 2013 01:50:37 +0000 (09:50 +0800)]
fix warning about addWeighted and remove magnitudeSqr().
Tony [Thu, 26 Sep 2013 17:31:44 +0000 (18:31 +0100)]
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.
Alexander Smorkalov [Thu, 26 Sep 2013 17:09:41 +0000 (21:09 +0400)]
Merge pull request #1511 from apavlenko:shorten_hdr
Fedor Morozov [Mon, 23 Sep 2013 19:40:06 +0000 (23:40 +0400)]
Docs updated, added InputArray, fixes for makePtr,...
Nghia Ho [Thu, 26 Sep 2013 13:08:23 +0000 (23:08 +1000)]
Merge remote-tracking branch 'upstream/master'
Andrey Pavlenko [Thu, 26 Sep 2013 13:06:06 +0000 (17:06 +0400)]
hortening the file names (HighDynamicRange -> HDR)
Alexander Smorkalov [Thu, 26 Sep 2013 12:28:52 +0000 (16:28 +0400)]
Merge pull request #1470 from IceRage:min_enclosing_triangle
Andrey Pavlenko [Thu, 26 Sep 2013 11:50:54 +0000 (15:50 +0400)]
Merge pull request #1503 from ilya-lavrenov:ocl_arithm
Nghia Ho [Thu, 26 Sep 2013 09:14:59 +0000 (19:14 +1000)]
Removed trailing whitespaces
Nghia Ho [Thu, 26 Sep 2013 09:13:01 +0000 (19:13 +1000)]
Merge remote-tracking branch 'upstream/master'
Alexander Smorkalov [Thu, 26 Sep 2013 08:16:01 +0000 (12:16 +0400)]
Merge pull request #1464 from StevenPuttemans:bugfix_3186_second
perping [Thu, 26 Sep 2013 07:30:44 +0000 (15:30 +0800)]
fix three warning about mog, mog2 and KNearestNeighbour.
Alexander Smorkalov [Thu, 26 Sep 2013 07:09:57 +0000 (11:09 +0400)]
Merge pull request #1485 from vpisarev:ipp_fixes
perping [Thu, 26 Sep 2013 06:04:11 +0000 (14:04 +0800)]
Update the OpenCL documents.
Alexander Smorkalov [Thu, 26 Sep 2013 05:31:06 +0000 (09:31 +0400)]
Merge pull request #1497 from jet47:fix-bug-3277
Alexander Smorkalov [Thu, 26 Sep 2013 05:30:25 +0000 (09:30 +0400)]
Merge pull request #1500 from alalek:fix_add_definitions
Alexander Smorkalov [Thu, 26 Sep 2013 05:30:01 +0000 (09:30 +0400)]
Merge pull request #1502 from melody-rain:2.4_Stereo_Match_Const_Space_BP
Ilya Lavrenov [Wed, 25 Sep 2013 12:18:04 +0000 (16:18 +0400)]
changes in OpenCL matrix operations docs
Alexander Smorkalov [Wed, 25 Sep 2013 13:24:19 +0000 (17:24 +0400)]
Merge pull request #1499 from georgebrindeiro:patch-2
Alexander Smorkalov [Wed, 25 Sep 2013 13:19:37 +0000 (17:19 +0400)]
Merge pull request #1471 from ozantonkal:master
Ilya Lavrenov [Wed, 25 Sep 2013 11:28:12 +0000 (15:28 +0400)]
replaced manually new/delete by AutoBuffer
Ilya Lavrenov [Wed, 25 Sep 2013 11:02:47 +0000 (15:02 +0400)]
fixed minMaxLoc kernel (removed compilation errors)
Ilya Lavrenov [Tue, 24 Sep 2013 18:54:13 +0000 (22:54 +0400)]
reverted and generalized original ocl::transpose
Jin Ma [Wed, 25 Sep 2013 09:42:56 +0000 (17:42 +0800)]
Resolved the bug that the work group size is not valid.
Alexander Alekhin [Tue, 24 Sep 2013 16:17:39 +0000 (20:17 +0400)]
cmake: PCH: use DEFINE_SYMBOL target property
Alexander Alekhin [Sat, 21 Sep 2013 17:12:39 +0000 (21:12 +0400)]
cmake: fixed incorrect usage of add_definitions() on Linux
Alexander Smorkalov [Wed, 25 Sep 2013 07:29:46 +0000 (11:29 +0400)]
Merge pull request #1496 from shawke:patch-1
Alexander Smorkalov [Wed, 25 Sep 2013 07:27:25 +0000 (11:27 +0400)]
Merge pull request #1498 from alalek:revert_1487
George Andrew Brindeiro [Tue, 24 Sep 2013 15:59:37 +0000 (12:59 -0300)]
Added nonfree headers that are required for using SURF features
Alexander Smorkalov [Tue, 24 Sep 2013 11:36:16 +0000 (15:36 +0400)]
Merge pull request #1199 from devernay:2.4-qtkit
Alexander Alekhin [Tue, 24 Sep 2013 11:12:24 +0000 (15:12 +0400)]
Revert "cmake: fixed incorrect usage of add_definitions() on Linux"
This reverts commit
286244efedd215600b6be72d4c25e48af0ed1c2d.
Vladislav Vinogradov [Tue, 24 Sep 2013 10:45:13 +0000 (14:45 +0400)]
fix bug #3277 (findCirclesGrid failures):
findHomagraphy can return empty Mat in master branch
Alexander Smorkalov [Tue, 24 Sep 2013 10:44:32 +0000 (14:44 +0400)]
Merge pull request #1351 from barisdemiroz:eclipse-java-tutorial
Ilya Lavrenov [Tue, 24 Sep 2013 10:18:42 +0000 (14:18 +0400)]
removed arithm_absdiff.cl
Ilya Lavrenov [Tue, 24 Sep 2013 10:13:10 +0000 (14:13 +0400)]
refactored arithm.cpp. Extended param list for all the tests
Ilya Lavrenov [Tue, 24 Sep 2013 10:07:54 +0000 (14:07 +0400)]
refactoed and extended ocl::transpose
Ilya Lavrenov [Tue, 24 Sep 2013 10:02:01 +0000 (14:02 +0400)]
refactored and extended ocl::exp and ocl::log
Ilya Lavrenov [Tue, 24 Sep 2013 09:58:18 +0000 (13:58 +0400)]
refactored and extended ocl::compare
Ilya Lavrenov [Tue, 24 Sep 2013 09:54:46 +0000 (13:54 +0400)]
refactored and extended binary bitwise operations
Ilya Lavrenov [Tue, 24 Sep 2013 09:51:37 +0000 (13:51 +0400)]
refactored and extended ocl::addWeighted
Ilya Lavrenov [Tue, 24 Sep 2013 09:49:38 +0000 (13:49 +0400)]
refactored and extended ocl::LUT
shawke [Tue, 24 Sep 2013 09:48:04 +0000 (11:48 +0200)]
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.
Ilya Lavrenov [Tue, 24 Sep 2013 09:43:12 +0000 (13:43 +0400)]
removed comments from filtering.cpp and imgproc.cpp in ocl module
Ilya Lavrenov [Tue, 24 Sep 2013 09:39:07 +0000 (13:39 +0400)]
removed ocl::magnitudeSqr
Ilya Lavrenov [Tue, 24 Sep 2013 09:34:55 +0000 (13:34 +0400)]
refactored and extended arithm operations add/sub/mul/div/absdiff
Ilya Lavrenov [Tue, 24 Sep 2013 09:17:09 +0000 (13:17 +0400)]
marked some methods of ocl::Context as const
Ilya Lavrenov [Tue, 24 Sep 2013 09:15:05 +0000 (13:15 +0400)]
removed needless arithm_2_mat.cl file
StevenPuttemans [Tue, 17 Sep 2013 11:05:28 +0000 (13:05 +0200)]
Attempt at fixing bug 3186
Alexander Smorkalov [Mon, 23 Sep 2013 12:34:14 +0000 (16:34 +0400)]
Merge pull request #1430 from nzjrs:add-brisk-to-demos
Nghia Ho [Mon, 23 Sep 2013 10:05:51 +0000 (20:05 +1000)]
Merge remote-tracking branch 'upstream/master'
Alexander Smorkalov [Mon, 23 Sep 2013 10:00:04 +0000 (14:00 +0400)]
Merge pull request #1484 from lluisgomez:scene_text_detection_documentation
Alexander Smorkalov [Mon, 23 Sep 2013 09:34:38 +0000 (13:34 +0400)]
Merge pull request #1489 from melody-rain:2_4_knearest_neighbor
Alexander Smorkalov [Mon, 23 Sep 2013 08:56:19 +0000 (12:56 +0400)]
Merge pull request #1482 from ilya-lavrenov:ocl_setTO
Alexander Smorkalov [Mon, 23 Sep 2013 08:54:19 +0000 (12:54 +0400)]
Merge pull request #1487 from alalek:fix_add_definitions
lluis [Mon, 23 Sep 2013 08:17:47 +0000 (10:17 +0200)]
fixed typos
abidrahmank [Sat, 21 Sep 2013 18:44:27 +0000 (00:14 +0530)]
GSoC Python Tutorials
GSoC Python Tutorials
removed white spaces
removed blank lines at EOF
removed duplicate labels