Merge pull request #36 from jonnitto/master

BUGFIX: Dummy image for Neos 7.1
sitegeist · May 23, 2021 · b74ba41 · b74ba41
2 parents 2215342 + d4900f9
commit b74ba41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/Classes/Controller/DummyImageController.php b/Classes/Controller/DummyImageController.php
@@ -255,13 +255,8 @@ protected function renderBorder(ImageInterface $image, ColorInterface $foregroun
     protected function renderText(ImageInterface $image, ColorInterface $textColor, int $width, int $height, string $text, bool $center = false): void
     {
         $initialFontSize = 10;
-        if (file_exists('resource://Neos.Neos/Public/Fonts/NotoSans/NotoSans-Regular.ttf')) {
-            $fontFile = $this->packageManager->getPackage('Neos.Neos')->getPackagePath() . "Resources/Public/Fonts/NotoSans/NotoSans-Regular.ttf";
-            $initialFont = $this->imagineService->font($fontFile, $initialFontSize, $textColor);
-        } elseif (file_exists('resource://Neos.Neos/Public/Fonts/NotoSans-Regular.ttf')) {
-            $fontFile = $this->packageManager->getPackage('Neos.Neos')->getPackagePath() . "Resources/Public/Fonts/NotoSans-Regular.ttf";
-            $initialFont = $this->imagineService->font($fontFile, $initialFontSize, $textColor);
-        }
+        $fontFile = $this->packageManager->getPackage('Sitegeist.Kaleidoscope')->getPackagePath() . "Resources/Private/Font/NotoSans-Regular.ttf";
+        $initialFont = $this->imagineService->font($fontFile, $initialFontSize, $textColor);
 
         // scale text to fit the image
         $initialFontBox = $initialFont->box($text);

diff --git a/Resources/Private/Font/NotoSans-Regular.ttf b/Resources/Private/Font/NotoSans-Regular.ttf