Version 3.4.6

upload/ips_kernel/classImageImagemagick.php

@@ -3,19 +3,19 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.4.5
+ * IP.Board v3.4.6
  * Image Handler: ImageMagick Library
- * Last Updated: $Date: 2013-02-20 19:45:47 -0500 (Wed, 20 Feb 2013) $
+ * Last Updated: $Date: 2013-08-05 19:04:11 -0400 (Mon, 05 Aug 2013) $
  * </pre>
  *
- * @author 		$Author: bfarber $
+ * @author 		$Author: AndyMillne $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/company/standards.php#license
  * @package		IP.Board
  * @subpackage	Kernel
  * @link		http://www.invisionpower.com
  * @since		Monday 5th May 2008 14:00
- * @version		$Revision: 12007 $
+ * @version		$Revision: 12329 $
  *
  * ImageMagick Example
  * <code>
@@ -26,12 +26,12 @@
  *					'im_path'		=> '/path/to/imagemagick/folder/',
  *					'temp_path'		=> '/tmp/',
  * 			)		);
- * 
+ *
  * if( $image->error )
  * {
  * 	print $image->error;exit;
  * }
- * 
+ *
  * Set max width and height
  * $image->resizeImage( 600, 480 );
  * // Add a watermark
@@ -133,6 +133,8 @@ class classImageImagemagick extends classImage implements interfaceImage
 			@unlink( $this->temp_file );
 		}
 		
+		@copy( $this->image_full, $this->temp_file );
+		
 	 	//---------------------------------------------------------
 	 	// Get image extension
 	 	//---------------------------------------------------------
@@ -193,7 +195,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 		//$ratioOrig	= 1;
 	 	}
   
-	    if ( $width / $height > $ratioOrig ) 
+	    if ( $width / $height > $ratioOrig )
 	    {
 	       $nheight = $width / $ratioOrig;
 	       $nwidth  = $width;
@@ -229,7 +231,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 * @return	@e array
 	 */
 	public function crop( $x1, $y1, $width, $height )
-	{  		
+	{
         $this->_cropX = $x1;
         $this->_cropY = $y1;
        
@@ -268,7 +270,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 		if( ! is_array($new_dims) OR !count($new_dims) OR !$new_dims['img_width'] )
 		{
 			if( ! $this->force_resize )
-			{ 
+			{
 				return array( 'originalWidth'  => $this->orig_dimensions['width'],
 					 		  'originalHeight' => $this->orig_dimensions['height'],
 					 		  'newWidth'       => $this->orig_dimensions['width'],
@@ -503,7 +505,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 	}
 	 	else
 	 	{
-		 	return false;			
+		 	return false;
 	 	}
 	}
 	
@@ -596,7 +598,7 @@ class classImageImagemagick extends classImage implements interfaceImage
 	 	}
 	 	else
 	 	{
-		 	return false;			
+		 	return false;
 	 	}
 	}