summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2014-07-09 23:07:58 +0200
committerGeorg Ehrke <developer@georgehrke.com>2014-07-09 23:07:58 +0200
commit380aacdf93f7549f84a88c21531871271a15a96d (patch)
treef9fed9e7435f88f24396d8637bc973658c2dc78d
parent404ac8bcd32aca8f9b004621ac737800cd86dfd1 (diff)
downloadnextcloud-server-380aacdf93f7549f84a88c21531871271a15a96d.tar.gz
nextcloud-server-380aacdf93f7549f84a88c21531871271a15a96d.zip
fix orientation in image-backend, not in preview system itself
-rwxr-xr-xlib/private/preview.php2
-rw-r--r--lib/private/preview/image.php1
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/private/preview.php b/lib/private/preview.php
index 8089379bde5..5a6e9829afe 100755
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -556,8 +556,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;
}