From 557aaa3cabde05d84ab8de94afcab25666684bf9 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Sun, 15 Sep 2013 01:31:07 +0200
Subject: [PATCH] [TASK] Remove GFX/im_combine_filename setting
Image Magick support for versions 4 and 5 was dropped. The setting
to differentiate combine from composite is obsolete now and composite
is used always.
Change-Id: I0fbc847167d340fd83315285745c63d53225891a
Resolves: #52011
Releases: 6.2
Reviewed-on: https://review.typo3.org/23836
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
---
typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php | 8 --------
typo3/sysext/core/Classes/Utility/CommandUtility.php | 3 +--
typo3/sysext/core/Configuration/DefaultConfiguration.php | 1 -
.../install/Classes/Configuration/Image/CustomPreset.php | 1 -
.../Classes/Configuration/Image/ImageMagick6Preset.php | 1 -
.../sysext/install/Classes/Controller/StepController.php | 2 ++
.../Resources/Public/Images/TestReference/About.txt | 3 +--
7 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
index 4bd99137e70d..4ffe2a952b3d 100644
--- a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
+++ b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
@@ -41,11 +41,6 @@ use TYPO3\CMS\Core\Utility\MathUtility;
class GraphicalFunctions {
// Internal configuration, set in init()
- // The ImageMagick filename used for combining two images. This name changed during the versions.
- /**
- * @todo Define visibility
- */
- public $combineScript = 'combine';
// If set, there is no frame pointer prepended to the filenames.
/**
@@ -342,9 +337,6 @@ class GraphicalFunctions {
// Setting default JPG parameters:
$this->jpegQuality = MathUtility::forceIntegerInRange($gfxConf['jpg_quality'], 10, 100, 75);
$this->cmds['jpg'] = ($this->cmds['jpeg'] = '-colorspace ' . $this->colorspace . ' -sharpen 50 -quality ' . $this->jpegQuality);
- if ($gfxConf['im_combine_filename']) {
- $this->combineScript = $gfxConf['im_combine_filename'];
- }
if ($gfxConf['im_noFramePrepended']) {
$this->noFramePrepended = 1;
}
diff --git a/typo3/sysext/core/Classes/Utility/CommandUtility.php b/typo3/sysext/core/Classes/Utility/CommandUtility.php
index 2ea68a8562c8..ab6480d2a2a0 100644
--- a/typo3/sysext/core/Classes/Utility/CommandUtility.php
+++ b/typo3/sysext/core/Classes/Utility/CommandUtility.php
@@ -116,7 +116,6 @@ class CommandUtility {
}
$path = \TYPO3\CMS\Core\Utility\GeneralUtility::fixWindowsFilePath($path);
$im_version = strtolower($gfxConf['im_version_5']);
- $combineScript = $gfxConf['im_combine_filename'] ? trim($gfxConf['im_combine_filename']) : 'combine';
// This is only used internally, has no effect outside
if ($command === 'combine') {
$command = 'composite';
@@ -129,7 +128,7 @@ class CommandUtility {
if ($im_version === 'im6') {
$switchCompositeParameters = TRUE;
}
- $path = escapeshellarg($path . ($command == 'composite' ? $combineScript : $command) . $isExt);
+ $path = escapeshellarg($path . ($command == 'composite' ? 'composite' : $command) . $isExt);
}
// strip profile information for thumbnails and reduce their size
if ($parameters && $command != 'identify' && $gfxConf['im_useStripProfileByDefault'] && $gfxConf['im_stripProfileCommand'] != '') {
diff --git a/typo3/sysext/core/Configuration/DefaultConfiguration.php b/typo3/sysext/core/Configuration/DefaultConfiguration.php
index 60248ce8eedb..3838385c5fa5 100644
--- a/typo3/sysext/core/Configuration/DefaultConfiguration.php
+++ b/typo3/sysext/core/Configuration/DefaultConfiguration.php
@@ -48,7 +48,6 @@ return array(
'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)
- 'im_combine_filename' => 'combine', // String: Latest ImageMagick versions has changed the name of combine to composite. Configure here if needed.
'im_noFramePrepended' => FALSE, // Boolean: If set, the [x] frame indicator is NOT prepended to filenames in stdgraphic. Some IM5+ version didn't work at all with the typical [0]-prefix, which allow multipage pdf's and animated gif's to be scaled only for the first frame/page and that seriously cuts down rendering time. Set this flag only if your ImageMagick version cannot find the files. Notice that changing this flag causes temporary filenames to change, thus the server will begin scaling images again which were previously cached.
'im_stripProfileCommand' => '+profile \'*\'', // String: Specify the command to strip the profile information, which can reduce thumbnail size up to 60KB. Command can differ in IM/GM, IM also know the -strip command. See <a href="http://www.imagemagick.org/Usage/thumbnails/#profiles" target="_blank">imagemagick.org</a> for details
'im_useStripProfileByDefault' => TRUE, // Boolean: If set, the im_stripProfileCommand is used with all IM Image operations by default. See tsRef for setting this parameter explocit for IMAGE generation.
diff --git a/typo3/sysext/install/Classes/Configuration/Image/CustomPreset.php b/typo3/sysext/install/Classes/Configuration/Image/CustomPreset.php
index a47cbc363cac..d4e64bf1244d 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/CustomPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/CustomPreset.php
@@ -44,7 +44,6 @@ class CustomPreset extends Configuration\AbstractCustomPreset implements Configu
'GFX/im_imvMaskState' => 0,
'GFX/im_v5effects' => 0,
'GFX/im_mask_temp_ext_gif' => 0,
- 'GFX/im_combine_filename' => 'combine',
'GFX/colorspace' => '',
);
}
diff --git a/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php b/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
index 6d2f1875c774..09eeffe94d40 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
@@ -55,7 +55,6 @@ class ImageMagick6Preset extends AbstractImagePreset implements Configuration\Pr
'GFX/im_imvMaskState' => 1,
'GFX/im_v5effects' => 1,
'GFX/im_mask_temp_ext_gif' => 1,
- 'GFX/im_combine_filename' => 'composite',
'GFX/colorspace' => 'sRGB',
);
diff --git a/typo3/sysext/install/Classes/Controller/StepController.php b/typo3/sysext/install/Classes/Controller/StepController.php
index ba15de5f9db9..accea3b4fb19 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/defaultTypoScript_editorcfg.',
// #25099
'FE/simulateStaticDocuments',
+ // 52011
+ 'GFX/im_combine_filename',
// #22687
'GFX/gdlib_2',
// #52010
diff --git a/typo3/sysext/install/Resources/Public/Images/TestReference/About.txt b/typo3/sysext/install/Resources/Public/Images/TestReference/About.txt
index 347bec3fde60..ac9d0733d5db 100644
--- a/typo3/sysext/install/Resources/Public/Images/TestReference/About.txt
+++ b/typo3/sysext/install/Resources/Public/Images/TestReference/About.txt
@@ -8,7 +8,6 @@ These comparison images was generated by Kasper Skårhøj, using:
$TYPO3_CONF_VARS['GFX']['im_path_lzw'] = '';
$TYPO3_CONF_VARS['GFX']['TTFdpi'] = '96';
$TYPO3_CONF_VARS['GFX']['gdlib_png'] = '1';
-$TYPO3_CONF_VARS['GFX']['im_combine_filename'] = 'composite';
$TYPO3_CONF_VARS['GFX']['im_path'] = '/usr/bin/';
$TYPO3_CONF_VARS['GFX']['im_version_5'] = 'im5';
$TYPO3_CONF_VARS['GFX']['im_imvMaskState'] = '0';
@@ -30,4 +29,4 @@ WBMP Support enabled
- I was not able to create GIF files for reference so I just converted them directly with ImageMagick
-- Also LZW compression has NOT been used anywhere except the GD test images since ImageMagick doesn't support it.
+- Also LZW compression has NOT been used anywhere except the GD test images since ImageMagick doesn't support it.
\ No newline at end of file
--
GitLab