Merge branch 'release/1.3.0.2'

takuya-takeuchi · Jun 25, 2020 · e91da42 · e91da42
2 parents 86d559d + b7ab159
commit e91da42
Show file tree

Hide file tree

Showing 15 changed files with 144 additions and 171 deletions.
diff --git a/nuget/TestPackage.ps1 b/nuget/TestPackage.ps1
@@ -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"
 

diff --git a/nuget/nuspec/FaceRecognitionDotNet.CPU.nuspec b/nuget/nuspec/FaceRecognitionDotNet.CPU.nuspec
@@ -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>

diff --git a/nuget/nuspec/FaceRecognitionDotNet.CUDA100.nuspec b/nuget/nuspec/FaceRecognitionDotNet.CUDA100.nuspec
@@ -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>

diff --git a/nuget/nuspec/FaceRecognitionDotNet.CUDA101.nuspec b/nuget/nuspec/FaceRecognitionDotNet.CUDA101.nuspec
@@ -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>

diff --git a/nuget/nuspec/FaceRecognitionDotNet.CUDA102.nuspec b/nuget/nuspec/FaceRecognitionDotNet.CUDA102.nuspec
@@ -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>

diff --git a/nuget/nuspec/FaceRecognitionDotNet.CUDA92.nuspec b/nuget/nuspec/FaceRecognitionDotNet.CUDA92.nuspec
@@ -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>

diff --git a/nuget/nuspec/FaceRecognitionDotNet.MKL.nuspec b/nuget/nuspec/FaceRecognitionDotNet.MKL.nuspec
@@ -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>

diff --git a/src/FaceRecognitionDotNet/FaceEncoding.cs b/src/FaceRecognitionDotNet/FaceEncoding.cs
@@ -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>

diff --git a/src/FaceRecognitionDotNet/docs/FaceRecognitionDotNet.xml b/src/FaceRecognitionDotNet/docs/FaceRecognitionDotNet.xml
diff --git a/src/FaceRecognitionDotNet/docs/ja/FaceRecognitionDotNet.xml b/src/FaceRecognitionDotNet/docs/ja/FaceRecognitionDotNet.xml
diff --git a/test/FaceRecognitionDotNet.Tests/FaceRecognitionDotNet.Tests.csproj b/test/FaceRecognitionDotNet.Tests/FaceRecognitionDotNet.Tests.csproj
@@ -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>