Merge branch 'release/1.2.3.10'

Author: takuya-takeuchi

DlibDotNet

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Takuya Takeuchi
+Copyright (c) 2018-2019 Takuya Takeuchi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE renamed to LICENSE.txt

@@ -2,12 +2,12 @@
 <package >
   <metadata>
     <id>FaceRecognitionDotNet</id>
-    <version>1.2.3.9</version>
+    <version>1.2.3.10</version>
     <title>FaceRecognitionDotNet</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
+    <license type="file">LICENSE.txt</license>
     <projectUrl>https://github.com/takuya-takeuchi/FaceRecognitionDotNet</projectUrl>
     <iconUrl>https://github.com/takuya-takeuchi/FaceRecognitionDotNet/blob/master/nuget/face128.png?raw=true</iconUrl>
     <description>The world's simplest facial recognition api for .NET
@@ -19,13 +19,16 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<
     <serviceable>true</serviceable>
     <dependencies>
       <group targetFramework="netstandard2.0">
-        <dependency id="DlibDotNet" version="[19.16.0.20190122,)" />
+        <dependency id="DlibDotNet" version="[19.16.0.20190223,)" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <file src="..\src\FaceRecognitionDotNet\bin\Release\netstandard2.0\FaceRecognitionDotNet.dll" target="lib\netstandard2.0" />
     <file src="..\src\FaceRecognitionDotNet\bin\Release\netstandard2.0\FaceRecognitionDotNet.xml" target="lib\netstandard2.0" />
-    <file src="..\src\FaceRecognitionDotNet\docs\ja\*.xml" target="lib\netstandard2.0\ja" /> 
+    <file src="..\src\FaceRecognitionDotNet\docs\ja\*.xml" target="lib\netstandard2.0\ja" />
+    
+    <!-- license -->
+    <file src="..\LICENSE.txt" target="" /> 
   </files>
 </package>

nuget/FaceRecognitionDotNet-CPU.nuspec

@@ -2,12 +2,12 @@
 <package >
   <metadata>
     <id>FaceRecognitionDotNet-WithCUDA</id>
-    <version>1.2.3.9</version>
+    <version>1.2.3.10</version>
     <title>FaceRecognitionDotNet (with CUDA)</title>
     <authors>Takuya Takeuchi</authors>
     <owners>Takuya Takeuchi</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
+    <license type="file">LICENSE.txt</license>
     <projectUrl>https://github.com/takuya-takeuchi/FaceRecognitionDotNet</projectUrl>
     <iconUrl>https://github.com/takuya-takeuchi/FaceRecognitionDotNet/blob/master/nuget/face128.png?raw=true</iconUrl>
     <description>The world's simplest facial recognition api for .NET
@@ -19,13 +19,16 @@ This library is ported from https://github.com/ageitgey/face_recognition by C#.<
     <serviceable>true</serviceable>
     <dependencies>
       <group targetFramework="netstandard2.0">
-        <dependency id="DlibDotNet-WithCUDA" version="[19.16.0.20190122,)" />
+        <dependency id="DlibDotNet-WithCUDA" version="[19.16.0.20190223,)" />
       </group>
     </dependencies>
   </metadata>
   <files>
     <file src="..\src\FaceRecognitionDotNet\bin\Release\netstandard2.0\FaceRecognitionDotNet.dll" target="lib\netstandard2.0" />
     <file src="..\src\FaceRecognitionDotNet\bin\Release\netstandard2.0\FaceRecognitionDotNet.xml" target="lib\netstandard2.0" />
     <file src="..\src\FaceRecognitionDotNet\docs\ja\*.xml" target="lib\netstandard2.0\ja" />
+    
+    <!-- license -->
+    <file src="..\LICENSE.txt" target="" /> 
   </files>
 </package>

nuget/FaceRecognitionDotNet-CUDA.nuspec

@@ -372,6 +372,26 @@ public IEnumerable<Location> FaceLocations(Image image, int numberOfTimesToUpsam
             }
         }
 
+        /// <summary>
+        /// Creates an <see cref="FaceEncoding"/> from the <see cref="double"/> array.
+        /// </summary>
+        /// <param name="encoding">The <see cref="double"/> array contains face encoding data.</param>
+        /// <returns>The <see cref="FaceEncoding"/> this method creates.</returns>
+        /// <exception cref="ArgumentNullException"><paramref name="encoding"/> is null.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="encoding"/> must be 128.</exception>
+        public static FaceEncoding LoadFaceEncoding(double[] encoding)
+        {
+            if (encoding == null)
+                throw new ArgumentNullException(nameof(encoding));
+            if (encoding.Length != 128)
+                throw new ArgumentOutOfRangeException($"{nameof(encoding)}.{nameof(encoding.Length)} must be 128.");
+            
+            var matrix = Matrix<double>.CreateTemplateParameterizeMatrix(0, 1);
+            matrix.SetSize(128);
+            matrix.Assign(encoding);
+            return new FaceEncoding(matrix);
+        }
+
         /// <summary>
         /// Creates an <see cref="Image"/> from the <see cref="byte"/> array.
         /// </summary>

nuget/nuget.exe

@@ -5,7 +5,7 @@
     <Authors>Takuya Takeuchi</Authors>
     <Copyright>Takuya Takeuchi</Copyright>
     <Description>Porting face_recognition (by Adam Geitgey) by C#</Description>
-    <Version>1.2.3.9</Version>
+    <Version>1.2.3.10</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

src/FaceRecognitionDotNet/FaceRecognition.cs

@@ -446,6 +446,96 @@ public void Initialize()
             this._FaceRecognition = FaceRecognition.Create(ModelDirectory);
         }
 
+        [TestMethod]
+        public void LoadFaceEncoding()
+        {
+            var bidenUrl = "https://upload.wikimedia.org/wikipedia/commons/thumb/6/64/Biden_2013.jpg";
+            var bidenFile = "480px-Biden_2013.jpg";
+
+            var path1 = Path.Combine(ImageDirectory, bidenFile);
+            if (!File.Exists(path1))
+            {
+                var url = $"{bidenUrl}/{bidenFile}";
+                var binary = new HttpClient().GetByteArrayAsync(url).Result;
+
+                Directory.CreateDirectory(ImageDirectory);
+                File.WriteAllBytes(path1, binary);
+            }
+
+            bool atLeast1Time = false;
+
+            var getMatrix = typeof(FaceEncoding).GetField("_Encoding", BindingFlags.Instance | BindingFlags.NonPublic);
+
+            foreach (var mode in new[] { Mode.Rgb, Mode.Greyscale })
+            {
+                using (var image1 = FaceRecognition.LoadImageFile(path1, mode))
+                {
+                    var encodings = this._FaceRecognition.FaceEncodings(image1).ToArray();
+                    foreach (var e1 in encodings)
+                    {
+                        atLeast1Time = true;
+
+                        var matrix = getMatrix.GetValue(e1) as Matrix<double>;
+                        Assert.IsNotNull(matrix);
+
+                        var fe = matrix.ToArray();
+
+                        using (var e2 = FaceRecognition.LoadFaceEncoding(fe))
+                        {
+                            var distance = FaceRecognition.FaceDistance(e1, e2);
+                            Console.WriteLine($"Original: {distance}");
+                            Assert.IsTrue(Math.Abs(distance) < double.Epsilon);
+                        }
+
+                        fe[0] = 1;
+                        using (var e2 = FaceRecognition.LoadFaceEncoding(fe))
+                        {
+                            var distance = FaceRecognition.FaceDistance(e1, e2);
+                            Console.WriteLine($"Modified: {distance}");
+                            Assert.IsTrue(Math.Abs(distance) > double.Epsilon);
+                        }
+                    }
+
+                    foreach (var encoding in encodings)
+                        encoding.Dispose();
+                }
+            }
+
+            if (!atLeast1Time)
+                Assert.Fail("Assert check did not execute");
+        }
+
+        [TestMethod]
+        public void LoadFaceEncodingFail()
+        {
+            try
+            {
+                FaceRecognition.LoadFaceEncoding(null);
+                Assert.Fail($"{nameof(this.FaceEncodings)}.{nameof(FaceRecognition.LoadFaceEncoding)} should throw {nameof(ArgumentNullException)}");
+            }
+            catch (ArgumentNullException)
+            {
+            }
+
+            try
+            {
+                FaceRecognition.LoadFaceEncoding(new double[129]);
+                Assert.Fail($"{nameof(this.FaceEncodings)}.{nameof(FaceRecognition.LoadFaceEncoding)} should throw {nameof(ArgumentOutOfRangeException)}");
+            }
+            catch (ArgumentOutOfRangeException)
+            {
+            }
+
+            try
+            {
+                FaceRecognition.LoadFaceEncoding(new double[127]);
+                Assert.Fail($"{nameof(this.FaceEncodings)}.{nameof(FaceRecognition.LoadFaceEncoding)} should throw {nameof(ArgumentOutOfRangeException)}");
+            }
+            catch (ArgumentOutOfRangeException)
+            {
+            }
+        }
+
         [TestMethod]
         public void LoadImage()
         {