| 
							
							
								 Suleyman TURKMEN | 11ca1c95f8 | update cpp samples and tutorials | 2016-06-26 20:55:00 +03:00 |  | 
			
				
					| 
							
							
								 ValeryTyumen | 297808e6b9 | Feature #3957 | 2015-12-17 18:19:39 +03:00 |  | 
			
				
					| 
							
							
								 Jay Bosamiya | 10cc7c78dd | Fix typo | 2015-01-17 22:53:30 +05:30 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 0738ea7d0f | Make highgui.hpp independent from C API | 2013-04-08 15:47:29 +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 | 49a1ba6038 | Set stricter warning rules for gcc | 2012-06-07 17:21:29 +00:00 |  | 
			
				
					| 
							
							
								 Gary Bradski | 5232638854 | revamped | 2010-12-04 08:31:09 +00:00 |  | 
			
				
					| 
							
							
								 Vadim Pisarevsky | ee3618243d | converted some OpenCV C samples to C++ | 2010-11-27 23:15:16 +00:00 |  |