? .cache
? .project
? .projectOptions
? files
? test.patch
? includes/_file.inc_
? misc/Thumbs.db
? misc/farbtastic/Thumbs.db
? modules/gd
? modules/imagemagick
? sites/all/modules
? sites/default/settings.php
Index: includes/image.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/image.inc,v
retrieving revision 1.21
diff -u -r1.21 image.inc
--- includes/image.inc 12 May 2007 05:51:20 -0000 1.21
+++ includes/image.inc 2 Jul 2007 16:07:12 -0000
@@ -4,76 +4,80 @@
/**
* Return a list of available toolkits.
*
- * @return An array of toolkit name => descriptive title.
+ * @return
+ * An array of the enabled image toolkit modules. The module name is the key
+ * and the value is a sub-array with the module's 'name' and 'description'.
*/
function image_get_available_toolkits() {
- $toolkits = file_scan_directory('includes', 'image\..*\.inc$');
+ static $toolkits;
- $output = array();
- foreach ($toolkits as $file => $toolkit) {
- include_once "./$file";
- $function = str_replace('.', '_', $toolkit->name) .'_info';
- if (function_exists($function)) {
- $info = $function();
- $output[$info['name']] = $info['title'];
+ if (!isset($toolkits)) {
+ $toolkits = array();
+ foreach (module_implements('image_toolkit', TRUE) as $module) {
+ $info = drupal_parse_info_file(drupal_get_path('module', $module) .'/'. $module .'.info');
+ $toolkits[$module] = array('name' => $info['name'], 'description' => $info['description']);
}
}
- $output['gd'] = t('Built-in GD2 toolkit');
- return $output;
+
+ return $toolkits;
}
/**
* Retrieve the name of the currently used toolkit.
*
- * @return String containing the name of the toolkit.
+ * @return
+ * String containing the name of the toolkit, or FALSE if none is available.
*/
function image_get_toolkit() {
- static $toolkit;
- if (!$toolkit) {
- $toolkit = variable_get('image_toolkit', 'gd');
- $toolkit_file = './includes/image.'. $toolkit .'.inc';
- if ($toolkit != 'gd' && file_exists($toolkit_file)) {
- include_once $toolkit_file;
- }
- elseif (!image_gd_check_settings()) {
- $toolkit = FALSE;
- }
+ $toolkit = variable_get('image_toolkit', 'gd');
+
+ // Verify that the image toolkit is available.
+ if (isset($toolkit) && module_exists($toolkit)) {
+ return $toolkit;
}
- return $toolkit;
+ return FALSE;
}
/**
* Invokes the given method using the currently selected toolkit.
*
- * @param $method A string containing the method to invoke.
- * @param $params An optional array of parameters to pass to the toolkit method.
- *
- * @return Mixed values (typically Boolean for successful operation).
+ * @param $method
+ * A string containing the method to invoke.
+ * @param $source
+ * The file path to the source image.
+ * @param $destination
+ * The file path to the destination image.
+ * @param $params
+ * An optional array of parameters to pass to the toolkit method.
+ * Possible keys and values are:
+ * x The top left co-ordinate of the crop area (x axis value),
+ * y The top left co-ordinate of the crop area (y axis value).
+ * width The target width for resize.
+ * height The target height for resize.
+ * degrees The number of (clockwise) degrees to rotate the image.
+ * bg_color An hexidecimal integer specifying a color. E.g. 0x000000
+ * for black, 0xff00ff for magenta, and 0xffffff for white.
+ * @param $toolkit
+ * An optional override of the default image toolkit.
+ * @return
+ * Mixed values (typically Boolean for successful operation).
*/
-function image_toolkit_invoke($method, $params = array()) {
- if ($toolkit = image_get_toolkit()) {
- $function = 'image_'. $toolkit .'_'. $method;
- if (function_exists($function)) {
- return call_user_func_array($function, $params);
- }
- else {
- watchdog('php', 'The selected image handling toolkit %toolkit can not correctly process %function.', array('%toolkit' => $toolkit, '%function' => $function), WATCHDOG_ERROR);
- return FALSE;
- }
+function image_toolkit_invoke($method, $source, $destination, $params = array(), $toolkit = FALSE) {
+ if (!$toolkit) {
+ $toolkit = image_get_toolkit();
}
- else {
- if ($method == 'settings') {
- return image_gd_settings();
- }
+ if ($toolkit) {
+ return module_invoke($toolkit, 'image_toolkit', $method, $source, $destination, $params);
}
+ return FALSE;
}
-
/**
* Get details about an image.
*
- * @return array containing information about the image
+ * @return
+ * An array containing the following information about the image:
* 'width': image's width in pixels
* 'height': image's height in pixels
* 'extension': commonly used extension for the image
@@ -110,22 +114,30 @@
*
* The resulting image always has the exact target dimensions.
*
- * @param $source The file path of the source image
- * @param $destination The file path of the destination image
- * @param $width The target width
- * @param $height The target height
- *
- * @return TRUE or FALSE, based on success
+ * @param $source
+ * The file path of the source image.
+ * @param $destination
+ * The file path of the destination image.
+ * @param $width
+ * The target width in pixels.
+ * @param $height
+ * The target height in pixels.
+ * @param $toolkit
+ * An optional override of the default image toolkit.
+ * @return
+ * TRUE or FALSE, based on success.
*/
-function image_scale_and_crop($source, $destination, $width, $height) {
+function image_scale_and_crop($source, $destination, $width, $height, $toolkit = FALSE) {
$info = image_get_info($source);
$scale = max($width / $info['width'], $height / $info['height']);
$x = round(($info['width'] * $scale - $width) / 2);
$y = round(($info['height'] * $scale - $height) / 2);
- if (image_toolkit_invoke('resize', array($source, $destination, $info['width'] * $scale, $info['height'] * $scale))) {
- return image_toolkit_invoke('crop', array($destination, $destination, $x, $y, $width, $height));
+ $params = array('width' => $info['width'] * $scale, 'height' => $info['height'] * $scale);
+ if (image_toolkit_invoke('resize', $source, $destination, $params, $toolkit)) {
+ $params = array('x' => $x, 'y' => $y, 'width' => $width, 'height' => $height);
+ return image_toolkit_invoke('crop', $destination, $destination, $params, $toolkit);
}
return FALSE;
}
@@ -136,14 +148,20 @@
*
* The resulting image can be smaller for one or both target dimensions.
*
- * @param $source The file path of the source image
- * @param $destination The file path of the destination image
- * @param $width The target width
- * @param $height The target height
- *
- * @return True or FALSE, based on success
+ * @param $source
+ * The file path of the source image.
+ * @param $destination
+ * The file path of the destination image.
+ * @param $width
+ * The target width in pixels.
+ * @param $height
+ * The target height in pixels.
+ * @param $toolkit
+ * An optional override of the default image toolkit.
+ * @return
+ * TRUE or FALSE, based on success.
*/
-function image_scale($source, $destination, $width, $height) {
+function image_scale($source, $destination, $width, $height, $toolkit = FALSE) {
$info = image_get_info($source);
// Don't scale up.
@@ -153,206 +171,82 @@
$aspect = $info['height'] / $info['width'];
if ($aspect < $height / $width) {
- $width = (int)min($width, $info['width']);
- $height = (int)round($width * $aspect);
+ $params['width'] = (int) min($width, $info['width']);
+ $params['height'] = (int) round($width * $aspect);
}
else {
- $height = (int)min($height, $info['height']);
- $width = (int)round($height / $aspect);
+ $params['height'] = (int) min($height, $info['height']);
+ $params['width'] = (int) round($height / $aspect);
}
- return image_toolkit_invoke('resize', array($source, $destination, $width, $height));
+ return image_toolkit_invoke('resize', $source, $destination, $params, $toolkit);
}
/**
* Resize an image to the given dimensions (ignoring aspect ratio).
*
- * @param $source The filepath of the source image.
- * @param $destination The file path of the destination image.
- * @param $width The target width.
- * @param $height The target height.
- */
-function image_resize($source, $destination, $width, $height) {
- return image_toolkit_invoke('resize', array($source, $destination, $width, $height));
+ * @param $source
+ * The filepath of the source image.
+ * @param $destination
+ * The file path of the destination image.
+ * @param $width
+ * The target width in pixels.
+ * @param $height
+ * The target height in pixels.
+ * @param $toolkit
+ * An optional override of the default image toolkit.
+ * @return
+ * TRUE or FALSE, based on success.
+ */
+function image_resize($source, $destination, $width, $height, $toolkit = FALSE) {
+ $params = array('width' => $width, 'height' => $height);
+ return image_toolkit_invoke('resize', $source, $destination, $params, $toolkit);
}
/**
* Rotate an image by the given number of degrees.
*
- * @param $source The filepath of the source image
- * @param $destination The file path of the destination image
- * @param $degrees The number of (clockwise) degrees to rotate the image
- */
-function image_rotate($source, $destination, $degrees) {
- return image_toolkit_invoke('rotate', array($source, $destination, $degrees));
+ * @param $source
+ * The filepath of the source image.
+ * @param $destination
+ * The file path of the destination image.
+ * @param $degrees
+ * The number of (clockwise) degrees to rotate the image.
+ * @param $bg_color
+ * An hexidecimal integer specifying the background color to use for the
+ * uncovered area of the image after the rotation. E.g. 0x000000 for black,
+ * 0xff00ff for magenta, and 0xffffff for white.
+ * @param $toolkit
+ * An optional override of the default image toolkit.
+ * @return
+ * TRUE or FALSE, based on success.
+ */
+function image_rotate($source, $destination, $degrees, $bg_color = 0x000000, $toolkit = FALSE) {
+ $params = array('degrees' => $degrees, 'bg_color' => $bg_color);
+ return image_toolkit_invoke('rotate', $source, $destination, $params, $toolkit);
}
/**
* Crop an image to the rectangle specified by the given rectangle.
*
- * @param $source The filepath of the source image
- * @param $destination The file path of the destination image
- * @param $x The top left co-ordinate of the crop area (x axis value)
- * @param $y The top left co-ordinate of the crop area (y axis value)
- * @param $width The target width
- * @param $height The target height
- */
-function image_crop($source, $destination, $x, $y, $width, $height) {
- return image_toolkit_invoke('crop', array($source, $destination, $x, $y, $width, $height));
+ * @param $source
+ * The filepath of the source image.
+ * @param $destination
+ * The file path of the destination image.
+ * @param $x
+ * The top left co-ordinate of the crop area (x axis value).
+ * @param $y
+ * The top left co-ordinate of the crop area (y axis value).
+ * @param $width
+ * The target width in pixels.
+ * @param $height
+ * The target height in pixels.
+ * @param $toolkit
+ * An optional override of the default image toolkit.
+ * @return
+ * TRUE or FALSE, based on success.
+ */
+function image_crop($source, $destination, $x, $y, $width, $height, $toolkit = FALSE) {
+ $params = array('x' => $x, 'y' => $y, 'width' => $width, 'height' => $height);
+ return image_toolkit_invoke('crop', $source, $destination, $params, $toolkit);
}
-
-/**
- * GD2 toolkit functions
- * With the minimal requirements of PHP 4.3 for Drupal, we use the built-in version of GD.
- */
-
-/**
- * Retrieve settings for the GD2 toolkit.
- */
-function image_gd_settings() {
- if (image_gd_check_settings()) {
- $form = array();
- $form['status'] = array('#value' => t('The built-in GD2 toolkit is installed and working properly.'));
-
- $form['image_jpeg_quality'] = array(
- '#type' => 'textfield',
- '#title' => t('JPEG quality'),
- '#description' => t('Define the image quality for JPEG manipulations. Ranges from 0 to 100. Higher values mean better image quality but bigger files.'),
- '#size' => 10,
- '#maxlength' => 3,
- '#default_value' => variable_get('image_jpeg_quality', 75),
- '#field_suffix' => t('%'),
- );
-
- return $form;
- }
- else {
- form_set_error('image_toolkit', t('The built-in GD image toolkit requires that the GD module for PHP be installed and configured properly. For more information see PHP\'s image documentation.', array('@url' => 'http://php.net/image')));
- return FALSE;
- }
-}
-
-/**
- * Verify GD2 settings (that the right version is actually installed).
- *
- * @return boolean
- */
-function image_gd_check_settings() {
- if ($check = get_extension_funcs('gd')) {
- if (in_array('imagegd2', $check)) {
- // GD2 support is available.
- return TRUE;
- }
- }
- return FALSE;
-}
-
-/**
- * Scale an image to the specified size using GD.
- */
-function image_gd_resize($source, $destination, $width, $height) {
- if (!file_exists($source)) {
- return FALSE;
- }
-
- $info = image_get_info($source);
- if (!$info) {
- return FALSE;
- }
-
- $im = image_gd_open($source, $info['extension']);
- if (!$im) {
- return FALSE;
- }
-
- $res = imageCreateTrueColor($width, $height);
- if ($info['extension'] == 'png') {
- $transparency = imagecolorallocatealpha($res, 0, 0, 0, 127);
- imagealphablending($res, FALSE);
- imagefilledrectangle($res, 0, 0, $width, $height, $transparency);
- imagealphablending($res, TRUE);
- imagesavealpha($res, TRUE);
- }
- imageCopyResampled($res, $im, 0, 0, 0, 0, $width, $height, $info['width'], $info['height']);
- $result = image_gd_close($res, $destination, $info['extension']);
-
- imageDestroy($res);
- imageDestroy($im);
-
- return $result;
-}
-
-/**
- * Rotate an image the given number of degrees.
- */
-function image_gd_rotate($source, $destination, $degrees, $bg_color = 0) {
- if (!function_exists('imageRotate')) {
- return FALSE;
- }
-
- $info = image_get_info($source);
- if (!$info) {
- return FALSE;
- }
-
- $im = image_gd_open($source, $info['extension']);
- if (!$im) {
- return FALSE;
- }
-
- $res = imageRotate($im, $degrees, $bg_color);
- $result = image_gd_close($res, $destination, $info['extension']);
-
- return $result;
-}
-
-/**
- * Crop an image using the GD toolkit.
- */
-function image_gd_crop($source, $destination, $x, $y, $width, $height) {
- $info = image_get_info($source);
- if (!$info) {
- return FALSE;
- }
-
- $im = image_gd_open($source, $info['extension']);
- $res = imageCreateTrueColor($width, $height);
- imageCopy($res, $im, 0, 0, $x, $y, $width, $height);
- $result = image_gd_close($res, $destination, $info['extension']);
-
- imageDestroy($res);
- imageDestroy($im);
-
- return $result;
-}
-
-/**
- * GD helper function to create an image resource from a file.
- */
-function image_gd_open($file, $extension) {
- $extension = str_replace('jpg', 'jpeg', $extension);
- $open_func = 'imageCreateFrom'. $extension;
- if (!function_exists($open_func)) {
- return FALSE;
- }
- return $open_func($file);
-}
-
-/**
- * GD helper to write an image resource to a destination file.
- */
-function image_gd_close($res, $destination, $extension) {
- $extension = str_replace('jpg', 'jpeg', $extension);
- $close_func = 'image'. $extension;
- if (!function_exists($close_func)) {
- return FALSE;
- }
- if ($extension == 'jpeg') {
- return $close_func($res, $destination, variable_get('image_jpeg_quality', 75));
- }
- else {
- return $close_func($res, $destination);
- }
-}
-
-
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.506
diff -u -r1.506 system.module
--- modules/system/system.module 2 Jul 2007 14:41:37 -0000 1.506
+++ modules/system/system.module 2 Jul 2007 16:07:13 -0000
@@ -274,10 +274,32 @@
);
$items['admin/settings/image-toolkit'] = array(
'title' => 'Image toolkit',
- 'description' => 'Choose which image toolkit to use if you have installed optional toolkits.',
+ 'description' => 'Choose which image toolkit to use for resizing or rotating images.',
'page callback' => 'drupal_get_form',
'page arguments' => array('system_image_toolkit_settings'),
);
+ $toolkits = image_get_available_toolkits();
+ if ($toolkits) {
+ $items['admin/settings/image-toolkit/list'] = array(
+ 'title' => 'List',
+ 'type' => MENU_DEFAULT_LOCAL_TASK,
+ 'weight' => -1,
+ );
+ $items['admin/settings/image-toolkit/config'] = array(
+ 'title' => 'Configure',
+ 'type' => MENU_LOCAL_TASK,
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array(image_get_toolkit() .'_settings_form'),
+ );
+ foreach ($toolkits as $module => $info) {
+ $items['admin/settings/image-toolkit/config/'. $module] = array(
+ 'title' => $info['name'],
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array($module .'_settings_form'),
+ 'type' => $module == image_get_toolkit() ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK,
+ );
+ }
+ }
$items['admin/content/rss-publishing'] = array(
'title' => 'RSS publishing',
'description' => 'Configure the number of items per feed and whether feeds should be titles/teasers/full-text.',
@@ -774,20 +796,38 @@
}
function system_image_toolkit_settings() {
- $toolkits_available = image_get_available_toolkits();
- if (count($toolkits_available) > 1) {
- $form['image_toolkit'] = array(
- '#type' => 'radios',
- '#title' => t('Select an image processing toolkit'),
- '#default_value' => variable_get('image_toolkit', image_get_toolkit()),
- '#options' => $toolkits_available
- );
- }
- else {
- $form['image_toolkit'] = array('#value' => ''. t("No image toolkits found. Drupal will use PHP's built-in GD library for image handling.") .'
');
+ $toolkits = image_get_available_toolkits();
+
+ switch (count($toolkits)) {
+ case 0:
+ $form['image_toolkits']['#value'] = t('There are no image toolkit modules enabled. Toolkit modules can be enabled from the module configuration page.', array('!admin-build-modules' => url('admin/build/modules')));
+
+ return $form;
+
+ case 1:
+ $toolkit = key($toolkits);
+ // The variable needs to be manually set. Otherwise, if a user has two
+ // toolkits and disables the selected one they won't be able to select the
+ // remaing toolkit.
+ variable_set('image_toolkit', $toolkit);
+ $form['image_toolkit']['#value'] = t('The %toolkit module is the only enabled image toolkit. Drupal will use it for resizing, cropping and other image manipulations.', array('%toolkit' => $toolkits[$toolkit]['name']));
+
+ return $form;
+
+ default:
+ $options = array();
+ foreach ($toolkits as $module => $info) {
+ $options[$module] = $info['name'];
+ }
+ $form['image_toolkit'] = array(
+ '#type' => 'radios',
+ '#title' => t('Select an image processing toolkit'),
+ '#default_value' => image_get_toolkit(),
+ '#options' => $options,
+ '#description' => t('This setting lets you choose which toolkit Drupal uses resizing, cropping and other image manipulations'),
+ );
+ return system_settings_form($form);
}
- $form['image_toolkit_settings'] = image_toolkit_invoke('settings');
- return system_settings_form($form);
}
function system_rss_feeds_settings() {