diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2011-01-14 01:12:32 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2011-01-14 01:12:32 +0000 |
| commit | 2898fe3b82ce10d045dd2c274a3290bacf209a00 (patch) | |
| tree | 5aced91bb92d8c9136cabf60ebc918248328907a /modules/gallery/helpers/gallery_graphics.php | |
| parent | 47cbef684d41a4d51a9848091997e10b909abf32 (diff) | |
| parent | e4a43c99e421c830e569eaae6294286ed51e0ad8 (diff) | |
Git pull from devel line.
Diffstat (limited to 'modules/gallery/helpers/gallery_graphics.php')
| -rw-r--r-- | modules/gallery/helpers/gallery_graphics.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/helpers/gallery_graphics.php b/modules/gallery/helpers/gallery_graphics.php index 6038a95b..4cd7143e 100644 --- a/modules/gallery/helpers/gallery_graphics.php +++ b/modules/gallery/helpers/gallery_graphics.php @@ -56,7 +56,7 @@ class gallery_graphics_Core { } $dims = getimagesize($input_file); - if (max($dims[0], $dims[1]) < min($options["width"], $options["height"])) { + if (max($dims[0], $dims[1]) <= min($options["width"], $options["height"])) { // Image would get upscaled; do nothing copy($input_file, $output_file); } else { @@ -75,7 +75,7 @@ class gallery_graphics_Core { /** * Overlay an image on top of the input file. * - * Valid options are: file, mime_type, position, transparency_percent, padding + * Valid options are: file, position, transparency, padding * * Valid positions: northwest, north, northeast, * west, center, east, |