From: Matthias Schmidt <gravatronics@live.com>
Date: Tue, 31 May 2016 18:40:07 +0000 (+0200)
Subject: Suppress warnings regarding JPEG images
X-Git-Tag: 2.1.11~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5cf84a99e197ebc86f26bf8eac895f91b4b1004e;p=GitHub%2FWoltLab%2FWCF.git

Suppress warnings regarding JPEG images
---

diff --git a/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
index 1ab8ed2cb0..edc253aff8 100644
--- a/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
+++ b/wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php
@@ -50,6 +50,14 @@ class GDImageAdapter implements IImageAdapter {
 	 */
 	protected $width = 0;
 	
+	/**
+	 * GDImageAdapter constructor.
+	 */
+	public function __construct() {
+		// suppress warnings like "recoverable error: Invalid SOS parameters for sequential JPEG"
+		@ini_set('gd.jpeg_ignore_warning', 1);
+	}
+	
 	/**
 	 * @see	\wcf\system\image\adapter\IImageAdapter::load()
 	 */
@@ -81,7 +89,11 @@ class GDImageAdapter implements IImageAdapter {
 			break;
 			
 			case IMAGETYPE_JPEG:
-				$this->image = imageCreateFromJpeg($file);
+				// suppress warnings and properly handle errors
+				$this->image = @imageCreateFromJpeg($file);
+				if ($this->image === false) {
+					throw new SystemException("Could not read jpeg image '".$file."'.");
+				}
 			break;
 			
 			case IMAGETYPE_PNG: