Move the graphics::rotate to gallery_graphics::rotate to be consistent with the other gallery graphics functions.

3 files changed, 22 insertions, 23 deletions

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index 2ac54754..a1e7dcc3 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -36,7 +36,8 @@ class Quick_Controller extends Controller {
     }
 
     if ($degrees) {
-      graphics::rotate($item->file_path(), $item->file_path(), array("degrees" => $degrees));
+      gallery_graphics::rotate($item->file_path(), $item->file_path(),
+                               array("degrees" => $degrees));
 
       list($item->width, $item->height) = getimagesize($item->file_path());
       $item->resize_dirty= 1;
diff --git a/modules/gallery/helpers/gallery_graphics.php b/modules/gallery/helpers/gallery_graphics.php
index bdd600c5..c24d2bde 100644
--- a/modules/gallery/helpers/gallery_graphics.php
+++ b/modules/gallery/helpers/gallery_graphics.php
@@ -19,6 +19,26 @@
  */
 class gallery_graphics_Core {
   /**
+   * Rotate an image.  Valid options are degrees
+   *
+   * @param string     $input_file
+   * @param string     $output_file
+   * @param array      $options
+   */
+  static function rotate($input_file, $output_file, $options) {
+    graphics::init_toolkit();
+
+    module::event("graphics_rotate", $input_file, $output_file, $options);
+
+    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);
+  }
+
+  /**
    * Resize an image.  Valid options are width, height and master.  Master is one of the Image
    * master dimension constants.
    *
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index ecddd86b..1063c073 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -193,28 +193,6 @@ class graphics_Core {
   }
 
   /**
-   * Rotate an image.  Valid options are degrees
-   *
-   * @param string     $input_file
-   * @param string     $output_file
-   * @param array      $options
-   */
-  static function rotate($input_file, $output_file, $options) {
-    if (!self::$init) {
-      self::init_toolkit();
-    }
-
-    module::event("graphics_rotate", $input_file, $output_file, $options);
-
-    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);
-  }
-
-  /**
    * Return a query result that locates all items with dirty images.
    * @return Database_Result Query result
    */