vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Roman Donchenko
aacf188e83
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/color.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_color.cpp
samples/cpp/3calibration.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
samples/cpp/Qt_sample/main.cpp
samples/cpp/camshiftdemo.cpp
samples/cpp/descriptor_extractor_matcher.cpp
samples/cpp/distrans.cpp
samples/cpp/generic_descriptor_match.cpp
samples/cpp/grabcut.cpp
samples/cpp/morphology2.cpp
samples/cpp/segment_objects.cpp
samples/cpp/stereo_calib.cpp
samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
samples/cpp/video_dmtx.cpp
2013-11-19 16:21:09 +04:00
StevenPuttemans
2b106db02f
Applied all fixes related to translating C to C++ code
...
Also fixed some typos and code alignment
Also adapted tutorial CPP samples
Fixed some identation problems
2013-11-17 20:34:50 +01:00
Roman Donchenko
62353b7980
Boring changes - samples.
2013-09-05 19:02:59 +04:00
Andrey Kamaev
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
Andrey Kamaev
9690ed8232
Fix build of OpenCV samples (Linux)
2013-01-30 12:48:01 +04:00
Vadim Pisarevsky
c69312ea0d
fixed #2580 , #2210 . some work on #2025 .
...
modified SIFT to 1) double image before finding keypoints, 2) use floating-point internally instead of 16-bit integers, 3) set the keypoint response to the abs(interpolated_DoG_value). step 1) increases the number of detected keypoints significantly and together with 2) and 3) it improves some detection benchmarks. On the other hand, the stability of the small keypoints is lower, so the rotation and scale invariance tests now struggle a bit. In 2.5 need to make this feature optional and add some more intelligence to the algorithm.
added test that finds a planar object using SIFT.
2013-01-29 19:38:56 +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
7b5a45eac4
Merged the trunk r8384:8407 (inclusive)
2012-05-30 08:04:37 +00:00
Maria Dimashova
0d1ec967e8
fixed sample
2011-05-30 16:20:17 +00:00
Maria Dimashova
d5a79f8b19
Fixed #727
2011-05-30 15:11:34 +00:00
Maria Dimashova
ebe2d03aef
removed duplicated output, added the print of first and last points always
2011-05-20 12:46:05 +00:00
Maria Dimashova
f3662b0bd1
fixed sample
2011-05-20 12:30:47 +00:00
Maria Dimashova
983f4f1621
minor changes of recall-precision output
2011-05-20 12:14:35 +00:00
Vadim Pisarevsky
306a11a7c5
fixed a few warnings from VS2010 express
2011-05-17 14:15:23 +00:00
Gary Bradski
8faae6cfc5
revamped
2010-12-04 08:30:07 +00:00
Vadim Pisarevsky
1286c1db45
fixed multiple warnings from VS2010.
2010-11-25 16:55:46 +00:00
Maria Dimashova
7e5c11a920
added tests for some detectors; made features2d object create functions as static classes methods; fixed OpponentColorDescriptorExtractor, BriefDescriptorExtractor (on rgb); renamed DynamicDetector
2010-11-25 15:59:37 +00:00
Gary Bradski
d5f0f0391a
created help function, added more docs
2010-11-25 02:41:22 +00:00
Maria Dimashova
a5b58c00ea
updated user prompt and included headers
2010-11-16 16:01:56 +00:00
Maria Dimashova
ce0132583a
added possibility of matcher filtering to sample
2010-10-29 13:13:46 +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
26dbbcc070
added bag of words; did some renaming
2010-09-23 16:17:48 +00:00
Maria Dimashova
9e9d4b9e49
added OpponentColorDescriptorExtractor
2010-09-23 10:53:36 +00:00
Maria Dimashova
8ab3fdbcca
merged regression tests for FeatureDetector, DescriptorExtractor from branch .features2d;
...
renamed createDetector to createFeatureDetector
2010-09-17 11:26:58 +00:00
Maria Dimashova
601e9af9f8
added match()
2010-08-24 12:52:29 +00:00
Maria Dimashova
d8ad4e2267
added detector and descriptor evaluation to sample descriptor_extractor_matcher
2010-08-05 13:34:53 +00:00
Maria Dimashova
4e60decad3
added GridAdaptedFeatureDetector, PyramidAdaptedFeatureDetector and funcs to draw keypoints and matches
2010-08-03 16:28:52 +00:00
Maria Dimashova
912607a387
minor sample changes
2010-07-22 16:30:42 +00:00
Maria Dimashova
400eb37189
added parameter keypointIndexes to KeyPoint::convert, updated sample
2010-06-15 15:19:11 +00:00
Maria Dimashova
dd72f2ec52
moved matchesMask
2010-06-12 14:39:56 +00:00
Maria Dimashova
008da75691
renamed parameter of drawMatches (mask to matchesMask)
2010-06-12 10:11:57 +00:00
Victor Erukhimov
c751e901ce
Changed interface for drawMatches
2010-06-12 06:30:00 +00:00
Victor Erukhimov
c6750a0f45
Moved detector and descriptor class factory functions into features2d module
2010-06-11 18:44:22 +00:00
Maria Dimashova
6667d935f1
updated descriptor_extractro_matcher sample to use added drawMatches function
2010-06-11 17:17:47 +00:00
Vadim Pisarevsky
023e2b2850
removed irrelevant assertion.
2010-06-10 20:56:40 +00:00
Victor Erukhimov
7c1eedfc61
Renamed descriptor samples
2010-06-10 16:53:36 +00:00
