Adil Ibragimov
8a4a1bb018
Several type of formal refactoring:
...
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
2014-08-13 15:21:35 +04:00
Ilya Lavrenov
32eb38ec98
fixed defects from coverity.com
2014-02-23 20:21:08 +04:00
yash
1a89a03c7c
Fixed CV_ASSERT condition in the code for bag of words
2014-02-16 22:33:30 +05:30
Konstantin Matskevich
bdfa9fa14a
fixes2
2014-02-05 13:51:14 +04:00
Konstantin Matskevich
b0f617bc01
fixes
2014-02-05 09:59:04 +04:00
Konstantin Matskevich
f44334285b
features2d
2014-02-04 16:55:07 +04:00
Andrey Pavlenko
4fbd2ef87a
Merge pull request #1290 from mbarnach:bow_desc
2014-01-21 19:22:47 +04:00
StevenPuttemans
e4b41d38f1
Fixed descripotorsCount to descriptorsCount
...
See feature 2862
2013-12-16 10:47:24 +01:00
Mathieu Barnachon
b413bcbba4
Fix shadow parameter.
2013-11-27 11:36:34 +01:00
Mathieu Barnachon
99c8b8c016
Fix parameter name to fit documentation.
2013-11-27 11:06:52 +01:00
Mathieu Barnachon
c90fe65f22
Fix compilation issue related to previous commit.
2013-11-24 17:16:45 +01:00
Mathieu Barnachon
e8b86c8663
Fix name of one parameter to fit the documentation.
2013-11-24 17:14:23 +01:00
Mathieu Barnachon
9dc713eaba
Fix name of parameter to have proper documentation.
2013-11-24 15:45:05 +01:00
Mathieu Barnachon
bf84d476fc
Fix useless space...
2013-11-24 15:38:48 +01:00
Mathieu Barnachon
0c4da123e9
Remove duplicate functions.
2013-11-24 14:33:41 +01:00
Mathieu Barnachon
67525627db
Merge remote-tracking branch 'upstream/master' into bow_desc
...
Conflicts:
modules/features2d/src/bagofwords.cpp
2013-11-24 14:21:44 +01:00
Mathieu Barnachon
464985205c
Update PR after mdim review.
2013-09-05 16:05:54 +12:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
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
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
StevenPuttemans
52bfa7b850
Fixed bug 1873 : return image keypoint descriptors + fix on line 152 pure declaration
2013-07-19 09:29:48 +02:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
bd0e0b5800
Merged the trunk r8589:8653 - all changes related to build warnings
2012-06-15 13:04:17 +00:00
Andrey Kamaev
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
Vadim Pisarevsky
abeeb40d46
a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc.
2011-04-17 13:14:45 +00:00
Vadim Pisarevsky
1286c1db45
fixed multiple warnings from VS2010.
2010-11-25 16:55:46 +00:00
Maria Dimashova
e406dfee44
refactored features2d and sample on matching to many images
2010-11-22 18:27:08 +00:00
Maria Dimashova
d7c86bbcdc
minor change of BOW
2010-11-08 15:21:56 +00:00
Maria Dimashova
69e329c9fd
modified features2d interface; added algorithmic test for DescriptorMatcher; added sample on matching to many images
2010-10-29 08:44:42 +00:00
Maria Dimashova
9f934363e5
added sample on BOW usage to image classification (training and testing is on Pascal VOC dataset)
2010-10-08 13:17:34 +00:00
Maria Dimashova
13b535ac19
added BOWTrainer::add()
2010-09-30 14:21:22 +00:00
Maria Dimashova
26dbbcc070
added bag of words; did some renaming
2010-09-23 16:17:48 +00:00
