Skip to content

Commit

Permalink
Merge branch 'release/1.3.0.2'
Browse files Browse the repository at this point in the history
takuya-takeuchi committed Jun 25, 2020
2 parents 86d559d + b7ab159 commit e91da42
Showing 15 changed files with 144 additions and 171 deletions.
13 changes: 12 additions & 1 deletion nuget/TestPackage.ps1
Original file line number Diff line number Diff line change
@@ -60,7 +60,18 @@ function RunTest($BuildTargets, $DependencyHash)
Remove-Item -Path "$TargetDir" -Recurse -Force
}

Copy-Item "$NativeTestDir" "$WorkDir" -Recurse
$TargetDirTestImages = Join-Path $TargetDir TestImages
if (Test-Path "$TargetDirTestImages") {
Remove-Item -Path "$TargetDirTestImages" -Recurse -Force
}

$NativeTestDirTestImages = Join-Path $NativeTestDir TestImages
$NativeTestDirSources = Join-Path $NativeTestDir "*.cs"
$NativeTestDirProject = Join-Path $NativeTestDir "FaceRecognitionDotNet.Tests.csproj"
Copy-Item "$NativeTestDirTestImages" "$TargetDirTestImages" -Recurse
Copy-Item "$NativeTestDirSources" "$TargetDir" -Recurse
Copy-Item "$NativeTestDirProject" "$TargetDir" -Recurse


Set-Location -Path "$TargetDir"

2 changes: 1 addition & 1 deletion nuget/nuspec/FaceRecognitionDotNet.CPU.nuspec
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>FaceRecognitionDotNet</id>
<version>1.3.0.1</version>
<version>1.3.0.2</version>
<title>FaceRecognitionDotNet</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
6 changes: 3 additions & 3 deletions nuget/nuspec/FaceRecognitionDotNet.CUDA100.nuspec
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>FaceRecognitionDotNet.CUDA100</id>
<version>1.3.0.1</version>
<version>1.3.0.2</version>
<title>FaceRecognitionDotNet for CUDA 10.0</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
@@ -20,11 +20,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<

<dependencies>
<group targetFramework="net461">
<dependency id="DlibDotNet" version="19.18.0.20200525" />
<dependency id="DlibDotNet.CUDA100" version="19.18.0.20200525" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Drawing.Common" version="4.7.0" />
<dependency id="DlibDotNet" version="19.18.0.20200525" />
<dependency id="DlibDotNet.CUDA100" version="19.18.0.20200525" />
</group>
</dependencies>
<frameworkAssemblies>
6 changes: 3 additions & 3 deletions nuget/nuspec/FaceRecognitionDotNet.CUDA101.nuspec
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>FaceRecognitionDotNet.CUDA101</id>
<version>1.3.0.1</version>
<version>1.3.0.2</version>
<title>FaceRecognitionDotNet for CUDA 10.1</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
@@ -20,11 +20,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<

<dependencies>
<group targetFramework="net461">
<dependency id="DlibDotNet" version="19.18.0.20200525" />
<dependency id="DlibDotNet.CUDA101" version="19.18.0.20200525" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Drawing.Common" version="4.7.0" />
<dependency id="DlibDotNet" version="19.18.0.20200525" />
<dependency id="DlibDotNet.CUDA101" version="19.18.0.20200525" />
</group>
</dependencies>
<frameworkAssemblies>
6 changes: 3 additions & 3 deletions nuget/nuspec/FaceRecognitionDotNet.CUDA102.nuspec
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>FaceRecognitionDotNet.CUDA102</id>
<version>1.3.0.1</version>
<version>1.3.0.2</version>
<title>FaceRecognitionDotNet for CUDA 10.2</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
@@ -20,11 +20,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<

<dependencies>
<group targetFramework="net461">
<dependency id="DlibDotNet" version="19.18.0.20200525" />
<dependency id="DlibDotNet.CUDA102" version="19.18.0.20200525" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Drawing.Common" version="4.7.0" />
<dependency id="DlibDotNet" version="19.18.0.20200525" />
<dependency id="DlibDotNet.CUDA102" version="19.18.0.20200525" />
</group>
</dependencies>
<frameworkAssemblies>
6 changes: 3 additions & 3 deletions nuget/nuspec/FaceRecognitionDotNet.CUDA92.nuspec
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>FaceRecognitionDotNet.CUDA92</id>
<version>1.3.0.1</version>
<version>1.3.0.2</version>
<title>FaceRecognitionDotNet for CUDA 9.2</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
@@ -20,11 +20,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<

<dependencies>
<group targetFramework="net461">
<dependency id="DlibDotNet" version="19.18.0.20200525" />
<dependency id="DlibDotNet.CUDA92" version="19.18.0.20200525" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Drawing.Common" version="4.7.0" />
<dependency id="DlibDotNet" version="19.18.0.20200525" />
<dependency id="DlibDotNet.CUDA92" version="19.18.0.20200525" />
</group>
</dependencies>
<frameworkAssemblies>
6 changes: 3 additions & 3 deletions nuget/nuspec/FaceRecognitionDotNet.MKL.nuspec
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
<package >
<metadata>
<id>FaceRecognitionDotNet.MKL</id>
<version>1.3.0.1</version>
<version>1.3.0.2</version>
<title>FaceRecognitionDotNet for MKL</title>
<authors>Takuya Takeuchi</authors>
<owners>Takuya Takeuchi</owners>
@@ -20,11 +20,11 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<

<dependencies>
<group targetFramework="net461">
<dependency id="DlibDotNet" version="19.18.0.20200525" />
<dependency id="DlibDotNet.MKL" version="19.18.0.20200525" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Drawing.Common" version="4.7.0" />
<dependency id="DlibDotNet" version="19.18.0.20200525" />
<dependency id="DlibDotNet.MKL" version="19.18.0.20200525" />
</group>
</dependencies>
<frameworkAssemblies>
11 changes: 11 additions & 0 deletions src/FaceRecognitionDotNet/FaceEncoding.cs
Original file line number Diff line number Diff line change
@@ -59,6 +59,17 @@ public int Size

#region Methods

/// <summary>
/// Gets a feature data of face as raw format.
/// </summary>
/// <returns>A <see cref="double"/> array that represents a feature data.</returns>
/// <remarks><see cref="FaceEncoding"/> class supports serialization. This method is for interoperability between FaceRecognitionDotNet and dlib.</remarks>
public double[] GetRawEncoding()
{
this.ThrowIfDisposed();
return this._Encoding.ToArray();
}

#region Overrides

/// <summary>
7 changes: 7 additions & 0 deletions src/FaceRecognitionDotNet/docs/FaceRecognitionDotNet.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions src/FaceRecognitionDotNet/docs/ja/FaceRecognitionDotNet.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -21,6 +21,12 @@
<None Update="TestImages\32bit.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TestImages\480px-Biden_2013.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TestImages\480px-President_Barack_Obama.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TestImages\Age\DianaPrincessOfWales_1997_36.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
235 changes: 82 additions & 153 deletions test/FaceRecognitionDotNet.Tests/FaceRecognitionTest.cs

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@ public class ImageTest

private const string ResultDirectory = "Result";

private const string TestImageDirectory = "TestImages";

#endregion

[Fact]
@@ -25,7 +27,7 @@ public void Save()
new { Name = "saved.png", Format = ImageFormat.Png },
};

using (var img = FaceRecognition.LoadImageFile(Path.Combine("TestImages", "obama.jpg")))
using (var img = FaceRecognition.LoadImageFile(Path.Combine(TestImageDirectory, "obama.jpg")))
{
var directory = Path.Combine(ResultDirectory, testName);
Directory.CreateDirectory(directory);
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e91da42

Please sign in to comment.