From e88d458c7484b015c5b40a98d76afb4b43c72444 Mon Sep 17 00:00:00 2001
From: colings <colings@example.com>
Date: Wed, 23 Feb 2011 20:30:23 -0600
Subject: [PATCH] Added extra item arg for gallery_graphics changes

---
 3.1/modules/autorotate/helpers/autorotate.php            | 2 +-
 3.1/modules/embed_videos/controllers/embedded_videos.php | 2 +-
 3.1/modules/gwtorganise/controllers/json_album.php       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/3.1/modules/autorotate/helpers/autorotate.php b/3.1/modules/autorotate/helpers/autorotate.php
index bf531d01..50cc1ab3 100644
--- a/3.1/modules/autorotate/helpers/autorotate.php
+++ b/3.1/modules/autorotate/helpers/autorotate.php
@@ -42,7 +42,7 @@ class autorotate {
 			}
 			if($degrees) {
 				$tmpfile = tempnam(TMPPATH, "rotate");
-				gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $degrees));
+				gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $degrees), $item);
 				// Update EXIF info
 				$data = new PelDataWindow(file_get_contents($tmpfile));
 				if (PelJpeg::isValid($data)) {
diff --git a/3.1/modules/embed_videos/controllers/embedded_videos.php b/3.1/modules/embed_videos/controllers/embedded_videos.php
index fc7281f2..f49d4220 100644
--- a/3.1/modules/embed_videos/controllers/embedded_videos.php
+++ b/3.1/modules/embed_videos/controllers/embedded_videos.php
@@ -106,7 +106,7 @@ class Embedded_videos_Controller extends Controller {
           $file = fopen($temp_filename, "wb");
           fwrite($file, $content);
           fclose($file);
-          gallery_graphics::composite($temp_filename, $temp_filename, array("file" => "modules/embed_videos/images/embed_video_icon.png", "position" => "center", "transparency" => 95));
+          gallery_graphics::composite($temp_filename, $temp_filename, array("file" => "modules/embed_videos/images/embed_video_icon.png", "position" => "center", "transparency" => 95), $item);
           $item->set_data_file($temp_filename);
           $item->name = basename($itemname);
           $item->title = $title;
diff --git a/3.1/modules/gwtorganise/controllers/json_album.php b/3.1/modules/gwtorganise/controllers/json_album.php
index bb682fb7..542efb01 100644
--- a/3.1/modules/gwtorganise/controllers/json_album.php
+++ b/3.1/modules/gwtorganise/controllers/json_album.php
@@ -247,7 +247,7 @@ class Json_Album_Controller extends Controller {
     }
 
     if ($degrees) {
-      gallery_graphics::rotate($item->file_path(), $item->file_path(), array("degrees" => $degrees));
+      gallery_graphics::rotate($item->file_path(), $item->file_path(), array("degrees" => $degrees), $item);
 
       list($item->width, $item->height) = getimagesize($item->file_path());
       $item->resize_dirty= 1;