diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-09-17 17:05:47 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-09-17 17:05:47 +0200 |
| commit | ef0a0f5f87f88ff19d6f2234f7669914881e8b1a (patch) | |
| tree | e8e8bc1e607e15724d1ef1bda5a76b4b42ccad67 /lib | |
| parent | c88d517e8879c56755bc26f604d515d9772b35b3 (diff) | |
| parent | 380aacdf93f7549f84a88c21531871271a15a96d (diff) | |
| download | nextcloud-server-ef0a0f5f87f88ff19d6f2234f7669914881e8b1a.tar.gz nextcloud-server-ef0a0f5f87f88ff19d6f2234f7669914881e8b1a.zip | |
Merge pull request #9554 from owncloud/fix_preview_orientation
fix orientation in image-backend, not in preview system itself
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/private/preview.php | 2 | ||||
| -rw-r--r-- | lib/private/preview/image.php | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/private/preview.php b/lib/private/preview.php index bc3eccbafb4..21fa581d84e 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -567,8 +567,6 @@ class Preview { return; } - $image->fixOrientation(); - $realX = (int)$image->width(); $realY = (int)$image->height(); diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php index cec5d7c0170..ec5b87befea 100644 --- a/lib/private/preview/image.php +++ b/lib/private/preview/image.php @@ -29,6 +29,7 @@ class Image extends Provider { $fileName = $fileview->getLocalFile($path); } $image->loadFromFile($fileName); + $image->fixOrientation(); return $image->valid() ? $image : false; } |