From 45d16916718ea103b371da9c7bef0385717d8cef Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Wed, 10 Jul 2013 13:38:42 +0200
Subject: [PATCH] fix orientation before caching preview
---
lib/preview.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/preview.php b/lib/preview.php
index f12107c9f5..6173fc8aa6 100755
--- a/lib/preview.php
+++ b/lib/preview.php
@@ -332,7 +332,7 @@ class Preview {
$preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingup, $this->fileview);
- if(!$preview) {
+ if(!($preview instanceof \OC_Image)) {
continue;
}
@@ -346,6 +346,8 @@ class Preview {
if($this->userview->is_dir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/') === false) {
$this->userview->mkdir(self::THUMBNAILS_FOLDER . '/' . $fileid . '/');
}
+
+ $preview->fixOrientation();
$this->userview->file_put_contents($cachepath, $preview->data());
break;
@@ -382,8 +384,6 @@ class Preview {
* @return image
*/
public function resizeAndCrop() {
- $this->preview->fixOrientation();
-
$image = $this->preview;
$x = $this->maxX;
$y = $this->maxY;
--
GitLab