Import release 0.99.1

Changes

@@ -1,5 +1,28 @@
 Revision history for Perl extension Image::EXIF.
 
+99.1  Fri May 21 14:40 PST 2004
+	Mr Eric Johnston released new version of his library which is 0.99.1
+	So we do!
+
+	From now I'm gonna rename exif.c to _exif.c to allow compile and use
+	this package for Win & Mac perl cookers.
+
+	And just small note from Blair Zajac:
+	>Hello,
+
+	>I'm looking to use the Image::EXIF module and noticed that the
+	>'unknown' hash key is actually spelled 'unknow'.  Since all
+	>occurrences of the word are misspelled in the package, is this
+	>deliberate?
+
+	>I'm attaching a patch to fix this and a couple of other spelling
+	>mistakes.
+
+	>Best,
+	>Blair
+
+	Thanks Blair for your note.
+	Fixed.
 
 98.6  Wed Jan 14 13:53:48 PST 2004
 	HONY (OldNewYear Crazy Russian Custom)

EXIF.pm

@@ -25,7 +25,7 @@ sub get_image_info($);
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
 our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
 our @EXPORT = qw();
-our $VERSION = '0.98.6';
+our $VERSION = '0.99.1';
 
 sub AUTOLOAD {
     # This AUTOLOAD is used to 'autoload' constants from the constant()
@@ -167,7 +167,7 @@ sub get_other_info($)
 	$hash;
 }
 
-sub get_unknow_info($)
+sub get_unknown_info($)
 {
 	my $self = shift;
 
@@ -176,7 +176,7 @@ sub get_unknow_info($)
 	if (c_errstr()){
 		push @{$self->{errstr}}, c_errstr();
 	} else {
-		c_get_unknow_info();
+		c_get_unknown_info();
 		while(my ($fld, $val) = c_fetch()){
 			$fld eq '' && next;
 			$val =~ s/\s*$//g;
@@ -217,11 +217,11 @@ sub get_all_info($)
 	                $hash->{other}->{$fld} = $val;
         	}
 
-		c_get_unknow_info();
+		c_get_unknown_info();
 		while(my ($fld, $val) = c_fetch()){
 			$fld eq '' && next;
 			$val =~ s/\s*$//g;
-	                $hash->{unknow}->{$fld} = $val;
+	                $hash->{unknown}->{$fld} = $val;
         	}
 	}
 
@@ -257,15 +257,15 @@ Image::EXIF - Perl extension for exif library
    my $camera_info = $exif->get_camera_info(); # hash reference
    my $other_info = $exif->get_other_info(); # hash reference
    my $point_shoot_info = $exif->get_point_shoot_info(); # hash reference
-   my $unknow_info = $exif->get_unknow_info(); # hash reference
+   my $unknown_info = $exif->get_unknown_info(); # hash reference
    my $all_info = $exif->get_all_info(); # hash reference
 
    print $exif->error ?
 	$exit->errstr : Dumper($all_info);
 
 =head1 DESCRIPTION
 
-Perl Package Image::EXIF based on utility exiftags v0.98
+Perl Package Image::EXIF based on utility exiftags v0.99.1
 by Eric M. Johnston, [email protected], http://johnst.org/sw/exiftags/.
 Actually it's just a wrapper. Weak PHP's support of EXIF
 made me write it.

EXIF.xs

@@ -190,7 +190,7 @@ CODE:
 		ep = et->props;
 
 int
-c_get_unknow_info()
+c_get_unknown_info()
 CODE:
 	dumplvl = ED_UNK;
 	if (et)

README

@@ -1,10 +1,10 @@
-			=======================
-			Image/EXIF version 0.98.6
-			=======================
+			=========================
+			Image/EXIF version 0.99.1
+			=========================
 
 
 
-Perl Package Image::EXIF based on utility exiftags v0.98
+Perl Package Image::EXIF based on utility exiftags v0.99.1
 by Eric M. Johnston, [email protected], http://johnst.org/sw/exiftags/.
 Actually it's just a wrapper. Weak PHP's support of EXIF
 made me write it.

asahi.c

@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2004 Eric M. Johnston <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Eric M. Johnston.
+ * 4. Neither the name of the author nor the names of any co-contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id: asahi.c,v 1.4 2004/04/08 04:12:29 ejohnst Exp $
+ */
+
+/*
+ * Exif tag definitions for Asahi Optical Co. (Pentax) maker notes.
+ * Note that the format is similar to Casio's, though has byte order
+ * weirdness like Fuji.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "makers.h"
+
+
+/* Quality. */
+
+static struct descrip asahi_qual[] = {
+	{ 0,	"Economy" },
+	{ 1,	"Fine" },
+	{ 2,	"Super Fine" },
+	{ -1,	"Unknown" },
+};
+
+
+/* Resolution. */
+
+static struct descrip asahi_res[] = {
+	{ 0,	"640x480" },
+	{ 2,	"1024x768" },
+	{ 4,	"1600x1200" },
+	{ 22,	"2304x1728" },
+	{ -1,	"Unknown" },
+};
+
+
+/* Focus mode. */
+
+static struct descrip asahi_focus[] = {
+	{ 0,	"Normal" },
+	{ 1,	"Macro" },
+	{ 2,	"Macro" },
+	{ 3,	"Infinity" },
+	{ -1,	"Unknown" },
+};
+
+
+/* White balance. */
+
+static struct descrip asahi_whiteb[] = {
+	{ 0,	"Auto" },
+	{ 1,	"Daylight" },
+	{ 2,	"Shade" },
+	{ 3,	"Fluorescent" },
+	{ 4,	"Tungsten" },
+	{ 5,	"Manual" },
+	{ -1,	"Unknown" },
+};
+
+
+/* Saturation, contrast, & sharpness. */
+
+static struct descrip asahi_range[] = {
+	{ 0,	"Soft" },
+	{ 1,	"Normal" },
+	{ 2,	"Hard" },
+	{ 3,	"Medium Soft" },
+	{ 4,	"Medium Hard" },
+	{ -1,	"Unknown" },
+};
+
+
+/* Maker note IFD tags. */
+
+static struct exiftag asahi_tags[] = {
+	{ 0x0008, TIFF_SHORT, 1, ED_IMG, "AsahiQuality",
+	  "Quality Level", asahi_qual },
+	{ 0x0009, TIFF_SHORT, 1, ED_VRB, "AsahiRes",
+	  "Recorded Pixels", asahi_res },
+	{ 0x000d, TIFF_SHORT, 1, ED_IMG, "AsahiFocus",
+	  "Focusing Mode", asahi_focus },
+	{ 0x0019, TIFF_SHORT, 1, ED_IMG, "AsahiWhiteB",
+	  "White Balance", asahi_whiteb },
+	{ 0x001f, TIFF_SHORT, 1, ED_IMG, "AsahiSaturate",
+	  "Saturation", asahi_range },
+	{ 0x0020, TIFF_SHORT, 1, ED_IMG, "AsahiContrast",
+	  "Contrast", asahi_range },
+	{ 0x0021, TIFF_SHORT, 1, ED_IMG, "AsahiSharp",
+	  "Sharpness", asahi_range },
+	{ 0xffff, TIFF_UNKN, 0, ED_UNK, "AsahiUnknown",
+	  "Asahi Unknown", NULL },
+};
+
+
+/*
+ * Process Asahi maker note tags.
+ */
+void
+asahi_prop(struct exifprop *prop, struct exiftags *t)
+{
+
+	/* Override a couple of standard tags. */
+
+	switch (prop->tag) {
+
+	case 0x0019:
+		prop->override = EXIF_T_WHITEBAL;
+		break;
+
+	case 0x001f:
+		prop->override = EXIF_T_SATURATION;
+		break;
+
+	case 0x0020:
+		prop->override = EXIF_T_CONTRAST;
+		break;
+
+	case 0x0021:
+		prop->override = EXIF_T_SHARPNESS;
+		break;
+	}
+}
+
+
+/*
+ * Try to read an Asahi maker note IFD.
+ */
+struct ifd *
+asahi_ifd(u_int32_t offset, struct tiffmeta *md)
+{
+	struct tiffmeta mkrmd;
+
+	mkrmd = *md;
+	mkrmd.order = BIG;
+
+	/*
+	 * It appears that there are a couple of maker note schemes for
+	 * for Asahi cameras, most with a 6 byte offset.  ("AOC" stands
+	 * for "Asahi Optical Co.")
+	 */
+
+	if (!memcmp("AOC\0", md->btiff + offset, 4)) {
+
+		/*
+		 * If the prefix includes two spaces, fix at big-endian.
+		 * E.g., Optio 230, 330GS, 33L.
+		 */
+
+		if (!memcmp("  ", md->btiff + offset + 4, 2))
+			return (readifds(offset + 6, asahi_tags, &mkrmd));
+
+		/*
+		 * With two zero bytes, try file byte order (?).
+		 * E.g., Optio 330RS, 33WR, 430RS, 450, 550, 555, S, S4.
+		 */
+
+		if (!memcmp("\0\0", md->btiff + offset + 4, 2))
+			return (readifds(offset + 6, asahi_tags, md));
+
+		/*
+		 * Two M's seems to be a different tag set we don't grok.
+		 * E.g., *ist D.
+		 */
+
+		if (!memcmp("MM", md->btiff + offset + 4, 2)) {
+			exifwarn("Asahi maker note version not supported");
+			return (NULL);
+		}
+
+		exifwarn("Asahi maker note version not supported");
+		return (NULL);
+	}
+
+	/*
+	 * The EI-200 seems to have a non-IFD note; we'll use the heuristic
+	 * of a minimum 10 tags before we look at it as an IFD.
+	 */
+
+	if (exif2byte(md->btiff + offset, md->order) < 10) {
+		exifwarn("Asahi maker note version not supported");
+		return (NULL);
+	}
+
+	/* E.g., Optio 330, 430. */
+
+	return (readifds(offset, asahi_tags, &mkrmd));
+}