StevenPuttemans
|
e4b41d38f1
|
Fixed descripotorsCount to descriptorsCount
See feature 2862
|
2013-12-16 10:47:24 +01: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 |
|
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 |
|