diff options
| author | Olivier Paroz <oparoz@users.noreply.github.com> | 2015-09-24 23:45:07 +0300 |
|---|---|---|
| committer | Olivier Paroz <oparoz@users.noreply.github.com> | 2015-09-24 23:45:07 +0300 |
| commit | 15b1b5e9a9d78616903b2a7bc7c0819826e2cf77 (patch) | |
| tree | 948cd58b53a085baa4c03fb453dbf432b05b0893 | |
| parent | e317f88ca843a56e3f5ad3db1eaafa79ba3fa4c8 (diff) | |
| parent | 352d699b5c7a087e808a44d1912fdcffbb9275fc (diff) | |
Merge pull request #378 from owncloud/Fix-previews-on-high-dpi-screens
Only fix previews which are too big
| -rw-r--r-- | preview/preview.php | 2 | ||||
| -rw-r--r-- | service/thumbnailservice.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/preview/preview.php b/preview/preview.php index 20796396..cb5101c7 100644 --- a/preview/preview.php +++ b/preview/preview.php @@ -153,7 +153,7 @@ class Preview { $previewWidth = $previewData->width(); $previewHeight = $previewData->height(); - if ($previewWidth !== $maxWidth || $previewHeight !== $maxHeight) { + if ($previewWidth > $maxWidth || $previewHeight > $maxHeight) { $previewData = $this->fixPreview( $previewData, $previewWidth, $previewHeight, $maxWidth, $maxHeight, $square ); diff --git a/service/thumbnailservice.php b/service/thumbnailservice.php index ef220bd1..6137b8bc 100644 --- a/service/thumbnailservice.php +++ b/service/thumbnailservice.php @@ -41,7 +41,7 @@ class ThumbnailService { * @return array<double|boolean> */ public function getThumbnailSpecs($square, $scale) { - $height = 200 * $scale; + $height = ceil(200 * $scale); if ($square) { $width = $height; } else { |