| 
							
							
								 tt | 4ea2eceb70 | Image Segmentation .cpp tutorial Distance Transform tutorial fixes
Distance Transform fixes v.2
Distance Transform fixes v.3
Distance Transform fixes v.4 | 2015-01-27 16:44:52 +01:00 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 vbystricky | 4286f60387 | Extract imgcodecs module from highgui | 2014-07-07 16:28:08 +04:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | d58cd9851f | Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py | 2013-12-03 17:35:21 +04:00 |  | 
			
				
					| 
							
							
								 Adrien BAK | 38904c9a11 | fix exception being thrown when no arguments are passed | 2013-11-28 12:09:17 +09:00 |  | 
			
				
					| 
							
							
								 Adrien BAK | 094d7c4926 | build fix | 2013-11-28 11:42:44 +09:00 |  | 
			
				
					| 
							
							
								 Adrien BAK | dda3b534ad | fix indent | 2013-11-26 16:09:59 +09:00 |  | 
			
				
					| 
							
							
								 Adrien BAK | 1c025be068 | fix typos | 2013-11-26 16:09:42 +09:00 |  | 
			
				
					| 
							
							
								 Adrien BAK | 514f1fae95 | improved error handling | 2013-11-26 16:09:29 +09:00 |  | 
			
				
					| 
							
							
								 Adrien BAK | 8a2de2ecca | modified HoughCircleDemo to introduce variable params via trackbars Conflicts:
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp | 2013-11-26 16:09:04 +09: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 | 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 | e9a28f66ee | Normalized file endings. | 2013-08-21 18:59:25 +04:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | f76dd99299 | Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp | 2013-08-19 19:02:36 +04:00 |  | 
			
				
					| 
							
							
								 Bahram Dahi | 230bc03d97 | Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp | 2013-08-16 08:14:32 -07:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 0738ea7d0f | Make highgui.hpp independent from C API | 2013-04-08 15:47:29 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 288a0634c2 | Make imgproc.hpp independent from C API | 2013-04-08 15:47:28 +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 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | b131dfeecd | Build tutorial codes together with other samples These codes should be included into regular builds. | 2012-11-09 10:15:48 +04:00 |  | 
			
				
					| 
							
							
								 OpenCV Buildbot | 04384a71e4 | Normalize line endings and whitespace | 2012-10-17 15:32:23 +04:00 |  | 
			
				
					| 
							
							
								 Ana Huaman | 0a14f76731 | Added 02 cpp sample files for tutorials: remap and Geometric Transformations (warpAffine and Rotation2D) | 2011-06-29 17:39:12 +00:00 |  | 
			
				
					| 
							
							
								 Ana Huaman | 8f01f2cc9f | Added 02 tutorials for Hough Lines and Circle detection in tutorial_code -- based on code existent | 2011-06-28 19:32:48 +00:00 |  | 
			
				
					| 
							
							
								 Ana Huaman | 832262e376 | Added Laplace and Canny reST tutorials and corrected a small bug in Canny sample code | 2011-06-27 17:06:54 +00:00 |  | 
			
				
					| 
							
							
								 Ana Huaman | 3a0d3ebdde | Added Laplace, Canny and Sobel samples in tutorial cpp code | 2011-06-26 23:09:04 +00:00 |  | 
			
				
					| 
							
							
								 Ana Huaman | 65575cef7e | Added two new sample files for copyMakeBorder and filter2D | 2011-06-26 18:36:59 +00:00 |  |