image handling class

3 files changed, 373 insertions, 280 deletions

diff --git a/inc/functions.php b/inc/functions.php
index 7e57f7bd..91b68bfc 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1495,91 +1495,7 @@
 		return "{$numerator}{$sep}{$denominator}";
 	}
 
-	/*********************************************/
-	/* Fonction: imagecreatefrombmp              */
-	/* Author:   DHKold                          */
-	/* Contact:  admin@dhkold.com                */
-	/* Date:     The 15th of June 2005           */
-	/* Version:  2.0B                            */
-	/*********************************************/
-
-	function imagecreatefrombmp($filename) {
-	   if (! $f1 = fopen($filename,"rb")) return FALSE;
-	   $FILE = unpack("vfile_type/Vfile_size/Vreserved/Vbitmap_offset", fread($f1,14));
-	   if ($FILE['file_type'] != 19778) return FALSE;
-	   $BMP = unpack('Vheader_size/Vwidth/Vheight/vplanes/vbits_per_pixel'.
-					 '/Vcompression/Vsize_bitmap/Vhoriz_resolution'.
-					 '/Vvert_resolution/Vcolors_used/Vcolors_important', fread($f1,40));
-	   $BMP['colors'] = pow(2,$BMP['bits_per_pixel']);
-	   if ($BMP['size_bitmap'] == 0) $BMP['size_bitmap'] = $FILE['file_size'] - $FILE['bitmap_offset'];
-	   $BMP['bytes_per_pixel'] = $BMP['bits_per_pixel']/8;
-	   $BMP['bytes_per_pixel2'] = ceil($BMP['bytes_per_pixel']);
-	   $BMP['decal'] = ($BMP['width']*$BMP['bytes_per_pixel']/4);
-	   $BMP['decal'] -= floor($BMP['width']*$BMP['bytes_per_pixel']/4);
-	   $BMP['decal'] = 4-(4*$BMP['decal']);
-	   if ($BMP['decal'] == 4) $BMP['decal'] = 0;
-
-	   $PALETTE = array();
-	   if ($BMP['colors'] < 16777216)
-	   {
-		$PALETTE = unpack('V'.$BMP['colors'], fread($f1,$BMP['colors']*4));
-	   }
-
-	   $IMG = fread($f1,$BMP['size_bitmap']);
-	   $VIDE = chr(0);
-
-	   $res = imagecreatetruecolor($BMP['width'],$BMP['height']);
-	   $P = 0;
-	   $Y = $BMP['height']-1;
-	   while ($Y >= 0)
-	   {
-		$X=0;
-		while ($X < $BMP['width'])
-		{
-		 if ($BMP['bits_per_pixel'] == 24)
-			$COLOR = unpack("V",substr($IMG,$P,3).$VIDE);
-		 elseif ($BMP['bits_per_pixel'] == 16)
-		 {  
-			$COLOR = unpack("n",substr($IMG,$P,2));
-			$COLOR[1] = $PALETTE[$COLOR[1]+1];
-		 }
-		 elseif ($BMP['bits_per_pixel'] == 8)
-		 {  
-			$COLOR = unpack("n",$VIDE.substr($IMG,$P,1));
-			$COLOR[1] = $PALETTE[$COLOR[1]+1];
-		 }
-		 elseif ($BMP['bits_per_pixel'] == 4)
-		 {
-			$COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
-			if (($P*2)%2 == 0) $COLOR[1] = ($COLOR[1] >> 4) ; else $COLOR[1] = ($COLOR[1] & 0x0F);
-			$COLOR[1] = $PALETTE[$COLOR[1]+1];
-		 }
-		 elseif ($BMP['bits_per_pixel'] == 1)
-		 {
-			$COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
-			if     (($P*8)%8 == 0) $COLOR[1] =  $COLOR[1]        >>7;
-			elseif (($P*8)%8 == 1) $COLOR[1] = ($COLOR[1] & 0x40)>>6;
-			elseif (($P*8)%8 == 2) $COLOR[1] = ($COLOR[1] & 0x20)>>5;
-			elseif (($P*8)%8 == 3) $COLOR[1] = ($COLOR[1] & 0x10)>>4;
-			elseif (($P*8)%8 == 4) $COLOR[1] = ($COLOR[1] & 0x8)>>3;
-			elseif (($P*8)%8 == 5) $COLOR[1] = ($COLOR[1] & 0x4)>>2;
-			elseif (($P*8)%8 == 6) $COLOR[1] = ($COLOR[1] & 0x2)>>1;
-			elseif (($P*8)%8 == 7) $COLOR[1] = ($COLOR[1] & 0x1);
-			$COLOR[1] = $PALETTE[$COLOR[1]+1];
-		 }
-		 else
-			return FALSE;
-		 imagesetpixel($res,$X,$Y,$COLOR[1]);
-		 $X++;
-		 $P += $BMP['bytes_per_pixel'];
-		}
-		$Y--;
-		$P+=$BMP['decal'];
-	   }
-	   fclose($f1);
-
-	 return $res;
-	}
+	
 	
 	function getPostByHash($hash) {
 		global $board;
@@ -1602,176 +1518,4 @@
 				file_unlink($post['thumb']);
 		}
 	}
-	
-	function createimage($type, $source_pic) {
-		global $config;
-		
-		$image = false;
-		switch($type) {
-			case 'jpg':
-			case 'jpeg':				
-				if(!$image = @imagecreatefromjpeg($source_pic)) {
-					file_unlink($source_pic);
-					error($config['error']['invalidimg']);
-				}
-				break;
-			case 'png':
-				if(!$image = @imagecreatefrompng($source_pic)) {
-					file_unlink($source_pic);
-					error($config['error']['invalidimg']);
-				}
-				break;
-			case 'gif':
-				if(!$image = @imagecreatefromgif($source_pic)) {
-					file_unlink($source_pic);
-					error($config['error']['invalidimg']);
-				}
-				break;
-			case 'bmp':
-				if(!$image = @imagecreatefrombmp($source_pic)) {
-					unlink($source_pic);
-					file_unlink($config['error']['invalidimg']);
-				}
-				break;
-			default:
-				error($config['error']['unknownext']);
-		}
-		return $image;
-	}
-
-	function resize($src, $width, $height, $destination_pic, $max_width, $max_height, $ext) {
-		global $config;
-		$return = Array();
-
-		$x_ratio = $max_width / $width;
-		$y_ratio = $max_height / $height;
-
-		if(($width <= $max_width) && ($height <= $max_height)) {
-			$tn_width = $width;
-			$tn_height = $height;
-			} elseif (($x_ratio * $height) < $max_height) {
-				$tn_height = ceil($x_ratio * $height);
-				$tn_width = $max_width;
-			} else {
-				$tn_width = ceil($y_ratio * $width);
-				$tn_height = $max_height;
-		}
-
-		$return['width'] = $tn_width;
-		$return['height'] = $tn_height;
-
-		$tmp = imagecreatetruecolor($tn_width, $tn_height);
-		
-		if($ext == 'png' || $ext == 'gif') {
-			imagecolortransparent($tmp, imagecolorallocatealpha($tmp, 0, 0, 0, 0));
-			imagesavealpha($tmp, true);
-		}
-		if($ext == 'png')
-			imagealphablending($tmp, false);
-		
-		imagecopyresampled($tmp, $src, 0, 0, 0, 0, $tn_width, $tn_height, $width, $height);
-		
-		switch($ext) {
-			case 'jpg':
-			case 'jpeg':
-				imagejpeg($tmp, $destination_pic);
-				break;
-			case 'png':
-				imagepng($tmp, $destination_pic, $config['thumb_quality']);
-				break;
-			case 'gif':
-				imagegif($tmp, $destination_pic);
-				break;
-			case 'bmp':
-				imagebmp($tmp, $destination_pic);
-				break;
-			default:
-				error($config['error']['unknownext']);
-		}
-		
-		imagedestroy($src);
-		imagedestroy($tmp);
-
-		return $return;
-	}
-
-	function imagebmp(&$img, $filename='') {
-		$widthOrig = imagesx($img);
-		$widthFloor = ((floor($widthOrig/16))*16);
-		$widthCeil = ((ceil($widthOrig/16))*16);
-		$height = imagesy($img);
-
-		$size = ($widthCeil*$height*3)+54;
-
-		// Bitmap File Header
-		$result = 'BM';	 // header (2b)
-		$result .= int_to_dword($size); // size of file (4b)
-		$result .= int_to_dword(0); // reserved (4b)
-		$result .= int_to_dword(54); // byte location in the file which is first byte of IMAGE (4b)
-		// Bitmap Info Header
-		$result .= int_to_dword(40); // Size of BITMAPINFOHEADER (4b)
-		$result .= int_to_dword($widthCeil); // width of bitmap (4b)
-		$result .= int_to_dword($height); // height of bitmap (4b)
-		$result .= int_to_word(1);	// biPlanes = 1 (2b)
-		$result .= int_to_word(24); // biBitCount = {1 (mono) or 4 (16 clr ) or 8 (256 clr) or 24 (16 Mil)} (2b
-		$result .= int_to_dword(0); // RLE COMPRESSION (4b)
-		$result .= int_to_dword(0); // width x height (4b)
-		$result .= int_to_dword(0); // biXPelsPerMeter (4b)
-		$result .= int_to_dword(0); // biYPelsPerMeter (4b)
-		$result .= int_to_dword(0); // Number of palettes used (4b)
-		$result .= int_to_dword(0); // Number of important colour (4b)
-
-		// is faster than chr()
-		$arrChr = array();
-		for($i=0; $i<256; $i++){
-		$arrChr[$i] = chr($i);
-		}
-
-		// creates image data
-		$bgfillcolor = array('red'=>0, 'green'=>0, 'blue'=>0);
-
-		// bottom to top - left to right - attention blue green red !!!
-		$y=$height-1;
-		for ($y2=0; $y2<$height; $y2++) {
-			for ($x=0; $x<$widthFloor;	) {
-				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
-				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
-				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
-				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
-				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
-				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
-				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
-				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
-				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
-				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
-				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
-				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
-				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
-				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
-				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
-				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
-			}
-			for ($x=$widthFloor; $x<$widthCeil; $x++) {
-				$rgb = ($x<$widthOrig) ? imagecolorsforindex($img, imagecolorat($img, $x, $y)) : $bgfillcolor;
-				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
-			}
-			$y--;
-		}
-
-		// see imagegif
-		if($filename == '') {
-			echo $result;
-		} else {
-			$file = fopen($filename, 'wb');
-			fwrite($file, $result);
-			fclose($file);
-		}
-	}
-	// imagebmp helpers
-	function int_to_dword($n) {
-		return chr($n & 255).chr(($n >> 8) & 255).chr(($n >> 16) & 255).chr(($n >> 24) & 255);
-	}
-	function int_to_word($n) {
-		return chr($n & 255).chr(($n >> 8) & 255);
-	}
 ?>
diff --git a/inc/image.php b/inc/image.php
new file mode 100644
index 00000000..d5dfd494
--- /dev/null
+++ b/inc/image.php
@@ -0,0 +1,346 @@
+<?php
+	if($_SERVER['SCRIPT_FILENAME'] == str_replace('\\', '/', __FILE__)) {
+		// You cannot request this file directly.
+		header('Location: ../', true, 302);
+		exit;
+	}
+
+	class Image {
+		public $src, $format, $image, $size;
+		public function __construct($src, $format = false) {
+			global $config;
+			
+			$this->src = $src;
+			$this->format = $format;
+			
+			$classname = 'Image' . strtoupper($this->format);
+			if(!class_exists($classname)) {
+				error('Unsupported file format: ' . $this->format);
+			}
+			
+			$this->image = new $classname($this);
+			if(!$this->image->valid()) {
+				$this->delete();
+				error($config['error']['invalidimg']);
+			}
+			
+			$this->size = (object)Array('width' => $this->image->_width(), 'height' => $this->image->_height());
+			if($this->size->width < 1 || $this->size->height < 1) {
+				$this->delete();
+				error($config['error']['invalidimg']);
+			}
+		}
+		
+		public function resize($extension, $max_width, $max_height) {
+			$classname = 'Image' . strtoupper($extension);
+			if(!class_exists($classname)) {
+				error('Unsupported file format: ' . $extension);
+			}
+			$thumb = new $classname(false);
+			$thumb->original_width = $this->size->width;
+			$thumb->original_height = $this->size->height;
+			
+			$x_ratio = $max_width / $this->size->width;
+			$y_ratio = $max_height / $this->size->height;
+			
+			if(($this->size->width <= $max_width) && ($this->size->height <= $max_height)) {
+				$width = $this->size->width;
+				$height = $this->size->height;
+			} elseif (($x_ratio * $this->size->height) < $max_height) {
+				$height = ceil($x_ratio * $this->size->height);
+				$width = $max_width;
+			} else {
+				$width = ceil($y_ratio * $this->size->width);
+				$height = $max_height;
+			}
+			
+			$thumb->_resize($this->image->image, $width, $height);
+			return $thumb;
+		}
+		
+		public function delete() {
+			file_unlink($this->src);
+		}
+		public function destroy() {
+			$this->image->_destroy();
+		}
+	}
+	
+	class ImageGD {
+		public function GD_create() {
+			$this->image = imagecreatetruecolor($this->width, $this->height);
+		}
+		public function GD_copyresampled() {
+			imagecopyresampled($this->image, $this->original, 0, 0, 0, 0, $this->width, $this->height, $this->original_width, $this->original_height);
+		}
+		public function GD_resize() {
+			$this->GD_create();
+			$this->GD_copyresampled();
+		}
+	}
+	
+	class ImageBase extends ImageGD {
+		public $image, $src, $original, $original_width, $original_height, $width, $height;		
+		public function valid() {
+			return (bool)$this->image;
+		}
+		
+		public function __construct($img) {
+			if($img !== false) {
+				$this->src = &$img->src;
+				$this->from();
+			}
+		}
+		
+		public function _width() {
+			if(method_exists($this, 'width'))
+				return $this->width();
+			// use default GD functions
+			return imagesx($this->image);
+		}
+		public function _height() {
+			if(method_exists($this, 'height'))
+				return $this->height();
+			// use default GD functions
+			return imagesy($this->image);
+		}
+		public function _destroy() {
+			if(method_exists($this, 'destroy'))
+				return $this->destroy();
+			// use default GD functions
+			return imagedestroy($this->image);
+		}
+		public function _resize($original, $width, $height) {
+			$this->original = &$original;
+			$this->width = $width;
+			$this->height = $height;
+			
+			if(method_exists($this, 'resize'))
+				$this->resize();
+			else
+				// use default GD functions
+				$this->GD_resize();
+		}
+	}
+	
+	
+	class ImagePNG extends ImageBase {
+		public function from() {
+			$this->image = imagecreatefrompng($this->src);
+		}
+		public function to($src) {
+			global $config;
+			imagepng($this->image, $src, $config['thumb_quality']);
+		}
+		public function resize() {
+			$this->GD_create();
+			imagecolortransparent($this->image, imagecolorallocatealpha($this->image, 0, 0, 0, 0));
+			imagesavealpha($this->image, true);
+			imagealphablending($this->image, false);
+			$this->GD_copyresampled();
+		}
+	}
+	
+	class ImageGIF extends ImageBase {
+		public function from() {
+			$this->image = imagecreatefromgif($this->src);
+		}
+		public function to($src) {
+			imagegif($this->image, $src);
+		}
+		public function resize() {
+			$this->GD_create();
+			imagecolortransparent($this->image, imagecolorallocatealpha($this->image, 0, 0, 0, 0));
+			imagesavealpha($this->image, true);
+			$this->GD_copyresampled();
+		}
+	}
+	
+	class ImageJPG extends ImageBase {
+		public function from() {
+			$this->image = imagecreatefromjpeg($this->src);
+		}
+		public function to($src) {
+			imagejpeg($this->image, $src);
+		}
+	}
+	class ImageJPEG extends ImageJPG {
+	}
+	
+	class ImageBMP extends ImageBase {
+		public function from() {
+			$this->image = imagecreatefrombmp($this->src);
+		}
+		public function to($src) {
+			imagebmp($this->image, $src);
+		}
+	}
+	
+	
+	/*********************************************/
+	/* Fonction: imagecreatefrombmp              */
+	/* Author:   DHKold                          */
+	/* Contact:  admin@dhkold.com                */
+	/* Date:     The 15th of June 2005           */
+	/* Version:  2.0B                            */
+	/*********************************************/
+
+	function imagecreatefrombmp($filename) {
+	   if (! $f1 = fopen($filename,"rb")) return FALSE;
+	   $FILE = unpack("vfile_type/Vfile_size/Vreserved/Vbitmap_offset", fread($f1,14));
+	   if ($FILE['file_type'] != 19778) return FALSE;
+	   $BMP = unpack('Vheader_size/Vwidth/Vheight/vplanes/vbits_per_pixel'.
+					 '/Vcompression/Vsize_bitmap/Vhoriz_resolution'.
+					 '/Vvert_resolution/Vcolors_used/Vcolors_important', fread($f1,40));
+	   $BMP['colors'] = pow(2,$BMP['bits_per_pixel']);
+	   if ($BMP['size_bitmap'] == 0) $BMP['size_bitmap'] = $FILE['file_size'] - $FILE['bitmap_offset'];
+	   $BMP['bytes_per_pixel'] = $BMP['bits_per_pixel']/8;
+	   $BMP['bytes_per_pixel2'] = ceil($BMP['bytes_per_pixel']);
+	   $BMP['decal'] = ($BMP['width']*$BMP['bytes_per_pixel']/4);
+	   $BMP['decal'] -= floor($BMP['width']*$BMP['bytes_per_pixel']/4);
+	   $BMP['decal'] = 4-(4*$BMP['decal']);
+	   if ($BMP['decal'] == 4) $BMP['decal'] = 0;
+
+	   $PALETTE = array();
+	   if ($BMP['colors'] < 16777216)
+	   {
+		$PALETTE = unpack('V'.$BMP['colors'], fread($f1,$BMP['colors']*4));
+	   }
+
+	   $IMG = fread($f1,$BMP['size_bitmap']);
+	   $VIDE = chr(0);
+
+	   $res = imagecreatetruecolor($BMP['width'],$BMP['height']);
+	   $P = 0;
+	   $Y = $BMP['height']-1;
+	   while ($Y >= 0)
+	   {
+		$X=0;
+		while ($X < $BMP['width'])
+		{
+		 if ($BMP['bits_per_pixel'] == 24)
+			$COLOR = unpack("V",substr($IMG,$P,3).$VIDE);
+		 elseif ($BMP['bits_per_pixel'] == 16)
+		 {  
+			$COLOR = unpack("n",substr($IMG,$P,2));
+			$COLOR[1] = $PALETTE[$COLOR[1]+1];
+		 }
+		 elseif ($BMP['bits_per_pixel'] == 8)
+		 {  
+			$COLOR = unpack("n",$VIDE.substr($IMG,$P,1));
+			$COLOR[1] = $PALETTE[$COLOR[1]+1];
+		 }
+		 elseif ($BMP['bits_per_pixel'] == 4)
+		 {
+			$COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
+			if (($P*2)%2 == 0) $COLOR[1] = ($COLOR[1] >> 4) ; else $COLOR[1] = ($COLOR[1] & 0x0F);
+			$COLOR[1] = $PALETTE[$COLOR[1]+1];
+		 }
+		 elseif ($BMP['bits_per_pixel'] == 1)
+		 {
+			$COLOR = unpack("n",$VIDE.substr($IMG,floor($P),1));
+			if     (($P*8)%8 == 0) $COLOR[1] =  $COLOR[1]        >>7;
+			elseif (($P*8)%8 == 1) $COLOR[1] = ($COLOR[1] & 0x40)>>6;
+			elseif (($P*8)%8 == 2) $COLOR[1] = ($COLOR[1] & 0x20)>>5;
+			elseif (($P*8)%8 == 3) $COLOR[1] = ($COLOR[1] & 0x10)>>4;
+			elseif (($P*8)%8 == 4) $COLOR[1] = ($COLOR[1] & 0x8)>>3;
+			elseif (($P*8)%8 == 5) $COLOR[1] = ($COLOR[1] & 0x4)>>2;
+			elseif (($P*8)%8 == 6) $COLOR[1] = ($COLOR[1] & 0x2)>>1;
+			elseif (($P*8)%8 == 7) $COLOR[1] = ($COLOR[1] & 0x1);
+			$COLOR[1] = $PALETTE[$COLOR[1]+1];
+		 }
+		 else
+			return FALSE;
+		 imagesetpixel($res,$X,$Y,$COLOR[1]);
+		 $X++;
+		 $P += $BMP['bytes_per_pixel'];
+		}
+		$Y--;
+		$P+=$BMP['decal'];
+	   }
+	   fclose($f1);
+
+	 return $res;
+	}
+	
+	function imagebmp(&$img, $filename='') {
+		$widthOrig = imagesx($img);
+		$widthFloor = ((floor($widthOrig/16))*16);
+		$widthCeil = ((ceil($widthOrig/16))*16);
+		$height = imagesy($img);
+
+		$size = ($widthCeil*$height*3)+54;
+
+		// Bitmap File Header
+		$result = 'BM';	 // header (2b)
+		$result .= int_to_dword($size); // size of file (4b)
+		$result .= int_to_dword(0); // reserved (4b)
+		$result .= int_to_dword(54); // byte location in the file which is first byte of IMAGE (4b)
+		// Bitmap Info Header
+		$result .= int_to_dword(40); // Size of BITMAPINFOHEADER (4b)
+		$result .= int_to_dword($widthCeil); // width of bitmap (4b)
+		$result .= int_to_dword($height); // height of bitmap (4b)
+		$result .= int_to_word(1);	// biPlanes = 1 (2b)
+		$result .= int_to_word(24); // biBitCount = {1 (mono) or 4 (16 clr ) or 8 (256 clr) or 24 (16 Mil)} (2b
+		$result .= int_to_dword(0); // RLE COMPRESSION (4b)
+		$result .= int_to_dword(0); // width x height (4b)
+		$result .= int_to_dword(0); // biXPelsPerMeter (4b)
+		$result .= int_to_dword(0); // biYPelsPerMeter (4b)
+		$result .= int_to_dword(0); // Number of palettes used (4b)
+		$result .= int_to_dword(0); // Number of important colour (4b)
+
+		// is faster than chr()
+		$arrChr = array();
+		for($i=0; $i<256; $i++){
+		$arrChr[$i] = chr($i);
+		}
+
+		// creates image data
+		$bgfillcolor = array('red'=>0, 'green'=>0, 'blue'=>0);
+
+		// bottom to top - left to right - attention blue green red !!!
+		$y=$height-1;
+		for ($y2=0; $y2<$height; $y2++) {
+			for ($x=0; $x<$widthFloor;	) {
+				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+				$rgb = imagecolorsforindex($img, imagecolorat($img, $x++, $y));
+				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+			}
+			for ($x=$widthFloor; $x<$widthCeil; $x++) {
+				$rgb = ($x<$widthOrig) ? imagecolorsforindex($img, imagecolorat($img, $x, $y)) : $bgfillcolor;
+				$result .= $arrChr[$rgb['blue']].$arrChr[$rgb['green']].$arrChr[$rgb['red']];
+			}
+			$y--;
+		}
+
+		// see imagegif
+		if($filename == '') {
+			echo $result;
+		} else {
+			$file = fopen($filename, 'wb');
+			fwrite($file, $result);
+			fclose($file);
+		}
+	}
+	// imagebmp helpers
+	function int_to_dword($n) {
+		return chr($n & 255).chr(($n >> 8) & 255).chr(($n >> 16) & 255).chr(($n >> 24) & 255);
+	}
+	function int_to_word($n) {
+		return chr($n & 255).chr(($n >> 8) & 255);
+	}
+
+?>
diff --git a/post.php b/post.php
index ec2f6f15..1063a889 100644
--- a/post.php
+++ b/post.php
@@ -431,21 +431,6 @@
 			if(!@move_uploaded_file($_FILES['file']['tmp_name'], $post['file'])) error($config['error']['nomove']);
 			
 			if(!isset($__file)) {
-				$size = @getimagesize($post['file']);
-				$post['width'] = &$size[0];
-				$post['height'] = &$size[1];
-				
-				// Check if the image is valid
-				if($post['width'] < 1 || $post['height'] < 1) {
-					undoImage($post);
-					error($config['error']['invalidimg']);
-				}
-				
-				if($post['width'] > $config['max_width'] || $post['height'] > $config['max_height']) {
-					undoImage($post);
-					error($config['error']['maxsize']);
-				}
-				
 				// Check IE MIME type detection XSS exploit
 				$buffer = file_get_contents($post['file'], null, null, null, 255);
 				if(preg_match($config['ie_mime_type_detection'], $buffer)) {
@@ -453,21 +438,39 @@
 					error($config['error']['mime_exploit']);
 				}
 				
-				if($config['minimum_copy_resize'] && $post['width'] <= $config['thumb_width'] && $post['height'] <= $config['thumb_height'] && $post['extension'] == ($config['thumb_ext'] ? $config['thumb_ext'] : $post['extension'])) {
+				require_once 'inc/image.php';
+				// create image object
+				$image = new Image($post['file'], $post['extension']);
+				
+				if($image->size->width > $config['max_width'] || $image->size->height > $config['max_height']) {
+					$image->delete();
+					error($config['error']['maxsize']);
+				}
+				
+				
+				if($config['minimum_copy_resize'] &&
+					$image->size->width <= $config['thumb_width'] &&
+					$image->size->height <= $config['thumb_height'] &&
+					$post['extension'] == ($config['thumb_ext'] ? $config['thumb_ext'] : $post['extension'])) {
+					
 					// Copy, because there's nothing to resize
 					copy($post['file'], $post['thumb']);
 					
-					$post['thumbwidth'] = $post['width'];
-					$post['thumbheight'] = $post['height'];
+					$post['thumbwidth'] = $image->size->width;
+					$post['thumbheight'] = $image->size->height;
 				} else {
-					$image = createimage($post['extension'], $post['file']);
+					$thumb = $image->resize($config['thumb_ext'] ? $config['thumb_ext'] : $post['extension'], $config['thumb_width'], $config['thumb_height']);
+					$thumb->to($post['thumb']);
 					
-					// Create a thumbnail
-					$thumb = resize($image, $post['width'], $post['height'], $post['thumb'], $config['thumb_width'], $config['thumb_height'], ($config['thumb_ext'] ? $config['thumb_ext'] : $post['extension']));
+					//header('Content-Type: text/plain');
+					//var_dump($thumb);
+					//exit;
 					
-					$post['thumbwidth'] = $thumb['width'];
-					$post['thumbheight'] = $thumb['height'];
+					$post['thumbwidth'] = $thumb->width;
+					$post['thumbheight'] = $thumb->height;
+					$thumb->_destroy();
 				}
+				$image->destroy();
 			} else {
 				copy($config['file_thumb'], $post['thumb']);