Added and updated WinRT samples

Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>

Added and updated WinRT samples
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
58108457 · Maxim Kostin · 86ebf4a2 · 58108457 · 58108457 · 58108457
Commit 58108457 authored Feb 13, 2015 by Maxim Kostin
19 changed files
--- a/samples/winrt/.gitignore
+++ b/samples/winrt/.gitignore
+# Ignore thumbnails created by windows
+Thumbs.db
+#ignore winrt copies of opencv files
+opencl_kernels.cpp
+opencl_kernels.hpp
+# Ignore files build by Visual Studio
+*.obj
+*.exe
+*.pdb
+*.aps
+*.vcproj.*.user
+*.vcxproj.user
+*.vspscc
+*_i.c
+*.i
+*.icf
+*_p.c
+*.ncb
+*.suo
+*.tlb
+*.tlh
+*.bak
+*.cache
+*.ilk
+*.log
+*.winmd
+[Bb]in
+[Dd]ebug*/
+*.sbr
+*.sdf
+obj/
+[Rr]elease*/
+_ReSharper*/
+[Tt]est[Rr]esult*
+ipch/
+*.opensdf
+Generated Files
+AppPackages
+SubmissionInfo
+*.hps
+# Ignore files build by ndk and eclipse
+libs/
+bin/
+obj/
+gen/
+local.properties
+# Ignore python compiled files
+*.pyc
+# Ignore files build by airplay and marmalade
+build_*_xcode/
+build_*_vc10/
+# Ignore files built by xcode
+*.mode*v*
+*.pbxuser
+*.xcbkptlist
+*.xcscheme
+*.xcworkspacedata
+*.xcuserstate
+xcschememanagement.plist
+build/
+.DS_Store
+._.*
+xcuserdata/
+DerivedData/
+*.xccheckout
+# Ignore files built by bada
+.Simulator-Debug/
+.Target-Debug/
+.Target-Release/
+# Ignore files built by blackberry
+Simulator/
+Device-Debug/
+Device-Release/
+# Ignore vim swaps
+*.swp
+# CTags
+tags
--- a/samples/winrt/ImageManipulations/MediaCapture.sln
+++ b/samples/winrt/ImageManipulations/MediaCapture.sln
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 11 Express for Windows 8
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaCapture", "MediaCapture.vcxproj", "{C5B886A7-8300-46FF-B533-9613DE2AF637}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GrayscaleTransform", "MediaExtensions\OcvTransform\OcvTransform.vcxproj", "{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OcvTransform", "MediaExtensions\OcvTransform\OcvTransform.vcxproj", "{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,18 +17,6 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Debug|ARM.ActiveCfg = Debug|ARM
-		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Debug|ARM.Build.0 = Debug|ARM
-		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Debug|Win32.Build.0 = Debug|Win32
-		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Debug|x64.ActiveCfg = Debug|x64
-		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Debug|x64.Build.0 = Debug|x64
-		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Release|ARM.ActiveCfg = Release|ARM
-		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Release|ARM.Build.0 = Release|ARM
-		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Release|Win32.ActiveCfg = Release|Win32
-		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Release|Win32.Build.0 = Release|Win32
-		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Release|x64.ActiveCfg = Release|x64
-		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Release|x64.Build.0 = Release|x64
 		{C5B886A7-8300-46FF-B533-9613DE2AF637}.Debug|ARM.ActiveCfg = Debug|ARM
 		{C5B886A7-8300-46FF-B533-9613DE2AF637}.Debug|ARM.Build.0 = Debug|ARM
 		{C5B886A7-8300-46FF-B533-9613DE2AF637}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -45,6 +35,18 @@ Global
 		{C5B886A7-8300-46FF-B533-9613DE2AF637}.Release|x64.ActiveCfg = Release|x64
 		{C5B886A7-8300-46FF-B533-9613DE2AF637}.Release|x64.Build.0 = Release|x64
 		{C5B886A7-8300-46FF-B533-9613DE2AF637}.Release|x64.Deploy.0 = Release|x64
+		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Debug|ARM.ActiveCfg = Debug|ARM
+		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Debug|ARM.Build.0 = Debug|ARM
+		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Debug|Win32.Build.0 = Debug|Win32
+		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Debug|x64.ActiveCfg = Debug|x64
+		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Debug|x64.Build.0 = Debug|x64
+		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Release|ARM.ActiveCfg = Release|ARM
+		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Release|ARM.Build.0 = Release|ARM
+		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Release|Win32.ActiveCfg = Release|Win32
+		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Release|Win32.Build.0 = Release|Win32
+		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Release|x64.ActiveCfg = Release|x64
+		{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--- a/samples/winrt/ImageManipulations/MediaCapture.vcxproj
+++ b/samples/winrt/ImageManipulations/MediaCapture.vcxproj
--- a/samples/winrt/ImageManipulations/MediaCapture.vcxproj.filters
+++ b/samples/winrt/ImageManipulations/MediaCapture.vcxproj.filters
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="AdvancedCapture.xaml.cpp" />
+    <ClCompile Include="App.xaml.cpp" />
+    <ClCompile Include="Common\LayoutAwarePage.cpp" />
+    <ClCompile Include="Constants.cpp" />
+    <ClCompile Include="Common\SuspensionManager.cpp" />
+    <ClCompile Include="MainPage.xaml.cpp" />
+    <ClCompile Include="pch.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="AdvancedCapture.xaml.h" />
+    <ClInclude Include="Constants.h" />
+    <ClInclude Include="MainPage.xaml.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="Common\LayoutAwarePage.h" />
+    <ClInclude Include="Common\SuspensionManager.h" />
+    <ClInclude Include="App.xaml.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="assets\opencv-logo-30.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="assets\opencv-logo-150.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\splash-sdk.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\StoreLogo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\windows-sdk.scale-100.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="AdvancedCapture.xaml" />
+    <Page Include="Common\StandardStyles.xaml" />
+    <Page Include="MainPage.xaml" />
+    <Page Include="Sample-Utils\SampleTemplateStyles.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Assets">
+      <UniqueIdentifier>{392352d8-f913-4741-82cf-d8075bb6f022}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="MediaCapture_TemporaryKey.pfx" />
+    <None Include="..\..\..\bin\WS\8.1\x86\bin\Debug\opencv_core300d.dll" />
+    <None Include="..\..\..\bin\WS\8.1\x86\bin\Debug\opencv_imgproc300d.dll" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
--- a/samples/winrt/ImageManipulations/MediaCapture_TemporaryKey.pfx
+++ b/samples/winrt/ImageManipulations/MediaCapture_TemporaryKey.pfx
--- a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvImageManipulations.h
+++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvImageManipulations.h
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+ /* File created by MIDL compiler version 8.00.0603 */
+/* at Tue Jan 20 15:16:38 2015
+ */
+/* Compiler settings for C:\Users\MAXIM~1.KOS\AppData\Local\Temp\OcvImageManipulations.idl-a5dae736:
+    Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 8.00.0603 
+    protocol : dce , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data 
+    VC __declspec() decoration level: 
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+/* @@MIDL_FILE_HEADING(  ) */
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 475
+#endif
+#include "rpc.h"
+#include "rpcndr.h"
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif // __RPCNDR_H_VERSION__
+#ifndef __OcvImageManipulations_h__
+#define __OcvImageManipulations_h__
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+#if defined(__cplusplus)
+#if defined(__MIDL_USE_C_ENUM)
+#define MIDL_ENUM enum
+#else
+#define MIDL_ENUM enum class
+#endif
+#endif
+/* Forward Declarations */ 
+/* header files for imported files */
+#include "Windows.Media.h"
+#ifdef __cplusplus
+extern "C"{
+#endif 
+/* interface __MIDL_itf_OcvImageManipulations_0000_0000 */
+/* [local] */ 
+#pragma warning(push)
+#pragma warning(disable:4001) 
+#pragma once
+#pragma warning(pop)
+#ifndef RUNTIMECLASS_OcvTransform_OcvImageManipulations_DEFINED
+#define RUNTIMECLASS_OcvTransform_OcvImageManipulations_DEFINED
+extern const __declspec(selectany) _Null_terminated_ WCHAR RuntimeClass_OcvTransform_OcvImageManipulations[] = L"OcvTransform.OcvImageManipulations";
+#endif
+/* interface __MIDL_itf_OcvImageManipulations_0000_0000 */
+/* [local] */ 
+extern RPC_IF_HANDLE __MIDL_itf_OcvImageManipulations_0000_0000_v0_0_c_ifspec;
+extern RPC_IF_HANDLE __MIDL_itf_OcvImageManipulations_0000_0000_v0_0_s_ifspec;
+/* Additional Prototypes for ALL interfaces */
+/* end of Additional Prototypes */
+#ifdef __cplusplus
+}
+#endif
+#endif
--- a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvImageManipulations.idl
+++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvImageManipulations.idl
@@ -7,5 +7,6 @@ namespace OcvTransform
    [version(NTDDI_WIN8)]
    runtimeclass OcvImageManipulations
    {
+        interface Windows.Media.IMediaExtension;
    }
 }
--- a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.cpp
+++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.cpp
@@ -8,8 +8,11 @@
 #include "OcvTransform.h"
 #include "bufferlock.h"
-#include "opencv2\core\core.hpp"
+#include <opencv2\core\core.hpp>
-#include "opencv2\imgproc\imgproc.hpp"
+#include <opencv2\imgproc\imgproc.hpp>
+#include <opencv2\features2d\features2d.hpp>
 using namespace Microsoft::WRL;

--- a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj
+++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|ARM">
      <Configuration>Debug</Configuration>
@@ -27,47 +27,48 @@
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
-    <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath>
    <ProjectGuid>{BA69218F-DA5C-4D14-A78D-21A9E4DEC669}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
    <RootNamespace>OcvTransform</RootNamespace>
    <ProjectName>OcvTransform</ProjectName>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <PropertyGroup>
@@ -96,6 +97,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <GenerateManifest>false</GenerateManifest>
    <OutDir>$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <LibraryPath>$(ProjectDir)..\..\..\..\..\bin\WS\8.1\x86\lib\Debug;$(ProjectDir)..\..\..\..\..\bin\WS\8.1\x86\3rdparty\lib\Debug;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
    <GenerateManifest>false</GenerateManifest>
@@ -123,11 +125,11 @@
      </PrecompiledHeaderOutputFile>
      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
      <CompileAsWinRT>false</CompileAsWinRT>
-      <AdditionalIncludeDirectories>$(OPENCV_DIR)\include;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories);$(ProjectDir)\..\Common</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies);mf.lib;mfuuid.lib;mfplat.lib;opencv_core245.lib;opencv_imgproc245.lib</AdditionalDependencies>
+      <AdditionalDependencies>opencv_core300d.lib;opencv_imgproc300d.lib;zlibd.lib;runtimeobject.lib;%(AdditionalDependencies);mf.lib;mfuuid.lib;mfplat.lib</AdditionalDependencies>
      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
      <ModuleDefinitionFile>OcvTransform.def</ModuleDefinitionFile>
      <AdditionalLibraryDirectories>$(OPENCV_DIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -147,7 +149,7 @@
      </PrecompiledHeaderOutputFile>
      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
      <CompileAsWinRT>false</CompileAsWinRT>
-      <AdditionalIncludeDirectories>$(OPENCV_DIR)\include;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories);$(ProjectDir)\..\Common</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -171,7 +173,7 @@
      </PrecompiledHeaderOutputFile>
      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
      <CompileAsWinRT>false</CompileAsWinRT>
-      <AdditionalIncludeDirectories>$(OPENCV_DIR)\include;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories);$(ProjectDir)\..\Common</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -195,7 +197,7 @@
      </PrecompiledHeaderOutputFile>
      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
      <CompileAsWinRT>false</CompileAsWinRT>
-      <AdditionalIncludeDirectories>$(OPENCV_DIR)\include;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories);$(ProjectDir)\..\Common</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -219,7 +221,7 @@
      </PrecompiledHeaderOutputFile>
      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
      <CompileAsWinRT>false</CompileAsWinRT>
-      <AdditionalIncludeDirectories>$(OPENCV_DIR)\include;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories);$(ProjectDir)\..\Common</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -243,7 +245,7 @@
      </PrecompiledHeaderOutputFile>
      <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
      <CompileAsWinRT>false</CompileAsWinRT>
-      <AdditionalIncludeDirectories>$(OPENCV_DIR)\include;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories);$(ProjectDir)\..\Common</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@@ -316,4 +318,4 @@
  </Target>
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
\ No newline at end of file
--- a/samples/winrt/ImageManipulations/Package.appxmanifest
+++ b/samples/winrt/ImageManipulations/Package.appxmanifest
 <?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
+<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="Microsoft.SDKSamples.MediaCapture.CPP" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="1.0.0.0" />
+  <Identity Name="Microsoft.SDKSamples.MediaCapture.CPP" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="1.1.0.6" />
  <Properties>
    <DisplayName>MediaCapture CPP sample</DisplayName>
    <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
-    <Logo>Assets\storeLogo-sdk.png</Logo>
+    <Logo>Assets\windows-sdk.png</Logo>
  </Properties>
  <Prerequisites>
-    <OSMinVersion>6.2.1</OSMinVersion>
+    <OSMinVersion>6.3</OSMinVersion>
-    <OSMaxVersionTested>6.2.1</OSMaxVersionTested>
+    <OSMaxVersionTested>6.3</OSMaxVersionTested>
  </Prerequisites>
  <Resources>
    <Resource Language="x-generate" />
  </Resources>
  <Applications>
    <Application Id="MediaCapture.App" Executable="$targetnametoken$.exe" EntryPoint="MediaCapture.App">
-      <VisualElements DisplayName="OCV Image Manipulations" Logo="assets\opencv-logo-150.png" SmallLogo="assets\opencv-logo-30.png" Description="OpenCV Image Manipulations sample" ForegroundText="light" BackgroundColor="#00b2f0">
+      <m2:VisualElements DisplayName="OCV Image Manipulations" Description="OpenCV Image Manipulations sample" BackgroundColor="#00b2f0" ForegroundText="light" Square150x150Logo="Assets\opencv-logo-150.png" Square30x30Logo="Assets\opencv-logo-30.png">
-        <DefaultTile ShortName="Ocv ImageManipulations" ShowName="allLogos" />
+        <m2:DefaultTile ShortName="Ocv ImageManipulations">
-        <SplashScreen Image="Assets\splash-sdk.png" BackgroundColor="#00b2f0" />
+          <m2:ShowNameOnTiles>
-      </VisualElements>
+            <m2:ShowOn Tile="square150x150Logo" />
+          </m2:ShowNameOnTiles>
+        </m2:DefaultTile>
+        <m2:SplashScreen BackgroundColor="#00b2f0" Image="Assets\splash-sdk.png" />
+      </m2:VisualElements>
    </Application>
  </Applications>
  <Capabilities>
@@ -33,4 +37,4 @@
      </InProcessServer>
    </Extension>
  </Extensions>
 </Package>
\ No newline at end of file
--- a/samples/winrt/ImageManipulations/assets/StoreLogo.png
+++ b/samples/winrt/ImageManipulations/assets/StoreLogo.png
--- a/samples/winrt/ImageManipulations/assets/windows-sdk.scale-100.png
+++ b/samples/winrt/ImageManipulations/assets/windows-sdk.scale-100.png
--- a/samples/winrt/OcvImageProcessing/OcvImageProcessing.sln
+++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing.sln
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OcvImageProcessing", "OcvImageProcessing\OcvImageProcessing.vcxproj", "{A5555EA2-F9E8-4078-90F5-D428F2C0D6D1}"
 EndProject
 Global

--- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/MainPage.xaml.cpp
+++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/MainPage.xaml.cpp
@@ -9,6 +9,8 @@
 #include <wrl\client.h>
 #include <Robuffer.h>
 #include <vector>
+#include <opencv2\imgproc\types_c.h>
 using namespace OcvImageProcessing;
 using namespace Microsoft::WRL;
@@ -129,7 +131,7 @@ cv::Mat OcvImageProcessing::MainPage::ApplyFindFeaturesFilter(const cv::Mat& ima
 {
    cv::Mat result;
    cv::Mat intermediateMat;
-    cv::Ptr<cv::FeatureDetector> detector = cv::FastFeatureDetector::create(50);
+	cv::Ptr<cv::FastFeatureDetector> detector = cv::FastFeatureDetector::create(50);
    std::vector<cv::KeyPoint> features;
    image.copyTo(result);

--- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj
+++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj
--- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj.filters
+++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj.filters
@@ -41,39 +41,11 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="OcvImageProcessing_TemporaryKey.pfx" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_calib3d247.dll" />
+    <None Include="..\..\..\..\bin\WS\8.1\x86\bin\Debug\opencv_core300d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_calib3d247d.dll" />
+    <None Include="..\..\..\..\bin\WS\8.1\x86\bin\Debug\opencv_features2d300d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_contrib247.dll" />
+    <None Include="..\..\..\..\bin\WS\8.1\x86\bin\Debug\opencv_flann300d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_contrib247d.dll" />
+    <None Include="..\..\..\..\bin\WS\8.1\x86\bin\Debug\opencv_imgproc300d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_core247.dll" />
+    <None Include="..\..\..\..\bin\WS\8.1\x86\bin\Debug\opencv_ml300d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_core247d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_features2d247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_features2d247d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_flann247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_flann247d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_gpu247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_highgui247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_highgui247d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_imgproc247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_imgproc247d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_legacy247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_legacy247d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_ml247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_ml247d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_nonfree247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_nonfree247d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_objdetect247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_objdetect247d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_photo247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_photo247d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_stitching247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_stitching247d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_superres247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_superres247d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_video247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_video247d.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_videostab247.dll" />
-    <None Include="$(OPENCV_DIR)\bin\opencv_videostab247d.dll" />
  </ItemGroup>
  <ItemGroup>
    <Page Include="MainPage.xaml" />

--- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing_TemporaryKey.pfx
+++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing_TemporaryKey.pfx
--- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/Package.appxmanifest
+++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/Package.appxmanifest
 <?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
+<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="96635370-3751-48a8-84a6-afd4229cf435" Publisher="CN=asmorkalov" Version="1.0.0.0" />
+  <Identity Name="96635370-3751-48a8-84a6-afd4229cf435" Publisher="CN=dalestam" Version="1.1.0.1" />
  <Properties>
    <DisplayName>OcvImageProcessing</DisplayName>
    <PublisherDisplayName>asmorkalov</PublisherDisplayName>
    <Logo>Assets\StoreLogo.png</Logo>
  </Properties>
  <Prerequisites>
-    <OSMinVersion>6.2.1</OSMinVersion>
+    <OSMinVersion>6.3</OSMinVersion>
-    <OSMaxVersionTested>6.2.1</OSMaxVersionTested>
+    <OSMaxVersionTested>6.3</OSMaxVersionTested>
  </Prerequisites>
  <Resources>
    <Resource Language="x-generate" />
  </Resources>
  <Applications>
    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="OcvImageProcessing.App">
-      <VisualElements DisplayName="OcvImageProcessing" Logo="Assets\Logo.png" SmallLogo="Assets\SmallLogo.png" Description="OcvImageProcessing" ForegroundText="light" BackgroundColor="#464646">
+      <m2:VisualElements DisplayName="OcvImageProcessing" Description="OcvImageProcessing" BackgroundColor="#464646" ForegroundText="light" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png">
-        <DefaultTile ShowName="allLogos" />
+        <m2:DefaultTile>
-        <SplashScreen Image="Assets\SplashScreen.png" />
+          <m2:ShowNameOnTiles>
-      </VisualElements>
+            <m2:ShowOn Tile="square150x150Logo" />
+          </m2:ShowNameOnTiles>
+        </m2:DefaultTile>
+        <m2:SplashScreen Image="Assets\SplashScreen.png" />
+      </m2:VisualElements>
    </Application>
  </Applications>
 </Package>
\ No newline at end of file
--- a/samples/winrt/readme.txt
+++ b/samples/winrt/readme.txt
+Building OpenCV WinRT Samples
+=============================
+Samples are created to run against x86 architecture OpenCV binaries. 
+Please follow the instructions in "platforms/winrt/readme.txt" to generate and build OpenCV for WinRT.
\ No newline at end of file