From 069d8633411b10bf48d67ee67b7df39478c1731f Mon Sep 17 00:00:00 2001
From: Jens Frank <jeluf@users.mediawiki.org>
Date: Thu, 20 May 2004 12:03:22 +0000
Subject: [PATCH] Only generate truecolor PNGs if original image is already
 truecolor. Will still generate truecolor for PHP 4.2 or earlier.

Fix for bug #918857
---
 includes/Image.php | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/includes/Image.php b/includes/Image.php
index 324b51d42a..2482718c2b 100644
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -14,7 +14,8 @@ class Image
 		$historyLine,	# Number of line to return by nextHistoryLine()
 		$historyRes,	# result of the query for the image's history
 		$width,		# \
-		$height,	#  --- returned by getimagesize, see http://de3.php.net/manual/en/function.getimagesize.php
+		$height,	#  |
+		$bits,		#   --- returned by getimagesize, see http://de3.php.net/manual/en/function.getimagesize.php
 		$type,		#  |
 		$attr;		# /
 
@@ -35,6 +36,17 @@ class Image
 		if ( $this->fileExists = file_exists( $this->imagePath ) ) // Sic!, "=" is intended
 		{
 			list($this->width, $this->height, $this->type, $this->attr) = getimagesize( $this->imagePath );
+			$gid = getimagesize( $this->imagePath );
+			$this->width = $gid["width"];
+			$this->height = $gid["height"];
+			$this->type = $gid["type"];
+			$this->attr = $gid["attr"];
+			if ( defined( $gid["bits"] ) ) 
+			{
+				$this->bits = $gid["bits"];
+			} else {
+				$this->bits = 0;
+			}
 		}
 		$this->historyLine = 0;
 	}
@@ -168,6 +180,8 @@ class Image
 				#
 				# First find out what kind of file this is, and select the correct
 				# input routine for this.
+
+				$truecolor = false;
 				
 				switch( $this->type ) {
 					case 1: # GIF
@@ -175,9 +189,11 @@ class Image
 						break;
 					case 2: # JPG
 						$src_image = imagecreatefromjpeg( $this->imagePath );
+						$truecolor = true;
 						break;
 					case 3: # PNG
 						$src_image = imagecreatefrompng( $this->imagePath );
+						$truecolor = ( $this->bits > 8 );
 						break;
 					case 15: # WBMP for WML
 						$src_image = imagecreatefromwbmp( $this->imagePath );
@@ -190,7 +206,11 @@ class Image
 						break;
 				}
 				$height = floor( $this->height * ( $width/$this->width ) );
-				$dst_image = imagecreatetruecolor( $width, $height );
+				if ( $truecolor ) {
+					$dst_image = imagecreatetruecolor( $width, $height );
+				} else {
+					$dst_image = imagecreate( $width, $height );
+				}
 				imagecopyresampled( $dst_image, $src_image, 
 							0,0,0,0,
 							$width, $height, $this->width, $this->height );
-- 
2.20.1