diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2015-01-19 00:12:55 +0100 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2015-01-19 00:12:55 +0100 |
| commit | 9cef90da981336a907a9ca7f9b511e25b7be8a90 (patch) | |
| tree | 57d959cee090a7ac5e5d46789f047cc164ab86fd | |
| parent | aff22b32250b6a97136cb25db82e65c4f1148f5c (diff) | |
| parent | a28d3b594b089af837c6a319d7b7b6a8f7155210 (diff) | |
| download | nextcloud-server-9cef90da981336a907a9ca7f9b511e25b7be8a90.tar.gz nextcloud-server-9cef90da981336a907a9ca7f9b511e25b7be8a90.zip | |
Merge pull request #13448 from owncloud/fix-exif-orientation
Fix exif orientation for flipped images
| -rw-r--r-- | lib/private/image.php | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/private/image.php b/lib/private/image.php index 07cfb0f72d3..90b024de3d3 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -358,35 +358,42 @@ class OC_Image { $o = $this->getOrientation(); $this->logger->debug('OC_Image->fixOrientation() Orientation: ' . $o, array('app' => 'core')); $rotate = 0; + $flip = false; switch ($o) { case -1: return false; //Nothing to fix case 1: $rotate = 0; break; - case 2: // Not tested + case 2: $rotate = 0; + $flip = true; break; case 3: $rotate = 180; break; - case 4: // Not tested + case 4: $rotate = 180; + $flip = true; break; - case 5: // Not tested + case 5: $rotate = 90; + $flip = true; break; case 6: - //$rotate = 90; $rotate = 270; break; - case 7: // Not tested + case 7: $rotate = 270; + $flip = true; break; case 8: $rotate = 90; break; } + if($flip) { + imageflip($this->resource, IMG_FLIP_HORIZONTAL); + } if ($rotate) { $res = imagerotate($this->resource, $rotate, 0); if ($res) { |