1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00

merge Win10/VS2015 changes

This commit is contained in:
Gregory Morse
2015-12-17 21:15:59 +01:00
parent aee03cd5e5
commit af5bec70cd
10 changed files with 584 additions and 10396 deletions
@@ -28,8 +28,7 @@
#include <functional>
#include <concrt.h>
#include <agile.h>
using namespace Windows::UI::Xaml::Controls;
#include "opencv2/core/cvdef.h"
namespace cv
{
@@ -130,4 +129,4 @@ CV_EXPORTS void winrt_imshow();
//! @} videoio_winrt
} // cv
} // cv