? .cvsignore
? .str_vs_preg.php.swp
? imagecache_cleanup_build_derivative.patch
? str_vs_preg.php.txt
Index: imagecache.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagecache/imagecache.module,v
retrieving revision 1.109
diff -u -p -r1.109 imagecache.module
--- imagecache.module	3 May 2009 14:28:13 -0000	1.109
+++ imagecache.module	3 May 2009 14:37:59 -0000
@@ -190,6 +190,7 @@ function imagecache_imagecache_actions()
     'imagecache_resize' => array(
       'name' => 'Resize',
       'description' => 'Resize an image to an exact set of dimensions, ignoring aspect ratio.',
+      'file' => 'imagecache_actions.inc',
     ),
     'imagecache_scale' => array(
       'name' => 'Scale',
@@ -855,34 +856,6 @@ function theme_imagecache_imagelink($pre
   return l($image, $original_image_url, array('absolute' => FALSE, 'html' => TRUE));
 }
 
-
-/************************************************************************************
- * ImageCache action implementation example in module.
- */
-function imagecache_resize_image(&$image, $data) {
-  if (!imageapi_image_resize($image, $data['width'], $data['height'])) {
-    watchdog('imagecache', 'imagecache_resize_image failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, TRUE)), WATCHDOG_ERROR);
-    return FALSE;
-  }
-  return TRUE;
-}
-
-function imagecache_resize_form($action) {
-  $form['width'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Width'),
-    '#default_value' => isset($action['width']) ? $action['width'] : '100%',
-    '#description' => t('Enter a width in pixels or as a percentage. i.e. 500 or 80%.'),
-  );
-  $form['height'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Height'),
-    '#default_value' => isset($action['height']) ? $action['height'] : '100%',
-    '#description' => t('Enter a height in pixels or as a percentage. i.e. 500 or 80%.'),
-  );
-  return $form;
-}
-
 /**
  *  ImageCache 2.x API
  *
Index: imagecache_actions.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagecache/imagecache_actions.inc,v
retrieving revision 1.22
diff -u -p -r1.22 imagecache_actions.inc
--- imagecache_actions.inc	19 Apr 2009 19:19:51 -0000	1.22
+++ imagecache_actions.inc	3 May 2009 14:37:59 -0000
@@ -1,6 +1,30 @@
 <?php
 // $Id: imagecache_actions.inc,v 1.22 2009/04/19 19:19:51 drewish Exp $
 
+function imagecache_resize_form($action) {
+  $form['width'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Width'),
+    '#default_value' => isset($action['width']) ? $action['width'] : '100%',
+    '#description' => t('Enter a width in pixels or as a percentage. i.e. 500 or 80%.'),
+  );
+  $form['height'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Height'),
+    '#default_value' => isset($action['height']) ? $action['height'] : '100%',
+    '#description' => t('Enter a height in pixels or as a percentage. i.e. 500 or 80%.'),
+  );
+  return $form;
+}
+
+function imagecache_resize_image(&$image, $data) {
+  if (!imageapi_image_resize($image, $data['width'], $data['height'])) {
+    watchdog('imagecache', 'imagecache_resize_image failed. image: %image, data: %data.', array('%path' => $image, '%data' => print_r($data, TRUE)), WATCHDOG_ERROR);
+    return FALSE;
+  }
+  return TRUE;
+}
+
 function theme_imagecache_resize($element) {
   $data = $element['#value'];
   return 'width: '. $data['width'] .', height: '. $data['height'];