summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-02-20 08:21:04 +0100
committerGitHub <noreply@github.com>2018-02-20 08:21:04 +0100
commita3de507b7626919a42ef6a86d94af30b0f04f3a9 (patch)
treeeb2b55c15322cbf8a353ea34155805a172247a62
parent16a4e7192cf517231bed155b99786fcfa738c081 (diff)
parenta4159378be87d4bc66cba9b122490a0fe4da03a6 (diff)
downloadnextcloud-server-a3de507b7626919a42ef6a86d94af30b0f04f3a9.tar.gz
nextcloud-server-a3de507b7626919a42ef6a86d94af30b0f04f3a9.zip
Merge pull request #8440 from nextcloud/8428_13
[stable13] Use TTF fonts for avatar generation
-rw-r--r--core/fonts/OpenSans-Light.ttfbin0 -> 222412 bytes
-rw-r--r--core/fonts/OpenSans-Semibold.ttfbin0 -> 221328 bytes
-rw-r--r--lib/private/Avatar.php2
3 files changed, 1 insertions, 1 deletions
diff --git a/core/fonts/OpenSans-Light.ttf b/core/fonts/OpenSans-Light.ttf
new file mode 100644
index 00000000000..0d381897da2
--- /dev/null
+++ b/core/fonts/OpenSans-Light.ttf
Binary files differ
diff --git a/core/fonts/OpenSans-Semibold.ttf b/core/fonts/OpenSans-Semibold.ttf
new file mode 100644
index 00000000000..1a7679e3949
--- /dev/null
+++ b/core/fonts/OpenSans-Semibold.ttf
Binary files differ
diff --git a/lib/private/Avatar.php b/lib/private/Avatar.php
index cd29017333c..45ad66d0817 100644
--- a/lib/private/Avatar.php
+++ b/lib/private/Avatar.php
@@ -254,7 +254,7 @@ class Avatar implements IAvatar {
$white = imagecolorallocate($im, 255, 255, 255);
imagefilledrectangle($im, 0, 0, $size, $size, $background);
- $font = __DIR__ . '/../../core/fonts/OpenSans-Semibold.woff';
+ $font = __DIR__ . '/../../core/fonts/OpenSans-Semibold.ttf';
$fontSize = $size * 0.4;
$box = imagettfbbox($fontSize, 0, $font, $text);