Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						7f542e391a 
					 
					
						
						
							
							Merge branch 2.4  
						
						... 
						
						
						
						Conflicts:
	android/service/engine/AndroidManifest.xml - use file from 2.4
	modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
	modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4 
						
						
					 
					
						2012-11-20 19:12:00 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						04481d9ef4 
					 
					
						
						
							
							Fix Android build with clang compiler  
						
						
						
						
					 
					
						2012-11-20 15:20:04 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						9719ea93b6 
					 
					
						
						
							
							Merge branch 2.4  
						
						
						
						
					 
					
						2012-11-13 19:54:48 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						afff9cf716 
					 
					
						
						
							
							Optimized buffers reuse in gpu module:  
						
						... 
						
						
						
						ensureSizeIsEnough now doesn't reallocate memory, if buffer is small submat of big matrix
fixed createContinous according new changes 
						
						
					 
					
						2012-11-12 10:30:35 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						e5ffbf9498 
					 
					
						
						
							
							Fix stream output operator for Vec<uchar,n>  
						
						... 
						
						
						
						This fixes output for 8U and 8S vector depths.
They were mistakenly printed as characters instead of numbers. 
						
						
					 
					
						2012-11-09 09:54:43 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						4d059e9e5b 
					 
					
						
						
							
							Merge release 2.4.3  
						
						
						
						
					 
					
						2012-11-02 17:58:02 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						9a08b7be45 
					 
					
						
						
							
							fixed compile problem with the old Xcode (<4.5)  
						
						
						
						
					 
					
						2012-11-02 15:29:16 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						4a2f626d85 
					 
					
						
						
							
							Remove "-rc" suffix from version  
						
						
						
						
					 
					
						2012-11-02 14:27:34 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						09dec4e873 
					 
					
						
						
							
							Merge pull request  #124  from branch taka-no-me:vs8-vs9-tbb  
						
						
						
						
					 
					
						2012-11-01 19:26:30 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						d9d4e8df6f 
					 
					
						
						
							
							fixed bugs  #2300  (Vector::dot) and  #2467  (build with Xcode 4.5 with --stdlib=libc++)  
						
						
						
						
					 
					
						2012-11-01 16:37:39 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						fd4909360f 
					 
					
						
						
							
							Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library.  
						
						
						
						
					 
					
						2012-11-01 12:44:10 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						729d76ad09 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2012-10-25 15:32:48 +04:00 
						 
				 
			
				
					
						
							
							
								LeonidBeynenson 
							
						 
					 
					
						
						
							
						
						d6aa3bd8ed 
					 
					
						
						
							
							Made changes in cv::Algorithm  
						
						... 
						
						
						
						made it to give more verbose errors when arguments of wrong types are passed, added setters with types (e.g. setInt, etc) 
						
						
					 
					
						2012-10-23 21:37:27 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						8dbde3297e 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2012-10-23 20:32:19 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						6f08d03322 
					 
					
						
						
							
							Advance version number to 2.4.3-rc  
						
						
						
						
					 
					
						2012-10-23 17:59:59 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						40030d2ca0 
					 
					
						
						
							
							Fix windows build warnings  
						
						
						
						
					 
					
						2012-10-22 19:13:18 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						57775988e7 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2012-10-22 16:57:56 +04:00 
						 
				 
			
				
					
						
							
							
								Kazuki MATSUDA 
							
						 
					 
					
						
						
							
						
						72c93dabd3 
					 
					
						
						
							
							Add stream operators (Requested  #2430 )  
						
						... 
						
						
						
						Add output stream operators (<<) for Rect, Size, Matx, Vec.
I can't add operations for cv::KeyPoint.
And putting together all operator<<.
(Matx, Point_, Point3_, Vec, Size_, Rect_) 
						
						
					 
					
						2012-10-20 11:19:42 +09: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 
							
						 
					 
					
						
						
							
						
						0442bca235 
					 
					
						
						
							
							Revert "partially recovered binary compatibility (ticket  #2415 )"  
						
						... 
						
						
						
						This reverts commit 94b97b7a63 
						
						
					 
					
						2012-10-16 19:37:12 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						18ab16dbd3 
					 
					
						
						
							
							Revert "some more fixes towards binary compatibility"  
						
						... 
						
						
						
						This reverts commit a8c5e35619 
						
						
					 
					
						2012-10-16 19:35:28 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						ebac3a02aa 
					 
					
						
						
							
							Fix backward compatibility of opencv_core  
						
						
						
						
					 
					
						2012-10-16 15:13:00 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						58f31819cc 
					 
					
						
						
							
							Return drawContours back to imgproc  
						
						... 
						
						
						
						This partly reverts commit 6ca618277c 
						
						
					 
					
						2012-10-15 18:12:33 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						a3b1971977 
					 
					
						
						
							
							Bring back escaped virtual destructors from 2.4.2  
						
						
						
						
					 
					
						2012-10-15 17:48:49 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						8441cf700d 
					 
					
						
						
							
							added function cv::findNonZero (patch  #2205 )  
						
						
						
						
					 
					
						2012-10-11 22:52:15 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						354a5f2686 
					 
					
						
						
							
							added recommended number of stripes to parallel_for_, modified some of the functions to use larger stripes (for better performance)  
						
						
						
						
					 
					
						2012-10-11 22:37:14 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						7ee6040192 
					 
					
						
						
							
							enable Matx as Mat elements (bug  #1705 ).  
						
						
						
						
					 
					
						2012-10-11 15:02:48 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						a135e862c1 
					 
					
						
						
							
							made opencv headers windows.h-less (Bug  #2122 )  
						
						
						
						
					 
					
						2012-10-09 17:12:42 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						a8c5e35619 
					 
					
						
						
							
							some more fixes towards binary compatibility  
						
						
						
						
					 
					
						2012-10-09 15:56:16 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						4be7619ce4 
					 
					
						
						
							
							_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3  
						
						
						
						
					 
					
						2012-10-08 21:37:15 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						94b97b7a63 
					 
					
						
						
							
							partially recovered binary compatibility (ticket  #2415 )  
						
						
						
						
					 
					
						2012-10-08 17:06:05 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						11367e2c3d 
					 
					
						
						
							
							added GpuMat support to OutputArray  
						
						
						
						
					 
					
						2012-10-02 14:34:17 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						f32eb05ea1 
					 
					
						
						
							
							Fix AVX and other SIMD support detection  
						
						
						
						
					 
					
						2012-09-17 13:30:28 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						0598f33a85 
					 
					
						
						
							
							refactored command line parser, fixed the docs  
						
						
						
						
					 
					
						2012-09-07 17:44:01 +04:00 
						 
				 
			
				
					
						
							
							
								AoD314 
							
						 
					 
					
						
						
							
						
						54a202b3d5 
					 
					
						
						
							
							add new version of CommandLineParser. add empty docs  
						
						
						
						
					 
					
						2012-09-07 13:24:48 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						bcd0aefbca 
					 
					
						
						
							
							Fix gcc build errors and warnings  
						
						
						
						
					 
					
						2012-09-05 15:51:51 +04:00 
						 
				 
			
				
					
						
							
							
								Kevin 
							
						 
					 
					
						
						
							
						
						93155c6ae0 
					 
					
						
						
							
							Overloaded PCA constructor and ( ) operator to implement Feature#2287 - PCA that retains a specified amount of variance from the data. A sample was added to samples/cpp to demonstrate the new functionality. Docs and Tests were also updated  
						
						
						
						
					 
					
						2012-09-04 13:58:59 +04:00 
						 
				 
			
				
					
						
							
							
								Vincent Rabaud 
							
						 
					 
					
						
						
							
						
						f56432559e 
					 
					
						
						
							
							add conversion from/to Matx  
						
						
						
						
					 
					
						2012-08-28 15:13:41 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						0bd68a70f1 
					 
					
						
						
							
							fixed   #2297 ,  #2300 ; fixed several warnings  
						
						
						
						
					 
					
						2012-08-28 13:45:35 +04:00 
						 
				 
			
				
					
						
							
							
								Anatoly Baksheev 
							
						 
					 
					
						
						
							
						
						70204a8e68 
					 
					
						
						
							
							Removed PtrElemStep, Marked DevMem1D as deprecated, now should use PtrStepSz now  
						
						
						
						
					 
					
						2012-08-24 02:02:42 +04:00 
						 
				 
			
				
					
						
							
							
								Vincent Rabaud 
							
						 
					 
					
						
						
							
						
						1baf5209c4 
					 
					
						
						
							
							fix the compile bug  
						
						
						
						
					 
					
						2012-08-23 14:20:31 +02:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						da5aaab277 
					 
					
						
						
							
							optimized gpu::integral for Kepler  
						
						
						
						
					 
					
						2012-08-22 12:13:34 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						8efb84b5a4 
					 
					
						
						
							
							added ios camera support in highgui. turned on optimization in opencv2.framework (ticket  #2232 )  
						
						
						
						
					 
					
						2012-08-20 19:36:36 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						41b6d25bdd 
					 
					
						
						
							
							added cross-platform Mutex implementation; enable platform-native (GDC/Concurrency) parallel_for_ implementation when TBB is not installed.  
						
						
						
						
					 
					
						2012-08-17 17:32:06 +04:00 
						 
				 
			
				
					
						
							
							
								Vladislav Vinogradov 
							
						 
					 
					
						
						
							
						
						7928cec670 
					 
					
						
						
							
							added linesAccumGlobal kernel  
						
						
						
						
					 
					
						2012-08-15 13:18:35 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintesv 
							
						 
					 
					
						
						
							
						
						a2df490914 
					 
					
						
						
							
							added CV_IN_OUT to img argument of drawing functions  
						
						
						
						
					 
					
						2012-08-08 11:18:52 +03:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						310b1ad7b9 
					 
					
						
						
							
							moved parallel_for_ and ParallelLoopBody to core.hpp  
						
						
						
						
					 
					
						2012-08-03 16:41:00 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						fd9069422a 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						
						
						
					 
					
						2012-08-03 16:14:38 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						27c2aa3a4e 
					 
					
						
						
							
							parallel version of bilateral filter was implemented using parallel_for_  
						
						
						
						
					 
					
						2012-08-02 16:25:30 +04:00