Skip to content

Commit 64c1d4f

Browse files
Merge branch 'release/1.2.3.7'
2 parents f393732 + dd77675 commit 64c1d4f

File tree

5 files changed

+24
-15
lines changed

5 files changed

+24
-15
lines changed

DlibDotNet

Submodule DlibDotNet updated 263 files

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
The world's simplest facial recognition api for .NET
44
This repository is porting https://github.com/ageitgey/face_recognition by C#.
55

6-
FaceRecognitionDotNet supports only Windows for now.
7-
But it will support MacOS and Linux after DlibDotNet supports them!!
6+
This package supports cross platform, Windows, Linux and MacOSX!!
87

9-
|Package|NuGet|
10-
|---|---|
11-
|FaceRecognitionDotNet|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet)|
12-
|FaceRecognitionDotNet With CUDA|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet-WithCUDA.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet-WithCUDA)|
8+
|Package|Windows|Linux|MacOSX|
9+
|---|---|---|---|
10+
|FaceRecognitionDotNet|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet)|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet)|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet)|
11+
|FaceRecognitionDotNet With CUDA|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet-WithCUDA.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet-WithCUDA)|[![NuGet version](https://img.shields.io/nuget/v/FaceRecognitionDotNet-WithCUDA.svg)](https://www.nuget.org/packages/FaceRecognitionDotNet-WithCUDA)|N/A|
1312

1413
## Demo
1514

nuget/FaceRecognitionDotNet-CPU.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<package >
33
<metadata>
44
<id>FaceRecognitionDotNet</id>
5-
<version>1.2.3.6</version>
5+
<version>1.2.3.7</version>
66
<title>FaceRecognitionDotNet</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>
@@ -14,12 +14,12 @@
1414

1515
This library is ported from https://github.com/ageitgey/face_recognition by C#.</description>
1616
<releaseNotes></releaseNotes>
17-
<copyright>© Takuya Takeuchi 2018</copyright>
17+
<copyright>© Takuya Takeuchi 2018-2019</copyright>
1818
<tags>.net machinelearning face-recognition</tags>
1919
<serviceable>true</serviceable>
2020
<dependencies>
2121
<group targetFramework="netstandard2.0">
22-
<dependency id="DlibDotNet" version="[19.15.0.20181008,)" />
22+
<dependency id="DlibDotNet" version="[19.16.0.20190115,)" />
2323
</group>
2424
</dependencies>
2525
</metadata>

nuget/FaceRecognitionDotNet-CUDA.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<package >
33
<metadata>
44
<id>FaceRecognitionDotNet-WithCUDA</id>
5-
<version>1.2.3.6</version>
5+
<version>1.2.3.7</version>
66
<title>FaceRecognitionDotNet (with CUDA)</title>
77
<authors>Takuya Takeuchi</authors>
88
<owners>Takuya Takeuchi</owners>
@@ -14,12 +14,12 @@
1414

1515
This library is ported from https://github.com/ageitgey/face_recognition by C#.</description>
1616
<releaseNotes></releaseNotes>
17-
<copyright>© Takuya Takeuchi 2018</copyright>
17+
<copyright>© Takuya Takeuchi 2018-2019</copyright>
1818
<tags>.net machinelearning face-recognition</tags>
1919
<serviceable>true</serviceable>
2020
<dependencies>
2121
<group targetFramework="netstandard2.0">
22-
<dependency id="DlibDotNet-WithCUDA" version="[19.15.0.20181008,)" />
22+
<dependency id="DlibDotNet-WithCUDA" version="[19.16.0.20190115,)" />
2323
</group>
2424
</dependencies>
2525
</metadata>

src/FaceRecognitionDotNet/FaceRecognition.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Linq;
5+
using System.Text;
56
using DlibDotNet;
67
using DlibDotNet.Dnn;
78
using FaceRecognitionDotNet.Dlib.Python;
@@ -79,6 +80,15 @@ private FaceRecognition(string directory)
7980

8081
#region Properties
8182

83+
/// <summary>
84+
/// Gets or sets the character encoding to convert System.String to byte[] for internal library.
85+
/// </summary>
86+
public static Encoding InternalEncoding
87+
{
88+
get => DlibDotNet.Dlib.Encoding;
89+
set => DlibDotNet.Dlib.Encoding = value ?? Encoding.UTF8;
90+
}
91+
8292
/// <summary>
8393
/// Gets a value indicating whether this object has been disposed of.
8494
/// </summary>

0 commit comments

Comments
 (0)