Mathieu Barnachon
43c9818895
Adding class for BOW image matcher (Feature #3005 ).
...
Same prototype as BOWImgDescriptorExtractor, but do only the matching.
If the feature is accepted, the BOWImgDescriptorExtractor and BOWImgDescriptorMatcher should probably refactor with inheritance.
Add a class to compute the keypoints, descriptors and matching from an image should be added to.
2013-08-18 11:32:04 +12:00
Andrey Pavlenko
4ed9b1ca9a
Merge pull request #1166 from StevenPuttemans:patch_2288
2013-07-31 15:50:13 +04:00
StevenPuttemans
f33fe94c0d
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
2013-07-31 13:38:18 +02:00
Andrey Pavlenko
a77456e8aa
Merge pull request #1208 from berak:Bug_3094
2013-07-31 14:29:21 +04:00
berak
03c4a6299b
expanded the CV_Assert in pyrdown_ to check for empty mats
2013-07-30 17:32:48 +02:00
Andrey Pavlenko
c4e1edbb83
Merge pull request #1195 from jet47:gpucodec-remove-ffmpeg-dep
2013-07-30 18:22:08 +04:00
Andrey Pavlenko
93923141d5
Merge pull request #1108 from nailbiter:optimLP
2013-07-30 17:50:31 +04:00
Andrey Pavlenko
b31293c984
Merge pull request #1194 from SpecLad:no-const-inputarray
2013-07-30 17:41:26 +04:00
Andrey Pavlenko
cd62f9f7cb
Merge pull request #1164 from bitwangyaoyao:master_fixHaar
2013-07-30 16:14:24 +04:00
Andrey Pavlenko
c5e569d178
Merge pull request #1204 from berak:Bug_3170
2013-07-30 16:13:03 +04:00
Andrey Pavlenko
41d180f90a
Merge pull request #1198 from znah:py_flann_fix
2013-07-30 14:17:33 +04:00
Alex Leontiev
3013ad6624
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
2013-07-30 04:14:36 +03:00
Andrey Pavlenko
9e8dd28b0e
Merge pull request #1200 from shervinemami:patch-1
2013-07-29 15:31:36 +04:00
berak
1b10860f36
added add_definitions(-DCVAPI_EXPORTS) to cmakelists.txt
2013-07-29 12:16:37 +02:00
Shervin Emami
7dc147c1f2
Changed cornerHarris description to say it finds corners, not edges
2013-07-26 19:13:25 -07:00
Alexander Mordvintsev
25b9ac18e6
fixed Bug #3143 - flann 'not implemented' error
2013-07-26 17:59:38 +04:00
Vladislav Vinogradov
60e2dbe810
removed ffmpeg dependency from gpucodec module:
...
used implementation from highgui module
2013-07-26 16:13:37 +04:00
Roman Donchenko
31de2833b4
Replace "const InputArray" with "InputArray".
...
InputArray is a reference, and references are always constant anyway. Making
it const even causes a GCC warning.
2013-07-26 14:52:56 +04:00
Alex Leontiev
52b250f466
Minor fixes
...
Fixing failed build.
2013-07-25 14:30:20 +03:00
Roman Donchenko
8afb7a40c6
Merge pull request #1159 from lluisgomez:scene_text_detection_NM
2013-07-25 12:13:49 +04:00
Roman Donchenko
98d36a4037
Merge pull request #1171 from SpecLad:drop-legacy-options
2013-07-25 12:05:36 +04:00
Roman Donchenko
4e1e0c9ee3
Merge pull request #1180 from nghiaho12:master
2013-07-25 12:04:09 +04:00
Nghia Ho
eb2720a908
missing fclose when returning early
2013-07-24 23:53:18 +10:00
Roman Donchenko
45f7c83da4
Merge pull request #1119 from 23pointsNorth:lsd
2013-07-24 13:50:11 +04:00
Roman Donchenko
b2d359b6ac
Merge pull request #1170 from SpecLad:merge-2.4
2013-07-24 13:45:33 +04:00
lluis
c4f88b0687
removed some unnecessary ERStat members as they are easily computable from others
2013-07-23 15:04:01 +02:00
lluis
43e7e6e475
removed extra cv:: scope qualifiers for better readability
2013-07-23 14:37:45 +02:00
lluis
2087d4602b
using Rect for storing the bounding box instead of an integer array
2013-07-23 13:58:52 +02:00
lluis
ca6b30a568
using explicit keyword in the ERStat constructor for safe contruction
2013-07-23 00:24:17 +02:00
Roman Donchenko
abe4219256
Drop the legacy CMake options.
...
3.0 seems like an appropriate time to do that.
2013-07-22 18:49:38 +04:00
Roman Donchenko
3939d78336
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
2013-07-22 18:38:57 +04:00
Daniel Angelov
ae93a3e681
The accurate LineSegmentDetector object.
2013-07-22 15:08:23 +03:00
Daniel Angelov
26847f92b3
Fixed the sample.
2013-07-22 14:46:34 +03:00
Roman Donchenko
38a0b47b2f
Merge pull request #1165 from vpisarev:24_ipp
2013-07-22 15:34:13 +04:00
Roman Donchenko
ef91d7e883
Merge pull request #1153 from abidrahmank:bgdGMG_docs
2013-07-22 14:52:36 +04:00
Daniel Angelov
982ccd784e
Added the update on the sample.
2013-07-22 13:49:33 +03:00
Vadim Pisarevsky
8b6afd697d
added call to IPP's ippiDistanceTransform_5x5_8u32f_C1R (by Alexander Kapustin)
2013-07-22 14:20:13 +04:00
yao
3d3e9ab635
Fix the problem of haar caused by merge
2013-07-22 17:53:56 +08:00
Roman Donchenko
bb15e735b8
Merge pull request #1161 from SpecLad:xls-comp-bug
2013-07-22 13:28:29 +04:00
Roman Donchenko
1432f3a82c
Fix xls-report.py not working with more than one comparison.
2013-07-22 12:48:43 +04:00
Daniel Angelov
6fa4834f31
Update on the class. Edited tests and samples.
2013-07-22 00:55:29 +03:00
Andrey Pavlenko
aaf47578e8
Merge pull request #1155 from bitwangyaoyao:master_fix
2013-07-21 18:50:39 +04:00
Andrey Pavlenko
f01cd3d99e
Merge pull request #1158 from StevenPuttemans:bugfix_3165
2013-07-21 18:47:16 +04:00
Andrey Pavlenko
cdcb5ed134
Merge pull request #1156 from StevenPuttemans:bugfix_1873_new
2013-07-21 18:46:58 +04:00
Andrey Pavlenko
bd4d24f0fa
Merge pull request #1122 from SpecLad:merge-2.4
2013-07-21 18:46:27 +04:00
Andrey Pavlenko
cd103e442f
Merge pull request #1032 from jet47:gpuarithm-remove-obsolete-api
2013-07-21 18:45:47 +04:00
Daniel Angelov
6f3d6ded47
Test case to strict, as overlapping lines (based on random places) may occur.
2013-07-21 10:39:24 +03:00
Daniel Angelov
68e348f960
Added private operator=.
2013-07-21 10:08:11 +03:00
Daniel Angelov
cedd768397
Fixed the M_PI to CV_PI
2013-07-21 01:54:27 +03:00
Daniel Angelov
965b3759b1
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.
2013-07-21 01:31:51 +03:00
