[SCM] Debian packaging of libimage-size-perl branch, master, updated. debian/3.232-1-3-gd7da7b6

[gregor herrmann]

The following commit has been merged in the master branch:
commit b656d49a42802f59664a5277fe22ef518cd63024
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue Jul 24 20:05:46 2012 +0200

    unapply patch in git
    
    Git-Dch: Ignore

diff --git a/imgsize b/imgsize
index 66493d4..3c27abd 100755
--- a/imgsize
+++ b/imgsize
@@ -46,13 +46,11 @@ $opts{r} &&
 $opts{f} &&
     ($rtn = \&return_fmt);
 
-my $error = 0;
-
 if (@ARGV > 1)
 {
     foreach (@ARGV)
     {
-        print STDOUT sprintf("%s: %s\n", $_, $rtn->($_));
+        printf "$_: %s\n", $rtn->($_);
     }
 }
 else
@@ -60,7 +58,7 @@ else
     printf "%s\n", $rtn->($ARGV[0]);
 }
 
-exit $error;
+exit 0;
 
 sub return_html
 {
@@ -69,7 +67,7 @@ sub return_html
     my ($width, $height, $err) = imgsize($file);
 
     return (defined $width) ?
-        qq(width="$width" height="$height") : ("error: $err", $error = 1);
+        qq(width="$width" height="$height") : "error: $err";
 }
 
 sub return_attr
@@ -79,7 +77,7 @@ sub return_attr
     my ($width, $height, $err) = imgsize($file);
 
     return (defined $width) ?
-        "(-width => $width, -height => $height)" : ("error: $err", $error = 1);
+        "(-width => $width, -height => $height)" : "error: $err";
 }
 
 sub return_imgsize
@@ -88,7 +86,7 @@ sub return_imgsize
 
     my ($width, $height, $err) = imgsize($file);
 
-    return (defined $width) ? "$width $height" : ("error: $err", $error = 1);
+    return (defined $width) ? "$width $height" : "error: $err";
 }
 
 sub return_fmt
@@ -98,7 +96,7 @@ sub return_fmt
     my ($width, $height, $err) = imgsize($file);
 
     return (defined $width) ?
-        sprintf($opts{f}, $width, $height, $err) : ("error: $err", $error = 1);
+        sprintf($opts{f}, $width, $height, $err) : "error: $err";
 }
 
 __END__

-- 
Debian packaging of libimage-size-perl