Merge pull request #4155 from MSOpenTech:highgui_contrib

modules/highgui/CMakeLists.txt

@@ -29,6 +29,9 @@ file(GLOB highgui_ext_hdrs
      "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.hpp"
      "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.h")
 
+# Removing WinRT API headers by default
+list(REMOVE_ITEM highgui_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/highgui_winrt.hpp")
+
 if(HAVE_QT5)
   set(CMAKE_AUTOMOC ON)
   set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -66,12 +69,23 @@ elseif(HAVE_QT)
   if(${_have_flag})
     set_source_files_properties(${_RCC_OUTFILES} PROPERTIES COMPILE_FLAGS -Wno-missing-declarations)
   endif()
-elseif(WINRT AND NOT WINRT_8_0)
-  # Dependencies used by the implementation referenced
-  # below are not available on WinRT 8.0.
-  # Enabling it for WiRT 8.1+ only.
-  status("  ${name}: WinRT detected")
-  list(APPEND highgui_srcs ${CMAKE_CURRENT_LIST_DIR}/src/window_winrt.cpp)
+elseif(WINRT)
+  if(NOT WINRT_8_0)
+    # Dependencies used by the implementation referenced
+    # below are not available on WinRT 8.0.
+    # Enabling it for WiRT 8.1+ only.
+
+    # WinRT 8.1+ detected. Adding WinRT API header.
+    status("  ${name}: WinRT detected. Adding WinRT API header")
+    list(APPEND highgui_ext_hdrs "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/highgui_winrt.hpp")
+
+
+    list(APPEND highgui_srcs
+      ${CMAKE_CURRENT_LIST_DIR}/src/window_winrt.cpp
+      ${CMAKE_CURRENT_LIST_DIR}/src/window_winrt_bridge.cpp)
+    list(APPEND highgui_hdrs
+      ${CMAKE_CURRENT_LIST_DIR}/src/window_winrt_bridge.hpp)
+  endif()
 
   # libraries below are neither available nor required
   # on ARM devices and/or Windows Phone
@@ -81,6 +95,10 @@ elseif(WINRT AND NOT WINRT_8_0)
       status("  ${name}: Windows Phone detected")
     elseif(OpenCV_ARCH STREQUAL "ARM")
       status("  ${name}: ARM detected")
+      if(WINRT_STORE)
+        list(REMOVE_ITEM HIGHGUI_LIBRARIES "ws2_32")
+        status("  ${name}:   Removing 'ws2_32.lib'")
+      endif()
     endif()
     status("  ${name}:   Removing 'comctl32.lib, gdi32.lib, ole32.lib, setupapi.lib'")
     status("  ${name}:   Leaving '${HIGHGUI_LIBRARIES}'")

modules/highgui/include/opencv2/highgui.hpp

@@ -79,7 +79,7 @@ It provides easy interface to:
         attached to the control panel is a trackbar, or the control panel is empty, a new buttonbar is
         created. Then, a new button is attached to it.
 
-    See below the example used to generate the figure: :
+    See below the example used to generate the figure:
     @code
         int main(int argc, char *argv[])
             int value = 50;
@@ -122,6 +122,45 @@ It provides easy interface to:
         }
     @endcode
 
+
+    @defgroup highgui_winrt WinRT support
+
+    This figure explains new functionality implemented with WinRT GUI. The new GUI provides an Image control,
+    and a slider panel. Slider panel holds trackbars attached to it.
+
+    Sliders are attached below the image control. Every new slider is added below the previous one.
+
+    See below the example used to generate the figure:
+    @code
+        void sample_app::MainPage::ShowWindow()
+        {
+            static cv::String windowName("sample");
+            cv::winrt_initContainer(this->cvContainer);
+            cv::namedWindow(windowName); // not required
+
+            cv::Mat image = cv::imread("Assets/sample.jpg");
+            cv::Mat converted = cv::Mat(image.rows, image.cols, CV_8UC4);
+            cvtColor(image, converted, CV_BGR2BGRA);
+            cv::imshow(windowName, converted); // this will create window if it hasn't been created before
+
+            int state = 42;
+            cv::TrackbarCallback callback = [](int pos, void* userdata)
+            {
+                if (pos == 0) {
+                    cv::destroyWindow(windowName);
+                }
+            };
+            cv::TrackbarCallback callbackTwin = [](int pos, void* userdata)
+            {
+                if (pos >= 70) {
+                    cv::destroyAllWindows();
+                }
+            };
+            cv::createTrackbar("Sample trackbar", windowName, &state, 100, callback);
+            cv::createTrackbar("Twin brother", windowName, &state, 100, callbackTwin);
+        }
+    @endcode
+
     @defgroup highgui_c C API
 @}
 */

modules/highgui/include/opencv2/highgui/highgui_winrt.hpp

+// highgui (UX) support for Windows Runtime
+
+// Copyright (c) Microsoft Open Technologies, Inc.
+// All rights reserved.
+//
+// (3 - clause BSD License)
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that
+// the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the
+// following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or
+// promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE ARE DISCLAIMED.IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
+// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES(INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT(INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+using namespace Windows::UI::Xaml::Controls;
+
+namespace cv
+{
+
+//! @addtogroup highgui_winrt
+//! @{
+
+/********************************** WinRT Specific API *************************************************/
+
+/** @brief Initializes container component that will be used to hold generated window content.
+
+@param container Container (Panel^) reference that will be used to hold generated window content: controls and image.
+
+@note
+    Must be called to assign WinRT container that will hold created windows content.
+*/
+    CV_EXPORTS void winrt_initContainer(::Windows::UI::Xaml::Controls::Panel^ container);
+
+//! @} videoio_winrt
+
+} // cv
\ No newline at end of file

modules/highgui/src/precomp.hpp

@@ -95,16 +95,18 @@
 #define CV_WINDOW_MAGIC_VAL     0x00420042
 #define CV_TRACKBAR_MAGIC_VAL   0x00420043
 
-//Yannick Verdie 2010
+//Yannick Verdie 2010, Max Kostin 2015
 void cvSetModeWindow_W32(const char* name, double prop_value);
 void cvSetModeWindow_GTK(const char* name, double prop_value);
 void cvSetModeWindow_CARBON(const char* name, double prop_value);
 void cvSetModeWindow_COCOA(const char* name, double prop_value);
+void cvSetModeWindow_WinRT(const char* name, double prop_value);
 
 double cvGetModeWindow_W32(const char* name);
 double cvGetModeWindow_GTK(const char* name);
 double cvGetModeWindow_CARBON(const char* name);
 double cvGetModeWindow_COCOA(const char* name);
+double cvGetModeWindow_WinRT(const char* name);
 
 double cvGetPropWindowAutoSize_W32(const char* name);
 double cvGetPropWindowAutoSize_GTK(const char* name);

modules/highgui/src/window.cpp

@@ -65,7 +65,10 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu
             cvSetModeWindow_CARBON(name,prop_value);
         #elif defined (HAVE_COCOA)
             cvSetModeWindow_COCOA(name,prop_value);
+        #elif defined (WINRT)
+            cvSetModeWindow_WinRT(name, prop_value);
         #endif
+
     break;
 
     case CV_WND_PROP_AUTOSIZE:
@@ -104,6 +107,8 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
             return cvGetModeWindow_CARBON(name);
         #elif defined (HAVE_COCOA)
             return cvGetModeWindow_COCOA(name);
+        #elif defined (WINRT)
+            return cvGetModeWindow_WinRT(name);
         #else
             return -1;
         #endif

modules/highgui/src/window_winrt_bridge.hpp

+// highgui to XAML bridge for OpenCV
+
+// Copyright (c) Microsoft Open Technologies, Inc.
+// All rights reserved.
+//
+// (3 - clause BSD License)
+//
+// Redistribution and use in source and binary forms, with or without modification, are permitted provided that
+// the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the
+// following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+// following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or
+// promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE ARE DISCLAIMED.IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
+// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES(INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT(INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#include <map>
+#include <opencv2\core.hpp>
+
+using namespace Windows::UI::Xaml::Controls;
+
+class CvWindow;
+class CvTrackbar;
+
+class HighguiBridge
+{
+public:
+
+    /** @brief Instantiates a Highgui singleton (Meyers type).
+
+    The function Instantiates a Highgui singleton (Meyers type) and returns reference to that instance.
+    */
+    static HighguiBridge& getInstance();
+
+    /** @brief Finds window by name and returns the reference to it.
+
+    @param name Name of the window.
+
+    The function finds window by name and returns the reference to it. Returns nullptr
+    if window with specified name is not found or name argument is null.
+    */
+    CvWindow*           findWindowByName(cv::String name);
+
+    /** @brief Returns reference to the trackbar(slider) registered within window with a provided name.
+
+    @param name Name of the window.
+
+    The function returns reference to the trackbar(slider) registered within window with a provided name.
+    Returns nullptr if trackbar with specified name is not found or window reference is nullptr.
+    */
+    CvTrackbar*         findTrackbarByName(cv::String trackbarName, cv::String windowName);
+
+    /** @brief Converts cv::String to Platform::String.
+
+    @param name String to convert.
+
+    The function converts cv::String to Platform::String.
+    Returns nullptr if conversion fails.
+    */
+    Platform::String^   convertString(cv::String name);
+
+    /** @brief Creates window if there is no window with this name, otherwise returns existing window.
+
+    @param name Window name.
+
+    The function creates window if there is no window with this name, otherwise returns existing window.
+    */
+    CvWindow*           namedWindow(cv::String name);
+
+    /** @brief Shows provided window.
+
+    The function shows provided window: makes provided window current, removes current container
+    contents and shows current window by putting it as a container content.
+    */
+    void                showWindow(CvWindow* window);
+
+    /** @brief Destroys window if there exists window with this name, otherwise does nothing.
+
+    @param name Window name.
+
+    The function destroys window if there exists window with this name, otherwise does nothing.
+    If window being destroyed is the current one, it will be hidden by clearing the window container.
+    */
+    void                destroyWindow(cv::String name);
+
+    /** @brief Destroys all windows.
+
+    The function destroys all windows.
+    */
+    void                destroyAllWindows();
+
+    /** @brief Assigns container used to display windows.
+
+    @param _container Container reference.
+
+    The function assigns container used to display windows.
+    */
+    void                setContainer(Windows::UI::Xaml::Controls::Panel^ _container);
+
+private:
+
+    // Meyers singleton
+    HighguiBridge(const HighguiBridge &);
+    void operator=(HighguiBridge &);
+    HighguiBridge() {
+        windowsMap = new std::map<cv::String, CvWindow*>();
+    };
+
+    /** @brief Creates window if there is no window with this name.
+
+    @param name Window name.
+
+    The function creates window if there is no window with this name.
+    */
+    CvWindow*           createWindow(cv::String name);
+
+    /** @brief Cleans current container contents.
+
+    The function cleans current container contents.
+    */
+    void                cleanContainer();
+
+    // see https://msdn.microsoft.com/en-US/library/windows/apps/xaml/hh700103.aspx
+    // see https://msdn.microsoft.com/ru-ru/library/windows.foundation.collections.aspx
+    std::map<cv::String, CvWindow*>*    windowsMap;
+    CvWindow*                           currentWindow;
+
+    // Holds current container/content to manipulate with
+    Windows::UI::Xaml::Controls::Panel^ container;
+};
+
+class CvTrackbar
+{
+public:
+    CvTrackbar(cv::String name, Slider^ slider, CvWindow* parent);
+    ~CvTrackbar();
+
+    double  getPosition();
+    void    setPosition(double pos);
+    double  getMaxPosition();
+    void    setMaxPosition(double pos);
+    Slider^ getSlider();
+    void    setSlider(Slider^ pos);
+
+    CvTrackbarCallback2 callback;
+
+private:
+    cv::String  name;
+    Slider^     slider;
+    CvWindow*   parent;
+};
+
+class CvWindow
+{
+public:
+    CvWindow(cv::String name, int flag = CV_WINDOW_NORMAL);
+    ~CvWindow();
+
+    /** @brief NOTE: prototype.
+
+    Should create button if there is no button with this name already.
+    */
+    void            createButton(cv::String name);
+
+    /** @brief Creates slider if there is no slider with this name already.
+
+    The function creates slider if there is no slider with this name already OR resets
+    provided values for the existing one.
+    */
+    void            createSlider(cv::String name, int* val, int count, CvTrackbarCallback2 on_notify, void* userdata);
+
+    /** @brief Updates window image.
+
+    @param src Image data object reference.
+
+    The function updates window image. If argument is null or image control is not found - does nothing.
+    */
+    void            updateImage(CvMat* arr);
+
+    /** @brief Returns reference to the trackbar(slider) registered within provided window.
+
+    @param name Name of the window.
+
+    The function returns reference to the trackbar(slider) registered within provided window.
+    Returns nullptr if trackbar with specified name is not found or window reference is nullptr.
+    */
+    CvTrackbar*     findTrackbarByName(cv::String name);
+    Page^           getPage();
+
+private:
+    cv::String name;
+
+    // Holds image data in CV format
+    CvMat* imageData;
+
+    // Map of all sliders assigned to this window
+    std::map<cv::String, CvTrackbar*>*  sliderMap;
+
+    // Window contents holder
+    Page^ page;
+
+    // Image control displayed by this window
+    Image^ imageControl;
+
+    // Container for sliders
+    Panel^ sliderPanel;
+
+    // Container for buttons
+    // TODO: prototype, not available via API
+    Panel^ buttonPanel;
+
+    // Holds image width to arrange other UI elements.
+    // Required since imageData->width value gets recalculated when processing
+    int imageWidth;
+
+    // Default markup for the container content allowing for proper components placement
+    static const Platform::String^ markupContent;
+
+    // Default Slider size, fallback solution for unexpected edge cases
+    static const double sliderDefaultWidth;
+};
\ No newline at end of file

samples/winrt/FaceDetection/FaceDetection/MainPage.xaml

-<Page
-    x:Class="FaceDetection.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:FaceDetection"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
+<Page x:Class="FaceDetection.MainPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:local="using:FaceDetection"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d">
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Button x:Name="InitBtn" Content="Initialize" HorizontalAlignment="Left" Height="67" Margin="69,81,0,0" VerticalAlignment="Top" Width="218" Click="InitBtn_Click"/>
-        <Button x:Name="detectBtn" Content="Detect Faces" HorizontalAlignment="Left" Height="67" Margin="69,168,0,0" VerticalAlignment="Top" Width="218" Click="detectBtn_Click"/>
-        <Image x:Name="img1" HorizontalAlignment="Left" Height="446" Margin="354,84,0,0" VerticalAlignment="Top" Width="883"/>
+        <Button x:Name="InitBtn"
+                Width="218"
+                Height="67"
+                Margin="69,81,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Click="InitBtn_Click"
+                Content="Initialize" />
+        <Button x:Name="detectBtn"
+                Width="218"
+                Height="67"
+                Margin="69,168,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Click="detectBtn_Click"
+                Content="Detect Faces" />
+        <StackPanel x:Name="cvContainer"
+                    Width="883"
+                    Height="446"
+                    Margin="354,84,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top" />
 
     </Grid>
 </Page>

samples/winrt/FaceDetection/FaceDetection/MainPage.xaml.cpp

@@ -10,6 +10,8 @@
 #include <opencv2\imgcodecs\imgcodecs.hpp>
 #include <opencv2\core\core.hpp>
 #include <opencv2\imgproc\imgproc.hpp>
+#include <opencv2\highgui.hpp>
+#include <opencv2\highgui\highgui_winrt.hpp>
 
 #include <Robuffer.h>
 
@@ -33,6 +35,7 @@ using namespace Microsoft::WRL;
 
 // Name of the resource classifier used to detect human faces (frontal)
 cv::String face_cascade_name = "Assets/haarcascade_frontalface_alt.xml";
+cv::String window_name = "Faces";
 
 MainPage::MainPage()
 {
@@ -45,7 +48,8 @@ void FaceDetection::MainPage::InitBtn_Click(Platform::Object^ sender, Windows::U
     cv::Mat image = cv::imread("Assets/group1.jpg");
     groupFaces = cv::Mat(image.rows, image.cols, CV_8UC4);
     cv::cvtColor(image, groupFaces, CV_BGR2BGRA);
-    UpdateImage(groupFaces);
+    cv::winrt_initContainer(cvContainer);
+    cv::imshow(window_name, groupFaces);
 
     if (!face_cascade.load(face_cascade_name)) {
         Windows::UI::Popups::MessageDialog("Couldn't load face detector \n").ShowAsync();
@@ -70,29 +74,8 @@ void FaceDetection::MainPage::detectBtn_Click(Platform::Object^ sender, Windows:
             cv::rectangle(groupFaces, face, cv::Scalar(0, 255, 255), 5);
         }
 
-        UpdateImage(groupFaces);
+        cv::imshow(window_name, groupFaces);
     } else {
         Windows::UI::Popups::MessageDialog("Initialize image before processing \n").ShowAsync();
     }
-}
-
-void FaceDetection::MainPage::UpdateImage(const cv::Mat& image) {
-    // Create the WriteableBitmap
-    WriteableBitmap^ bitmap = ref new WriteableBitmap(image.cols, image.rows);
-
-    // Get access to the pixels
-    IBuffer^ buffer = bitmap->PixelBuffer;
-    unsigned char* dstPixels;
-
-    // Obtain IBufferByteAccess
-    ComPtr<IBufferByteAccess> pBufferByteAccess;
-    ComPtr<IInspectable> pBuffer((IInspectable*)buffer);
-    pBuffer.As(&pBufferByteAccess);
-
-    // Get pointer to pixel bytes
-    pBufferByteAccess->Buffer(&dstPixels);
-    memcpy(dstPixels, image.data, image.step.buf[1] * image.cols*image.rows);
-
-    // Set the bitmap to the Image element
-    img1->Source = bitmap;
 }
\ No newline at end of file

samples/winrt/FaceDetection/FaceDetection/opencv.props

@@ -2,13 +2,14 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <OpenCV_Bin>$(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\</OpenCV_Bin>
-    <OpenCV_Lib>$(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\</OpenCV_Lib>
-    <OpenCV_Include>$(OPENCV_WINRT_INSTALL_DIR)\WS\8.1\$(PlatformTarget)\include\</OpenCV_Include>
+    <Runtime Condition="'$(ApplicationType)'=='Windows Phone'">WP</Runtime>
+    <Runtime Condition="'$(ApplicationType)'=='Windows Store'">WS</Runtime>
+    <OpenCV_Bin>$(OPENCV_WINRT_INSTALL_DIR)\$(Runtime)\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\</OpenCV_Bin>
+    <OpenCV_Lib>$(OPENCV_WINRT_INSTALL_DIR)\$(Runtime)\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\</OpenCV_Lib>
+    <OpenCV_Include>$(OPENCV_WINRT_INSTALL_DIR)\$(Runtime)\8.1\$(PlatformTarget)\include\</OpenCV_Include>
     <!--debug suffix for OpenCV dlls and libs -->
     <DebugSuffix Condition="'$(Configuration)'=='Debug'">d</DebugSuffix>
-    <DebugSuffix Condition="'$(Configuration)'!='Debug'">
-    </DebugSuffix>
+    <DebugSuffix Condition="'$(Configuration)'!='Debug'"></DebugSuffix>
   </PropertyGroup>
   <ItemGroup>
     <!--Add required OpenCV dlls here-->
@@ -33,14 +34,20 @@
     <None Include="$(OpenCV_Bin)opencv_objdetect300$(DebugSuffix).dll">
       <DeploymentContent>true</DeploymentContent>
     </None>
+    <None Include="$(OpenCV_Bin)opencv_videoio300$(DebugSuffix).dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="$(OpenCV_Bin)opencv_highgui300$(DebugSuffix).dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(OpenCV_Include);$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(OpenCV_Include);%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <!--Add required OpenCV libs here-->
-      <AdditionalDependencies>opencv_core300$(DebugSuffix).lib;opencv_imgcodecs300$(DebugSuffix).lib;opencv_imgproc300$(DebugSuffix).lib;opencv_features2d300$(DebugSuffix).lib;opencv_flann300$(DebugSuffix).lib;opencv_ml300$(DebugSuffix).lib;opencv_imgcodecs300$(DebugSuffix).lib;opencv_objdetect300$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opencv_core300$(DebugSuffix).lib;opencv_imgproc300$(DebugSuffix).lib;opencv_imgcodecs300$(DebugSuffix).lib;opencv_flann300$(DebugSuffix).lib;opencv_videoio300$(DebugSuffix).lib;opencv_features2d300$(DebugSuffix).lib;opencv_objdetect300$(DebugSuffix).lib;opencv_ml300$(DebugSuffix).lib;opencv_highgui300$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OpenCV_Lib);%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>