Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						95e38e457f 
					 
					
						
						
							
							core/umat: usage flags (with proposals from PR  #2195 )  
						
						
						
						
					 
					
						2014-02-14 15:40:16 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						91ca834be9 
					 
					
						
						
							
							bug fix for issue 3470  
						
						
						
						
					 
					
						2014-02-03 14:46:22 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						9dfb96389c 
					 
					
						
						
							
							Merge commit '4b885e206' into merge-2.4  
						
						
						
						
					 
					
						2013-12-30 16:48:45 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						f9aa148ba9 
					 
					
						
						
							
							eliminating VS2013 build warnings  
						
						
						
						
					 
					
						2013-12-26 13:35:59 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						6da5d21331 
					 
					
						
						
							
							fixed many bugs related to Mat::getUMat(), asynchronous kernel execution etc. Also, played a bit with ocl::cvtColor vs cv::cvtColor performance  
						
						
						
						
					 
					
						2013-12-01 03:12:19 +04:00 
						 
				 
			
				
					
						
							
							
								Michael Pratt 
							
						 
					 
					
						
						
							
						
						8aafd569c8 
					 
					
						
						
							
							Support PyString_AsString() in Python 3 < 3.3  
						
						... 
						
						
						
						In Python 3, version 3.3+, PyUnicode_AsUTF8() provides similar
functionality to Python 2's PyString_AsString().
In older versions of Python 3, there is no public function to provide
the same functionality.  However, the "internal" _PyUnicode_AsString()
does provide that functionality, so use it to replace
PyString_AsString().
With this patch, cv2 should compile for Python 3.[0-2]. 
						
						
					 
					
						2013-11-07 23:47:33 -05:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						e14171fd33 
					 
					
						
						
							
							fixed crash in Python bindings  
						
						
						
						
					 
					
						2013-10-24 17:37:33 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						303df78cca 
					 
					
						
						
							
							removed refcount field from Mat; that helped to find and eliminate some memory leaks. perf tests should probably pass now  
						
						
						
						
					 
					
						2013-10-24 16:08:15 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						de521fc9fa 
					 
					
						
						
							
							fixed some more compile bugs (including Python bindings)  
						
						
						
						
					 
					
						2013-10-22 23:34:16 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						1ac1b9ae35 
					 
					
						
						
							
							Merge pull request  #1474  from f-morozov:for_pr  
						
						
						
						
					 
					
						2013-10-02 11:49:54 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						851a8a1cd0 
					 
					
						
						
							
							fixed whitespace error  
						
						
						
						
					 
					
						2013-09-30 14:31:39 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						f0b050fa88 
					 
					
						
						
							
							exposed LineSegemntDetector to python  
						
						
						
						
					 
					
						2013-09-30 14:30:00 +04:00 
						 
				 
			
				
					
						
							
							
								Fedor Morozov 
							
						 
					 
					
						
						
							
						
						c9ace38897 
					 
					
						
						
							
							Docs updated, added InputArray, fixes for makePtr,...  
						
						
						
						
					 
					
						2013-09-26 19:02:35 +04:00 
						 
				 
			
				
					
						
							
							
								Fedor Morozov 
							
						 
					 
					
						
						
							
						
						f99be6bda6 
					 
					
						
						
							
							Mergin itseez  
						
						
						
						
					 
					
						2013-09-18 18:55:12 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						79d51c3398 
					 
					
						
						
							
							expose findEssentialMat, decomposeEssentialMat and recoverPose to Python  
						
						
						
						
					 
					
						2013-09-09 14:02:05 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						dadee3752c 
					 
					
						
						
							
							Adapt Python bindings to the new Ptr.  
						
						
						
						
					 
					
						2013-09-05 19:03:00 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Shishkov 
							
						 
					 
					
						
						
							
						
						924f7ce373 
					 
					
						
						
							
							small changes for compilation  
						
						
						
						
					 
					
						2013-09-03 14:05:14 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						e9a28f66ee 
					 
					
						
						
							
							Normalized file endings.  
						
						
						
						
					 
					
						2013-08-21 18:59:25 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						f55740da70 
					 
					
						
						
							
							Deleted all trailing whitespace.  
						
						
						
						
					 
					
						2013-08-21 18:59:24 +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 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						bcba3fc6b8 
					 
					
						
						
							
							Merge pull request  #1263  from abidrahmank:pyCLAHE_24  
						
						
						
						
					 
					
						2013-08-14 12:10:22 +04:00 
						 
				 
			
				
					
						
							
							
								abidrahmank 
							
						 
					 
					
						
						
							
						
						96c1df14f4 
					 
					
						
						
							
							CLAHE Python bindings  
						
						
						
						
					 
					
						2013-08-13 19:51:32 +05:30 
						 
				 
			
				
					
						
							
							
								Alexander Shishkov 
							
						 
					 
					
						
						
							
						
						c4fb0e9dbb 
					 
					
						
						
							
							few changes for compilation  
						
						
						
						
					 
					
						2013-08-06 15:41:32 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Shishkov 
							
						 
					 
					
						
						
							
						
						6df203c449 
					 
					
						
						
							
							Fixes for Linux compilation, small changes  
						
						
						
						
					 
					
						2013-08-03 01:45:20 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						25b9ac18e6 
					 
					
						
						
							
							fixed Bug  #3143  - flann 'not implemented' error  
						
						
						
						
					 
					
						2013-07-26 17:59:38 +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 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						28a5c127ea 
					 
					
						
						
							
							Made the Python bindings not use deprecated NumPy 1.7 API.  
						
						
						
						
					 
					
						2013-07-16 14:33:15 +04:00 
						 
				 
			
				
					
						
							
							
								abidrahmank 
							
						 
					 
					
						
						
							
						
						5d863f7516 
					 
					
						
						
							
							drawMatches python bindings  
						
						
						
						
					 
					
						2013-07-11 09:28:37 +05:30 
						 
				 
			
				
					
						
							
							
								Gabe Schwartz 
							
						 
					 
					
						
						
							
						
						bb209193c9 
					 
					
						
						
							
							Updated usage of METH_X definitions for python 3.  
						
						... 
						
						
						
						Python 3 requires METH_VARARGS | METH_KEYWORDS, not just METH_KEYWORDS. 
						
						
					 
					
						2013-06-13 20:10:01 -04:00 
						 
				 
			
				
					
						
							
							
								Gabe Schwartz 
							
						 
					 
					
						
						
							
						
						fb9781b97b 
					 
					
						
						
							
							Updated cv2.cpp to support Python 3 API.  
						
						... 
						
						
						
						Added a header with defines to enable the module to compile with either
python 2 or 3 without changes. 
						
						
					 
					
						2013-06-13 20:10:01 -04:00 
						 
				 
			
				
					
						
							
							
								Gabe Schwartz 
							
						 
					 
					
						
						
							
						
						931ebab822 
					 
					
						
						
							
							Updated generator and parser to support Python 3.  
						
						
						
						
					 
					
						2013-06-13 18:39:47 -04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						b8ed00bd64 
					 
					
						
						
							
							Compile OpenCV with GCC visibility set to hidden  
						
						
						
						
					 
					
						2013-05-13 18:33:20 +04:00 
						 
				 
			
				
					
						
							
							
								Egbert van der Wal 
							
						 
					 
					
						
						
							
						
						dc6a144396 
					 
					
						
						
							
							add (optional) index argument to RetrieveFrame method  
						
						
						
						
					 
					
						2013-05-04 17:18:12 +02:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						298ccf6487 
					 
					
						
						
							
							Turn pyopencv_to and pyopencv_from into templates  
						
						... 
						
						
						
						This protects from unwanted implicit conversions between types at compile time. 
						
						
					 
					
						2013-04-13 01:02:57 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						f886651cf0 
					 
					
						
						
							
							Drop old python samples and tests  
						
						
						
						
					 
					
						2013-04-12 19:37:40 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						b2ba8b9969 
					 
					
						
						
							
							Drop old python interface  
						
						
						
						
					 
					
						2013-04-12 19:37:40 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						3b364330ad 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2013-04-12 15:35:38 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						5e048d1fa5 
					 
					
						
						
							
							Move C API of opencv_objdetect to separate file  
						
						... 
						
						
						
						Also move cv::linemod to own header 
						
						
					 
					
						2013-04-12 14:37:01 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						57d4c86b2b 
					 
					
						
						
							
							Fixed the shebang lines on the Python scripts.  
						
						... 
						
						
						
						Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script. 
						
						
					 
					
						2013-04-11 18:37:23 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						199a35a105 
					 
					
						
						
							
							Move C API of opencv_video to separate file  
						
						
						
						
					 
					
						2013-04-11 17:38:33 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						b0e6606b98 
					 
					
						
						
							
							Cleanup core module API  
						
						... 
						
						
						
						* Drop some low level API
* Remove outdated overloads
* Utilize Input/OutputArray 
						
						
					 
					
						2013-04-09 13:36:32 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						69648f0a6f 
					 
					
						
						
							
							Make photo.hpp independent from C API  
						
						
						
						
					 
					
						2013-04-08 15:47:29 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						0738ea7d0f 
					 
					
						
						
							
							Make highgui.hpp independent from C API  
						
						
						
						
					 
					
						2013-04-08 15:47:29 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						67073daf19 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2013-04-05 21:11:59 +04:00 
						 
				 
			
				
					
						
							
							
								Dustin Spicuzza 
							
						 
					 
					
						
						
							
						
						64b5784c0b 
					 
					
						
						
							
							Catch exceptions when large allocations fail  
						
						
						
						
					 
					
						2013-04-05 00:43:10 -04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						75ea10e6ff 
					 
					
						
						
							
							fix for  #2806  (missing 'nu03' field of moments)  
						
						
						
						
					 
					
						2013-04-02 12:14:43 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						715fa3303e 
					 
					
						
						
							
							Move cv::Mat out of core.hpp  
						
						
						
						
					 
					
						2013-04-01 15:24:34 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						5e7ab8baf3 
					 
					
						
						
							
							Move cv::Scalar_ to types.hpp  
						
						
						
						
					 
					
						2013-04-01 15:24:33 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						20534c9beb 
					 
					
						
						
							
							Merge pull request  #692  from vpisarev:refactor_calib3d_stereo  
						
						
						
						
					 
					
						2013-03-26 18:38:16 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						44157c421f 
					 
					
						
						
							
							fixed python test failures (modified stereo correspondence test to use cv2.* stuff), fixed docs  
						
						
						
						
					 
					
						2013-03-25 00:42:46 +04:00