bachir/popsu-d7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added missing module fixer and updated imagecache_actions

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2018-03-21 17:06:08 +01:00
parent 3f7e130321
commit 0bcc558ed5
83 changed files with 6386 additions and 2517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
sites/all/modules/imagecache_actions/canvasactions/imagecache_canvasactions.module
View File

@@ -5,7 +5,7 @@
* including "Watermark"
*
* Based on first draft of the code by Dimm (imagecache.module 5--1)
* http://drupal.org/node/184816
* https://drupal.org/node/184816
*
* Rewritten and ported to Imagecache actions API (imagecache.module 5--2) by
* dman http://coders.co.nz/
@@ -39,21 +39,20 @@
*
*/
// During devel, caching is pointless. Flush it
// imagecache_action_definitions(TRUE);
if (! function_exists('imagecache_actions_calculate_relative_position') ) {
module_load_include('inc', 'imagecache_canvasactions', 'utility');
module_load_include('inc', 'imagecache_actions', 'utility');
}
// @todo There doesn't seem to be a way to specify a file in hook_image_effect_info
// so placing this here for the time being.
module_load_include('inc', 'imagecache_canvasactions', 'canvasactions');
module_load_include('inc', 'imagecache_canvasactions', 'rounded_corners');
// imageapi extensions
module_load_include('inc', 'imagcache_actions', 'image_overlay.inc');
/**
* Implements hook_image_effect_info().
*
* Defines information about the supported effects.
*/
function imagecache_canvasactions_image_effect_info() {
$effects = array();
@@ -69,8 +68,8 @@ function imagecache_canvasactions_image_effect_info() {
$effects['canvasactions_imagemask'] = array(
'label' => t('Image mask'),
'help' => t(' Choose the file image you wish to use as a mask, and apply it to the canvas.'),
'effect callback' => 'canvasactions_imagemask_image',
'dimensions passthrough' => TRUE,
'effect callback' => 'canvasactions_imagemask_effect',
'form callback' => 'canvasactions_imagemask_form',
'summary theme' => 'canvasactions_imagemask_summary',
);
@@ -78,8 +77,8 @@ function imagecache_canvasactions_image_effect_info() {
$effects['canvasactions_file2canvas'] = array(
'label' => t('Overlay (watermark)'),
'help' => t('Choose the file image you wish to use as an overlay, and position it in a layer on top of the canvas.'),
'effect callback' => 'canvasactions_file2canvas_image',
'dimensions passthrough' => TRUE,
'effect callback' => 'canvasactions_file2canvas_effect',
'form callback' => 'canvasactions_file2canvas_form',
'summary theme' => 'canvasactions_file2canvas_summary',
);
@@ -87,7 +86,7 @@ function imagecache_canvasactions_image_effect_info() {
$effects['canvasactions_canvas2file'] = array(
'label' => t('Underlay (background)'),
'help' => t('Choose the file image you wish to use as an background, and position the processed image on it.'),
'effect callback' => 'canvasactions_canvas2file_image',
'effect callback' => 'canvasactions_canvas2file_effect',
'dimensions callback' => 'canvasactions_canvas2file_dimensions',
'form callback' => 'canvasactions_canvas2file_form',
'summary theme' => 'canvasactions_canvas2file_summary',
@@ -96,8 +95,8 @@ function imagecache_canvasactions_image_effect_info() {
$effects['canvasactions_source2canvas'] = array(
'label' => t('Overlay: source image to canvas'),
'help' => t('Places the source image onto the canvas for compositing.'),
'effect callback' => 'canvasactions_source2canvas_image',
'dimensions passthrough' => TRUE,
'effect callback' => 'canvasactions_source2canvas_effect',
'form callback' => 'canvasactions_source2canvas_form',
'summary theme' => 'canvasactions_source2canvas_summary',
);
@@ -105,8 +104,8 @@ function imagecache_canvasactions_image_effect_info() {
$effects['canvasactions_roundedcorners'] = array(
'label' => t('Rounded Corners'),
'help' => t('This is true cropping, not overlays, so the result <em>can</em> be transparent.'),
'effect callback' => 'canvasactions_roundedcorners_image',
'dimensions passthrough' => TRUE,
'effect callback' => 'canvasactions_roundedcorners_effect',
'form callback' => 'canvasactions_roundedcorners_form',
'summary theme' => 'canvasactions_roundedcorners_summary',
);
@@ -114,55 +113,105 @@ function imagecache_canvasactions_image_effect_info() {
$effects['canvasactions_aspect'] = array(
'label' => t('Aspect switcher'),
'help' => t('Use different effects depending on whether the image is landscape of portrait shaped. This re-uses other preset definitions, and just chooses between them based on the rule.'),
'effect callback' => 'canvasactions_aspect_image',
'effect callback' => 'canvasactions_aspect_effect',
'dimensions callback' => 'canvasactions_aspect_dimensions',
'form callback' => 'canvasactions_aspect_form',
'summary theme' => 'canvasactions_aspect_summary',
);
$effects['canvasactions_resizepercent'] = array(
'label' => t('Resize (percent)'),
'help' => t('Resize the image based on percent. If only a single dimension is specified, the other dimension will be calculated.'),
'effect callback' => 'canvasactions_resizepercent_effect',
'dimensions callback' => 'canvasactions_resizepercent_dimensions',
'form callback' => 'canvasactions_resizepercent_form',
'summary theme' => 'canvasactions_resizepercent_summary',
);
$effects['canvasactions_blur'] = array(
'label' => t('Blur'),
'help' => t('Make the image become unclear.'),
'effect callback' => 'canvasactions_blur_effect',
'dimensions passthrough' => TRUE,
'form callback' => 'canvasactions_blur_form',
'summary theme' => 'canvasactions_blur_summary',
);
$effects['canvasactions_interlace'] = array(
'label' => t('Interlace / Progressive'),
'help' => t('Create interlaced PNG/GIF or progressive JPG.'),
'effect callback' => 'canvasactions_interlace_effect',
'dimensions passthrough' => TRUE,
'form callback' => 'canvasactions_interlace_form',
);
$effects['canvasactions_perspective'] = array(
'label' => t('Perspective transform'),
'help' => t('Adds a perspective transformation to the image.'),
'effect callback' => 'canvasactions_perspective_effect',
'dimensions passthrough' => TRUE,
'form callback' => 'canvasactions_perspective_form',
'summary theme' => 'canvasactions_perspective_summary',
);
return $effects;
}
/**
* Need to register the theme functions we expect to use
* Implements hook_theme().
*
* Registers theme functions for the effect summaries.
*/
function imagecache_canvasactions_theme() {
$util_dir = drupal_get_path('module', 'imagecache_actions');
return array(
'canvasactions_definecanvas_summary' => array(
'file' => 'canvasactions.inc',
'variables' => array('data' => NULL),
'file' => 'canvasactions.inc',
),
'canvasactions_imagemask_summary' => array(
'file' => 'canvasactions.inc',
'arguments' => array('element' => NULL),
'file' => 'canvasactions.inc',
),
'canvasactions_file2canvas_summary' => array(
'file' => 'canvasactions.inc',
'variables' => array('data' => NULL),
'file' => 'canvasactions.inc',
),
'canvasactions_source2canvas_summary' => array(
'file' => 'canvasactions.inc',
'variables' => array('data' => NULL),
'file' => 'canvasactions.inc',
),
'canvasactions_canvas2file_summary' => array(
'file' => 'canvasactions.inc',
'variables' => array('data' => NULL),
'file' => 'canvasactions.inc',
),
'canvasactions_roundedcorners_summary' => array(
'file' => 'rounded_corners.inc',
'variables' => array('data' => NULL),
'file' => 'canvasactions.inc',
),
'canvasactions_aspect_summary' => array(
'file' => 'canvasactions.inc',
'variables' => array('data' => NULL),
'file' => 'canvasactions.inc',
),
'canvasactions_resizepercent_summary' => array(
'variables' => array('data' => NULL),
'file' => 'canvasactions.inc',
),
'canvasactions_blur_summary' => array(
'variables' => array('data' => NULL),
'file' => 'canvasactions.inc',
),
'canvasactions_perspective_summary' => array(
'variables' => array('data' => NULL),
'file' => 'canvasactions.inc',
),
'canvasactions_perspective_anchor' => array(
'render element' => 'element',
),
);
}
/**
* Implements hook_image_style_flush.
* Implements hook_image_style_flush().
*
* This hook checks if the image style that is being flushed is used in an
* aspect switcher effect. If so, the style that contains the aspect switcher
@@ -171,7 +220,7 @@ function imagecache_canvasactions_theme() {
* @param array $flushed_style
* The image style that is being flushed.
*/
function imagecache_canvasactions_image_style_flush($flushed_style) {
function imagecache_canvasactions_image_style_flush(/*array*/ $flushed_style) {
$styles = image_styles();
foreach ($styles as $style) {
if ($style['name'] !== $flushed_style['name']) {