11 Commits

Author	SHA1	Message	Date
Vitaly Tuzov	b0b2d8de44	Remove unused code	2018-04-24 12:13:19 +03:00
Vitaly Tuzov	65c46d0cc6	Removed WINRT related code	2018-04-23 17:04:53 +03:00
Alexander Alekhin	d2d9fd6945	build: fix MSVS build problems ... with 'CL=/permissive-'	2018-04-10 14:50:56 +03:00
Tomoaki Teshima	fe7b3f1228	clean up the code ... * disable the warning in CMake, not int the code using pragma	2017-12-22 08:42:21 +09:00
Gregory Morse	af5bec70cd	merge Win10/VS2015 changes	2015-12-17 21:15:59 +01:00
Roman Donchenko	5455e38e15	cap_msmf.hpp: fix a warning about nNull being unused ... The two functions featuring nNull are not particularly needed, so I simply removed them. Conflicts: modules/highgui/src/cap_msmf.hpp	2015-04-25 18:54:54 +02:00
Maxim Kostin	cdd23440c9	Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1 ... - Substituted HAVE_WINRT with WINRT - Fixed compilation issues in ocl.cpp and parallel.cpp - Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore - Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp - Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c; - Added ole32.lib for core module (for WindowsStore 8.0 builds) - Made OpenCV_ARCH aware of ARM Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>	2015-03-02 22:26:43 +03:00
Artur Wieczorek	3a0b375104	Remove ATL dependency from MSMF capture code. ... Use _com_ptr_t instead of CComPtr in ComPtr wrapper to avoid ATL dependency.	2014-10-01 12:02:28 +02:00
Artur Wieczorek	6ad3427426	Fixed compilation errors under VS 2010 and Win 7 ... Applied in PR3240 to 2.4 branch.	2014-09-25 11:43:13 +02:00
Vadim Pisarevsky	1578dd1027	Merge pull request #2702 from GregoryMorse:patch-3	2014-09-18 12:38:54 +00:00
vbystricky	d58f736935	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00