John Stowers
4b19fda1d6
Add brisk features to python demos
2013-09-20 21:12:49 +02:00
John Stowers
42faaa8b39
Fix mouse handling in python demos
2013-09-20 21:04:07 +02:00
John Stowers
14d225134d
Redefine CPU_xx constants in cv::namespace
...
This makes them visible from the python bindings
2013-09-20 20:04:33 +02:00
Nghia Ho
4171767d19
Merge remote-tracking branch 'upstream/master'
2013-09-21 02:20:25 +10:00
Vadim Pisarevsky
8e7eb79f6e
fixed compile errors and warnings when building master branch with IPP enabled
2013-09-20 16:02:15 +04:00
Ilya Lavrenov
362a67a695
fixed ocl::oclMat::setTo for 2-channel images
2013-09-20 15:57:38 +04:00
Alexander Smorkalov
c0c575d68e
Merge pull request #1481 from Human:master
2013-09-20 11:08:09 +04:00
Alexander Smorkalov
94966b38c0
Merge pull request #1448 from StevenPuttemans:bugfix_3264
2013-09-20 10:55:24 +04:00
Alexander Smorkalov
1445a29e1c
Merge pull request #1469 from lluisgomez:scene_text_detection_erGrouping
2013-09-20 10:54:53 +04:00
Bob Igo
2eb5ca0024
fixed malformed XML
2013-09-19 16:32:32 -04:00
Ovidiu Parvu
2bf36c312f
Removed static variables which were not read-only and used more function parameters instead.
2013-09-19 18:32:03 +01:00
Ovidiu Parvu
e324446c70
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.
2013-09-19 16:22:30 +01:00
Ovidiu Parvu
52cdae6e2b
Removed the cvMinEnclosingTriangle function since the C API will be deprecated starting with OpenCV 3.0
2013-09-19 15:37:10 +01:00
Ovidiu Parvu
21390d806f
Removed non-ASCII characters from the comments
2013-09-19 15:12:07 +01:00
Nghia Ho
8e8ff4dd33
Merge remote-tracking branch 'upstream/master'
2013-09-19 23:58:19 +10:00
Alexander Smorkalov
0ecd7913f8
Merge pull request #1472 from alalek:master_fix_debug_builds_on_win
2013-09-19 14:41:55 +04:00
lluis
2837bfd9fa
Added erGrouping function: Find groups of Extremal Regions that are organized as text blocks. Updated sample/cpp to use the complete text detection pipeline
2013-09-19 10:30:25 +02:00
Alexander Smorkalov
c550e452f9
Merge pull request #1384 from hbristow:matlab_public
2013-09-19 10:25:02 +04:00
Fedor Morozov
f99be6bda6
Mergin itseez
2013-09-18 18:55:12 +04:00
Ovidiu Parvu
73f476bd4b
Added a namespace and prefixed global variables with "G_" in order to prevent variable shadowing problems.
2013-09-18 15:51:10 +01:00
Fedor Morozov
90b6af1496
Merge new changes
2013-09-18 18:21:45 +04:00
Fedor Morozov
b1af5cc478
Remove ghost removal
2013-09-18 18:15:51 +04:00
Ozan Tonkal
5780b418c9
delete duplicate bunny.ply, remove tabs and extra lines
2013-09-18 13:46:43 +01:00
Ovidiu Parvu
737c5fe781
Updated the return type of the cvMinEnclosingTriangle function in the documentation
2013-09-18 13:09:55 +01:00
Alexander Alekhin
81ac97c6bd
fix for broken debug builds (MSVS2010/2012)
2013-09-18 16:05:21 +04:00
Ozan Tonkal
8de46e1f81
removed trailing spaces
2013-09-18 12:50:55 +01:00
Ovidiu Parvu
dc64dd7315
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
2013-09-18 12:21:24 +01:00
Andrey Pavlenko
d08b163657
Merge pull request #1468 from alalek:fix_alignSize_usage
2013-09-18 13:30:38 +04:00
hbristow
d84ab09ab7
Updated documentation
2013-09-18 18:52:23 +10:00
Ozan Tonkal
824c28a588
Merge remote-tracking branch 'itseez/master'
2013-09-18 08:44:37 +01:00
hbristow
1dd017e9d0
Fixed a memory leak in mxarray
2013-09-18 17:10:54 +10:00
Alexander Smorkalov
99a43257d5
Merge pull request #1465 from jet47:cudev-old-cc
2013-09-18 10:39:53 +04:00
Alexander Alekhin
f1b5cbc8fe
ocl: fix invalid usage of alignSize (n is not a power of 2), added roundUp
2013-09-18 01:14:41 +04:00
Alexander Smorkalov
3fa3722641
Merge pull request #1458 from look4pritam:my-branch
2013-09-17 22:50:48 +04:00
Ozan Tonkal
223fb39d94
include viz tutorials in the main tutorials file. ignore viz samples
2013-09-17 20:17:13 +02:00
Ozan Tonkal
a117400577
ignore viz tutorials when BUILD_opencv_viz is not set
2013-09-17 18:55:10 +02:00
Ozan Tonkal
e3e5fd5baa
Merge remote-tracking branch 'itseezstream/master'
2013-09-17 17:50:14 +02:00
Andrey Pavlenko
ad404ef44f
Merge pull request #1446 from lluisgomez:scene_text_detection_NM_fix2
2013-09-17 17:50:46 +04:00
Vladislav Vinogradov
20f636fcee
fixed cudev compilation for old pre-Fermi archs
2013-09-17 17:43:12 +04:00
Alexander Smorkalov
6fae07ba88
Merge pull request #1460 from ilya-lavrenov:ocl_divUp
2013-09-17 15:37:44 +04:00
Alexander Smorkalov
14951dc387
Merge pull request #1461 from ilya-lavrenov:ocl_dataOperations
2013-09-17 15:21:34 +04:00
Alexander Smorkalov
d437183388
Merge pull request #1439 from ilya-lavrenov:convertTo
2013-09-17 15:12:02 +04:00
Alexander Smorkalov
9cf301e257
Merge pull request #1449 from SpecLad:dc1394-095
2013-09-17 14:36:30 +04:00
Alexander Smorkalov
8853d19e74
Merge pull request #1452 from alalek:fix_cv_export_templates
2013-09-17 14:35:40 +04:00
Andrey Pavlenko
b3bb42773b
Merge pull request #1454 from ilya-lavrenov:ocl_pyrUp
2013-09-17 14:03:40 +04:00
Alexander Smorkalov
2dceb68a21
Merge pull request #1455 from ilya-lavrenov:ocl_test_output
2013-09-17 13:18:52 +04:00
Fedor Morozov
89508bf7ab
NO exr now
2013-09-17 00:46:15 +04:00
Fedor Morozov
76c6fa9348
No EXR in tests
2013-09-17 00:39:22 +04:00
Ilya Lavrenov
6a26c4483f
added performance tests for data transfer operations
2013-09-16 23:51:36 +04:00
Ilya Lavrenov
58b84c2fc0
removed needless divUp
2013-09-16 15:48:30 +04:00
