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 [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
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
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().
Alexander Smorkalov [Thu, 26 Sep 2013 17:09:41 +0000 (21:09 +0400)]
Merge pull request #1511 from apavlenko:shorten_hdr
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
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
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
Jin Ma [Mon, 23 Sep 2013 07:10:00 +0000 (15:10 +0800)]
Removed unused constructor.
Alexander Smorkalov [Mon, 23 Sep 2013 06:31:46 +0000 (10:31 +0400)]
Merge pull request #1299 from jet47:gpu-cuda-rename
Alexander Smorkalov [Mon, 23 Sep 2013 06:26:44 +0000 (10:26 +0400)]
Merge pull request #1483 from kecsap:nbayes
Jin Ma [Sun, 22 Sep 2013 02:23:54 +0000 (10:23 +0800)]
Added knearest neighbor of OpenCL version.
It includes the accuracy/performance test and the implementation of KNN.
Jin Ma [Sun, 22 Sep 2013 02:22:09 +0000 (10:22 +0800)]
Added knearest neighbor of OpenCL version.
It includes the accuracy/performance test and the implementation of KNN.
Alexander Alekhin [Sat, 21 Sep 2013 17:12:39 +0000 (21:12 +0400)]
cmake: fixed incorrect usage of add_definitions() on Linux
Csaba Kertesz [Wed, 18 Sep 2013 19:49:32 +0000 (21:49 +0200)]
Fix a memory leak in CvNormalBayesClassifier::train()
lluis [Fri, 20 Sep 2013 12:19:59 +0000 (14:19 +0200)]
added rst documentation for the Class-specific Extremal Regions for Scene Text Detection
John Stowers [Tue, 10 Sep 2013 11:36:57 +0000 (13:36 +0200)]
Add brisk features to python demos
John Stowers [Tue, 10 Sep 2013 11:35:57 +0000 (13:35 +0200)]
Fix mouse handling in python demos
John Stowers [Wed, 18 Sep 2013 20:52:37 +0000 (22:52 +0200)]
Redefine CPU_xx constants in cv::namespace
This makes them visible from the python bindings
Vadim Pisarevsky [Fri, 20 Sep 2013 12:02:15 +0000 (16:02 +0400)]
fixed compile errors and warnings when building master branch with IPP enabled
Ilya Lavrenov [Fri, 20 Sep 2013 10:22:18 +0000 (14:22 +0400)]
fixed ocl::oclMat::setTo for 2-channel images
Alexander Smorkalov [Fri, 20 Sep 2013 07:08:09 +0000 (11:08 +0400)]
Merge pull request #1481 from Human:master
Alexander Smorkalov [Fri, 20 Sep 2013 06:55:23 +0000 (10:55 +0400)]
Merge pull request #1448 from StevenPuttemans:bugfix_3264
Alexander Smorkalov [Fri, 20 Sep 2013 06:54:52 +0000 (10:54 +0400)]
Merge pull request #1469 from lluisgomez:scene_text_detection_erGrouping
Bob Igo [Thu, 19 Sep 2013 20:32:32 +0000 (16:32 -0400)]
fixed malformed XML
Ovidiu Parvu [Thu, 19 Sep 2013 17:32:03 +0000 (18:32 +0100)]
Removed static variables which were not read-only and used more function parameters instead.
Ovidiu Parvu [Thu, 19 Sep 2013 15:22:30 +0000 (16:22 +0100)]
Changed the signature of the minEnclosingTriangle function such that it returns the area automatically. Moreover, the overloaded function was no longer required so it was removed. Sample code, documentation and unit tests were updated correspondingly.
Ovidiu Parvu [Thu, 19 Sep 2013 14:37:10 +0000 (15:37 +0100)]
Removed the cvMinEnclosingTriangle function since the C API will be deprecated starting with OpenCV 3.0
Ovidiu Parvu [Thu, 19 Sep 2013 14:12:07 +0000 (15:12 +0100)]
Removed non-ASCII characters from the comments
Alexander Smorkalov [Thu, 19 Sep 2013 10:41:55 +0000 (14:41 +0400)]
Merge pull request #1472 from alalek:master_fix_debug_builds_on_win
lluis [Tue, 17 Sep 2013 21:45:23 +0000 (23:45 +0200)]
Added erGrouping function: Find groups of Extremal Regions that are organized as text blocks. Updated sample/cpp to use the complete text detection pipeline
Alexander Smorkalov [Thu, 19 Sep 2013 06:25:02 +0000 (10:25 +0400)]
Merge pull request #1384 from hbristow:matlab_public
Ovidiu Parvu [Wed, 18 Sep 2013 14:51:10 +0000 (15:51 +0100)]
Added a namespace and prefixed global variables with "G_" in order to prevent variable shadowing problems.
Ozan Tonkal [Wed, 18 Sep 2013 12:46:43 +0000 (13:46 +0100)]
delete duplicate bunny.ply, remove tabs and extra lines
Ovidiu Parvu [Wed, 18 Sep 2013 12:09:55 +0000 (13:09 +0100)]
Updated the return type of the cvMinEnclosingTriangle function in the documentation
Alexander Alekhin [Tue, 17 Sep 2013 22:08:53 +0000 (02:08 +0400)]
fix for broken debug builds (MSVS2010/2012)
Ozan Tonkal [Wed, 18 Sep 2013 11:50:55 +0000 (12:50 +0100)]
removed trailing spaces
Ovidiu Parvu [Wed, 18 Sep 2013 11:21:24 +0000 (12:21 +0100)]
Made the following changes after code inspection (min_enclosing_triangle.cpp):
* Corrected minor typos in comments/function signatures
* Added new details to copyright statement
* Removed unreferenced macros
* Removed the assert statement which was checking the type of the OutputArray triangle
* When returning results using Mat::copyTo instead of Mat::convertTo
* Changed C-style casts to static_casts
* Added division by zero check to distanceFromPointToLine() function
* Updated reference webpages last access dates
* Moved the declaration of the gammaOfA variable outside the while loop in moveAIfLowAndBIfHigh() function for efficiency reasons
Andrey Pavlenko [Wed, 18 Sep 2013 09:30:38 +0000 (13:30 +0400)]
Merge pull request #1468 from alalek:fix_alignSize_usage
hbristow [Wed, 18 Sep 2013 08:52:23 +0000 (18:52 +1000)]
Updated documentation
Ozan Tonkal [Wed, 18 Sep 2013 07:44:37 +0000 (08:44 +0100)]
Merge remote-tracking branch 'itseez/master'