Skip to content

Commit 4df7ff6

Browse files
AshleyFAshleyF
committed
Merged PR 31263: Release 0.10.16.1
Release build 0.10.16.1 into Master
1 parent 67b1205 commit 4df7ff6

File tree

121 files changed

+9225
-4716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+9225
-4716
lines changed

‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Company>Microsoft Corporation</Company>
77
<Owners>microsoft,psi</Owners>
88
<Authors>Microsoft</Authors>
9-
<AssemblyVersion>0.9.6.1</AssemblyVersion>
9+
<AssemblyVersion>0.10.16.1</AssemblyVersion>
1010
<FileVersion>$(AssemblyVersion)</FileVersion>
1111
<Version>$(AssemblyVersion)-beta</Version>
1212
<SignAssembly>false</SignAssembly>

‎Samples/KinectSample/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation. All rights reserved.")]
1111
[assembly: ComVisible(false)]
1212
[assembly: Guid("c42c2219-487c-479e-87e7-90e1e47ab049")]
13-
[assembly: AssemblyVersion("0.9.6.1")]
14-
[assembly: AssemblyFileVersion("0.9.6.1")]
15-
[assembly: AssemblyInformationalVersion("0.9.6.1-beta")]
13+
[assembly: AssemblyVersion("0.10.16.1")]
14+
[assembly: AssemblyFileVersion("0.10.16.1")]
15+
[assembly: AssemblyInformationalVersion("0.10.16.1-beta")]

‎Samples/OpenCVSample/OpenCVSample.Interop/AssemblyInfo.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ using namespace System::Security::Permissions;
1313
[assembly:AssemblyProductAttribute(L"OpenCVSampleInterop")];
1414
[assembly:AssemblyCompanyAttribute(L"Microsoft Corporation")];
1515
[assembly:AssemblyCopyrightAttribute(L"Copyright (c) Microsoft Corporation. All rights reserved.")];
16-
[assembly:AssemblyVersionAttribute("0.9.6.1")];
17-
[assembly:AssemblyFileVersionAttribute("0.9.6.1")];
18-
[assembly:AssemblyInformationalVersionAttribute("0.9.6.1-beta")];
16+
[assembly:AssemblyVersionAttribute("0.10.16.1")];
17+
[assembly:AssemblyFileVersionAttribute("0.10.16.1")];
18+
[assembly:AssemblyInformationalVersionAttribute("0.10.16.1-beta")];
1919
[assembly:ComVisible(false)];
2020
[assembly:CLSCompliantAttribute(true)];

‎Samples/OpenCVSample/OpenCVSample.Interop/OpenCVNative.cpp

+4-6
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,12 @@ namespace Microsoft
3939

4040
static void SaveImage(ImageBuffer ^img, System::String ^filename)
4141
{
42-
std::string fn = msclr::interop::marshal_as<std::string>(filename);
43-
cv::Mat matImg = WrapInMat(img);
44-
IplImage *iplImg = new IplImage(matImg);
45-
cvSaveImage(fn.c_str(), iplImg);
46-
delete iplImg;
42+
std::string fn = msclr::interop::marshal_as<std::string>(filename);
43+
cv::Mat matImg = WrapInMat(img);
44+
cv::imwrite(fn, matImg);
4745
}
4846
};
4947
}
5048
}
5149
}
52-
}
50+
}

‎Samples/OpenCVSample/OpenCVSample.Interop/OpenCVSample.Interop.vcxproj

+28-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project InitialTargets="CheckVariable" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Condition="'$(OpenCVDir_V4)'!=''">
4+
<OpenCVIncludes>$(OpenCVDir_V4)\build\include</OpenCVIncludes>
5+
<OpenCVLibs Condition="'$(Configuration)'=='Debug'">$(OpenCVDir_V4)\build\x64\vc15\lib\opencv_world411d.lib</OpenCVLibs>
6+
<OpenCVLibs Condition="'$(Configuration)'=='Release'">$(OpenCVDir_V4)\build\x64\vc15\lib\opencv_world411.lib</OpenCVLibs>
7+
<OpenCVDefines>SUPPORT_OPENCV</OpenCVDefines>
8+
</PropertyGroup>
9+
<PropertyGroup Condition="'$(OpenCVDir_V4)'==''">
10+
<OpenCVIncludes />
11+
<OpenCVLibs />
12+
<OpenCVDefines />
13+
</PropertyGroup>
314
<ItemGroup Label="ProjectConfigurations">
415
<ProjectConfiguration Include="Debug|x64">
516
<Configuration>Debug</Configuration>
@@ -50,7 +61,7 @@
5061
<EnableManagedIncrementalBuild>true</EnableManagedIncrementalBuild>
5162
<LinkKeyFile>
5263
</LinkKeyFile>
53-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(OpenCVDir)\build\include;$(OpenCVDir)\sources\modules\highgui\include;$(OpenCVDir)\sources\modules\core\include;$(OpenCVDir)\sources\modules\videostab\include;$(OpenCVDir)\sources\modules\imgcodecs\include;$(OpenCVDir)\sources\modules\imgproc\include;$(OpenCVDir)\sources\modules\videoio\include;;$(OpenCVDir)\sources\include</IncludePath>
64+
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
5465
<OutDir>$(Platform)\$(Configuration)\</OutDir>
5566
<IntDir>$(ProjectDir)\$(Platform)\$(Configuration)\</IntDir>
5667
<CodeAnalysisRuleSet>..\..\..\Build\Microsoft.Psi.ruleset</CodeAnalysisRuleSet>
@@ -60,7 +71,7 @@
6071
<EnableManagedIncrementalBuild>true</EnableManagedIncrementalBuild>
6172
<LinkKeyFile>
6273
</LinkKeyFile>
63-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(OpenCVDir)\build\include;$(OpenCVDir)\sources\modules\highgui\include;$(OpenCVDir)\sources\modules\core\include;$(OpenCVDir)\sources\modules\videostab\include;$(OpenCVDir)\sources\modules\imgcodecs\include;$(OpenCVDir)\sources\modules\imgproc\include;$(OpenCVDir)\sources\modules\videoio\include;;$(OpenCVDir)\sources\include</IncludePath>
74+
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
6475
<OutDir>$(Platform)\$(Configuration)\</OutDir>
6576
<IntDir>$(ProjectDir)\$(Platform)\$(Configuration)\</IntDir>
6677
<CodeAnalysisRuleSet>..\..\..\Build\Microsoft.Psi.ruleset</CodeAnalysisRuleSet>
@@ -71,19 +82,19 @@
7182
<Optimization>Disabled</Optimization>
7283
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7384
<PrecompiledHeader>Use</PrecompiledHeader>
74-
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
85+
<AdditionalIncludeDirectories>$(OpenCVIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7586
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
7687
</ClCompile>
7788
<Link>
7889
<GenerateDebugInformation>true</GenerateDebugInformation>
79-
<AdditionalDependencies>"$(OpenCVDir)\build\x64\vc14\lib\opencv_world330d.lib";kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
90+
<AdditionalDependencies>"$(OpenCVLibs)";kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
8091
<AdditionalLibraryDirectories>$(SolutionDir)bin\</AdditionalLibraryDirectories>
8192
<TargetMachine>MachineX64</TargetMachine>
8293
</Link>
8394
<PostBuildEvent>
8495
<Command>if not exist $(OutDir)..\..\..\OpenCVSample\bin\Debug (mkdir $(OutDir)..\..\..\OpenCVSample\bin\Debug)
8596
copy $(OutDir)$(TargetName)$(TargetExt) $(OutDir)..\..\..\OpenCVSample\bin\Debug\$(TargetName)$(TargetExt)
86-
copy $(OpenCVDir)\build\x64\vc14\bin\opencv_world330d.dll $(OutDir)..\..\..\OpenCVSample\bin\Debug</Command>
97+
copy $(OpenCVLibs) $(OutDir)..\..\..\OpenCVSample\bin\Debug</Command>
8798
</PostBuildEvent>
8899
</ItemDefinitionGroup>
89100
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -92,13 +103,13 @@ copy $(OpenCVDir)\build\x64\vc14\bin\opencv_world330d.dll $(OutDir)..\..\..\Open
92103
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93104
<PrecompiledHeader>Use</PrecompiledHeader>
94105
<Optimization>MaxSpeed</Optimization>
95-
<AdditionalIncludeDirectories>$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
106+
<AdditionalIncludeDirectories>$(OpenCVIncludes);$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
96107
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
97108
<BrowseInformation>true</BrowseInformation>
98109
</ClCompile>
99110
<Link>
100111
<GenerateDebugInformation>true</GenerateDebugInformation>
101-
<AdditionalDependencies>"$(OpenCVDir)\build\x64\vc14\lib\opencv_world330.lib";kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
112+
<AdditionalDependencies>"$(OpenCVLibs)";kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
102113
<AdditionalLibraryDirectories>$(SolutionDir)bin\</AdditionalLibraryDirectories>
103114
<TargetMachine>MachineX64</TargetMachine>
104115
</Link>
@@ -108,7 +119,7 @@ copy $(OpenCVDir)\build\x64\vc14\bin\opencv_world330d.dll $(OutDir)..\..\..\Open
108119
<PostBuildEvent>
109120
<Command>if not exist $(OutDir)..\..\..\OpenCVSample\bin\Release (mkdir $(OutDir)..\..\..\OpenCVSample\bin\Release)
110121
copy $(OutDir)$(TargetName)$(TargetExt) $(OutDir)..\..\..\OpenCVSample\bin\Release\$(TargetName)$(TargetExt)
111-
copy $(OpenCVDir)\build\x64\vc14\bin\opencv_world330.dll $(OutDir)..\..\..\OpenCVSample\bin\Release</Command>
122+
copy $(OpenCVLibs) $(OutDir)..\..\..\OpenCVSample\bin\Release</Command>
112123
</PostBuildEvent>
113124
</ItemDefinitionGroup>
114125
<ItemGroup>
@@ -139,10 +150,13 @@ copy $(OpenCVDir)\build\x64\vc14\bin\opencv_world330.dll $(OutDir)..\..\..\OpenC
139150
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
140151
<ImportGroup Label="ExtensionTargets">
141152
</ImportGroup>
153+
<Target Name="OldBuild" DependsOnTargets="$(OldBuildDependsOn)" />
142154
<Target Name="CheckVariable">
143-
<Warning Text="In order to build this sample you must define the environment variable OpenCVDir to point to your Intel RealSense SDK installation" ContinueOnError="WarnAndContinue" Condition="'$(OpenCVDir)'==''" />
144-
<CreateProperty Value="" Condition="'$(OpenCVDir)'==''">
145-
<Output TaskParameter="Value" PropertyName="BuildDependsOn" />
146-
</CreateProperty>
155+
<Warning Text="In order to build this sample you must define the environment variable OpenCVDir_V4 to point to your OpenCV SDK installation" ContinueOnError="WarnAndContinue" Condition="'$(OpenCVDir_V4)'==''" />
156+
<CallTarget Targets="OldBuild" Condition="'$(OpenCVDir_V4)'!=''" />
147157
</Target>
148-
</Project>
158+
<PropertyGroup>
159+
<OldBuildDependsOn>$(BuildDependsOn)</OldBuildDependsOn>
160+
<BuildDependsOn>CheckVariable</BuildDependsOn>
161+
</PropertyGroup>
162+
</Project>

‎Samples/OpenCVSample/OpenCVSample/OpenCVSample.csproj

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets="CheckVariable">
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -141,10 +141,13 @@
141141
</PackageReference>
142142
</ItemGroup>
143143
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
144+
<Target Name="OldBuild" DependsOnTargets="$(OldBuildDependsOn)"/>
144145
<Target Name="CheckVariable">
145-
<Warning Text="In order to build this sample you must define the environment variable OpenCVDir to point to your Intel RealSense SDK installation" ContinueOnError="WarnAndContinue" Condition="'$(OpenCVDir)'==''" />
146-
<CreateProperty Value="" Condition="'$(OpenCVDir)'==''">
147-
<Output TaskParameter="Value" PropertyName="BuildDependsOn" />
148-
</CreateProperty>
146+
<Warning Text="In order to build this sample you must define the environment variable OpenCVDir_V4 to point to your OpenCV SDK installation" ContinueOnError="WarnAndContinue" Condition="'$(OpenCVDir_V4)'==''" />
147+
<CallTarget Targets="OldBuild" Condition="'$(OpenCVDir_V4)'!=''"/>
149148
</Target>
150-
</Project>
149+
<PropertyGroup>
150+
<OldBuildDependsOn>$(BuildDependsOn)</OldBuildDependsOn>
151+
<BuildDependsOn>CheckVariable</BuildDependsOn>
152+
</PropertyGroup>
153+
</Project>

‎Samples/OpenCVSample/OpenCVSample/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation. All rights reserved.")]
1212
[assembly: ComVisible(false)]
1313
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
14-
[assembly: AssemblyVersion("0.9.6.1")]
15-
[assembly: AssemblyFileVersion("0.9.6.1")]
16-
[assembly: AssemblyInformationalVersion("0.9.6.1-beta")]
14+
[assembly: AssemblyVersion("0.10.16.1")]
15+
[assembly: AssemblyFileVersion("0.10.16.1")]
16+
[assembly: AssemblyInformationalVersion("0.10.16.1-beta")]

‎Samples/OpenCVSample/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ This sample demostrates how to integrate OpenCV with Platform for Situated Intel
44
1) OpenCVSample.csproj is the main sample. It creates a webcam source and sends the images from the camera to OpenCV to convert them to gray scale.
55
2) OpenCVSampleInterop is a C++ project that is used to interop between C# and OpenCV.
66

7-
The OpenCVSample.Interop project is the interop layer between the sample (project OpenCVSample) and OpenCV. In order to build this project you will need OpenCV installed on your machine. OpenCV can be obtained [here](http://opencv.org/releases.html). The sample relies on version 3.3.0. You will need to set an environment variable named "OpenCVDir" that points to your OpenCV installation. The path should be the root of OpenCV which contains the "sources" directory (along with the license). For instance, "D:\cv3.3\opencv".
7+
The OpenCVSample.Interop project is the interop layer between the sample (project OpenCVSample) and OpenCV. In order to build this project you will need OpenCV installed on your machine. OpenCV can be obtained [here](http://opencv.org/releases.html). The sample relies on version 4.1.1. You will need to set an environment variable named "OpenCVDir_V4" that points to your OpenCV installation. The path should be the root of OpenCV which contains the "sources" directory (along with the license). For instance, "D:\OpenCV-4.1.1\opencv".

‎Samples/SpeechSample/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation. All rights reserved.")]
1111
[assembly: ComVisible(false)]
1212
[assembly: Guid("c5ab7394-68fb-4641-bdae-8a956edc44a9")]
13-
[assembly: AssemblyVersion("0.9.6.1")]
14-
[assembly: AssemblyFileVersion("0.9.6.1")]
15-
[assembly: AssemblyInformationalVersion("0.9.6.1-beta")]
13+
[assembly: AssemblyVersion("0.10.16.1")]
14+
[assembly: AssemblyFileVersion("0.10.16.1")]
15+
[assembly: AssemblyInformationalVersion("0.10.16.1-beta")]

‎Samples/WebcamWithAudioSample/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation. All rights reserved.")]
1111
[assembly: ComVisible(false)]
1212
[assembly: Guid("f2c129ec-e1be-4f37-aa91-c48d1b98d75a")]
13-
[assembly: AssemblyVersion("0.9.6.1")]
14-
[assembly: AssemblyFileVersion("0.9.6.1")]
15-
[assembly: AssemblyInformationalVersion("0.9.6.1-beta")]
13+
[assembly: AssemblyVersion("0.10.16.1")]
14+
[assembly: AssemblyFileVersion("0.10.16.1")]
15+
[assembly: AssemblyInformationalVersion("0.10.16.1-beta")]

‎Samples/WpfSample/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation. All rights reserved.")]
1212
[assembly: ComVisible(false)]
1313
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
14-
[assembly: AssemblyVersion("0.9.6.1")]
15-
[assembly: AssemblyFileVersion("0.9.6.1")]
16-
[assembly: AssemblyInformationalVersion("0.9.6.1-beta")]
14+
[assembly: AssemblyVersion("0.10.16.1")]
15+
[assembly: AssemblyFileVersion("0.10.16.1")]
16+
[assembly: AssemblyInformationalVersion("0.10.16.1-beta")]

‎Sources/Data/Test.Psi.Data/DatasetTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ await session.CreateDerivedPartitionAsync(
386386
(pipeline, importer, exporter, parameter) =>
387387
{
388388
var inputStream = importer.OpenStream<int>("Root");
389-
var derivedStream = inputStream.Sample(TimeSpan.FromMinutes(1)).Select(x => x * parameter).Write("DerivedStream", exporter);
389+
var derivedStream = inputStream.Sample(TimeSpan.FromMinutes(1), RelativeTimeInterval.Infinite).Select(x => x * parameter).Write("DerivedStream", exporter);
390390

391391
// add a dummy source and propose a long time interval so that the operation will block (and eventually be cancelled)
392392
var generator = Generators.Repeat(pipeline, 0, int.MaxValue, TimeSpan.FromMilliseconds(1000));
@@ -424,7 +424,7 @@ private static void GenerateTestStore(string storeName, string storePath)
424424
using (var p = Pipeline.Create())
425425
{
426426
var store = Store.Create(p, storeName, storePath);
427-
var root = Generators.Sequence(p, 0, i => i + 1, 10).Write("Root", store);
427+
var root = Generators.Sequence(p, 0, i => i + 1, 10, TimeSpan.FromTicks(1)).Write("Root", store);
428428
p.Run();
429429
}
430430
}

‎Sources/Data/Test.Psi.Data/SimpleReaderTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void SimpleReader()
4343
using (var p = Pipeline.Create("write"))
4444
{
4545
var writeStore = Store.Create(p, name, this.path);
46-
var seq = Generators.Sequence(p, 0, i => i + 1, count);
46+
var seq = Generators.Sequence(p, 0, i => i + 1, count, TimeSpan.FromTicks(1));
4747
seq.Write("seq", writeStore);
4848
seq.Do((m, e) => before[m] = e);
4949
p.Run();
@@ -74,7 +74,7 @@ public void SimpleReaderLargeStream()
7474
using (var p = Pipeline.Create("write"))
7575
{
7676
var writeStore = Store.Create(p, name, this.path);
77-
var seq = Generators.Sequence(p, 0, i => i + 1, count);
77+
var seq = Generators.Sequence(p, 0, i => i + 1, count, TimeSpan.FromTicks(1));
7878
var big = seq.Select(i => bytes.Select(_ => i).ToArray());
7979
seq.Write("seq", writeStore);
8080
big.Write("big", writeStore, largeMessages: true);

0 commit comments

Comments
 (0)