Merge branch 'master' of git@github.com:gallery/gallery3

1 files changed, 5 insertions, 0 deletions

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 7dc46eeb..2892011f 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -206,10 +206,15 @@ class graphics_Core {
       // Image would get upscaled; do nothing
       copy($input_file, $output_file);
     } else {
+      try {
       Image::factory($input_file)
         ->resize($options["width"], $options["height"], $options["master"])
         ->quality(module::get_var("gallery", "image_quality"))
+        ->sharpen(module::get_var("gallery", "image_sharpen"))
         ->save($output_file);
+      } catch (Exception $e) {
+        Kohana::log("error", $e->getMessage());
+      }
     }
 
     module::event("graphics_resize_completed", $input_file, $output_file, $options);