diff --git a/ChangeLog b/ChangeLog
index 2b0fd99246fa7732281ddc2523f8be3ebf819bf3..9d3e5520970f14e3fe27c6934a1729cce6aa8abc 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-17 Steffen Gebert <steffen@steffen-gebert.de>
+
+ * Fixed bug #14449: Deprecate usage of ImageMagick version 4 and 5
+
2010-11-17 Ernesto Baschny <ernst@cron-it.de>
* Added feature #16027: Let typolink honour secure filelink configuration
diff --git a/t3lib/class.t3lib_stdgraphic.php b/t3lib/class.t3lib_stdgraphic.php
index 6d5f510c504d4350719fe061997fcc3f1aa7b263..eb395387b9a43ec8b46fa3d07fa39af226177103 100644
--- a/t3lib/class.t3lib_stdgraphic.php
+++ b/t3lib/class.t3lib_stdgraphic.php
@@ -256,7 +256,10 @@ class t3lib_stdGraphic {
$this->png_truecolor = true;
}
if (!$gfxConf['im_version_5']) {
+ t3lib_div::deprecationLog('The option $TYPO3_CONF_VARS[\'GFX\'][\'im_version_5\'] is not set, ImageMagic 4 is assumed. This is deprecated since TYPO3 4.5, support will be removed in TYPO3 4.6. Make sure to upgrade to ImageMagick version 6 or GraphichsMagick.');
$this->im_version_4 = true;
+ } elseif ($gfxConf['im_version_5'] === 'im5') {
+ t3lib_div::deprecationLog('The option $TYPO3_CONF_VARS[\'GFX\'][\'im_version_5\'] is set to \'im5\'. This is deprecated since TYPO3 4.5, support will be removed in TYPO3 4.6. Make sure to upgrade to ImageMagick version 6 or GraphichsMagick.');
}
// When GIFBUILDER gets used in truecolor mode
@@ -298,7 +301,6 @@ class t3lib_stdGraphic {
}
if ($gfxConf['im_no_effects']) {
// Boolean. This is necessary if using ImageMagick 5+.
- // Approved version for using effects is version 4.2.9.
// Effects in Imagemagick 5+ tends to render very slowly!!
// - therefore must be disabled in order not to perform sharpen, blurring and such.
$this->NO_IM_EFFECTS = 1;
diff --git a/t3lib/config_default.php b/t3lib/config_default.php
index 16169edb2ac0ba1bf0537667b802c6f91e423eae..4ad8aac19e680c661e9001460133d7c0d9bb1baf 100644
--- a/t3lib/config_default.php
+++ b/t3lib/config_default.php
@@ -35,13 +35,13 @@ $TYPO3_CONF_VARS = array(
'gdlib_png' => FALSE, // Boolean: Enables the use of GD, with PNG only. This means that all items normally generated as gif-files will be png-files instead!
'im' => TRUE, // Boolean: Enables the use of IM.
- 'im_path' => '/usr/X11R6/bin/', // Path to the IM tools 'convert', 'combine', 'identify'.
+ 'im_path' => '/usr/bin/', // Path to the IM tools 'convert', 'combine', 'identify'.
'im_path_lzw' => '/usr/bin/', // Path to the IM tool 'convert' with LZW enabled! See 'gif_compress'. If your version 4.2.9 of ImageMagick is compiled with LZW you may leave this field blank AND disable the flag 'gif_compress'! Tip: You can call LZW 'convert' with a prefix like 'myver_convert' by setting this path with it, eg. '/usr/bin/myver_' instead of just '/usr/bin/'.
'im_version_5' => '', // String: Set this if you're using ImageMagick/GraphicsMagick but not IM 4.x. Setting this value will automatically configure some settings for use with the specified program version. Allowed values are: "im4", "im5", "im6" and "gm" (uses GraphicsMagick instead of ImageMagick).
'im_negate_mask' => FALSE, // Boolean: Indicates if the mask images should be inverted first. This depends of the ImageMagick version. Below ver. 5.1 this should be false. Above ImageMagick version 5.2+ it should be true. Just set the flag if the masks works opposite the intension!
'im_imvMaskState' => FALSE, // Boolean: If set, the 'im_negate_mask' state is inverted. This is very useful with newer versions of IM5 (at least 5.4.3+) where the 'im_version_5' setting will set 'im_negate_mask' which will eventually be wrong... Halleluja for ImageMagick - have I ever regreted using that package...
- 'im_no_effects' => FALSE, // Boolean: This is necessary if using ImageMagick 5+. Approved version for using effects is version 4.2.9. Effects in Imagemagick 5+ tends to render very slowly! Therefore this must be disabled in order not to perform sharpen, blurring and such. (However lately IM5 is allowed for effects again, but syntax has changed!)
+ 'im_no_effects' => FALSE, // Boolean: This is necessary if using ImageMagick 5+. Effects in Imagemagick 5+ tends to render very slowly! Therefore this must be disabled in order not to perform sharpen, blurring and such. (However lately IM5 is allowed for effects again, but syntax has changed!)
'im_v5effects' => 0, // <p>Integer (-1, 0, 1)</p><dl><dt>0</dt><dd>disabled</dd><dt>-1</dt><dd>Do not sharpen images by default</dd><dt>1</dt><dd>All; blur and sharpening is allowed in ImageMagick again and the 'im_no_effects' flag is cancelled.</dd></dl><p>Blurring and sharpening has new syntaxes though. See class.t3lib_stdgraphic.php for details.</p>
'im_mask_temp_ext_gif' => FALSE, // Boolean: This should be set if ImageMagick is version 5+. This is used in class.tslib_content.php for masking images and the extension png is normally used because it's faster than gif for temporary files. But png seems not to work with some IM 5+ versions, so...
'im_mask_temp_ext_noloss' => 'miff', // String: Loss-less ImageMagick extension to use for mask processing in temporary filenames. Normally 'miff' (ImageMagick's OWN format) will do fine. However at least IM 5.4.9 has proved not to be able to write to its own file format which forced me to add this option. You can try and set this to tif/png/jpg if some masking doesn't work the way it should.
diff --git a/typo3/sysext/install/mod/class.tx_install.php b/typo3/sysext/install/mod/class.tx_install.php
index 5e00aae07ce4e2938058bafb71c5c1163d2406cb..5b1a75f6b0593c29d6738bbf19fdda3e34739270 100755
--- a/typo3/sysext/install/mod/class.tx_install.php
+++ b/typo3/sysext/install/mod/class.tx_install.php
@@ -2474,14 +2474,12 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
<p>
<strong>Notice: </strong>
<br />
- ImageMagick 4.2.9 is recommended and the binaries are
- normally installed by RPM in /usr/X11R6/bin or by compiling
- in /usr/local/bin. Please look in the "Inside TYPO3"
- pdf-document for extensive information about ImageMagick issues.
+ ImageMagick 6 or GraphicsMagick is recommended and the binaries are
+ normally installed in /usr/bin.
<br />
Paths to ImageMagick are defined in localconf.php and may be
something else than /usr/bin/, but this is default for
- ImageMagick 5+
+ ImageMagick 6+
</p>
', 2);
if (ini_get('doc_root')) {
@@ -4357,7 +4355,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
In order to do this, TYPO3 uses two sets of tools:
</p>
<p>
- <strong>ImageMagick:</strong>
+ <strong>ImageMagick / GraphicsMagick:</strong>
<br />
For conversion of non-web formats to webformats, combining
images with alpha-masks, performing image-effects like blurring
@@ -4368,20 +4366,18 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
namely \'convert\' (converting fileformats, scaling, effects),
\'combine\'/\'composite\' (combining images with masks) and
\'identify\' (returns image information).
+ GraphicsMagick is an alternative to ImageMagick and can be enabled
+ by setting [GFX][im_version_5] to \'gm\'. This is recommended and
+ enabled by default.
<br />
- Because ImageMagick are external programs, two requirements must
- be met: 1) The programs must be installed on the server and
- working and 2) if safe_mode is enabled, the programs must be
- located in the folder defined by the php.ini setting,
+ Because ImageMagick and Graphicsmagick are external programs, two
+ requirements must be met: 1) The programs must be installed on the
+ server and working and 2) if safe_mode is enabled, the programs must
+ be located in the folder defined by the php.ini setting,
<em>safe_mode_exec_dir</em> (else they are not executed).
<br />
ImageMagick is available for both Windows and Unix. The current
- version is 5+, but TYPO3 enthusiasts prefer an old version 4.2.9
- because that version has three main advantages: It\'s faster in
- some operations, the blur-function works, the sharpen-function
- works. Anyway you do it, you must tell TYPO3 by configuration
- whether you\'re using version 5+ or 4.2.9. (flag:
- [GFX][im_version_5])
+ version is 6+.
<br />
ImageMagick homepage is at <a href="http://www.imagemagick.org/">http://www.imagemagick.org/</a>
</p>