' . var_export($library, TRUE) . ''); + $this->assertTrue($library['installed'], "libraries_detect_dependencies() detects compatible version string: '$version_string' is compatible with '$version'"); + } + foreach ($incompatible as $version_string) { + $library['dependencies'][0] = "example_dependency ($version_string)"; + $library['installed'] = TRUE; + unset($library['error'], $library['error message']); + libraries_detect_dependencies($library); + $this->verbose('Library:
' . var_export($library, TRUE) . ''); + $this->assertEqual($library['error'], 'incompatible dependency', "libraries_detect_dependencies() detects incompatible version strings: '$version_string' is incompatible with '$version'"); + } + // Instead of repeating this assertion for each version string, we just + // re-use the $library variable from the foreach loop. + $error_message = t('The version %dependency_version of the %dependency library is not compatible with the %library library.', array( + '%dependency_version' => $version, + '%dependency' => 'Example dependency', + '%library' => $library['name'], + )); + $this->verbose("Expected:
' . var_export(libraries_scan_info_files(), TRUE) . ''); + } + + /** + * Tests libraries_info(). + */ + public function testLibrariesInfo() { + // Test that modules can provide and alter library information. + $info = libraries_info(); + $this->assertTrue(isset($info['example_module'])); + $this->verbose('Library:
' . var_export($info['example_module'], TRUE) . ''); + $this->assertEqual($info['example_module']['info type'], 'module'); + $this->assertEqual($info['example_module']['module'], 'libraries_test_module'); + $this->assertTrue($info['example_module']['module_altered']); + + // Test that themes can provide and alter library information. + $this->assertTrue(isset($info['example_theme'])); + $this->verbose('Library:
' . var_export($info['example_theme'], TRUE) . ''); + $this->assertEqual($info['example_theme']['info type'], 'theme'); + $this->assertEqual($info['example_theme']['theme'], 'libraries_test_theme'); + $this->assertTrue($info['example_theme']['theme_altered']); + + // Test that library information is found correctly. + $expected = array( + 'name' => 'Example files', + 'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example', + 'version' => '1', + 'files' => array( + 'js' => array('example_1.js' => array()), + 'css' => array('example_1.css' => array()), + 'php' => array('example_1.php' => array()), + ), + 'info type' => 'module', + 'module' => 'libraries_test_module', + ); + libraries_info_defaults($expected, 'example_files'); + $library = libraries_info('example_files'); + $this->verbose('Expected:
' . var_export($expected, TRUE) . ''); + $this->verbose('Actual:
' . var_export($library, TRUE) . ''); + $this->assertEqual($library, $expected, 'Library information is correctly gathered.'); + + // Test a library specified with an .info file gets detected. + $expected = array( + 'name' => 'Example info file', + 'info type' => 'info file', + 'info file' => drupal_get_path('module', 'libraries') . '/tests/libraries/example_info_file.libraries.info', + ); + libraries_info_defaults($expected, 'example_info_file'); + $library = libraries_info('example_info_file'); + // If this module was downloaded from Drupal.org, the Drupal.org packaging + // system has corrupted the test info file. + // @see http://drupal.org/node/1606606 + unset($library['core'], $library['datestamp'], $library['project'], $library['version']); + $this->verbose('Expected:
' . var_export($expected, TRUE) . ''); + $this->verbose('Actual:
' . var_export($library, TRUE) . ''); + $this->assertEqual($library, $expected, 'Library specified with an .info file found'); + } + + /** + * Tests libraries_detect(). + */ + public function testLibrariesDetect() { + // Test missing library. + $library = libraries_detect('example_missing'); + $this->verbose('
' . var_export($library, TRUE) . ''); + $this->assertEqual($library['error'], 'not found', 'Missing library not found.'); + $error_message = t('The %library library could not be found.', array( + '%library' => $library['name'], + )); + $this->assertEqual($library['error message'], $error_message, 'Correct error message for a missing library.'); + + // Test unknown library version. + $library = libraries_detect('example_undetected_version'); + $this->verbose('
' . var_export($library, TRUE) . ''); + $this->assertEqual($library['error'], 'not detected', 'Undetected version detected as such.'); + $error_message = t('The version of the %library library could not be detected.', array( + '%library' => $library['name'], + )); + $this->assertEqual($library['error message'], $error_message, 'Correct error message for a library with an undetected version.'); + + // Test unsupported library version. + $library = libraries_detect('example_unsupported_version'); + $this->verbose('
' . var_export($library, TRUE) . ''); + $this->assertEqual($library['error'], 'not supported', 'Unsupported version detected as such.'); + $error_message = t('The installed version %version of the %library library is not supported.', array( + '%version' => $library['version'], + '%library' => $library['name'], + )); + $this->assertEqual($library['error message'], $error_message, 'Correct error message for a library with an unsupported version.'); + + // Test supported library version. + $library = libraries_detect('example_supported_version'); + $this->verbose('
' . var_export($library, TRUE) . ''); + $this->assertEqual($library['installed'], TRUE, 'Supported library version found.'); + + // Test libraries_get_version(). + $library = libraries_detect('example_default_version_callback'); + $this->verbose('
' . var_export($library, TRUE) . ''); + $this->assertEqual($library['version'], '1', 'Expected version returned by default version callback.'); + + // Test a multiple-parameter version callback. + $library = libraries_detect('example_multiple_parameter_version_callback'); + $this->verbose('
' . var_export($library, TRUE) . ''); + $this->assertEqual($library['version'], '1', 'Expected version returned by multiple parameter version callback.'); + + // Test a top-level files property. + $library = libraries_detect('example_files'); + $files = array( + 'js' => array('example_1.js' => array()), + 'css' => array('example_1.css' => array()), + 'php' => array('example_1.php' => array()), + ); + $this->verbose('
' . var_export($library, TRUE) . ''); + $this->assertEqual($library['files'], $files, 'Top-level files property works.'); + + // Test version-specific library files. + $library = libraries_detect('example_versions'); + $files = array( + 'js' => array('example_2.js' => array()), + 'css' => array('example_2.css' => array()), + 'php' => array('example_2.php' => array()), + ); + $this->verbose('
' . var_export($library, TRUE) . ''); + $this->assertEqual($library['files'], $files, 'Version-specific library files found.'); + + // Test missing variant. + $library = libraries_detect('example_variant_missing'); + $this->verbose('
' . var_export($library, TRUE) . ''); + $this->assertEqual($library['variants']['example_variant']['error'], 'not found', 'Missing variant not found'); + $error_message = t('The %variant variant of the %library library could not be found.', array( + '%variant' => 'example_variant', + '%library' => 'Example variant missing', + )); + $this->assertEqual($library['variants']['example_variant']['error message'], $error_message, 'Correct error message for a missing variant.'); + + // Test existing variant. + $library = libraries_detect('example_variant'); + $this->verbose('
' . var_export($library, TRUE) . ''); + $this->assertEqual($library['variants']['example_variant']['installed'], TRUE, 'Existing variant found.'); + } + + /** + * Tests libraries_detect() without a $name parameter. + */ + public function testLibrariesDetectAll() { + // Test that an array with all library information is returned and that the + // libraries are properly detected. + $libraries = libraries_detect(); + $this->verbose('
' . var_export($libraries, TRUE) . ''); + $this->assertEqual($libraries['example_missing']['error'], 'not found'); + $this->assertEqual($libraries['example_undetected_version']['error'], 'not detected'); + $this->assertEqual($libraries['example_unsupported_version']['error'], 'not supported'); + $this->assertEqual($libraries['example_supported_version']['installed'], TRUE); + } + + /** + * Tests libraries_load(). + */ + public function testLibrariesLoad() { + // Test dependencies. + $library = libraries_load('example_dependency_missing'); + $this->verbose('
' . var_export($library, TRUE) . ''); + $this->assertFalse($library['loaded'], 'Library with missing dependency cannot be loaded'); + $library = libraries_load('example_dependency_incompatible'); + $this->verbose('
' . var_export($library, TRUE) . ''); + $this->assertFalse($library['loaded'], 'Library with incompatible dependency cannot be loaded'); + $library = libraries_load('example_dependency_compatible'); + $this->verbose('
' . var_export($library, TRUE) . ''); + $this->assertEqual($library['loaded'], 1, 'Library with compatible dependency is loaded'); + $loaded = &drupal_static('libraries_load'); + $this->verbose('
' . var_export($loaded, TRUE) . ''); + $this->assertEqual($loaded['example_dependency']['loaded'], 1, 'Dependency library is also loaded'); + + // Test that PHP files that have a local $path variable do not break library + // loading. + // @see _libraries_require_once() + $library = libraries_load('example_path_variable_override'); + $this->assertEqual($library['loaded'], 2, 'PHP files cannot break library loading.'); + } + + /** + * Tests the applying of callbacks. + */ + public function testCallbacks() { + $expected = array( + 'name' => 'Example callback', + 'library path' => drupal_get_path('module', 'libraries') . '/tests/libraries/example', + 'version' => '1', + 'versions' => array( + '1' => array( + 'variants' => array( + 'example_variant' => array( + 'info callback' => 'not applied', + 'pre-detect callback' => 'not applied', + 'post-detect callback' => 'not applied', + 'pre-dependencies-load callback' => 'not applied', + 'pre-load callback' => 'not applied', + 'post-load callback' => 'not applied', + ), + ), + 'info callback' => 'not applied', + 'pre-detect callback' => 'not applied', + 'post-detect callback' => 'not applied', + 'pre-dependencies-load callback' => 'not applied', + 'pre-load callback' => 'not applied', + 'post-load callback' => 'not applied', + ), + ), + 'variants' => array( + 'example_variant' => array( + 'info callback' => 'not applied', + 'pre-detect callback' => 'not applied', + 'post-detect callback' => 'not applied', + 'pre-dependencies-load callback' => 'not applied', + 'pre-load callback' => 'not applied', + 'post-load callback' => 'not applied', + ), + ), + 'callbacks' => array( + 'info' => array('_libraries_test_module_info_callback'), + 'pre-detect' => array('_libraries_test_module_pre_detect_callback'), + 'post-detect' => array('_libraries_test_module_post_detect_callback'), + 'pre-dependencies-load' => array('_libraries_test_module_pre_dependencies_load_callback'), + 'pre-load' => array('_libraries_test_module_pre_load_callback'), + 'post-load' => array('_libraries_test_module_post_load_callback'), + ), + 'info callback' => 'not applied', + 'pre-detect callback' => 'not applied', + 'post-detect callback' => 'not applied', + 'pre-dependencies-load callback' => 'not applied', + 'pre-load callback' => 'not applied', + 'post-load callback' => 'not applied', + 'info type' => 'module', + 'module' => 'libraries_test_module', + ); + libraries_info_defaults($expected, 'example_callback'); + + // Test a callback in the 'info' group. + $expected['info callback'] = 'applied (top-level)'; + $expected['versions']['1']['info callback'] = 'applied (version 1)'; + $expected['versions']['1']['variants']['example_variant']['info callback'] = 'applied (version 1, variant example_variant)'; + $expected['variants']['example_variant']['info callback'] = 'applied (variant example_variant)'; + $library = libraries_info('example_callback'); + $this->verbose('Expected:
' . var_export($expected, TRUE) . ''); + $this->verbose('Actual:
' . var_export($library, TRUE) . ''); + $this->assertEqual($library, $expected, 'Prepare callback was applied correctly.'); + + // Test a callback in the 'pre-detect' and 'post-detect' phases. + // Successfully detected libraries should only contain version information + // for the detected version and thus, be marked as installed. + unset($expected['versions']); + $expected['installed'] = TRUE; + // Additionally, version-specific properties of the detected version are + // supposed to override the corresponding top-level properties. + $expected['info callback'] = 'applied (version 1)'; + $expected['variants']['example_variant']['installed'] = TRUE; + $expected['variants']['example_variant']['info callback'] = 'applied (version 1, variant example_variant)'; + // Version-overloading takes place after the 'pre-detect' callbacks have + // been applied. + $expected['pre-detect callback'] = 'applied (version 1)'; + $expected['post-detect callback'] = 'applied (top-level)'; + $expected['variants']['example_variant']['pre-detect callback'] = 'applied (version 1, variant example_variant)'; + $expected['variants']['example_variant']['post-detect callback'] = 'applied (variant example_variant)'; + $library = libraries_detect('example_callback'); + $this->verbose('Expected:
' . var_export($expected, TRUE) . ''); + $this->verbose('Actual:
' . var_export($library, TRUE) . ''); + $this->assertEqual($library, $expected, 'Detect callback was applied correctly.'); + + // Test a callback in the 'pre-dependencies-load', 'pre-load' and + // 'post-load' phases. + // Successfully loaded libraries should only contain information about the + // already loaded variant. + unset($expected['variants']); + $expected['loaded'] = 0; + $expected['pre-dependencies-load callback'] = 'applied (top-level)'; + $expected['pre-load callback'] = 'applied (top-level)'; + $expected['post-load callback'] = 'applied (top-level)'; + $library = libraries_load('example_callback'); + $this->verbose('Expected:
' . var_export($expected, TRUE) . ''); + $this->verbose('Actual:
' . var_export($library, TRUE) . ''); + $this->assertEqual($library, $expected, 'Pre-load and post-load callbacks were applied correctly.'); + // This is not recommended usually and is only used for testing purposes. + drupal_static_reset('libraries_load'); + // Successfully loaded library variants are supposed to contain the specific + // variant information only. + $expected['info callback'] = 'applied (version 1, variant example_variant)'; + $expected['pre-detect callback'] = 'applied (version 1, variant example_variant)'; + $expected['post-detect callback'] = 'applied (variant example_variant)'; + $library = libraries_load('example_callback', 'example_variant'); + $this->verbose('Expected:
' . var_export($expected, TRUE) . ''); + $this->verbose('Actual:
' . var_export($library, TRUE) . ''); + $this->assertEqual($library, $expected, 'Pre-detect and post-detect callbacks were applied correctly to a variant.'); + } + + /** + * Tests that library files are properly added to the page output. + * + * We check for JavaScript and CSS files directly in the DOM and add a list of + * included PHP files manually to the page output. + * + * @see _libraries_test_module_load() + */ + public function testLibrariesOutput() { + // Test loading of a simple library with a top-level files property. + $this->drupalGet('libraries-test-module/files'); + $this->assertLibraryFiles('example_1', 'File loading'); + + // Test loading of integration files. + $this->drupalGet('libraries-test-module/module-integration-files'); + $this->assertRaw('libraries_test_module.js', 'Integration file loading: libraries_test_module.js found'); + $this->assertRaw('libraries_test_module.css', 'Integration file loading: libraries_test_module.css found'); + $this->assertRaw('libraries_test_module.inc', 'Integration file loading: libraries_test_module.inc found'); + $this->drupalGet('libraries-test-module/theme-integration-files'); + $this->assertRaw('libraries_test_theme.js', 'Integration file loading: libraries_test_theme.js found'); + $this->assertRaw('libraries_test_theme.css', 'Integration file loading: libraries_test_theme.css found'); + $this->assertRaw('libraries_test_theme.inc', 'Integration file loading: libraries_test_theme.inc found'); + + // Test loading of post-load integration files. + $this->drupalGet('libraries-test-module/module-integration-files-post-load'); + // If the files were not loaded correctly, a fatal error occurs. + $this->assertResponse(200, 'Post-load integration files are loaded correctly.'); + + // Test version overloading. + $this->drupalGet('libraries-test-module/versions'); + $this->assertLibraryFiles('example_2', 'Version overloading'); + + // Test variant loading. + $this->drupalGet('libraries-test-module/variant'); + $this->assertLibraryFiles('example_3', 'Variant loading'); + + // Test version overloading and variant loading. + $this->drupalGet('libraries-test-module/versions-and-variants'); + $this->assertLibraryFiles('example_4', 'Concurrent version and variant overloading'); + + // Test caching. + variable_set('libraries_test_module_cache', TRUE); + cache_clear_all('example_callback', 'cache_libraries'); + // When the library information is not cached, all callback groups should be + // invoked. + $this->drupalGet('libraries-test-module/cache'); + $this->assertRaw('The info callback group was invoked.', 'Info callback invoked for uncached libraries.'); + $this->assertRaw('The pre-detect callback group was invoked.', 'Pre-detect callback invoked for uncached libraries.'); + $this->assertRaw('The post-detect callback group was invoked.', 'Post-detect callback invoked for uncached libraries.'); + $this->assertRaw('The pre-load callback group was invoked.', 'Pre-load callback invoked for uncached libraries.'); + $this->assertRaw('The post-load callback group was invoked.', 'Post-load callback invoked for uncached libraries.'); + // When the library information is cached only the 'pre-load' and + // 'post-load' callback groups should be invoked. + $this->drupalGet('libraries-test-module/cache'); + $this->assertNoRaw('The info callback group was not invoked.', 'Info callback not invoked for cached libraries.'); + $this->assertNoRaw('The pre-detect callback group was not invoked.', 'Pre-detect callback not invoked for cached libraries.'); + $this->assertNoRaw('The post-detect callback group was not invoked.', 'Post-detect callback not invoked for cached libraries.'); + $this->assertRaw('The pre-load callback group was invoked.', 'Pre-load callback invoked for cached libraries.'); + $this->assertRaw('The post-load callback group was invoked.', 'Post-load callback invoked for cached libraries.'); + variable_set('libraries_test_module_cache', FALSE); + } + + /** + * Helper function to assert that a library was correctly loaded. + * + * Asserts that all the correct files were loaded and all the incorrect ones + * were not. + * + * @param $name + * The name of the files that should be loaded. The current testing system + * knows of 'example_1', 'example_2', 'example_3' and 'example_4'. Each name + * has an associated JavaScript, CSS and PHP file that will be asserted. All + * other files will be asserted to not be loaded. See + * tests/example/README.txt for more information on how the loading of the + * files is tested. + * @param $label + * (optional) A label to prepend to the assertion messages, to make them + * less ambiguous. + * @param $extensions + * (optional) The expected file extensions of $name. Defaults to + * array('js', 'css', 'php'). + */ + public function assertLibraryFiles($name, $label = '', $extensions = array('js', 'css', 'php')) { + $label = ($label !== '' ? "$label: " : ''); + + // Test that the wrong files are not loaded... + $names = array( + 'example_1' => FALSE, + 'example_2' => FALSE, + 'example_3' => FALSE, + 'example_4' => FALSE, + ); + // ...and the correct ones are. + $names[$name] = TRUE; + + // Test for the specific HTML that the different file types appear as in the + // DOM. + $html = array( + 'js' => array(''), + 'css' => array('@import url("', '");'), + // PHP files do not get added to the DOM directly. + // @see _libraries_test_load() + 'php' => array('
There are no user-configurable options for this process.
+Certain cameras can embed orientation information into image + files when they save them. This information is embedded in an EXIF tag + and can be used to rotate images to their correct position for display. + Not all cameras or images contain this information. + This process is only useful for images that contain this information, + whereas for other images it is harmless. +
+Although most modern browsers do support the orientation tag, the + information may get lost or become incorrect by other operations. + So, to support all browsers and prevent rotation errors, it is better to + start each image style with this effect. +
+The expected/supported values are:
+ Tag: 0x0112 Orientation
+
Wikipedia: Exchangeable image file format
+ ", + ); + return $form; +} + +/** + * Implements theme_hook() for the autorotate effect summary. + * + * param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_imagecache_autorotate_summary(/*array $variables*/) { + return 'image based on its EXIF data.'; +} + +/** + * Autorotate image based on EXIF Orientation tag. + */ +function imagecache_autorotate_effect(stdClass $image /*, $data*/) { + // Test to see if EXIF is supported by the current image type. + if (in_array($image->info['mime_type'], array('image/jpeg', 'image/tiff'))) { + // Hand over to toolkit. + return image_toolkit_invoke('imagecache_autorotate', $image); + } + else if ($image->source === 'modules/image/sample.png' && user_access('administer image styles')) { + if (!extension_loaded('exif')) { + // Issue a warning if we are in the admin screen and the exif extension is + // not enabled. + drupal_set_message(t('The autorotate image effect requires the exif extension to be enabled.'), 'warning'); + if ($image->toolkit === 'imagemagick') { + drupal_set_message(t('Though imagemagick will work without the exif extension, subsequent effects may fail as the image dimensions cannot be updated.'), 'warning'); + } + } + } + return TRUE; +} + +/** + * GD toolkit specific implementation of this image effect. + * + * @param stdClass $image + * + * @return bool + * true on success, false otherwise. + */ +function image_gd_imagecache_autorotate(stdClass $image) { + if (!function_exists('exif_read_data')) { + watchdog('imagecache_actions', 'Image %file could not be auto-rotated: !message', array('%file' => $image->source, '!message' => t('The exif_read_data() function is not available in this PHP installation. You probably have to enable the exif extension.'))); + return FALSE; + } + $exif = exif_read_data(drupal_realpath($image->source)); + if (isset($exif['Orientation'])) { + // http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/EXIF.html: + // 1 = Horizontal (normal) + // 2 = Mirror horizontal + // 3 = Rotate 180 + // 4 = Mirror vertical + // 5 = Mirror horizontal and rotate 270 CW + // 6 = Rotate 90 CW + // 7 = Mirror horizontal and rotate 90 CW + // 8 = Rotate 270 CW + // @todo: Add horizontal and vertical flips etc. + // imagecopy seems to be able to mirror, see conmments on + // http://php.net/manual/en/function.imagecopy.php + // @todo: Create sample set for tests. + switch ($exif['Orientation']) { + case 3: + $degrees = 180; + break; + case 6: + $degrees = 90; + break; + case 8: + $degrees = 270; + break; + default: + $degrees = 0; + } + if ($degrees != 0) { + return image_rotate($image, $degrees); + } + } + return TRUE; +} + +/** + * Imagemagick toolkit specific implementation of this image effect. + * + * @param stdClass $image + * An image object. + * + * @return bool + * true on success, false otherwise. + * + * @see http://www.imagemagick.org/script/command-line-options.php#auto-orient + */ +function image_imagemagick_imagecache_autorotate(stdClass $image) { + // Use the exif extension, if enabled, to figure out the new dimensions. + // Moreover (see [#2366163]): to prevent a bug in IM to incorrectly rotate the + // image when it should not, we only pass the auto-orient argument when the + // exif extension could detect the 'Orientation' tag. + if (function_exists('exif_read_data')) { + $exif = exif_read_data(drupal_realpath($image->source)); + if (isset($exif['Orientation'])) { + switch ($exif['Orientation']) { + case 1: + // Normal orientation: no need to rotate or to change the dimensions. + break; + case 5: + case 6: + case 7: + case 8: + // 90 or 270 degrees rotation (+ optional mirror): swap dimensions. + $image->ops[] = '-auto-orient'; + $tmp = $image->info['width']; + $image->info['width'] = $image->info['height']; + $image->info['height'] = $tmp; + break; + default: + // All other orientations: pass the arguments, but the dimensions + // remain the same. + $image->ops[] = '-auto-orient'; + break; + } + } + } + else { + // We do add the auto-orient argument to IM. IM will determine itself + // whether to rotate or not. + $image->ops[] = '-auto-orient'; + // However we cannot keep track of the dimensions anymore. + $image->info['width'] = $image->info['height'] = NULL; + } + return TRUE; +} + +/** + * Image dimensions callback for this image effect. + * + * @param array $dimensions + * An array with the dimensions (in pixels) to be modified. + * param array $data + * An associative array containing the effect data. + */ +function imagecache_autorotate_dimensions(array &$dimensions/*, array $data*/) { + // We can only know the resulting dimensions if both dimensions are equal. + // Otherwise we need to inspect the image itself, which is not passed in here. + // (this callback was introduced to enhance performance by NOT accessing the + // image file when rendering the width and height attributes of the html img + // tag). + if ($dimensions['width'] !== $dimensions['height']) { + $dimensions['width'] = $dimensions['height'] = NULL; + } +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/autorotate/portrait-painting.jpg b/sites/all/modules/contrib/files/imagecache_actions/autorotate/portrait-painting.jpg new file mode 100644 index 00000000..c6e4fdbe Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/autorotate/portrait-painting.jpg differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/canvasactions/canvasactions.inc b/sites/all/modules/contrib/files/imagecache_actions/canvasactions/canvasactions.inc new file mode 100644 index 00000000..f2163c7d --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/canvasactions/canvasactions.inc @@ -0,0 +1,1249 @@ + 'item', + '#title' => t('Image mask'), + '#description' => t('This effect will add (or replace) a transparency channel to your image. The mask file should be a grayscale image where black is fully transparent and white is fully opaque. The referenced mask will be applied to the top left of the image.'), + ); + $form['path'] = array( + '#type' => 'textfield', + '#title' => t('Mask file name'), + '#default_value' => isset($data['path']) ? $data['path'] : '', + '#description' => imagecache_actions_file_field_description(), + '#element_validate' => array('imagecache_actions_validate_file'), + ); + return $form; +} + +/** + * Implements theme_hook() for the image mask effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_canvasactions_imagemask_summary(array $variables) { + $data = $variables['data']; + return 'file: ' . $data['path']; +} + +/** + * Image effect callback for the image mask effect. + * + * @param stdClass $image + * @param array $data + * + * @return bool + * true on success, false otherwise. + */ +function canvasactions_imagemask_effect(stdClass $image, array $data) { + $mask = imagecache_actions_image_load($data['path'], $image->toolkit); + if ($mask) { + // @todo: (sydneyshan) Consider best way to add offset support - I assume we + // would position the mask somewhere (top/left/offset px etc) and choose if + // the surrounding area is white or black (opaque or transparent) using an + // extra form element (radio). Assess existing positioning code first to + // reduce duplication of code. Pass the results to the following function as + // array($mask, $data). Perhaps add a 'scale mask to fit image'/'scale image + // to fit mask'/'no scale' radio group? + return image_toolkit_invoke('imagemask', $image, array($mask)); + } + return FALSE; +} + +/** + * GD toolkit specific implementation of the image mask effect. + * + * @param stdClass $image + * Image object containing the GD image resource to operate on. + * @param stdClass $mask + * An image object containing the image to use as mask. + * + * @return bool + * true on success, false otherwise. + */ +function image_gd_imagemask(stdClass $image, stdClass $mask) { + $newPicture = imagecreatetruecolor($image->info['width'], $image->info['height']); + imagesavealpha($newPicture, TRUE); + imagealphablending($newPicture, TRUE); + $transparent = imagecolorallocatealpha($newPicture, 0, 0, 0, 127); + imagefill($newPicture, 0, 0, $transparent); + + // Perform pixel-based alpha map application. + for ($x = 0; $x < $image->info['width']; $x++) { + for ($y = 0; $y < $image->info['height']; $y++) { + // Deal with images with mismatched sizes + if ($x >= $mask->info['width'] || $y >= $mask->info['height']) { + imagesetpixel($newPicture, $x, $y, $transparent); + } + else { + $alpha = imagecolorsforindex($mask->resource, imagecolorat($mask->resource, $x, $y)); + $alpha = 127 - floor($alpha['red'] / 2); + $color = imagecolorsforindex($image->resource, imagecolorat($image->resource, $x, $y)); + imagesetpixel($newPicture, $x, $y, imagecolorallocatealpha($newPicture, $color['red'], $color['green'], $color['blue'], $alpha)); + } + } + } + + // Copy back to original picture. + imagedestroy($image->resource); + $image->resource = $newPicture; + + return TRUE; +} + + +/** + * Imagemagick toolkit specific implementation of the image mask effect. + * + * @param stdClass $image + * Image object containing the image resource to operate on. + * @param stdClass $mask + * An image object containing the image to use as mask. + * + * @return bool + * true on success, false otherwise. + */ +function image_imagemagick_imagemask(stdClass $image, stdClass $mask) { + $image->ops[] = escapeshellarg($mask->source); + $image->ops[] = '-alpha Off -compose CopyOpacity -composite'; + return TRUE; +} + +/** + * Image effect form callback for the define canvas effect. + * + * @param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function canvasactions_definecanvas_form(array $data) { + module_load_include('inc', 'imagecache_actions', 'utility-color'); + $defaults = array( + 'RGB' => array( + 'HEX' => '#333333', + ), + 'under' => TRUE, + 'exact' => array( + 'width' => '', + 'height' => '', + 'xpos' => 'center', + 'ypos' => 'center', + ), + 'relative' => array( + 'leftdiff' => '', + 'rightdiff' => '', + 'topdiff' => '', + 'bottomdiff' => '', + ), + ); + $data += $defaults; + + $form = array( + 'RGB' => imagecache_rgb_form($data['RGB']), + 'help' => array( + '#markup' => t('Enter no color value for transparent. This will have the effect of adding clear margins around the image.'), + '#prefix' => '', + '#suffix' => '
', + ), + 'under' => array( + '#type' => 'checkbox', + '#title' => t('Resize canvas under image (possibly cropping)'), + '#default_value' => $data['under'], + '#description' => t('If not set, this will create a solid flat layer, probably totally obscuring the source image'), + ), + ); + $form['info'] = array('#value' => t('Enter values in ONLY ONE of the below options. Either exact or relative. Most values are optional - you can adjust only one dimension as needed. If no useful values are set, the current base image size will be used.')); + $form['exact'] = array( + '#type' => 'fieldset', + '#collapsible' => TRUE, + '#title' => 'Exact size', + 'help' => array( + '#markup' => t('Set the canvas to a precise size, possibly cropping the image. Use to start with a known size.'), + '#prefix' => '', + '#suffix' => '
', + ), + 'width' => array( + '#type' => 'textfield', + '#title' => t('Width'), + '#default_value' => $data['exact']['width'], + '#description' => t('Enter a value in pixels or percent'), + '#size' => 5, + ), + 'height' => array( + '#type' => 'textfield', + '#title' => t('Height'), + '#default_value' => $data['exact']['height'], + '#description' => t('Enter a value in pixels or percent'), + '#size' => 5, + ), + ); + $form['exact'] = array_merge($form['exact'], imagecache_actions_pos_form($data['exact'])); + if (!$data['exact']['width'] && !$data['exact']['height']) { + $form['exact']['#collapsed'] = TRUE; + } + + $form['relative'] = array( + '#type' => 'fieldset', + '#collapsible' => TRUE, + '#title' => t('Relative size'), + 'help' => array( + '#markup' => t('Set the canvas to a relative size, based on the current image dimensions. Use to add simple borders or expand by a fixed amount. Negative values may crop the image.'), + '#prefix' => '', + '#suffix' => '
', + ), + 'leftdiff' => array( + '#type' => 'textfield', + '#title' => t('left difference'), + '#default_value' => $data['relative']['leftdiff'], + '#size' => 6, + '#description' => t('Enter an offset in pixels.'), + ), + 'rightdiff' => array( + '#type' => 'textfield', + '#title' => t('right difference'), + '#default_value' => $data['relative']['rightdiff'], + '#size' => 6, + '#description' => t('Enter an offset in pixels.'), + ), + 'topdiff' => array( + '#type' => 'textfield', + '#title' => t('top difference'), + '#default_value' => $data['relative']['topdiff'], + '#size' => 6, + '#description' => t('Enter an offset in pixels.'), + ), + 'bottomdiff' => array( + '#type' => 'textfield', + '#title' => t('bottom difference'), + '#default_value' => $data['relative']['bottomdiff'], + '#size' => 6, + '#description' => t('Enter an offset in pixels.'), + ), + ); + if (!$data['relative']['leftdiff'] && !$data['relative']['rightdiff'] && !$data['relative']['topdiff'] && !$data['relative']['bottomdiff']) { + $form['relative']['#collapsed'] = TRUE; + } + + $form['#submit'][] = 'canvasactions_definecanvas_form_submit'; + return $form; +} + +/** + * Implements theme_hook() for the define canvas effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_canvasactions_definecanvas_summary(array $variables) { + $data = $variables['data']; + if ($data['exact']['width'] || $data['exact']['height']) { + $w = !empty($data['exact']['width']) ? $data['exact']['width'] : '100%'; + $h = !empty($data['exact']['height']) ? $data['exact']['height'] : '100%'; + $x = !empty($data['exact']['xpos']) ? $data['exact']['xpos'] : '0'; + $y = !empty($data['exact']['ypos']) ? $data['exact']['ypos'] : '0'; + $output = "{$w}x{$h} ($x, $y)"; + } + else { + $output = ' left:' . $data['relative']['leftdiff']; + $output .= ' right:' . $data['relative']['rightdiff']; + $output .= ' top:' . $data['relative']['topdiff']; + $output .= ' bottom:' . $data['relative']['bottomdiff']; + } + $output .= theme('imagecacheactions_rgb', array('RGB' => $data['RGB'])); + $output .= ($data['under']) ? t(" under image ") : t(" over image "); + return $output; +} + +/** + * Image effect callback for the define canvas effect. + * + * @param stdClass $image + * @param array $data + * + * @return boolean + * true on success, false otherwise. + */ +function canvasactions_definecanvas_effect(stdClass $image, array $data) { + // May be given either exact or relative dimensions. + if ($data['exact']['width'] || $data['exact']['height']) { + // Allows only one dimension to be used if the other is unset. + if (!$data['exact']['width']) { + $data['exact']['width'] = $image->info['width']; + } + if (!$data['exact']['height']) { + $data['exact']['height'] = $image->info['height']; + } + + $targetsize['width'] = imagecache_actions_percent_filter($data['exact']['width'], $image->info['width']); + $targetsize['height'] = imagecache_actions_percent_filter($data['exact']['height'], $image->info['height']); + + $targetsize['left'] = image_filter_keyword($data['exact']['xpos'], $targetsize['width'], $image->info['width']); + $targetsize['top'] = image_filter_keyword($data['exact']['ypos'], $targetsize['height'], $image->info['height']); + + } + else { + // Calculate relative size. + $targetsize['width'] = $image->info['width'] + $data['relative']['leftdiff'] + $data['relative']['rightdiff']; + $targetsize['height'] = $image->info['height'] + $data['relative']['topdiff'] + $data['relative']['bottomdiff']; + $targetsize['left'] = $data['relative']['leftdiff']; + $targetsize['top'] = $data['relative']['topdiff']; + } + + // Convert from hex (as it is stored in the UI). + if ($data['RGB']['HEX'] && $deduced = imagecache_actions_hex2rgba($data['RGB']['HEX'])) { + $data['RGB'] = array_merge($data['RGB'], $deduced); + } + + // All the math is done, now defer to the toolkit in use. + $data['targetsize'] = $targetsize; + + $success = image_toolkit_invoke('definecanvas', $image, array($data)); + if ($success) { + $image->info['width'] = $targetsize['width']; + $image->info['height'] = $targetsize['height']; + } + return $success; +} + +/** + * GD toolkit specific implementation of the define canvas effect. + * + * @param stdClass $image + * @param array $data + * The parameters for this effect. $data['targetsize'] is an array expected to + * contain a width, height and a left, top. + * + * @return bool + * true on success, false otherwise. + */ +function image_gd_definecanvas(stdClass $image, array $data) { + $targetsize = $data['targetsize']; + $RGB = $data['RGB']; + + $newcanvas = imagecreatetruecolor($targetsize['width'], $targetsize['height']); + imagesavealpha($newcanvas, TRUE); + imagealphablending($newcanvas, FALSE); + imagesavealpha($image->resource, TRUE); + if ($RGB['HEX']) { + // Set color, allow it to define transparency, or assume opaque. + $background = imagecolorallocatealpha($newcanvas, $RGB['red'], $RGB['green'], $RGB['blue'], $RGB['alpha']); + } + else { + // No color, attempt transparency, assume white. + $background = imagecolorallocatealpha($newcanvas, 255, 255, 255, 127); + } + imagefilledrectangle($newcanvas, 0, 0, $targetsize['width'], $targetsize['height'], $background); + + if ($data['under']) { + $canvas_object = new stdClass(); + $canvas_object->resource = $newcanvas; + $canvas_object->info = array( + 'width' => $targetsize['width'], + 'height' => $targetsize['height'], + 'mime_type' => $image->info['mime_type'], + 'extension' => $image->info['extension'], + ); + $canvas_object->toolkit = $image->toolkit; + image_overlay($image, $canvas_object, $targetsize['left'], $targetsize['top'], 100, TRUE); + } + else { + $image->resource = $newcanvas; + } + return TRUE; +} + +/** + * Imagemagick toolkit specific implementation of the define canvas effect. + * + * @param stdClass $image + * @param array $data + * The parameters for this effect. $data['targetsize'] is an array expected to + * contain a width, height and a left, top. + * + * @return bool + * true on success, false otherwise. + * + * @see http://www.imagemagick.org/script/command-line-options.php#extent + */ +function image_imagemagick_definecanvas(stdClass $image, $data) { + // Reset any gravity settings from earlier effects. + $image->ops[] = '-gravity None'; + + $backgroundcolor = $data['RGB']['HEX'] != '' ? '#' . ltrim($data['RGB']['HEX'], '#') : 'None'; + $image->ops[] = '-background ' . escapeshellarg($backgroundcolor); + + $compose_operator = $data['under'] ? 'src-over' : 'dst-over'; + $image->ops[] = "-compose $compose_operator"; + + $targetsize = $data['targetsize']; + $geometry = sprintf('%dx%d', $targetsize['width'], $targetsize['height']); + if ($targetsize['left'] || $targetsize['top']) { + $geometry .= sprintf('%+d%+d', -$targetsize['left'], -$targetsize['top']); + } + $image->ops[] = '-extent ' . escapeshellarg($geometry); + + return TRUE; +} + +/** + * Image dimensions callback for the define canvas effect. + * + * @param array $dimensions + * Dimensions to be modified - an associative array containing the items + * 'width' and 'height' (in pixels). + * @param array $data + * An associative array containing the effect data. + */ +function canvasactions_definecanvas_dimensions(array &$dimensions, array $data) { + // May be given either exact or relative dimensions. + if ($data['exact']['width'] || $data['exact']['height']) { + // Allows only one dimension to be used if the other is unset. + if (!$data['exact']['width']) { + $data['exact']['width'] = $dimensions['width']; + } + if (!$data['exact']['height']) { + $data['exact']['height'] = $dimensions['height']; + } + + $dimensions['width'] = imagecache_actions_percent_filter($data['exact']['width'], $dimensions['width']); + $dimensions['height'] = imagecache_actions_percent_filter($data['exact']['height'], $dimensions['height']); + } + else { + // Calculate relative sizes (only possible if we have the current size). + if ($dimensions['width'] !== NULL) { + $dimensions['width'] = $dimensions['width'] + (int) $data['relative']['leftdiff'] + (int) $data['relative']['rightdiff']; + } + if ($dimensions['height'] !== NULL) { + $dimensions['height'] = $dimensions['height'] + (int) $data['relative']['topdiff'] + (int) $data['relative']['bottomdiff']; + } + } +} + + +/** + * Image effect form callback for the underlay (background) effect. + * + * @param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function canvasactions_canvas2file_form(array $data) { + $defaults = array( + 'xpos' => '0', + 'ypos' => '0', + 'alpha' => '100', + 'path' => '', + 'dimensions' => 'original', + ); + $data = array_merge($defaults, (array) $data); + + $form = imagecache_actions_pos_form($data); + $form['alpha'] = array( + '#type' => 'textfield', + '#title' => t('opacity'), + '#default_value' => $data['alpha'], + '#size' => 6, + '#description' => t('Opacity: 0-100. Be aware that values other than 100% may be slow to process.'), + ); + $form['path'] = array( + '#type' => 'textfield', + '#title' => t('file name'), + '#default_value' => $data['path'], + '#description' => imagecache_actions_file_field_description(), + '#element_validate' => array('imagecache_actions_validate_file'), + ); + $form['dimensions'] = array( + '#type' => 'radios', + '#title' => t('final dimensions'), + '#default_value' => $data['dimensions'], + '#options' => array( + 'original' => 'original (dimensions are retained)', + 'background' => 'background (image will be forced to match the size of the background)', + 'minimum' => 'minimum (image may be cropped)', + 'maximum' => 'maximum (image may end up with gaps)', + ), + '#description' => t('What to do when the background image is a different size from the source image. Backgrounds are not tiled, but may be arbitrarily large.'), + ); + return $form; +} + +/** + * Implements theme_hook() for the underlay (background) effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_canvasactions_canvas2file_summary($variables) { + $data = $variables['data']; + $file = $data['path']; + return "xpos:{$data['xpos']} , ypos:{$data['ypos']} alpha:{$data['alpha']}%. file: $file, dimensions:{$data['dimensions']}"; +} + +/** + * Image effect callback for the underlay (background) effect. + * + * @param stdClass $image + * @param array $data + * + * @return boolean + * true on success, false otherwise. + */ +function canvasactions_canvas2file_effect(stdClass $image, array $data) { + $underlay = imagecache_actions_image_load($data['path'], $image->toolkit); + if ($underlay) { + // To handle odd sizes, we will resize/crop the background image to the + // desired dimensions before starting the merge. The built-in + // imagecopymerge, and the watermark library both do not allow overlays to + // be bigger than the target. + + // Adjust size. + $crop_rules = array( + 'xoffset' => 0, + 'yoffset' => 0, + ); + if (empty($data['dimensions'])) { + $data['dimensions'] = 'original'; + } + switch ($data['dimensions']) { + case 'original': + // If the underlay is smaller than the target size, + // then when preparing the underlay by cropping it, + // the offsets may need to be negative + // which will produce a 'cropped' image larger than the original. + // In this case, we need to calculate the position of the bg image + // in relation to the space it will occupy under the top layer + //$crop_rules['xoffset'] = $underlay->info['width'] - $image->info['width'] ; + + $crop_rules['width'] = $image->info['width']; + $crop_rules['height'] = $image->info['height']; + break; + case 'background': + $crop_rules['width'] = $underlay->info['width']; + $crop_rules['height'] = $underlay->info['height']; + break; + case 'minimum': + $crop_rules['width'] = min($underlay->info['width'], $image->info['width']); + $crop_rules['height'] = min($underlay->info['height'], $image->info['height']); + break; + case 'maximum': + $crop_rules['width'] = max($underlay->info['width'], $image->info['width']); + $crop_rules['height'] = max($underlay->info['height'], $image->info['height']); + break; + } + // imageapi crop assumes upsize is legal. + + // Crop both before processing to avoid unwanted processing. + image_crop_effect($underlay, $crop_rules); + // @todo: BUG - this doesn't position either + // Actually this fails because imagecache_crop fills it with solid color when 'cropping' to a larger size. + //imagecache_crop_image($image, $crop_rules); + //dpm(get_defined_vars()); + // This func modifies the underlay image by ref, placing the current canvas on it. + if (image_overlay($image, $underlay, $data['xpos'], $data['ypos'], $data['alpha'], TRUE)) { + //$image->resource = $underlay->resource; + $image = $underlay; //@todo: this is a no-op. + return TRUE; + } + } + return FALSE; +} + +/** + * Image dimensions callback for the underlay (background) effect. + * + * @param array $dimensions + * Dimensions to be modified - an associative array containing the items + * 'width' and 'height' (in pixels). + * @param array $data + * An associative array containing the effect data. + */ +function canvasactions_canvas2file_dimensions(array &$dimensions, array $data) { + if ($data['dimensions'] !== 'original') { + $underlay = imagecache_actions_image_load($data['path']); + if ($underlay) { + // If the new dimensions are taken from the background, we don't need to + // know the original dimensions, we can just set the new dimensions to the + // dimensions of the background. Otherwise, we need to know the old + // dimensions. If unknown we have to leave them unknown. + switch ($data['dimensions']) { + case 'background': + $dimensions['width'] = $underlay->info['width']; + $dimensions['height'] = $underlay->info['height']; + break; + case 'minimum': + if ($dimensions['width'] !== NULL) { + $dimensions['width'] = min($underlay->info['width'], $dimensions['width']); + } + if ($dimensions['height'] !== NULL) { + $dimensions['height'] = min($underlay->info['height'], $dimensions['height']); + } + break; + case 'maximum': + if ($dimensions['width'] !== NULL) { + $dimensions['width'] = max($underlay->info['width'], $dimensions['width']); + } + if ($dimensions['height'] !== NULL) { + $dimensions['height'] = max($underlay->info['height'], $dimensions['height']); + } + break; + } + } + } +} + + +/** + * Image effect form callback for the overlay (watermark) effect. + * + * @param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function canvasactions_file2canvas_form(array $data) { + + $defaults = array( + 'xpos' => '', + 'ypos' => '', + 'alpha' => '100', + 'scale' => '', + 'path' => '', + ); + $data = array_merge($defaults, (array) $data); + + $form = array( + 'help' => array( + '#markup' => t('Note that using a non transparent overlay that is larger than the source image may result in unwanted results - a solid background.'), + ), + ); + $form += imagecache_actions_pos_form($data); + $form['alpha'] = array( + '#type' => 'textfield', + '#title' => t('opacity'), + '#default_value' => $data['alpha'], + '#field_suffix' => t('%'), + '#size' => 6, + '#description' => t('Opacity: 0-100. Warning: Due to a limitation in the GD toolkit, using an opacity other than 100% requires the system to use an algorithm that\'s much slower than the built-in functions. If you want partial transparency, you are better to use an already-transparent png as the overlay source image.'), + '#element_validate' => array('imagecache_actions_validate_number_non_negative'), + ); + $form['scale'] = array( + '#type' => 'textfield', + '#title' => t('scale'), + '#default_value' => $data['scale'], + '#field_suffix' => t('%'), + '#size' => 6, + '#description' => t('Scales the overlay with respect to the source, thus not its own dimensions. Leave empty to use the original size of overlay image.'), + '#element_validate' => array('imagecache_actions_validate_number_positive'), + ); + $form['path'] = array( + '#type' => 'textfield', + '#title' => t('file name'), + '#default_value' => $data['path'], + '#description' => imagecache_actions_file_field_description(), + '#element_validate' => array('imagecache_actions_validate_file'), + ); + return $form; +} + +/** + * Implements theme_hook() for the overlay (watermark) effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_canvasactions_file2canvas_summary(array $variables) { + $data = $variables['data']; + return '' . $data['path'] . ', x:' . $data['xpos'] . ', y:' . $data['ypos'] . ', alpha:' . (!empty($data['alpha']) ? $data['alpha'] : 100) . '%' . ', scale:' . (!empty($data['scale']) ? $data['scale'].'%' : '-'); +} + +/** + * Image effect callback for the overlay (watermark) image effect. + * + * @param stdClass $image + * @param array $data + * + * @return boolean + * true on success, false otherwise. + */ +function canvasactions_file2canvas_effect(stdClass $image, array $data) { + $overlay = imagecache_actions_image_load($data['path']); + if ($overlay) { + if (!empty($data['scale']) && $data['scale'] > 0) { + // Scale the overlay with respect to the dimensions of the source being + // overlaid. To maintain the aspect ratio, only the width of the overlay + // is scaled like that, the height of the overlay follows the aspect + // ratio (that is why we use image_scale instead of image_resize). + $overlay_w = $image->info['width'] * $data['scale'] / 100; + image_scale($overlay, $overlay_w, NULL, TRUE); + } + if (!isset($data['alpha'])) { + $data['alpha'] = 100; + } + return image_overlay($image, $overlay, $data['xpos'], $data['ypos'], $data['alpha']); + } + return FALSE; +} + + +/** + * Image effect form callback for the overlay: source image to canvas effect. + * + * @param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function canvasactions_source2canvas_form($data) { + $defaults = array( + 'xpos' => '', + 'ypos' => '', + 'alpha' => '100', + 'path' => '', + ); + $data = array_merge($defaults, (array) $data); + + $form = imagecache_actions_pos_form($data); + $form['alpha'] = array( + '#type' => 'textfield', + '#title' => t('opacity'), + '#default_value' => $data['alpha'], + '#size' => 6, + '#description' => t('Opacity: 0-100.'), + ); + return $form; +} + +/** + * Implements theme_hook() for the overlay: source img to canvas effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_canvasactions_source2canvas_summary(array $variables) { + $data = $variables['data']; + return 'xpos:' . $data['xpos'] . ', ypos:' . $data['ypos'] . ' alpha:' . $data['alpha'] . '%'; +} + +/** + * Image effect callback for the overlay: source image to canvas effect. + * + * @param stdClass $image + * @param array $data + * + * @return boolean + * true on success, false otherwise. + */ +function canvasactions_source2canvas_effect(stdClass $image, array $data) { + $overlay = image_load($image->source, $image->toolkit); + return image_overlay($image, $overlay, $data['xpos'], $data['ypos'], $data['alpha']); +} + + +/** + * Image effect form callback for the aspect switcher effect. + * + * @param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function canvasactions_aspect_form(array $data) { + $defaults = array( + 'ratio_adjustment' => 1, + 'portrait' => '', + 'landscape' => '', + ); + $data = array_merge($defaults, (array) $data); + + $form = array( + 'help' => array( + '#markup' => t('You must create the two presets to use before enabling this process.'), + ) + ); + + // The PASS_THROUGH parameter is new as of D7.23, and is added here to prevent + // image_style_options() from double-encoding the human-readable image style + // name, since the form API will already sanitize options in a select list. + $styles = image_style_options(TRUE, PASS_THROUGH); + // @todo: remove the current style to prevent (immediate) recursion? + + $form['portrait'] = array( + '#type' => 'select', + '#title' => t('Style to use if the image is portrait (vertical)'), + '#default_value' => $data['portrait'], + '#options' => $styles, + '#description' => t('If you choose none, no extra processing will be done.'), + ); + $form['landscape'] = array( + '#type' => 'select', + '#title' => t('Style to use if the image is landscape (horizontal)'), + '#default_value' => $data['landscape'], + '#options' => $styles, + '#description' => t('If you choose none, no extra processing will be done.'), + ); + + $form['ratio_adjustment'] = array( + '#type' => 'textfield', + '#title' => t('Ratio Adjustment (advanced)'), + '#size' => 3, + '#default_value' => $data['ratio_adjustment'], + '#description' => t(" +This allows you to bend the rules for how different the proportions need to be to trigger the switch. +There are no user-configurable options for this process.
+This effect will save the derivative image in an interlace / progressive way + which might improve perceived performance, especially for large images. + File size and loading speed will not change, but the user will pretty quickly + see a "degraded" copy of the entire image instead of a clear copy of the upper + part of the image.
+Wikipedia: Interlacing (bitmaps)
', + ); + return $form; +} + +/** + * Image effect callback for the Interlace / Progressive effect. + * + * @param stdClass $image + * @param array $data + * + * @return bool + * true on success, false otherwise. + */ +function canvasactions_interlace_effect(stdClass $image, array $data) { + return image_toolkit_invoke('interlace', $image, array($data)); +} + +/** + * GD toolkit specific implementation of the image interlace effect. + * + * @param stdClass $image + * Image object containing the GD image resource to operate on. + * param array $data + * The current configuration for this image effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_gd_interlace($image/*, array $data*/) { + imageinterlace($image->resource, 1); + return TRUE; +} + +/** + * Imagemagick toolkit specific implementation of the image interlace effect. + * + * @param stdClass $image + * Image object containing the image resource to operate on. + * param array $data + * The current configuration for this image effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_imagemagick_interlace($image/*, array $data*/) { + $image->ops[] = '-interlace Plane'; + return TRUE; +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/canvasactions/imagecache_canvasactions.info b/sites/all/modules/contrib/files/imagecache_actions/canvasactions/imagecache_canvasactions.info new file mode 100644 index 00000000..721162a1 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/canvasactions/imagecache_canvasactions.info @@ -0,0 +1,14 @@ +name = Imagecache Canvas Actions +description = Provides image effects for manipulating image canvases: define canvas, image mask, watermark, underlay background image, rounded corners, composite source to image and resize by percent effect. Also provides an aspect switcher (portrait/landscape). +package = Media +core = 7.x + +dependencies[] = imagecache_actions +dependencies[] = image + +; Information added by Drupal.org packaging script on 2016-02-19 +version = "7.x-1.7" +core = "7.x" +project = "imagecache_actions" +datestamp = "1455872655" + diff --git a/sites/all/modules/contrib/files/imagecache_actions/canvasactions/imagecache_canvasactions.module b/sites/all/modules/contrib/files/imagecache_actions/canvasactions/imagecache_canvasactions.module new file mode 100644 index 00000000..0bf772c5 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/canvasactions/imagecache_canvasactions.module @@ -0,0 +1,221 @@ +source as the filename, + * + * $image->info array + * + * $image->resource handle on the image object + * + * @param $action array of settings as defined in your form. + * + */ + +if (! function_exists('imagecache_actions_calculate_relative_position') ) { + 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'); + +/** + * Implements hook_image_effect_info(). + * + * Defines information about the supported effects. + */ +function imagecache_canvasactions_image_effect_info() { + $effects = array(); + + $effects['canvasactions_definecanvas'] = array( + 'label' => t('Define canvas'), + 'help' => t('Define the size of the working canvas and background color, this controls the dimensions of the output image.'), + 'effect callback' => 'canvasactions_definecanvas_effect', + 'dimensions callback' => 'canvasactions_definecanvas_dimensions', + 'form callback' => 'canvasactions_definecanvas_form', + 'summary theme' => 'canvasactions_definecanvas_summary', + ); + + $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.'), + 'dimensions passthrough' => TRUE, + 'effect callback' => 'canvasactions_imagemask_effect', + 'form callback' => 'canvasactions_imagemask_form', + 'summary theme' => 'canvasactions_imagemask_summary', + ); + + $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.'), + 'dimensions passthrough' => TRUE, + 'effect callback' => 'canvasactions_file2canvas_effect', + 'form callback' => 'canvasactions_file2canvas_form', + 'summary theme' => 'canvasactions_file2canvas_summary', + ); + + $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_effect', + 'dimensions callback' => 'canvasactions_canvas2file_dimensions', + 'form callback' => 'canvasactions_canvas2file_form', + 'summary theme' => 'canvasactions_canvas2file_summary', + ); + + $effects['canvasactions_source2canvas'] = array( + 'label' => t('Overlay: source image to canvas'), + 'help' => t('Places the source image onto the canvas for compositing.'), + 'dimensions passthrough' => TRUE, + 'effect callback' => 'canvasactions_source2canvas_effect', + 'form callback' => 'canvasactions_source2canvas_form', + 'summary theme' => 'canvasactions_source2canvas_summary', + ); + + $effects['canvasactions_roundedcorners'] = array( + 'label' => t('Rounded Corners'), + 'help' => t('This is true cropping, not overlays, so the result can be transparent.'), + 'dimensions passthrough' => TRUE, + 'effect callback' => 'canvasactions_roundedcorners_effect', + 'form callback' => 'canvasactions_roundedcorners_form', + 'summary theme' => 'canvasactions_roundedcorners_summary', + ); + + $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_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', + ); + + return $effects; +} + +/** + * Implements hook_theme(). + * + * Registers theme functions for the effect summaries. + */ +function imagecache_canvasactions_theme() { + return array( + 'canvasactions_definecanvas_summary' => array( + 'variables' => array('data' => NULL), + 'file' => 'canvasactions.inc', + ), + 'canvasactions_imagemask_summary' => array( + 'arguments' => array('element' => NULL), + 'file' => 'canvasactions.inc', + ), + 'canvasactions_file2canvas_summary' => array( + 'variables' => array('data' => NULL), + 'file' => 'canvasactions.inc', + ), + 'canvasactions_source2canvas_summary' => array( + 'variables' => array('data' => NULL), + 'file' => 'canvasactions.inc', + ), + 'canvasactions_canvas2file_summary' => array( + 'variables' => array('data' => NULL), + 'file' => 'canvasactions.inc', + ), + 'canvasactions_roundedcorners_summary' => array( + 'variables' => array('data' => NULL), + 'file' => 'canvasactions.inc', + ), + 'canvasactions_aspect_summary' => array( + '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', + ), + ); +} + +/** + * 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 + * effect, should be flushed as well as the flushed style was probably changed. + * + * @param array $flushed_style + * The image style that is being flushed. + */ +function imagecache_canvasactions_image_style_flush(/*array*/ $flushed_style) { + $styles = image_styles(); + foreach ($styles as $style) { + if ($style['name'] !== $flushed_style['name']) { + foreach ($style['effects'] as $effect) { + if ($effect['name'] === 'canvasactions_aspect') { + if ( (isset($effect['data']['portrait']) && $effect['data']['portrait'] === $flushed_style['name']) + || (isset($effect['data']['landscape']) && $effect['data']['landscape'] === $flushed_style['name'])) { + image_style_flush($style); + } + } + } + } + } +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/canvasactions/rounded_corners.inc b/sites/all/modules/contrib/files/imagecache_actions/canvasactions/rounded_corners.inc new file mode 100644 index 00000000..770fd6ee --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/canvasactions/rounded_corners.inc @@ -0,0 +1,329 @@ + '16', + #'antialias' => TRUE, + 'independent_corners_set' => array( + 'independent_corners' => FALSE, + 'radii' => array( + 'tl' => 0, + 'tr' => 0, + 'bl' => 0, + 'br' => 0, + ), + ), + ); + $action = array_merge($defaults, (array) $action); + + $form['radius'] = array( + '#type' => 'textfield', + '#title' => t('radius'), + '#default_value' => $action['radius'], + '#size' => 2, + ); + + $form['independent_corners_set'] = array( + '#type' => 'fieldset', + '#title' => t('Individual Corner Values'), + '#collapsible' => TRUE, + '#collapsed' => (! $action['independent_corners_set']['independent_corners']), + ); + $form['independent_corners_set']['independent_corners'] = array( + '#type' => 'checkbox', + '#title' => t('Set Corners Independently'), + '#default_value' => $action['independent_corners_set']['independent_corners'], + ); + $corners = array( + 'tl' => t("Top Left Radius"), + 'tr' => t("Top Right Radius"), + 'bl' => t("Bottom Left Radius"), + 'br' => t("Bottom Right Radius"), + ); + // Loop over the four corners and create field elements for them. + $form['independent_corners_set']['radii'] = array( + '#type' => 'item', + '#id' => 'independent-corners-set', + '#states' => array( + 'visible' => array( + ':input[name="data[independent_corners_set][independent_corners]"]' => array('checked' => TRUE), + ), + ), + ); + foreach ($corners as $attribute => $label) { + $form['independent_corners_set']['radii'][$attribute] = array( + '#type' => 'textfield', + '#title' => $label, + '#default_value' => 0 + $action['independent_corners_set']['radii'][$attribute], + '#size' => 2, + ); + } + /* + $form['antialias'] = array( + '#type' => 'checkbox', + '#title' => t('antialias'), + '#return_value' => TRUE, + '#default_value' => $action['antialias'], + '#description' => t('Attempt antialias smoothing when drawing the corners'), + ); + */ + $form['notes'] = array( + '#markup' => t(' + Note: the rounded corners effect uses true alpha transparency masking. + This means that this effect will fail to be saved on jpegs + unless you either+ Note that colorshift is a mathematical filter that doesn't always + have the expected result. + To shift an image precisely TO a target color, + desaturate (greyscale) it before colorizing. + The hue (color wheel) is the direction the + existing colors are shifted. The tone (inner box) is the amount. + Keep the tone half-way up the left site of the color box + for best results. +
")); + return $form; +} + +/** + * Implements theme_hook() for the color shift effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_coloractions_colorshift_summary(array $variables) { + return theme_imagecacheactions_rgb($variables['data']); +} + +/** + * Image effect callback for the color shift effect. + * + * @param stdClass $image + * @param array $data + * + * @return bool + * true on success, false otherwise. + */ +function coloractions_colorshift_effect(stdClass $image, array $data) { + // convert color from hex (as it is stored in the UI) + if ($data['RGB']['HEX'] && $deduced = imagecache_actions_hex2rgba($data['RGB']['HEX'])) { + $data['RGB'] = array_merge($data['RGB'], $deduced); + } + return image_toolkit_invoke('colorshift', $image, array($data)); +} + +/** + * GD toolkit specific implementation of the color shift effect. + * + * @param stdClass $image + * @param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_gd_colorshift(stdClass $image, array $data) { + $RGB = $data['RGB']; + if (!function_exists('imagefilter')) { + module_load_include('inc', 'imagecache_actions', 'imagefilter'); + } + return imagefilter($image->resource, 4, $RGB['red'], $RGB['green'], $RGB['blue']); +} + +/** + * Imagemagick toolkit specific implementation of the color shift effect. + * + * @param stdClass $image + * @param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_imagemagick_colorshift(stdClass $image, array $data) { + $RGB = $data['RGB']; + $image->ops[] = "-fill rgb" . escapeshellcmd('(') . "{$RGB['red']},{$RGB['green']},{$RGB['blue']}" . escapeshellcmd(')') . " -colorize 50" . escapeshellcmd('%'); + return TRUE; +} + + +/** + * Image effect form callback for the color overlay effect. + * + * @param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function coloractions_coloroverlay_form(array $data) { + $defaults = array( + 'RGB' => array( + 'HEX' => '#E2DB6A', + ), + ); + $data = array_merge($defaults, (array) $data); + $form = array('#theme' => 'imagecache_rgb_form'); + $form['RGB'] = imagecache_rgb_form($data['RGB']); + $form['note'] = array('#value' => t("+ Note that color overlay is a mathematical filter that doesn't always + have the expected result. + To shift an image precisely TO a target color, + desaturate (greyscale) it before colorizing. + The hue (color wheel) is the direction the + existing colors are shifted. The tone (inner box) is the amount. + Keep the tone half-way up the left site of the color box + for best results. +
")); + return $form; +} + +/** + * Implements theme_hook() for the color overlay effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_coloractions_coloroverlay_summary(array $variables) { + return theme_imagecacheactions_rgb($variables['data']); +} + +/** + * Image effect callback for the color overlay effect. + * + * @param stdClass $image + * @param array $data + * + * @return bool + * true on success, false otherwise. + */ +function coloractions_coloroverlay_effect(stdClass $image, array $data) { + // convert color from hex (as it is stored in the UI) + if ($data['RGB']['HEX'] && $deduced = imagecache_actions_hex2rgba($data['RGB']['HEX'])) { + $data['RGB'] = array_merge($data['RGB'], $deduced); + } + return image_toolkit_invoke('coloroverlay', $image, array($data)); +} + +/** + * GD toolkit specific implementation of the color overlay effect. + * + * @param stdClass $image + * @param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_gd_coloroverlay(stdClass $image, array $data) { + $RGB = $data['RGB']; + + $w = $image->info['width']; + $h = $image->info['height']; + + for($y=0;$y<$h;$y++) { + for($x=0;$x<$w;$x++) { + $rgb = imagecolorat($image->resource, $x, $y); + $source = imagecolorsforindex($image->resource, $rgb); + + if($source['red'] <= 128){ + $final_r = (2 * $source['red'] * $RGB['red'])/256; + }else{ + $final_r = 255 - (((255 - (2 * ($source['red'] - 128))) * (255 - $RGB['red']))/256); + } + if($source['green'] <= 128){ + $final_g = (2 * $source['green'] * $RGB['green'])/256; + }else{ + $final_g = 255 - (((255 - (2 * ($source['green'] - 128))) * (255 - $RGB['green']))/256); + } + if($source['blue'] <= 128){ + $final_b = (2 * $source['blue'] * $RGB['blue'])/256; + }else{ + $final_b = 255 - (((255 - (2 * ($source['blue'] - 128))) * (255 - $RGB['blue']))/256); + } + $final_colour = imagecolorallocatealpha($image->resource, $final_r, $final_g, $final_b, $source['alpha']); + imagesetpixel($image->resource, $x, $y, $final_colour); + } + } + + return TRUE; +} + +/** + * Imagemagick toolkit specific implementation of the color overlay effect. + * + * @param stdClass $image + * @param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_imagemagick_coloroverlay(stdClass $image, array $data) { + $RGB = $data['RGB']; + $image->ops[] = escapeshellcmd('(') . " +clone +matte -fill rgb" . escapeshellcmd('(') . "{$RGB['red']},{$RGB['green']},{$RGB['blue']}" . escapeshellcmd(')') . " -colorize 100" . escapeshellcmd('%') . " +clone +swap -compose overlay -composite " . escapeshellcmd(')') . " -compose SrcIn -composite"; + return TRUE; +} + + +/** + * Image effect form callback for the brightness effect. + * + * @param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function coloractions_brightness_form(array $data) { + $default = array('filter_arg1' => '100'); + $data = array_merge($default, (array) $data); + $form = array(); + $form['help'] = array('#value' => t("The brightness effect seldom looks good on its own, but can be useful to wash out an image before making it transparent - eg for a watermark.")); + $form['filter_arg1'] = array( + '#type' => 'textfield', + '#title' => t('Brightness'), + '#description' => t('-255 - +255'), + '#default_value' => $data['filter_arg1'], + '#size' => 3, + ); + return $form; +} + +/** + * Implements theme_hook() for the brightness effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_coloractions_brightness_summary(array $variables) { + return t("Adjust") . " : " . $variables['data']['filter_arg1']; +} + +/** + * Image effect callback for the brightness effect. + * + * @param stdClass $image + * @param array $data + * + * @return bool + * true on success, false otherwise. + */ +function coloractions_brightness_effect(stdClass $image, array $data) { + return image_toolkit_invoke('brightness', $image, array($data)); +} + +/** + * GD toolkit specific implementation of the brightness effect. + * + * @param stdClass $image + * @param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_gd_brightness(stdClass $image, array $data) { + if (!function_exists('imagefilter')) { + module_load_include('inc', 'imagecache_actions', 'imagefilter'); } + return imagefilter($image->resource, 2, $data['filter_arg1']); +} + +/** + * Imagemagick toolkit specific implementation of the brightness effect. + * + * @param stdClass $image + * @param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_imagemagick_brightness(stdClass $image, array $data) { + $image->ops[] = "-modulate " . (int)(100 + ( $data['filter_arg1'] / 128 * 100 )); + return TRUE; +} + + +/** + * Image effect form callback for the image invert effect. + * + * This effect has no parameters. + * + * param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function coloractions_invert_form(/*array $data*/) { + $form = array(); + return $form; +} + +/** + * Image effect callback for the image invert effect. + * + * @param stdClass $image + * @param array $data + * + * @return bool + * true on success, false otherwise. + */ +function coloractions_invert_effect(stdClass $image, array $data) { + return image_toolkit_invoke('invert', $image, array($data)); +} + +/** + * GD toolkit specific implementation of the image invert effect. + * + * @param stdClass $image + * param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_gd_invert(stdClass $image/*, array $data*/) { + if (!function_exists('imagefilter')) { + module_load_include('inc', 'imagecache_actions', 'imagefilter'); + } + return imagefilter($image->resource, 0); +} + +/** + * Imagemagick toolkit specific implementation of the image invert effect. + * + * param stdClass $image + * param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_imagemagick_invert(/*stdClass $image, array $data*/) { + // @todo + return FALSE; +} + + +/** + * Image effect form callback for the convert image format effect. + * + * @param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function coloractions_convert_form(array $data) { + $defaults = array( + 'format' => 'image/png', + 'quality' => '75', + ); + $data = array_merge($defaults, $data); + + $form = array( + 'help' => array( + '#markup' => t("If you've been using transparencies in the process, the result may get saved as a PNG (as the image was treated as a one in in-between processes). If this is not desired (file sizes may get too big) you should use this process to force a flatten action before saving. "), + ), + 'help2' => array( + '#markup' => t("For technical reasons, changing the file format within imagecache does not change the filename suffix. A png may be saved as a *.jpg or vice versa. This may confuse some browsers and image software, but most of them have no trouble. "), + ), + 'format' => array( + '#title' => t("File format"), + '#type' => 'select', + '#default_value' => isset($data['format']) ? $data['format'] : 'image/png', + '#options' => coloractions_file_formats(), + ), + 'quality' => array( + '#type' => 'textfield', + '#title' => t('Quality'), + '#description' => t('Override the default image quality. Works for Imagemagick only. Ranges from 0 to 100. For jpg, higher values mean better image quality but bigger files. For png it is a combination of compression and filter'), + '#size' => 10, + '#maxlength' => 3, + '#default_value' => $data['quality'], + '#field_suffix' => '%', + ), + ); + + return $form; +} + +/** + * Implements theme_hook() for the convert image format effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_coloractions_convert_summary($variables) { + $data = $variables['data']; + $formats = coloractions_file_formats(); + if ($formats[$data['format']] == 'jpg') { + return t('Convert to: @format, quality: @quality%', array( + '@format' => $formats[$data['format']], + '@quality' => $data['quality'] + )); + } + else { + return t("Convert to") .": ". $formats[$data['format']]; + } +} + +/** + * Image effect callback for the convert image format effect. + * + * @param stdClass $image + * @param array $data + * + * @return bool + * true on success, false otherwise. + */ +function coloractions_convert_effect(stdClass $image, array $data) { + $formats = coloractions_file_formats(); + $image->info['mime_type'] = $data['format']; + $image->info['extension'] = $formats[$data['format']]; + image_toolkit_invoke('convert', $image, array($data)); + return TRUE; +} + +/** + * GD toolkit specific implementation of the convert image format effect. + * + * param stdClass $image + * param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_gd_convert(/*stdClass $image, array $data*/) { + return TRUE; +} + +/** + * Imagemagick toolkit specific implementation of the color shift effect. + * + * Converting the image format with imagemagick is done by prepending the output + * format to the target file separated by a colon (:). This is done with + * hook_imagemagick_arguments_alter(), see below. + * + * @param stdClass $image + * @param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_imagemagick_convert(stdClass $image, array $data) { + $image->ops['output_format'] = $image->info['extension']; + $image->ops['custom_quality_value'] = (int) $data['quality']; + return TRUE; +} + +/** + * Implements hook_imagemagick_arguments_alter(). + * + * This hook moves a change in output format from the args (action list) to the + * destination format setting within the context. + */ +function imagecache_coloractions_imagemagick_arguments_alter(&$args, &$context) { + if (isset($args['output_format'])) { + $context['destination_format'] = $args['output_format']; + unset($args['output_format']); + } + if (isset($args['custom_quality_value'])) { + $args['quality'] = sprintf('-quality %d', $args['custom_quality_value']); + unset($args['custom_quality_value']); + } +} + +/** + * Mini mime-type list + * + * image_type_to_extension and image_type_to_mime_type? + */ +function coloractions_file_formats() { + return array('image/jpeg' => 'jpg', 'image/gif' => 'gif', 'image/png' => 'png'); +} + + +/** + * Image effect form callback for the posterize effect. + * + * @param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function coloractions_posterize_form(array $data) { + $form = array(); + + $form['colors'] = array( + '#type' => 'textfield', + '#title' => t('Color levels per channel'), + '#default_value' => isset($data['colors']) ? $data['colors'] : '', + '#required' => TRUE, + '#size' => 10, + '#element_validate' => array('image_effect_integer_validate'), + '#allow_negative' => FALSE, + '#description' => t('Number of unique values per color channel to reduce this image to. The transparency channel is left unchanged. This effect can be used to reduce file size on png images.'), + ); + + return $form; +} + +/** + * Implements theme_hook() for the posterize effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_coloractions_posterize_summary(array $variables) { + return t(': Reduce to @colors color levels per channel', array('@colors' => $variables['data']['colors'])); +} + +/** + * Image effect callback for the posterize effect. + * + * @param stdClass $image + * @param array $data + * + * @return bool + * true on success, false otherwise. + */ +function coloractions_posterize_effect(stdClass $image, array $data) { + if (!image_toolkit_invoke('posterize', $image, array($data['colors']))) { + watchdog('imagecache_actions', 'Image posterize failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array( + '%toolkit' => $image->toolkit, + '%path' => $image->source, + '%mimetype' => $image->info['mime_type'], + '%dimensions' => $image->info['height'] . 'x' . $image->info['height'], + ), WATCHDOG_ERROR); + return FALSE; + } + return TRUE; +} + +/** + * GD toolkit specific implementation of the posterize effect. + * + * Based on: + * http://www.qtcentre.org/threads/36385-Posterizes-an-image-with-results-identical-to-Gimp-s-Posterize-command?p=167712#post167712 + * + * @param stdClass $image + * @param int $colors + * The parameter for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_gd_posterize(stdClass $image, $colors) { + // Value step for colors per channel. + $round_to = 255 / ($colors - 1); + $alpha_bit_mask = 255 << 24; + + for ($x = imagesx($image->resource); $x--; ) { + for ($y = imagesy($image->resource); $y--; ) { + $rgb = imagecolorat($image->resource, $x, $y); + + // Use bitmasks to extract numbers we want, faster equivalent to imagecolorsforindex(). + $a = $rgb & $alpha_bit_mask; // Alpha + $r = $rgb >> 16 & 255; // Red + $g = $rgb >> 8 & 255; // Green + $b = $rgb & 255; // Blue + + // (int) (value + 0.5) faster equivalent to round() and already an int. + $new_r = (int) (((int) ($r / $round_to + 0.5)) * $round_to + 0.5); + $new_g = (int) (((int) ($g / $round_to + 0.5)) * $round_to + 0.5); + $new_b = (int) (((int) ($b / $round_to + 0.5)) * $round_to + 0.5); + + // Faster equivalent to imagecolorallocatealpha(). + $color_combined = $a | ($new_r << 16) | ($new_g << 8) | $new_b; + imagesetpixel($image->resource, $x, $y, $color_combined); + } + } + + return TRUE; +} + +/** + * Imagemagick toolkit specific implementation of the color shift effect. + * + * @param stdClass $image + * @param int $colors + * The parameter for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_imagemagick_posterize(stdClass $image, $colors) { + // In newer versions of ImageMagick dithering has no effect on posterize. + // Turn dithering off on older versions of ImageMagick for consistency. + $image->ops[] = ' +dither -posterize ' . (int) $colors; + return TRUE; +} + +/** + * Image effect form callback for the brightness effect. + * + * Settings for color level adjustment actions. + * + * @param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function coloractions_adjustlevels_form(array $data) { + + $defaults = array( + 'independent_colors' => FALSE, + 'all_colors' => array( + 'low' => 0, + 'high' => 1, + ), + 'per_color' => array( + 'low_red' => 0, + 'high_red' => 1, + 'low_green' => 0, + 'high_green' => 1, + 'low_blue' => 0, + 'high_blue' => 1, + ), + ); + $data = array_merge($defaults, $data); + + $form = array( + '#type' => 'container', + 'help' => array( + '#type' => 'markup', + '#markup' => t("Adjusting color levels scales the given channels to a range specified by the 'low' and 'high' values. + These 'low' and 'high' values can be any value between 0 and 1. + E.g. assume that 'low' is 0.2 and 'high' is 0.9. + Pixels that had a value of 0, will get a value of 0.2 * 255 = 51 and pixels that had a value of 255, will get a value of 0.9 * 255 = 229.
+Note that color level adjustment is a mathematical filter and a such doesn't do automatic balancing.
"), + ), + '#element_validate' => array('coloractions_validate_form'), + ) ; + + $form['independent_colors'] = array( + '#type' => 'checkbox', + '#title' => t('Set each color independently'), + '#default_value' => $data['independent_colors'], + ); + + $form['all_colors'] = array( + '#type' => 'container', + '#tree' => TRUE, + '#title' => t('All colors range'), + '#required' => !$data['independent_colors'], + '#states' => array( + 'visible' => array(':input[name="data[independent_colors]"]' => array('checked' => FALSE)), + 'required' => array(':input[name="data[independent_colors]"]' => array('checked' => FALSE)), + ), + ); + $form['all_colors'] += coloractions_adjustlevels_form_helper(array( + 'low' => array('title' => t('Low'), 'default' => $data['all_colors']['low']), + 'high' => array('title' => t('High'), 'default' => $data['all_colors']['high']), + )); + + $form['per_color'] = array( + '#type' => 'container', + '#tree' => TRUE, + '#title' => t('Individual Color Ranges'), + '#required' => $data['independent_colors'], + '#states' => array( + 'visible' => array(':input[name="data[independent_colors]"]' => array('checked' => TRUE)), + 'required' => array(':input[name="data[independent_colors]"]' => array('checked' => TRUE)), + ), + ); + $form['per_color'] += coloractions_adjustlevels_form_helper(array( + 'low_red' => array('title' => t('Red Low'), 'default' => $data['per_color']['low_red']), + 'high_red' => array('title' => t('Red High'), 'default' => $data['per_color']['high_red']), + 'low_green' => array('title' => t('Green Low'), 'default' => $data['per_color']['low_green']), + 'high_green' => array('title' => t('Green High'), 'default' => $data['per_color']['high_green']), + 'low_blue' => array('title' => t('Blue Low'), 'default' => $data['per_color']['low_blue']), + 'high_blue' => array('title' => t('Blue High'), 'default' => $data['per_color']['high_blue']), + )); + + return $form; +} + +/** + * Helper function to create the form for the color level adjustment effect. + * + * @param array $data + * Array containing the form elements + * names as keys for array elements containing title and default value. + * + * @return array + */ +function coloractions_adjustlevels_form_helper(array $data) { + $form = array(); + + foreach ($data as $name => $value) { + $form[$name] = array( + '#type' => 'textfield', + '#title' => $value['title'], + '#default_value' => $value['default'], + '#size' => 5, + '#element_validate' => array('coloractions_validate_scale_0_1'), + ); + } + + return $form; +} + +/** + * Form element validation handler for elements that should contain a number + * between 0 and 1. + */ +function coloractions_validate_scale_0_1($element/*, &$form_state*/) { + $value = $element['#value']; + if ($value != '' && (!is_numeric($value) || (float) $value > 1.0 || (float) $value < 0.0)) { + form_error($element, t('%name must be a value between 0 and 1.', array('%name' => $element['#title']))); + } +} + +/** + * Form element validation handler that compares low and high values. + */ +function coloractions_validate_form($element/*, &$form_state*/) { + $independent_colors = !empty($element['independent_colors']['#value']); + if (!$independent_colors) { + // Compare low and high. + coloractions_validate_low_and_high($element, 'all_colors', ''); + } + else { + // Compare low and high per color + coloractions_validate_low_and_high($element, 'per_color', '_red'); + coloractions_validate_low_and_high($element, 'per_color', '_green'); + coloractions_validate_low_and_high($element, 'per_color', '_blue'); + } +} + +function coloractions_validate_low_and_high($element, $fieldset, $suffix) { + if ((float) $element[$fieldset]["low$suffix"]['#value'] > (float) $element[$fieldset]["high$suffix"]['#value']) { + form_error($element[$fieldset]["high$suffix"], t('%name-high must be higher then %name-low.', + array('%name-high' => $element[$fieldset]["high$suffix"]['#title'], '%name-low' => $element[$fieldset]["low$suffix"]['#title']))); + } + +} + +/** + * Implements theme_hook() for the adjust color levels effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_coloractions_adjustlevels_summary(array $variables) { + $data = $variables['data']; + if (empty($data['independent_colors'])) { + return t('@range', + array('@range' => "[{$data['all_colors']['low']} - {$data['all_colors']['high']}]")); + } + else { + return t('red: @red-range, green: @green-range, blue: @blue-range', + array('@red-range' => "[{$data['per_color']['low_red']} - {$data['per_color']['high_red']}]", + '@green-range' => "[{$data['per_color']['low_green']} - {$data['per_color']['high_green']}]", + '@blue-range' => "[{$data['per_color']['low_blue']} - {$data['per_color']['high_blue']}]")); + } +} + +/** + * Image effect callback for the adjust levels effect. + * + * @param stdClass $image + * @param array $data + * + * @return bool + * true on success, false otherwise. + */ +function coloractions_adjustlevels_effect(stdClass $image, array $data) { + return image_toolkit_invoke('adjustlevels', $image, array($data)); +} + +/** + * GD toolkit specific implementation of the adjust levels effect. + * + * @param stdClass $image + * @param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_gd_adjustlevels(stdClass $image, array $data) { + + $width = $image->info['width']; + $height = $image->info['height']; + + if ($data['independent_colors']) { + $lower_r = $data['per_color']['low_red'] * 255; + $factor_r = ($data['per_color']['high_red'] * 255 - $lower_r) / 255; + $lower_g = $data['per_color']['low_green'] * 255; + $factor_g = ($data['per_color']['high_green'] * 255 - $lower_g) / 255; + $lower_b = $data['per_color']['low_blue'] * 255; + $factor_b = ($data['per_color']['high_blue'] * 255 - $lower_b) / 255; + } + else { + $lower_r = $lower_g = $lower_b = $data['all_colors']['low'] * 255; + $factor_r = $factor_g = $factor_b = ($data['all_colors']['high'] * 255 - $lower_r) / 255; + } + + for ($y = 0; $y < $height; $y++) { + for ($x = 0; $x < $width; $x++) { + $rgb = imagecolorat($image->resource, $x, $y); + $source = imagecolorsforindex($image->resource, $rgb); + + $final_r = $lower_r + $factor_r * $source['red']; + $final_g = $lower_g + $factor_g * $source['green']; + $final_b = $lower_b + $factor_b * $source['blue']; + + $final_colour = imagecolorallocatealpha($image->resource, $final_r, $final_g, $final_b, $source['alpha']); + imagesetpixel($image->resource, $x, $y, $final_colour); + } + } + + return TRUE; +} + +/** + * Implements theme_hook() for the desaturate alpha effect summary. + * + * param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_coloractions_desaturatealpha_summary(/*array $variables*/) { + return t(': Desaturates the image while retaining transparency.'); +} + +/** + * Image effect callback for the desaturate alpha effect. + * + * @param stdClass $image + * @param array $data + * + * @return bool + * true on success, false otherwise. + */ +function coloractions_desaturatealpha_effect(stdClass $image, array $data) { + return image_toolkit_invoke('desaturatealpha', $image, array($data)); +} + +/** + * GD toolkit specific implementation of the adjust levels effect. + * + * @param stdClass $image + * param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_gd_desaturatealpha(stdClass $image/*, array $data*/) { + imagealphablending($image->resource, FALSE); + $result = imagefilter($image->resource, IMG_FILTER_GRAYSCALE); + imagealphablending($image->resource, TRUE); + return $result; +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/coloractions/transparency.inc b/sites/all/modules/contrib/files/imagecache_actions/coloractions/transparency.inc new file mode 100644 index 00000000..20825cac --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/coloractions/transparency.inc @@ -0,0 +1,248 @@ + FALSE, + 'RGB' => array('HEX' => '#000000'), + 'opacity' => 0.5, + ); + $data = array_merge($defaults, (array) $data); + + $form = array(); + $form['help'] = array( + '#markup' => t(" +You can either set the alpha values of the image to a fixed + amount by defining opacity, or choose a color and let the + darkness of the image pixels define an opacity. + These are different effects. Don't do both + or you will just get a plain block of color of a certain opacity. + ") + ); + + $form['opacity'] = array( + '#type' => 'textfield', + '#title' => t('Opacity'), + '#default_value' => $data['opacity'], + '#size' => 3, + '#description' => t(" + A decimal between 0 and 1. + You can define the amount of transparency to apply, eg 0.8 (80%) opacity + will make the image slightly transparent. + Use this with no fill color defined for normal results. + If you follow up by flattening the image onto white or grey, + this will have the effect of partial desaturation. + "), + ); + + $form['description'] = array( + '#value' => t( + "
Alpha toning is an advanced method of greyscaling or colorizing. + It works using transparency, not colour matching. + The results of this filter are excellent for using as watermarks, + and for 'sepia' type imprints on coloured or textured backgrounds. + It converts dark areas of the image to opaque, light to transparent.
+Note that if you are working with JPEGs, this alpha effect will not last into the final image + unless you either flatten this image against a background color + or image in a later process or convert it to a PNG before saving + using available imagecache actions.
" + ) + ); + + $form['RGB'] = imagecache_rgb_form($data['RGB']); + $form['RGB']['#type'] = 'fieldset'; + $form['RGB']['#title'] = t('Fill Color'); + $form['RGB']['HEX']['#description'] = t(" + Although this image will end up as an alpha transparency mask, + it still has to have some colour to be visible. + Black is safe. Dark Sepia #704214 is good too. + Set it to nothing to not perform any color shift. + "); + + $form['flatten'] = array( + '#type' => 'checkbox', + '#title' => t('Flatten Transparency'), + '#default_value' => $data['flatten'], + '#return_value' => TRUE, + '#description' => t("The opposite of adding alpha transparency, 'flatten' will place the given colour solidly behind the image. Use this if you can't trust IE, or you really do want the image filled in with a solid colour."), + ); + + return $form; +} + +/** + * Implements theme_hook() for the alpha effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * + * @ingroup themeable + */ +function theme_coloractions_alpha_summary(array $variables) { + $data = $variables['data']; + return ($data['flatten'] ? t("Flatten") : t("Transparent")) + . ($data['opacity'] ? " : " . ($data['opacity'] * 100) . '%' : '') + . " : " . theme_imagecacheactions_rgb($data['RGB']); +} + +/** + * Image effect callback for the alpha effect. + * + * Either convert light parts of an image to see-through, or place a solid + * colour behind areas that would otherwise be see-though + * + * To save a partially transparent image, the image resource must be switched to + * PNG. REMEMBER TO SWITCH IT BACK if needed. + * + * @param stdClass $image + * @param array $data + * + * @return bool + * true on success, false otherwise. + */ +function coloractions_alpha_effect(stdClass $image, array $data) { + // @todo: Extract to GD specific function. + if (!$data['flatten']) { + // Given an image, convert dark areas to opaque, light to transparent. + return png_color2alpha($image, $data['RGB']['HEX'], $data['opacity']); + } + else { + // Do the opposite, flatten the transparency ONTO the given color. + $info = $image->info; + + if (!$info) { + watchdog('imagecache_actions', "Problem converting image to fill behind. Source image returned no info"); + return FALSE; + } + + $base_image = imagecreatetruecolor($info['width'], $info['height']); + imagesavealpha($base_image, TRUE); + imagealphablending($base_image, FALSE); + + // Start with a solid color. + $background_rgb = imagecache_actions_hex2rgba($data['RGB']['HEX']); + + // Setting the background color here solid is what flattens the image. + // But what I really want to do is set it colored rgb AND 100% transparent, + // in the hope that a failure to render transparency would instead render + // THAT colour. + $background_color = @imagecolorallocatealpha($base_image, $background_rgb['red'], $background_rgb['green'], $background_rgb['blue'], 0); + // But that still doesn't work. Yet somehow I've seen transparent images + // that fallback to white, not silver. + + imagefill($base_image, 0, 0, $background_color); + + // And set the overlay behavior back again. + imagealphablending($base_image, TRUE); + + // Place the current image over it. + if ($result = imagecopy($base_image, $image->resource, 0, 0, 0, 0, $info['width'], $info['height'])) { + imagedestroy($image->resource); + $image->resource = $base_image; + } + + return $result; + } +} + +/** + * This achieves a tonal effect by converting the images combined tone and + * existing transparency into one shade value. This is then used as the ALPHA + * transparency for that pixel, while the whole thing is coloured the same + * shade. Images 'grey toned' in this manner should sit smoothly on any + * background. + * + * With no color set, use the existing hue. + * + * To save a partially transparent image, the image resource must be switched to + * PNG. ... or maybe not. Just flatten it yourself, or switch the format + * yourself. This hack would produce side effects otherwise. + * + * This algorithm runs maths per-pixel, and therefore is incredibly much more + * inefficient than any native routine. Will kill the server on large images. + * + * @param stdClass $image + * @param string $color + * @param float $opacity + * between 0 transparent and 1 solid. + * + * @return bool + * true on success, false otherwise. + */ +function png_color2alpha(stdClass $image, $color, $opacity = NULL) { + $info = $image->info; + if (!$info) { + return FALSE; + } + $im1 = $image->resource; + + imagesavealpha($im1, TRUE); + imagealphablending($im1, FALSE); + + if ($color) { + $background = imagecache_actions_hex2rgba($color); + } + $width = imagesx($im1); + $height = imagesy($im1); + + if (($width * $height) > (1200 * 1200)) { + watchdog('imagecache_actions', __FUNCTION__ . " on {$image->source}. Image is TOO BIG to run the per-pixel algorithm. Aborting."); + return FALSE; + } + for ($i = 0; $i < $height; $i++) { + //this loop traverses each row in the image + for ($j = 0; $j < $width; $j++) { + //this loop traverses each pixel of each row + // Get the color & alpha info of the current pixel. + $retrieved_color = imagecolorat($im1, $j, $i); // an index + $rgba_array = imagecolorsforindex($im1, $retrieved_color); + $alpha = 127; + + // Calculate the total shade value of this pixel. + + // If the rule sets a color, then the darkness of the existing + // pixel will define the desired alpha value. + if ($color) { + $lightness = ($rgba_array['red'] + $rgba_array['green'] + $rgba_array['blue']) / 3; + // Need to flip the numbers around before doing maths. + //$opacity = 1-($rgba_array['alpha']/127); + //$darkness = 1-($lightness/256); // 0 is white, 1 is black + //$visibility = $darkness * $opacity; + //$alpha = (1-$visibility) * 127; + $alpha = (1 - ((1 - ($lightness / 256)) * (1 - ($rgba_array['alpha'] / 127)))) * 127; + } + // If color is NOT set, then the existing color is passed though, only + // made somewhat transparent. + if (!$color) { + $background = $rgba_array; + } + if ($opacity) { + // It's a user-defined alpha value. + $alpha = $alpha * $opacity; + } + + // Paint the pixel. + /** @noinspection PhpUndefinedVariableInspection */ + $color_to_paint = imagecolorallocatealpha($image->resource, $background['red'], $background['green'], $background['blue'], $alpha); + imagesetpixel($image->resource, $j, $i, $color_to_paint); + } + } + return TRUE; +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/customactions/README.txt b/sites/all/modules/contrib/files/imagecache_actions/customactions/README.txt new file mode 100644 index 00000000..3d7f9793 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/customactions/README.txt @@ -0,0 +1,145 @@ +README +------ +README for the custom actions effect module. + + +Dependencies +------------ +Hard dependencies: +- Imagecache actions. +- Image (Drupal core). + +Soft dependencies/recommended modules: +- Imagemagick (preferred toolkit). +- PHP filter (Drupal core). + + +Which toolkit? +-------------- +Personally, I prefer the imagemagick toolkit: +- It is better in anti-aliasing, try to rotate an image using both toolkits and + you will see what I mean. +- It does not execute in the PHP memory space, so is not restricted by the + memory_limit PHP setting. +- The GD toolkit will, at least on my Windows configuration, keep font files + open after a text operation, so you cannot delete, move or rename it anymore. + + +Installing +---------- +As usual. After enabling the module you can add custom actions to images. + + +Custom action PHP snippets +-------------------------- +Given the correct permission, the custom action effect allows you to write your +own PHP snippet that does the requested processing on the image. How it can do +so, depends on the toolkit. + +For all toolkits, the snippet should return true to indicate success and false +to indicate failure. + +GD +-- +The GD image resource is available in $image->resource. You can call the GD +functions on this resource. This effect will query the width and height after +your processing, so you don't have to change that yourself. + +Imagemagick +----------- +All real image processing is done at the end, if all effects have added their +command line arguments to the $image->ops array. So your custom action should +add the imagemagick commands and its parameters by adding new string entries to +the end of that array. + +If your commands change the width or height of the resulting image, you should +record so by changing $image->info['width'] and/or $image->info['height']. + +General +------- +To ease your task, this effect makes some information regarding the image being +processed available in 2 variables: $image and $image_context. These variables +are readily available in your snippet. + +$image is an object containing the following properties: +- source: string, the source of the image, e.g. public://photo.jpg +- info: array, example data: + - width (int) 180 + - height (int) 180 + - extension (string) png + - mime_type (string) image/png + - file_size (int) 4417 +- toolkit: string, imagemagick or GD +- resource: resource. The GD image resource. +- ops: array. An array of strings with the ImageMagick commands. + +$image_context is an associative array containing: +- effect_data: array, the data of this image effect, example data for the custom + action effect: + - php (string) +- managed_file: object|null. A managed file object containing these properties: + - fid (string) 2 + - uid (string) 1 + - filename (string) photo.jpg + - uri (string) public://photo.jpg + - filemime (string) image/jpeg + - filesize (string) 445751 + - status (string) 1 + - timestamp (string) 1327525851 + - metatags Array [0] + - rdf_mapping Array [0] +- referring_entities: array|null. A nested array with (fully loaded) entities + referring to the current image. The 1st level of entries is keyed by the field + name, the 2nd by entity type, and the 3rd by entity id. Example data: + - field_photo Array [1] + - node Array [1] + - 12 Object of: stdClass + - nid (string) 12 + - vid (string) 12 + - type (string) page + - author ... + - timestamp ... + - ... +- entity: object|null, the 1st entity in referring_entities. This is for easy + access to the referring entity if it may be assumed that only 1 entity is + referring to the current image. +- image_field: array|null, the 1st image field in entity that is referring to + the current image. This is for easy access to the image field data if it may + be assumed that only 1 image field is referring to the current image. Example + data: + - fid (int) 2 + - alt (string) ... + - title (string) ... + - ... + +Of course there are many other possible useful globals. Think of: +- base_url +- base_path +- base_root +- is_https +- user +- language +and of course $_SERVER and $_GET. + +Using these information you can access entity data as follows: + +Specific case (1 entity, of known entity_type, referring to the image): + + +Or the more general case (not knowing the referring type, or multiple entities +that may be referring to the image): + $field_referring_entities) { + foreach ($field_referring_entities as $entity_type => $entities) { + foreach ($entities as $entity_id => $entity) { + $field = field_get_items($entity_type, $entity, $field_name); + } + } +} +?> diff --git a/sites/all/modules/contrib/files/imagecache_actions/customactions/imagecache_customactions.info b/sites/all/modules/contrib/files/imagecache_actions/customactions/imagecache_customactions.info new file mode 100644 index 00000000..65cb37dd --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/customactions/imagecache_customactions.info @@ -0,0 +1,14 @@ +name = Imagecache Custom Actions +description = Provides the custom and subroutine image effects. +package = Media +core = 7.x + +dependencies[] = imagecache_actions +dependencies[] = image + +; Information added by Drupal.org packaging script on 2016-02-19 +version = "7.x-1.7" +core = "7.x" +project = "imagecache_actions" +datestamp = "1455872655" + diff --git a/sites/all/modules/contrib/files/imagecache_actions/customactions/imagecache_customactions.install b/sites/all/modules/contrib/files/imagecache_actions/customactions/imagecache_customactions.install new file mode 100644 index 00000000..2e43bb4c --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/customactions/imagecache_customactions.install @@ -0,0 +1,23 @@ +fields('image_effects') + ->condition('name', 'imagecache_customactions', '=') + ->execute() + ->fetchAll(); + foreach ($effects as $effect) { + $data = unserialize($effect->data); + if (array_key_exists('text', $data)) { + $data['php'] = $data['text']; + unset($data['text']); + $data = serialize($data); + db_update('image_effects') + ->condition('ieid', $effect->ieid) + ->fields(array('data' => $data)) + ->execute(); + } + } +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/customactions/imagecache_customactions.module b/sites/all/modules/contrib/files/imagecache_actions/customactions/imagecache_customactions.module new file mode 100644 index 00000000..04ead663 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/customactions/imagecache_customactions.module @@ -0,0 +1,290 @@ + t('Custom action'), + 'help' => t('Runs custom PHP code.'), + 'effect callback' => 'imagecache_customactions_effect', + 'dimensions callback' => 'imagecache_customactions_dimensions', + 'form callback' => 'imagecache_customactions_form', + 'summary theme' => 'imagecache_customactions_summary', + ); + + $effects['imagecache_subroutine'] = array( + 'label' => t('Subroutine'), + 'help' => t('Runs another defined preset on the image.'), + 'effect callback' => 'imagecache_subroutine_effect', + 'dimensions callback' => 'imagecache_subroutine_dimensions', + 'form callback' => 'imagecache_subroutine_form', + 'summary theme' => 'imagecache_subroutine_summary', + ); + + return $effects; +} + +/** + * Implements hook_theme(). + * + * Registers theme functions for the effect summaries. + */ +function imagecache_customactions_theme() { + return array( + 'imagecache_customactions_summary' => array( + 'variables' => array('data' => NULL), + ), + 'imagecache_subroutine_summary' => array( + 'variables' => array('data' => NULL), + ), + ); +} + +/** + * Implements hook_image_style_flush(). + * + * This hook checks if the image style that is being flushed is used in a + * subroutine effect. If so, the style that contains the subroutine effect + * should be flushed as well. + * + * This may lead to recursive calls to image_style_flush() and thus to this + * hook. Without loops in styles that call each other as subroutine, this + * recursion will always end. + * + * @param array $flushed_style + * The image style that is being flushed. + */ +function imagecache_customactions_image_style_flush(/*array*/ $flushed_style) { + $styles = image_styles(); + foreach ($styles as $style) { + if ($style['name'] !== $flushed_style['name']) { + foreach ($style['effects'] as $effect) { + if ($effect['name'] === 'imagecache_subroutine') { + if (isset($effect['data']['subroutine_presetname']) && $effect['data']['subroutine_presetname'] === $flushed_style['name']) { + image_style_flush($style); + } + } + } + } + } +} + +/** + * Image effect form callback for the custom action effect. + * + * Note that this is not a complete form, it only contains the portion of the + * form for configuring the effect options. Therefore it does not not need to + * include metadata about the effect, nor a submit button. + * + * @param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function imagecache_customactions_form(array $data) { + // Add defaults. + $data += array('php' => 'return TRUE;'); + + // Note: we also need to check for the existence of the module: admin has + // all rights, so user_acccess(...) returns TRUE even if the module is not + // enabled and the permission does not exist. + $allow_php = module_exists('php') && user_access('use PHP for settings'); + + $form = array( + 'php' => array( + '#type' => 'textarea', + '#rows' => 12, + '#title' => t('PHP code'), + '#default_value' => $data['php'], + '#disabled' => !$allow_php, + '#description' => t("A piece of PHP code that modifies the image. +It should return a boolean indicating success or failure. +You will need the '%use_php' permission, defined by the 'PHP filter' module. +See the help for an extensive explanation of the possibilities.
", + array('%use_php' => t('Use PHP for settings'))), + '#wysiwyg' => FALSE, + ), + ); + return $form; +} + +/** + * Implements theme_hook() for the custom action effect summary. + * + * param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_imagecache_customactions_summary(/*array $variables*/) { + return 'Custom PHP code'; +} + +/** + * Image effect callback for the custom action effect. + * + * @param stdClass $image + * @param array $data + * + * @return boolean + * true on success, false otherwise. + */ +function imagecache_customactions_effect(stdClass $image, array $data) { + // Check that the PHP filter module is enabled. + $result = module_exists('php'); + if ($result) { + // Get context about the image. + module_load_include('inc', 'imagecache_actions', 'utility'); + $GLOBALS['image_context'] = imagecache_actions_get_image_context($image, $data); + $GLOBALS['image'] = $image; + + $result = php_eval('<' . '?php global $image, $image_context; ' . $data['php'] . ' ?' . '>'); + // php_eval returns '1' if the snippet returns true. + $result = $result === '1'; + + unset($GLOBALS['image']); + unset($GLOBALS['image_context']); + } + + if ($result && $image->toolkit == 'GD') { + $image->info['width'] = imagesx($image->resource); + $image->info['height'] = imagesy($image->resource); + } + + return $result; +} + +/** + * Image dimensions callback for the custom action effect. + * + * @param array $dimensions + * Dimensions to be modified - an associative array containing the items + * 'width' and 'height' (in pixels). + * param array $data + * An associative array containing the effect data. + */ +function imagecache_customactions_dimensions(array &$dimensions/*, array $data*/) { + $dimensions['width'] = NULL; + $dimensions['height'] = NULL; +} + +/** + * Subroutine - an imagecache action that just calls another one. + * + * Contributed by Alan D + * https://drupal.org/node/618784 + * + * Reworked into customactions by dman 2010-07 + */ + +/** + * Image effect form callback for the subroutine effect. + * + * @param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function imagecache_subroutine_form(array $data) { + // Add defaults. + $data += array('subroutine_presetname' => ''); + + // List available image styles. + // The PASS_THROUGH parameter is new as of D7.23, and is added here to prevent + // image_style_options() from double-encoding the human-readable image style + // name, since the form API will already sanitize options in a select list. + $styles = image_style_options(TRUE, PASS_THROUGH); + //@todo: unset the current style to prevent obvious recursion. + + $form = array(); + + $form['subroutine_presetname'] = array( + '#type' => 'select', + '#title' => t('Image style to call'), + '#default_value' => $data['subroutine_presetname'], + '#options' => $styles, + '#required' => TRUE, + ); + + return $form; +} + +/** + * Implements theme_hook() for the subroutine effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_imagecache_subroutine_summary(array $variables) { + $data = $variables['data']; + + module_load_include('inc', 'imagecache_actions', 'utility'); + $label = imagecache_actions_get_style_label($data['subroutine_presetname']); + return t('Apply image style %label', array('%label' => $label)); +} + +/** + * Image effect callback for the subroutine effect. + * + * @param stdClass $image + * @param array $data + * + * @return boolean + * true on success, false otherwise. + */ +function imagecache_subroutine_effect(stdClass $image, array $data) { + $result = FALSE; + if ($style = image_style_load($data['subroutine_presetname'])) { + $result = TRUE; + foreach ($style['effects'] as $effect) { + $result = $result && image_effect_apply($image, $effect); + } + } + return $result; +} + +/** + * Image dimensions callback for the subroutine effect. + * + * @param array $dimensions + * Dimensions to be modified - an array with components width and height, in + * pixels. + * @param array $data + * An array with the effect options. + */ +function imagecache_subroutine_dimensions(array &$dimensions, array $data) { + // Let the subroutine transform the dimensions. + image_style_transform_dimensions($data['subroutine_presetname'], $dimensions); +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/aspect-chaining.png b/sites/all/modules/contrib/files/imagecache_actions/docs/aspect-chaining.png new file mode 100644 index 00000000..53b4ba13 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/aspect-chaining.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/brightness.png b/sites/all/modules/contrib/files/imagecache_actions/docs/brightness.png new file mode 100644 index 00000000..d9c646d1 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/brightness.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/canvases.png b/sites/all/modules/contrib/files/imagecache_actions/docs/canvases.png new file mode 100644 index 00000000..222a2f53 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/canvases.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/cheap_dropshadow.png b/sites/all/modules/contrib/files/imagecache_actions/docs/cheap_dropshadow.png new file mode 100644 index 00000000..0b2fe221 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/cheap_dropshadow.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/colorshift.png b/sites/all/modules/contrib/files/imagecache_actions/docs/colorshift.png new file mode 100644 index 00000000..91d27217 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/colorshift.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/combo.png b/sites/all/modules/contrib/files/imagecache_actions/docs/combo.png new file mode 100644 index 00000000..cf1fc084 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/combo.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/corner-bl.png b/sites/all/modules/contrib/files/imagecache_actions/docs/corner-bl.png new file mode 100644 index 00000000..7c6e0cee Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/corner-bl.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/corner-br.png b/sites/all/modules/contrib/files/imagecache_actions/docs/corner-br.png new file mode 100644 index 00000000..d2280da2 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/corner-br.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/corner-tl.png b/sites/all/modules/contrib/files/imagecache_actions/docs/corner-tl.png new file mode 100644 index 00000000..1b3ef5db Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/corner-tl.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/corner-tr.png b/sites/all/modules/contrib/files/imagecache_actions/docs/corner-tr.png new file mode 100644 index 00000000..17399a90 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/corner-tr.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/overlays.png b/sites/all/modules/contrib/files/imagecache_actions/docs/overlays.png new file mode 100644 index 00000000..4cbc4f3c Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/overlays.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/polaroid-template-transparent.png b/sites/all/modules/contrib/files/imagecache_actions/docs/polaroid-template-transparent.png new file mode 100644 index 00000000..61599624 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/polaroid-template-transparent.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/polaroid.png b/sites/all/modules/contrib/files/imagecache_actions/docs/polaroid.png new file mode 100644 index 00000000..7a46161d Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/polaroid.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/rounded.png b/sites/all/modules/contrib/files/imagecache_actions/docs/rounded.png new file mode 100644 index 00000000..e276b36e Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/rounded.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/text.png b/sites/all/modules/contrib/files/imagecache_actions/docs/text.png new file mode 100644 index 00000000..474b4b02 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/text.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/transparency.png b/sites/all/modules/contrib/files/imagecache_actions/docs/transparency.png new file mode 100644 index 00000000..2e9b7b57 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/transparency.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/docs/watermark.png b/sites/all/modules/contrib/files/imagecache_actions/docs/watermark.png new file mode 100644 index 00000000..f6aba5cb Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/docs/watermark.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/help/aspect_switcher.html b/sites/all/modules/contrib/files/imagecache_actions/help/aspect_switcher.html new file mode 100644 index 00000000..65b26372 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/help/aspect_switcher.html @@ -0,0 +1,146 @@ + + + ++ This is done through "chaining" two switches - "is it quite + wide or not?", then "is it quite tall or not?" which leaves + us with "must be square then." +
++ First we create the three sizes we will be using, + small-landscape, small-square, small-portrait. I'll just set + those up with scale_and_crop. +
++ We want wide images up to a ratio of 1:0.75 to be rendered + wide. We want squarish images, with an aspect between 1:0.75 + and 1:1.25 to be rendered square, and anything taller to be + rendered tall. +
++ To do this, we chain 2 rules. We need to build them + backwards, the smaller sub-rule first, but to understand, I'l + list them top down. +
++ Rule 1. is the master rule, 3-aspects +
++ if ratio is less than 1:.75, use small-landscape. If greater, + proceed to rule 2. +
++
++ Rule 2. square-or-portrait +
++ if ratio is less than 1:1.25, use small-square. If greater, + use small-portrait. +
++ To do this, we use the aspect switcher to link to the two + sizes, and the ratio adjustment to move + the switching point a little. Set the ratio adjustment to + 1.25 +
++ With these (5!) rules in place, you can get the desired + effect. This is a little trickier than just making a 'square' + setting, but it allows for the required fudge factor to + handle almost-square images. +
++ You can nudge the adjustment factor to be looser or tighter. + You can create even more chained rules, and define a + 'super-wide' size. +
+| + small-landscape + | ++ [Scale And Crop] width: 200, height: 100 + | +
| + small-portrait + | ++ [Scale And Crop] width: 100, height: 200 + | +
| + small-square + | ++ [Scale And Crop] width: 140, height: 140 + | +
| + small-square-or-portrait + | ++ [Aspect Switcher] Portrait + size: small-portrait. Landscape + size: small-square (switch + at 1:1.25) + | +
| + small-3-aspects + | ++ [Aspect Switcher] Portrait + size: small-square-or-portrait. + Landscape + size: small-landscape (switch + at 1:.75) + | +
+ The illustration shows the result of this set-up on a + collection of images. The listed dimensions are those of the + source images. You'll see that the mostly-square ones are + rendered square. +
+
+ + The rule being applied is: 1 Is it wide? +
++ For image 250x300, the aspect is ( 250/300 = 0.83 ) Normally + that number (less than 1) would be classified as 'portrait', + and with the adjustment (*0.75) that is still true, so the + processing passes through to the portrait preset. +
++ rule #2 it it tall? +
++ This preset however does a different set of maths, and + multiplies the aspect by 1.25, producing a result that causes + it to trigger to 'landscape' choice. 'landscape' at this + point is set to be the 'square' preset. And we get what we + wanted. +
+ + + diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Apostrophic Labs License Komika).txt b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Apostrophic Labs License Komika).txt new file mode 100644 index 00000000..92296f55 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Apostrophic Labs License Komika).txt @@ -0,0 +1,36 @@ +Komika font by APOSTROPHIC LABS: +http://moorstation.org/typoasis/designers/lab/index.htm. + +Below the license as was packaged with the font download: + +Here is the "Read Me" from the original http://www.apostrophiclab.com website: + +Archived here: http://web.archive.org/web/20030408055445/www.hardcovermedia.com/lab/Pages/info.html + +and here: http://apostrophiclab.pedroreina.net/info.html + +----------- + +Apostrophic Laboratories does not collect or relay any personal information about its visitors. + +Apostrophic Laboratories is not affiliated with the company that provides its web hosting service. + +Apostrophic Laboratories is not affiliated with any third party advertising service. This lab will always be advertisement-free to maintain the spirit and integrity of freedom of information that the world wide web was intended to represent. + +The fonts on this site are freeware and can be used as they are in any context without permission from Apostrophic Laboratories, except to produce material that is racist, criminal and/or illegal in nature. It is prohibited to modify any Apostrophic Laboratories font(s) for repackaging and/or re-release without an express written authorization by the designer(s) of the font(s) or Apostrophic Laboratories. Under no circumstance shall any Apostrophic Laboratories design or font design be sold or purchased. Email info@apostrophiclab.com if you want more information. + +The Apostrophic Laboratories site and its contents are the property of Apostrophic Laboratories and the contents' creators. It is prohibited to use the graphic designs shown on this site or any of the site's elements without obtaining written authorization from the designer(s) and/or developer(s) of the content in question. Email info@apostrophiclab.com if you want more information. + +Read everything written by Kurt Vonnegut. +Hear everything written by Mozart. +Live every day like it is your first. +Smell the flowers. +Touch the faces of babies. +Run in the rain. +Eat pop corn. + +The following constitutes the different methods of contacting Apostrophic Laboratories. +Web: http://www.apostrophiclab.com +Email: info@apostrophiclab.com +For individual designer email addresses, click here. +Address: Apostrophic Laboratories, 343 Kingswood Road, Toronto, Ontario, Canada M4E 3N8 diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Blokletters-Balpen.ttf b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Blokletters-Balpen.ttf new file mode 100644 index 00000000..d3ecaa82 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Blokletters-Balpen.ttf differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Blokletters-Potlood.ttf b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Blokletters-Potlood.ttf new file mode 100644 index 00000000..dae65c63 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Blokletters-Potlood.ttf differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Blokletters-Viltstift.ttf b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Blokletters-Viltstift.ttf new file mode 100644 index 00000000..1846868c Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Blokletters-Viltstift.ttf differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Creative Commons Attribution Share 2.5 (Blokletters).txt b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Creative Commons Attribution Share 2.5 (Blokletters).txt new file mode 100644 index 00000000..58b02df3 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Creative Commons Attribution Share 2.5 (Blokletters).txt @@ -0,0 +1,24 @@ +Blokletters fonts by Lefly Fonts: http://lefly.vepar.nl/ under the following +license: + +You are free: + +to Share — to copy, distribute and transmit the work +to Remix — to adapt the work + +Under the following conditions: + +Attribution — You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work). + +Share Alike — If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one. + +With the understanding that: + +Waiver — Any of the above conditions can be waived if you get permission from the copyright holder. + +Other Rights — In no way are any of the following rights affected by the license: +- Your fair dealing or fair use rights; +- The author's moral rights; +- Rights other persons may have either in the work itself or in how the work is used, such as publicity or privacy rights. + +Notice — For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page. diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Komika_display.ttf b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Komika_display.ttf new file mode 100644 index 00000000..5ae5bc98 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Komika_display.ttf differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/OFL (Pacifico).txt b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/OFL (Pacifico).txt new file mode 100644 index 00000000..190e9863 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/OFL (Pacifico).txt @@ -0,0 +1,93 @@ +Copyright (c) 2011, Vernon Adams (vern@newtypography.co.uk), +with Reserved Font Name Pacifico. +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Pacifico.ttf b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Pacifico.ttf new file mode 100644 index 00000000..122e4511 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/Pacifico.ttf differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/README.txt b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/README.txt new file mode 100644 index 00000000..46bdfe63 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/README.txt @@ -0,0 +1,274 @@ +README +------ +README for the Image effect text module. + +Author Erwin Derksen (fietserwin: https://drupal.org/user/750928) + + +Dependencies +------------ +Hard dependencies: +- Imagecache actions. +- Image (Drupal core). + +Soft dependencies/recommended modules: +- Imagemagick (preferred toolkit, https://drupal.org/project/imagemagick). +- PHP filter (Drupal core, if yuo want to use PHP to create the text to render). +- System stream wrapper (https://drupal.org/project/system_stream_wrapper) +- Remote stream wrapper (https://drupal.org/project/remote_stream_wrapper) +The latter 2 provide additional stream wrappers. Especially the system stream +wrapper is very handy as it provides, among others, a module:// and theme:// +wrapper. + + +Toolkit +------- +Personally, I prefer the imagemagick toolkit: +- It is better in anti-aliasing, try to rotate an image using both toolkits and + you will see what I mean. +- It does not execute in the PHP memory space, so is not restricted by the + memory_limit PHP setting. +- The GD toolkit will, at least on my Windows configuration, keep the font file + open after a text operation, so you cannot delete, move or rename it anymore. +- This module does a better job with Imagemagick (see below). + + +Installing +---------- +As usual. After enabling the module you can add texts to images. This image +effect works with both the GD and imagemagick toolkit, though results differ +depending on the toolkit you use. + + +More information about the effect data options +---------------------------------------------- + +Font +---- +This module comes with some free fonts so you can easily test this effect. +Please read their respective licences. + +For real use, you normally want to use your own font as dictated by the website +design. The font types supported depend on the toolkit in use, but at least ttf +files will always work. This option accepts either: +- 1 of the (enabled) scheme's: + * public:// + * private:// Preferred for site specific masks, overlays, etc, that do not + need to be shared publicly. + * temporary:// Unlikely to be useful, but supported anyway as all schemes are + supported. + * module:// Introduced by the system stream wrapper module and preferred for + module provided resources. + * theme:// idem. + * profile:// idem. + * library:// idem. +- A relative path (relative to the current directory, probably Drupal root). +- An absolute path. +- A system or toolkit font specification. E.g. on my Windows system 'arial.ttf' + worked with both GD and Imagemagick. A warning will be issued but that may be + ignored when it works as expected. + + +Text position +------------- +The text position defines the point in the image where you want to place (align) +your text. It starts at the top left corner of the image with position 0,0 and +the positive directions are to the right and down. + +The definition of the vertical position differs per toolkit. For GD it is the +position of the font baseline, while for Imagemagick it is the bottom of the +bounding box, i.e the descender or beard line in typography terminology. + + +Text alignment +-------------- +You can align your text with regard to the text position. Possible horizontal +alignments are left (default), center and right. Vertical alignments are top, +center and bottom (default). + +Note: Given +- the way that GD uses the vertical text position (as baseline), +- and the way this module implements (vertical) alignment (translating the + (vertical) position using the calculated bounding box), +vertical alignment with the GD toolkit is a bit off. You will have to compensate +for this yourself. + + +Rotation +-------- +The text can be rotated before being overlaid on the image. The value is in +degrees. Positive values are rotated clockwise, So 90 degrees is straight down. +negative values counter clockwise. + +In Imagemagick the text is rotated around the text position. Thus centered text +is rotated around its own center. GD, on the other hand, always rotates around +the left bottom (baseline) position, regardless the text alignment. So using +rotation with a non default alignment (left bottom) will give surprising +results. + + +Text source +----------- +The text to place on the image may come from different sources: +- Text (with token replacement): the text to place on the image has to be + entered on the image effect form. Use this e.g. for a copyright notice. + notes: + * Token replacement: you can use all global tokens, the file tokens, and + tokens from entities referring to the image via an image field. Example: if + you know that the image style is only used for article nodes, you can use + [node:field-image:alt] to get the alt text of the image. Note: this specific + example requires the entity_token module. + * New lines: you can add a new line by adding \n to your text. To get a + literal \n, use \\n. +- PHP: the text to place on the image comes from a piece of PHP code that should + return the text to place on the image. Only users with the 'use PHP for + settings' permission are allowed to use this source. This permission and the + evaluation of the PHP code come from the PHP filter module which is part of + Drupal core and thus needs to be enabled, also during image generation. + To add new lines to your text add them literally to the string you return, + normally by using "\n" in your PHP code. +- Image Alt or Title: to alleviate the need to enable the PHP filter module, 2 + commonly used sources for dynamic texts are directly available without any + coding: the alt and title properties of an image field linked to the image at + hand. + +Notes: +- When using token replacement or the image alt or title, multiple image fields, + possibly in different languages, may be referring to the image that is being + processed. This module will take the first image field it finds to extract the + alt and title. If the field in itself is multi-lingual, thus not a synced + field, the current language will be taken, which is the language of the user + that happens to request this image derivative first. +- This module will not automatically break text based on available space. +- Due to the way that GD text box positioning works it is quite difficult to + correctly position multiple lines of text with GD. If you have a working + solution please post a patch. (Probably involves exploding the text in + separate lines and then positioning each line separately.) + + +PHP snippets to determine the text +---------------------------------- +Given the correct permission, you can write your own PHP snippet to compute the +text to display. To ease this task, this module makes some information regarding +the image being processed available in 2 variables: $image and $image_context. +These variables are readily available in your snippet. + +$image is an object containing the following properties: +- source: string, the source of the image, e.g. public://photo.jpg +- info: array, example data: + - width (int) 180 + - height (int) 180 + - extension (string) png + - mime_type (string) image/png + - file_size (int) 4417 +- toolkit: string, imagemagick or GD + +$image_context is an associative array containing: +- effect_data: array, the data of this image effect, example data for the text + effect: + - size (string) 12 + - xpos (string) center + - ypos (string) center + - halign (string) left + - valign (string) bottom + - RGB Array [1] + - HEX (string) 000000 + - alpha (string) 100 + - angle (string) 0 + - fontfile (string:46) module://image_effects_text/Komika_display.ttf + - text_source (string) text + - text (string) Hello World! + - php (string) return 'Hello World!' +- managed_file: object|null. A managed file object containing these properties: + - fid (string) 2 + - uid (string) 1 + - filename (string) photo.jpg + - uri (string) public://photo.jpg + - filemime (string) image/jpeg + - filesize (string) 445751 + - status (string) 1 + - timestamp (string) 1327525851 + - metatags Array [0] + - rdf_mapping Array [0] +- referring_entities: array|null. A nested array with (fully loaded) entities + referring to the current image. The 1st level of entries is keyed by the field + name, the 2nd by entity type, and the 3rd by entity id. Example data: + - field_photo Array [1] + - node Array [1] + - 12 Object of: stdClass + - nid (string) 12 + - vid (string) 12 + - type (string) page + - author ... + - timestamp ... + - ... +- entity: object|null, the 1st entity in referring_entities. This is for easy + access to the referring entity if it may be assumed that only 1 entity is + referring to the current image. +- image_field: array|null, the 1st image field in entity that is referring to + the current image. This is for easy access to the image field data if it may + be assumed that only 1 image field is referring to the current image. Example + data: + - fid (int) 2 + - alt (string) ... + - title (string) ... + - ... + +Of course there are many other possible useful globals. Think of: +- base_url +- base_path +- base_root +- is_https +- user +- language +and of course $_SERVER and $_GET. + +Using these information you can access entity data as follows: + +Specific case (1 entity, of known entity_type, referring to the image): + + +Or the more general case (not knowing the referring type, or multiple entities +that may be referring to the image): + $field_referring_entities) { + foreach ($field_referring_entities as $entity_type => $entities) { + foreach ($entities as $entity_id => $entity) { + $field = field_get_items($entity_type, $entity, $field_name); + // ... + } + } +} +?> + +TODO +---- +- Vertical alignment: add baseline as vertical alignment and make both toolkits + behave the same for any given vertical alignment. +- Rotation and alignment. Imagemagick seems to be more correct. Can GD made to + do the same? +- Language and alt/title: what if the first user to pass by and that generates + the image is in a language that has no alt/title? +- Check for existence of imagettftext() and fail properly. + +To quote http://www.imagemagick.org/Usage/text/#draw: +As of IM version 6.2.4, the "-draw text" operation no longer understands the use +of '\n' as meaning newline, or the use of percent '%' image information escapes. +(See Drawing a Percent Bug). These abilities, and problems, however remain +available in the new IM v6 operator "-annotate". See the Annotate Text Drawing +Operator below. diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text.inc b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text.inc new file mode 100644 index 00000000..35e73161 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text.inc @@ -0,0 +1,728 @@ + + For text rendering to work on a server, we must + know the system path to the font file, not just the name. + Font library handling differs too much on different systems and + the available PHP toolkits are unable to return good diagnostics. +
+ On Debian/Ubuntu, you may find your fonts in and under
+ /usr/share/fonts/truetype/
+ eg '/usr/share/fonts/truetype/ttf-bitstream-vera/VeraMono.ttf'
+
+ On OSX, they are probably in /Library/Fonts/
+ eg '/Library/Fonts/Times New Roman Bold Italic.ttf'
+
+ On Windows, they are probably in C:\\WINDOWS\Fonts\
+ eg 'C:\\WINDOWS\\Fonts\\comic.ttf'
+
+ Of course, this will change if you deploy to a different server! + so the best approach is to place your own TTF font file inside your private + or public files directory and use that. Just give the filename with the + 'private://' or 'public://' scheme prefix and it should be found. +
+ "; + $output .= t("Files directory is !files
", array('!files' => variable_get('file_public_path', conf_path() . '/files'))); + + return $output; +} + +/** + * Image effect form callback for the text effect. + * + * Note that this is not a complete form, it only contains the portion of the + * form for configuring the effect options. Therefore it does not not need to + * include metadata about the effect, nor a submit button. + * + * @param array $data + * The current configuration for this image effect. + * + * @return array + * The form definition for this effect. + */ +function image_effects_text_form_inc(array $data) { + // Use of functions imagecache_file_...() creates a dependency on file utility.inc. + module_load_include('inc', 'imagecache_actions', 'utility'); + // Use of function imagecache_rgb_form() creates a dependency on file utility-color.inc. + module_load_include('inc', 'imagecache_actions', 'utility-color'); + + // Note: we also need to check for the existence of the module: admin has + // all rights, so user_access(...) returns TRUE even if the module is not + // enabled and the permission does not exist. + // A user without the 'use PHP for settings' permission (defined by the core + // PHP filter module) may not: + // - Select the 'PHP code' text source option if it is currently not selected. + // - Change the 'PHP code' textarea. + $allow_php = module_exists('php') && user_access('use PHP for settings'); + $defaults = array( + 'size' => 50, + 'angle' => 0, + 'xpos' => '0', + 'ypos' => '0', + 'halign' => 'left', + 'valign' => 'top', + 'RGB' => array('HEX' => '#000000'), + 'alpha' => 100, + 'fontfile' => drupal_get_path('module', 'image_effects_text') . '/Komika_display.ttf', + 'text_source' => 'text', + 'text' => t('Hello World!'), + 'php' => 'if (!$image_context[\'entity\']) { + return \'' . t('No referring entity') . '\'; +} +$entity_type = \'node\'; +$field_name = \'my_field\'; +$entity = $image_context[\'entity\']; +$field = field_get_items($entity_type, $entity, $field_name); +if ($field) { + return isset($field[0][\'value\']) ? $field[0][\'value\'] : \'' . t('No field value') . '\'; +} +', + ); + $data += $defaults; + $tokens = token_info(); + $tokens = array_keys($tokens['types']); + $form = array( + 'size' => array( + '#type' => 'textfield', + '#title' => t('Font size'), + '#default_value' => $data['size'], + '#description' => t('The font size in points. Only in GD1 this is in pixels.'), + '#size' => 3, + ), + 'xpos' => array( + '#type' => 'textfield', + '#title' => t('X offset'), + '#default_value' => $data['xpos'], + '#description' => t('Enter an offset in pixels or use a keyword: left, center, or right. Syntax like right-20 is also valid.'), + '#size' => 10, + ), + 'ypos' => array( + '#type' => 'textfield', + '#title' => t('Y offset'), + '#default_value' => $data['ypos'], + '#description' => t('Enter an offset in pixels or use a keyword: top, center, or bottom. Syntax like bottom-20 is also valid.'), + '#size' => 10, + ), + 'halign' => array( + '#type' => 'select', + '#title' => t('Horizontal alignment'), + '#default_value' => $data['halign'], + '#description' => t('The horizontal alignment of the text around the given %xpos.', array('%xpos' => t('X offset'))), + '#options' => array( + 'left' => t('Left'), + 'center' => t('Center'), + 'right' => t('Right') + ), + ), + 'valign' => array( + '#type' => 'select', + '#title' => t('Vertical alignment'), + '#default_value' => $data['valign'], + '#description' => t('The vertical alignment of the text around the given %ypos.', array('%ypos' => t('Y offset'))), + '#options' => array( + 'top' => t('Top'), + 'center' => t('Center'), + 'bottom' => t('Bottom') + ), + ), + 'RGB' => imagecache_rgb_form($data['RGB']), + 'alpha' => array( + '#type' => 'textfield', + '#title' => t('Opacity'), + '#default_value' => $data['alpha'] ? $data['alpha'] : 100, + '#size' => 3, + '#description' => t('Opacity: 1-100.'), + ), + 'angle' => array( + '#type' => 'textfield', + '#title' => t('Angle'), + '#default_value' => $data['angle'], + '#description' => t('Angle: The angle in degrees, with 0 degrees being left-to-right reading text. Higher values represent a counter-clockwise rotation. For example, a value of 90 would result in bottom-to-top reading text.'), + '#size' => 3, + ), + 'fontfile' => array( + '#type' => 'textfield', + '#title' => t('Font file name'), + '#default_value' => $data['fontfile'], + '#description' => imagecache_actions_file_field_description(), + '#element_validate' => array('image_effects_text_validate_font'), + '#size' => 80, + ), + 'text_help' => array( + '#type' => 'item', + '#title' => t('Text'), + '#description' => t('Select the source of the text:
+See the help in README.txt for an extensive explanation of the possibilities.
', + array('%use_php' => t('Use PHP for settings'))), + ), + 'text_source' => array( + '#type' => 'select', + '#title' => t('Text source'), + '#default_value' => $data['text_source'], + '#options' => array( + 'alt' => t('Image alt'), + 'title' => t('Image title'), + 'text' => t('Text (with token replacement)'), + 'php' => t('PHP code'), + ), + ), + 'text' => array( + '#type' => 'textfield', + '#title' => t('Text'), + '#default_value' => $data['text'], + '#states' => array( + 'visible' => array(':input[name="data[text_source]"]' => array('value' => 'text')), + ), + ), + 'token_help' => array( + '#type' => 'fieldset', + '#title' => t('Token replacement patterns'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + 'tree' => array( + '#theme' => 'token_tree', + '#token_types' => $tokens, + ), + 'token_module_notice' => array( + '#markup' => !module_exists('token') ? t('You might want to enable the token module to view token replacement patterns.') : '', + ), + 'entity_token_module_notice' => array( + '#markup' => !module_exists('entity_token') ? t('You might want to enable the entity_token module to get token options for all entities and field properties.') : '', + ), + '#states' => array( + 'visible' => array(':input[name="data[text_source]"]' => array('value' => 'text')), + ), + ), + 'php' => array( + '#type' => 'textarea', + '#rows' => 12, + '#title' => t('PHP code'), + '#default_value' => $data['php'], + '#disabled' => !$allow_php, + '#states' => array( + 'visible' => array(':input[name="data[text_source]"]' => array('value' => 'php')), + ), + '#wysiwyg' => FALSE, + ), + ); + if (!$allow_php && $data['text_source'] !== 'php') { + unset($form['text_fieldset']['text_source']['#options']['php']); + } + + $form['#element_validate'][] = 'image_effects_text_form_validate'; + return $form; +} + +/** + * Element validation callback for the effect form. + * @see http://api.drupal.org/api/drupal/developer--topics--forms_api_reference.html/7#element_validate + */ +function image_effects_text_form_validate(array $element/*, &$form_state, $form*/) { + if (!is_numeric($element['size']['#value']) || $element['size']['#value'] <= 0) { + form_error($element['size'], t('%field must be a positive number.', array('%field' => t('Font size')))); + } + if (!is_numeric($element['alpha']['#value']) || $element['alpha']['#value'] < 0 || $element['alpha']['#value'] > 100) { + form_error($element['alpha'], t('%field must be a number between 1 and 100.', array('%field' => t('Opacity')))); + } + if (!is_numeric($element['angle']['#value'])) { + form_error($element['angle'], t('%field must be a number.', array('%field' => t('Angle')))); + } +} + +/** + * Validates that the file as specified in the element exists and is readable. + * + * This is a Form API #element_validate callback. + * + * @param array $element + */ +function image_effects_text_validate_font(array &$element/*, &$form_status*/) { + if (!imagecache_actions_find_file($element['#value'])) { + drupal_set_message(t("Unable to find the font file '%file'. Please check the path. You can ignore this waning, if the font refers to a system or toolkit font, and the text shows correctly.", array('%file' => $element['#value'])), 'warning'); + } +} + +/** + * Implements theme_hook() for the text effect summary. + * + * @param array $variables + * An associative array containing: + * - data: The current configuration for this image effect. + * + * @return string + * The HTML for the summary of this image effect. + * @ingroup themeable + */ +function theme_image_effects_text_summary(array $variables) { + $data = $variables['data']; + switch ($data['text_source']) { + case 'alt': + $text = 'image alt'; + break; + case 'title': + $text = 'image title'; + break; + case 'text': + $text = $data['text']; + break; + case 'php': + $text = 'PHP code'; + break; + default: + $text = ''; + break; + } + return 'Text: ' . $text . '; Position: ' . $data['xpos'] . ',' . $data['ypos'] . '; Alignment: ' . $data['halign'] . ',' . $data['valign']; +} + +/** + * Image effect callback for the text effect. + * + * @param stdClass $image + * @param array $data + * + * @return boolean + * true on success, false otherwise. + */ +function image_effects_text_effect_inc(stdClass $image, array $data) { + // Use of imagecache_actions_hex2rgba() ,the imagecache_file_...() functions, + // and imagecache_actions_get_image_context() create a dependency on + // file utility.inc. + module_load_include('inc', 'imagecache_actions', 'utility'); + + // Massage the data and pass it on to the toolkit dependent part. + // Start with a straight copy. + $params = $data; + + // Get the text to overlay. + $params['text'] = image_effects_text_get_text($image, $params); + if (empty($params['text'])) { + // No text to overlay. This is a situation that can be expected with token + // replacement, or custom PHP code. Return immediately with success. + return TRUE; + } + + // Find out where the font file is located and if it is readable. + $params['fontpath'] = imagecache_actions_find_file($data['fontfile']); + if ($params['fontpath'] === FALSE) { + // Pass the font on and let's hope that the toolkit knows where to find it. + // We did warn on the effect form. + $params['fontpath'] = $data['fontfile']; + } + + // Parse offsets. + $params['xpos'] = image_effects_text_get_offset($data['xpos'], $image->info['width'], $image->info['height'], $image->info['width']); + $params['ypos'] = image_effects_text_get_offset($data['ypos'], $image->info['width'], $image->info['height'], $image->info['height']); + + // Convert color from hex (as it is stored in the UI). + $params['RGB'] = $data['RGB']; + if ($params['RGB']['HEX'] && $deduced = imagecache_actions_hex2rgba($params['RGB']['HEX'])) { + $params['RGB'] += $deduced; + } + + // Make integers of various parameters. + $params['size'] = (int) $params['size']; + $params['xpos'] = (int) $params['xpos']; + $params['ypos'] = (int) $params['ypos']; + + // Hand over to toolkit. + return image_toolkit_invoke('image_effects_text', $image, array($params)); +} + +/** + * GD toolkit specific implementation of the text effect. + * + * @param stdClass $image + * @param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + */ +function image_gd_image_effects_text(stdClass $image, array $data) { + // Convert color and alpha to GD alpha and color value. + // GD alpha value: 0 = opaque, 127 = transparent. + $data['alpha'] = (int) ((1 - ($data['alpha'] / 100)) * 127); + $color = imagecolorallocatealpha($image->resource, $data['RGB']['red'], $data['RGB']['green'], $data['RGB']['blue'], $data['alpha']); + if ($color !== FALSE) { + $bounds = NULL; + // Adjust Y position for vertical alignment (if different from bottom). + if ($data['valign'] !== 'bottom') { + // Get bounding box. + // PHP Manual: "This function requires both the GD library and the » FreeType library." + // So it is not more demanding than imagettftext, which we need anyway. + $bounds = imagettfbbox($data['size'], 0, $data['fontpath'], $data['text']); + if (!$bounds) { + drupal_set_message(t('Failed to calculate text dimensions using GD toolkit. Ignoring the alignment settings.'), 'warning'); + } + else { + // Get height of bounding box. + $height = $bounds[1] - $bounds[7]; + // Shift ypos down (full height on bottom, half the height on center). + $data['ypos'] += $data['valign'] === 'center' ? (int) ($height / 2) : $height; + } + } + // Adjust X position for horizontal alignment (if different from left). + if ($data['halign'] !== 'left') { + // Get bounding box. PHP Manual: "This function requires both the GD + // library and the » FreeType library.", so it is not more demanding than + // imagettftext(), which we need anyway. + if ($bounds === NULL) { + $bounds = imagettfbbox($data['size'], 0, $data['fontpath'], $data['text']); + if (!$bounds) { + drupal_set_message(t('Failed to calculate text dimensions using GD toolkit. Ignoring the alignment.'), 'warning'); + } + } + if ($bounds !== FALSE) { + // Get width of bounding box. + $width = $bounds[2] - $bounds[0]; + // Shift xpos to the left (full width on right, half the width on center). + $data['xpos'] -= $data['halign'] === 'center' ? (int) ($width / 2) : $width; + } + } + + // PHP Manual: "This function requires both the GD library and the » FreeType library." + $bounds = imagettftext($image->resource, $data['size'], $data['angle'], $data['xpos'], $data['ypos'], $color, $data['fontpath'], $data['text']); + return $bounds !== FALSE; + } + return FALSE; +} + +/** + * Imagemagick toolkit specific implementation of the text effect. + * + * Text in Imagemagick: + * - http://www.imagemagick.org/script/command-line-options.php?#draw + * - http://www.imagemagick.org/script/command-line-options.php?#annotate + * + * UTF-8/non-ascii characters: + * To prevent problems with non-ASCII characters, the online manual suggests to + * put the text in a file and use the @{file} syntax. This does not work with + * the text primitive of the -draw command, so we use -annotate. + * We put the text in a temporary file which will be deleted by our hook_exit(). + * http://www.imagemagick.org/Usage/windows/#character_encoding + * + * Alignment in Imagemagick: + * This is not directly supported, though a justification option has been + * proposed: http://www.imagemagick.org/Usage/bugs/future/#justification. + * + * What we do have is the gravity option: + * Gravity is used to position a text, but it also automatically applies a + * justification based on that placement. So we use gravity here for alignment, + * but will thus have to rebase our positioning. + * - http://www.imagemagick.org/Usage/annotating/#gravity + * + * Gravity |halign|valign |hpos change|vpos change + * ------------------------------------------------ + * NorthWest left top 0 0 + * North center top -width/2 0 + * NorthEast right top -width 0 + * West left center 0 -height/2 + * Center center center -width/2 -height/2 + * East right center -width -height/2 + * SouthWest left bottom 0 -height + * South center bottom -width/2 -height + * SouthEast right bottom -width -height + * + * @param stdClass $image + * @param array $data + * The parameters for this effect. + * + * @return bool + * true on success, false otherwise. + + */ +function image_imagemagick_image_effects_text(stdClass $image, array $data) { + static $alignments2gravity = array( + 'left' => array( + 'top' => array( + 'gravity' => 'NorthWest', + 'tx' => 0, + 'ty' => 0, + ), + 'center' => array( + 'gravity' => 'West', + 'tx' => 0, + 'ty' => -0.5, + ), + 'bottom' => array( + 'gravity' => 'SouthWest', + 'tx' => 0, + 'ty' => 1, // reversed translation + ), + ), + 'center' => array( + 'top' => array( + 'gravity' => 'North', + 'tx' => -0.5, + 'ty' => 0, + ), + 'center' => array( + 'gravity' => 'Center', + 'tx' => -0.5, + 'ty' => -0.5, + ), + 'bottom' => array( + 'gravity' => 'South', + 'tx' => -0.5, + 'ty' => 1, // reversed translation + ), + ), + 'right' => array( + 'top' => array( + 'gravity' => 'NorthEast', + 'tx' => 1, // reversed translation + 'ty' => 0, + ), + 'center' => array( + 'gravity' => 'East', + 'tx' => 1, // reversed translation + 'ty' => -0.5, + ), + 'bottom' => array( + 'gravity' => 'SouthEast', + 'tx' => 1, // reversed translation + 'ty' => 1, // reversed translation + ), + ), + ); + + // Convert color and alpha to Imagemagick rgba color argument. + $alpha = $data['alpha'] / 100; + $color = 'rgba(' . $data['RGB']['red'] . ',' . $data['RGB']['green'] . ',' . $data['RGB']['blue'] . ',' . $alpha . ')'; + + // Set gravity for the alignment and calculate the translation to the + // requested x and y offset as starting from the gravity point. + $alignment_corrections = $alignments2gravity[$data['halign']][$data['valign']]; + $gravity = $alignment_corrections['gravity']; + if ($alignment_corrections['tx'] > 0) { + $data['xpos'] = (int) ($alignment_corrections['tx'] * $image->info['width'] - $data['xpos']); + } + else { + $data['xpos'] += (int) ($alignment_corrections['tx'] * $image->info['width']); + } + if ($alignment_corrections['ty'] > 0) { + $data['ypos'] = (int) ($alignment_corrections['ty'] * $image->info['height'] - $data['ypos']); + } + else { + $data['ypos'] += (int) ($alignment_corrections['ty'] * $image->info['height']); + } + + // Add signs to translation, also when positive or 0. + if ($data['xpos'] >= 0) { + $data['xpos'] = '+' . $data['xpos']; + } + if ($data['ypos'] >= 0) { + $data['ypos'] = '+' . $data['ypos']; + } + + // Angle must be positive. + if ($data['angle'] < 0) { + $data['angle'] = $data['angle'] % 360 + 360; + } + + // Set font file, size and color. fontpath is the real path, not a wrapper. + $image->ops[] = '-font ' . escapeshellarg($data['fontpath']); + $image->ops[] = "-pointsize {$data['size']}"; + $image->ops[] = '-fill ' . escapeshellarg($color); + + // Add text to a temporary file, + $tmp_file_name = drupal_tempnam('temporary://', 'image_effects_text'); + $tmp_file = fopen($tmp_file_name, 'w'); + if ($tmp_file) { + fwrite($tmp_file, $data['text']); + fclose($tmp_file); + // and inform our hook_exit about it. + image_effects_text_exit($tmp_file_name); + $tmp_file_name = drupal_realpath($tmp_file_name); + $text = "@$tmp_file_name"; + } + else { + // Fallback to pass the text via the command line, let's hope there are no + // non-ASCII characters or that it works anyway (OS and locale dependent). + $text = $data['text']; + } + + // Add gravity. + $image->ops[] = "-gravity $gravity"; + // Add text angle, position and text (file) itself. + $image->ops[] = "-annotate {$data['angle']}x{$data['angle']}{$data['xpos']}{$data['ypos']} " . escapeshellarg($text); + + return TRUE; +} + + +/** + * UTILITY + */ + +/** + * Convert a position into an offset in pixels. + * + * Position may be a number of additions and/or subtractions of: + * - An value, positive or negative, in pixels. + * - A, positive or negative, percentage (%). The given percentage of the + * current dimension will be taken. + * - 1 of the keywords: + * * top: 0 + * * bottom: the height of the current image + * * left: 0 + * * right: the width of the current image + * * center: 50% (of the current dimension) + * Examples: + * 0, 20, -20, 90%, 33.3% + 10, right, center - 20, 300 - center, bottom - 50. + * Note: + * The algorithm will accept many more situations, though the result may be hard + * to predict. + * + * @param string $position + * The string defining the position. + * @param int $width + * The length of the horizontal dimension. + * @param int $height + * The length of the vertical dimension. + * @param int $length + * The length of the current dimension (should be either width or height). + * + * @return number + * The computed offset in pixels. + */ +function image_effects_text_get_offset($position, $width, $height, $length) { + $value = 0; + + $tokens = preg_split('/ *(-|\+) */', $position, 0, PREG_SPLIT_DELIM_CAPTURE); + $sign = 1; + foreach ($tokens as $token) { + switch ($token) { + case '+'; + // Ignore, doesn't change the sign + break; + case '-'; + // Flip the sign. + $sign = -$sign; + break; + case 'top': + case 'left': + // Actually, top and left are a no-op. + $value += $sign * 0; + $sign = 1; + break; + case 'bottom': + // Use height of the image, even if this is for the horizontal position. + $value += $sign * $height; + $sign = 1; + break; + case 'right': + // Use width of the image, even if this is for the vertical position. + $value += $sign * $width; + $sign = 1; + break; + case 'center': + // half the current dimension as provided by $length. + $value += $sign * $length / 2; + $sign = 1; + break; + default: + // Value: absolute or percentage + if (substr($token, -strlen('%')) === '%') { + $percentage = ((float) substr($token, 0, -strlen('%'))) / 100.0; + $value += $sign * ($percentage * $length); + } + else { + $value += $sign * (float) $token; + } + $sign = 1; + break; + } + } + return $value; +} + +/** + * Get the text to use for this image. + * + * @param stdClass $image + * The image the current effect is to be applied to. + * @param array $data + * An array containing the effect data. + * + * @return string + * Plain text to be placed on the image. + */ +function image_effects_text_get_text(stdClass $image, array $data) { + // Get context about the image. + $image_context = imagecache_actions_get_image_context($image, $data); + + if ($data['text_source'] === 'text') { + // Replace \n with a newline character, except when preceded by a \. + $text = preg_replace('/([^\\\\])\\\\n/', "$1\n", $data['text']); + // Replace \\n by \n. + $text = preg_replace('/\\\\\\\\n/', '\n', $text); + + // Replace tokens. + $token_data = array(); + foreach ($image_context['referring_entities'] as /*$field_name =>*/ $field_referring_entities) { + foreach ($field_referring_entities as $entity_type => $entities) { + // We can pass only 1 entity per given type to token_replace(), we take + // the first. + $token_data[$entity_type] = reset($entities); + } + } + if ($image_context['managed_file']) { + $token_data['file'] = $image_context['managed_file']; + } + // We should not sanitize the text as it will not be rendered in the browser + // but is rendered on the image canvas on the server. + $text = token_replace($text, $token_data, array('clear' => TRUE, 'sanitize' => FALSE)); + } + else if ($data['text_source'] === 'alt' || $data['text_source'] === 'title') { + $text = ''; + // We have 2 possible sources for the alt or title text: + // - Image field. + // - Media module (7.x-2.x) with file_entity: the alt and title come as + // fields of the file entity, stored in 'managed_file'. The names of the + // fields are field_file_image_alt_text resp. field_file_image_title_text. + // BTW: these fields are also available in the 'image_field' entry, but as + // a managed file may be existing without any image field referring to it, + // we do the lookup in the managed_file entry. + if (!empty($image_context['image_field'][$data['text_source']])) { + $text = $image_context['image_field'][$data['text_source']]; + } + else if (!empty($image_context['managed_file'])) { + $field = field_get_items('file', $image_context['managed_file'], "field_file_image_{$data['text_source']}_text"); + if ($field) { + $text = $field[0]['value']; + } + } + } + else { // $data['text_source'] === 'php' + // Process the php using php_eval (rather than eval), but with GLOBAL + // variables, so they can be passed successfully. + $GLOBALS['image_context'] = $image_context; + $GLOBALS['image'] = $image; + // We don't need to check_plain() the resulting text, as the text is not + // rendered in a browser but processed on the server. + $text = module_exists('php') ? php_eval('<' . '?php global $image, $image_context; ' . $data['php'] . ' ?' . '>') : ''; + + unset($GLOBALS['image']); + unset($GLOBALS['image_context']); + } + return $text; +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text.info b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text.info new file mode 100644 index 00000000..55a92f75 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text.info @@ -0,0 +1,14 @@ +name = Image Effects Text +description = Provides an image effect to overlay text captions on images. +package = Media +core = 7.x + +dependencies[] = image +dependencies[] = imagecache_actions + +; Information added by Drupal.org packaging script on 2016-02-19 +version = "7.x-1.7" +core = "7.x" +project = "imagecache_actions" +datestamp = "1455872655" + diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text.module b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text.module new file mode 100644 index 00000000..24791b8b --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text.module @@ -0,0 +1,115 @@ + image + * * action(s) -> effect(s) + * resulting in image_effects_text. + * - The .module file is kept as small as possible. The real work is done in the + * .inc file. + * - Function and parameter naming has been changed to match the image effects + * in the core image module. + */ + +/** + * Implements hook_image_effect_info(). + * + * Defines information about the supported effects. + */ +function image_effects_text_image_effect_info() { + $effects = array(); + + $effects['image_effects_text'] = array( + 'label' => t('Text'), + 'help' => t('Add static or dynamic (coded) text to an image.'), + 'dimensions passthrough' => TRUE, + 'effect callback' => 'image_effects_text_effect', + 'form callback' => 'image_effects_text_form', + 'summary theme' => 'image_effects_text_summary', + ); + + return $effects; +} + +/** + * Implements hook_help(). + */ +function image_effects_text_help($path, $arg) { + if ($path === 'admin/advanced_help' && count($arg) >= 3 && $arg[2] === 'image_effects_text' + || $path === 'admin/help/image_effects_text') { + module_load_include('inc', 'image_effects_text', 'image_effects_text'); + return image_effects_text_help_inc($path, $arg); + } + else if ($path === 'admin/help#image_effects_text') { + // This path just checks if there is (non-empty) help, so it can place a + // link to it. + return ' '; + } + return ''; +} + +/** + * Implements hook_theme(). + * + * Registers theme functions for the effect summaries. + */ +function image_effects_text_theme() { + return array( + 'image_effects_text_summary' => array( + 'variables' => array('data' => NULL), + 'file' => 'image_effects_text.inc' + ), + ); +} + +/** + * Implements hook_exit(). + * + * For imagemagick we place the text in a temporary file as this prevents + * problems with non-ASCII characters. This hook deletes files created during + * execution of the text effect. As a style may contain multiple text effects, + * there may be multiple files to delete. + * + * To keep track of temporary files created by this effect, the image effect + * function itself also calls this hook, but passes the filename as a parameter. + * + * @param string|null $destination + */ +function image_effects_text_exit($destination = NULL) { + static $tmp_file_names = array(); + + if (isset($destination)) { + if (substr($destination, 0 , strlen('temporary://')) === 'temporary://') { + // Called by the effect function. Add to our static list of files ot delete. + $tmp_file_names[] = $destination; + } + } + else { + // Normal invocation as Drupal hook: delete any files we have collected. + foreach ($tmp_file_names as $tmp_file_name) { + unlink($tmp_file_name); + } + } +} + +/** + * Builds the form structure for the overlay text image effect. + */ +function image_effects_text_form($data) { + module_load_include('inc', 'image_effects_text', 'image_effects_text'); + return image_effects_text_form_inc($data); +} + +/** + * Callback to perform the image effect on the given image. + */ +function image_effects_text_effect($image, $data) { + module_load_include('inc', 'image_effects_text', 'image_effects_text'); + return image_effects_text_effect_inc($image, $data); +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text_test/README.txt b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text_test/README.txt new file mode 100644 index 00000000..4dc21df0 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text_test/README.txt @@ -0,0 +1,19 @@ +README +------ +README for the Image effect text test module. + +This module contains several image styles to test text effects. It uses an image +containing a grid and a font which are included in the install package as well. +The image styles defined by this module start with 'text-test-'. + +Hard Dependencies +----------------- +Hard dependencies: +- Imagecache actions (canvas_actions and image_effects_text). +- Image (Drupal core). +- System stream wrapper (https://drupal.org/project/system_stream_wrapper) + +Soft Dependencies +----------------- +- Imagemagick (preferred toolkit, https://drupal.org/project/imagemagick). +- GD diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text_test/grid800x600.png b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text_test/grid800x600.png new file mode 100644 index 00000000..811b06fa Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text_test/grid800x600.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text_test/image_effects_text_test.info b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text_test/image_effects_text_test.info new file mode 100644 index 00000000..1e117ce0 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text_test/image_effects_text_test.info @@ -0,0 +1,16 @@ +name = Image Effects Text test +description = Defines image styles that test the text effect. +core = 7.x +package = Media + +dependencies[] = image +dependencies[] = image_effects_text +dependencies[] = imagecache_canvasactions +dependencies[] = system_stream_wrapper + +; Information added by Drupal.org packaging script on 2016-02-19 +version = "7.x-1.7" +core = "7.x" +project = "imagecache_actions" +datestamp = "1455872655" + diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text_test/image_effects_text_test.module b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text_test/image_effects_text_test.module new file mode 100644 index 00000000..149d4c3d --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_effects_text/image_effects_text_test/image_effects_text_test.module @@ -0,0 +1,609 @@ + 'text-test-position-orientation', + 'effects' => array( + 115 => array( + 'label' => 'Overlay (watermark)', + 'help' => '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, + 'form callback' => 'canvasactions_file2canvas_form', + 'summary theme' => 'canvasactions_file2canvas_summary', + 'module' => 'imagecache_canvasactions', + 'name' => 'canvasactions_file2canvas', + 'data' => array( + 'xpos' => 'left', + 'ypos' => 'top', + 'alpha' => '100', + 'path' => 'module://image_effects_text_test/grid800x600.png', + ), + 'weight' => '-10', + ), + 116 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => '100', + 'ypos' => '200', + 'halign' => 'left', + 'valign' => 'top', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '0', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => '100,200 left,top', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '-8', + ), + 117 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => 'left+300', + 'ypos' => 'top+200', + 'halign' => 'left', + 'valign' => 'center', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '0', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => 'left+300,top+200 left,center', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '3', + ), + 118 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => 'right-300', + 'ypos' => '200+top', + 'halign' => 'left', + 'valign' => 'bottom', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '0', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => 'right-300,200+top left,bottom', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '4', + ), + 119 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => 'center-300', + 'ypos' => '100+center', + 'halign' => 'center', + 'valign' => 'top', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '0', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => 'center-300,100+center center,top', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '5', + ), + 120 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => '-100+center', + 'ypos' => 'center+100', + 'halign' => 'center', + 'valign' => 'center', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '0', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => '-100+center,center+100 center,center', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '6', + ), + 121 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => '-200+right', + 'ypos' => 'bottom-200', + 'halign' => 'center', + 'valign' => 'bottom', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '0', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => '-200+right,bottom-200 center, bottom', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '7', + ), + 122 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => '300', + 'ypos' => '500', + 'halign' => 'right', + 'valign' => 'top', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '0', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => '300,500 right,top', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '8', + ), + 123 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => 'right-center+100', + 'ypos' => 'bottom-100', + 'halign' => 'right', + 'valign' => 'center', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '0', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => 'right-center+100,bottom-100 right,center', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '9', + ), + 124 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => 'right-100', + 'ypos' => 'bottom-100', + 'halign' => 'right', + 'valign' => 'bottom', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '0', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => 'right-100,bottom-100 right,bottom', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '10', + ), + ), + ); + + // Exported image style: text-test-rotate-wrt-alignment. + $styles['text-test-rotate-wrt-alignment'] = array( + 'name' => 'text-test-rotate-wrt-alignment', + 'effects' => array( + 125 => array( + 'label' => 'Schalen', + 'help' => 'Door te schalen worden de originele verhoudingen behouden. Als één van de dimensies wordt ingevuld zal de andere worden berekend.', + 'effect callback' => 'image_scale_effect', + 'dimensions callback' => 'image_scale_dimensions', + 'form callback' => 'image_scale_form', + 'summary theme' => 'image_scale_summary', + 'module' => 'image', + 'name' => 'image_scale', + 'data' => array( + 'width' => '800', + 'height' => '', + 'upscale' => 0, + ), + 'weight' => '1', + ), + 126 => array( + 'label' => 'Overlay (watermark)', + 'help' => '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, + 'form callback' => 'canvasactions_file2canvas_form', + 'summary theme' => 'canvasactions_file2canvas_summary', + 'module' => 'imagecache_canvasactions', + 'name' => 'canvasactions_file2canvas', + 'data' => array( + 'xpos' => 0, + 'ypos' => 0, + 'alpha' => '100', + 'path' => 'module://image_effects_text_test/grid800x600.png', + ), + 'weight' => '2', + ), + 127 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => '100', + 'ypos' => '200', + 'halign' => 'left', + 'valign' => 'bottom', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '45', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => '100,200 45 left,bottom', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '3', + ), + 128 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => '300', + 'ypos' => '200', + 'halign' => 'center', + 'valign' => 'center', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '66.67', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => '300,200 66.67 center,center', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '4', + ), + 129 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => '500', + 'ypos' => '200', + 'halign' => 'right', + 'valign' => 'top', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '90', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => '500,200 45 right,top', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '5', + ), + 130 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => '100', + 'ypos' => '500', + 'halign' => 'left', + 'valign' => 'bottom', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '-30', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => '100,500 -30 left,bottom', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '7', + ), + 131 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => '300', + 'ypos' => '500', + 'halign' => 'center', + 'valign' => 'center', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '-45', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => '300,500 -45 center,center', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '8', + ), + 132 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '18', + 'xpos' => '600', + 'ypos' => '400', + 'halign' => 'right', + 'valign' => 'top', + 'RGB' => array( + 'HEX' => '000000', + ), + 'alpha' => '100', + 'angle' => '-90', + 'fontfile' => 'module://image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => '600,400 -90 right,top', + 'php' => 'return \'Hello World!\'', + ), + 'weight' => '9', + ), + ), + ); + + // Exported image style: text-test-utf8-multi-line-color-transparency. + $styles['text-test-utf8-multi-line-color-transparency'] = array( + 'name' => 'text-test-utf8-multi-line-color-transparency', + 'effects' => array( + 133 => array( + 'label' => 'Overlay (watermark)', + 'help' => '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, + 'form callback' => 'canvasactions_file2canvas_form', + 'summary theme' => 'canvasactions_file2canvas_summary', + 'module' => 'imagecache_canvasactions', + 'name' => 'canvasactions_file2canvas', + 'data' => array( + 'xpos' => 'left', + 'ypos' => 'top', + 'alpha' => '100', + 'path' => 'module://image_effects_text_test/grid800x600.png', + ), + 'weight' => '-10', + ), + 114 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '20', + 'xpos' => '100', + 'ypos' => '100', + 'halign' => 'left', + 'valign' => 'top', + 'RGB' => array( + 'HEX' => 'FF0000', + ), + 'alpha' => '100', + 'angle' => '0', + 'fontfile' => 'sites/all/modules/imagecache_actions/image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => 'top+100,left+100: é è à ù ç Ö ÿ ‘ ’ “ ” ° ² ³ € x ÷', + 'php' => 'if (!$image_context[\'entity\']) { + return \'No referring entity\'; +} +$entity_type = \'node\'; +$field_name = \'my_field\'; +$entity = $image_context[\'entity\']; +$field = field_get_items($entity_type, $entity, $field_name); +if ($field) { + return isset($field[0][\'value\']) ? $field[0][\'value\'] : \'No field value\'; +} +', + ), + 'weight' => '-9', + ), + 135 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '50', + 'xpos' => '100', + 'ypos' => '200', + 'halign' => 'left', + 'valign' => 'top', + 'RGB' => array( + 'HEX' => '0000FF', + ), + 'alpha' => '90', + 'angle' => '0', + 'fontfile' => 'sites/all/modules/imagecache_actions/image_effects_text/Komika_display.ttf', + 'text_source' => 'text', + 'text' => 'Hello World!\\nOlá, mundo\\\\nHej världen', + 'php' => 'if (!$image_context[\'entity\']) { + return \'No referring entity\'; +} +$entity_type = \'node\'; +$field_name = \'my_field\'; +$entity = $image_context[\'entity\']; +$field = field_get_items($entity_type, $entity, $field_name); +if ($field) { + return isset($field[0][\'value\']) ? $field[0][\'value\'] : \'No field value\'; +} +', + ), + 'weight' => '-8', + ), + 134 => array( + 'label' => 'Tekst', + 'help' => 'Add static or dynamic (coded) text to an image.', + 'dimensions passthrough' => TRUE, + 'form callback' => 'image_effects_text_form', + 'effect callback' => 'image_effects_text_effect', + 'summary theme' => 'image_effects_text_summary', + 'module' => 'image_effects_text', + 'name' => 'image_effects_text', + 'data' => array( + 'size' => '50', + 'xpos' => '400', + 'ypos' => 'bottom-100', + 'halign' => 'center', + 'valign' => 'bottom', + 'RGB' => array( + 'HEX' => 'FFFFFF', + ), + 'alpha' => '50', + 'angle' => '0', + 'fontfile' => 'arial.ttf', + 'text_source' => 'php', + 'text' => 'Hello World!', + 'php' => 'return "Hello World!\\nOlá, mundo\\\\nHej världen"; +', + ), + 'weight' => '-7', + ), + ), + ); + + return $styles; +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_overlay.inc b/sites/all/modules/contrib/files/imagecache_actions/image_overlay.inc new file mode 100644 index 00000000..b68bc81c --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_overlay.inc @@ -0,0 +1,205 @@ +info['width'], $image->info['width']); + $y = imagecache_actions_keyword_filter($y, $layer->info['height'], $image->info['height']); + } + else { + $x = imagecache_actions_keyword_filter($x, $image->info['width'], $layer->info['width']); + $y = imagecache_actions_keyword_filter($y, $image->info['height'], $layer->info['height']); + } + return image_toolkit_invoke('overlay', $image, array($layer, $x, $y, $alpha, $reverse)); +} + +/** + * GD toolkit specific implementation of the image overlay effect. + * + * NOTE that the PHP libraries are not great at merging images SO we include a + * library that does it pixel-by-pixel which is INCREDIBLY inefficient. If this + * can be improved, in a way that supports all transparency, please let us know! + * + * A watermark is layer onto image, return the image. An underlay is image onto + * layer, return the layer. Almost identical, but seeing as we work with + * resource handles, the handle needs to be swapped before returning. + * + * @param stdClass $image + * An image object. + * @param stdClass $layer + * Image object to be placed over or under the $image image. + * @param int $x + * Position of the overlay. + * @param int $y + * Position of the overlay. + * @param int $alpha + * Transparency of the overlay from 0-100. 0 is totally transparent. 100 + * (default) is totally opaque. + * @param boolean $reverse + * Flag to indicate that the 'overlay' actually goes under the image. + * + * @return boolean + * true on success, false otherwise. + */ +function image_gd_overlay(stdClass $image, stdClass $layer, $x, $y, $alpha = 100, $reverse = FALSE) { + // If the given alpha is 100%, we can use imagecopy - which actually works, + // is more efficient, and seems to retain the overlays partial transparency. + // Still does not work great for indexed gifs though? + if ($reverse) { + $upper = &$image; + $lower = &$layer; + } + else { + $upper = &$layer; + $lower = &$image; + } + if ($alpha == 100 && ($upper->info['mime_type'] != 'image/gif')) { + imagealphablending($lower->resource, TRUE); + imagesavealpha($lower->resource, TRUE); + imagealphablending($upper->resource, TRUE); + imagesavealpha($upper->resource, TRUE); + imagecopy($lower->resource, $upper->resource, $x, $y, 0, 0, $upper->info['width'], $upper->info['height']); + imagedestroy($upper->resource); + $image->resource = $lower->resource; + $image->info = $lower->info; + } + else { + // imagecopy() cannot be used and we have to use the slow library. + module_load_include('inc', 'imagecache_actions', 'watermark'); + $watermark = new watermark(); + $result_img = $watermark->create_watermark($lower->resource, $upper->resource, $x, $y, $alpha); + // Watermark creates a new image resource, so clean up both old images. + imagedestroy($lower->resource); + imagedestroy($upper->resource); + $image->resource = $result_img; + $image->info = $lower->info; + } + + return TRUE; +} + +/** + * Imagemagick toolkit specific implementation of the image overlay effect. + * + * An underlay should can be created like: + * -background None -extent 300x250-50-50 under.jpg -compose dst-over -composite + * + * Explanation: + * - first enlarge the canvas, making any new part fully transparent. + * - placing the "original" image on its requested position + * - define the "source" image to IM + * - compose the images placing the original over the source + * + * An overlay can be created like: + * overlay.png -geometry 50x50+100+75 -compose src-over -composite + * + * Explanation: + * - define the overlay image to IM + * - and define its size and position on the current image + * - compose the images placing the original over the source + * + * Please be aware of the limitations of imagemagick libraries out there - the + * versions distributed on hosted servers (if any) are often several years + * behind. Using the latest imagemagick release features will make this function + * unusable in real deployments. + * + * @param stdClass $image + * An image object. + * @param stdClass $layer + * Image object to be placed over or under the $image image. + * @param int $x + * Position of the overlay. + * @param int $y + * Position of the overlay. + * @param int $alpha + * Transparency of the overlay from 0-100. 0 is totally transparent. 100 + * (default) is totally opaque. + * @param boolean $reverse + * Flag to indicate that the 'overlay' actually goes under the image. + * + * @return boolean + * true on success, false otherwise. + */ +function image_imagemagick_overlay(stdClass $image, stdClass $layer, $x = 0, $y = 0, $alpha = 100, $reverse = FALSE) { + $realPath = imagecache_actions_find_file($layer->source); + if (!$realPath) { + return FALSE; + } + + // Reset any gravity settings from earlier effects. + $image->ops[] = '-gravity None'; + + // In imagemagick terms: + // - $image is the destination (the image being constructed) + // - $layer is the source (the source of the current operation) + // Add the layer image to the imagemagick command line. + + // Set the dimensions of the overlay. Use of the scale option means that we + // need to change the dimensions: always set them, they don't harm when the + // scale option is not used. + $sign = $reverse ? -1 : 1; + $geometry = sprintf('%ux%u%+d%+d', $layer->info['width'], $layer->info['height'], $sign * $x, $sign * $y); + + $compose_operator = $reverse ? 'dst-over' : 'src-over'; + + // And compose it with the destination. + if ($alpha == 100) { + // Lay one image over the other. The transparency channel of the upper + // image and/or its dimensions (being smaller than the lower image) will + // determine what remains visible of the lower image). + // + // Note: In explicitly setting a -compose operator we reset/overwrite any + // previously set one (former versions could produce erroneous results + // in combination with other effects before this one). + if ($reverse) { + // Underlay. + $image->ops[] = '-background'; + $image->ops[] = escapeshellarg('rgba(0,0,0,0)'); + $image->ops[] = "-extent $geometry"; + $image->ops[] = escapeshellarg($realPath); + } + else { + $image->ops[] = escapeshellarg($realPath); + $image->ops[] = "-geometry $geometry"; + } + $image->ops[] = "-compose $compose_operator -composite"; + } + else { + // Alpha is not 100, so this image effect turns into a blend operation. + // The alpha determines what percentage of the upper image pixel will be + // taken. From the lower image pixel, 100 - alpha percent will be taken. + // + // Note 1: I'm not sure if and how transparency of one or both images is + // used in or after the blend operation. + // Note 2: As of IM v6.5.3-4 (around june 2009) we can use: + // -compose blend -define compose:args=30[,70] + $image->ops[] = escapeshellarg($realPath); + $image->ops[] = "-geometry $geometry"; + $image->ops[] = "-compose blend -define compose:args=$alpha -composite"; + } + return TRUE; +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/README.txt b/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/README.txt new file mode 100644 index 00000000..358c3a88 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/README.txt @@ -0,0 +1,38 @@ +README for the Image styleds admin Drupal module +------------------------------------------------ + +Project page: https://drupal.org/project/imagecache_actions + +Current and past maintainers for Image styles admin: +- fietserwin (https://drupal.org/user/750928) + + +Release notes for 7.x-1.x-dev +----------------------------- +- Clear the (menu) cache after installing or updating. + + +Introduction +------------ +The Image style admin module extends the administrative interface for image +styles by providing additional features. + +Currently a duplicate, import and export image style feature are implemented. +More features may be added in the future. These features typically allow you to +more easily handle image styles. It allows us to more easily set up +a test/showcase sute of styles. Finally, it allows everybody to test D8 image +module features in real life. + +This module is not a replacement for the features module +(https://drupal.org/project/features). If you are serious about configuration +management and want to distribute styles to other systems, use features. + +Use this module for 1 time export/imports between different sites, "copy & +paste" reuse within a site, and when reporting issues to the imagecache_actions +issue queue. + + +TODO +---- +Solving errors in the core image handling? +- [#1554074]: scale does not work with imagemagick when dimensions are unknown? diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.css b/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.css new file mode 100644 index 00000000..9dfd40be --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.css @@ -0,0 +1,52 @@ +table#image-styles { + table-layout: fixed; +} + +#image-styles th.style-name { + width: 20%; +} + +#image-styles th.effects { + width: 30%; +} + +#image-styles th.settings { + width: 15%; +} + +#image-styles td { + vertical-align: top; +} + +#image-styles .expand.inner { + background: transparent url(/misc/menu-collapsed.png) left 0.6em no-repeat; + margin-left: -12px; + padding-left: 12px; +} + +#image-styles .expanded.expand.inner { + background: transparent url(/misc/menu-expanded.png) left 0.6em no-repeat; +} + +#image-styles .description { + cursor: pointer; +} + +#image-styles .description .inner { + overflow: hidden; /* truncates descriptions if too long */ + text-overflow: ellipsis; + white-space: nowrap; +} + +#image-styles .description .expanded.inner { + overflow: visible; + white-space: normal; +} + +#image-styles .description .expanded .details { + display: block; +} + +#image-styles .description .expanded .separator { + display: none; +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.inc b/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.inc new file mode 100644 index 00000000..85188d80 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.inc @@ -0,0 +1,309 @@ + isset($style['label']) ? $style['label'] : $style['name'], + '%new_name' => isset($duplicate_style['label']) ? $duplicate_style['label'] : $duplicate_style['name']))); + drupal_goto('admin/config/media/image-styles'); +} + +/** + * Duplicates an image style and saves it. + * + * @param array $style + * An image style array. + * @param string|null $new_style_name + * The preferred name for the new style. If left empty, the new name will be + * based on the name of the style to duplicate. In both cases and when + * necessary, the new name will be made unique by adding some suffix to it. + * @param string|null $new_style_label + * The preferred label for the new style. If left empty, the new label will be + * based on the label of the style to duplicate. If that one is also empty, + * no label will be defined for the new style, so Drupal (>=7.23) will create + * one. + * + * @return array + * An image style array with the newly created copy of the given style. + * + * @see image_style_name_validate() + */ +function image_styles_admin_duplicate($style, $new_style_name = NULL, $new_style_label = NULL) { + // Find a unique name for the copy. + // Step 1: Find the base: name without things like '-copy' or '-copy-1' + $style_name_base = empty($new_style_name) ? $style['name'] : $new_style_name; + if (preg_match('/-copy(-\d+)?$/', $style_name_base)) { + $style_name_base = substr($style_name_base, 0, strpos($style_name_base, '-copy')); + } + + // Step 2: Add -copy to it (if the name comes from the current style). + if (empty($new_style_name)) { + $style_name_base .= '-copy'; + } + + // Step 3: Ensure the new name will be unique. + $i = 0; + $style_name = $style_name_base; + $styles = image_styles(); + while (isset($styles[$style_name])) { + $i++; + $style_name = $style_name_base . '-' . $i; + } + $style['name'] = $style_name; + + // Step 4: Find a new label for the copy. + if (isset($new_style_label) || isset($style['label'])) { + $style_label = empty($new_style_label) ? $style['label'] : $new_style_label; + $copy = t('copy'); + if (preg_match("/ $copy( \d+)?$/", $style_label)) { + $style_label = substr($style_label, 0, strpos($style_label, " $copy")); + } + + // Step 4a: Add " copy" to it (if the name comes from the current style). + if (empty($new_style_label)) { + $style_label .= " $copy"; + } + + // Step 4b: Make "unique" (based on the number added to the name) + if ($i > 0) { + $style['label'] .= " $i"; + } + } + + // Unset isid to save it as a new style. + unset($style['isid']); + $style = image_style_save($style); + + // Save copies of each effect with the new image style ID (isid). + foreach ($style['effects'] as &$effect) { + // Unset ieid to save it as a new effect. + unset($effect['ieid']); + $effect['isid'] = $style['isid']; + $effect = image_effect_save($effect); + } + + return $style; +} + +/** + * drupal_get_form callback: form to export an image style. + * + * @param array $form + * @param array $form_state + * @param array $style + * An image style array. + * + * @return array + */ +function image_styles_admin_export_form($form, $form_state, $style) { + drupal_set_title(format_string('%page_name @style_name', + array('%page_name' => t('Export image style'), '@style_name' => isset($style['label']) ? $style['label'] : $style['name'])), + PASS_THROUGH); + $form['serialized_style'] = array( + '#type' => 'textarea', + '#rows' => 5, + '#title' => t('Image style export data'), + '#default_value' => image_styles_admin_export_serialize($style), + '#attributes' => array('readonly' =>'readonly'), + '#description' => t('Copy the contents of this field to the clipboard and, on another site, paste it in the textarea of an %page_title page.', + array('%page_title' => t('Import image style'))), + ); + return $form; +} + +/** +* drupal_get_form callback: form to import an image style. +*/ +function image_styles_admin_import_form($form/*, $form_state*/) { + $form['serialized_style'] = array( + '#type' => 'textarea', + '#rows' => 5, + '#title' => t('Image style import data'), + '#default_value' => '', + '#required' => TRUE, + '#description' => t('Paste the contents of the textarea of an %page_title page into this field.', array('%page_title' => t('Export image style'))), + ); + + $form['actions'] = array('#type' => 'actions'); + $form['actions']['submit'] = array( + '#type' => 'submit', + '#value' => t('Import'), + ); + + return $form; +} + +/** + * Callback to validate the import style form. + */ +function image_styles_admin_import_form_validate($form, &$form_state) { + $import = image_styles_admin_unify_newlines($form_state['values']['serialized_style']); + if (image_styles_admin_import_extract_style($import) === FALSE) { + form_set_error('serialized_style', t('The %field cannot be imported as an image style.', array('%field' => t('Image style import data')))); + } +} + +/** + * Callback to process form submission of the import style form. + */ +function image_styles_admin_import_form_submit($form, &$form_state) { + $import = image_styles_admin_unify_newlines($form_state['values']['serialized_style']); + $style = image_styles_admin_import_extract_style($import); + // Import the style by "duplicating" it, but prevent adding the -copy suffix + // by passing the requested name and label as 2nd and 3rd parameter. + $new_style = image_styles_admin_duplicate($style, $style['name'], isset($style['label']) ? $style['label'] : NULL); + if ($new_style['name'] === $style['name']) { + drupal_set_message(t('Style %name has been imported.', array('%name' => $style['name']))); + } + else { + drupal_set_message(t('Style %name has been imported as %new_name.', array( + '%name' => isset($style['label']) ? $style['label'] : $style['name'], + '%new_name' => isset($new_style['label']) ? $new_style['label'] : $new_style['name']))); + } + drupal_goto('admin/config/media/image-styles'); +} + +/** + * Serializes image style data so it can be exported. + * + * @param array $style + * An image style array. + * + * @return string + * The serialized image style. Keys that are not needed for import are not + * serialized. + */ +function image_styles_admin_export_serialize($style) { + $style = array_intersect_key($style, array('name' => 0, 'label' => 0, 'effects' => 0)); + foreach ($style['effects'] as &$effect) { + $effect = array_intersect_key($effect, array('weight' => 0, 'name' => 0, 'data' => 0)); + } + + array_walk_recursive($style, function(&$value) { + if (is_string($value)) { + $value = image_styles_admin_unify_newlines($value); + } + }); + return serialize($style); +} + +/** + * Unifies newlines in the string to the Unix newline standard. + * + * #2636314: textareas may convert newlines to the underlying OS style: convert + * all new lines to Unix style before unserializing. As string length is in the + * serialized data, we must ensure that we also do this on each array value + * before serializing. + * + * @param string $str + * + * @return string + */ +function image_styles_admin_unify_newlines($str) { + $str = str_replace("\r\n", "\n", $str); + $str = str_replace("\r", "\n", $str); + return $str; +} + +/** + * Unserializes and validates a string into image style data. + * + * @param string $import + * The string representation of a @see serialize()'d image style array. + * + * @return array|false + * An image style array or false if the string could not be unserialized into + * image style data. + */ +function image_styles_admin_import_extract_style($import) { + $style = unserialize($import); + + // Check if the contents of the textarea could be unserialized into an array. + if (!is_array($style)) { + return FALSE; + } + + // Filter out keys that we do not process. + $style = array_intersect_key($style, array('name' => 0, 'label' => 0, 'effects' => 0)); + + // 'name' is required and must be "machine name" string. + if (!isset($style['name']) || !is_string($style['name']) || preg_match('/[0-9a-z_\-]+/', $style['name']) !== 1) { + return FALSE; + } + + // Optional 'label' must be a string. + if (isset($style['label']) && !is_string($style['label'])) { + return FALSE; + } + + // 'effects' is required and must be an array. + if (!isset($style['effects']) || !is_array($style['effects'])) { + return FALSE; + } + + // Check effects elements + foreach ($style['effects'] as &$effect) { + // an effect must be an array. + if (!is_array($effect)) { + return FALSE; + } + // Check if the required keys are available, we will ignore the other. + $effect = array_intersect_key($effect, array('weight' => 0, 'name' => 0, 'data' => 0)); + if (count($effect) !== 3) { + return FALSE; + } + // effect weight must be an integer (data type in table is int, not float). + if (!is_int($effect['weight']) && $effect['weight'] !== (string) (int) $effect['weight']) { + return FALSE; + } + // effect name must be a string + if (!is_string($effect['name'])) { + return FALSE; + } + // Check whether the effect data is an array. + if (!is_array($effect['data'])) { + return FALSE; + } + } + + // @todo: are there any security implications for creating styles like this? + // - Unserialize() is save in itself: it only creates data (except possibly + // for__wakeup(), but that can only be in already existing code: safe + // - Not expected array entries are removed (array_intersect_key): safe + // - Basic types are checked: safe + // - Effect data array is not checked. Possibly unsafe?! The effect data array + // contains the effect parameters. Normally these are entered and validated + // via a form and subsequently saved in the database (serialized as here). + // The form validation is not executed on import and thus the data may + // contain invalid values. This is acceptable as it can also be done by + // operating directly on the database. In Drupal this is not normally + // checked for during processing: error messages will make clear that the + // data has been played with. Can incorrect data be abused? It may contain: + // - incorrect types: we do not know the data structure of the various + // effects, so we cannot check that and have to accept it as it comes. + // Effects should check_plain in summary theme and convert to int/float + // whenever possible before using it in commands. + // - PHP code, but that may be valid content for the text or custom effects: + // Effects should check_plain in summary theme and convert to int/float + // whenever possible before using it in commands. + // @todo: if the style contains an effect that contains PHP code, the user + // should need the 'use PHP for settings' permission. + // - HTML and or JS code: when used as parameter, this normally won't hurt. + // When showing on the screen (summary theme), proper escaping should + // suffice and is needed anyway: responsibility of effect. + return $style; +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.info b/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.info new file mode 100644 index 00000000..8a995677 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.info @@ -0,0 +1,13 @@ +name = Image styles admin +description = Provides additional administrative functionality to duplicate, export or import image styles. +package = Media +core = 7.x + +dependencies[] = image + +; Information added by Drupal.org packaging script on 2016-02-19 +version = "7.x-1.7" +core = "7.x" +project = "imagecache_actions" +datestamp = "1455872655" + diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.js b/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.js new file mode 100644 index 00000000..4af76743 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.js @@ -0,0 +1,19 @@ +(function($) { +"use strict"; + +Drupal.behaviors.imageStylesAdmin = { + attach: function(context) { + $('#image-styles').find('th.expand-all').once('expand-all', function() { + $(this).click(function() { + $('#image-styles').find('td.description .inner.expand').addClass('expanded'); + }); + }); + $('#image-styles').find('td.description').once('description', function() { + $('.inner.expand', $(this)).click(function() { + $(this).toggleClass('expanded'); + }); + }); + } +}; + +})(jQuery); diff --git a/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.module b/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.module new file mode 100644 index 00000000..21369ead --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/image_styles_admin/image_styles_admin.module @@ -0,0 +1,156 @@ + 'Duplicate style', + 'description' => 'Make a copy of an image style.', + 'page callback' => 'image_styles_admin_duplicate_page_callback', + 'page arguments' => array(5), + 'access arguments' => array('administer image styles'), + 'file' => 'image_styles_admin.inc', + ); + $items['admin/config/media/image-styles/export/%image_style'] = array( + 'title' => 'Export style', + 'description' => 'Export an image style.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('image_styles_admin_export_form', 5), + 'access arguments' => array('administer image styles'), + 'file' => 'image_styles_admin.inc', + ); + $items['admin/config/media/image-styles/import'] = array( + 'title' => 'Import style', + 'description' => 'Import an image style.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('image_styles_admin_import_form'), + 'access arguments' => array('administer image styles'), + 'type' => MENU_LOCAL_ACTION, + 'weight' => 3, + 'file' => 'image_styles_admin.inc', + ); + return $items; +} + +/** + * Implements hook_preprocess_HOOK for theme image_style_list. + */ +function image_styles_admin_preprocess_image_style_list(&$variables) { + // Tell imagecache_actions_preprocess_table to preprocess the next call to + // theme_table() + $image_styles = array_values($variables['styles']); + image_styles_admin_preprocess_table($image_styles); + + // Add CSS and JS files. + drupal_add_css(drupal_get_path('module', 'image_styles_admin') . '/image_styles_admin.css'); + if (base_path() !== '/') { + $base_path = base_path(); + drupal_add_css(" + #image-styles .expand.inner { background-image: url($base_path/misc/menu-collapsed.png) } + #image-styles .expanded.expand.inner { background-image: url($base_path/misc/menu-expanded.png) }", + array('type' => 'inline')); + } + drupal_add_js(drupal_get_path('module', 'image_styles_admin') . '/image_styles_admin.js'); + +} + +/** + * Implements hook_preprocess_HOOK for theme table. + */ +function image_styles_admin_preprocess_table(&$variables) { + static $image_styles = NULL; + + // If called from image_styles_admin_preprocess_image_style_list(), the + // parameter will be a sequential array. + if (key($variables) === 0) { + $image_styles = $variables; + } + else if (!empty($image_styles)) { + // Normal preprocess hook call: we only process if theme('table', ...) has + // been called via theme_image_style_list() and we have a non empty list of + // styles; + + // Set an ID on the table so it can be targeted by our CSS. + $variables['attributes']['id'] = 'image-styles'; + + // Add a class to the Style name and Settings columns for styling. + foreach ($variables['header'] as &$cell) { + $temp_cell = is_string($cell) ? array('data' => $cell) : $cell; + $class_names = array( + 'style-name' => t('Style name'), + 'settings' => t('Settings'), + ); + foreach ($class_names as $class => $name) { + if ($temp_cell['data'] == $name) { + $temp_cell['class'][] = $class; + $cell = $temp_cell; + } + } + } + + // Add the effects column header. + array_splice($variables['header'], 1, 0, array(array( + 'data' => t('Effects') . ' ', + 'class' => array('effects expand-all') + ))); + + // Add a column with a summary of all effects to each row. + foreach ($variables['rows'] as $i => &$row) { + $style = $image_styles[$i]; + $effects_list = array(); + foreach ($style['effects'] as $key => $effect) { + $definition = image_effect_definition_load($effect['name']); + $effect = array_merge($definition, $effect); + $style['effects'][$key] = $effect; + $effect_details = isset($effect['summary theme']) ? theme($effect['summary theme'], array('data' => $effect['data'])) : ''; + $effects_list[] = '' . $effect['label'] . ' ' . $effect_details . ''; + } + // Add the effects summary column to the row. + $effects_summary = array( + 'data' => '', + 'class' => 'description' + ); + array_splice($row, 1, 0, array($effects_summary)); + } + + // Find the column with the edit link in it. + $i = 0; + $first_row = reset($variables['rows']); + foreach ($first_row as $i => &$cell) { + $cell_data = is_array($cell) ? $cell['data'] : $cell; + if (strpos($cell_data, '>' . t('edit') . '<') !== FALSE) { + break; + } + } + + // Increase the colspan for the column with the edit link to include the + // duplicate and export links as well. This *should* be 2, but Drupal core + // specifies 1 more than should be there. + $variables['header'][$i]['colspan'] += 1; + + // Add the 2 links to each row by duplicating the edit link and then + // changing the text and the link. + $edit_column = $i; + foreach ($variables['rows'] as &$row) { + $i = $edit_column; + // Duplicate the edit link twice. + array_splice($row, $i + 1, 0, array($row[$i], $row[$i])); + // Replace edit with duplicate in text and href + $i++; + $row[$i] = str_replace('>' . t('edit') . '<', '>' . t('duplicate') . '<', $row[$i]); + $row[$i] = preg_replace('#/admin/config/media/image-styles/edit/#', '/admin/config/media/image-styles/duplicate/', $row[$i]); + // Replace edit with export in text and href + $i++; + $row[$i] = str_replace('>' . t('edit') . '<', '>' . t('export') . '<', $row[$i]); + $row[$i] = preg_replace('#/admin/config/media/image-styles/edit/#', '/admin/config/media/image-styles/export/', $row[$i]); + } + + // Don't preprocess subsequent calls to theme_table(). + $image_styles = NULL; + } +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/imagecache_actions.info b/sites/all/modules/contrib/files/imagecache_actions/imagecache_actions.info new file mode 100644 index 00000000..2dd92126 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/imagecache_actions.info @@ -0,0 +1,13 @@ +name = Imagecache Actions +description = Provides utility code for a number of additional image effects that can be found in the sub modules. +package = Media +core = 7.x + +dependencies[] = image + +; Information added by Drupal.org packaging script on 2016-02-19 +version = "7.x-1.7" +core = "7.x" +project = "imagecache_actions" +datestamp = "1455872655" + diff --git a/sites/all/modules/contrib/files/imagecache_actions/imagecache_actions.install b/sites/all/modules/contrib/files/imagecache_actions/imagecache_actions.install new file mode 100644 index 00000000..bad1be72 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/imagecache_actions.install @@ -0,0 +1,16 @@ + l('System Stream Wrapper', 'https://drupal.org/project/system_stream_wrapper', array('external' => TRUE)))), 'warning'); +} + +/** + * Clear image styles cache. + */ +function imagecache_actions_update_7002(&$sandbox) { + // We need to clear this cache as many effect callbacks have been renamed. + cache_clear_all('image_styles', 'cache'); +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/imagecache_actions.jquery.js b/sites/all/modules/contrib/files/imagecache_actions/imagecache_actions.jquery.js new file mode 100644 index 00000000..265fb722 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/imagecache_actions.jquery.js @@ -0,0 +1,12 @@ +/* + * UI enhancements for the imagecache edit form + */ +(function($){ + + /** + * None here at the moment :-) + * Conditional form logic was moved to drupal FAPI #states instead. + */ + +})(jQuery); + diff --git a/sites/all/modules/contrib/files/imagecache_actions/imagecache_actions.module b/sites/all/modules/contrib/files/imagecache_actions/imagecache_actions.module new file mode 100644 index 00000000..093ae3be --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/imagecache_actions.module @@ -0,0 +1,17 @@ + array( + 'file' => 'utility-color.inc', + 'variables' => array('rgb' => NULL), + ), + ); +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/imagefilter.inc b/sites/all/modules/contrib/files/imagecache_actions/imagefilter.inc new file mode 100644 index 00000000..f883c5d5 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/imagefilter.inc @@ -0,0 +1,292 @@ +> 16) & 0xFF); + $g = 255 - (($rgb >> 8) & 0xFF); + $b = 255 - ($rgb & 0xFF); + $a = $rgb >> 24; + $new_pxl = imagecolorallocatealpha($image, $r, $g, $b, $a); + if ($new_pxl == FALSE) { + $new_pxl = imagecolorclosestalpha($image, $r, $g, $b, $a); + } + imagesetpixel($image, $x, $y, $new_pxl); + ++$x; + } + ++$y; + } + return TRUE; + + case 1: + $y = 0; + while ($y < $max_y) { + $x = 0; + while ($x < $max_x) { + $rgb = imagecolorat($image, $x, $y); + $a = $rgb >> 24; + $r = ((($rgb >> 16) & 0xFF) * 0.299) + ((($rgb >> 8) & 0xFF) * 0.587) + (($rgb & 0xFF) * 0.114); + $new_pxl = imagecolorallocatealpha($image, $r, $r, $r, $a); + if ($new_pxl == FALSE) { + $new_pxl = imagecolorclosestalpha($image, $r, $r, $r, $a); + } + imagesetpixel($image, $x, $y, $new_pxl); + ++$x; + } + ++$y; + } + return TRUE; + + case 2: + $y = 0; + while ($y < $max_y) { + $x = 0; + while ($x < $max_x) { + $rgb = imagecolorat($image, $x, $y); + $r = (($rgb >> 16) & 0xFF) + $arg1; + $g = (($rgb >> 8) & 0xFF) + $arg1; + $b = ($rgb & 0xFF) + $arg1; + $a = $rgb >> 24; + $r = ($r > 255) ? 255 : (($r < 0) ? 0 : $r); + $g = ($g > 255) ? 255 : (($g < 0) ? 0 : $g); + $b = ($b > 255) ? 255 : (($b < 0) ? 0 : $b); + $new_pxl = imagecolorallocatealpha($image, $r, $g, $b, $a); + if ($new_pxl == FALSE) { + $new_pxl = imagecolorclosestalpha($image, $r, $g, $b, $a); + } + imagesetpixel($image, $x, $y, $new_pxl); + ++$x; + } + ++$y; + } + return TRUE; + + case 3: + $contrast = pow((100 - $arg1) / 100, 2); + $y = 0; + while ($y < $max_y) { + $x = 0; + while ($x < $max_x) { + $rgb = imagecolorat($image, $x, $y); + $a = $rgb >> 24; + $r = (((((($rgb >> 16) & 0xFF) / 255) - 0.5) * $contrast) + 0.5) * 255; + $g = (((((($rgb >> 8) & 0xFF) / 255) - 0.5) * $contrast) + 0.5) * 255; + $b = ((((($rgb & 0xFF) / 255) - 0.5) * $contrast) + 0.5) * 255; + $r = ($r > 255) ? 255 : (($r < 0) ? 0 : $r); + $g = ($g > 255) ? 255 : (($g < 0) ? 0 : $g); + $b = ($b > 255) ? 255 : (($b < 0) ? 0 : $b); + $new_pxl = imagecolorallocatealpha($image, $r, $g, $b, $a); + if ($new_pxl == FALSE) { + $new_pxl = imagecolorclosestalpha($image, $r, $g, $b, $a); + } + imagesetpixel($image, $x, $y, $new_pxl); + ++$x; + } + ++$y; + } + return TRUE; + + case 4: + $x = 0; + while ($x < $max_x) { + $y = 0; + while ($y < $max_y) { + $rgb = imagecolorat($image, $x, $y); + $r = (($rgb >> 16) & 0xFF) + $arg1; + $g = (($rgb >> 8) & 0xFF) + $arg2; + $b = ($rgb & 0xFF) + $arg3; + $a = $rgb >> 24; + $r = ($r > 255) ? 255 : (($r < 0) ? 0 : $r); + $g = ($g > 255) ? 255 : (($g < 0) ? 0 : $g); + $b = ($b > 255) ? 255 : (($b < 0) ? 0 : $b); + $new_pxl = imagecolorallocatealpha($image, $r, $g, $b, $a); + if ($new_pxl == FALSE) { + $new_pxl = imagecolorclosestalpha($image, $r, $g, $b, $a); + } + imagesetpixel($image, $x, $y, $new_pxl); + ++$y; + } + ++$x; + } + return TRUE; + + case 5: + return imageconvolution($image, array( + array(-1, 0, -1), + array(0, 4, 0), + array(-1, 0, -1), + ), 1, 127); + + case 6: + return imageconvolution($image, array( + array(1.5, 0, 0), + array(0, 0, 0), + array(0, 0, -1.5), + ), 1, 127); + + case 7: + return imageconvolution($image, array( + array(1, 2, 1), + array(2, 4, 2), + array(1, 2, 1), + ), 16, 0); + + case 8: + for ($y = 0; $y < $max_y; $y++) { + for ($x = 0; $x < $max_x; $x++) { + $flt_r_sum = $flt_g_sum = $flt_b_sum = 0; + $cpxl = imagecolorat($image, $x, $y); + for ($j = 0; $j < 3; $j++) { + for ($i = 0; $i < 3; $i++) { + if (($j == 1) && ($i == 1)) { + $flt_r[1][1] = $flt_g[1][1] = $flt_b[1][1] = 0.5; + } + else { + $pxl = imagecolorat($image, $x - (3 >> 1) + $i, $y - (3 >> 1) + $j); + + $new_a = $pxl >> 24; + // $r = (($pxl >> 16) & 0xFF); + // $g = (($pxl >> 8) & 0xFF); + // $b = ($pxl & 0xFF); + $new_r = abs((($cpxl >> 16) & 0xFF) - (($pxl >> 16) & 0xFF)); + if ($new_r != 0) { + $flt_r[$j][$i] = 1 / $new_r; + } + else { + $flt_r[$j][$i] = 1; + } + + $new_g = abs((($cpxl >> 8) & 0xFF) - (($pxl >> 8) & 0xFF)); + if ($new_g != 0) { + $flt_g[$j][$i] = 1 / $new_g; + } + else { + $flt_g[$j][$i] = 1; + } + + $new_b = abs(($cpxl & 0xFF) - ($pxl & 0xFF)); + if ($new_b != 0) { + $flt_b[$j][$i] = 1 / $new_b; + } + else { + $flt_b[$j][$i] = 1; + } + } + + $flt_r_sum += $flt_r[$j][$i]; + $flt_g_sum += $flt_g[$j][$i]; + $flt_b_sum += $flt_b[$j][$i]; + } + } + + for ($j = 0; $j < 3; $j++) { + for ($i = 0; $i < 3; $i++) { + if ($flt_r_sum != 0) { + $flt_r[$j][$i] /= $flt_r_sum; + } + if ($flt_g_sum != 0) { + $flt_g[$j][$i] /= $flt_g_sum; + } + if ($flt_b_sum != 0) { + $flt_b[$j][$i] /= $flt_b_sum; + } + } + } + + $new_r = $new_g = $new_b = 0; + + for ($j = 0; $j < 3; $j++) { + for ($i = 0; $i < 3; $i++) { + $pxl = imagecolorat($image, $x - (3 >> 1) + $i, $y - (3 >> 1) + $j); + $new_r += (($pxl >> 16) & 0xFF) * $flt_r[$j][$i]; + $new_g += (($pxl >> 8) & 0xFF) * $flt_g[$j][$i]; + $new_b += ($pxl & 0xFF) * $flt_b[$j][$i]; + } + } + + $new_r = ($new_r > 255) ? 255 : (($new_r < 0) ? 0 : $new_r); + $new_g = ($new_g > 255) ? 255 : (($new_g < 0) ? 0 : $new_g); + $new_b = ($new_b > 255) ? 255 : (($new_b < 0) ? 0 : $new_b); + $new_pxl = imagecolorallocatealpha($image, (int) $new_r, (int) $new_g, (int) $new_b, $new_a); + if ($new_pxl == FALSE) { + $new_pxl = imagecolorclosestalpha($image, (int) $new_r, (int) $new_g, (int) $new_b, $new_a); + } + imagesetpixel($image, $x, $y, $new_pxl); + } + } + return TRUE; + + case 9: + return imageconvolution($image, array( + array(-1, -1, -1), + array(-1, 9, -1), + array(-1, -1, -1), + ), 1, 0); + + case 10: + return imageconvolution($image, array( + array(1, 1, 1), + array(1, $arg1, 1), + array(1, 1, 1), + ), $arg1 + 8, 0); + + case 11: + default: + watchdog('imagecache_actions', 'Image filter failed: unknown filter type: %filtertype', + array('%filtertype' => $filtertype), + WATCHDOG_ERROR); + return FALSE; + } + } +} diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/150x300.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/150x300.jpg new file mode 100644 index 00000000..b209b907 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/150x300.jpg differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/200x300.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/200x300.jpg new file mode 100644 index 00000000..0f86a620 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/200x300.jpg differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/250x250.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/250x250.jpg new file mode 100644 index 00000000..f90447f4 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/250x250.jpg differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/250x300.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/250x300.jpg new file mode 100644 index 00000000..0140ad2a Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/250x300.jpg differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/300x150.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/300x150.jpg new file mode 100644 index 00000000..d1e5aa4b Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/300x150.jpg differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/300x200.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/300x200.jpg new file mode 100644 index 00000000..3bef6d1f Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/300x200.jpg differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/300x250.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/300x250.jpg new file mode 100644 index 00000000..f4839df7 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/300x250.jpg differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/README.txt b/sites/all/modules/contrib/files/imagecache_actions/tests/README.txt new file mode 100644 index 00000000..853951a3 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/tests/README.txt @@ -0,0 +1,9 @@ +This module provides an overview of all the imagecache presets in use on this +site, as well as a number of samples used to test if everything is working as +expected. + +Sample images are provided to illustrate a number of the sample presets. +Each image shown should match the one next to it. +Where they don't match illustrates a current weakness in the system or the code +coverage. + diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/background-2.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/background-2.jpg new file mode 100644 index 00000000..4697a01c Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/background-2.jpg differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/black-ribbon.gif b/sites/all/modules/contrib/files/imagecache_actions/tests/black-ribbon.gif new file mode 100644 index 00000000..61510c3f Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/black-ribbon.gif differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/corner-bl.png b/sites/all/modules/contrib/files/imagecache_actions/tests/corner-bl.png new file mode 100644 index 00000000..7c6e0cee Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/corner-bl.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/corner-br.png b/sites/all/modules/contrib/files/imagecache_actions/tests/corner-br.png new file mode 100644 index 00000000..d2280da2 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/corner-br.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/corner-tl.png b/sites/all/modules/contrib/files/imagecache_actions/tests/corner-tl.png new file mode 100644 index 00000000..1b3ef5db Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/corner-tl.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/corner-tr.png b/sites/all/modules/contrib/files/imagecache_actions/tests/corner-tr.png new file mode 100644 index 00000000..17399a90 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/corner-tr.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/corners_combo.imagecache_preset.inc b/sites/all/modules/contrib/files/imagecache_actions/tests/corners_combo.imagecache_preset.inc new file mode 100644 index 00000000..e0018b98 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/tests/corners_combo.imagecache_preset.inc @@ -0,0 +1,139 @@ + 'corners_combo', + '#weight' => 9, + 'effects' => array ( + 0 => array ( + 'weight' => '-10', + 'module' => 'imagecache_canvasactions', + 'name' => 'canvasactions_definecanvas', + 'data' => array ( + 'RGB' => array ( + 'HEX' => 'e5e8a1', + ), + 'under' => 1, + 'exact' => array ( + 'width' => '', + 'height' => '', + 'xpos' => 'center', + 'ypos' => 'center', + ), + 'relative' => array ( + 'leftdiff' => '4', + 'rightdiff' => '4', + 'topdiff' => '4', + 'bottomdiff' => '4', + ), + ), + ), + 1 => array ( + 'weight' => '-9', + 'module' => 'imagecache_canvasactions', + 'name' => 'canvasactions_definecanvas', + 'data' => array ( + 'RGB' => array ( + 'HEX' => '', + ), + 'under' => 1, + 'exact' => array ( + 'width' => '', + 'height' => '', + 'xpos' => 'center', + 'ypos' => 'center', + ), + 'relative' => array ( + 'leftdiff' => '4', + 'rightdiff' => '4', + 'topdiff' => '4', + 'bottomdiff' => '4', + ), + ), + ), + 2 => array ( + 'weight' => '-8', + 'module' => 'imagecache_canvasactions', + 'name' => 'canvasactions_file2canvas', + 'data' => array ( + 'xpos' => 'left', + 'ypos' => 'top', + 'alpha' => '100', + 'path' => "$filepath/corner-tl.png", + ), + ), + 3 => array ( + 'weight' => '-7', + 'module' => 'imagecache_canvasactions', + 'name' => 'canvasactions_file2canvas', + 'data' => array ( + 'xpos' => 'right', + 'ypos' => 'top', + 'alpha' => '100', + 'path' => "$filepath/corner-tr.png", + ), + ), + 4 => + array ( + 'weight' => '-6', + 'module' => 'imagecache_canvasactions', + 'name' => 'canvasactions_file2canvas', + 'data' => array ( + 'xpos' => 'left', + 'ypos' => 'bottom', + 'alpha' => '100', + 'path' => "$filepath/corner-bl.png", + ), + ), + 5 => array ( + 'weight' => '-5', + 'module' => 'imagecache_canvasactions', + 'name' => 'canvasactions_file2canvas', + 'data' => array ( + 'xpos' => 'right', + 'ypos' => 'bottom', + 'alpha' => '100', + 'path' => "$filepath/corner-br.png", + ), + ), + 6 => array ( + 'weight' => '-4', + 'module' => 'image', + 'name' => 'image_rotate', + 'data' => array ( + 'degrees' => '7', + 'random' => 0, + 'bgcolor' => '', + ), + ), + 7 => array ( + 'weight' => '-3', + 'module' => 'image', + 'name' => 'image_scale', + 'data' => array ( + 'width' => '300', + 'height' => '', + 'upscale' => 0, + ), + ), + 8 => array ( + 'weight' => '-2', + 'module' => 'imagecache_canvasactions', + 'name' => 'canvasactions_canvas2file', + 'data' => array ( + 'xpos' => '', + 'ypos' => '', + 'alpha' => '100', + 'path' => "$filepath/background-2.jpg", + 'dimensions' => 'original', + ), + ), + ), +); \ No newline at end of file diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/corners_combo.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/corners_combo.jpg new file mode 100644 index 00000000..ab173bb6 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/corners_combo.jpg differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/default.imagecache_preset.inc b/sites/all/modules/contrib/files/imagecache_actions/tests/default.imagecache_preset.inc new file mode 100644 index 00000000..4ccc0986 --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/tests/default.imagecache_preset.inc @@ -0,0 +1,15 @@ + 'default', + '#weight' => -1, + 'effects' => array(), +); \ No newline at end of file diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/default.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/default.jpg new file mode 100644 index 00000000..df4faf3a Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/default.jpg differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/grid-240x160.png b/sites/all/modules/contrib/files/imagecache_actions/tests/grid-240x160.png new file mode 100644 index 00000000..4d921739 Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/grid-240x160.png differ diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/imagecache_testsuite.features.inc b/sites/all/modules/contrib/files/imagecache_actions/tests/imagecache_testsuite.features.inc new file mode 100644 index 00000000..50af056f --- /dev/null +++ b/sites/all/modules/contrib/files/imagecache_actions/tests/imagecache_testsuite.features.inc @@ -0,0 +1,11 @@ + Configuration > Media > + * Image Styles (admin/config/media/image-styles/testsuite) that displays + * results for all existing image styles for all toolkits as well as for a set + * of test image styles defined in the various modules. + */ + +include_once('imagecache_testsuite.features.inc'); + +/** + * Implementation of hook_menu(). + */ +function imagecache_testsuite_menu() { + $items = array(); + $items['admin/config/media/image-styles/testsuite'] = array( + 'title' => 'Test Suite', + 'page callback' => 'imagecache_testsuite_page', + 'access arguments' => array('administer image styles'), + 'type' => MENU_LOCAL_TASK, + 'weight' => 10, + ); + $items['admin/config/media/image-styles/testsuite/%/%'] = array( + 'title' => 'Test Suite Image', + 'page callback' => 'imagecache_testsuite_generate', + 'page arguments' => array(5, 6), + 'access arguments' => array('administer image styles'), + 'type' => MENU_CALLBACK, + ); + $items['admin/config/media/image-styles/testsuite/positioning_test'] = array( + 'title' => 'Positioning Test', + 'page callback' => 'imagecache_testsuite_positioning', + 'access arguments' => array('administer image styles'), + 'type' => MENU_LOCAL_TASK, + ); + return $items; +} + +/** + * Implementation of hook_help() + */ +function imagecache_testsuite_help($path /*, $arg*/) { + switch ($path) { + // @todo: this path does not exist anymore. + case 'admin/build/imagecache/test' : + $output = file_get_contents(drupal_get_path('module', 'imagecache_testsuite') . "/README.txt"); + return _filter_autop($output); + break; + case 'admin/config/media/image-styles/testsuite' : + return t("+ This page displays a number of examples of image effects. + Illustrated are both the expected result and the actual result. +
+ This page is just for debugging to confirm that this behavior doesn't + change as the code gets updated. + If the two illustrations do not match, there is probably something + that needs fixing. +
+ More actions are provided by each of the imagecache actions submodules + and will be shown as you enable them. +
"); + break; + case 'admin/config/media/image-styles' : + return t(' + A number of styles here are provided by the Imagecache + Testsuite module as examples. + Disable this module to make them go away. + '); + break; + } + return ''; +} + +/** + * Returns the test suite page. + * + * The test suite page contians img links to all image derivatives to create as + * part of the test suite. + * + * Samples to test are scanned from: + * - The existing image styles. + * - The file features.inc attached to this module. (@todo: no longer eisting?) + * - Individual *.imagecache_preset.inc files found near any known modules. + * Images illustrating the named preset are looked for also. + * + * Flushes the entire test cache every time anything is done. + * + * @return string + * The html for the page. + */ +function imagecache_testsuite_page() { + module_load_include('inc', 'image', 'image.admin'); + module_load_include('inc', 'image', 'image.effects'); + + $tests = array_merge(image_styles(), imagecache_testsuite_get_tests()); + $toolkits = image_get_available_toolkits(); + + // Present the all-in-one overview page. + $sample_folders = imagecache_testsuite_get_folders(); + + // Draw the admin table. + $test_table = array(); + foreach ($tests as $style_name => $style) { + // Firstly, remove any previous images for the current style + image_style_flush($style); + + $row = array(); + $row_class = 'test'; + $details_list = array(); + + // Render the details. + foreach ($style['effects'] as $effect) { + if (!isset($effect['name'])) { + // badness + watchdog('imagecache_testsuite', 'invalid testcase within %style_name. No effect name', array('%style_name' => $style_name), WATCHDOG_ERROR); + $details_list[] = '" . implode($details_list) . "
"; + + // Look for a sample image. May also be defined by the definition itself, + // but normally assume a file named after the image style, in (one of the) + // directories with test styles. + foreach ($sample_folders as $sample_folder) { + if (file_exists("{$sample_folder}/{$style_name}.png")) { + $style['sample'] = "{$sample_folder}/{$style_name}.png"; + } + elseif (file_exists("{$sample_folder}/{$style_name}.jpg")) { + $style['sample'] = "{$sample_folder}/{$style_name}.jpg"; + } + } + + if (isset($style['sample']) && file_exists($style['sample'])) { + $sample_img = theme('image', array('path' => $style['sample'])); + // I was having trouble with permissions on an OSX dev machine. + if (!is_readable($style['sample'])) { + $sample_img = "FILE UNREADABLE: {$style['sample']}"; + } + } + else { + $sample_img = "[no sample]"; + } + $row['sample'] = $sample_img; + + // Generate a result for each available toolkit. + foreach ($toolkits as $toolkit => $toolkit_info) { + $test_url = "admin/config/media/image-styles/testsuite/$style_name/$toolkit"; + $test_img = theme('image', array( + 'path' => $test_url, + 'alt' => "$style_name/$toolkit" + )); + $row[$toolkit] = l($test_img, $test_url, array('html' => TRUE)); + } + $test_table[$style_name] = array( + 'data' => $row, + 'class' => array($row_class) + ); + } + + $header = array_merge(array('test', 'sample'), array_keys($toolkits)); + $output = theme('table', array( + 'header' => $header, + 'rows' => $test_table, + 'id' => 'imagecache-testsuite' + )); + + // @todo: zebra striping can be disabled in D7. + // Default system zebra-striping fails to show my transparency on white. + drupal_add_html_head(''); + + return $output; +} + +/** + * Returns the requested image derivative. + * + * If the image derivative generation is successful, the function does not + * return but exits processing using drupal_exit(). + * + * Flushes the entire test cache every time anything is done. + * + * @param string $test_id + * The id of the test to generate the derivative for. + * @param string $toolkit + * The toolkit to use, or empty for the default toolkit + * + * @return string|bool + * - The html for the page ($test_id is empty) + * - False when the image derivative could not be created. + */ +function imagecache_testsuite_generate($test_id = '', $toolkit = '') { + module_load_include('inc', 'image', 'image.admin'); + module_load_include('inc', 'image', 'image.effects'); + + if (empty($toolkit)) { + $toolkit = image_get_toolkit(); + } + else { + // Set the toolkit for this invocation only, so do not use variable_set. + global $conf; + $conf['image_toolkit'] = $toolkit; + if ($toolkit === 'gd') { + // This seems not to be done automatically elsewhere. + include_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'system') . '/' . 'image.gd.inc'; + } + } + + $target = 'module://imagecache_testsuite/sample.jpg'; + $tests = array_merge(image_styles(), imagecache_testsuite_get_tests()); + + // Run the process and return the image, @see image_style_create_derivative(). + $style = $tests[$test_id]; + if (!$style) { + trigger_error("Unknown test style preset '$test_id' ", E_USER_ERROR); + return FALSE; + } + + // @todo: should we let the image style system do its work and just interfere on hook_init with setting the toolkit? + // @todo: this would make the page generator easier as well and keep it working with secure image derivatives. + // Start emulating image_style_create_derivative() + // The main difference being I determine the toolkit I want to use. + // SOME of this code is probably redundant, was a lot of copy&paste without true understanding of the new image.module + if (!$image = image_load($target, $toolkit)) { + trigger_error("Failed to open original image $target with toolkit $toolkit", E_USER_ERROR); + return FALSE; + } + + // Need to save the result before returning it - to stay compatible with imagemagick + $filename = "$test_id-$toolkit.{$image->info['extension']}"; + $derivative_uri = image_style_path($style['name'], $filename); + $directory = dirname($derivative_uri); + file_prepare_directory($directory, FILE_CREATE_DIRECTORY); + watchdog('imagecache_testsuite', 'Checking a save dir %dir', array('%dir' => dirname($derivative_uri)), WATCHDOG_DEBUG); + + // Imagemagick is not quite right? place a file where the file is supposed to go + // before I put the real path there? else drupal_realpath() says nuh. + #file_save_data('touch this for imagemagick', $derivative_uri, FILE_EXISTS_REPLACE); + + foreach ($style['effects'] as $effect) { + // Need to load the full effect definitions, our test ones don't know all the callback info + $effect_definition = image_effect_definition_load($effect['name']); + if (empty($effect_definition)) { + watchdog('imagecache_testsuite', 'I have no idea what %name is', array('%name' => $effect['name']), WATCHDOG_ERROR); + continue; + } + $full_effect = array_merge($effect_definition, array('data' => $effect['data'])); + + // @todo: effects that involve other images (overlay, underlay) will load that image with the default toolkit which may differ from the toolkit tested here. + if (!image_effect_apply($image, $full_effect)) { + watchdog('imagecache_testsuite', 'action: %action (%callback) failed for %src', array( + '%action' => $full_effect['label'], + '%src' => $target, + '%callback' => $full_effect['effect callback'] + ), WATCHDOG_ERROR); + } + } + + if (!image_save($image, $derivative_uri)) { + watchdog('imagecache_testsuite', 'saving image %label failed for %derivative_uri', array( + '%derivative_uri' => $derivative_uri, + '%label' => isset($style['label']) ? $style['label'] : $style['name'] + ), WATCHDOG_ERROR); + return FALSE; + } + + if ($result_image = image_load($derivative_uri)) { + file_transfer($result_image->source, array( + 'Content-Type' => $result_image->info['mime_type'], + 'Content-Length' => $result_image->info['file_size'] + )); + drupal_exit(); + } + return "Failed to load the expected result from $derivative_uri"; +} + +/** + * Implements hook_image_default_styles(). + * + * Lists all our individual test cases and makes them available + * as enabled styles + */ +function imagecache_testsuite_image_default_styles() { + $styles = imagecache_testsuite_get_tests(); + + // Need to filter out the invalid test cases + // (ones that use unavailable actions) + // or the core complains with notices. +// foreach ($styles as $id => $style) { +// foreach ($style['effects'] as $delta => $action) { +// if (!empty($action['module']) && ($action['module'] != 'imagecache') && !module_exists($action['module'])) { +// unset($styles[$id]); +// break; +// } +// } +// } + return $styles; +} + +/** + * Retrieve the list of presets, each of which contain actions and action + * definitions. + * + * Scans all the module folders for files named *.imagecache_preset.inc + * + * It seems that the required shape in D7 is + * $style=>array( + * 'effects' => array( + * 0 => array('name' => 'something', 'data' => array()) + * ) + * ) + */ +function imagecache_testsuite_get_tests() { + $presets = array(); + $folders = imagecache_testsuite_get_folders(); + foreach ($folders as $folder) { + $preset_files = file_scan_directory($folder, "/.*.imagecache_preset.inc/"); + // Setting filepath in this scope allows the tests to know where they are. + // The inc files may use it to create their rules. + $filepath = $folder; + foreach ($preset_files as $preset_file) { + include_once($preset_file->uri); + } + } + uasort($presets, 'element_sort'); + return $presets; +} + +/** + * Places to scan for test presets and sample images. + * + * @return array + * an array of folder names of everything that implements imagecache_actions. + */ +function imagecache_testsuite_get_folders() { + $folders = array(drupal_get_path('module', 'imagecache_testsuite')); + foreach (module_implements('image_effect_info') as $module_name) { + $folders[] = drupal_get_path('module', $module_name) . '/tests'; + } + return $folders; +} + +/** + * Display a page demonstrating a number of positioning tests + * + * Tests both styles of positioning - the x=, y= original, used in most places, + * pls the css-like left=, top= version also. + */ +function imagecache_testsuite_positioning() { + module_load_include('inc', 'imagecache_actions', 'utility'); + drupal_set_title("Testing the positioning algorithm"); + $tests = imagecache_testsuite_positioning_get_tests(); + $table = array(); + // $dst_image represents tha field or canvas. + // $src_image is the item being placed on it. + // Both these represent an imageapi-type image resource handle, but contain just dimensions + $src_image = new stdClass(); + $src_image->info = array('width' => 75, 'height' => 100); + $dst_image = new stdClass(); + $dst_image->info = array('width' => 200, 'height' => 150); + + foreach ($tests as $testname => $test) { + // calc it, using either old or new method + if (isset($test['parameters']['x']) || isset($test['parameters']['y'])) { + $result['x'] = imagecache_actions_keyword_filter($test['parameters']['x'], $dst_image->info['width'], $src_image->info['width']); + $result['y'] = imagecache_actions_keyword_filter($test['parameters']['y'], $dst_image->info['height'], $src_image->info['height']); + } + else { + // use css style + $result = imagecache_actions_calculate_relative_position($dst_image, $src_image, $test['parameters']); + } + $expected_illustration = theme_positioning_test($test['expected']['x'], $test['expected']['y']); + $result_illustration = theme_positioning_test($result['x'], $result['y']); + $row = array(); + $row['name'] = array('data' => '' . join("\n", $outputs) . '';
+}
+
+function imagecache_testsuite_positioning_get_tests() {
+ return array(
+ 'base' => array(
+ 'parameters' => array(
+ 'x' => '0',
+ 'y' => '0',
+ ),
+ 'description' => '0 is top left.',
+ 'expected' => array(
+ 'x' => '0',
+ 'y' => '0',
+ ),
+ ),
+ 'numbers' => array(
+ 'parameters' => array(
+ 'x' => '50',
+ 'y' => '-50',
+ ),
+ 'description' => 'Basic numbers indicate distance and direction from top left.',
+ 'expected' => array(
+ 'x' => '50',
+ 'y' => '-50',
+ ),
+ ),
+ 'keywords' => array(
+ 'parameters' => array(
+ 'x' => 'center',
+ 'y' => 'bottom',
+ ),
+ 'description' => "Plain keywords will align against the region",
+ 'expected' => array(
+ 'x' => '62.5',
+ 'y' => '50',
+ ),
+ ),
+ 'keyword with offsets' => array(
+ 'parameters' => array(
+ 'x' => 'right+10',
+ 'y' => 'bottom+10',
+ ),
+ 'description' => "Keywords can be used with offsets. Positive numbers are in from the named side",
+ 'expected' => array(
+ 'x' => '115',
+ 'y' => '40',
+ ),
+ ),
+ 'keyword with negative offsets' => array(
+ 'parameters' => array(
+ 'x' => 'right-10',
+ 'y' => 'bottom-10',
+ ),
+ 'description' => "Negative numbers place the item outside the boundry",
+ 'expected' => array(
+ 'x' => '135',
+ 'y' => '60',
+ ),
+ ),
+ 'percent' => array(
+ 'parameters' => array(
+ 'x' => '50%',
+ 'y' => '50%',
+ ),
+ 'description' => "Percentages on their own will CENTER on both the source and destination items",
+ 'expected' => array(
+ 'x' => '62.5',
+ 'y' => '25',
+ ),
+ ),
+ 'keyword with percent' => array(
+ 'parameters' => array(
+ 'x' => 'right+10%',
+ 'y' => 'bottom+10%',
+ ),
+ 'description' => "Percentages can be used with keywords, though the placed image will be centered on the calculated position.",
+ 'expected' => array(
+ 'x' => '142.5',
+ 'y' => '85',
+ ),
+ ),
+ 'css styles' => array(
+ 'parameters' => array(
+ 'left' => '10px',
+ 'bottom' => '10px',
+ ),
+ 'description' => "A different method uses css-like parameters.",
+ 'expected' => array(
+ 'x' => '10',
+ 'y' => '40',
+ ),
+ ),
+ 'css negatives' => array(
+ 'parameters' => array(
+ 'left' => '-10px',
+ 'bottom' => '-10px',
+ ),
+ 'description' => "Negative numbers from sides always move outside of the boundries.",
+ 'expected' => array(
+ 'x' => '-10',
+ 'y' => '60',
+ ),
+ ),
+ 'css with percents' => array(
+ 'parameters' => array(
+ 'right' => '+10%',
+ 'bottom' => '+10%',
+ ),
+ 'description' => "Using percents with sides calculates the percent location on the base, then centers the source item on that point.",
+ 'expected' => array(
+ 'x' => '142.5',
+ 'y' => '85',
+ ),
+ ),
+ 'css centering' => array(
+ 'parameters' => array(
+ 'right' => '50%',
+ 'top' => '50%',
+ ),
+ 'description' => "The auto-centering that happens when percents are used means you can easily center things at 50%.",
+ 'expected' => array(
+ 'x' => '62.5',
+ 'y' => '25',
+ ),
+ ),
+ 'css positioning' => array(
+ 'parameters' => array(
+ 'right' => 'left+20',
+ 'top' => 'bottom-20',
+ ),
+ 'description' => "It's also possible to use keywords there, though it's not smart to do so",
+ 'expected' => array(
+ 'x' => '-55',
+ 'y' => '130',
+ ),
+ ),
+
+ );
+}
diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/relative_canvas.imagecache_preset.inc b/sites/all/modules/contrib/files/imagecache_actions/tests/relative_canvas.imagecache_preset.inc
new file mode 100644
index 00000000..4639eb35
--- /dev/null
+++ b/sites/all/modules/contrib/files/imagecache_actions/tests/relative_canvas.imagecache_preset.inc
@@ -0,0 +1,39 @@
+ 'relative_canvas',
+ '#weight' => 2.0,
+ 'effects' => array (
+ 0 => array (
+ 'weight' => '0',
+ 'module' => 'imagecache_canvasactions',
+ 'name' => 'canvasactions_definecanvas',
+ 'data' => array (
+ 'RGB' => array (
+ 'HEX' => '333333',
+ ),
+ 'under' => 1,
+ 'exact' => array (
+ 'width' => '',
+ 'height' => '',
+ 'xpos' => 'center',
+ 'ypos' => 'center',
+ ),
+ 'relative' => array (
+ 'leftdiff' => '10',
+ 'rightdiff' => '10',
+ 'topdiff' => '10',
+ 'bottomdiff' => '10',
+ ),
+ ),
+ ),
+ ),
+);
\ No newline at end of file
diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/relative_canvas.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/relative_canvas.jpg
new file mode 100644
index 00000000..53fd0836
Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/relative_canvas.jpg differ
diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/sample.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/sample.jpg
new file mode 100644
index 00000000..df4faf3a
Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/sample.jpg differ
diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/scale.imagecache_preset.inc b/sites/all/modules/contrib/files/imagecache_actions/tests/scale.imagecache_preset.inc
new file mode 100644
index 00000000..d19cb02a
--- /dev/null
+++ b/sites/all/modules/contrib/files/imagecache_actions/tests/scale.imagecache_preset.inc
@@ -0,0 +1,26 @@
+ 'scale',
+ '#weight' => 1.1,
+ 'effects' => array (
+ 0 => array (
+ 'weight' => '-1',
+ 'module' => 'image',
+ 'name' => 'image_scale',
+ 'data' => array (
+ 'width' => '100',
+ 'height' => '',
+ 'upscale' => 0,
+ ),
+ ),
+ )
+);
\ No newline at end of file
diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/scale.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/scale.jpg
new file mode 100644
index 00000000..17df8cfb
Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/scale.jpg differ
diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/scale_canvas.imagecache_preset.inc b/sites/all/modules/contrib/files/imagecache_actions/tests/scale_canvas.imagecache_preset.inc
new file mode 100644
index 00000000..69ae955f
--- /dev/null
+++ b/sites/all/modules/contrib/files/imagecache_actions/tests/scale_canvas.imagecache_preset.inc
@@ -0,0 +1,44 @@
+ 'scale_canvas',
+ '#weight' => 2.1,
+
+ 'effects' => array (
+ 1 => array (
+ 'weight' => '1',
+ 'module' => 'image',
+ 'name' => 'image_scale',
+ 'data' => array (
+ 'width' => '100',
+ 'height' => '150',
+ 'upscale' => TRUE,
+ ),
+ ),
+ 2 => array (
+ 'weight' => '2',
+ 'module' => 'imagecache_canvasactions',
+ 'name' => 'canvasactions_definecanvas',
+ 'data' => array (
+ 'RGB' => array (
+ 'HEX' => 'DDDDDD',
+ ),
+ 'under' => 1,
+ 'exact' => array (
+ 'width' => '100',
+ 'height' => '150',
+ 'xpos' => 'center',
+ 'ypos' => 'center',
+ ),
+ ),
+ ),
+ ),
+);
\ No newline at end of file
diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/scale_canvas.png b/sites/all/modules/contrib/files/imagecache_actions/tests/scale_canvas.png
new file mode 100644
index 00000000..85290e5b
Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/scale_canvas.png differ
diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/scale_rotate.imagecache_preset.inc b/sites/all/modules/contrib/files/imagecache_actions/tests/scale_rotate.imagecache_preset.inc
new file mode 100644
index 00000000..ad92f60c
--- /dev/null
+++ b/sites/all/modules/contrib/files/imagecache_actions/tests/scale_rotate.imagecache_preset.inc
@@ -0,0 +1,37 @@
+ 'scale_rotate',
+ '#weight' => 1.3,
+
+ 'effects' => array (
+ 1 => array (
+ 'weight' => '1',
+ 'module' => 'image',
+ 'name' => 'image_scale',
+ 'data' => array (
+ 'width' => '',
+ 'height' => '150',
+ 'upscale' => TRUE,
+ ),
+ ),
+ 2 => array (
+ 'weight' => '2',
+ 'module' => 'image',
+ 'name' => 'image_rotate',
+ 'data' => array (
+ 'degrees' => '15',
+ 'random' => 0,
+ 'bgcolor' => '',
+ ),
+ ),
+ ),
+);
\ No newline at end of file
diff --git a/sites/all/modules/contrib/files/imagecache_actions/tests/scale_rotate.jpg b/sites/all/modules/contrib/files/imagecache_actions/tests/scale_rotate.jpg
new file mode 100644
index 00000000..3b792500
Binary files /dev/null and b/sites/all/modules/contrib/files/imagecache_actions/tests/scale_rotate.jpg differ
diff --git a/sites/all/modules/contrib/files/imagecache_actions/utility-color.inc b/sites/all/modules/contrib/files/imagecache_actions/utility-color.inc
new file mode 100644
index 00000000..45548555
--- /dev/null
+++ b/sites/all/modules/contrib/files/imagecache_actions/utility-color.inc
@@ -0,0 +1,112 @@
+ '