generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,487 Commits 3 Branches 47 Tags
e16d89e8d68895d5899b7fded655b98185ceeb54
Commit Graph

22 Commits

Author SHA1 Message Date
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
0738ea7d0f Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04: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
Anatoly Baksheev
680eeecc3b fixed samples compilation 2012-12-17 13:19:26 +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
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Vadim Pisarevsky
957e80abbd lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template. 2012-03-15 14:36:01 +00:00
Vadim Pisarevsky
f0624c08dc propagated some more changes from 2.3 to trunk 2011-06-23 12:15:35 +00:00
Gary Bradski
1186caae20 revamped 2010-12-04 08:29:24 +00:00
Vadim Pisarevsky
042271f5f7 use the new-style headers in the samples to improve OpenCV build time. 2010-11-26 17:59:40 +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
3239d16c33 clarified docs 2010-11-25 02:48:18 +00:00
Maria Dimashova
3a873cb051 updated some included headers 2010-11-16 16:34:27 +00:00
Ilya Lysenkov
70a524bc50 Updated user prompt in the generic_descriptor_match sample 2010-11-13 05:40:40 +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
89935fc59b fixed FernDescriptorMatch; optimized keypoint regions matching in detector/descriptor evaluation; added CalonderDescriptorExtractor to evaluation tests 2010-10-04 14:12:36 +00:00
Vadim Pisarevsky
08cba33f9d fixed some more MSVC2010 warnings 2010-07-17 10:35:17 +00:00
Maria Dimashova
69adf86afe fixed compile error; renamed createDescriptorMatch to createGenericDescriptorMatch 2010-06-28 16:03:01 +00:00
Victor Erukhimov
7c1eedfc61 Renamed descriptor samples 2010-06-10 16:53:36 +00:00