| 
							
							
								 Nicolas Gryman | da34f1d58c | added jpeg with optimized coding support. | 2014-03-27 13:34:33 -04:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | d67b450741 | Merge pull request #2378 from ngryman:progressive_jpeg | 2014-03-26 12:12:02 +04:00 |  | 
			
				
					| 
							
							
								 Nicolas Gryman | b211e1d989 | added jpeg progressive support. | 2014-03-25 15:27:24 -04:00 |  | 
			
				
					| 
							
							
								 vbystricky | 193e97a34a | Move declaration of IVideoCapture class into precomp.hpp, make some methods of IVideoCapture pure virtual | 2014-03-07 16:25:15 +04:00 |  | 
			
				
					| 
							
							
								 vbystricky | ff8b8ef24c | Remove implementation of CvCapture interface for Intel PerC camera. Add IVideoCapture interface and implementation of this one for Intel PerC camera | 2014-02-25 10:59:35 +04:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | ccbceb56c4 | Merge pull request #2144 from nickdademo:pvapi_framestarttriggermode | 2014-02-19 14:48:57 +04:00 |  | 
			
				
					| 
							
							
								 Nick D'Ademo | 75b80e5d7d | Added missing comma in enum. | 2014-01-16 20:17:49 +11:00 |  | 
			
				
					| 
							
							
								 Adi Shavit | 24333569aa | Small fixes: typo, spacing and using ::ScreenToClient() instead of ::GetWindowRect() | 2014-01-16 11:09:25 +02:00 |  | 
			
				
					| 
							
							
								 Adi Shavit | e45cf2173f | [HighGUI] Updated mouse wheel delta to reside within the 'flags' variable. Updated C++ API. | 2014-01-14 21:33:32 +02:00 |  | 
			
				
					| 
							
							
								 Nick D'Ademo | 25870fa66b | Added PVAPI enums to highgui.hpp Added "PVAPI_" prefix to FrameStartTriggerMode definition | 2014-01-14 21:38:57 +11:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | 3c4b24d531 | Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp | 2013-12-23 18:50:17 +04:00 |  | 
			
				
					| 
							
							
								 Vadim Pisarevsky | d914f20a4c | updated patch to bring in the first functions with "transparent API" | 2013-11-18 11:48:00 -05:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | beeb932d22 | Boring changes - highgui. | 2013-09-05 18:26:43 +04:00 |  | 
			
				
					| 
							
							
								 Vladislav Vinogradov | 2fae1d9507 | removed ogl::Texture2D support from InputArray | 2013-06-10 12:40:30 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | b8ed00bd64 | Compile OpenCV with GCC visibility set to hidden | 2013-05-13 18:33:20 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 0738ea7d0f | Make highgui.hpp independent from C API | 2013-04-08 15:47:29 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 2b1ef95415 | Completely separate C and C++ API of OpenCV core | 2013-04-01 15:24:34 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | be7bbe3aa9 | Drop cv:: prefix from cv::String used inside the cv namespace | 2013-03-22 22:14:50 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 762aefd71b | Compile opencv_test_core with cv::String instead of std::string All tests passed! | 2013-03-22 22:14:22 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | ad5cddc007 | Main module headers are moved 1 level up e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp> | 2013-03-13 17:26:56 +04:00 |  |