diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-03-05 15:31:16 -0800 | 
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-03-05 15:31:16 -0800 | 
| commit | 5ff6409a0856134a113c64768e4474e14a6c86ea (patch) | |
| tree | 1d912e12b93c5c000ce504532960edb835a01545 /modules/gallery/helpers/gallery_graphics.php | |
| parent | 3e80fe9228bcbfa01bf87da67a47cd3f284dff01 (diff) | |
| parent | ca47b887f5bb8ad311c4ab7e4c71aace37ba88e9 (diff) | |
Merge branch 'master' of git://github.com/colings/gallery3
Diffstat (limited to 'modules/gallery/helpers/gallery_graphics.php')
| -rw-r--r-- | modules/gallery/helpers/gallery_graphics.php | 18 | 
1 files changed, 9 insertions, 9 deletions
| diff --git a/modules/gallery/helpers/gallery_graphics.php b/modules/gallery/helpers/gallery_graphics.php index e63b9336..1f47a65c 100644 --- a/modules/gallery/helpers/gallery_graphics.php +++ b/modules/gallery/helpers/gallery_graphics.php @@ -25,17 +25,17 @@ class gallery_graphics_Core {     * @param string     $output_file     * @param array      $options     */ -  static function rotate($input_file, $output_file, $options) { +  static function rotate($input_file, $output_file, $options, $item) {      graphics::init_toolkit(); -    module::event("graphics_rotate", $input_file, $output_file, $options); +    module::event("graphics_rotate", $input_file, $output_file, $options, $item);      Image::factory($input_file)        ->quality(module::get_var("gallery", "image_quality"))        ->rotate($options["degrees"])        ->save($output_file); -    module::event("graphics_rotate_completed", $input_file, $output_file, $options); +    module::event("graphics_rotate_completed", $input_file, $output_file, $options, $item);    }    /** @@ -46,10 +46,10 @@ class gallery_graphics_Core {     * @param string     $output_file     * @param array      $options     */ -  static function resize($input_file, $output_file, $options) { +  static function resize($input_file, $output_file, $options, $item) {      graphics::init_toolkit(); -    module::event("graphics_resize", $input_file, $output_file, $options); +    module::event("graphics_resize", $input_file, $output_file, $options, $item);      if (@filesize($input_file) == 0) {        throw new Exception("@todo EMPTY_INPUT_FILE"); @@ -69,7 +69,7 @@ class gallery_graphics_Core {        $image->save($output_file);      } -    module::event("graphics_resize_completed", $input_file, $output_file, $options); +    module::event("graphics_resize_completed", $input_file, $output_file, $options, $item);    }    /** @@ -87,11 +87,11 @@ class gallery_graphics_Core {     * @param string     $output_file     * @param array      $options     */ -  static function composite($input_file, $output_file, $options) { +  static function composite($input_file, $output_file, $options, $item) {      try {        graphics::init_toolkit(); -      module::event("graphics_composite", $input_file, $output_file, $options); +      module::event("graphics_composite", $input_file, $output_file, $options, $item);        list ($width, $height) = getimagesize($input_file);        list ($w_width, $w_height) = getimagesize($options["file"]); @@ -121,7 +121,7 @@ class gallery_graphics_Core {          ->quality(module::get_var("gallery", "image_quality"))          ->save($output_file); -      module::event("graphics_composite_completed", $input_file, $output_file, $options); +      module::event("graphics_composite_completed", $input_file, $output_file, $options, $item);      } catch (ErrorException $e) {        Kohana_Log::add("error", $e->get_message());      } | 
