Merge pull request #227 from hempalex/master

Fix preserving WEBP transparency and formats magic numbers

Author: JamesHeinrich

phpthumb.class.php

@@ -3898,11 +3898,11 @@ public function SourceImageToGD() {
 			$this->gdimg_source = $this->ImageCreateFromStringReplacement($this->rawImageData);
 			if (!$this->gdimg_source) {
 				if (substr($this->rawImageData, 0, 2) === 'BM') {
-					$this->getimagesizeinfo[2] = 6; // BMP
+					$this->getimagesizeinfo[2] = IMAGETYPE_BMP; // BMP
 				} elseif (substr($this->rawImageData, 0, 4) === 'II'."\x2A\x00") {
-					$this->getimagesizeinfo[2] = 7; // TIFF (littlendian)
+					$this->getimagesizeinfo[2] = IMAGETYPE_TIFF_II; // TIFF (littlendian)
 				} elseif (substr($this->rawImageData, 0, 4) === 'MM'."\x00\x2A") {
-					$this->getimagesizeinfo[2] = 8; // TIFF (bigendian)
+					$this->getimagesizeinfo[2] = IMAGETYPE_TIFF_MM; // TIFF (bigendian)
 				}
 				$this->DebugMessage('SourceImageToGD.ImageCreateFromStringReplacement() failed with unknown image type "'.substr($this->rawImageData, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($this->rawImageData, 0, 4)).')', __FILE__, __LINE__);
 //				return $this->ErrorImage('Unknown image type identified by "'.substr($this->rawImageData, 0, 4).'" ('.phpthumb_functions::HexCharDisplay(substr($this->rawImageData, 0, 4)).') in SourceImageToGD()['.__LINE__.']');
@@ -3914,9 +3914,10 @@ public function SourceImageToGD() {
 				return $this->ErrorImage('$this->md5s != md5(sourceFilename)'."\n".'"'.$this->md5s.'" != '."\n".'"'.phpthumb_functions::md5_file_safe($this->sourceFilename).'"');
 			}
 			switch (@$this->getimagesizeinfo[2]) {
-				case 1:
-				case 3:
-					// GIF or PNG input file may have transparency
+				case IMAGETYPE_GIF:
+				case IMAGETYPE_PNG:
+				case IMAGETYPE_WEBP:
+					// GIF, PNG of WEBP input file may have transparency
 					$this->is_alpha = true;
 					break;
 			}
@@ -3992,18 +3993,23 @@ public function SourceImageToGD() {
 			$gd_info = gd_info();
 			$GDreadSupport = false;
 			switch (@$this->getimagesizeinfo[2]) {
-				case 1:
+				case IMAGETYPE_GIF:
 					$imageHeader = 'Content-Type: image/gif';
 					$GDreadSupport = (bool) @$gd_info['GIF Read Support'];
 					break;
-				case 2:
+				case IMAGETYPE_JPEG:
 					$imageHeader = 'Content-Type: image/jpeg';
 					$GDreadSupport = (bool) @$gd_info['JPG Support'];
 					break;
-				case 3:
+				case IMAGETYPE_PNG:
 					$imageHeader = 'Content-Type: image/png';
 					$GDreadSupport = (bool) @$gd_info['PNG Support'];
 					break;
+				case IMAGETYPE_WEBP:
+					$imageHeader = 'Content-Type: image/webp';
+					$GDreadSupport = (bool) @$gd_info['WebP Support '];
+					break;
+
 			}
 			if ($imageHeader) {
 				// cannot create image for whatever reason (maybe imagecreatefromjpeg et al are not available?)
@@ -4044,7 +4050,7 @@ public function SourceImageToGD() {
 			//switch (substr($this->rawImageData, 0, 2)) {
 			//	case 'BM':
 			switch (@$this->getimagesizeinfo[2]) {
-				case 6:
+				case IMAGETYPE_BMP:
 					ob_start();
 					if (!@include_once __DIR__ .'/phpthumb.bmp.php' ) {
 						ob_end_clean();
@@ -4071,8 +4077,8 @@ public function SourceImageToGD() {
 			//switch (substr($this->rawImageData, 0, 4)) {
 			//	case 'II'."\x2A\x00":
 			//	case 'MM'."\x00\x2A":
-				case 7:
-				case 8:
+				case IMAGETYPE_TIFF_II:
+				case IMAGETYPE_TIFF_MM:
 					return $this->ErrorImage($this->ImageMagickVersion() ? 'ImageMagick failed on TIFF source conversion' : 'ImageMagick is unavailable and phpThumb() does not support TIFF source images without it');
 					break;