Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						068769263e 
					 
					
						
						
							
							fixed compilation warning  
						
						
						
						
					 
					
						2016-02-12 18:12:20 +03:00 
						 
				 
			
				
					
						
							
							
								takacsd 
							
						 
					 
					
						
						
							
						
						537d1322b4 
					 
					
						
						
							
							Add missing implementation to one of the Mat_<_Tp> constructor. ( #5945 )  
						
						
						
						
					 
					
						2016-01-11 16:05:22 +01:00 
						 
				 
			
				
					
						
							
							
								Maksim Shabunin 
							
						 
					 
					
						
						
							
						
						7cb78451d1 
					 
					
						
						
							
							Backported several changes from master branch:  
						
						... 
						
						
						
						- #3771  - inline round on ARM
- #5633  - documentation for MSER
- #5666  - run.py fixes 
						
						
					 
					
						2015-12-21 18:20:37 +03:00 
						 
				 
			
				
					
						
							
							
								StevenPuttemans 
							
						 
					 
					
						
						
							
						
						406cfc48c9 
					 
					
						
						
							
							adding markers to OpenCV for 2.4 branch  
						
						
						
						
					 
					
						2015-10-01 16:08:25 +02:00 
						 
				 
			
				
					
						
							
							
								a-andre 
							
						 
					 
					
						
						
							
						
						b757359ff8 
					 
					
						
						
							
							fix documentation builder warnings  
						
						
						
						
					 
					
						2015-08-18 18:48:32 +02:00 
						 
				 
			
				
					
						
							
							
								Evgeny Talanin 
							
						 
					 
					
						
						
							
						
						ac6ca660f4 
					 
					
						
						
							
							Increase version to 2.4.12  
						
						
						
						
					 
					
						2015-07-29 20:34:47 +03:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						96e5300fdd 
					 
					
						
						
							
							OpenCV and OpenCV Manager version++  
						
						
						
						
					 
					
						2015-02-20 15:17:11 +03:00 
						 
				 
			
				
					
						
							
							
								Thomas Gabrowski 
							
						 
					 
					
						
						
							
						
						ff4c42d182 
					 
					
						
						
							
							Fix iOS warnings about implicit conversion precision by changing double literals to float ones  
						
						
						
						
					 
					
						2015-02-13 00:51:03 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						a5969aec96 
					 
					
						
						
							
							Merge pull request  #3534  from taka-no-me:build_fixes  
						
						
						
						
					 
					
						2014-12-26 14:34:13 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						c105b72945 
					 
					
						
						
							
							Assorted fixes:  
						
						... 
						
						
						
						* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings 
						
						
					 
					
						2014-12-25 12:41:16 +03:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						20d957d212 
					 
					
						
						
							
							Merge pull request  #3511  from mattip:2.4  
						
						
						
						
					 
					
						2014-12-22 10:41:21 +00:00 
						 
				 
			
				
					
						
							
							
								Maksim Shabunin 
							
						 
					 
					
						
						
							
						
						91e21847e2 
					 
					
						
						
							
							Some changes to make migration to 3.0 easier  
						
						
						
						
					 
					
						2014-12-16 13:00:31 +03:00 
						 
				 
			
				
					
						
							
							
								mattip 
							
						 
					 
					
						
						
							
						
						ff7ea605ef 
					 
					
						
						
							
							export thread control to generated wrappers  
						
						
						
						
					 
					
						2014-12-14 11:55:02 +02:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						b476bf2a00 
					 
					
						
						
							
							Merge pull request  #3294  from mshabunin:fix-ios-warnings-24  
						
						
						
						
					 
					
						2014-11-05 11:35:19 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						529af7a90e 
					 
					
						
						
							
							Merge pull request  #3364  from mshabunin:doxygen-docs-24  
						
						
						
						
					 
					
						2014-10-30 10:42:25 +00:00 
						 
				 
			
				
					
						
							
							
								Maksim Shabunin 
							
						 
					 
					
						
						
							
						
						09fb7512ed 
					 
					
						
						
							
							Fixed iOS framework compilation warnings  
						
						
						
						
					 
					
						2014-10-27 15:28:21 +03:00 
						 
				 
			
				
					
						
							
							
								Maksim Shabunin 
							
						 
					 
					
						
						
							
						
						9b55c09999 
					 
					
						
						
							
							Basic doxygen documentation support  
						
						... 
						
						
						
						- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
Conflicts:
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/core/include/opencv2/core.hpp
	modules/core/include/opencv2/core/base.hpp
	modules/core/include/opencv2/core/cuda.inl.hpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/include/opencv2/core/matx.hpp
	modules/core/include/opencv2/core/types.hpp
	modules/flann/include/opencv2/flann/lsh_table.h
	modules/imgproc/include/opencv2/imgproc.hpp 
						
						
					 
					
						2014-10-23 18:27:26 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						6bb6039ebb 
					 
					
						
						
							
							Fixes for QNX 6.6 Neitrino support.  
						
						
						
						
					 
					
						2014-10-23 17:17:35 +04:00 
						 
				 
			
				
					
						
							
							
								bhack 
							
						 
					 
					
						
						
							
						
						32f6e1a554 
					 
					
						
						
							
							Fix for bug  #3469  CV_XADD failing in clang+nvcc combination  
						
						... 
						
						
						
						Taken from 3f07655231 
						
						
					 
					
						2014-09-23 12:39:16 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						343f4b3026 
					 
					
						
						
							
							OpenCV version++.  
						
						
						
						
					 
					
						2014-09-15 14:55:25 +04:00 
						 
				 
			
				
					
						
							
							
								PhilLab 
							
						 
					 
					
						
						
							
						
						efc1c39315 
					 
					
						
						
							
							Fixed self-assignment in cv::Ptr::operator =  
						
						... 
						
						
						
						A self-assignment leads to a call of release() with refcount being 2. In the release() method, refcount is decremented and then successfully checked for being 1. As a consequence, the underlying data is released. To prevent this, we test for a self-assignment 
						
						
					 
					
						2014-08-08 17:39:12 +02:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						fc41e8850b 
					 
					
						
						
							
							Merge pull request  #2836  from s98felix:2.4  
						
						
						
						
					 
					
						2014-07-25 12:59:41 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						e90c233551 
					 
					
						
						
							
							Merge pull request  #2984  from cambyse:2.4  
						
						
						
						
					 
					
						2014-07-18 10:05:22 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						39020fc9cf 
					 
					
						
						
							
							Merge pull request  #2898  from PhilLab:2.4  
						
						
						
						
					 
					
						2014-07-18 09:26:50 +00:00 
						 
				 
			
				
					
						
							
							
								Camille 
							
						 
					 
					
						
						
							
						
						5a5a487612 
					 
					
						
						
							
							bug fix 3381  
						
						
						
						
					 
					
						2014-07-18 00:06:31 +02:00 
						 
				 
			
				
					
						
							
							
								Camille 
							
						 
					 
					
						
						
							
						
						46775ad186 
					 
					
						
						
							
							bug fix 3381  
						
						
						
						
					 
					
						2014-07-17 22:57:31 +02:00 
						 
				 
			
				
					
						
							
							
								unknown 
							
						 
					 
					
						
						
							
						
						d0c3c4c373 
					 
					
						
						
							
							Function for drawing arrows  
						
						
						
						
					 
					
						2014-07-15 14:12:16 +02:00 
						 
				 
			
				
					
						
							
							
								Richard Yoo 
							
						 
					 
					
						
						
							
						
						c38023f4e7 
					 
					
						
						
							
							Modifications to support dynamic vector dispatch.  
						
						
						
						
					 
					
						2014-07-09 16:55:39 -07:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						ebb0255e19 
					 
					
						
						
							
							Remove a couple of useless casts in core headers  
						
						... 
						
						
						
						This helps users who compile their code with -Wuseless-cast. 
						
						
					 
					
						2014-06-30 16:12:04 +04:00 
						 
				 
			
				
					
						
							
							
								unknown 
							
						 
					 
					
						
						
							
						
						ade46bd428 
					 
					
						
						
							
							Fixed typos in comments  
						
						
						
						
					 
					
						2014-06-26 16:29:45 +02:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						436342d5f4 
					 
					
						
						
							
							Merge pull request  #2880  from GravityJack:SparseMatIterator-build-fix  
						
						
						
						
					 
					
						2014-06-25 16:32:18 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						b21b8ff9d7 
					 
					
						
						
							
							Merge pull request  #2891  from nisargthakkar:dims_zero_on_release  
						
						
						
						
					 
					
						2014-06-25 16:27:33 +04:00 
						 
				 
			
				
					
						
							
							
								Nisarg Thakkar 
							
						 
					 
					
						
						
							
						
						98421e5970 
					 
					
						
						
							
							Fix for Bug#3757: All dimension values are 0 after release is called  
						
						
						
						
					 
					
						2014-06-23 20:15:23 +05:30 
						 
				 
			
				
					
						
							
							
								Marc Rollins 
							
						 
					 
					
						
						
							
						
						05e0b3b7e6 
					 
					
						
						
							
							Fixing build error when using post-increment operator.  
						
						
						
						
					 
					
						2014-06-19 14:14:10 -07:00 
						 
				 
			
				
					
						
							
							
								Richard Yoo 
							
						 
					 
					
						
						
							
						
						11a09ef5cc 
					 
					
						
						
							
							Changes to support Intel AVX/AVX2 in cvResize().  
						
						
						
						
					 
					
						2014-06-06 15:39:09 -07:00 
						 
				 
			
				
					
						
							
							
								StevenPuttemans 
							
						 
					 
					
						
						
							
						
						006956c324 
					 
					
						
						
							
							Fixing as suggested in bug 2626, made naming same for both C, C++ and python API  
						
						
						
						
					 
					
						2014-05-13 11:02:01 +02:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						19a2495067 
					 
					
						
						
							
							fixed IPP related warnings  
						
						
						
						
					 
					
						2014-05-08 13:31:27 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						e23f7303a6 
					 
					
						
						
							
							OpenCV version++. OpenCV Manager version++.  
						
						
						
						
					 
					
						2014-03-31 15:00:25 -07:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						099ea91823 
					 
					
						
						
							
							typos  
						
						
						
						
					 
					
						2014-03-04 12:47:40 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						510680a5df 
					 
					
						
						
							
							typo  
						
						
						
						
					 
					
						2014-02-16 01:42:02 +04:00 
						 
				 
			
				
					
						
							
							
								Anatoly Baksheev 
							
						 
					 
					
						
						
							
						
						02ebc4368c 
					 
					
						
						
							
							Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style  
						
						
						
						
					 
					
						2014-01-20 22:51:33 +04:00 
						 
				 
			
				
					
						
							
							
								Kazuki Matsuda 
							
						 
					 
					
						
						
							
						
						2ae20c74a2 
					 
					
						
						
							
							Fix typo of SparseMat_<_Tp>::SparseMat_(const SparseMat& m)  
						
						... 
						
						
						
						Fix compilation erros when compiling this constructor.
First argument type of "convertTo" should be instance, not a pointer of instance.
First pull request was created for master branch.
But it should be marged for 2.4.
https://github.com/Itseez/opencv/pull/2113  
						
						
					 
					
						2014-01-06 02:24:14 +09:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						4ec1930949 
					 
					
						
						
							
							OpenCV version++; OpenCV Manager version++.  
						
						
						
						
					 
					
						2013-12-23 12:35:06 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						a118577a57 
					 
					
						
						
							
							core: added TLS support  
						
						
						
						
					 
					
						2013-12-11 18:50:11 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						f2cf9dd8bf 
					 
					
						
						
							
							updating version to 2.4.7.2  
						
						
						
						
					 
					
						2013-12-06 16:21:22 +04:00 
						 
				 
			
				
					
						
							
							
								Séverin Lemaignan 
							
						 
					 
					
						
						
							
						
						9ce9fc3361 
					 
					
						
						
							
							Ensure compilation to Javascript with Emscripten  
						
						
						
						
					 
					
						2013-12-03 09:18:59 +01:00 
						 
				 
			
				
					
						
							
							
								Anatoly Baksheev 
							
						 
					 
					
						
						
							
						
						8f6f9c3e58 
					 
					
						
						
							
							compilation for VS2008  
						
						
						
						
					 
					
						2013-11-16 20:14:01 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						2c38be079e 
					 
					
						
						
							
							Enabled CV_Assert and such to print the function name with Visual C++.  
						
						... 
						
						
						
						Also, I made a separate macro for the current function name, which
helps simplify a lot of code that uses it. 
						
						
					 
					
						2013-11-07 17:22:02 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						f027cf80f7 
					 
					
						
						
							
							OpenCV Version++. OpenCV Manager Version++.  
						
						
						
						
					 
					
						2013-11-01 15:22:34 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						578e984739 
					 
					
						
						
							
							Merge tag '2.4.6.2' into 2.4  
						
						... 
						
						
						
						OpenCV 2.4.6.2 (Tegra detection and native camera update) 
						
						
					 
					
						2013-10-17 17:19:04 +04:00