20 Commits

Author	SHA1	Message	Date
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
Alexander Smorkalov	4703f4552a	Experimental MS Media Foundation API support added	2013-04-02 18:10:55 -07:00
Andrey Kamaev	517062039e	Make core/internal.hpp a private header	2013-04-01 17:29:10 +04:00
Alexander Smorkalov	09bc99a0c0	HAVE_WIN32UI and HAVE_VFW checks and defines added.	2013-03-27 08:03:51 -07:00
Alexander Smorkalov	de95a2b278	Video IO tests turned off for ARM WinRT.	2013-03-27 00:45:41 -07:00
Andrey Kamaev	89356ff16d	Move non-CV functionality from core.hpp to separate utility.hpp header	2013-03-20 17:56:06 +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
Alexander Smorkalov	75191e8f2f	Smartek Giganetix Cameras support (Patch #2192) integrated to master.	2013-02-01 16:54:00 +04:00
Andrey Kamaev	00fbf58902	Revert incompletely applied patch from #2192 ... This reverts commit 2e7656dbdf.	2012-12-03 09:55:53 +04:00
Andrey Kamaev	a126532cb7	Fix OS X build warnings	2012-11-09 11:29:52 +04:00
marina.kolpakova	7a5b9a6b7f	replase __APPLE__ marco with __clang__	2012-11-01 19:34:05 +04:00
Andrey Kamaev	2b0072d823	Suppress more warnings in gtest on OS X	2012-10-24 20:36:30 +04:00
Evgeny Talanin	2e7656dbdf	#2192 patch apply	2012-10-12 13:03:43 +04:00
Andrey Kamaev	e900952b87	quiet most of the OSX build warnings	2012-07-05 12:56:31 +00:00
Andrey Kamaev	47a4e87784	Ignored warnings from gtest with precompiled headers enabled	2012-06-08 14:54:17 +00:00
Vadim Pisarevsky	d5a0088bbe	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
Andrey Kamaev	4168a698f6	Fixed highgui tests for Android	2011-12-20 07:45:49 +00:00
Vadim Pisarevsky	bf05872929	added opencv_test_highgui	2011-06-01 14:23:55 +00:00
Vadim Pisarevsky	061b49e0b2	reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine.	2011-02-09 20:55:11 +00:00