libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif-testsuite/tests check-general-images.sh, 1.3, 1.4 check-no-unknown-tags.sh, 1.1, 1.2 check-vars.sh.in, 1.1, 1.2

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15109

Modified Files:
	check-general-images.sh check-no-unknown-tags.sh 
	check-vars.sh.in 
Log Message:
Moved the list of images to test into check-vars.sh to centralize the
setup and easily allow local repositories of test images to be added.


Index: check-vars.sh.in
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-vars.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- check-vars.sh.in	12 Dec 2008 07:14:38 -0000	1.1
+++ check-vars.sh.in	13 Jan 2009 22:31:46 -0000	1.2
@@ -8,3 +8,17 @@ TOPSRCDIR=@top_srcdir@
 TOPBLDDIR=@top_builddir@
 EXIFEXE=`if test -x "$TOPBLDDIR/src/exif/exif/exif"; then echo "$TOPBLDDIR/src/exif/exif/exif"; elif test -x "$BINDIR/exif"; then echo "$BINDIR/exif"; else echo "Neither $TOPBLDDIR/src/exif/exif/exif nor $BINDIR/exif are executable." >&2; echo false; exit 1; fi`
 DIFFEXE=@DIFF@
+
+# space-separated list of all JPEG images to test
+ALLFILES="$TOPSRCDIR/src/pel-images/*.jpg $SRCDIR/images/*.jpg"
+
+# Function that returns true when the given file contains no EXIF tags
+noexiftags () {
+	# Test images without EXIF tags
+	case "$1" in 
+		 *-thumb* | *no-exif* | *canon-powershot-a400-001.jpg)
+			return 0 # No EXIF tags in this image
+			;;
+	esac
+	return 1 # normal image with EXIF tags
+}

Index: check-general-images.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-general-images.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- check-general-images.sh	10 Jan 2009 08:38:03 -0000	1.3
+++ check-general-images.sh	13 Jan 2009 22:31:46 -0000	1.4
@@ -4,9 +4,6 @@
 
 . check-vars.sh
 
-# |-separated list of test suite images that don't contain EXIF tags
-NOEXIFLIST='*canon-powershot-a400-001.jpg'
-
 tmpfile="./output.tmp"
 tmpimg="./general.out.jpg"
 
@@ -16,28 +13,26 @@ errors=0
 total=0
 total_img=0
 
-for img in "$TOPSRCDIR"/src/pel-images/*.jpg "$SRCDIR"/images/*.jpg
+for img in $ALLFILES
 do
 	test -f "$img" || continue
 	total_img=$(expr $total_img + 1)
 	echo \#${total_img}
 
 	# Test images without EXIF tags
-	case "$img" in 
-		*-thumb* | *no-exif* | $NOEXIFLIST)
-			echo -n "Attempting list of nonexistent EXIF data from \`${img}'..."
-			"$EXIFEXE" "${img}" > "$tmpfile" 2>&1
-			s="$?"
-			if test "$s" -eq 1; then
-				echo " ok."
-			else
-				echo " FAILED (${s})."
-				errors=$(expr $errors + 1)
-				cat "$tmpfile"
-			fi
-			continue
-			;;
-	esac
+	if noexiftags "$img" ; then
+		echo -n "Attempting list of nonexistent EXIF data from \`${img}'..."
+		"$EXIFEXE" "${img}" > "$tmpfile" 2>&1
+		s="$?"
+		if test "$s" -eq 1; then
+			echo " ok."
+		else
+			echo " FAILED (${s})."
+			errors=$(expr $errors + 1)
+			cat "$tmpfile"
+		fi
+		continue
+	fi
 
 	# Check that listing EXIF info works
 	echo -n "Listing EXIF info from \`${img}'..."

Index: check-no-unknown-tags.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-no-unknown-tags.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- check-no-unknown-tags.sh	13 Jan 2009 01:51:52 -0000	1.1
+++ check-no-unknown-tags.sh	13 Jan 2009 22:31:46 -0000	1.2
@@ -3,9 +3,6 @@
 
 . check-vars.sh
 
-# |-separated list of test suite images that don't contain EXIF tags
-NOEXIFLIST='*canon-powershot-a400-001.jpg'
-
 tmpfile="./output.tmp"
 
 # Display ok or FAILED depending on the result code
@@ -31,17 +28,13 @@ errors=0
 total=0
 total_img=0
 
-for img in "$TOPSRCDIR"/src/pel-images/*.jpg "$SRCDIR"/images/*.jpg
+for img in $ALLFILES
 do
 	test -f "$img" || continue
 
-	# Test images without EXIF tags
-	case "$img" in 
-		*-thumb* | *no-exif* | $NOEXIFLIST)
-			# skip image
-			continue
-			;;
-	esac
+	if noexiftags "$img" ; then
+		continue # skip image
+	fi
 
 	total_img=$(expr $total_img + 1)
 	echo -n "#${total_img} "

[libexif-cvs] exif/exif main.c, 1.69, 1.70 utils.c, 1.11, 1.12 utils.h, 1.7, 1.8

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6967/exif

Modified Files:
	main.c utils.c utils.h 
Log Message:
Fixed an issue with default tag values from the last check-in


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -d -r1.69 -r1.70
--- main.c	13 Jan 2009 08:44:31 -0000	1.69
+++ main.c	13 Jan 2009 08:51:41 -0000	1.70
@@ -172,7 +172,7 @@ static unsigned int remove_tag = 0, crea
 static unsigned int list_mnote = 0;
 static unsigned int show_version = 0;
 static const char *ifd_string = NULL, *tag_string = NULL;
-static ExifParams p = {0xffff, EXIF_IFD_COUNT, 0, 0, NULL, NULL, NULL};
+static ExifParams p = {EXIF_INVALID_TAG, EXIF_IFD_COUNT, 0, 0, NULL, NULL,NULL};
 LogArg log_arg = {0, 0, 0};
 
 int
@@ -266,7 +266,7 @@ main (int argc, const char **argv)
 	}
 	if (tag_string) {
 		p.tag = exif_tag_from_string (tag_string);
-		if (p.tag == 0xffff) {
+		if (p.tag == EXIF_INVALID_TAG) {
 			exif_log (log, -1, "exif", _("Invalid tag '%s'!"),
 				tag_string);
 			return 1;
@@ -274,7 +274,7 @@ main (int argc, const char **argv)
 	}
 
 	/* Check for all necessary parameters */
-	if ((p.tag == 0xffff) && (p.set_value || show_description)) {
+	if ((p.tag == EXIF_INVALID_TAG) && (p.set_value || show_description)) {
 		exif_log (log, -1, "exif", _("You need to specify a tag!"));
 		return 1;
 	}
@@ -364,7 +364,8 @@ main (int argc, const char **argv)
 
 		if (list_tags)
 			action_tag_table (ed, p);
-		else if (p.tag && !p.set_value && !remove_tag)
+		else if ((p.tag != EXIF_INVALID_TAG) &&
+			 !p.set_value && !remove_tag)
 			action_show_tag (ed, log, p);
 		else if (extract_thumbnail)
 			action_save_thumb (ed, log, p, fout);

Index: utils.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/utils.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- utils.c	26 Nov 2008 08:34:06 -0000	1.11
+++ utils.c	13 Jan 2009 08:51:41 -0000	1.12
@@ -33,7 +33,7 @@ exif_tag_from_string (const char *string
 	const char *name;
 
 	if (!string)
-		return 0xffff;
+		return EXIF_INVALID_TAG;
 
 	/* Is the string a decimal number? */
 	if (strspn (string, "0123456789") == strlen (string))
@@ -53,7 +53,7 @@ exif_tag_from_string (const char *string
 		if (name && !strcmp (string, name))
 			return (tag);
 	}
-	return (0xffff);
+	return EXIF_INVALID_TAG;
 }
 
 ExifIfd

Index: utils.h
===================================================================
RCS file: /cvsroot/libexif/exif/exif/utils.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- utils.h	26 Nov 2008 08:34:06 -0000	1.7
+++ utils.h	13 Jan 2009 08:51:41 -0000	1.8
@@ -25,6 +25,8 @@
 #include <libexif/exif-tag.h>
 #include <libexif/exif-ifd.h>
 
+enum {EXIF_INVALID_TAG = 0xffff};
+
 ExifTag exif_tag_from_string (const char *string);
 ExifIfd exif_ifd_from_string (const char *string);
 size_t exif_mbstrlen(const char *mbs, size_t *len);

[libexif-cvs] exif/exif main.c,1.68,1.69 actions.c,1.39,1.40

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6515/exif

Modified Files:
	main.c actions.c 
Log Message:
exif/main.c: Allow setting --tag=0 (needed for the GPS IFD)


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -d -r1.68 -r1.69
--- main.c	13 Jan 2009 06:50:48 -0000	1.68
+++ main.c	13 Jan 2009 08:44:31 -0000	1.69
@@ -172,7 +172,7 @@ static unsigned int remove_tag = 0, crea
 static unsigned int list_mnote = 0;
 static unsigned int show_version = 0;
 static const char *ifd_string = NULL, *tag_string = NULL;
-static ExifParams p = {0, EXIF_IFD_COUNT, 0, 0, NULL, NULL, NULL};
+static ExifParams p = {0xffff, EXIF_IFD_COUNT, 0, 0, NULL, NULL, NULL};
 LogArg log_arg = {0, 0, 0};
 
 int
@@ -274,7 +274,7 @@ main (int argc, const char **argv)
 	}
 
 	/* Check for all necessary parameters */
-	if (!p.tag && (p.set_value || show_description)) {
+	if ((p.tag == 0xffff) && (p.set_value || show_description)) {
 		exif_log (log, -1, "exif", _("You need to specify a tag!"));
 		return 1;
 	}

Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -d -r1.39 -r1.40
--- actions.c	26 Nov 2008 09:11:03 -0000	1.39
+++ actions.c	13 Jan 2009 08:44:31 -0000	1.40
@@ -201,7 +201,7 @@ show_entry (ExifEntry *entry, unsigned i
 
 	/*
 	 * The C() macro can point to a static buffer so these printfs
-	 * must be done separately.
+	 * cannot be combined.
 	 */
 	printf (_("EXIF entry '%s' "),
 		C(exif_tag_get_title_in_ifd (entry->tag, ifd)));

[libexif-cvs] exif NEWS,1.24,1.25 ChangeLog,1.84,1.85

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6515

Modified Files:
	NEWS ChangeLog 
Log Message:
exif/main.c: Allow setting --tag=0 (needed for the GPS IFD)


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/exif/NEWS,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -d -r1.24 -r1.25
--- NEWS	23 Dec 2008 04:58:04 -0000	1.24
+++ NEWS	13 Jan 2009 08:44:30 -0000	1.25
@@ -3,6 +3,7 @@ exif-0.6.x:
   * Updated translations: da, id, nl, pl, sk, sv, vi, zh_CN
   * Fixed alignment of tables in locales with multibyte character encoding
     (bug #2034873)
+  * Allow setting --tag=0 (needed for the GPS IFD)
 
 exif-0.6.17 (2008-11-06):
   * Fixed the output of -s and -t when iconv is configured

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -d -r1.84 -r1.85
--- ChangeLog	23 Dec 2008 04:58:04 -0000	1.84
+++ ChangeLog	13 Jan 2009 08:44:30 -0000	1.85
@@ -1,3 +1,7 @@
+2009-01-12  Dan Fandrich <da...@co...>
+
+	* exif/main.c: Allow setting --tag=0 (needed for the GPS IFD)
+
 2008-12-22  Dan Fandrich <da...@co...>
 
 	* po/vi.po: Updated Vietnamese translation by Clytie Siddall

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c, 1.37, 1.38 exif-mnote-data-olympus.h, 1.9, 1.10 mnote-olympus-entry.c, 1.42, 1.43 mnote-olympus-tag.c, 1.17, 1.18 mnote-olympus-tag.h, 1.9, 1.10

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5597/libexif/olympus

Modified Files:
	exif-mnote-data-olympus.c exif-mnote-data-olympus.h 
	mnote-olympus-entry.c mnote-olympus-tag.c mnote-olympus-tag.h 
Log Message:
Added support for Epson MakerNotes, which have the identical
tag format and namespace of the Olympus ones.


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -d -r1.42 -r1.43
--- mnote-olympus-entry.c	5 Dec 2008 20:52:53 -0000	1.42
+++ mnote-olympus-entry.c	13 Jan 2009 08:26:41 -0000	1.43
@@ -244,6 +244,7 @@ mnote_olympus_entry_get_value (MnoteOlym
 	char         buf[30];
 	ExifLong     vl;
 	ExifShort    vs = 0;
+	ExifSShort   vss = 0;
 	ExifRational vr, vr2;
 	ExifSRational vsr;
 	int          i, j;
@@ -305,10 +306,13 @@ mnote_olympus_entry_get_value (MnoteOlym
 	case MNOTE_NIKON_TAG_IMAGEADJUSTMENT:
 	case MNOTE_NIKON_TAG_ADAPTER:
 	case MNOTE_NIKON_TAG_SATURATION2:
+	case MNOTE_EPSON_TAG_OEM_MODEL:
 		CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
 		memcpy(v, entry->data, MIN (maxlen, entry->size));
 		break;
 	case MNOTE_NIKON_TAG_TOTALPICTURES:
+	case MNOTE_EPSON_TAG_IMAGE_WIDTH:
+	case MNOTE_EPSON_TAG_IMAGE_HEIGHT:
 		CF (entry->format, EXIF_FORMAT_LONG, v, maxlen);
 		CC (entry->components, 1, v, maxlen);
 		vl =  exif_get_long (entry->data, entry->order);
@@ -577,12 +581,21 @@ mnote_olympus_entry_get_value (MnoteOlym
 		}
 		break;
 	case MNOTE_OLYMPUS_TAG_LENSDISTORTION:
-		CF (entry->format, EXIF_FORMAT_SSHORT, v, maxlen);
-		CC (entry->components, 6, v, maxlen);
-		for (i=0; i < (int)entry->components; ++i) {
-			vs = exif_get_sshort (entry->data+2*i, entry->order);
-			sprintf (buf, "%hd ", vs);
+		if (entry->format == EXIF_FORMAT_SHORT) {
+			/* Epson uses a single SHORT here */
+			CC (entry->components, 1, v, maxlen);
+			vs = exif_get_short (entry->data, entry->order);
+			sprintf (buf, "%hu", vs);
 			strncat (v, buf, maxlen - strlen (v));
+		} else {
+			/* Others use an array of SSHORT here */
+			CC (entry->components, 6, v, maxlen);
+			CF (entry->format, EXIF_FORMAT_SSHORT, v, maxlen);
+			for (i=0; i < (int)entry->components; ++i) {
+				vss = exif_get_sshort (entry->data+2*i, entry->order);
+				sprintf (buf, "%hd ", vss);
+				strncat (v, buf, maxlen - strlen (v));
+			}
 		}
 		break;
 	case MNOTE_OLYMPUS_TAG_COLORCONTROL:

Index: mnote-olympus-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-tag.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- mnote-olympus-tag.h	5 Dec 2008 07:07:17 -0000	1.9
+++ mnote-olympus-tag.h	13 Jan 2009 08:26:41 -0000	1.10
@@ -179,6 +179,11 @@ enum _MnoteOlympusTag {
 	MNOTE_SANYO_TAG_SCENESELECT		= 0x021f,
 	MNOTE_SANYO_TAG_MANUALFOCUSDISTANCE	= 0x0223,
 	MNOTE_SANYO_TAG_SEQUENCESHOTINTERVAL	= 0x0224,
+
+	/* Epson */
+	MNOTE_EPSON_TAG_IMAGE_WIDTH		= 0x020b,
+	MNOTE_EPSON_TAG_IMAGE_HEIGHT		= 0x020c,
+	MNOTE_EPSON_TAG_OEM_MODEL		= 0x020d,
 };
 typedef enum _MnoteOlympusTag MnoteOlympusTag;
 

Index: mnote-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-tag.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -d -r1.17 -r1.18
--- mnote-olympus-tag.c	20 Oct 2008 07:52:43 -0000	1.17
+++ mnote-olympus-tag.c	13 Jan 2009 08:26:41 -0000	1.18
@@ -182,6 +182,11 @@ static const struct {
 	{MNOTE_SANYO_TAG_SCENESELECT, "SceneSelect", N_("Scene Select"), ""},
 	{MNOTE_SANYO_TAG_MANUALFOCUSDISTANCE, "ManualFocusDistance", N_("Manual Focus Distance"), ""},
 	{MNOTE_SANYO_TAG_SEQUENCESHOTINTERVAL, "SequenceShotInterval", N_("Sequence Shot Interval"), ""},
+
+	/* Epson */
+	{MNOTE_EPSON_TAG_IMAGE_WIDTH, "EpsonImageWidth", N_("Epson Image Width"), ""},
+	{MNOTE_EPSON_TAG_IMAGE_HEIGHT, "EpsonImageHeight", N_("Epson Image Height"), ""},
+	{MNOTE_EPSON_TAG_OEM_MODEL, "EpsonOEMModel", N_("OEM Model Name"), ""},
 #endif
 	{0, NULL, NULL, NULL}
 };

Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -d -r1.37 -r1.38
--- exif-mnote-data-olympus.c	11 Dec 2008 06:57:41 -0000	1.37
+++ exif-mnote-data-olympus.c	13 Jan 2009 08:26:41 -0000	1.38
@@ -102,11 +102,13 @@ exif_mnote_data_olympus_save (ExifMnoteD
 	switch (n->version) {
 	case olympusV1:
 	case sanyoV1:
+	case epsonV1:
 		*buf = exif_mem_alloc (ne->mem, *buf_size);
 		if (!*buf) return;
 
 		/* Write the header and the number of entries. */
-		strcpy ((char *)*buf, n->version==sanyoV1?"SANYO":"OLYMP");
+		strcpy ((char *)*buf, n->version==sanyoV1?"SANYO":
+					(n->version==epsonV1?"EPSON":"OLYMP"));
 		exif_set_short (*buf + 6, n->order, (ExifShort) 1);
 		datao = n->offset;
 		break;
@@ -224,6 +226,9 @@ exif_mnote_data_olympus_load (ExifMnoteD
 	 * Sanyo format is identical and uses identical tags except that
 	 * header starts with "SANYO".
 	 *
+	 * Epson format is identical and uses identical tags except that
+	 * header starts with "EPSON".
+	 *
 	 * Nikon headers start with "Nikon" (6 bytes including '\0'), 
 	 * version number (1 or 2).
 	 * 
@@ -235,13 +240,16 @@ exif_mnote_data_olympus_load (ExifMnoteD
 	 * lastly 0x2A.
 	 */
 	if (buf_size - n->offset < 22) return;
-	if (!memcmp (buf + o2, "OLYMP", 6) || !memcmp (buf + o2, "SANYO", 6)) {
+	if (!memcmp (buf + o2, "OLYMP", 6) || !memcmp (buf + o2, "SANYO", 6) ||
+	    !memcmp (buf + o2, "EPSON", 6)) {
 		exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus",
-			"Parsing Olympus/Sanyo maker note v1...");
+			"Parsing Olympus/Sanyo/Epson maker note v1...");
 
 		/* The number of entries is at position 8. */
 		if (!memcmp (buf + o2, "SANYO", 6))
 			n->version = sanyoV1;
+		else if (!memcmp (buf + o2, "EPSON", 6))
+			n->version = epsonV1;
 		else
 			n->version = olympusV1;
 		if (buf[o2 + 6] == 1)

Index: exif-mnote-data-olympus.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- exif-mnote-data-olympus.h	17 Feb 2008 18:31:56 -0000	1.9
+++ exif-mnote-data-olympus.h	13 Jan 2009 08:26:41 -0000	1.10
@@ -26,7 +26,14 @@
 #include <libexif/exif-byte-order.h>
 #include <libexif/exif-mem.h>
 
-enum OlympusVersion {nikonV1 = 1, nikonV2 = 2, olympusV1 = 3, olympusV2 = 4, sanyoV1 = 5 };
+enum OlympusVersion {
+	nikonV1 = 1,
+	nikonV2 = 2,
+	olympusV1 = 3,
+	olympusV2 = 4,
+	sanyoV1 = 5,
+	epsonV1 = 6
+};
 
 
 typedef struct _ExifMnoteDataOlympus ExifMnoteDataOlympus;

[libexif-cvs] libexif NEWS, 1.49, 1.50 ChangeLog, 1.296, 1.297 README, 1.22, 1.23

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5597

Modified Files:
	NEWS ChangeLog README 
Log Message:
Added support for Epson MakerNotes, which have the identical
tag format and namespace of the Olympus ones.


Index: README
===================================================================
RCS file: /cvsroot/libexif/libexif/README,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- README	11 Dec 2008 07:08:48 -0000	1.22
+++ README	13 Jan 2009 08:26:39 -0000	1.23
@@ -13,9 +13,9 @@ FEATURES
 --------
 
 libexif supports parsing, editing and saving of EXIF data. In addition, it
-has gettext support. All EXIF tags described in EXIF standard 2.1
-are supported.  Many maker notes from Canon, Casio, Fuji, Nikon, Olympus,
-Pentax and Sanyo cameras are also supported.
+has gettext support. All EXIF tags described in EXIF standard 2.1 (and most
+from 2.2) are supported.  Many maker notes from Canon, Casio, Epson,
+Fuji, Nikon, Olympus, Pentax and Sanyo cameras are also supported.
 
 
 REQUIREMENTS

Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -d -r1.49 -r1.50
--- NEWS	13 Jan 2009 01:46:11 -0000	1.49
+++ NEWS	13 Jan 2009 08:26:39 -0000	1.50
@@ -8,6 +8,7 @@ libexif-0.6.x:
   * Access to the raw EXIF data through the ExifEntry structure members is
     now officially documented
   * Fixed some Olympus/Sanyo MakerNote interpretations
+  * Added support for Epson MakerNotes
   * Fixed bug #1946138 to stop ignoring CFLAGS in the sqrt configure test
   * Added remaining GPS tags from the EXIF 2.2 spec to the tag table
   * Fixed the interpretation of some tags as being optional in IFD 1

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -d -r1.296 -r1.297
--- ChangeLog	7 Jan 2009 07:28:42 -0000	1.296
+++ ChangeLog	13 Jan 2009 08:26:39 -0000	1.297
@@ -1,3 +1,8 @@
+2009-01-12  Dan Fandrich <da...@co...>
+
+	* Added support for Epson MakerNotes, which have the identical
+	  tag format and namespace of the Olympus ones.
+
 2009-01-06  Dan Fandrich <da...@co...>
 
 	* libexif/exif-tags.c: Added remaining GPS tags from the EXIF 2.2

[libexif-cvs] libexif/libexif exif-data.c,1.116,1.117

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5597/libexif

Modified Files:
	exif-data.c 
Log Message:
Added support for Epson MakerNotes, which have the identical
tag format and namespace of the Olympus ones.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -d -r1.116 -r1.117
--- exif-data.c	13 Jan 2009 01:48:39 -0000	1.116
+++ exif-data.c	13 Jan 2009 08:26:41 -0000	1.117
@@ -735,6 +735,7 @@ exif_data_get_type_maker_note (ExifData 
 	if ((e->size >= 8) && ( !memcmp (e->data, "OLYMP", 6) ||
 				!memcmp (e->data, "OLYMPUS", 8) ||
 				!memcmp (e->data, "SANYO", 6) ||
+				!memcmp (e->data, "EPSON", 6) ||
 				!memcmp (e->data, "Nikon", 6)))
 		return EXIF_DATA_TYPE_MAKER_NOTE_OLYMPUS;
 

[libexif-cvs] exif/exif main.c,1.67,1.68

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1006/exif

Modified Files:
	main.c 
Log Message:
Added a hack to allow popt 1.10 messages to be translated.


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -d -r1.67 -r1.68
--- main.c	9 Dec 2008 20:17:39 -0000	1.67
+++ main.c	13 Jan 2009 06:50:48 -0000	1.68
@@ -220,6 +220,14 @@ main (int argc, const char **argv)
 		{"debug", 'd', POPT_ARG_NONE, &log_arg.debug, 0,
 		 N_("Show debugging messages"), NULL},
 		POPT_TABLEEND};
+#if 0
+/* This is a hack to allow translation of popt 1.10 messages with gettext.
+ * Supposedly, this won't be necessary starting with popt 1.12
+ */
+		N_("Help options:");
+		N_("Show this help message");
+		N_("Display brief usage message");
+#endif
 	ExifData *ed;
 	ExifLog *log = NULL;
 	char fout[1024] = {0, };

[libexif-cvs] libexif/libexif exif-tag.c,1.47,1.48

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19361

Modified Files:
	exif-tag.c 
Log Message:
Added missing support level tags for a bunch of EXIF tags to mark them
as optional in the EXIF IFD.


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -d -r1.47 -r1.48
--- exif-tag.c	13 Jan 2009 01:46:13 -0000	1.47
+++ exif-tag.c	13 Jan 2009 02:36:59 -0000	1.48
@@ -47,6 +47,7 @@ static const struct {
 	ExifSupportLevel esl[EXIF_IFD_COUNT][EXIF_DATA_TYPE_COUNT];
 } ExifTagTable[] = {
 #ifndef NO_VERBOSE_TAG_STRINGS
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_NEW_SUBFILE_TYPE, "NewSubfileType",
 	 N_("New Subfile Type"), N_("A general indication of the kind of data "
 	    "contained in this subfile.")},
@@ -87,7 +88,9 @@ static const struct {
 	 N_("The pixel composition. In JPEG compressed data a JPEG "
 	    "marker is used instead of this tag."),
 	 { ESL_MMMN, ESL_MMMN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_FILL_ORDER, "FillOrder", N_("Fill Order"), ""},
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_DOCUMENT_NAME, "DocumentName", N_("Document Name"), ""},
 	{EXIF_TAG_IMAGE_DESCRIPTION, "ImageDescription",
 	 N_("Image Description"),
@@ -103,7 +106,7 @@ static const struct {
 	    "video digitizer or other equipment that generated the "
 	    "image. When the field is left blank, it is treated as "
 	    "unknown."),
-	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN }},
+	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_MODEL, "Model", N_("Model"),
 	 N_("The model name or model number of the equipment. This is the "
 	    "model name or number of the DSC, scanner, video digitizer "
@@ -195,9 +198,12 @@ static const struct {
 	    "Normally this tag is not necessary, since color space is "
 	    "specified in the color space information tag (<ColorSpace>)."),
 	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_TRANSFER_RANGE, "TransferRange", N_("Transfer Range"), ""},
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_SUB_IFDS, "SubIFDs", "SubIFD Offsets", N_("Defined by Adobe Corporation "
 	    "to enable TIFF Trees within a TIFF file.")},
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_JPEG_PROC, "JPEGProc", "JPEGProc", ""},
 	{EXIF_TAG_JPEG_INTERCHANGE_FORMAT, "JPEGInterchangeFormat",
 	 N_("JPEG Interchange Format"),
@@ -256,20 +262,27 @@ static const struct {
 	    "being the value that gives the optimal image characteristics "
 	    "Interoperability these conditions."),
 	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_XML_PACKET, "XMLPacket", N_("XML Packet"), N_("XMP Metadata")},
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_RELATED_IMAGE_FILE_FORMAT, "RelatedImageFileFormat",
 	 "RelatedImageFileFormat", ""},
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_RELATED_IMAGE_WIDTH, "RelatedImageWidth",
 	 "RelatedImageWidth", ""},
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_RELATED_IMAGE_LENGTH, "RelatedImageLength",
 	 "RelatedImageLength", ""},
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_CFA_REPEAT_PATTERN_DIM, "CFARepeatPatternDim",
 	 "CFARepeatPatternDim", ""},
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_CFA_PATTERN, "CFAPattern",
 	 N_("CFA Pattern"),
 	 N_("Indicates the color filter array (CFA) geometric pattern of the "
 	    "image sensor when a one-chip color area sensor is used. "
 	    "It does not apply to all sensing methods.")},
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_BATTERY_LEVEL, "BatteryLevel", N_("Battery Level"), ""},
 	{EXIF_TAG_COPYRIGHT, "Copyright", N_("Copyright"),
 	 N_("Copyright information. In this standard the tag is used to "
@@ -299,7 +312,9 @@ static const struct {
 	{EXIF_TAG_FNUMBER, "FNumber", N_("FNumber"),
 	 N_("The F number."),
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_IPTC_NAA, "IPTC/NAA", "IPTC/NAA", ""},
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_IMAGE_RESOURCES, "ImageResources", N_("Image Resources Block"), ""},
 	{EXIF_TAG_EXIF_IFD_POINTER, "ExifIfdPointer", "ExifIFDPointer",
 	 N_("A pointer to the Exif IFD. Interoperability, Exif IFD has the "
@@ -307,6 +322,7 @@ static const struct {
 	    "ordinarily, however, it does not contain image data as in "
 	    "the case of TIFF."),
 	 { ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_INTER_COLOR_PROFILE, "InterColorProfile",
 	 "InterColorProfile", ""},
 	{EXIF_TAG_EXPOSURE_PROGRAM, "ExposureProgram", N_("Exposure Program"),
@@ -546,7 +562,8 @@ static const struct {
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_FLASH, "Flash", N_("Flash"),
 	 N_("This tag is recorded when an image is taken using a strobe "
-	    "light (flash).")},
+	    "light (flash)."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_FOCAL_LENGTH, "FocalLength", N_("Focal Length"),
 	 N_("The actual focal length of the lens, in mm. Conversion is not "
 	    "made to the focal length of a 35 mm film camera."),
@@ -578,7 +595,7 @@ static const struct {
 	    "When a <UserComment> area is set aside, it is recommended that "
 	    "the ID code be ASCII and that the following user comment "
 	    "part be filled with blank characters [20.H]."),
-			{ ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_SUB_SEC_TIME, "SubsecTime", "SubsecTime",
 	 N_("A tag used to record fractions of seconds for the "
 	    "<DateTime> tag."),
@@ -663,7 +680,7 @@ static const struct {
 	    "NULL. When this tag is used to map audio files, the relation "
 	    "of the audio file to image data must also be indicated on the "
 	    "audio file end."),
-			{ ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_INTEROPERABILITY_IFD_POINTER, "InteroperabilityIFDPointer",
 	 "InteroperabilityIFDPointer",
 	 N_("Interoperability IFD is composed of tags which stores the "
@@ -677,26 +694,31 @@ static const struct {
 	 { ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_FLASH_ENERGY, "FlashEnergy", N_("Flash Energy"),
 	 N_("Indicates the strobe energy at the time the image is "
-	    "captured, as measured in Beam Candle Power Seconds (BCPS).")},
+	    "captured, as measured in Beam Candle Power Seconds (BCPS)."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE, "SpatialFrequencyResponse",
 	 N_("Spatial Frequency Response"),
 	 N_("This tag records the camera or input device spatial frequency "
 	    "table and SFR values in the direction of image width, "
 	    "image height, and diagonal direction, as specified in ISO "
-	    "12233.")},
+	    "12233."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_FOCAL_PLANE_X_RESOLUTION, "FocalPlaneXResolution",
 	 N_("Focal Plane x-Resolution"),
 	 N_("Indicates the number of pixels in the image width (X) direction "
-	    "per <FocalPlaneResolutionUnit> on the camera focal plane.")},
+	    "per <FocalPlaneResolutionUnit> on the camera focal plane."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_FOCAL_PLANE_Y_RESOLUTION, "FocalPlaneYResolution",
 	 N_("Focal Plane y-Resolution"),
 	 N_("Indicates the number of pixels in the image height (V) direction "
-	    "per <FocalPlaneResolutionUnit> on the camera focal plane.")},
+	    "per <FocalPlaneResolutionUnit> on the camera focal plane."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT, "FocalPlaneResolutionUnit",
 	 N_("Focal Plane Resolution Unit"),
 	 N_("Indicates the unit for measuring <FocalPlaneXResolution> and "
 	    "<FocalPlaneYResolution>. This value is the same as the "
-	    "<ResolutionUnit>.")},
+	    "<ResolutionUnit>."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_SUBJECT_LOCATION, "SubjectLocation",
 	 N_("Subject Location"),
 	 N_("Indicates the location of the main subject in the scene. The "
@@ -704,84 +726,106 @@ static const struct {
 	    "main subject relative to the left edge, prior to rotation "
 	    "processing as per the <Rotation> tag. The first value "
 	    "indicates the X column number and the second indicates "
-	    "the Y row number.")},
+	    "the Y row number."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_EXPOSURE_INDEX, "ExposureIndex", N_("Exposure Index"),
 	 N_("Indicates the exposure index selected on the camera or "
-	    "input device at the time the image is captured.")},
+	    "input device at the time the image is captured."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_SENSING_METHOD, "SensingMethod", N_("Sensing Method"),
 	 N_("Indicates the image sensor type on the camera or input "
-	    "device.")},
+	    "device."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_FILE_SOURCE, "FileSource", N_("File Source"),
 	 N_("Indicates the image source. If a DSC recorded the image, "
 	    "the tag value of this tag always be set to 3, indicating "
-	    "that the image was recorded on a DSC.")},
+	    "that the image was recorded on a DSC."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_SCENE_TYPE, "SceneType", N_("Scene Type"),
 	 N_("Indicates the type of scene. If a DSC recorded the image, "
 	    "this tag value must always be set to 1, indicating that the "
-	    "image was directly photographed.")},
+	    "image was directly photographed."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_NEW_CFA_PATTERN, "CFAPattern",
 	 N_("CFA Pattern"),
 	 N_("Indicates the color filter array (CFA) geometric pattern of the "
 	    "image sensor when a one-chip color area sensor is used. "
-	    "It does not apply to all sensing methods.")},
+	    "It does not apply to all sensing methods."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_SUBJECT_AREA, "SubjectArea", N_("Subject Area"),
 	 N_("This tag indicates the location and area of the main subject "
-	    "in the overall scene.")},
+	    "in the overall scene."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_TIFF_EP_STANDARD_ID, "TIFF/EPStandardID", N_("TIFF/EP Standard ID"), ""},
 	{EXIF_TAG_CUSTOM_RENDERED, "CustomRendered", N_("Custom Rendered"),
 	 N_("This tag indicates the use of special processing on image "
 	    "data, such as rendering geared to output. When special "
 	    "processing is performed, the reader is expected to disable "
-	    "or minimize any further processing.")},
+	    "or minimize any further processing."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_EXPOSURE_MODE, "ExposureMode", N_("Exposure Mode"),
 	 N_("This tag indicates the exposure mode set when the image was "
 	    "shot. In auto-bracketing mode, the camera shoots a series of "
-	    "frames of the same scene at different exposure settings.")},
+	    "frames of the same scene at different exposure settings."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_WHITE_BALANCE, "WhiteBalance", N_("White Balance"),
 	 N_("This tag indicates the white balance mode set when the image "
-	    "was shot.")},
+	    "was shot."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_DIGITAL_ZOOM_RATIO, "DigitalZoomRatio",
 	 N_("Digital Zoom Ratio"),
 	 N_("This tag indicates the digital zoom ratio when the image was "
 	    "shot. If the numerator of the recorded value is 0, this "
-	    "indicates that digital zoom was not used.")},
+	    "indicates that digital zoom was not used."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM, "FocalLengthIn35mmFilm",
 	 N_("Focal Length In 35mm Film"),
 	 N_("This tag indicates the equivalent focal length assuming a "
 	    "35mm film camera, in mm. A value of 0 means the focal "
 	    "length is unknown. Note that this tag differs from the "
-	    "FocalLength tag.")},
+	    "FocalLength tag."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_SCENE_CAPTURE_TYPE, "SceneCaptureType",
 	 N_("Scene Capture Type"),
 	 N_("This tag indicates the type of scene that was shot. It can "
 	    "also be used to record the mode in which the image was "
 	    "shot. Note that this differs from the scene type "
-	    "<SceneType> tag.")},
+	    "<SceneType> tag."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_GAIN_CONTROL, "GainControl", N_("Gain Control"),
 	 N_("This tag indicates the degree of overall image gain "
-	    "adjustment.")},
+	    "adjustment."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_CONTRAST, "Contrast", N_("Contrast"),
 	 N_("This tag indicates the direction of contrast processing "
-	    "applied by the camera when the image was shot.")},
+	    "applied by the camera when the image was shot."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_SATURATION, "Saturation", N_("Saturation"),
 	 N_("This tag indicates the direction of saturation processing "
-	    "applied by the camera when the image was shot.")},
+	    "applied by the camera when the image was shot."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_SHARPNESS, "Sharpness", N_("Sharpness"),
 	 N_("This tag indicates the direction of sharpness processing "
-	    "applied by the camera when the image was shot.")},
+	    "applied by the camera when the image was shot."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_DEVICE_SETTING_DESCRIPTION, "DeviceSettingDescription",
 	 N_("Device Setting Description"),
 	 N_("This tag indicates information on the picture-taking "
 	    "conditions of a particular camera model. The tag is used "
 	    "only to indicate the picture-taking conditions in the "
-	    "reader.")},
+	    "reader."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_SUBJECT_DISTANCE_RANGE, "SubjectDistanceRange",
 	 N_("Subject Distance Range"),
-	 N_("This tag indicates the distance to the subject.")},
+	 N_("This tag indicates the distance to the subject."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_IMAGE_UNIQUE_ID, "ImageUniqueID", N_("Image Unique ID"),
 	 N_("This tag indicates an identifier assigned uniquely to "
 	    "each image. It is recorded as an ASCII string equivalent "
-	    "to hexadecimal notation and 128-bit fixed length.")},
+	    "to hexadecimal notation and 128-bit fixed length."),
+	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+	/* Not in EXIF 2.2 */
 	{EXIF_TAG_GAMMA, "Gamma", N_("Gamma"),
 	 N_("Indicates the value of coefficient gamma.")},
 	{EXIF_TAG_PRINT_IMAGE_MATCHING, "PrintImageMatching", N_("PRINT Image Matching"),

[libexif-cvs] libexif/libexif exif-data.c, 1.115, 1.116 exif-data.h, 1.22, 1.23

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16522/libexif

Modified Files:
	exif-data.c exif-data.h 
Log Message:
Log when a subsidiary IFD (EXIF, GPS, Interoperability, thumbnail) is found


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -d -r1.115 -r1.116
--- exif-data.c	11 Dec 2008 07:08:49 -0000	1.115
+++ exif-data.c	13 Jan 2009 01:48:39 -0000	1.116
@@ -171,6 +171,9 @@ exif_data_load_data_entry (ExifData *dat
 	entry->format     = exif_get_short (d + offset + 2, data->priv->order);
 	entry->components = exif_get_long  (d + offset + 4, data->priv->order);
 
+	/* FIXME: should use exif_tag_get_name_in_ifd here but entry->parent 
+	 * has not been set yet
+	 */
 	exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
 		  "Loading entry 0x%x ('%s')...", entry->tag,
 		  exif_tag_get_name (entry->tag));
@@ -398,6 +401,11 @@ exif_data_load_data_content (ExifData *d
 		case EXIF_TAG_JPEG_INTERCHANGE_FORMAT:
 			o = exif_get_long (d + offset + 12 * i + 8,
 					   data->priv->order);
+			/* FIXME: IFD_POINTER tags aren't marked as being in a
+			 * specific IFD, so exif_tag_get_name_in_ifd won't work
+			 */
+			exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
+				  "IFD entry 0x%x at %u.", tag, o);
 			switch (tag) {
 			case EXIF_TAG_EXIF_IFD_POINTER:
 				CHECK_REC (EXIF_IFD_EXIF);

Index: exif-data.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- exif-data.h	23 Dec 2008 08:33:55 -0000	1.22
+++ exif-data.h	13 Jan 2009 01:48:39 -0000	1.23
@@ -127,6 +127,8 @@ void          exif_data_set_byte_order  
 
 /*! Return the MakerNote data out of the EXIF data.  Only certain
  * MakerNote formats that are recognized by libexif are supported.
+ * The pointer references a member of the #ExifData structure and must NOT be
+ * freed by the caller.
  *
  * \param[in] d EXIF data
  * \return MakerNote data, or NULL if not found or not supported

[libexif-cvs] libexif NEWS,1.48,1.49

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16403

Modified Files:
	NEWS 
Log Message:
Fixed the interpretation of some tags as being optional in IFD 1
(to match the EXIF 2.2 spec) which stops them from being erroneously removed
from a file


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -d -r1.48 -r1.49
--- NEWS	7 Jan 2009 07:28:42 -0000	1.48
+++ NEWS	13 Jan 2009 01:46:11 -0000	1.49
@@ -10,6 +10,9 @@ libexif-0.6.x:
   * Fixed some Olympus/Sanyo MakerNote interpretations
   * Fixed bug #1946138 to stop ignoring CFLAGS in the sqrt configure test
   * Added remaining GPS tags from the EXIF 2.2 spec to the tag table
+  * Fixed the interpretation of some tags as being optional in IFD 1
+    (to match the EXIF 2.2 spec) which stops them from being erroneously
+    removed from a file
 
 libexif-0.6.17 (2008-11-06):
   * Updated translations: cs, de, pl, sk, vi

[libexif-cvs] libexif/libexif exif-tag.c,1.46,1.47

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16403/libexif

Modified Files:
	exif-tag.c 
Log Message:
Fixed the interpretation of some tags as being optional in IFD 1
(to match the EXIF 2.2 spec) which stops them from being erroneously removed
from a file


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -d -r1.46 -r1.47
--- exif-tag.c	9 Jan 2009 05:26:14 -0000	1.46
+++ exif-tag.c	13 Jan 2009 01:46:13 -0000	1.47
@@ -43,7 +43,8 @@ static const struct {
 	const char *name;
 	const char *title;
 	const char *description;
-	ExifSupportLevel esl[EXIF_IFD_COUNT][4];
+	/*! indexed by the types [ExifIfd][ExifDataType] */
+	ExifSupportLevel esl[EXIF_IFD_COUNT][EXIF_DATA_TYPE_COUNT];
 } ExifTagTable[] = {
 #ifndef NO_VERBOSE_TAG_STRINGS
 	{EXIF_TAG_NEW_SUBFILE_TYPE, "NewSubfileType",
@@ -163,7 +164,7 @@ static const struct {
 	 N_("A transfer function for the image, described in tabular style. "
 	    "Normally this tag is not necessary, since color space is "
 	    "specified in the color space information tag (<ColorSpace>)."),
-	 { ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
+	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_SOFTWARE, "Software", N_("Software"),
 	 N_("This tag records the name and version of the software or "
 	    "firmware of the camera or image input device used to "
@@ -171,29 +172,29 @@ static const struct {
 	    "it is recommended that the example shown below be "
 	    "followed. When the field is left blank, it is treated as "
 	    "unknown."),
-	 { ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
+	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_DATE_TIME, "DateTime", N_("Date and Time"),
 	 N_("The date and time of image creation. In this standard "
 	    "(EXIF-2.1) it is the date and time the file was changed."),
-	 { ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
+	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_ARTIST, "Artist", N_("Artist"),
 	 N_("This tag records the name of the camera owner, photographer or "
 	    "image creator. The detailed format is not specified, but it is "
 	    "recommended that the information be written as in the example "
 	    "below for ease of Interoperability. When the field is "
 	    "left blank, it is treated as unknown."),
-	 { ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
+	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_WHITE_POINT, "WhitePoint", N_("White Point"),
 	 N_("The chromaticity of the white point of the image. Normally "
 	    "this tag is not necessary, since color space is specified "
 	    "in the color space information tag (<ColorSpace>)."),
-	 { ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
+	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_PRIMARY_CHROMATICITIES, "PrimaryChromaticities",
 	 N_("Primary Chromaticities"),
 	 N_("The chromaticity of the three primary colors of the image. "
 	    "Normally this tag is not necessary, since color space is "
 	    "specified in the color space information tag (<ColorSpace>)."),
-	 { ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
+	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_TRANSFER_RANGE, "TransferRange", N_("Transfer Range"), ""},
 	{EXIF_TAG_SUB_IFDS, "SubIFDs", "SubIFD Offsets", N_("Defined by Adobe Corporation "
 	    "to enable TIFF Trees within a TIFF file.")},
@@ -254,7 +255,7 @@ static const struct {
 	    "in a color space information tag, with the default "
 	    "being the value that gives the optimal image characteristics "
 	    "Interoperability these conditions."),
-	 { ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
+	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_XML_PACKET, "XMLPacket", N_("XML Packet"), N_("XMP Metadata")},
 	{EXIF_TAG_RELATED_IMAGE_FILE_FORMAT, "RelatedImageFileFormat",
 	 "RelatedImageFileFormat", ""},
@@ -291,7 +292,7 @@ static const struct {
 	    "by a terminating NULL code, then the editor copyright is given "
 	    "(see example 3). When the field is left blank, it is treated "
 	    "as unknown."),
-	 { ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
+	 { ESL_OOOO, ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_EXPOSURE_TIME, "ExposureTime", N_("Exposure Time"),
 	 N_("Exposure time, given in seconds (sec)."),
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },

[libexif-cvs] libexif-testsuite/tests check-no-unknown-tags.sh, NONE, 1.1 Makefile.am, 1.21, 1.22

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16725/tests

Modified Files:
	Makefile.am 
Added Files:
	check-no-unknown-tags.sh 
Log Message:
Added check-no-unknown-tags.sh test to ensure that all EXIF tags are
recognized


Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -d -r1.21 -r1.22
--- Makefile.am	12 Dec 2008 07:14:38 -0000	1.21
+++ Makefile.am	13 Jan 2009 01:51:52 -0000	1.22
@@ -9,6 +9,7 @@ SUBDIRS = images
 EXTRA_DIST = \
 	check-exif-executable.sh \
 	check-general-images.sh \
+	check-no-unknown-tags.sh \
 	check-994706.sh check-994706.b.patch \
 	check-1054321.sh 1054321.jpg \
 	check-1054322.sh 1054322.jpg \
@@ -24,7 +25,8 @@ check_SCRIPTS = \
 	check-1169170.sh
 
 # This check script may take a little long - but it is invaluable. :)
-check_SCRIPTS += check-general-images.sh
+check_SCRIPTS += check-general-images.sh \
+	check-no-unknown-tags.sh
 
 TESTS = $(check_SCRIPTS)
 

--- NEW FILE: check-no-unknown-tags.sh ---
#!/bin/sh
# Run all test images through exif and ensure that all the tags are known.

. check-vars.sh

# |-separated list of test suite images that don't contain EXIF tags
NOEXIFLIST='*canon-powershot-a400-001.jpg'

tmpfile="./output.tmp"

# Display ok or FAILED depending on the result code
check_result () {
	s="$?"
	if test "$s" -eq 0; then
		echo " ok."
	else
		echo " FAILED (${s})."
		errors=$(expr $errors + 1)
		if [ -z "$1" ] ; then
			true cat "$tmpfile"
		else
			true cat "$1"
		fi
		continue
	fi
}

echo Testing "$EXIFEXE"

errors=0
total=0
total_img=0

for img in "$TOPSRCDIR"/src/pel-images/*.jpg "$SRCDIR"/images/*.jpg
do
	test -f "$img" || continue

	# Test images without EXIF tags
	case "$img" in 
		*-thumb* | *no-exif* | $NOEXIFLIST)
			# skip image
			continue
			;;
	esac

	total_img=$(expr $total_img + 1)
	echo -n "#${total_img} "

	# Capture the debug logs
	echo -n "Reading image \`${img}'..."
	# Run this in the C language locale so the messages are known
	env LANG=C LANGUAGE=C "$EXIFEXE" -d "${img}" > "$tmpfile" 2>&1
	check_result

	# Ensure all tags were understood
	echo -n "Looking for unknown tags..."
	! grep -q "Unknown tag" "$tmpfile"
	check_result

done

rm "$tmpfile"

self="$(basename "$0")"
echo "$self: Checked $total_img images."
echo "$self: $errors checks failed."
test "$errors" -eq 0

[libexif-cvs] libexif-testsuite NEWS,1.7,1.8

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16725

Modified Files:
	NEWS 
Log Message:
Added check-no-unknown-tags.sh test to ensure that all EXIF tags are
recognized


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/NEWS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- NEWS	10 Jan 2009 08:57:41 -0000	1.7
+++ NEWS	13 Jan 2009 01:51:51 -0000	1.8
@@ -2,6 +2,8 @@ New in 0.7.x:
   * Created check-vars.sh script to eliminate the need to generate all
     the tests scripts at build time
   * Made the tests work in non-English locales
+  * Added check-no-unknown-tags.sh test to ensure that all EXIF tags are
+    recognized
 
 New in 0.7.13:
   * Working with libexif and exif ver. 0.6.17

[libexif-cvs] libexif-testsuite/tests check-1054322.sh, 1.2, 1.3 check-994706.sh, 1.2, 1.3

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14994

Modified Files:
	check-1054322.sh check-994706.sh 
Log Message:
Clean some more temporary files


Index: check-994706.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-994706.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- check-994706.sh	10 Jan 2009 08:57:42 -0000	1.2
+++ check-994706.sh	10 Jan 2009 09:02:54 -0000	1.3
@@ -26,6 +26,6 @@ if test "$s" -ne 0; then
 	echo "The Maker Note should have been removed. Bad."
 fi
 
-rm -f "$dstimg" "./check-${bug}.src.txt" "./check-${bug}.dst.txt" "./check-${bug}.a.xpatch" "./check-${bug}.b.xpatch"
+rm -f "$dstimg" "./check-${bug}.src.txt" "./check-${bug}.dst.txt" "./check-${bug}.a.patch" "./check-${bug}.a.xpatch" "./check-${bug}.b.xpatch"
 
 exit "$s"

Index: check-1054322.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-1054322.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- check-1054322.sh	10 Jan 2009 08:57:42 -0000	1.2
+++ check-1054322.sh	10 Jan 2009 09:02:54 -0000	1.3
@@ -14,6 +14,7 @@ else
 	echo "Exit code $s"
 	exit 1
 fi
+rm -f "$result_file"
 
 result_file="result-1054322-2.tmp"
 env LANG=C LANGUAGE=C "$EXIFEXE" --remove-thumbnail --output ./1054323-2.out.jpg ./this-file-does-not-exist.jpg > ${result_file} 2>&1
@@ -29,5 +30,6 @@ else
 	echo "Exit code $s"
 	exit 1
 fi
+rm -f "$result_file"
 
 exit 0

[libexif-cvs] libexif-testsuite/tests check-1054322.sh, 1.1, 1.2 check-1054323.sh, 1.2, 1.3 check-994706.sh, 1.1, 1.2

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14599/tests

Modified Files:
	check-1054322.sh check-1054323.sh check-994706.sh 
Log Message:
Made the tests work in non-English locales


Index: check-994706.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-994706.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- check-994706.sh	12 Dec 2008 07:14:38 -0000	1.1
+++ check-994706.sh	10 Jan 2009 08:57:42 -0000	1.2
@@ -6,11 +6,11 @@ dstimg="./${bug}.jpg.modified.jpeg"
 
 # Remove Maker Note
 echo "Removing EXIF Maker Note"
-"$EXIFEXE" "--ifd=EXIF" "--tag=Maker Note" --remove --output "$dstimg" "$srcimg" > /dev/null 2>&1
+"$EXIFEXE" "--ifd=EXIF" "--tag=MakerNote" --remove --output "$dstimg" "$srcimg" > /dev/null 2>&1
 
 # List all tags
-"$EXIFEXE" --list-tags "$srcimg" | sed '1d' > "./check-${bug}.src.txt"
-"$EXIFEXE" --list-tags "$dstimg" | sed '1d' > "./check-${bug}.dst.txt"
+env LANG=C LANGUAGE=C "$EXIFEXE" --list-tags "$srcimg" | sed '1d' > "./check-${bug}.src.txt"
+env LANG=C LANGUAGE=C "$EXIFEXE" --list-tags "$dstimg" | sed '1d' > "./check-${bug}.dst.txt"
 
 # Find different tags in source and destination image
 "$DIFFEXE" -u "./check-${bug}.src.txt" "./check-${bug}.dst.txt" > "./check-${bug}.a.patch"
@@ -25,4 +25,7 @@ s="$?"
 if test "$s" -ne 0; then
 	echo "The Maker Note should have been removed. Bad."
 fi
+
+rm -f "$dstimg" "./check-${bug}.src.txt" "./check-${bug}.dst.txt" "./check-${bug}.a.xpatch" "./check-${bug}.b.xpatch"
+
 exit "$s"

Index: check-1054322.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-1054322.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- check-1054322.sh	12 Dec 2008 07:14:38 -0000	1.1
+++ check-1054322.sh	10 Jan 2009 08:57:42 -0000	1.2
@@ -1,7 +1,7 @@
 #!/bin/sh
 . check-vars.sh
 result_file="result-1054322-1.tmp"
-"$EXIFEXE" --remove-thumbnail --output ./1054322-1.out.jpg "$SRCDIR"/1054322.jpg > ${result_file} 2>&1
+env LANG=C LANGUAGE=C "$EXIFEXE" --remove-thumbnail --output ./1054322-1.out.jpg "$SRCDIR"/1054322.jpg > ${result_file} 2>&1
 result="`cat ${result_file}`"
 s="$?"
 echo "$result"
@@ -16,7 +16,7 @@ else
 fi
 
 result_file="result-1054322-2.tmp"
-"$EXIFEXE" --remove-thumbnail --output ./1054323-2.out.jpg ./this-file-does-not-exist.jpg > ${result_file} 2>&1
+env LANG=C LANGUAGE=C "$EXIFEXE" --remove-thumbnail --output ./1054323-2.out.jpg ./this-file-does-not-exist.jpg > ${result_file} 2>&1
 result="`cat ${result_file}`"
 s="$?"
 echo "$result"

Index: check-1054323.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-1054323.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- check-1054323.sh	23 Dec 2008 08:50:23 -0000	1.2
+++ check-1054323.sh	10 Jan 2009 08:57:42 -0000	1.3
@@ -3,3 +3,6 @@
 set -x
 # -d flag turns a Corrupt Data error into a warning
 "$EXIFEXE" -d -r -o ./1054323.out.jpg "$SRCDIR"/1054323.jpg >/dev/null
+s="$?"
+rm -f ./1054323.out.jpg
+exit "$s"

[libexif-cvs] libexif-testsuite NEWS,1.6,1.7

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14599

Modified Files:
	NEWS 
Log Message:
Made the tests work in non-English locales


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/NEWS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- NEWS	12 Dec 2008 07:14:36 -0000	1.6
+++ NEWS	10 Jan 2009 08:57:41 -0000	1.7
@@ -1,6 +1,7 @@
 New in 0.7.x:
   * Created check-vars.sh script to eliminate the need to generate all
     the tests scripts at build time
+  * Made the tests work in non-English locales
 
 New in 0.7.13:
   * Working with libexif and exif ver. 0.6.17

[libexif-cvs] libexif-testsuite/tests .cvsignore,1.2,1.3

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14004

Modified Files:
	.cvsignore 
Log Message:
Ignore some more generated files


Index: .cvsignore
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- .cvsignore	17 Mar 2005 01:59:01 -0000	1.2
+++ .cvsignore	10 Jan 2009 08:40:37 -0000	1.3
@@ -1,2 +1,6 @@
+Makefile
+Makefile.in
+check-vars.sh
 *.modified.jpeg
 *.out.jpg
+*.tmp

[libexif-cvs] libexif-testsuite/tests check-general-images.sh, 1.2, 1.3

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13860

Modified Files:
	check-general-images.sh 
Log Message:
Clean up some temporary files


Index: check-general-images.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/check-general-images.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- check-general-images.sh	12 Dec 2008 07:20:58 -0000	1.2
+++ check-general-images.sh	10 Jan 2009 08:38:03 -0000	1.3
@@ -138,7 +138,7 @@ do
 			errors=$(expr $errors + 1)
 			cat "$tmpfile"
 		fi
-		rm -f "$tmpfile"
+		rm -f "$tmpfile" "$thumb"
 		total=$(expr $total + 1)
 	else
 		echo "Skipping extract thumbnail test on ${img}"
@@ -146,6 +146,8 @@ do
 
 done
 
+rm "$tmpimg"
+
 self="$(basename "$0")"
 echo "$self: Performed $total checks on $total_img images."
 echo "$self: $errors checks failed."

[libexif-cvs] libexif/po en_CA.po,1.7,1.8

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/po
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28118/po

Modified Files:
	en_CA.po 
Log Message:
Jan Patera pointed out that referencing appendices, tables and sections of the
EXIF spec within the tag descriptions didn't make much sense.


Index: en_CA.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/en_CA.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- en_CA.po	9 Jan 2009 05:03:16 -0000	1.7
+++ en_CA.po	9 Jan 2009 05:26:15 -0000	1.8
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.16.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-08 21:00-0800\n"
+"POT-Creation-Date: 2009-01-08 21:19-0800\n"
 "PO-Revision-Date: 2007-11-12 18:00-0800\n"
 "Last-Translator: Dan Fandrich <da...@co...>\n"
 "Language-Team: none\n"
@@ -1371,18 +1371,18 @@ msgstr ""
 msgid "Digital zoom"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:764
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:762
 #: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
 msgid "Contrast"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:767
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:765
 #: libexif/olympus/mnote-olympus-tag.c:75
 #: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
 msgid "Saturation"
 msgstr ""
 
-#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:770
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:768
 #: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
 msgid "Sharpness"
 msgstr ""
@@ -2726,13 +2726,13 @@ msgstr ""
 #: libexif/exif-tag.c:219
 msgid ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in Appendix E, \"Color "
-"Space Guidelines\", is used as the default. The color space is declared in a "
-"color space information tag, with the default being the value that gives the "
+"default is given in TIFF; but here the value given in \"Color Space "
+"Guidelines\", is used as the default. The color space is declared in a color "
+"space information tag, with the default being the value that gives the "
 "optimal image characteristics Interoperability this condition."
 msgstr ""
 "The matrix coefficients for transformation from RGB to YCbCr image data. No "
-"default is given in TIFF; but here the value given in Appendix E, \"Color "
+"default is given in TIFF; but here the value given in \"Color "
 "Space Guidelines\", is used as the default. The colour space is declared in "
 "a colour space information tag, with the default being the value that gives "
 "the optimal image characteristics Interoperability this condition."
@@ -2803,11 +2803,11 @@ msgstr ""
 msgid "XMP Metadata"
 msgstr ""
 
-#: libexif/exif-tag.c:268 libexif/exif-tag.c:724
+#: libexif/exif-tag.c:268 libexif/exif-tag.c:722
 msgid "CFA Pattern"
 msgstr ""
 
-#: libexif/exif-tag.c:269 libexif/exif-tag.c:725
+#: libexif/exif-tag.c:269 libexif/exif-tag.c:723
 msgid ""
 "Indicates the color filter array (CFA) geometric pattern of the image sensor "
 "when a one-chip color area sensor is used. It does not apply to all sensing "
@@ -3043,11 +3043,11 @@ msgstr ""
 
 #: libexif/exif-tag.c:393
 msgid ""
-"Indicates the unit used to express the GPS receiver speed of movement. 'K' "
-"'M' and 'N' represents kilometers per hour, miles per hour, and knots."
+"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
+"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
 msgstr ""
 "Indicates the unit used to express the GPS receiver speed of movement. 'K' "
-"'M' and 'N' represents kilometres per hour, miles per hour, and knots."
+"'M' and 'N' represent kilometres per hour, miles per hour, and knots."
 
 #: libexif/exif-tag.c:396
 msgid "Speed of GPS receiver"
@@ -3185,10 +3185,10 @@ msgstr ""
 #: libexif/exif-tag.c:449
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represents kilometers, miles and knots."
+"'K', 'M' and 'N' represent kilometers, miles and knots."
 msgstr ""
 "Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represents kilometres, miles and knots."
+"'K', 'M' and 'N' represent kilometres, miles and knots."
 
 #: libexif/exif-tag.c:452
 msgid "Distance to destination"
@@ -3205,9 +3205,9 @@ msgstr ""
 #: libexif/exif-tag.c:455
 msgid ""
 "A character string recording the name of the method used for location "
-"finding. The first byte indicates the character code used (Table 6 Table 7), "
-"and this is followed by the name of the method. Since the Type is not ASCII, "
-"NULL termination is not necessary."
+"finding. The first byte indicates the character code used, and this is "
+"followed by the name of the method. Since the Type is not ASCII, NULL "
+"termination is not necessary."
 msgstr ""
 
 #: libexif/exif-tag.c:460
@@ -3217,9 +3217,8 @@ msgstr ""
 #: libexif/exif-tag.c:461
 msgid ""
 "A character string recording the name of the GPS area. The first byte "
-"indicates the character code used (Table 6 Table 7), and this is followed by "
-"the name of the GPS area. Since the Type is not ASCII, NULL termination is "
-"not necessary."
+"indicates the character code used, and this is followed by the name of the "
+"GPS area. Since the Type is not ASCII, NULL termination is not necessary."
 msgstr ""
 
 #: libexif/exif-tag.c:465
@@ -3412,63 +3411,63 @@ msgid ""
 "is identified based on an ID code in a fixed 8-byte area at the start of the "
 "tag data area. The unused portion of the area is padded with NULL (\"00.h"
 "\"). ID codes are assigned by means of registration. The designation method "
-"and references for each character code are given in Table 6. The value of "
-"CountN is determined based on the 8 bytes in the character code area and the "
-"number of bytes in the user comment part. Since the TYPE is not ASCII, NULL "
-"termination is not necessary (see Fig. 9). The ID code for the <UserComment> "
+"and references for each character code are defined in the specification. The "
+"value of CountN is determined based on the 8 bytes in the character code "
+"area and the number of bytes in the user comment part. Since the TYPE is not "
+"ASCII, NULL termination is not necessary. The ID code for the <UserComment> "
 "area may be a Defined code such as JIS or ASCII, or may be Undefined. The "
 "Undefined name is UndefinedText, and the ID code is filled with 8 bytes of "
 "all \"NULL\" (\"00.H\"). An Exif reader that reads the <UserComment> tag "
 "must have a function for determining the ID code. This function is not "
-"required in Exif readers that do not use the <UserComment> tag (see Table "
-"7). When a <UserComment> area is set aside, it is recommended that the ID "
-"code be ASCII and that the following user comment part be filled with blank "
-"characters [20.H]."
+"required in Exif readers that do not use the <UserComment> tag. When a "
+"<UserComment> area is set aside, it is recommended that the ID code be ASCII "
+"and that the following user comment part be filled with blank characters [20."
+"H]."
 msgstr ""
 
-#: libexif/exif-tag.c:583
+#: libexif/exif-tag.c:582
 msgid "A tag used to record fractions of seconds for the <DateTime> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:588
+#: libexif/exif-tag.c:587
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:593
+#: libexif/exif-tag.c:592
 msgid ""
 "A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:596
+#: libexif/exif-tag.c:595
 msgid "XP Title"
 msgstr ""
 
-#: libexif/exif-tag.c:598
+#: libexif/exif-tag.c:597
 msgid "XP Comment"
 msgstr ""
 
-#: libexif/exif-tag.c:600
+#: libexif/exif-tag.c:599
 msgid "XP Author"
 msgstr ""
 
-#: libexif/exif-tag.c:602
+#: libexif/exif-tag.c:601
 msgid "XP Keywords"
 msgstr ""
 
-#: libexif/exif-tag.c:604
+#: libexif/exif-tag.c:603
 msgid "XP Subject"
 msgstr ""
 
-#: libexif/exif-tag.c:607
+#: libexif/exif-tag.c:606
 msgid "The FlashPix format version supported by a FPXR file."
 msgstr ""
 
-#: libexif/exif-tag.c:609
+#: libexif/exif-tag.c:608
 msgid "Color Space"
 msgstr "Colour Space"
 
-#: libexif/exif-tag.c:610
+#: libexif/exif-tag.c:609
 msgid ""
 "The color space information tag is always recorded as the color space "
 "specifier. Normally sRGB (=1) is used to define the color space based on the "
@@ -3482,7 +3481,7 @@ msgstr ""
 "is used, Uncalibrated (=FFFF.H) is set. Image data recorded as Uncalibrated "
 "can be treated as sRGB when it is converted to FlashPix."
 
-#: libexif/exif-tag.c:619
+#: libexif/exif-tag.c:618
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid width of the meaningful image must be recorded in this tag, "
@@ -3490,45 +3489,43 @@ msgid ""
 "not exist in an uncompressed file."
 msgstr ""
 
-#: libexif/exif-tag.c:626
+#: libexif/exif-tag.c:625
 msgid ""
 "Information specific to compressed data. When a compressed file is recorded, "
 "the valid height of the meaningful image must be recorded in this tag, "
 "whether or not there is padding data or a restart marker. This tag should "
-"not exist in an uncompressed file. For details see section 2.8.1 and "
-"Appendix F. Since data padding is unnecessary in the vertical direction, the "
-"number of lines recorded in this valid image height tag will in fact be the "
-"same as that recorded in the SOF."
+"not exist in an uncompressed file. Since data padding is unnecessary in the "
+"vertical direction, the number of lines recorded in this valid image height "
+"tag will in fact be the same as that recorded in the SOF."
 msgstr ""
 
-#: libexif/exif-tag.c:637
+#: libexif/exif-tag.c:636
 msgid ""
 "This tag is used to record the name of an audio file related to the image "
 "data. The only relational information recorded here is the Exif audio file "
 "name and extension (an ASCII string consisting of 8 characters + '.' + 3 "
-"characters). The path is not recorded. Stipulations on audio are given in  "
-"section 3.6.3. File naming conventions are given in section 3.7.1. When "
-"using this tag, audio files must be recorded in conformance to the Exif "
-"audio format. Writers are also allowed to store the data such as Audio "
-"within APP2 as FlashPix extension stream data. Audio files must be recorded "
-"in conformance to the Exif audio format. The mapping of Exif image files and "
-"audio files is done in any of the three ways shown in Table 8. If multiple "
-"files are mapped to one file as in [2] or [3] of this table, the above "
-"format is used to record just one audio file name. If there are multiple "
-"audio files, the first recorded file is given. In the case of [3] in Table "
-"8, for example, for the Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV"
-"\" is given as the related Exif audio file. When there are three Exif audio "
-"files \"SND00001.WAV\", \"SND00002.WAV\" and \"SND00003.WAV\", the Exif "
-"image file name for each of them, \"DSC00001.JPG\", is indicated. By "
-"combining multiple relational information, a variety of playback "
-"possibilities can be supported. The method of using relational information "
-"is left to the implementation on the playback side. Since this information "
-"is an ASCII character string, it is terminated by NULL. When this tag is "
-"used to map audio files, the relation of the audio file to image data must "
-"also be indicated on the audio file end."
+"characters). The path is not recorded. Stipulations on audio and file naming "
+"conventions are defined in the specification. When using this tag, audio "
+"files must be recorded in conformance to the Exif audio format. Writers are "
+"also allowed to store the data such as Audio within APP2 as FlashPix "
+"extension stream data. Audio files must be recorded in conformance to the "
+"Exif audio format. The mapping of Exif image files and audio files is done "
+"in any of three ways, [1], [2] and [3]. If multiple files are mapped to one "
+"file as in [2] or [3], the above format is used to record just one audio "
+"file name. If there are multiple audio files, the first recorded file is "
+"given. In the case of [3], for example, for the Exif image file \"DSC00001."
+"JPG\" only  \"SND00001.WAV\" is given as the related Exif audio file. When "
+"there are three Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "
+"\"SND00003.WAV\", the Exif image file name for each of them, \"DSC00001.JPG"
+"\", is indicated. By combining multiple relational information, a variety of "
+"playback possibilities can be supported. The method of using relational "
+"information is left to the implementation on the playback side. Since this "
+"information is an ASCII character string, it is terminated by NULL. When "
+"this tag is used to map audio files, the relation of the audio file to image "
+"data must also be indicated on the audio file end."
 msgstr ""
 
-#: libexif/exif-tag.c:670
+#: libexif/exif-tag.c:668
 msgid ""
 "Interoperability IFD is composed of tags which stores the information to "
 "ensure the Interoperability and pointed by the following tag located in Exif "
@@ -3537,62 +3534,62 @@ msgid ""
 "characteristically compared with normal TIFF IFD."
 msgstr ""
 
-#: libexif/exif-tag.c:679
+#: libexif/exif-tag.c:677
 msgid "Flash Energy"
 msgstr ""
 
-#: libexif/exif-tag.c:680
+#: libexif/exif-tag.c:678
 msgid ""
 "Indicates the strobe energy at the time the image is captured, as measured "
 "in Beam Candle Power Seconds (BCPS)."
 msgstr ""
 
-#: libexif/exif-tag.c:683
+#: libexif/exif-tag.c:681
 msgid "Spatial Frequency Response"
 msgstr ""
 
-#: libexif/exif-tag.c:684
+#: libexif/exif-tag.c:682
 msgid ""
 "This tag records the camera or input device spatial frequency table and SFR "
 "values in the direction of image width, image height, and diagonal "
 "direction, as specified in ISO 12233."
 msgstr ""
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:687
 msgid "Focal Plane x-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:690
+#: libexif/exif-tag.c:688
 msgid ""
 "Indicates the number of pixels in the image width (X) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:693
+#: libexif/exif-tag.c:691
 msgid "Focal Plane y-Resolution"
 msgstr ""
 
-#: libexif/exif-tag.c:694
+#: libexif/exif-tag.c:692
 msgid ""
 "Indicates the number of pixels in the image height (V) direction per "
 "<FocalPlaneResolutionUnit> on the camera focal plane."
 msgstr ""
 
-#: libexif/exif-tag.c:697
+#: libexif/exif-tag.c:695
 msgid "Focal Plane Resolution Unit"
 msgstr ""
 
-#: libexif/exif-tag.c:698
+#: libexif/exif-tag.c:696
 msgid ""
 "Indicates the unit for measuring <FocalPlaneXResolution> and "
 "<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
 msgstr ""
 
-#: libexif/exif-tag.c:702
+#: libexif/exif-tag.c:700
 msgid "Subject Location"
 msgstr ""
 
-#: libexif/exif-tag.c:703
+#: libexif/exif-tag.c:701
 msgid ""
 "Indicates the location of the main subject in the scene. The value of this "
 "tag represents the pixel at the center of the main subject relative to the "
@@ -3606,191 +3603,191 @@ msgstr ""
 "value indicates the X column number and the second indicates the Y row "
 "number."
 
-#: libexif/exif-tag.c:709
+#: libexif/exif-tag.c:707
 msgid "Exposure Index"
 msgstr ""
 
-#: libexif/exif-tag.c:710
+#: libexif/exif-tag.c:708
 msgid ""
 "Indicates the exposure index selected on the camera or input device at the "
 "time the image is captured."
 msgstr ""
 
-#: libexif/exif-tag.c:712
+#: libexif/exif-tag.c:710
 msgid "Sensing Method"
 msgstr ""
 
-#: libexif/exif-tag.c:713
+#: libexif/exif-tag.c:711
 msgid "Indicates the image sensor type on the camera or input device."
 msgstr ""
 
-#: libexif/exif-tag.c:715 libexif/fuji/mnote-fuji-tag.c:64
+#: libexif/exif-tag.c:713 libexif/fuji/mnote-fuji-tag.c:64
 msgid "File Source"
 msgstr ""
 
-#: libexif/exif-tag.c:716
+#: libexif/exif-tag.c:714
 msgid ""
 "Indicates the image source. If a DSC recorded the image, the tag value of "
 "this tag always be set to 3, indicating that the image was recorded on a DSC."
 msgstr ""
 
-#: libexif/exif-tag.c:719
+#: libexif/exif-tag.c:717
 msgid "Scene Type"
 msgstr ""
 
-#: libexif/exif-tag.c:720
+#: libexif/exif-tag.c:718
 msgid ""
 "Indicates the type of scene. If a DSC recorded the image, this tag value "
 "must always be set to 1, indicating that the image was directly photographed."
 msgstr ""
 
-#: libexif/exif-tag.c:728
+#: libexif/exif-tag.c:726
 msgid "Subject Area"
 msgstr ""
 
-#: libexif/exif-tag.c:729
+#: libexif/exif-tag.c:727
 msgid ""
 "This tag indicates the location and area of the main subject in the overall "
 "scene."
 msgstr ""
 
-#: libexif/exif-tag.c:731
+#: libexif/exif-tag.c:729
 msgid "TIFF/EP Standard ID"
 msgstr ""
 
-#: libexif/exif-tag.c:732
+#: libexif/exif-tag.c:730
 msgid "Custom Rendered"
 msgstr ""
 
-#: libexif/exif-tag.c:733
+#: libexif/exif-tag.c:731
 msgid ""
 "This tag indicates the use of special processing on image data, such as "
 "rendering geared to output. When special processing is performed, the reader "
 "is expected to disable or minimize any further processing."
 msgstr ""
 
-#: libexif/exif-tag.c:737
+#: libexif/exif-tag.c:735
 msgid "Exposure Mode"
 msgstr ""
 
-#: libexif/exif-tag.c:738
+#: libexif/exif-tag.c:736
 msgid ""
 "This tag indicates the exposure mode set when the image was shot. In auto-"
 "bracketing mode, the camera shoots a series of frames of the same scene at "
 "different exposure settings."
 msgstr ""
 
-#: libexif/exif-tag.c:741 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/exif-tag.c:739 libexif/fuji/mnote-fuji-tag.c:40
 #: libexif/pentax/mnote-pentax-tag.c:41 libexif/pentax/mnote-pentax-tag.c:70
 msgid "White Balance"
 msgstr ""
 
-#: libexif/exif-tag.c:742
+#: libexif/exif-tag.c:740
 msgid "This tag indicates the white balance mode set when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:745
+#: libexif/exif-tag.c:743
 msgid "Digital Zoom Ratio"
 msgstr ""
 
-#: libexif/exif-tag.c:746
+#: libexif/exif-tag.c:744
 msgid ""
 "This tag indicates the digital zoom ratio when the image was shot. If the "
 "numerator of the recorded value is 0, this indicates that digital zoom was "
 "not used."
 msgstr ""
 
-#: libexif/exif-tag.c:750
+#: libexif/exif-tag.c:748
 msgid "Focal Length In 35mm Film"
 msgstr ""
 
-#: libexif/exif-tag.c:751
+#: libexif/exif-tag.c:749
 msgid ""
 "This tag indicates the equivalent focal length assuming a 35mm film camera, "
 "in mm. A value of 0 means the focal length is unknown. Note that this tag "
 "differs from the FocalLength tag."
 msgstr ""
 
-#: libexif/exif-tag.c:756
+#: libexif/exif-tag.c:754
 msgid "Scene Capture Type"
 msgstr ""
 
-#: libexif/exif-tag.c:757
+#: libexif/exif-tag.c:755
 msgid ""
 "This tag indicates the type of scene that was shot. It can also be used to "
 "record the mode in which the image was shot. Note that this differs from the "
 "scene type <SceneType> tag."
 msgstr ""
 
-#: libexif/exif-tag.c:761
+#: libexif/exif-tag.c:759
 msgid "Gain Control"
 msgstr ""
 
-#: libexif/exif-tag.c:762
+#: libexif/exif-tag.c:760
 msgid "This tag indicates the degree of overall image gain adjustment."
 msgstr ""
 
-#: libexif/exif-tag.c:765
+#: libexif/exif-tag.c:763
 msgid ""
 "This tag indicates the direction of contrast processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:768
+#: libexif/exif-tag.c:766
 msgid ""
 "This tag indicates the direction of saturation processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:771
+#: libexif/exif-tag.c:769
 msgid ""
 "This tag indicates the direction of sharpness processing applied by the "
 "camera when the image was shot."
 msgstr ""
 
-#: libexif/exif-tag.c:774
+#: libexif/exif-tag.c:772
 msgid "Device Setting Description"
 msgstr ""
 
-#: libexif/exif-tag.c:775
+#: libexif/exif-tag.c:773
 msgid ""
 "This tag indicates information on the picture-taking conditions of a "
 "particular camera model. The tag is used only to indicate the picture-taking "
 "conditions in the reader."
 msgstr ""
 
-#: libexif/exif-tag.c:780
+#: libexif/exif-tag.c:778
 msgid "Subject Distance Range"
 msgstr ""
 
-#: libexif/exif-tag.c:781
+#: libexif/exif-tag.c:779
 msgid "This tag indicates the distance to the subject."
 msgstr ""
 
-#: libexif/exif-tag.c:782
+#: libexif/exif-tag.c:780
 msgid "Image Unique ID"
 msgstr ""
 
-#: libexif/exif-tag.c:783
+#: libexif/exif-tag.c:781
 msgid ""
 "This tag indicates an identifier assigned uniquely to each image. It is "
 "recorded as an ASCII string equivalent to hexadecimal notation and 128-bit "
 "fixed length."
 msgstr ""
 
-#: libexif/exif-tag.c:786
+#: libexif/exif-tag.c:784
 msgid "Gamma"
 msgstr ""
 
-#: libexif/exif-tag.c:787
+#: libexif/exif-tag.c:785
 msgid "Indicates the value of coefficient gamma."
 msgstr ""
 
-#: libexif/exif-tag.c:788
+#: libexif/exif-tag.c:786
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:789
+#: libexif/exif-tag.c:787
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 

[libexif-cvs] libexif/libexif exif-tag.c,1.45,1.46

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28118/libexif

Modified Files:
	exif-tag.c 
Log Message:
Jan Patera pointed out that referencing appendices, tables and sections of the
EXIF spec within the tag descriptions didn't make much sense.


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -d -r1.45 -r1.46
--- exif-tag.c	9 Jan 2009 05:03:14 -0000	1.45
+++ exif-tag.c	9 Jan 2009 05:26:14 -0000	1.46
@@ -218,7 +218,7 @@ static const struct {
 	 N_("YCbCr Coefficients"),
 	 N_("The matrix coefficients for transformation from RGB to YCbCr "
 	    "image data. No default is given in TIFF; but here the "
-	    "value given in Appendix E, \"Color Space Guidelines\", is used "
+	    "value given in \"Color Space Guidelines\", is used "
 	    "as the default. The color space is declared in a "
 	    "color space information tag, with the default being the value "
 	    "that gives the optimal image characteristics "
@@ -391,7 +391,7 @@ static const struct {
             "during three-dimensional measurement."), ESL_GPS},
 	{EXIF_TAG_GPS_SPEED_REF, "GPSSpeedRef", N_("Speed unit"),
          N_("Indicates the unit used to express the GPS receiver speed "
-            "of movement. 'K' 'M' and 'N' represents kilometers per hour, "
+            "of movement. 'K', 'M' and 'N' represent kilometers per hour, "
             "miles per hour, and knots."), ESL_GPS},
 	{EXIF_TAG_GPS_SPEED, "GPSSpeed", N_("Speed of GPS receiver"),
 	 N_("Indicates the speed of GPS receiver movement."), ESL_GPS},
@@ -447,20 +447,20 @@ static const struct {
             "of values is from 0.00 to 359.99."), ESL_GPS},
 	{EXIF_TAG_GPS_DEST_DISTANCE_REF, "GPSDestDistanceRef", N_("Reference for distance to destination"),
          N_("Indicates the unit used to express the distance to the "
-            "destination point. 'K', 'M' and 'N' represents kilometers, miles "
+            "destination point. 'K', 'M' and 'N' represent kilometers, miles "
             "and knots."), ESL_GPS},
 	{EXIF_TAG_GPS_DEST_DISTANCE, "GPSDestDistance", N_("Distance to destination"),
 	 N_("Indicates the distance to the destination point."), ESL_GPS},
 	{EXIF_TAG_GPS_PROCESSING_METHOD, "GPSProcessingMethod", N_("Name of GPS processing method"),
          N_("A character string recording the name of the method used "
             "for location finding. The first byte indicates the character "
-            "code used (Table 6 Table 7), and this is followed by the name "
+            "code used, and this is followed by the name "
             "of the method. Since the Type is not ASCII, NULL termination is "
             "not necessary."), ESL_GPS},
 	{EXIF_TAG_GPS_AREA_INFORMATION, "GPSAreaInformation", N_("Name of GPS area"),
          N_("A character string recording the name of the GPS area. The "
-            "first byte indicates the character code used (Table 6 Table "
-            "7), and this is followed by the name of the GPS area. Since "
+            "first byte indicates the character code used, "
+            "and this is followed by the name of the GPS area. Since "
             "the Type is not ASCII, NULL termination is not necessary."), ESL_GPS},
 	{EXIF_TAG_GPS_DATE_STAMP, "GPSDateStamp", N_("GPS date"),
          N_("A character string recording date and time information "
@@ -563,18 +563,17 @@ static const struct {
 	    "the tag data area. The unused portion of the area is padded "
 	    "with NULL (\"00.h\"). ID codes are assigned by means of "
 	    "registration. The designation method and references for each "
-	    "character code are given in Table 6. The value of CountN "
-	    "is determined based on the 8 bytes in the character code "
+	    "character code are defined in the specification. The value of "
+	    "CountN is determined based on the 8 bytes in the character code "
 	    "area and the number of bytes in the user comment part. Since "
-	    "the TYPE is not ASCII, NULL termination is not necessary "
-	    "(see Fig. 9). "
+	    "the TYPE is not ASCII, NULL termination is not necessary. "
 	    "The ID code for the <UserComment> area may be a Defined code "
 	    "such as JIS or ASCII, or may be Undefined. The Undefined name "
 	    "is UndefinedText, and the ID code is filled with 8 bytes of all "
 	    "\"NULL\" (\"00.H\"). An Exif reader that reads the "
 	    "<UserComment> tag must have a function for determining the "
 	    "ID code. This function is not required in Exif readers that "
-	    "do not use the <UserComment> tag (see Table 7). "
+	    "do not use the <UserComment> tag. "
 	    "When a <UserComment> area is set aside, it is recommended that "
 	    "the ID code be ASCII and that the following user comment "
 	    "part be filled with blank characters [20.H]."),
@@ -627,8 +626,8 @@ static const struct {
 	    "file is recorded, the valid height of the meaningful image "
 	    "must be recorded in this tag, whether or not there is padding "
 	    "data or a restart marker. This tag should not exist in an "
-	    "uncompressed file. For details see section 2.8.1 and Appendix "
-	    "F. Since data padding is unnecessary in the vertical direction, "
+	    "uncompressed file. "
+	    "Since data padding is unnecessary in the vertical direction, "
 	    "the number of lines recorded in this valid image height tag "
 	    "will in fact be the same as that recorded in the SOF."),
 	 { ESL_NNNN, ESL_NNNN, ESL_NNNM, ESL_NNNN, ESL_NNNN } },
@@ -639,19 +638,18 @@ static const struct {
 	    "recorded here is the Exif audio file name and extension (an "
 	    "ASCII string consisting of 8 characters + '.' + 3 "
 	    "characters). The path is not recorded. Stipulations on audio "
-	    "are given in  section 3.6.3. File naming conventions are "
-	    "given in section 3.7.1. "
+	    "and file naming conventions are defined in the specification. "
 	    "When using this tag, audio files must be recorded in "
 	    "conformance to the Exif audio format. Writers are also allowed "
 	    "to store the data such as Audio within APP2 as FlashPix "
 	    "extension stream data. "
 	    "Audio files must be recorded in conformance to the Exif audio "
 	    "format. The mapping of Exif image files and audio files is done "
-	    "in any of the three ways shown in Table 8. If multiple files "
-	    "are mapped to one file as in [2] or [3] of this table, the above "
+	    "in any of three ways, [1], [2] and [3]. If multiple files "
+	    "are mapped to one file as in [2] or [3], the above "
 	    "format is used to record just one audio file name. If "
 	    "there are multiple audio files, the first recorded file is "
-	    "given. In the case of [3] in Table 8, for example, for the "
+	    "given. In the case of [3], for example, for the "
 	    "Exif image file \"DSC00001.JPG\" only  \"SND00001.WAV\" is "
 	    "given as the related Exif audio file. When there are three "
 	    "Exif audio files \"SND00001.WAV\", \"SND00002.WAV\" and "

[libexif-cvs] libexif/libexif exif-tag.c,1.44,1.45

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26457/libexif

Modified Files:
	exif-tag.c 
Log Message:
Fixed a typo in the EXIF_TAG_GPS_DEST_DISTANCE_REF tag description (thanks
to Jan Patera for catching it).


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -d -r1.44 -r1.45
--- exif-tag.c	7 Jan 2009 07:28:40 -0000	1.44
+++ exif-tag.c	9 Jan 2009 05:03:14 -0000	1.45
@@ -447,7 +447,7 @@ static const struct {
             "of values is from 0.00 to 359.99."), ESL_GPS},
 	{EXIF_TAG_GPS_DEST_DISTANCE_REF, "GPSDestDistanceRef", N_("Reference for distance to destination"),
          N_("Indicates the unit used to express the distance to the "
-            "destination point. 'K', 'M' and 'N' represent kilometers, miles "
+            "destination point. 'K', 'M' and 'N' represents kilometers, miles "
             "and knots."), ESL_GPS},
 	{EXIF_TAG_GPS_DEST_DISTANCE, "GPSDestDistance", N_("Distance to destination"),
 	 N_("Indicates the distance to the destination point."), ESL_GPS},

[libexif-cvs] libexif/po en_CA.po,1.6,1.7

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/po
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26457/po

Modified Files:
	en_CA.po 
Log Message:
Fixed a typo in the EXIF_TAG_GPS_DEST_DISTANCE_REF tag description (thanks
to Jan Patera for catching it).


Index: en_CA.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/en_CA.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- en_CA.po	7 Jan 2009 07:28:43 -0000	1.6
+++ en_CA.po	9 Jan 2009 05:03:16 -0000	1.7
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.16.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 23:14-0800\n"
+"POT-Creation-Date: 2009-01-08 21:00-0800\n"
 "PO-Revision-Date: 2007-11-12 18:00-0800\n"
 "Last-Translator: Dan Fandrich <da...@co...>\n"
 "Language-Team: none\n"
@@ -3185,10 +3185,10 @@ msgstr ""
 #: libexif/exif-tag.c:449
 msgid ""
 "Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometers, miles and knots."
+"'K', 'M' and 'N' represents kilometers, miles and knots."
 msgstr ""
 "Indicates the unit used to express the distance to the destination point. "
-"'K', 'M' and 'N' represent kilometres, miles and knots."
+"'K', 'M' and 'N' represents kilometres, miles and knots."
 
 #: libexif/exif-tag.c:452
 msgid "Distance to destination"
@@ -3229,7 +3229,7 @@ msgstr ""
 #: libexif/exif-tag.c:466
 msgid ""
 "A character string recording date and time information relative to UTC "
-"(Coordinated Universal Time). The format is \"YYYY:MM:DD.\" The length of "
+"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
 "the string is 11 bytes including NULL."
 msgstr ""
 

[libexif-cvs] libexif/po en_CA.po,1.5,1.6

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif/po
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10402/po

Modified Files:
	en_CA.po 
Log Message:
libexif/exif-tags.c: Added remaining GPS tags from the EXIF 2.2
spec to the tag table.


Index: en_CA.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/en_CA.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- en_CA.po	5 Nov 2008 07:20:29 -0000	1.5
+++ en_CA.po	7 Jan 2009 07:28:43 -0000	1.6
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.16.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-04 15:06-0800\n"
+"POT-Creation-Date: 2009-01-06 23:14-0800\n"
 "PO-Revision-Date: 2007-11-12 18:00-0800\n"
 "Last-Translator: Dan Fandrich <da...@co...>\n"
 "Language-Team: none\n"
@@ -38,7 +38,7 @@ msgid "Invalid number of components (%i,
 msgstr ""
 
[...2061 lines suppressed...]
-#: libexif/exif-tag.c:686
+#: libexif/exif-tag.c:786
 msgid "Gamma"
 msgstr ""
 
-#: libexif/exif-tag.c:687
+#: libexif/exif-tag.c:787
 msgid "Indicates the value of coefficient gamma."
 msgstr ""
 
-#: libexif/exif-tag.c:688
+#: libexif/exif-tag.c:788
 msgid "PRINT Image Matching"
 msgstr ""
 
-#: libexif/exif-tag.c:689
+#: libexif/exif-tag.c:789
 msgid "Related to Epson's PRINT Image Matching technology"
 msgstr ""
 

[libexif-cvs] libexif ChangeLog,1.295,1.296 NEWS,1.47,1.48

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10402

Modified Files:
	ChangeLog NEWS 
Log Message:
libexif/exif-tags.c: Added remaining GPS tags from the EXIF 2.2
spec to the tag table.


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -d -r1.47 -r1.48
--- NEWS	23 Dec 2008 08:24:44 -0000	1.47
+++ NEWS	7 Jan 2009 07:28:42 -0000	1.48
@@ -9,6 +9,7 @@ libexif-0.6.x:
     now officially documented
   * Fixed some Olympus/Sanyo MakerNote interpretations
   * Fixed bug #1946138 to stop ignoring CFLAGS in the sqrt configure test
+  * Added remaining GPS tags from the EXIF 2.2 spec to the tag table
 
 libexif-0.6.17 (2008-11-06):
   * Updated translations: cs, de, pl, sk, vi

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -d -r1.295 -r1.296
--- ChangeLog	3 Jan 2009 08:17:35 -0000	1.295
+++ ChangeLog	7 Jan 2009 07:28:42 -0000	1.296
@@ -1,3 +1,8 @@
+2009-01-06  Dan Fandrich <da...@co...>
+
+	* libexif/exif-tags.c: Added remaining GPS tags from the EXIF 2.2
+	  spec to the tag table.
+
 2009-01-03  Dan Fandrich <da...@co...>
 
 	* contrib/examples/photographer.c: Added example program to show how