diff --git a/typo3/sysext/core/Classes/Core/Bootstrap.php b/typo3/sysext/core/Classes/Core/Bootstrap.php
index ea152fad0a057cf1269621ef5829c0f914ea3ad0..ed5b46c77c578a3594913340bef3b064b2fd1003 100644
--- a/typo3/sysext/core/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/core/Classes/Core/Bootstrap.php
@@ -488,12 +488,10 @@ class Bootstrap {
}
if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5']) {
$GLOBALS['TYPO3_CONF_VARS']['GFX']['im_negate_mask'] = 1;
- $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_no_effects'] = 1;
$GLOBALS['TYPO3_CONF_VARS']['GFX']['im_mask_temp_ext_gif'] = 1;
if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] === 'gm') {
$GLOBALS['TYPO3_CONF_VARS']['GFX']['im_negate_mask'] = 0;
$GLOBALS['TYPO3_CONF_VARS']['GFX']['im_imvMaskState'] = 0;
- $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_no_effects'] = 1;
$GLOBALS['TYPO3_CONF_VARS']['GFX']['im_v5effects'] = -1;
}
}
@@ -1074,4 +1072,4 @@ class Bootstrap {
}
-?>
+?>
\ No newline at end of file
diff --git a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
index e70e12a7f33c6d5381f7cfeb1978d792e477a8cd..4bd99137e70dc776c16e715640161a795336003a 100644
--- a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
+++ b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
@@ -363,14 +363,14 @@ class GraphicalFunctions {
// Just set the flag if the masks works opposite the intension!
$this->maskNegate = ' -negate';
}
- if ($gfxConf['im_no_effects']) {
- // Boolean. This is necessary if using ImageMagick 5+.
- // 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;
- $this->cmds['jpg'] = ($this->cmds['jpeg'] = '-colorspace ' . $this->colorspace . ' -quality ' . $this->jpegQuality);
- }
- // ... but if 'im_v5effects' is set, don't care about 'im_no_effects'
+
+ // Boolean. This is necessary if using ImageMagick 5+.
+ // 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;
+ $this->cmds['jpg'] = ($this->cmds['jpeg'] = '-colorspace ' . $this->colorspace . ' -quality ' . $this->jpegQuality);
+
+ // ... but if 'im_v5effects' is set, enable effects
if ($gfxConf['im_v5effects']) {
$this->NO_IM_EFFECTS = 0;
$this->V5_EFFECTS = 1;
diff --git a/typo3/sysext/core/Configuration/DefaultConfiguration.php b/typo3/sysext/core/Configuration/DefaultConfiguration.php
index 4014186ac9acb0cd9dd798b0b03449b8bf91efed..1c6aa654faa1bf7fe98ce3cf98344ba2dabe411e 100644
--- a/typo3/sysext/core/Configuration/DefaultConfiguration.php
+++ b/typo3/sysext/core/Configuration/DefaultConfiguration.php
@@ -44,8 +44,7 @@ return array(
'im_version_5' => 'im6', // String: Set this either to "im6" or "gm" (uses GraphicsMagick instead of ImageMagick). Setting this value will automatically configure some settings for use with the specified program version.
'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+. 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 \TYPO3\CMS\Core\Imaging\GraphicalFunctions for details.</p>
+ '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.</dd></dl>
'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.
'im_noScaleUp' => FALSE, // Boolean: If set, images are not being scaled up if told so (in t3lib/stdgraphics.php)
diff --git a/typo3/sysext/install/Classes/Configuration/Image/CustomPreset.php b/typo3/sysext/install/Classes/Configuration/Image/CustomPreset.php
index 190070f1a247de9ddb16cb15100da184426d0680..a47cbc363cac0594832d91de7ed203221c5180e5 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/CustomPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/CustomPreset.php
@@ -42,7 +42,6 @@ class CustomPreset extends Configuration\AbstractCustomPreset implements Configu
'GFX/im_version_5' => '',
'GFX/im_negate_mask' => 0,
'GFX/im_imvMaskState' => 0,
- 'GFX/im_no_effects' => 0,
'GFX/im_v5effects' => 0,
'GFX/im_mask_temp_ext_gif' => 0,
'GFX/im_combine_filename' => 'combine',
diff --git a/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php b/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
index a9239b684f21b9386325025730a2b3b3593b07d1..9b0d1a649942572bcb4fa63d9de2df50fc8b20d0 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
@@ -53,7 +53,6 @@ class GraphicsMagickPreset extends AbstractImagePreset implements Configuration\
'GFX/im_version_5' => 'gm',
'GFX/im_negate_mask' => 0,
'GFX/im_imvMaskState' => 0,
- 'GFX/im_no_effects' => 1,
'GFX/im_v5effects' => -1,
'GFX/im_mask_temp_ext_gif' => 1,
'GFX/colorspace' => 'RGB',
diff --git a/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php b/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
index 1f92e1bad4a170612b7c273dd8c772065c98144d..6d2f1875c774960176b8524643e268ea1d8d9776 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
@@ -53,7 +53,6 @@ class ImageMagick6Preset extends AbstractImagePreset implements Configuration\Pr
'GFX/im_version_5' => 'im6',
'GFX/im_negate_mask' => 0,
'GFX/im_imvMaskState' => 1,
- 'GFX/im_no_effects' => 1,
'GFX/im_v5effects' => 1,
'GFX/im_mask_temp_ext_gif' => 1,
'GFX/im_combine_filename' => 'composite',
@@ -106,4 +105,4 @@ class ImageMagick6Preset extends AbstractImagePreset implements Configuration\Pr
return $result;
}
}
-?>
\ No newline at end of file
+?>
diff --git a/typo3/sysext/install/Classes/Controller/StepController.php b/typo3/sysext/install/Classes/Controller/StepController.php
index 2672814271b23344e66a138898bee527c6388585..7b3cc7c6c5c6d10c4b69312b93777cb359bf8635 100644
--- a/typo3/sysext/install/Classes/Controller/StepController.php
+++ b/typo3/sysext/install/Classes/Controller/StepController.php
@@ -70,6 +70,8 @@ class StepController extends AbstractController {
'FE/simulateStaticDocuments',
// #22687
'GFX/gdlib_2',
+ // #52010
+ 'GFX/im_no_effects',
// #18431
'GFX/noIconProc',
// #17606
@@ -454,4 +456,4 @@ class StepController extends AbstractController {
}
}
}
-?>
+?>
\ No newline at end of file