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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user