fabarea / media

Classes/FileUpload/Optimizer/Rotate.php

Indentation +148 added lines, -148 removed lines

@@ -18,153 +18,153 @@
 class Rotate implements ImageOptimizerInterface
 {
 
-    /**
-     * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
-     */
-    protected $gifCreator;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
-    }
-
-    /**
-     * Optimize the given uploaded image
-     *
-     * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
-     * @return \Fab\Media\FileUpload\UploadedFileInterface
-     */
-    public function optimize($uploadedFile)
-    {
-
-        $orientation = $this->getOrientation($uploadedFile->getFileWithAbsolutePath());
-        $isRotated = $this->isRotated($orientation);
-
-        // Only rotate image if necessary!
-        if ($isRotated > 0) {
-            $transformation = $this->getTransformation($orientation);
-
-            $imParams = '###SkipStripProfile###';
-            if ($transformation !== '') {
-                $imParams .= ' ' . $transformation;
-            }
-
-            $tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);
-            if ($tempFileInfo) {
-                // Replace original file
-                @unlink($uploadedFile->getFileWithAbsolutePath());
-                @rename($tempFileInfo[3], $uploadedFile->getFileWithAbsolutePath());
-
-                if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] === 'gm') {
-                    $this->resetOrientation($uploadedFile->getFileWithAbsolutePath());
-                }
-            }
-        }
-        return $uploadedFile;
-    }
-
-    /**
-     * Returns the EXIF orientation of a given picture.
-     *
-     * @param string $filename
-     * @return integer
-     */
-    protected function getOrientation($filename)
-    {
-        $extension = strtolower(substr($filename, strrpos($filename, '.') + 1));
-        $orientation = 1; // Fallback to "straight"
-        if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('jpg,jpeg,tif,tiff', $extension) && function_exists('exif_read_data')) {
-            try {
-                $exif = exif_read_data($filename);
-                if ($exif) {
-                    $orientation = $exif['Orientation'];
-                }
-            } catch (\Exception $e) {}
-        }
-        return $orientation;
-    }
-
-    /**
-     * Returns true if the given picture is rotated.
-     *
-     * @param integer $orientation EXIF orientation
-     * @return integer
-     * @see http://www.impulseadventure.com/photo/exif-orientation.html
-     */
-    protected function isRotated($orientation)
-    {
-        $ret = false;
-        switch ($orientation) {
-            case 2: // horizontal flip
-            case 3: // 180°
-            case 4: // vertical flip
-            case 5: // vertical flip + 90 rotate right
-            case 6: // 90° rotate right
-            case 7: // horizontal flip + 90 rotate right
-            case 8: // 90° rotate left
-                $ret = true;
-                break;
-        }
-        return $ret;
-    }
-
-    /**
-     * Returns a command line parameter to fix the orientation of a rotated picture.
-     *
-     * @param integer $orientation
-     * @return string
-     */
-    protected function getTransformation($orientation)
-    {
-        $transformation = '';
-        if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] !== 'gm') {
-            // ImageMagick
-            if ($orientation >= 2 && $orientation <= 8) {
-                $transformation = '-auto-orient';
-            }
-        } else {
-            // GraphicsMagick
-            switch ($orientation) {
-                case 2: // horizontal flip
-                    $transformation = '-flip horizontal';
-                    break;
-                case 3: // 180°
-                    $transformation = '-rotate 180';
-                    break;
-                case 4: // vertical flip
-                    $transformation = '-flip vertical';
-                    break;
-                case 5: // vertical flip + 90 rotate right
-                    $transformation = '-transpose';
-                    break;
-                case 6: // 90° rotate right
-                    $transformation = '-rotate 90';
-                    break;
-                case 7: // horizontal flip + 90 rotate right
-                    $transformation = '-transverse';
-                    break;
-                case 8: // 90° rotate left
-                    $transformation = '-rotate 270';
-                    break;
-            }
-        }
-        return $transformation;
-    }
-
-    /**
-     * Resets the EXIF orientation flag of a picture.
-     *
-     * @param string $filename
-     * @return void
-     * @see http://sylvana.net/jpegcrop/exif_orientation.html
-     */
-    protected function resetOrientation($filename)
-    {
-        JpegExifOrient::setOrientation($filename, 1);
-    }
+	/**
+	 * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
+	 */
+	protected $gifCreator;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
+		$this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+	}
+
+	/**
+	 * Optimize the given uploaded image
+	 *
+	 * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface
+	 */
+	public function optimize($uploadedFile)
+	{
+
+		$orientation = $this->getOrientation($uploadedFile->getFileWithAbsolutePath());
+		$isRotated = $this->isRotated($orientation);
+
+		// Only rotate image if necessary!
+		if ($isRotated > 0) {
+			$transformation = $this->getTransformation($orientation);
+
+			$imParams = '###SkipStripProfile###';
+			if ($transformation !== '') {
+				$imParams .= ' ' . $transformation;
+			}
+
+			$tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);
+			if ($tempFileInfo) {
+				// Replace original file
+				@unlink($uploadedFile->getFileWithAbsolutePath());
+				@rename($tempFileInfo[3], $uploadedFile->getFileWithAbsolutePath());
+
+				if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] === 'gm') {
+					$this->resetOrientation($uploadedFile->getFileWithAbsolutePath());
+				}
+			}
+		}
+		return $uploadedFile;
+	}
+
+	/**
+	 * Returns the EXIF orientation of a given picture.
+	 *
+	 * @param string $filename
+	 * @return integer
+	 */
+	protected function getOrientation($filename)
+	{
+		$extension = strtolower(substr($filename, strrpos($filename, '.') + 1));
+		$orientation = 1; // Fallback to "straight"
+		if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('jpg,jpeg,tif,tiff', $extension) && function_exists('exif_read_data')) {
+			try {
+				$exif = exif_read_data($filename);
+				if ($exif) {
+					$orientation = $exif['Orientation'];
+				}
+			} catch (\Exception $e) {}
+		}
+		return $orientation;
+	}
+
+	/**
+	 * Returns true if the given picture is rotated.
+	 *
+	 * @param integer $orientation EXIF orientation
+	 * @return integer
+	 * @see http://www.impulseadventure.com/photo/exif-orientation.html
+	 */
+	protected function isRotated($orientation)
+	{
+		$ret = false;
+		switch ($orientation) {
+			case 2: // horizontal flip
+			case 3: // 180°
+			case 4: // vertical flip
+			case 5: // vertical flip + 90 rotate right
+			case 6: // 90° rotate right
+			case 7: // horizontal flip + 90 rotate right
+			case 8: // 90° rotate left
+				$ret = true;
+				break;
+		}
+		return $ret;
+	}
+
+	/**
+	 * Returns a command line parameter to fix the orientation of a rotated picture.
+	 *
+	 * @param integer $orientation
+	 * @return string
+	 */
+	protected function getTransformation($orientation)
+	{
+		$transformation = '';
+		if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] !== 'gm') {
+			// ImageMagick
+			if ($orientation >= 2 && $orientation <= 8) {
+				$transformation = '-auto-orient';
+			}
+		} else {
+			// GraphicsMagick
+			switch ($orientation) {
+				case 2: // horizontal flip
+					$transformation = '-flip horizontal';
+					break;
+				case 3: // 180°
+					$transformation = '-rotate 180';
+					break;
+				case 4: // vertical flip
+					$transformation = '-flip vertical';
+					break;
+				case 5: // vertical flip + 90 rotate right
+					$transformation = '-transpose';
+					break;
+				case 6: // 90° rotate right
+					$transformation = '-rotate 90';
+					break;
+				case 7: // horizontal flip + 90 rotate right
+					$transformation = '-transverse';
+					break;
+				case 8: // 90° rotate left
+					$transformation = '-rotate 270';
+					break;
+			}
+		}
+		return $transformation;
+	}
+
+	/**
+	 * Resets the EXIF orientation flag of a picture.
+	 *
+	 * @param string $filename
+	 * @return void
+	 * @see http://sylvana.net/jpegcrop/exif_orientation.html
+	 */
+	protected function resetOrientation($filename)
+	{
+		JpegExifOrient::setOrientation($filename, 1);
+	}
 
 }

Classes/FileUpload/Optimizer/Resize.php

Indentation +111 added lines, -111 removed lines

@@ -19,116 +19,116 @@
 class Resize implements ImageOptimizerInterface
 {
 
-    /**
-     * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
-     */
-    protected $gifCreator;
-
-    /**
-     * @var \TYPO3\CMS\Core\Resource\ResourceStorage
-     */
-    protected $storage;
-
-    /**
-     * Constructor
-     */
-    public function __construct($storage = null)
-    {
-        $this->storage = $storage;
-        $this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
-    }
-
-    /**
-     * Optimize the given uploaded image.
-     *
-     * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
-     * @return \Fab\Media\FileUpload\UploadedFileInterface
-     */
-    public function optimize($uploadedFile)
-    {
-
-        $imageInfo = getimagesize($uploadedFile->getFileWithAbsolutePath());
-
-        $currentWidth = $imageInfo[0];
-        $currentHeight = $imageInfo[1];
-
-        // resize an image if this one is bigger than telling by the settings.
-        if (is_object($this->storage)) {
-            $storageRecord = $this->storage->getStorageRecord();
-        } else {
-            // Will only work in the BE for now.
-            $storage = $this->getMediaModule()->getCurrentStorage();
-            $storageRecord = $storage->getStorageRecord();
-        }
-
-        if (strlen($storageRecord['maximum_dimension_original_image']) > 0) {
-
-            /** @var \Fab\Media\Dimension $imageDimension */
-            $imageDimension = GeneralUtility::makeInstance(\Fab\Media\Dimension::class, $storageRecord['maximum_dimension_original_image']);
-            if ($currentWidth > $imageDimension->getWidth() || $currentHeight > $imageDimension->getHeight()) {
-
-                // resize taking the width as reference
-                $this->resize($uploadedFile->getFileWithAbsolutePath(), $imageDimension->getWidth(), $imageDimension->getHeight());
-            }
-        }
-        return $uploadedFile;
-    }
-
-    /**
-     * Resize an image according to given parameter.
-     *
-     * @throws \Exception
-     * @param string $fileNameAndPath
-     * @param int $width
-     * @param int $height
-     * @return void
-     */
-    public function resize($fileNameAndPath, $width = 0, $height = 0)
-    {
-
-        // Skip profile of the image
-        $imParams = '###SkipStripProfile###';
-        $options = array(
-            'maxW' => $width,
-            'maxH' => $height,
-        );
-
-        $tempFileInfo = $this->gifCreator->imageMagickConvert($fileNameAndPath, '', '', '', $imParams, '', $options, true);
-        if ($tempFileInfo) {
-
-            // Overwrite original file
-            @unlink($fileNameAndPath);
-            @rename($tempFileInfo[3], $fileNameAndPath);
-        }
-    }
-
-    /**
-     * Escapes a file name so it can safely be used on the command line.
-     *
-     * @see \TYPO3\CMS\Core\Imaging\GraphicalFunctions
-     * @param string $inputName filename to safeguard, must not be empty
-     * @return string $inputName escaped as needed
-     */
-    protected function wrapFileName($inputName)
-    {
-        if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
-            $currentLocale = setlocale(LC_CTYPE, 0);
-            setlocale(LC_CTYPE, $GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLocale']);
-        }
-        $escapedInputName = escapeshellarg($inputName);
-        if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
-            setlocale(LC_CTYPE, $currentLocale);
-        }
-        return $escapedInputName;
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
+	/**
+	 * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
+	 */
+	protected $gifCreator;
+
+	/**
+	 * @var \TYPO3\CMS\Core\Resource\ResourceStorage
+	 */
+	protected $storage;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct($storage = null)
+	{
+		$this->storage = $storage;
+		$this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
+		$this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+	}
+
+	/**
+	 * Optimize the given uploaded image.
+	 *
+	 * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface
+	 */
+	public function optimize($uploadedFile)
+	{
+
+		$imageInfo = getimagesize($uploadedFile->getFileWithAbsolutePath());
+
+		$currentWidth = $imageInfo[0];
+		$currentHeight = $imageInfo[1];
+
+		// resize an image if this one is bigger than telling by the settings.
+		if (is_object($this->storage)) {
+			$storageRecord = $this->storage->getStorageRecord();
+		} else {
+			// Will only work in the BE for now.
+			$storage = $this->getMediaModule()->getCurrentStorage();
+			$storageRecord = $storage->getStorageRecord();
+		}
+
+		if (strlen($storageRecord['maximum_dimension_original_image']) > 0) {
+
+			/** @var \Fab\Media\Dimension $imageDimension */
+			$imageDimension = GeneralUtility::makeInstance(\Fab\Media\Dimension::class, $storageRecord['maximum_dimension_original_image']);
+			if ($currentWidth > $imageDimension->getWidth() || $currentHeight > $imageDimension->getHeight()) {
+
+				// resize taking the width as reference
+				$this->resize($uploadedFile->getFileWithAbsolutePath(), $imageDimension->getWidth(), $imageDimension->getHeight());
+			}
+		}
+		return $uploadedFile;
+	}
+
+	/**
+	 * Resize an image according to given parameter.
+	 *
+	 * @throws \Exception
+	 * @param string $fileNameAndPath
+	 * @param int $width
+	 * @param int $height
+	 * @return void
+	 */
+	public function resize($fileNameAndPath, $width = 0, $height = 0)
+	{
+
+		// Skip profile of the image
+		$imParams = '###SkipStripProfile###';
+		$options = array(
+			'maxW' => $width,
+			'maxH' => $height,
+		);
+
+		$tempFileInfo = $this->gifCreator->imageMagickConvert($fileNameAndPath, '', '', '', $imParams, '', $options, true);
+		if ($tempFileInfo) {
+
+			// Overwrite original file
+			@unlink($fileNameAndPath);
+			@rename($tempFileInfo[3], $fileNameAndPath);
+		}
+	}
+
+	/**
+	 * Escapes a file name so it can safely be used on the command line.
+	 *
+	 * @see \TYPO3\CMS\Core\Imaging\GraphicalFunctions
+	 * @param string $inputName filename to safeguard, must not be empty
+	 * @return string $inputName escaped as needed
+	 */
+	protected function wrapFileName($inputName)
+	{
+		if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
+			$currentLocale = setlocale(LC_CTYPE, 0);
+			setlocale(LC_CTYPE, $GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLocale']);
+		}
+		$escapedInputName = escapeshellarg($inputName);
+		if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
+			setlocale(LC_CTYPE, $currentLocale);
+		}
+		return $escapedInputName;
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
 
 }