diff --git a/samples/winrt/.gitignore b/samples/winrt/.gitignore new file mode 100644 index 0000000000..d4b2f0f455 --- /dev/null +++ b/samples/winrt/.gitignore @@ -0,0 +1,87 @@ +# 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 diff --git a/samples/winrt/ImageManipulations/MediaCapture.sln b/samples/winrt/ImageManipulations/MediaCapture.sln index e1f9aa3859..f82f20396e 100644 --- a/samples/winrt/ImageManipulations/MediaCapture.sln +++ b/samples/winrt/ImageManipulations/MediaCapture.sln @@ -1,9 +1,11 @@  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 diff --git a/samples/winrt/ImageManipulations/MediaCapture.vcxproj b/samples/winrt/ImageManipulations/MediaCapture.vcxproj index a0f8c84f9b..3430a487f8 100644 --- a/samples/winrt/ImageManipulations/MediaCapture.vcxproj +++ b/samples/winrt/ImageManipulations/MediaCapture.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -30,44 +30,45 @@ {C5B886A7-8300-46FF-B533-9613DE2AF637} SDKSample en-US - $(VCTargetsPath11) - 11.0 + 12.0 true MediaCapture + Windows Store + 8.1 Application true - v110 + v120 Application true - v110 + v120 Application true - v110 + v120 Application false true - v110 + v120 Application false true - v110 + v120 Application false true - v110 + v120 @@ -90,10 +91,24 @@ - + + True + x86 + 76D64E4F88C9B7D47ACA757CDFD15D6F3AD81D92 + MediaCapture_TemporaryKey.pfx + + + $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86); + pch.h + ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\..\modules\imgproc\include;..\..\..\modules\features2d\include;..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) @@ -159,7 +174,10 @@ - + + + true + @@ -167,144 +185,15 @@ - - true - true + true - true - true - true - - true - true + true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true + - + \ No newline at end of file diff --git a/samples/winrt/ImageManipulations/MediaCapture.vcxproj.filters b/samples/winrt/ImageManipulations/MediaCapture.vcxproj.filters new file mode 100644 index 0000000000..db0f737615 --- /dev/null +++ b/samples/winrt/ImageManipulations/MediaCapture.vcxproj.filters @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + Assets + + + Assets + + + Assets + + + Assets + + + + + + + + + + + + + + + {392352d8-f913-4741-82cf-d8075bb6f022} + + + + + + + + \ No newline at end of file diff --git a/samples/winrt/ImageManipulations/MediaCapture_TemporaryKey.pfx b/samples/winrt/ImageManipulations/MediaCapture_TemporaryKey.pfx new file mode 100644 index 0000000000..0f4f0d9e3d Binary files /dev/null and b/samples/winrt/ImageManipulations/MediaCapture_TemporaryKey.pfx differ diff --git a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvImageManipulations.h b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvImageManipulations.h new file mode 100644 index 0000000000..c29b855adf --- /dev/null +++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvImageManipulations.h @@ -0,0 +1,92 @@ + + +/* 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 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 +#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 + + diff --git a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvImageManipulations.idl b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvImageManipulations.idl index 37235a092d..1bec5d0dc8 100644 --- 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; } } diff --git a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.cpp b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.cpp index 538f353f5e..438b2c6d13 100644 --- 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\imgproc\imgproc.hpp" +#include +#include +#include + + using namespace Microsoft::WRL; diff --git a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj index 54c0ce40ab..c8f767e39a 100644 --- a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj +++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,47 +27,48 @@ - $(VCTargetsPath11) {BA69218F-DA5C-4D14-A78D-21A9E4DEC669} Win32Proj OcvTransform OcvTransform - 11.0 + 12.0 true + Windows Store + 8.1 DynamicLibrary true - v110 + v120 DynamicLibrary true - v110 + v120 DynamicLibrary true - v110 + v120 DynamicLibrary false true - v110 + v120 DynamicLibrary false true - v110 + v120 DynamicLibrary false true - v110 + v120 @@ -96,6 +97,7 @@ false $(Configuration)\$(MSBuildProjectName)\ + $(ProjectDir)..\..\..\..\..\bin\WS\8.1\x86\lib\Debug;$(ProjectDir)..\..\..\..\..\bin\WS\8.1\x86\3rdparty\lib\Debug;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) false @@ -123,11 +125,11 @@ $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) false - $(OPENCV_DIR)\include;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories);$(ProjectDir)\..\Common + ..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console - runtimeobject.lib;%(AdditionalDependencies);mf.lib;mfuuid.lib;mfplat.lib;opencv_core245.lib;opencv_imgproc245.lib + opencv_core300d.lib;opencv_imgproc300d.lib;zlibd.lib;runtimeobject.lib;%(AdditionalDependencies);mf.lib;mfuuid.lib;mfplat.lib false OcvTransform.def $(OPENCV_DIR)\lib;%(AdditionalLibraryDirectories) @@ -147,7 +149,7 @@ $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) false - $(OPENCV_DIR)\include;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories);$(ProjectDir)\..\Common + ..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -171,7 +173,7 @@ $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) false - $(OPENCV_DIR)\include;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories);$(ProjectDir)\..\Common + ..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -195,7 +197,7 @@ $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) false - $(OPENCV_DIR)\include;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories);$(ProjectDir)\..\Common + ..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -219,7 +221,7 @@ $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) false - $(OPENCV_DIR)\include;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories);$(ProjectDir)\..\Common + ..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -243,7 +245,7 @@ $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) false - $(OPENCV_DIR)\include;$(ProjectDir);$(IntermediateOutputPath);%(AdditionalIncludeDirectories);$(ProjectDir)\..\Common + ..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console @@ -316,4 +318,4 @@ - + \ No newline at end of file diff --git a/samples/winrt/ImageManipulations/Package.appxmanifest b/samples/winrt/ImageManipulations/Package.appxmanifest index b66e01465e..96b6455c4a 100644 --- a/samples/winrt/ImageManipulations/Package.appxmanifest +++ b/samples/winrt/ImageManipulations/Package.appxmanifest @@ -1,24 +1,28 @@  - - + + MediaCapture CPP sample Microsoft Corporation - Assets\storeLogo-sdk.png + Assets\windows-sdk.png - 6.2.1 - 6.2.1 + 6.3 + 6.3 - - - - + + + + + + + + @@ -33,4 +37,4 @@ - + \ No newline at end of file diff --git a/samples/winrt/ImageManipulations/assets/StoreLogo.png b/samples/winrt/ImageManipulations/assets/StoreLogo.png new file mode 100644 index 0000000000..af64bf00ad Binary files /dev/null and b/samples/winrt/ImageManipulations/assets/StoreLogo.png differ diff --git a/samples/winrt/ImageManipulations/assets/windows-sdk.scale-100.png b/samples/winrt/ImageManipulations/assets/windows-sdk.scale-100.png new file mode 100644 index 0000000000..af64bf00ad Binary files /dev/null and b/samples/winrt/ImageManipulations/assets/windows-sdk.scale-100.png differ diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing.sln b/samples/winrt/OcvImageProcessing/OcvImageProcessing.sln index 11bf904bc1..c93d53e9d1 100644 --- a/samples/winrt/OcvImageProcessing/OcvImageProcessing.sln +++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing.sln @@ -1,6 +1,8 @@  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 diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/MainPage.xaml.cpp b/samples/winrt/OcvImageProcessing/OcvImageProcessing/MainPage.xaml.cpp index 6d5ac04bda..85d6c318fd 100644 --- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/MainPage.xaml.cpp +++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/MainPage.xaml.cpp @@ -9,6 +9,8 @@ #include #include #include +#include + 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 detector = cv::FastFeatureDetector::create(50); + cv::Ptr detector = cv::FastFeatureDetector::create(50); std::vector features; image.copyTo(result); diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj b/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj index 1d862b71e1..ec7e826ae2 100644 --- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj +++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -30,42 +30,44 @@ {a5555ea2-f9e8-4078-90f5-d428f2c0d6d1} OcvImageProcessing en-US - 11.0 + 12.0 true + Windows Store + 8.1 Application true - v110 + v120 Application true - v110 + v120 Application true - v110 + v120 Application false true - v110 + v120 Application false true - v110 + v120 Application false true - v110 + v120 @@ -91,53 +93,73 @@ OcvImageProcessing_TemporaryKey.pfx - True + False + x86 + + + $(ProjectDir)..\..\..\..\bin\WS\8.1\x86\lib\Debug;$(ProjectDir)..\..\..\..\bin\WS\8.1\x86\3rdparty\lib\Debug;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) /bigobj %(AdditionalOptions) 4453 + ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + + %(AdditionalDependencies) + /bigobj %(AdditionalOptions) 4453 + ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + + %(AdditionalDependencies) + /bigobj %(AdditionalOptions) 4453 - $(OPENCV_DIR)\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) $(OPENCV_DIR)\lib;%(AdditionalLibraryDirectories) - opencv_core247d.lib;opencv_imgproc247d.lib;opencv_features2d247d.lib;%(AdditionalDependencies) + opencv_core300d.lib;opencv_imgproc300d.lib;opencv_features2d300d.lib;opencv_flann300d.lib;opencv_ml300d.lib;zlibd.lib;%(AdditionalDependencies) /bigobj %(AdditionalOptions) 4453 - $(OPENCV_DIR)\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) $(OPENCV_DIR)\lib;%(AdditionalLibraryDirectories) - opencv_core247.lib;opencv_imgproc247.lib;opencv_features2d247.lib;%(AdditionalDependencies) + %(AdditionalDependencies) /bigobj %(AdditionalOptions) 4453 + ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + + %(AdditionalDependencies) + /bigobj %(AdditionalOptions) 4453 + ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + + %(AdditionalDependencies) + @@ -163,103 +185,19 @@ Designer - - true - - + true - - true - - + true - - true - - + true - - true - - + true - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - + true diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj.filters b/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj.filters index 607c601c18..48876df958 100644 --- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj.filters +++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj.filters @@ -41,39 +41,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing_TemporaryKey.pfx b/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing_TemporaryKey.pfx new file mode 100644 index 0000000000..b7e4c30f27 Binary files /dev/null and b/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing_TemporaryKey.pfx differ diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/Package.appxmanifest b/samples/winrt/OcvImageProcessing/OcvImageProcessing/Package.appxmanifest index 40f61cf768..19ed89b27b 100644 --- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/Package.appxmanifest +++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/Package.appxmanifest @@ -1,24 +1,28 @@  - - + + OcvImageProcessing asmorkalov Assets\StoreLogo.png - 6.2.1 - 6.2.1 + 6.3 + 6.3 - - - - + + + + + + + + \ No newline at end of file diff --git a/samples/winrt/readme.txt b/samples/winrt/readme.txt new file mode 100644 index 0000000000..2f22658c90 --- /dev/null +++ b/samples/winrt/readme.txt @@ -0,0 +1,6 @@ +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