platform/upstream/opencv.git
11 years agoAdded test cpp
Nghia Ho [Wed, 31 Jul 2013 13:43:25 +0000 (23:43 +1000)]
Added test cpp

11 years agoMerge https://github.com/Itseez/opencv
Nghia Ho [Wed, 31 Jul 2013 13:40:34 +0000 (23:40 +1000)]
Merge https://github.com/Itseez/opencv

Keeping up to date

11 years agoFinished test code, added image to the doc
Nghia Ho [Wed, 31 Jul 2013 13:08:02 +0000 (23:08 +1000)]
Finished test code, added image to the doc

11 years agoMerge pull request #1166 from StevenPuttemans:patch_2288
Andrey Pavlenko [Wed, 31 Jul 2013 11:50:12 +0000 (15:50 +0400)]
Merge pull request #1166 from StevenPuttemans:patch_2288

11 years agoAdded the sample from patch #2288 : reading in sequence of images
StevenPuttemans [Mon, 22 Jul 2013 11:00:54 +0000 (13:00 +0200)]
Added the sample from patch #2288 : reading in sequence of images

Added bugfixes
- Changed CV_WINDOW_NORMAL to 1
- Changed the help function to static
- Added extra help information on mask specifics

11 years agoMerge pull request #1208 from berak:Bug_3094
Andrey Pavlenko [Wed, 31 Jul 2013 10:29:21 +0000 (14:29 +0400)]
Merge pull request #1208 from berak:Bug_3094

11 years agoMerge https://github.com/Itseez/opencv
Nghia Ho [Tue, 30 Jul 2013 20:10:57 +0000 (06:10 +1000)]
Merge https://github.com/Itseez/opencv

Keep up to date

11 years agoexpanded the CV_Assert in pyrdown_ to check for empty mats
berak [Tue, 30 Jul 2013 15:32:48 +0000 (17:32 +0200)]
expanded the CV_Assert in pyrdown_ to check for empty mats

11 years agoMerge pull request #1195 from jet47:gpucodec-remove-ffmpeg-dep
Andrey Pavlenko [Tue, 30 Jul 2013 14:22:08 +0000 (18:22 +0400)]
Merge pull request #1195 from jet47:gpucodec-remove-ffmpeg-dep

11 years agoMerge https://github.com/Itseez/opencv
Nghia Ho [Tue, 30 Jul 2013 13:58:10 +0000 (23:58 +1000)]
Merge https://github.com/Itseez/opencv

11 years agoMerge pull request #1108 from nailbiter:optimLP
Andrey Pavlenko [Tue, 30 Jul 2013 13:50:29 +0000 (17:50 +0400)]
Merge pull request #1108 from nailbiter:optimLP

11 years agoMerge pull request #1194 from SpecLad:no-const-inputarray
Andrey Pavlenko [Tue, 30 Jul 2013 13:41:25 +0000 (17:41 +0400)]
Merge pull request #1194 from SpecLad:no-const-inputarray

11 years agoMerge pull request #1164 from bitwangyaoyao:master_fixHaar
Andrey Pavlenko [Tue, 30 Jul 2013 12:14:23 +0000 (16:14 +0400)]
Merge pull request #1164 from bitwangyaoyao:master_fixHaar

11 years agoMerge pull request #1204 from berak:Bug_3170
Andrey Pavlenko [Tue, 30 Jul 2013 12:13:02 +0000 (16:13 +0400)]
Merge pull request #1204 from berak:Bug_3170

11 years agoMerge pull request #1198 from znah:py_flann_fix
Andrey Pavlenko [Tue, 30 Jul 2013 10:17:32 +0000 (14:17 +0400)]
Merge pull request #1198 from znah:py_flann_fix

11 years agoMinor fixes
Alex Leontiev [Tue, 30 Jul 2013 01:14:36 +0000 (04:14 +0300)]
Minor fixes

Request to comments on pull request for simplex method. In particular
*) while(1) is replaced with for(;;)
*) if(true){...} constructions in tests are replaced with #if 1 ...
 #endif

11 years agoMerge pull request #1200 from shervinemami:patch-1
Andrey Pavlenko [Mon, 29 Jul 2013 11:31:36 +0000 (15:31 +0400)]
Merge pull request #1200 from shervinemami:patch-1

11 years agoadded add_definitions(-DCVAPI_EXPORTS) to cmakelists.txt
berak [Mon, 29 Jul 2013 10:16:37 +0000 (12:16 +0200)]
added add_definitions(-DCVAPI_EXPORTS) to cmakelists.txt

11 years agoAdded C interface
Nghia Ho [Sun, 28 Jul 2013 05:31:58 +0000 (15:31 +1000)]
Added C interface

11 years agochanged from isnormal to isfinite, the prev ignored zero
Nghia Ho [Sat, 27 Jul 2013 15:06:55 +0000 (01:06 +1000)]
changed from isnormal to isfinite, the prev ignored zero

11 years agoFixed ret
Nghia Ho [Sat, 27 Jul 2013 14:46:44 +0000 (00:46 +1000)]
Fixed ret

11 years agoNew intersection function for rotated rectangles
Nghia Ho [Sat, 27 Jul 2013 14:12:24 +0000 (00:12 +1000)]
New intersection function for rotated rectangles

11 years agoChanged cornerHarris description to say it finds corners, not edges
Shervin Emami [Sat, 27 Jul 2013 02:13:25 +0000 (19:13 -0700)]
Changed cornerHarris description to say it finds corners, not edges

11 years agofixed Bug #3143 - flann 'not implemented' error
Alexander Mordvintsev [Fri, 26 Jul 2013 13:58:39 +0000 (17:58 +0400)]
fixed Bug #3143 - flann 'not implemented' error

11 years agoremoved ffmpeg dependency from gpucodec module:
Vladislav Vinogradov [Fri, 26 Jul 2013 12:13:37 +0000 (16:13 +0400)]
removed ffmpeg dependency from gpucodec module:

used implementation from highgui module

11 years agoReplace "const InputArray" with "InputArray".
Roman Donchenko [Fri, 26 Jul 2013 10:52:56 +0000 (14:52 +0400)]
Replace "const InputArray" with "InputArray".

InputArray is a reference, and references are always constant anyway. Making
it const even causes a GCC warning.

11 years agoMinor fixes
Alex Leontiev [Thu, 25 Jul 2013 11:30:20 +0000 (14:30 +0300)]
Minor fixes

Fixing failed build.

11 years agoMerge pull request #1159 from lluisgomez:scene_text_detection_NM
Roman Donchenko [Thu, 25 Jul 2013 08:13:47 +0000 (12:13 +0400)]
Merge pull request #1159 from lluisgomez:scene_text_detection_NM

11 years agoMerge pull request #1171 from SpecLad:drop-legacy-options
Roman Donchenko [Thu, 25 Jul 2013 08:05:36 +0000 (12:05 +0400)]
Merge pull request #1171 from SpecLad:drop-legacy-options

11 years agoMerge pull request #1180 from nghiaho12:master
Roman Donchenko [Thu, 25 Jul 2013 08:04:09 +0000 (12:04 +0400)]
Merge pull request #1180 from nghiaho12:master

11 years agomissing fclose when returning early
Nghia Ho [Wed, 24 Jul 2013 13:53:18 +0000 (23:53 +1000)]
missing fclose when returning early

11 years agoMerge pull request #1119 from 23pointsNorth:lsd
Roman Donchenko [Wed, 24 Jul 2013 09:50:10 +0000 (13:50 +0400)]
Merge pull request #1119 from 23pointsNorth:lsd

11 years agoMerge pull request #1170 from SpecLad:merge-2.4
Roman Donchenko [Wed, 24 Jul 2013 09:45:32 +0000 (13:45 +0400)]
Merge pull request #1170 from SpecLad:merge-2.4

11 years agoremoved some unnecessary ERStat members as they are easily computable from others
lluis [Tue, 23 Jul 2013 13:04:01 +0000 (15:04 +0200)]
removed some unnecessary ERStat members as they are easily computable from others

11 years agoremoved extra cv:: scope qualifiers for better readability
lluis [Tue, 23 Jul 2013 12:37:45 +0000 (14:37 +0200)]
removed extra cv:: scope qualifiers for better readability

11 years agousing Rect for storing the bounding box instead of an integer array
lluis [Tue, 23 Jul 2013 11:58:52 +0000 (13:58 +0200)]
using Rect for storing the bounding box instead of an integer array

11 years agousing explicit keyword in the ERStat constructor for safe contruction
lluis [Mon, 22 Jul 2013 22:24:17 +0000 (00:24 +0200)]
using explicit keyword in the ERStat constructor for safe contruction

11 years agoDrop the legacy CMake options.
Roman Donchenko [Mon, 22 Jul 2013 14:49:38 +0000 (18:49 +0400)]
Drop the legacy CMake options.

3.0 seems like an appropriate time to do that.

11 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
Roman Donchenko [Mon, 22 Jul 2013 14:38:57 +0000 (18:38 +0400)]
Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/core/include/opencv2/core/types_c.h
modules/gpu/src/cuda/imgproc.cu
modules/gpu/src/cuda/safe_call.hpp
modules/gpu/src/error.cpp
modules/gpu/src/imgproc.cpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/shapedescr.cpp
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cv.hpp

11 years agoThe accurate LineSegmentDetector object.
Daniel Angelov [Mon, 22 Jul 2013 12:08:23 +0000 (15:08 +0300)]
The accurate LineSegmentDetector object.

11 years agoFixed the sample.
Daniel Angelov [Mon, 22 Jul 2013 11:46:34 +0000 (14:46 +0300)]
Fixed the sample.

11 years agoMerge pull request #1165 from vpisarev:24_ipp
Roman Donchenko [Mon, 22 Jul 2013 11:34:13 +0000 (15:34 +0400)]
Merge pull request #1165 from vpisarev:24_ipp

11 years agoMerge pull request #1153 from abidrahmank:bgdGMG_docs
Roman Donchenko [Mon, 22 Jul 2013 10:52:35 +0000 (14:52 +0400)]
Merge pull request #1153 from abidrahmank:bgdGMG_docs

11 years agoAdded the update on the sample.
Daniel Angelov [Mon, 22 Jul 2013 10:49:33 +0000 (13:49 +0300)]
Added the update on the sample.

11 years agoadded call to IPP's ippiDistanceTransform_5x5_8u32f_C1R (by Alexander Kapustin)
Vadim Pisarevsky [Mon, 22 Jul 2013 10:20:13 +0000 (14:20 +0400)]
added call to IPP's ippiDistanceTransform_5x5_8u32f_C1R (by Alexander Kapustin)

11 years agoFix the problem of haar caused by merge
yao [Mon, 22 Jul 2013 09:53:56 +0000 (17:53 +0800)]
Fix the problem of haar caused by merge

11 years agoMerge pull request #1161 from SpecLad:xls-comp-bug
Roman Donchenko [Mon, 22 Jul 2013 09:28:28 +0000 (13:28 +0400)]
Merge pull request #1161 from SpecLad:xls-comp-bug

11 years agoFix xls-report.py not working with more than one comparison.
Roman Donchenko [Mon, 22 Jul 2013 08:48:43 +0000 (12:48 +0400)]
Fix xls-report.py not working with more than one comparison.

11 years agoUpdate on the class. Edited tests and samples.
Daniel Angelov [Sun, 21 Jul 2013 21:55:29 +0000 (00:55 +0300)]
Update on the class. Edited tests and samples.

11 years agoMerge pull request #1155 from bitwangyaoyao:master_fix
Andrey Pavlenko [Sun, 21 Jul 2013 14:50:38 +0000 (18:50 +0400)]
Merge pull request #1155 from bitwangyaoyao:master_fix

11 years agoMerge pull request #1158 from StevenPuttemans:bugfix_3165
Andrey Pavlenko [Sun, 21 Jul 2013 14:47:16 +0000 (18:47 +0400)]
Merge pull request #1158 from StevenPuttemans:bugfix_3165

11 years agoMerge pull request #1156 from StevenPuttemans:bugfix_1873_new
Andrey Pavlenko [Sun, 21 Jul 2013 14:46:58 +0000 (18:46 +0400)]
Merge pull request #1156 from StevenPuttemans:bugfix_1873_new

11 years agoMerge pull request #1122 from SpecLad:merge-2.4
Andrey Pavlenko [Sun, 21 Jul 2013 14:46:26 +0000 (18:46 +0400)]
Merge pull request #1122 from SpecLad:merge-2.4

11 years agoMerge pull request #1032 from jet47:gpuarithm-remove-obsolete-api
Andrey Pavlenko [Sun, 21 Jul 2013 14:45:46 +0000 (18:45 +0400)]
Merge pull request #1032 from jet47:gpuarithm-remove-obsolete-api

11 years agoTest case to strict, as overlapping lines (based on random places) may occur.
Daniel Angelov [Sun, 21 Jul 2013 07:39:24 +0000 (10:39 +0300)]
Test case to strict, as overlapping lines (based on random places) may occur.

11 years agoAdded private operator=.
Daniel Angelov [Sun, 21 Jul 2013 07:08:11 +0000 (10:08 +0300)]
Added private operator=.

11 years agoFixed the M_PI to CV_PI
Daniel Angelov [Sat, 20 Jul 2013 22:54:27 +0000 (01:54 +0300)]
Fixed the M_PI to CV_PI

11 years agoUpdate on the class to reflect the review. Split the class into virtual and implement...
Daniel Angelov [Sat, 20 Jul 2013 22:31:51 +0000 (01:31 +0300)]
Update on the class to reflect the review. Split the class into virtual and implementation. change of name to LineSegmentDetector, using Input/Output-Arrays, general clean ups.

11 years agoEliminated all the calls to std::find()
Alex Leontiev [Sat, 20 Jul 2013 12:14:02 +0000 (15:14 +0300)]
Eliminated all the calls to std::find()

This is done by keeping indexToRow vector, that keeps the information,
opposite to those kept by N and B. That is, while N and B help to
determine which variable corresponds to given column in column-vector c
or row in matrix b, indexToRow helps to determine the corresponding
row/column for a given variable.

At this point, I'm waiting for comments from pull request reviewer and
not working on any upgrades. Comments are appreciated, as usual.

11 years agofixed compilation errors and warnings on builds 3298 and 4384
lluis [Sat, 20 Jul 2013 09:35:56 +0000 (11:35 +0200)]
fixed compilation errors and warnings on builds 3298 and 4384

11 years agofixed some warnings on build 4285
lluis [Sat, 20 Jul 2013 09:13:38 +0000 (11:13 +0200)]
fixed some warnings on build 4285

11 years agoadd opencv_ml headers to precomp
lluis [Sat, 20 Jul 2013 08:33:42 +0000 (10:33 +0200)]
add opencv_ml headers to precomp

11 years agoClass-specific Extremal Region Filter algorithm as proposed in :
lluis [Fri, 19 Jul 2013 23:10:05 +0000 (01:10 +0200)]
Class-specific Extremal Region Filter algorithm as proposed in :
Neumann L., Matas J.: Real-Time Scene Text Localization and Recognition, CVPR 2012.

High-level C++ interface and implementation of algorithm is in the objdetect module.
C++ example, a test image, and the default classifiers in xml files.

11 years agobgdsubtractorGMG docs
abidrahmank [Fri, 19 Jul 2013 17:41:30 +0000 (23:11 +0530)]
bgdsubtractorGMG docs

11 years agoApplied bugfix #3165 : Changed min_eps value
StevenPuttemans [Fri, 19 Jul 2013 12:11:04 +0000 (14:11 +0200)]
Applied bugfix #3165 : Changed min_eps value

11 years agoSimplify printing procedures
Alex Leontiev [Fri, 19 Jul 2013 09:34:33 +0000 (12:34 +0300)]
Simplify printing procedures

Use opencv's print() procedure in place of my own procedures to output
matrices and std::vectors.

Interestingly enough, operator<< does not work for matrices, when called
from my .cpp files in src/ subfolder of the optim module, although it
works when called from tests and stand-alone programs, compiled with
opencv. I think, this requires investigation and, maybe, bug report.

11 years agoMerge pull request #1148 from StevenPuttemans:patch_3125
Roman Donchenko [Fri, 19 Jul 2013 08:48:49 +0000 (12:48 +0400)]
Merge pull request #1148 from StevenPuttemans:patch_3125

11 years agoMerge pull request #1141 from apavlenko:fix_warning_unreach_code
Roman Donchenko [Fri, 19 Jul 2013 08:22:58 +0000 (12:22 +0400)]
Merge pull request #1141 from apavlenko:fix_warning_unreach_code

11 years agoMerge pull request #1133 from abidrahmank:denoising_pydocs
Roman Donchenko [Fri, 19 Jul 2013 08:20:56 +0000 (12:20 +0400)]
Merge pull request #1133 from abidrahmank:denoising_pydocs

11 years agoMerge pull request #1150 from janstarzy:spelling
Roman Donchenko [Fri, 19 Jul 2013 08:15:30 +0000 (12:15 +0400)]
Merge pull request #1150 from janstarzy:spelling

11 years agoFixed bug 1873 : return image keypoint descriptors + fix on line 152 pure declaration
StevenPuttemans [Fri, 19 Jul 2013 07:29:48 +0000 (09:29 +0200)]
Fixed bug 1873 : return image keypoint descriptors + fix on line 152 pure declaration

11 years agoWarning fixes
yao [Fri, 19 Jul 2013 06:36:41 +0000 (14:36 +0800)]
Warning fixes

11 years agoMinor fixes
Alex Leontiev [Fri, 19 Jul 2013 00:09:39 +0000 (03:09 +0300)]
Minor fixes

In request to the comments for the pull request.

11 years agominor improvement (consistency, readability)
Andrey Pavlenko [Thu, 18 Jul 2013 15:50:51 +0000 (19:50 +0400)]
minor improvement (consistency, readability)

11 years agoMerge pull request #1095 from jet47:gpu-perf-tests
Andrey Pavlenko [Thu, 18 Jul 2013 15:32:37 +0000 (19:32 +0400)]
Merge pull request #1095 from jet47:gpu-perf-tests

11 years agoremoving unreachible code
Andrey Pavlenko [Thu, 18 Jul 2013 15:15:49 +0000 (19:15 +0400)]
removing unreachible code

11 years agofixed cpackage -> package
Jan Starzynski [Thu, 18 Jul 2013 13:33:25 +0000 (15:33 +0200)]
fixed cpackage -> package

11 years agoChanged first approach to a more general MS-specific approach.
StevenPuttemans [Thu, 18 Jul 2013 12:24:19 +0000 (14:24 +0200)]
Changed first approach to a more general MS-specific approach.
Suggested by @SpecLad

11 years agoMerge pull request #1144 from prclibo:master
Roman Donchenko [Thu, 18 Jul 2013 12:05:39 +0000 (16:05 +0400)]
Merge pull request #1144 from prclibo:master

11 years agoMerge pull request #1137 from StevenPuttemans:bugfix_3131_24
Roman Donchenko [Thu, 18 Jul 2013 12:02:46 +0000 (16:02 +0400)]
Merge pull request #1137 from StevenPuttemans:bugfix_3131_24

11 years agocorrected some spelling errors
Jan Starzynski [Thu, 18 Jul 2013 11:24:55 +0000 (13:24 +0200)]
corrected some spelling errors

11 years agoMerge pull request #1147 from jet47:gpu-sanity-test-name
Roman Donchenko [Thu, 18 Jul 2013 10:29:47 +0000 (14:29 +0400)]
Merge pull request #1147 from jet47:gpu-sanity-test-name

11 years agoMerge pull request #1138 from janstarzy:mat-dist
Andrey Pavlenko [Thu, 18 Jul 2013 10:23:12 +0000 (14:23 +0400)]
Merge pull request #1138 from janstarzy:mat-dist

11 years agoMerge pull request #1042 from jet47:gpuimgproc-refactoring
Andrey Pavlenko [Thu, 18 Jul 2013 10:22:44 +0000 (14:22 +0400)]
Merge pull request #1042 from jet47:gpuimgproc-refactoring

11 years agoremoved GPU_/CPU_ prefix from gpu's sanity test
Vladislav Vinogradov [Thu, 18 Jul 2013 09:41:27 +0000 (13:41 +0400)]
removed GPU_/CPU_ prefix from gpu's sanity test

11 years agoFixing bug #3131 adding breakpoints to featuretracker.cpp
StevenPuttemans [Wed, 17 Jul 2013 12:52:42 +0000 (14:52 +0200)]
Fixing bug #3131 adding breakpoints to featuretracker.cpp

11 years agoMerge pull request #1146 from jet47:fix-gpu-without-cufft-cublas
Roman Donchenko [Thu, 18 Jul 2013 08:54:09 +0000 (12:54 +0400)]
Merge pull request #1146 from jet47:fix-gpu-without-cufft-cublas

11 years agoMerge pull request #1145 from jet47:cuda-default-cc
Roman Donchenko [Thu, 18 Jul 2013 08:25:20 +0000 (12:25 +0400)]
Merge pull request #1145 from jet47:cuda-default-cc

11 years agofixed compilation without CUBLAS and CUFFT
Vladislav Vinogradov [Thu, 18 Jul 2013 07:24:34 +0000 (11:24 +0400)]
fixed compilation without CUBLAS and CUFFT

11 years agoupdated default parameters for CUDA CC in CMake:
Vladislav Vinogradov [Thu, 18 Jul 2013 05:44:00 +0000 (09:44 +0400)]
updated default parameters for CUDA CC in CMake:

* removed 2.0 PTX from default parameters since it has become obsolete
* added 3.5 BIN to prevent JIT compilation for super-Kepler

11 years agoremoved tab in five-point.cpp
Bo Li [Thu, 18 Jul 2013 02:09:50 +0000 (10:09 +0800)]
removed tab in five-point.cpp

11 years agofixed a bug for the mask of recoverPose function
Bo Li [Thu, 18 Jul 2013 01:55:39 +0000 (09:55 +0800)]
fixed a bug for the mask of recoverPose function

11 years agofixed strings in n1_dims(): n1_dcols() -> n1_dims()
Jan Starzynski [Wed, 17 Jul 2013 16:41:54 +0000 (18:41 +0200)]
fixed strings in n1_dims(): n1_dcols() -> n1_dims()

11 years agoMerge pull request #1131 from asmorkalov:winrt_tbb_dbg_fix
Roman Donchenko [Wed, 17 Jul 2013 14:48:20 +0000 (18:48 +0400)]
Merge pull request #1131 from asmorkalov:winrt_tbb_dbg_fix

11 years agoMerge pull request #1127 from SpecLad:np-1.7
Roman Donchenko [Wed, 17 Jul 2013 14:48:07 +0000 (18:48 +0400)]
Merge pull request #1127 from SpecLad:np-1.7

11 years agoMerge pull request #1132 from apavlenko:master_ver_290
Roman Donchenko [Wed, 17 Jul 2013 13:51:55 +0000 (17:51 +0400)]
Merge pull request #1132 from apavlenko:master_ver_290

11 years agoMerge pull request #1136 from StevenPuttemans:bugfix_3157
Roman Donchenko [Wed, 17 Jul 2013 13:51:27 +0000 (17:51 +0400)]
Merge pull request #1136 from StevenPuttemans:bugfix_3157

11 years agoadding method dims() to core.Mat
Jan Starzynski [Wed, 17 Jul 2013 13:04:34 +0000 (15:04 +0200)]
adding method dims() to core.Mat

11 years agoRemoved Note, added other fix (libs to lib)
StevenPuttemans [Wed, 17 Jul 2013 13:02:55 +0000 (15:02 +0200)]
Removed Note, added other fix (libs to lib)

11 years agoDebug build for WindowsRT with TBB fixed.
Alexander Smorkalov [Tue, 16 Jul 2013 14:37:09 +0000 (07:37 -0700)]
Debug build for WindowsRT with TBB fixed.

Debug library name prefix changed no "_debug" to fit pragmas in TBB
headers.