Update to latest patch from project CVS

1 files changed, 54 insertions, 14 deletions

diff --git a/www/WebMagick/files/patch-aa b/www/WebMagick/files/patch-aa
index fac6f7edf80d..1d3aa5885d32 100644
--- a/www/WebMagick/files/patch-aa
+++ b/www/WebMagick/files/patch-aa
@@ -1,5 +1,19 @@
---- webmagick.orig	Wed Oct 23 03:50:49 2002
-+++ webmagick.in	Wed Oct 23 04:25:13 2002
+Index: webmagick.in
+===================================================================
+RCS file: /cvsroot/webmagick/WebMagick/webmagick.in,v
+retrieving revision 1.114
+retrieving revision 1.116
+diff -u -r1.114 -r1.116
+--- webmagick.in	25 Sep 2002 01:00:20 -0000	1.114
++++ webmagick.in	23 Oct 2002 00:57:06 -0000	1.116
+@@ -1,6 +1,6 @@
+ #! @PERL@ 
+ #
+-# $Id: webmagick.in,v 1.114 2002/09/25 01:00:20 clindell Exp $
++# $Id: webmagick.in,v 1.116 2002/10/23 00:57:06 ache Exp $
+ #
+ # You are looking at the main PERL script for WebMagick, a package to
+ # intelligently create HTML and JavaScript index files and imagemaps
 @@ -1595,9 +1595,6 @@
  	 'address'		=> $opt_address,	 
  	 'anonymous'		=> $opt_anonymous,
@@ -20,33 +34,55 @@
  	 'metaauthor'		=> $opt_metaauthor,
  	 'metacharset'          => $opt_metacharset,
  	 'metaclassification'	=> $opt_metaclassification,
-@@ -2938,6 +2938,8 @@
+@@ -2937,11 +2937,13 @@
+ 					       $opt_forcelowres, $opt_lowresgeom,
  					       $opt_lowresformat, $opt_lowresmin,
  					       0, 0);
++		undef @$image; # Only delete image data, not object
++
  		if ($rc == -1) {
-+		    # @$image already deleted
 +		    print("Trying next image...\n");
  		    next READ;
  		}
  
+-		undef @$image; # Only delete image data, not object
+ 	    }
+ 
+ 	    #then do the thumbnail
 @@ -2951,7 +2953,9 @@
  					   $opt_cacheformat, $opt_cachemin,
  					   $opt_thumbprehook, $opt_thumbposthook);
  	    if ($rc == -1) {
 -			next READ;
-+		# @$image already deleted
++		undef @$image; # Only delete image data, not object
 +		print("Trying next image...\n");
 +		next READ;
  	    }
  
  	    #
-@@ -3731,14 +3735,18 @@
+@@ -2959,8 +2963,6 @@
+ 	    #
+ 	    push(@$thumbs, @$image);
+ 	     
+-	    #print( STDERR "Freeing $imagename ...\n") if $opt_debug;
+-             
+ 	    # Only delete image data, not object
+ 	    undef @$image;
+ 	}
+@@ -3698,7 +3700,6 @@
+ 		print( STDERR "Reading $cachename ...\n" ) if $opt_debug;
+ 		$status = $image->Read("$cachename");
+ 		if ("$status") {
+-			undef @$image;						# Only delete image data, not object
+ 			handleMagickError( __FILE__, __LINE__, $cachename, $status);
+ 			return -1;								# Try to read next image
+ 		}
+@@ -3731,14 +3732,16 @@
  		# scaled sizes) but not smaller.
  		# This uses a feature available in PerlMagick 1.12 and beyond
  		$status = $image->Set(size=>$a_geometry);
 -		handleMagickError( __FILE__, __LINE__, "$a_geometry", $status) if "$status";
 +		if ("$status") {
-+			undef @$image;
 +			handleMagickError( __FILE__, __LINE__, "$a_geometry", $status);
 +			return -1;								# Try to read next image		    }
 +		}
@@ -58,44 +94,48 @@
 -			undef @$image;						# Only delete image data, not object
 -			print("Trying next image ...\n" );
 +		if ("$status") {
-+			undef @$image;
 +			handleMagickError( __FILE__, __LINE__, $imagename, $status);
  			return -1;								# Try to read next image		    }
  		}
  
-@@ -3826,7 +3834,11 @@
+@@ -3802,7 +3805,6 @@
+ 			}
+ 		    
+ 			if ("$status") {
+-				undef @$image;					# Only delete image data, not object
+ 				handleMagickError( __FILE__, __LINE__, $imagename, $status);
+ 				return -1;							# Try to read next image
+ 			}
+@@ -3826,7 +3828,10 @@
  
  			# Apply comment to thumbnail image
  			$status = $image->Comment( $comment );
 -			handleMagickError( __FILE__, __LINE__, $cachename, $status) if "$status";
 +			if ("$status") {
-+				undef @$image;
 +				handleMagickError( __FILE__, __LINE__, $cachename, $status);
 +				return -1;
 +			}
  		    
  			print( STDERR "Writing ${cachename} ...\n" )
  			    if $opt_debug;
-@@ -3844,7 +3856,11 @@
+@@ -3844,7 +3849,10 @@
  							filename=>"${a_cacheformat}:${cachename}"
  						       );
  			}
 -			handleMagickError( __FILE__, __LINE__, $cachename, $status) if "$status";
 +			if ("$status") {
-+				undef @$image;
 +				handleMagickError( __FILE__, __LINE__, $cachename, $status);
 +				return -1;
 +			}
  			if (! $a_lowres) {
  			# TODO: for some reason, the output looks like these are getting put in twice, once with .cache/
  				$thumbImageSizes{$imagename} = html_imgsize($cachename);
-@@ -3916,12 +3932,13 @@
+@@ -3916,12 +3924,12 @@
  	    print( STDERR "Applying image label: \"${label}\"\n" )
  		if $opt_debug;
  	    $status = $image->Label( $label );
 -	    handleMagickError( __FILE__, __LINE__, $imagename, $status) if "$status";
 +	    if ("$status") {
-+		    undef @$image;
 +		    handleMagickError( __FILE__, __LINE__, $imagename, $status);
 +		    return -1;
 +	    }