Skip to content

Commit e91da42

Browse files
takuya-takeuchitakuya-takeuchi
committed
Merge branch 'release/1.3.0.2'
2 parents 86d559d + b7ab159 commit e91da42

15 files changed

+144
-171
lines changed

‎nuget/TestPackage.ps1‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,18 @@ function RunTest($BuildTargets, $DependencyHash)
6060
Remove-Item -Path "$TargetDir" -Recurse -Force
6161
}
6262

63-
Copy-Item "$NativeTestDir" "$WorkDir" -Recurse
63+
$TargetDirTestImages = Join-Path $TargetDir TestImages
64+
if (Test-Path "$TargetDirTestImages") {
65+
Remove-Item -Path "$TargetDirTestImages" -Recurse -Force
66+
}
67+
68+
$NativeTestDirTestImages = Join-Path $NativeTestDir TestImages
69+
$NativeTestDirSources = Join-Path $NativeTestDir "*.cs"
70+
$NativeTestDirProject = Join-Path $NativeTestDir "FaceRecognitionDotNet.Tests.csproj"
71+
Copy-Item "$NativeTestDirTestImages" "$TargetDirTestImages" -Recurse
72+
Copy-Item "$NativeTestDirSources" "$TargetDir" -Recurse
73+
Copy-Item "$NativeTestDirProject" "$TargetDir" -Recurse
74+
6475

6576
Set-Location -Path "$TargetDir"
6677

‎nuget/nuspec/FaceRecognitionDotNet.CPU.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>FaceRecognitionDotNet</id>
5-
<version>1.3.0.1</version>
5+
<version>1.3.0.2</version>
66
<title>FaceRecognitionDotNet</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>

‎nuget/nuspec/FaceRecognitionDotNet.CUDA100.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>FaceRecognitionDotNet.CUDA100</id>
5-
<version>1.3.0.1</version>
5+
<version>1.3.0.2</version>
66
<title>FaceRecognitionDotNet for CUDA 10.0</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>
@@ -20,11 +20,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<
2020

2121
<dependencies>
2222
<group targetFramework="net461">
23-
<dependency id="DlibDotNet" version="19.18.0.20200525" />
23+
<dependency id="DlibDotNet.CUDA100" version="19.18.0.20200525" />
2424
</group>
2525
<group targetFramework="netstandard2.0">
2626
<dependency id="System.Drawing.Common" version="4.7.0" />
27-
<dependency id="DlibDotNet" version="19.18.0.20200525" />
27+
<dependency id="DlibDotNet.CUDA100" version="19.18.0.20200525" />
2828
</group>
2929
</dependencies>
3030
<frameworkAssemblies>

‎nuget/nuspec/FaceRecognitionDotNet.CUDA101.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>FaceRecognitionDotNet.CUDA101</id>
5-
<version>1.3.0.1</version>
5+
<version>1.3.0.2</version>
66
<title>FaceRecognitionDotNet for CUDA 10.1</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>
@@ -20,11 +20,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<
2020

2121
<dependencies>
2222
<group targetFramework="net461">
23-
<dependency id="DlibDotNet" version="19.18.0.20200525" />
23+
<dependency id="DlibDotNet.CUDA101" version="19.18.0.20200525" />
2424
</group>
2525
<group targetFramework="netstandard2.0">
2626
<dependency id="System.Drawing.Common" version="4.7.0" />
27-
<dependency id="DlibDotNet" version="19.18.0.20200525" />
27+
<dependency id="DlibDotNet.CUDA101" version="19.18.0.20200525" />
2828
</group>
2929
</dependencies>
3030
<frameworkAssemblies>

‎nuget/nuspec/FaceRecognitionDotNet.CUDA102.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>FaceRecognitionDotNet.CUDA102</id>
5-
<version>1.3.0.1</version>
5+
<version>1.3.0.2</version>
66
<title>FaceRecognitionDotNet for CUDA 10.2</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>
@@ -20,11 +20,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<
2020

2121
<dependencies>
2222
<group targetFramework="net461">
23-
<dependency id="DlibDotNet" version="19.18.0.20200525" />
23+
<dependency id="DlibDotNet.CUDA102" version="19.18.0.20200525" />
2424
</group>
2525
<group targetFramework="netstandard2.0">
2626
<dependency id="System.Drawing.Common" version="4.7.0" />
27-
<dependency id="DlibDotNet" version="19.18.0.20200525" />
27+
<dependency id="DlibDotNet.CUDA102" version="19.18.0.20200525" />
2828
</group>
2929
</dependencies>
3030
<frameworkAssemblies>

‎nuget/nuspec/FaceRecognitionDotNet.CUDA92.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>FaceRecognitionDotNet.CUDA92</id>
5-
<version>1.3.0.1</version>
5+
<version>1.3.0.2</version>
66
<title>FaceRecognitionDotNet for CUDA 9.2</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>
@@ -20,11 +20,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<
2020

2121
<dependencies>
2222
<group targetFramework="net461">
23-
<dependency id="DlibDotNet" version="19.18.0.20200525" />
23+
<dependency id="DlibDotNet.CUDA92" version="19.18.0.20200525" />
2424
</group>
2525
<group targetFramework="netstandard2.0">
2626
<dependency id="System.Drawing.Common" version="4.7.0" />
27-
<dependency id="DlibDotNet" version="19.18.0.20200525" />
27+
<dependency id="DlibDotNet.CUDA92" version="19.18.0.20200525" />
2828
</group>
2929
</dependencies>
3030
<frameworkAssemblies>

‎nuget/nuspec/FaceRecognitionDotNet.MKL.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>FaceRecognitionDotNet.MKL</id>
5-
<version>1.3.0.1</version>
5+
<version>1.3.0.2</version>
66
<title>FaceRecognitionDotNet for MKL</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>
@@ -20,11 +20,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<
2020

2121
<dependencies>
2222
<group targetFramework="net461">
23-
<dependency id="DlibDotNet" version="19.18.0.20200525" />
23+
<dependency id="DlibDotNet.MKL" version="19.18.0.20200525" />
2424
</group>
2525
<group targetFramework="netstandard2.0">
2626
<dependency id="System.Drawing.Common" version="4.7.0" />
27-
<dependency id="DlibDotNet" version="19.18.0.20200525" />
27+
<dependency id="DlibDotNet.MKL" version="19.18.0.20200525" />
2828
</group>
2929
</dependencies>
3030
<frameworkAssemblies>

‎src/FaceRecognitionDotNet/FaceEncoding.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,17 @@ public int Size
5959

6060
#region Methods
6161

62+
/// <summary>
63+
/// Gets a feature data of face as raw format.
64+
/// </summary>
65+
/// <returns>A <see cref="double"/> array that represents a feature data.</returns>
66+
/// <remarks><see cref="FaceEncoding"/> class supports serialization. This method is for interoperability between FaceRecognitionDotNet and dlib.</remarks>
67+
public double[] GetRawEncoding()
68+
{
69+
this.ThrowIfDisposed();
70+
return this._Encoding.ToArray();
71+
}
72+
6273
#region Overrides
6374

6475
/// <summary>

‎src/FaceRecognitionDotNet/docs/FaceRecognitionDotNet.xml‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/FaceRecognitionDotNet/docs/ja/FaceRecognitionDotNet.xml‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)