diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-08-22 13:41:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 13:41:19 +0200 |
| commit | bb2336f389619ea6dcd0a5fdfa82eb4f8cf28079 (patch) | |
| tree | cf41623e6956bb02e5b26c6c22e463742a205e68 /lib | |
| parent | e27817aedaafb3ad387520c5dc9298c7ffcea6ad (diff) | |
| parent | 5a996b5f879c83f0911ba33af542fdd844929b79 (diff) | |
| download | nextcloud-server-bb2336f389619ea6dcd0a5fdfa82eb4f8cf28079.tar.gz nextcloud-server-bb2336f389619ea6dcd0a5fdfa82eb4f8cf28079.zip | |
Merge pull request #10526 from steiny2k/HEICHEIF
Support HEIC for previews
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/composer/composer/autoload_classmap.php | 1 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_static.php | 1 | ||||
| -rw-r--r-- | lib/private/Preview/HEIC.php | 40 | ||||
| -rw-r--r-- | lib/private/PreviewManager.php | 3 |
4 files changed, 45 insertions, 0 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index f411a288f22..160200ce573 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -856,6 +856,7 @@ return array( 'OC\\Preview\\GIF' => $baseDir . '/lib/private/Preview/GIF.php', 'OC\\Preview\\Generator' => $baseDir . '/lib/private/Preview/Generator.php', 'OC\\Preview\\GeneratorHelper' => $baseDir . '/lib/private/Preview/GeneratorHelper.php', + 'OC\\Preview\\HEIC' => $baseDir . '/lib/private/Preview/HEIC.php', 'OC\\Preview\\Illustrator' => $baseDir . '/lib/private/Preview/Illustrator.php', 'OC\\Preview\\Image' => $baseDir . '/lib/private/Preview/Image.php', 'OC\\Preview\\JPEG' => $baseDir . '/lib/private/Preview/JPEG.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 35ce1ed09ff..bed3ba25ce2 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -886,6 +886,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Preview\\GIF' => __DIR__ . '/../../..' . '/lib/private/Preview/GIF.php', 'OC\\Preview\\Generator' => __DIR__ . '/../../..' . '/lib/private/Preview/Generator.php', 'OC\\Preview\\GeneratorHelper' => __DIR__ . '/../../..' . '/lib/private/Preview/GeneratorHelper.php', + 'OC\\Preview\\HEIC' => __DIR__ . '/../../..' . '/lib/private/Preview/HEIC.php', 'OC\\Preview\\Illustrator' => __DIR__ . '/../../..' . '/lib/private/Preview/Illustrator.php', 'OC\\Preview\\Image' => __DIR__ . '/../../..' . '/lib/private/Preview/Image.php', 'OC\\Preview\\JPEG' => __DIR__ . '/../../..' . '/lib/private/Preview/JPEG.php', diff --git a/lib/private/Preview/HEIC.php b/lib/private/Preview/HEIC.php new file mode 100644 index 00000000000..151326129bc --- /dev/null +++ b/lib/private/Preview/HEIC.php @@ -0,0 +1,40 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2018, ownCloud GmbH + * @copyright Copyright (c) 2018, Sebastian Steinmetz (me@sebastiansteinmetz.ch) + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OC\Preview; + +class HEIC extends Bitmap { + /** + * {@inheritDoc} + */ + public function getMimeType() { + return '/image\/hei(f|c)/'; + } + + /** + * {@inheritDoc} + */ + public function isAvailable(\OCP\Files\FileInfo $file) { + return in_array("HEIC", \Imagick::queryFonts("HEI*") ); + } + +} diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php index 979208d0aed..de03861badc 100644 --- a/lib/private/PreviewManager.php +++ b/lib/private/PreviewManager.php @@ -278,6 +278,7 @@ class PreviewManager implements IPreview { * - OC\Preview\JPEG * - OC\Preview\GIF * - OC\Preview\BMP + * - OC\Preview\HEIC * - OC\Preview\XBitmap * - OC\Preview\MarkDown * - OC\Preview\MP3 @@ -310,6 +311,7 @@ class PreviewManager implements IPreview { Preview\JPEG::class, Preview\GIF::class, Preview\BMP::class, + Preview\HEIC::class, Preview\XBitmap::class ]; @@ -370,6 +372,7 @@ class PreviewManager implements IPreview { 'PSD' => ['mimetype' => '/application\/x-photoshop/', 'class' => Preview\Photoshop::class], 'EPS' => ['mimetype' => '/application\/postscript/', 'class' => Preview\Postscript::class], 'TTF' => ['mimetype' => '/application\/(?:font-sfnt|x-font$)/', 'class' => Preview\Font::class], + 'HEIC' => ['mimetype' => '/image\/hei(f|c)/', 'class' => Preview\HEIC::class], ]; foreach ($imagickProviders as $queryFormat => $provider) { |