[libimage-info-perl] 07/18: Import Debian patch 1.21-2

[Salvatore Bonaccorso]

This is an automated email from the git hooks/post-receive script.

carnil pushed a commit to branch master
in repository libimage-info-perl.

commit 645a40e8114c69f293a8dee3b28e2470bf62a5bb
Author: Don Armstrong <don at debian.org>
Date:   Sat Jul 22 02:35:05 2006 -0700

    Import Debian patch 1.21-2
---
 debian/changelog       | 10 ++++++++++
 debian/control         |  2 +-
 lib/Image/Info.pm      |  8 +++++---
 lib/Image/Info/TIFF.pm |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1380e00..f61e71b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libimage-info-perl (1.21-2) unstable; urgency=low
+
+  * Fix some typos in Image::Info pod (closes: #369245)
+  * Indicate where the documentation of the image_info options is (closes:
+    #369246)
+  * Fix EXIF parsing in some TIFFs due to a typo (closes: #378419); thanks
+    to Steinar H. Gunderson.
+
+ -- Don Armstrong <don at debian.org>  Sat, 22 Jul 2006 02:35:05 -0700
+
 libimage-info-perl (1.21-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index fa1a968..2ebaf86 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Section: perl
 Build-Depends: debhelper (>= 4)
 Build-Depends-Indep: perl (>= 5.6.0-17), libio-string-perl, libimage-base-bundle-perl | libimage-xpm-perl, libimage-base-bundle-perl | libimage-xbm-perl, libxml-simple-perl 
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: libimage-info-perl
 Architecture: all
diff --git a/lib/Image/Info.pm b/lib/Image/Info.pm
index 3331973..81d8cb2 100644
--- a/lib/Image/Info.pm
+++ b/lib/Image/Info.pm
@@ -253,7 +253,7 @@ describing the images inside the file.  If there is only one image in
 the file only one hash is returned.  In scalar context, only the hash
 for the first image is returned.
 
-In case of error, and hash containing the "error" key will be
+In case of error, a hash containing the "error" key will be
 returned.  The corresponding value will be an appropriate error
 message.
 
@@ -262,7 +262,9 @@ then it is assumed that this scalar contains the raw image data
 directly.
 
 The image_info() function also take optional key/value style arguments
-that can influence what information is returned.
+that can influence what information is returned. See
+L<Image::Info::XPM> and other L<Image::Info> submodules for the
+parameters that they take.
 
 =item image_type( $filename )
 
@@ -299,7 +301,7 @@ inside the file is going to be the same as that of the file itself.
 
 =item dim( $info_hash )
 
-Takes an hash as returned from image_info() and returns the dimensions
+Takes a hash as returned from image_info() and returns the dimensions
 ($width, $height) of the image.  In scalar context returns the
 dimensions as a string.
 
diff --git a/lib/Image/Info/TIFF.pm b/lib/Image/Info/TIFF.pm
index 1348cd5..ec8a54e 100644
--- a/lib/Image/Info/TIFF.pm
+++ b/lib/Image/Info/TIFF.pm
@@ -192,7 +192,7 @@ sub _process_ifds {
 	if ($tn eq "ExifOffset") {
 	    # parse ExifSubIFD
             # print "ExifSubIFD at $value_offset\n";
-	    process_ifds($info,$fh,$page,$tagsseen,$byteorder,$value_offset);
+	    _process_ifds($info,$fh,$page,$tagsseen,$byteorder,$value_offset);
 	}
 	$info->push_info($page, $tn => $val);
 	$n--;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libimage-info-perl.git