This path requires the upgrader to be run and applies the following changes:

* moves the composite method back into core
* requires that the operation be fully qualified i.e. gallery_graphics::resize
* caches the graphics rules on each request

2 files changed, 21 insertions, 76 deletions

diff --git a/modules/watermark/helpers/watermark_graphics.php b/modules/watermark/helpers/watermark_graphics.php
deleted file mode 100644
index aef7586b..00000000
--- a/modules/watermark/helpers/watermark_graphics.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class watermark_graphics_Core {
-  /**
-   * Overlay an image on top of the input file.
-   *
-   * Valid options are: file, mime_type, position, transparency_percent, padding
-   *
-   * Valid positions: northwest, north, northeast,
-   *                  west, center, east,
-   *                  southwest, south, southeast
-   *
-   * padding is in pixels
-   *
-   * @param string     $input_file
-   * @param string     $output_file
-   * @param array      $options
-   */
-  static function composite($input_file, $output_file, $options) {
-    try {
-      graphics::init_toolkit();
-
-      module::event("graphics_composite", $input_file, $output_file, $options);
-
-      list ($width, $height) = getimagesize($input_file);
-      list ($w_width, $w_height) = getimagesize($options["file"]);
-
-      $pad = isset($options["padding"]) ? $options["padding"] : 10;
-      $top = $pad;
-      $left = $pad;
-      $y_center = max($height / 2 - $w_height / 2, $pad);
-      $x_center = max($width / 2 - $w_width / 2, $pad);
-      $bottom = max($height - $w_height - $pad, $pad);
-      $right = max($width - $w_width - $pad, $pad);
-
-      switch ($options["position"]) {
-      case "northwest": $x = $left;     $y = $top;       break;
-      case "north":     $x = $x_center; $y = $top;       break;
-      case "northeast": $x = $right;    $y = $top;       break;
-      case "west":      $x = $left;     $y = $y_center;  break;
-      case "center":    $x = $x_center; $y = $y_center;  break;
-      case "east":      $x = $right;    $y = $y_center;  break;
-      case "southwest": $x = $left;     $y = $bottom;    break;
-      case "south":     $x = $x_center; $y = $bottom;    break;
-      case "southeast": $x = $right;    $y = $bottom;    break;
-      }
-
-      Image::factory($input_file)
-        ->composite($options["file"], $x, $y, $options["transparency"])
-        ->quality(module::get_var("gallery", "image_quality"))
-        ->save($output_file);
-
-      module::event("graphics_composite_completed", $input_file, $output_file, $options);
-    } catch (ErrorException $e) {
-      Kohana::log("error", $e->get_message());
-    }
-  }
-}
diff --git a/modules/watermark/helpers/watermark_installer.php b/modules/watermark/helpers/watermark_installer.php
index b3e91044..5c7dfdab 100644
--- a/modules/watermark/helpers/watermark_installer.php
+++ b/modules/watermark/helpers/watermark_installer.php
@@ -33,11 +33,31 @@ class watermark_installer {
                DEFAULT CHARSET=utf8;");
 
     @mkdir(VARPATH . "modules/watermark");
-    module::set_version("watermark", 1);
+    module::set_version("watermark", 2);
   }
 
   static function uninstall() {
     Database::instance()->query("DROP TABLE {watermarks}");
     dir::unlink(VARPATH . "modules/watermark");
   }
+
+  static function upgrade($version) {
+    $db = Database::instance();
+    if ($version == 1) {
+      graphics::remove_rules("watermark");
+      if ($name = module::get_var("watermark", "name")) {
+        foreach (array("thumb", "resize") as $target) {
+          graphics::add_rule(
+            "watermark", $target, "gallery_graphics::composite",
+            array("file" => VARPATH . "modules/watermark/$name",
+                  "width" => module::get_var("watermark", "width"),
+                  "height" => module::get_var("watermark", "height"),
+                  "position" => module::get_var("watermark", "position"),
+                  "transparency" => 101 - module::get_var("watermark", "transparency")),
+            1000);
+        }
+      }
+      module::set_version("watermark", $version = 2);
+    }
+  }
 }