libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif ChangeLog,1.123,1.124

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27199

Modified Files:
	ChangeLog 
Log Message:

2004-06-22  Lutz Mueller <lu...@us...>

	* libexif/olympus/mnote-olympus-tag.[c,h]: New tags discovered by
	  Serge Droz <ser...@ps...>.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- ChangeLog	15 Jun 2004 16:23:09 -0000	1.123
+++ ChangeLog	22 Jun 2004 18:10:38 -0000	1.124
@@ -1,3 +1,8 @@
+2004-06-22  Lutz Mueller <lu...@us...>
+
+	* libexif/olympus/mnote-olympus-tag.[c,h]: New tags discovered by
+	  Serge Droz <ser...@ps...>.
+
 2004-06-15  Jan Patera <pa...@us...>
 
 	* libexif/olympus/mnote-olympus-entry.c: MNOTE_OLYMPUS_TAG_INFO

[libexif-cvs] exif/exif actions.c,1.18,1.19

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21247/exif

Modified Files:
	actions.c 
Log Message:

2004-06-22  Lutz Mueller <lu...@us...>

	* exif/actions.c: Don't crash if return value is NULL. Spotted by
	  Serge Droz <ser...@ps...>.
	  Kill warning.


Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- actions.c	6 Jun 2004 03:02:04 -0000	1.18
+++ actions.c	22 Jun 2004 18:01:19 -0000	1.19
@@ -104,6 +104,7 @@
 	char b[1024];
 	char b1[1024], b2[1024];
 	ExifMnoteData *n;
+	const char *p;
 
 	n = exif_data_get_mnote_data (ed);
 	if (!n) {
@@ -123,8 +124,10 @@
 		printf (_("MakerNote contains %i values:\n"), c);
 	}
 	for (i = 0; i < c; i++) {
-		strncpy (b1, C (exif_mnote_data_get_title (n, i)), bs);
-		strncpy (b2, C (exif_mnote_data_get_value (n, i, b, bs)), bs);
+		p = C (exif_mnote_data_get_title (n, i));
+		strncpy (b1, p ? p : _("Unknown tag"), bs);
+		p = C (exif_mnote_data_get_value (n, i, b, bs));
+		strncpy (b2, p ? p : _("Unknown value"), bs);
 		printf ("%s: %s\n", b1, b2);
 	}
 }
@@ -166,7 +169,7 @@
 show_entry_machine (ExifEntry *e, void *data)
 {
 	unsigned char *ids = data;
-	char *v[1024];
+	char v[1024];
 
 	if (*ids) fprintf (stdout, "0x%04x", e->tag);
 	else fprintf (stdout, "%s", exif_tag_get_title (e->tag));

[libexif-cvs] exif ChangeLog,1.42,1.43

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/exif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21247

Modified Files:
	ChangeLog 
Log Message:

2004-06-22  Lutz Mueller <lu...@us...>

	* exif/actions.c: Don't crash if return value is NULL. Spotted by
	  Serge Droz <ser...@ps...>.
	  Kill warning.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ChangeLog	6 Jun 2004 03:02:04 -0000	1.42
+++ ChangeLog	22 Jun 2004 18:01:19 -0000	1.43
@@ -1,3 +1,9 @@
+2004-06-22  Lutz Mueller <lu...@us...>
+
+	* exif/actions.c: Don't crash if return value is NULL. Spotted by
+	  Serge Droz <ser...@ps...>.
+	  Kill warning.
+
 2004-06-06  Lutz Mueller <lu...@us...>
 
 	* exif/actions.c: Try to fix segfault.

[libexif-cvs] libexif ChangeLog,1.122,1.123

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7406

Modified Files:
	ChangeLog 
Log Message:
libexif/olympus/mnote-olympus-entry.c: MNOTE_OLYMPUS_TAG_INFO


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- ChangeLog	6 Jun 2004 03:04:20 -0000	1.122
+++ ChangeLog	15 Jun 2004 16:23:09 -0000	1.123
@@ -1,3 +1,7 @@
+2004-06-15  Jan Patera <pa...@us...>
+
+	* libexif/olympus/mnote-olympus-entry.c: MNOTE_OLYMPUS_TAG_INFO
+
 2004-06-06  Lutz Mueller <lu...@us...>
 
 	* libexif/olympus/exif-mnote-data-olympus.c: More documentation,

[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c,1.13,1.14

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6067

Modified Files:
	mnote-olympus-entry.c 
Log Message:
MNOTE_OLYMPUS_TAG_INFO: handle length 53 (in addition to 52) & extract the string


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mnote-olympus-entry.c	7 Jun 2004 14:08:57 -0000	1.13
+++ mnote-olympus-entry.c	15 Jun 2004 16:21:56 -0000	1.14
@@ -52,8 +52,16 @@
         }                                                               \
 }
 
-#undef  MIN
-#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
+#define CC2(number,t1,t2,v,maxlen)                                      \
+{                                                                       \
+	if ((number != t1) && (number != t2)) {                         \
+		snprintf (v, maxlen,                                    \
+			_("Invalid number of components (%i, "          \
+			"expected %i or %i)."), (int) number,		\
+			(int) t1, (int) t2);  				\
+		break;                                                  \
+	}                                                               \
+}
 
 static struct {
 	ExifTag tag;
@@ -423,7 +431,8 @@
 		break;
 	case MNOTE_OLYMPUS_TAG_INFO:
 		CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
-		CC (entry->components, 52, v, maxlen);
+		CC2 (entry->components, 52, 53, v, maxlen);
+		strncpy (v, entry->data, MIN (maxlen, entry->size));
 		break;
 	case MNOTE_OLYMPUS_TAG_ID:
 		CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);

[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c,1.12,1.13

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19763

Modified Files:
	mnote-olympus-entry.c 
Log Message:
Prevent crashes on too many unknown bytes:
man strncat: only the first n characters of src are appended to dest.



Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mnote-olympus-entry.c	6 Jun 2004 03:04:21 -0000	1.12
+++ mnote-olympus-entry.c	7 Jun 2004 14:08:57 -0000	1.13
@@ -519,7 +519,7 @@
 				  entry->size);
 			for (i = 0; i < entry->size; i++) {
 				sprintf (buf, " %02x", entry->data[i]);
-				strncat (v, buf, maxlen);
+				strncat (v, buf, maxlen - strlen (v));
 			}
 			break;
 		}

[libexif-cvs] libexif/libexif/olympus Makefile.am,1.6,1.7 exif-mnote-data-olympus.c,1.14,1.15 mnote-olympus-entry.c,1.11,1.12 mnote-olympus-tag.c,1.3,1.4

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29923/libexif/olympus

Modified Files:
	Makefile.am exif-mnote-data-olympus.c mnote-olympus-entry.c 
	mnote-olympus-tag.c 
Log Message:

2004-06-06  Lutz Mueller <lu...@us...>

	* libexif/olympus/exif-mnote-data-olympus.c: More documentation,
	  additional case (Nikon, 02 0a 00).
	* Makefile.am: s/LIBMNOTE/LIBEXIF


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mnote-olympus-entry.c	25 May 2004 22:30:53 -0000	1.11
+++ mnote-olympus-entry.c	6 Jun 2004 03:04:21 -0000	1.12
@@ -179,7 +179,7 @@
 		CC (entry->components, 4, v, maxlen);
 		vl = exif_get_long (entry->data, entry->order);
 		if ((vl & 0xF0F0F0F0) == 0x30303030) {
-			memcpy (v, entry->data, MIN(maxlen, 4));
+			memcpy (v, entry->data, MIN (maxlen, 4));
 		} else {
 			snprintf (v, maxlen, "%04lx", vl);
 		}

Index: mnote-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-tag.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mnote-olympus-tag.c	10 May 2004 12:28:48 -0000	1.3
+++ mnote-olympus-tag.c	6 Jun 2004 03:04:21 -0000	1.4
@@ -22,6 +22,7 @@
 #include "mnote-olympus-tag.h"
 
 #include <libexif/i18n.h>
+#include <libexif/exif-utils.h>
 
 #include <stdlib.h>
 
@@ -133,7 +134,7 @@
 {
 	unsigned int i;
 
-	bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR);
 	for (i = 0; table[i].title; i++) if (table[i].tag == t) break;
 	return (_(table[i].title));
 }
@@ -143,7 +144,8 @@
 {
 	unsigned int i;
 
-	bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR);
 	for (i = 0; table[i].description; i++) if (table[i].tag == t) break;
+	if (!table[i].description) return NULL;
 	return (_(table[i].description));
 }

Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- exif-mnote-data-olympus.c	25 May 2004 22:30:49 -0000	1.14
+++ exif-mnote-data-olympus.c	6 Jun 2004 03:04:21 -0000	1.15
@@ -62,9 +62,9 @@
 {
 	ExifMnoteDataOlympus *n = (ExifMnoteDataOlympus *) d;
 
-	if (!d) return NULL;
-	if (n->count <= i) return NULL;
-	exif_log (d->log, EXIF_LOG_CODE_DEBUG, "MnoteDataOlympus",
+	if (!d || !val) return NULL;
+	if (i > n->count -1) return NULL;
+	exif_log (d->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus",
 		  "Querying value for tag '%s'...",
 		  mnote_olympus_tag_get_name (n->entries[i].tag));
 	return mnote_olympus_entry_get_value (&n->entries[i], val, maxlen);
@@ -159,58 +159,108 @@
 {
 	ExifMnoteDataOlympus *n = (ExifMnoteDataOlympus *) en;
 	ExifShort c;
-	unsigned int i, s, o, o2, datao = 6, base = 0;
+	unsigned int i, s, o, o2 = 0, datao = 6, base = 0;
 
 	if (!n || !buf) return;
 
-	exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteOlympus",
-		  "Trying to parse Olympus/Nikon maker note...");
+	/* Start of interesting data */
+	o2 = 6 + n->offset;
 
 	/*
 	 * Olympus headers start with "OLYMP" and need to have at least
 	 * a size of 22 bytes (6 for 'OLYMP', 2 other bytes, 2 for the
 	 * number of entries, and 12 for one entry.
 	 *
-	 * Nikon v1 headers start with "Nikon", 0, 1, 0, number_of_tags,
+	 * Nikon headers start with "Nikon" (6 bytes including '\0'), 
+	 * version number (1 or 2).
+	 * 
+	 * Version 1 continues with 0, 1, 0, number_of_tags,
 	 * or just with number_of_tags (models D1H, D1X...).
-	 * Nikon v2 headers start with "Nikon", 0, 2, 0, 0, 0, "MM", 0, 0x2A
-	 * or "Nikon", 0, 2, 0, 0, 0, "II", 0x2A, 0.
+	 * 
+	 * Version 2 continues with an unknown byte (0 or 10),
+	 * two unknown bytes (0), "MM" or "II", another byte 0 and 
+	 * lastly 0x2A.
 	 */
 	if (buf_size - n->offset < 22) return;
-	if (!memcmp (buf + 6 + n->offset, "OLYMP", 5)) {
-		o2 = 6 + n->offset + 8 + 2;
-		c = exif_get_short (buf + 6 + n->offset + 8, n->order);
+	if (!memcmp (buf + o2, "OLYMP", 5)) {
+		exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus",
+			"Parsing Olympus maker note...");
+
+		/* The number of entries is at position 8. */
 		n->version = 0;
-	} else if (!memcmp (buf + 6 + n->offset, "Nikon", 5)) {
-		o2 = 6 + n->offset + 8 + 2;
-		datao = o2;
-		if (!memcmp(buf + o2 - 4, "\2\0\0\0II\x2A\0", 8)) {
-			n->order = EXIF_BYTE_ORDER_INTEL;
-			o2 += exif_get_long(buf + o2 + 4, n->order);
-			n->version = 2;
-		} else if (!memcmp(buf + o2 - 4, "\2\0\0\0MM\0\x2A", 8)) {
-			n->order = EXIF_BYTE_ORDER_MOTOROLA;
-			o2 += exif_get_long(buf + o2 + 4, n->order);
-			n->version = 2;
-		} else if (!memcmp(buf + o2 - 4, "\1\0", 2)) {
-			o2 -= 2;
+		o2 += 8;
+
+	} else if (!memcmp (buf + o2, "Nikon", 6)) {
+		o2 += 6;
+		exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus",
+			"Parsing Nikon maker note (0x%02x, %02x, %02x, "
+			"%02x, %02x, %02x, %02x, %02x, %02x)...",
+			buf[o2 + 0], buf[o2 + 1], buf[o2 + 2], buf[o2 + 3], 
+			buf[o2 + 4], buf[o2 + 5], buf[o2 + 6], buf[o2 + 7]); 
+
+		/* The first byte is the version. */
+		if (o2 >= buf_size) return;
+		n->version = buf[o2];
+		o2 += 1;
+
+		/* Skip an unknown byte (00 or 0A). */
+		o2 += 1;
+
+		switch (n->version) {
+		case 1:
+
 			base = MNOTE_NIKON1_TAG_BASE;
-			n->version = 1;
-		} else {
+			break;
+
+		case 2:
+
+			/* Skip 2 unknown bytes (00 00). */
+			o2 += 2;
+
+			/*
+			 * Byte order. From here the data offset
+			 * gets calculated.
+			 */
+			datao = o2;
+			if (o2 >= buf_size) return;
+			if (!strncmp (&buf[o2], "II", 2))
+				n->order = EXIF_BYTE_ORDER_INTEL;
+			else if (!strncmp (&buf[o2], "MM", 2))
+				n->order = EXIF_BYTE_ORDER_MOTOROLA;
+			else {
+				exif_log (en->log, EXIF_LOG_CODE_DEBUG,
+					"ExifMnoteDatalympus", "Unknown "
+					"byte order '%c%c'", buf[o2],
+					buf[o2 + 1]);
+				return;
+			}
+			o2 += 2;
+
+			/* Skip 2 unknown bytes (00 2A). */
+			o2 += 2;
+
+			/* Go to where the number of entries is. */
+			if (o2 >= buf_size) return;
+			o2 = datao + exif_get_long (buf + o2, n->order);
+			break;
+
+		default:
+			exif_log (en->log, EXIF_LOG_CODE_DEBUG,
+				"ExifMnoteDataOlympus", "Unknown version "
+				"number %i.", n->version);
 			return;
 		}
-		if (o2 + 2 > buf_size) return;
-		c = exif_get_short (buf + o2, n->order);
-		o2 += 2;
-	} else if (!memcmp (buf + 6 + n->offset, "\0\x1b", 2)) {
-		o2 = 6 + n->offset;
-		c = exif_get_short (buf + o2, n->order);
-		o2 += 2;
+	} else if (!memcmp (buf + o2, "\0\x1b", 2)) {
 		n->version = 2;
 	} else {
 		return;
 	}
 
+	/* Number of entries */
+	if (o2 >= buf_size) return;
+	c = exif_get_short (buf + o2, n->order);
+	o2 += 2;
+
 	/* Read the number of entries and remove old ones. */
 	exif_mnote_data_olympus_clear (n);
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	26 Oct 2003 10:11:31 -0000	1.6
+++ Makefile.am	6 Jun 2004 03:04:21 -0000	1.7
@@ -1,5 +1,5 @@
 INCLUDES =						\
-	-DLIBMNOTE_LOCALEDIR=\""$(datadir)/locale"\"	\
+	-DLIBEXIF_LOCALEDIR=\""$(datadir)/locale"\"	\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/intl
 

[libexif-cvs] libexif/libexif exif-mnote-data.c,1.5,1.6

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29923/libexif

Modified Files:
	exif-mnote-data.c 
Log Message:

2004-06-06  Lutz Mueller <lu...@us...>

	* libexif/olympus/exif-mnote-data-olympus.c: More documentation,
	  additional case (Nikon, 02 0a 00).
	* Makefile.am: s/LIBMNOTE/LIBEXIF


Index: exif-mnote-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-mnote-data.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exif-mnote-data.c	20 May 2004 10:50:35 -0000	1.5
+++ exif-mnote-data.c	6 Jun 2004 03:04:20 -0000	1.6
@@ -52,8 +52,7 @@
 {
 	if (!d) return;
 	if (d->priv) {
-		if (d->methods.free)
-			d->methods.free (d);
+		if (d->methods.free) d->methods.free (d);
 		free (d->priv);
 		d->priv = NULL;
 	}
@@ -62,8 +61,7 @@
 void
 exif_mnote_data_unref (ExifMnoteData *d)
 {
-	if (!d || !d->priv)
-		return;
+	if (!d || !d->priv) return;
 	if (d->priv->ref_count > 0) d->priv->ref_count--;
 	if (!d->priv->ref_count)
 		exif_mnote_data_free (d);

[libexif-cvs] libexif ChangeLog,1.121,1.122

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29923

Modified Files:
	ChangeLog 
Log Message:

2004-06-06  Lutz Mueller <lu...@us...>

	* libexif/olympus/exif-mnote-data-olympus.c: More documentation,
	  additional case (Nikon, 02 0a 00).
	* Makefile.am: s/LIBMNOTE/LIBEXIF


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- ChangeLog	27 May 2004 17:56:22 -0000	1.121
+++ ChangeLog	6 Jun 2004 03:04:20 -0000	1.122
@@ -1,3 +1,9 @@
+2004-06-06  Lutz Mueller <lu...@us...>
+
+	* libexif/olympus/exif-mnote-data-olympus.c: More documentation,
+	  additional case (Nikon, 02 0a 00).
+	* Makefile.am: s/LIBMNOTE/LIBEXIF
+
 2004-05-27  Lutz Mueller <lu...@us...>
 
 	* configure.in: 0.6.10 as 0.6.9 has just been released.

[libexif-cvs] exif/exif actions.c,1.17,1.18

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29635/exif

Modified Files:
	actions.c 
Log Message:

2004-06-06  Lutz Mueller <lu...@us...>

	* exif/actions.c: Try to fix segfault.


Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- actions.c	6 Jun 2004 02:28:14 -0000	1.17
+++ actions.c	6 Jun 2004 03:02:04 -0000	1.18
@@ -127,7 +127,6 @@
 		strncpy (b2, C (exif_mnote_data_get_value (n, i, b, bs)), bs);
 		printf ("%s: %s\n", b1, b2);
 	}
-	exif_mnote_data_unref (n);
 }
 
 void

[libexif-cvs] exif ChangeLog,1.41,1.42

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/exif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29635

Modified Files:
	ChangeLog 
Log Message:

2004-06-06  Lutz Mueller <lu...@us...>

	* exif/actions.c: Try to fix segfault.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ChangeLog	6 Jun 2004 02:28:14 -0000	1.41
+++ ChangeLog	6 Jun 2004 03:02:04 -0000	1.42
@@ -1,5 +1,9 @@
 2004-06-06  Lutz Mueller <lu...@us...>
 
+	* exif/actions.c: Try to fix segfault.
+
+2004-06-06  Lutz Mueller <lu...@us...>
+
 	* exif/actions.c: Fix --show-mnote.
 
 2004-05-27  Lutz Mueller <lu...@us...>

[libexif-cvs] exif/exif actions.c,1.16,1.17

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25028/exif

Modified Files:
	actions.c 
Log Message:

2004-06-06  Lutz Mueller <lu...@us...>

	* exif/actions.c: Fix --show-mnote.


Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- actions.c	20 May 2004 10:51:58 -0000	1.16
+++ actions.c	6 Jun 2004 02:28:14 -0000	1.17
@@ -102,6 +102,7 @@
 {
 	unsigned int i, bs = 1024, c;
 	char b[1024];
+	char b1[1024], b2[1024];
 	ExifMnoteData *n;
 
 	n = exif_data_get_mnote_data (ed);
@@ -121,9 +122,11 @@
 	default:
 		printf (_("MakerNote contains %i values:\n"), c);
 	}
-	for (i = 0; i < c; i++)
-		printf ("%s: %s\n", C(exif_mnote_data_get_title (n, i)),
-			C(exif_mnote_data_get_value (n, i, b, bs)));
+	for (i = 0; i < c; i++) {
+		strncpy (b1, C (exif_mnote_data_get_title (n, i)), bs);
+		strncpy (b2, C (exif_mnote_data_get_value (n, i, b, bs)), bs);
+		printf ("%s: %s\n", b1, b2);
+	}
 	exif_mnote_data_unref (n);
 }
 

[libexif-cvs] exif ChangeLog,1.40,1.41

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/exif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25028

Modified Files:
	ChangeLog 
Log Message:

2004-06-06  Lutz Mueller <lu...@us...>

	* exif/actions.c: Fix --show-mnote.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ChangeLog	27 May 2004 17:50:08 -0000	1.40
+++ ChangeLog	6 Jun 2004 02:28:14 -0000	1.41
@@ -1,3 +1,7 @@
+2004-06-06  Lutz Mueller <lu...@us...>
+
+	* exif/actions.c: Fix --show-mnote.
+
 2004-05-27  Lutz Mueller <lu...@us...>
 
 	* configure.in: 0.6.10 as 0.6.9 has just been released.

[libexif-cvs] libexif README,1.7,1.8

[Lutz M. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13301

Modified Files:
	README 
Log Message:
Mention pel.


Index: README
===================================================================
RCS file: /cvsroot/libexif/libexif/README,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- README	26 Oct 2003 10:06:16 -0000	1.7
+++ README	4 Jun 2004 19:48:02 -0000	1.8
@@ -43,6 +43,12 @@
 If you would like to migrate your program to use libexif or add EXIF support
 to it, don't hesitate to contact the authors.
 
+LIBRARIES
+---------
+
+I know of the following libraries that use or have been inspired by libexif:
+ - pel: PHP-Code (http://pel.sourceforge.net)
+
 BUGS
 ----
 

[libexif-cvs] libexif ChangeLog,1.120,1.121 configure.in,1.64,1.65

[Lutz M?l. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16989

Modified Files:
	ChangeLog configure.in 
Log Message:

2004-05-27  Lutz Mueller <lu...@us...>

	* configure.in: 0.6.10 as 0.6.9 has just been released.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- ChangeLog	27 May 2004 17:11:39 -0000	1.120
+++ ChangeLog	27 May 2004 17:56:22 -0000	1.121
@@ -1,5 +1,9 @@
 2004-05-27  Lutz Mueller <lu...@us...>
 
+	* configure.in: 0.6.10 as 0.6.9 has just been released.
+
+2004-05-27  Lutz Mueller <lu...@us...>
+
 	* libexif/exif-entry.c: Jan Patera pointed me to the fact that
 	  last change is pointless.
 

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- configure.in	2 May 2004 20:59:23 -0000	1.64
+++ configure.in	27 May 2004 17:56:23 -0000	1.65
@@ -1,7 +1,7 @@
 AC_PREREQ(2.50)
 AC_INIT(libexif/exif-data.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libexif, 0.6.9)
+AM_INIT_AUTOMAKE(libexif, 0.6.10)
 AM_MAINTAINER_MODE
 
 dnl ---------------------------------------------------------------------------
@@ -46,7 +46,7 @@
 else
 	AC_MSG_RESULT([no])
 fi
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
 
 
 dnl ---------------------------------------------------------------------------
@@ -59,7 +59,7 @@
     AC_SUBST(LDFLAGS)
 fi
 
-AC_OUTPUT([
+AC_OUTPUT([ po/Makefile.in 
   Makefile
   libexif.spec
   libexif/Makefile

[libexif-cvs] exif ChangeLog,1.39,1.40 configure.in,1.32,1.33

[Lutz M?l. <lu...@us...>]

Update of /cvsroot/libexif/exif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16779

Modified Files:
	ChangeLog configure.in 
Log Message:

2004-05-27  Lutz Mueller <lu...@us...>

	* configure.in: 0.6.10 as 0.6.9 has just been released.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- ChangeLog	27 May 2004 17:45:51 -0000	1.39
+++ ChangeLog	27 May 2004 17:50:08 -0000	1.40
@@ -1,5 +1,9 @@
 2004-05-27  Lutz Mueller <lu...@us...>
 
+	* configure.in: 0.6.10 as 0.6.9 has just been released.
+
+2004-05-27  Lutz Mueller <lu...@us...>
+
 	* *: Now make distcheck works.
 
 2004-05-24  Jan Patera <pa...@us...>

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/exif/configure.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- configure.in	27 May 2004 17:45:51 -0000	1.32
+++ configure.in	27 May 2004 17:50:08 -0000	1.33
@@ -1,7 +1,7 @@
 AC_PREREQ(2.50)
 AC_INIT(exif/main.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(exif,0.6.9)
+AM_INIT_AUTOMAKE(exif,0.6.10)
 AM_MAINTAINER_MODE
 
 AM_PROG_LIBTOOL

[libexif-cvs] exif/po de.po,1.6,1.7 es.po,1.2,1.3 fr.po,1.3,1.4

[Lutz M?l. <lu...@us...>]

Update of /cvsroot/libexif/exif/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15938/po

Modified Files:
	de.po es.po fr.po 
Log Message:

2004-05-27  Lutz Mueller <lu...@us...>

	* *: Now make distcheck works.


Index: es.po
===================================================================
RCS file: /cvsroot/libexif/exif/po/es.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- es.po	15 Dec 2002 11:39:13 -0000	1.2
+++ es.po	27 May 2004 17:45:51 -0000	1.3
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: exif\n"
-"POT-Creation-Date: 2002-07-25 18:37+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-27 19:45+0200\n"
 "PO-Revision-Date: 2002-09-03 20:07-0300\n"
 "Last-Translator: Fabian Mandelbaum <fa...@ma...>\n"
 "Language-Team: Spanish <es...@li...>\n"
@@ -13,204 +14,307 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: exif/main.c:70
+#: exif/actions.c:43
 #, c-format
-msgid "Could not parse data of tag '%s'."
-msgstr "No se pueden analizar los datos de la etiqueta '%s'."
+msgid "EXIF tags in '%s':"
+msgstr "Etiquetas EXIF en '%s':"
 
-#: exif/main.c:81
+#: exif/actions.c:109
 #, c-format
-msgid "Tag '%s' does not contain known information."
-msgstr "La etiqueta '%s' no contiene información conocida."
+msgid "Unknown MakerNote format."
+msgstr ""
 
-#: exif/main.c:86
+#: exif/actions.c:116
+#, fuzzy, c-format
+msgid "MakerNote does not contain any value.\n"
+msgstr "IFD '%s' no contiene la etiqueta '%s'."
+
+#: exif/actions.c:119
 #, c-format
-msgid "Tag '%s' contains one piece of information:"
-msgstr "La etiqueta '%s' contiene información:"
+msgid "MakerNote contains 1 value:\n"
+msgstr ""
 
-#: exif/main.c:90
+#: exif/actions.c:122
+#, fuzzy, c-format
+msgid "MakerNote contains %i values:\n"
+msgstr "Etiquetas EXIF en '%s':"
+
+#: exif/actions.c:139
 #, c-format
-msgid "Tag '%s' contains the following information:"
-msgstr "La etiqueta '%s' contiene la información siguiente:"
+msgid "EXIF tags in '%s' ('%s' byte order):"
+msgstr "Etiquetas EXIF en '%s' ('%s' es el orden de bytes):"
 
-#: exif/main.c:106
+#: exif/actions.c:144 exif/actions.c:146
+msgid "Tag"
+msgstr "Etiqueta"
+
+#: exif/actions.c:149 exif/actions.c:151 exif/main.c:282
+msgid "Value"
+msgstr "Valor"
+
+#: exif/actions.c:157
 #, c-format
-msgid "EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':"
-msgstr "La entrada EXIF '%s' (0x%x, '%s') existe en IFD '%s':"
+msgid "EXIF data contains a thumbnail (%i bytes)."
+msgstr "Los datos EXIF contienen una diapositiva (%i bytes)."
 
-#: exif/main.c:110
+#: exif/actions.c:189
 #, c-format
-msgid "  Format: '%s'"
-msgstr "  Formato: '%s'"
+msgid "ThumbnailSize\t%i\n"
+msgstr ""
 
-#: exif/main.c:112
+#: exif/main.c:51
 #, c-format
-msgid "  Components: %i"
-msgstr "  Componentes: %i"
+msgid "Internal error. Please contact <lib...@li...>."
+msgstr ""
+"Error interno. Por favor, contacte con <lib...@li...>."
 
-#: exif/main.c:114
+#: exif/main.c:61
 #, c-format
-msgid "  Value: '%s'"
-msgstr "  Valor: '%s'"
+msgid "EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':"
+msgstr "La entrada EXIF '%s' (0x%x, '%s') existe en IFD '%s':"
+
+#: exif/main.c:98
+#, c-format
+msgid "Not enough memory."
+msgstr "No hay memoria suficiente."
 
 #: exif/main.c:116
-msgid "  Data:"
-msgstr "  Datos:"
+#, c-format
+msgid "Too few components specified!"
+msgstr ""
 
-#: exif/main.c:148
+#: exif/main.c:146
+#, c-format
+msgid "Not yet implemented!"
+msgstr "¡Todavía no implementado!"
+
+#: exif/main.c:165
 #, c-format
 msgid "Could not parse JPEG file '%s'."
 msgstr "No se pudo analizar archivo JPEG '%s'."
 
-#: exif/main.c:160 exif/main.c:328
+#: exif/main.c:175
+#, c-format
+msgid "Too much EXIF data (%i bytes). Only %i bytes are allowed."
+msgstr ""
+
+#: exif/main.c:189 exif/main.c:435
 #, c-format
 msgid "Wrote file '%s'."
 msgstr "Se escribió archivo '%s'."
 
-#: exif/main.c:188
+#: exif/main.c:260
 msgid "Show IDs instead of tag names"
 msgstr "Mostrar IDs en vez de nombres de etiqueta"
 
-#: exif/main.c:190
+#: exif/main.c:262
 msgid "Select tag"
 msgstr "Seleccionar etiqueta"
 
-#: exif/main.c:190
+#: exif/main.c:262
 msgid "tag"
 msgstr "etiqueta"
 
-#: exif/main.c:192
+#: exif/main.c:264
 msgid "Select IFD"
 msgstr "Seleccionar IFD"
 
-#: exif/main.c:192
+#: exif/main.c:264
 msgid "IFD"
 msgstr "IFD"
 
-#: exif/main.c:194
+#: exif/main.c:266
 msgid "List all EXIF tags"
 msgstr "Listar todas las etiquetas EXIF"
 
-#: exif/main.c:196
+#: exif/main.c:268
+#, fuzzy
+msgid "Show contents of tag MakerNote"
+msgstr "Mostrar IDs en vez de nombres de etiqueta"
+
+#: exif/main.c:270
+msgid "Remove tag or ifd"
+msgstr ""
+
+#: exif/main.c:272
 msgid "Show description of tag"
 msgstr "Mostrar descripción de la etiqueta"
 
-#: exif/main.c:198
+#: exif/main.c:274
 msgid "Extract thumbnail"
 msgstr "Extraer diapositiva"
 
-#: exif/main.c:200
+#: exif/main.c:276
+#, fuzzy
+msgid "Remove thumbnail"
+msgstr "Extraer diapositiva"
+
+#: exif/main.c:278
 msgid "Insert FILE as thumbnail"
 msgstr "Insertar ARCHIVO como diapositiva"
 
-#: exif/main.c:200 exif/main.c:202
+#: exif/main.c:278 exif/main.c:280
 msgid "FILE"
 msgstr "ARCHIVO"
 
-#: exif/main.c:202
-msgid "Write output to FILE"
+#: exif/main.c:280
+#, fuzzy
+msgid "Write data to FILE"
 msgstr "Escribir salida en ARCHIVO"
 
-#: exif/actions.c:136 exif/actions.c:138 exif/main.c:204
-msgid "Value"
-msgstr "Valor"
+#: exif/main.c:284
+msgid "Output in a machine-readable (tab delimited) format"
+msgstr ""
 
-#: exif/main.c:216
+#: exif/main.c:287
+msgid "Show debugging messages"
+msgstr ""
+
+#: exif/main.c:304
 msgid "[OPTION...] file"
 msgstr "[OPCIÓN...] archivo"
 
-#: exif/main.c:228
+#: exif/main.c:321
 #, c-format
 msgid "Invalid tag '%s'!"
 msgstr "¡Etiqueta '%s' no válida!"
 
-#: exif/main.c:238
+#: exif/main.c:332
 #, c-format
 msgid ""
 "Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and "
 "'Interoperability'."
-msgstr "IFD '%s' no válido. Los IFD válidos son '0', '1', 'EXIF', 'GPS', e 'Interoperability'."
+msgstr ""
+"IFD '%s' no válido. Los IFD válidos son '0', '1', 'EXIF', 'GPS', e "
+"'Interoperability'."
 
-#: exif/main.c:248
+#: exif/main.c:342
+#, c-format
 msgid "Please specify a tag!"
 msgstr "¡Especifique una etiqueta por favor!"
 
-#: exif/main.c:252
+#: exif/main.c:346
 #, c-format
 msgid "Tag '%s' (0x%04x, '%s'): %s"
 msgstr "Etiqueta '%s' (0x%04x, '%s'): %s"
 
-#: exif/main.c:271
+#: exif/main.c:370
 #, c-format
 msgid "'%s' does not contain EXIF data!"
 msgstr "¡'%s' no contiene datos EXIF!"
 
-#: exif/main.c:296
+#: exif/main.c:396
 #, c-format
 msgid "IFD '%s' does not contain tag '%s'."
 msgstr "IFD '%s' no contiene la etiqueta '%s'."
 
-#: exif/main.c:310
+#: exif/main.c:410
 #, c-format
 msgid "'%s' does not contain a thumbnail!"
 msgstr "¡'%s' no contiene una diapositiva!"
 
-#: exif/main.c:321
+#: exif/main.c:422
 #, c-format
 msgid "Could not open '%s' for writing (%m)!"
 msgstr "¡No se pudo abrir '%s' para escribir (%m)!"
 
-#: exif/main.c:343
+#: exif/main.c:426
+#, fuzzy, c-format
+msgid "Could not open '%s' for writing (%s)!"
+msgstr "¡No se pudo abrir '%s' para escribir (%m)!"
+
+#: exif/main.c:464
 #, c-format
 msgid "Could not open '%s' (%m)!"
 msgstr "¡No se pudo abrir '%s' (%m)!"
 
-#: exif/main.c:352
+#: exif/main.c:467
+#, fuzzy, c-format
+msgid "Could not open '%s' (%s)!"
+msgstr "¡No se pudo abrir '%s' (%m)!"
+
+#: exif/main.c:478
 #, c-format
 msgid "Could not allocate %i byte(s)."
 msgstr "No se pudo asignar %i byte(s)."
 
-#: exif/main.c:361
+#: exif/main.c:488
 #, c-format
 msgid "Could not read '%s' (%m)."
 msgstr "No se pudo leer '%s' (%m)."
 
-#: exif/main.c:374
+#: exif/main.c:491
+#, fuzzy, c-format
+msgid "Could not read '%s' (%s)."
+msgstr "No se pudo leer '%s' (%m)."
+
+#: exif/main.c:506
+#, c-format
 msgid "You need to specify a tag!"
 msgstr "¡Debe especificar una etiqueta!"
 
-#: exif/main.c:382
+#: exif/main.c:515 exif/main.c:538
+#, c-format
 msgid "You need to specify an IFD!"
 msgstr "¡Debe especificar un IFD!"
 
-#. e->data[s * i] = ;
-#: exif/main.c:429 exif/main.c:465
-msgid "Not yet implemented!"
-msgstr "¡Todavía no implementado!"
+#: exif/main.c:554
+#, fuzzy, c-format
+msgid "IFD '%s' does not contain a tag '%s'!"
+msgstr "IFD '%s' no contiene la etiqueta '%s'."
 
-#: exif/main.c:436
-msgid "Internal error. Please contact <lib...@li...>."
-msgstr "Error interno. Por favor, contacte con <lib...@li...>."
+#, fuzzy
+#~ msgid "EXIF MakerNote tags in '%s' ('%s' byte order):"
+#~ msgstr "Etiquetas EXIF en '%s' ('%s' es el orden de bytes):"
 
-#: exif/main.c:447
-msgid "Not enough memory."
-msgstr "No hay memoria suficiente."
+#, fuzzy
+#~ msgid "MakerNote entry '%s' (0x%x, '%s'):"
+#~ msgstr "Etiqueta '%s' (0x%04x, '%s'): %s"
 
-#: exif/actions.c:61
-#, c-format
-msgid "EXIF tags in '%s':"
-msgstr "Etiquetas EXIF en '%s':"
+#, fuzzy
+#~ msgid "Select MakerNote tag"
+#~ msgstr "Seleccionar etiqueta"
 
-#: exif/actions.c:126
-#, c-format
-msgid "EXIF tags in '%s' ('%s' byte order):"
-msgstr "Etiquetas EXIF en '%s' ('%s' es el orden de bytes):"
+#, fuzzy
+#~ msgid "ntag"
+#~ msgstr "etiqueta"
 
-#: exif/actions.c:131 exif/actions.c:133
-msgid "Tag"
-msgstr "Etiqueta"
+#, fuzzy
+#~ msgid "List all EXIF MakerNote tags"
+#~ msgstr "Listar todas las etiquetas EXIF"
 
-#: exif/actions.c:144
-#, c-format
-msgid "EXIF data contains a thumbnail (%i bytes)."
-msgstr "Los datos EXIF contienen una diapositiva (%i bytes)."
+#, fuzzy
+#~ msgid "'%s' does not contain EXIF MakerNote data!"
+#~ msgstr "¡'%s' no contiene datos EXIF!"
+
+#, fuzzy
+#~ msgid "Invalid MakerNote tag '%s'!"
+#~ msgstr "¡Etiqueta '%s' no válida!"
+
+#, fuzzy
+#~ msgid "Please specify a MakerNote tag!"
+#~ msgstr "¡Especifique una etiqueta por favor!"
+
+#~ msgid "Could not parse data of tag '%s'."
+#~ msgstr "No se pueden analizar los datos de la etiqueta '%s'."
+
+#~ msgid "Tag '%s' does not contain known information."
+#~ msgstr "La etiqueta '%s' no contiene información conocida."
+
+#~ msgid "Tag '%s' contains one piece of information:"
+#~ msgstr "La etiqueta '%s' contiene información:"
+
+#~ msgid "Tag '%s' contains the following information:"
+#~ msgstr "La etiqueta '%s' contiene la información siguiente:"
+
+#~ msgid "  Format: '%s'"
+#~ msgstr "  Formato: '%s'"
+
+#~ msgid "  Components: %i"
+#~ msgstr "  Componentes: %i"
+
+#~ msgid "  Value: '%s'"
+#~ msgstr "  Valor: '%s'"
+
+#~ msgid "  Data:"
+#~ msgstr "  Datos:"

Index: fr.po
===================================================================
RCS file: /cvsroot/libexif/exif/po/fr.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- fr.po	15 Dec 2002 11:39:13 -0000	1.3
+++ fr.po	27 May 2004 17:45:51 -0000	1.4
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: exif\n"
-"POT-Creation-Date: 2002-11-20 15:43+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-27 19:45+0200\n"
 "PO-Revision-Date: 2002-11-20 15:43+0100\n"
 "Last-Translator: Arnaud Launay <as...@la...>\n"
 "Language-Team: Français <tr...@tr...>\n"
@@ -14,110 +15,171 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: exif/main.c:72
+#: exif/actions.c:43
+#, c-format
+msgid "EXIF tags in '%s':"
+msgstr "Marqueurs EXIF dans '%s' :"
+
+#: exif/actions.c:109
+#, c-format
+msgid "Unknown MakerNote format."
+msgstr ""
+
+#: exif/actions.c:116
+#, fuzzy, c-format
+msgid "MakerNote does not contain any value.\n"
+msgstr "Makernote ne contient pas le marqueur '%s'."
+
+#: exif/actions.c:119
+#, c-format
+msgid "MakerNote contains 1 value:\n"
+msgstr ""
+
+#: exif/actions.c:122
+#, fuzzy, c-format
+msgid "MakerNote contains %i values:\n"
+msgstr "Marqueurs EXIF MakerNote dans '%s' :"
+
+#: exif/actions.c:139
+#, c-format
+msgid "EXIF tags in '%s' ('%s' byte order):"
+msgstr "Marqueurs EXIF dans'%s' (ordre des octets '%s') :"
+
+#: exif/actions.c:144 exif/actions.c:146
+msgid "Tag"
+msgstr "Marqueur"
+
+#: exif/actions.c:149 exif/actions.c:151 exif/main.c:282
+msgid "Value"
+msgstr "Valeur"
+
+#: exif/actions.c:157
+#, c-format
+msgid "EXIF data contains a thumbnail (%i bytes)."
+msgstr "Les données EXIF contiennent une vignette (%i octets)."
+
+#: exif/actions.c:189
+#, c-format
+msgid "ThumbnailSize\t%i\n"
+msgstr ""
+
+#: exif/main.c:51
+#, c-format
+msgid "Internal error. Please contact <lib...@li...>."
+msgstr ""
+"Erreur interne. Veuillez contacter <lib...@li...>."
+
+#: exif/main.c:61
 #, c-format
 msgid "EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':"
 msgstr "L'entrée EXIF '%s' (0x%x, '%s') existe dans l'IFD '%s' :"
 
-#: exif/main.c:85
+#: exif/main.c:98
 #, c-format
-msgid "MakerNote entry '%s' (0x%x, '%s'):"
-msgstr "Entrée MakerNote '%s' (0x%x, '%s') :"
+msgid "Not enough memory."
+msgstr "Pas assez de mémoire."
 
-#: exif/main.c:118
+#: exif/main.c:116
+#, c-format
+msgid "Too few components specified!"
+msgstr ""
+
+#: exif/main.c:146
+#, c-format
+msgid "Not yet implemented!"
+msgstr "Pas encore implémenté !"
+
+#: exif/main.c:165
 #, c-format
 msgid "Could not parse JPEG file '%s'."
 msgstr "Ne peut parcourir le fichier JPEG '%s'."
 
-#: exif/main.c:128
+#: exif/main.c:175
 #, c-format
 msgid "Too much EXIF data (%i bytes). Only %i bytes are allowed."
 msgstr "Trop de données EXIF (%i octets). Seuls %i octets sont autorisés."
 
-#: exif/main.c:142 exif/main.c:422
+#: exif/main.c:189 exif/main.c:435
 #, c-format
 msgid "Wrote file '%s'."
 msgstr "Écrit le fichier '%s'."
 
-#: exif/main.c:185
+#: exif/main.c:260
 msgid "Show IDs instead of tag names"
 msgstr "Montre les ID plutôt que les noms des marqueurs"
 
-#: exif/main.c:187
+#: exif/main.c:262
 msgid "Select tag"
 msgstr "Sélection du marqueur"
 
-#: exif/main.c:187
+#: exif/main.c:262
 msgid "tag"
 msgstr "marqueur"
 
-#: exif/main.c:190
-msgid "Select MakerNote tag"
-msgstr "Sélection du marqueur MakerNote"
-
-#: exif/main.c:190
-msgid "ntag"
-msgstr "ntag"
-
-#: exif/main.c:193
+#: exif/main.c:264
 msgid "Select IFD"
 msgstr "Sélection de l'IFD"
 
-#: exif/main.c:193
+#: exif/main.c:264
 msgid "IFD"
 msgstr "IFD"
 
-#: exif/main.c:195
+#: exif/main.c:266
 msgid "List all EXIF tags"
 msgstr "Liste tous les marqueurs EXIF"
 
-#: exif/main.c:198
-msgid "List all EXIF MakerNote tags"
-msgstr "Liste tous les marqueurs EXIF MakerNote"
+#: exif/main.c:268
+#, fuzzy
+msgid "Show contents of tag MakerNote"
+msgstr "Montre les ID plutôt que les noms des marqueurs"
 
-#: exif/main.c:201
+#: exif/main.c:270
 msgid "Remove tag or ifd"
 msgstr "Supprime le marqueur ou l'ifd"
 
-#: exif/main.c:203
+#: exif/main.c:272
 msgid "Show description of tag"
 msgstr "Montre la description du marqueur"
 
-#: exif/main.c:205
+#: exif/main.c:274
 msgid "Extract thumbnail"
 msgstr "Extrait la vignette"
 
-#: exif/main.c:207
+#: exif/main.c:276
 msgid "Remove thumbnail"
 msgstr "Supprime la vignette"
 
-#: exif/main.c:209
+#: exif/main.c:278
 msgid "Insert FILE as thumbnail"
 msgstr "Insère le FICHIER comme vignette"
 
-#: exif/main.c:209 exif/main.c:211
+#: exif/main.c:278 exif/main.c:280
 msgid "FILE"
 msgstr "FICHIER"
 
-#: exif/main.c:211
-msgid "Write output to FILE"
+#: exif/main.c:280
+#, fuzzy
+msgid "Write data to FILE"
 msgstr "Écrit la sortie vers le FICHIER"
 
-#: exif/main.c:213 exif/actions.c:186 exif/actions.c:188 exif/actions.c:221
-#: exif/actions.c:223
-msgid "Value"
-msgstr "Valeur"
+#: exif/main.c:284
+msgid "Output in a machine-readable (tab delimited) format"
+msgstr ""
 
-#: exif/main.c:232
+#: exif/main.c:287
+msgid "Show debugging messages"
+msgstr ""
+
+#: exif/main.c:304
 msgid "[OPTION...] file"
 msgstr "[OPTION...] fichier"
 
-#: exif/main.c:244
+#: exif/main.c:321
 #, c-format
 msgid "Invalid tag '%s'!"
 msgstr "Marqueur '%s' invalide !"
 
-#: exif/main.c:255
+#: exif/main.c:332
 #, c-format
 msgid ""
 "Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and "
@@ -126,135 +188,101 @@
 "IFD '%s' invalide. Les IFDs valides sont '0', '1', 'EXIF', 'GPS', "
 "et'Interoperability'."
 
-#: exif/main.c:269
+#: exif/main.c:342
+#, c-format
 msgid "Please specify a tag!"
 msgstr "Veuillez spécifier un marqueur !"
 
-#: exif/main.c:273 exif/main.c:346
+#: exif/main.c:346
 #, c-format
 msgid "Tag '%s' (0x%04x, '%s'): %s"
 msgstr "Marqueur '%s' (0x%04x, '%s'): %s"
 
-#: exif/main.c:292
+#: exif/main.c:370
 #, c-format
 msgid "'%s' does not contain EXIF data!"
 msgstr "'%s' ne contient pas de données EXIF !"
 
-#: exif/main.c:303
-#, c-format
-msgid "'%s' does not contain EXIF MakerNote data!"
-msgstr "'%s' ne contient pas de données EXIF MakerNote !"
-
-#: exif/main.c:332
-#, c-format
-msgid "Invalid MakerNote tag '%s'!"
-msgstr "Marqueur MakerNote '%s' invalide !"
-
-#: exif/main.c:342
-msgid "Please specify a MakerNote tag!"
-msgstr "Veuillez spécifier un marqueur MakerNote !"
-
-#: exif/main.c:369
+#: exif/main.c:396
 #, c-format
 msgid "IFD '%s' does not contain tag '%s'."
 msgstr "L'IFD '%s' ne contient pas de marqueur '%s'."
 
-#: exif/main.c:385
-#, c-format
-msgid "Makernote does not contain tag '%s'."
-msgstr "Makernote ne contient pas le marqueur '%s'."
-
-#: exif/main.c:397
+#: exif/main.c:410
 #, c-format
 msgid "'%s' does not contain a thumbnail!"
 msgstr "'%s' ne contient pas de vignette !"
 
-#: exif/main.c:409
+#: exif/main.c:422
 #, c-format
 msgid "Could not open '%s' for writing (%m)!"
 msgstr "Ne peut ouvrir '%s' pour l'écriture (%m) !"
 
-#: exif/main.c:413
+#: exif/main.c:426
 #, c-format
 msgid "Could not open '%s' for writing (%s)!"
 msgstr "Ne peut ouvrir '%s' pour l'écriture (%s) !"
 
-#: exif/main.c:451
+#: exif/main.c:464
 #, c-format
 msgid "Could not open '%s' (%m)!"
 msgstr "Ne peut ouvrir '%s' (%m) !"
 
-#: exif/main.c:454
+#: exif/main.c:467
 #, c-format
 msgid "Could not open '%s' (%s)!"
 msgstr "Ne peut ouvrir '%s' (%s) !"
 
-#: exif/main.c:465
+#: exif/main.c:478
 #, c-format
 msgid "Could not allocate %i byte(s)."
 msgstr "Ne peut allouer %i octet(s)."
 
-#: exif/main.c:475
+#: exif/main.c:488
 #, c-format
 msgid "Could not read '%s' (%m)."
 msgstr "Ne peut lire '%s' (%m)."
 
-#: exif/main.c:478
+#: exif/main.c:491
 #, c-format
 msgid "Could not read '%s' (%s)."
 msgstr "Ne peut lire '%s' (%s)."
 
-#: exif/main.c:493
+#: exif/main.c:506
+#, c-format
 msgid "You need to specify a tag!"
 msgstr "Vous devez spécifier un marqueur !"
 
-#: exif/main.c:502 exif/main.c:599
+#: exif/main.c:515 exif/main.c:538
+#, c-format
 msgid "You need to specify an IFD!"
 msgstr "Vous devez spécifier un IFD !"
 
-#: exif/main.c:549 exif/main.c:587
-msgid "Not yet implemented!"
-msgstr "Pas encore implémenté !"
-
-#: exif/main.c:556
-msgid "Internal error. Please contact <lib...@li...>."
-msgstr ""
-"Erreur interne. Veuillez contacter <lib...@li...>."
-
-#: exif/main.c:567
-msgid "Not enough memory."
-msgstr "Pas assez de mémoire."
-
-#: exif/main.c:615
+#: exif/main.c:554
 #, c-format
 msgid "IFD '%s' does not contain a tag '%s'!"
 msgstr "L'IFD '%s' ne contient pas de marqueur '%s' !"
 
-#: exif/actions.c:61
-#, c-format
-msgid "EXIF tags in '%s':"
-msgstr "Marqueurs EXIF dans '%s' :"
+#~ msgid "EXIF MakerNote tags in '%s' ('%s' byte order):"
+#~ msgstr "Marqueurs EXIF MakerNote dans '%s' (ordre des octets '%s') :"
 
-#: exif/actions.c:90
-#, c-format
-msgid "EXIF MakerNote tags in '%s':"
-msgstr "Marqueurs EXIF MakerNote dans '%s' :"
+#~ msgid "MakerNote entry '%s' (0x%x, '%s'):"
+#~ msgstr "Entrée MakerNote '%s' (0x%x, '%s') :"
 
-#: exif/actions.c:176
-#, c-format
-msgid "EXIF tags in '%s' ('%s' byte order):"
-msgstr "Marqueurs EXIF dans'%s' (ordre des octets '%s') :"
+#~ msgid "Select MakerNote tag"
+#~ msgstr "Sélection du marqueur MakerNote"
 
-#: exif/actions.c:181 exif/actions.c:183 exif/actions.c:216 exif/actions.c:218
-msgid "Tag"
-msgstr "Marqueur"
+#~ msgid "ntag"
+#~ msgstr "ntag"
 
-#: exif/actions.c:194
-#, c-format
-msgid "EXIF data contains a thumbnail (%i bytes)."
-msgstr "Les données EXIF contiennent une vignette (%i octets)."
+#~ msgid "List all EXIF MakerNote tags"
+#~ msgstr "Liste tous les marqueurs EXIF MakerNote"
 
-#: exif/actions.c:211
-#, c-format
-msgid "EXIF MakerNote tags in '%s' ('%s' byte order):"
-msgstr "Marqueurs EXIF MakerNote dans '%s' (ordre des octets '%s') :"
+#~ msgid "'%s' does not contain EXIF MakerNote data!"
+#~ msgstr "'%s' ne contient pas de données EXIF MakerNote !"
+
+#~ msgid "Invalid MakerNote tag '%s'!"
+#~ msgstr "Marqueur MakerNote '%s' invalide !"
+
+#~ msgid "Please specify a MakerNote tag!"
+#~ msgstr "Veuillez spécifier un marqueur MakerNote !"

Index: de.po
===================================================================
RCS file: /cvsroot/libexif/exif/po/de.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- de.po	15 Dec 2002 11:39:13 -0000	1.6
+++ de.po	27 May 2004 17:45:51 -0000	1.7
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: exif\n"
-"POT-Creation-Date: 2002-06-10 20:19+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-27 19:45+0200\n"
 "PO-Revision-Date: 2002-09-14 14:40+0200\n"
 "Last-Translator: Lutz Müller <lu...@us...>\n"
 "Language-Team: Deutsch <de...@li...>\n"
@@ -13,210 +14,309 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: exif/main.c:70
+#: exif/actions.c:43
 #, c-format
-msgid "Could not parse data of tag '%s'."
-msgstr "Konnte den Inhalt von Abschnitt '%s' nicht interpretieren."
+msgid "EXIF tags in '%s':"
+msgstr "EXIF Einträge in '%s':"
 
-#: exif/main.c:81
+#: exif/actions.c:109
 #, c-format
-msgid "Tag '%s' does not contain known information."
-msgstr "Abschnitt '%s' enthält unbekannte Informationen."
+msgid "Unknown MakerNote format."
+msgstr ""
 
-#: exif/main.c:86
+#: exif/actions.c:116
+#, fuzzy, c-format
+msgid "MakerNote does not contain any value.\n"
+msgstr "'%s' enthält keine EXIF Daten!"
+
+#: exif/actions.c:119
 #, c-format
-msgid "Tag '%s' contains one piece of information:"
-msgstr "Abschnitt '%s' enthält eine Information:"
+msgid "MakerNote contains 1 value:\n"
+msgstr ""
 
-#: exif/main.c:90
+#: exif/actions.c:122
+#, fuzzy, c-format
+msgid "MakerNote contains %i values:\n"
+msgstr "EXIF Einträge in '%s':"
+
+#: exif/actions.c:139
 #, c-format
-msgid "Tag '%s' contains the following information:"
-msgstr "Abschitt '%s' enhält folgende Informationen:"
+msgid "EXIF tags in '%s' ('%s' byte order):"
+msgstr "EXIF Einträge in '%s' ('%s' Byte-Reihenfolge):"
 
-#: exif/main.c:106
+#: exif/actions.c:144 exif/actions.c:146
+msgid "Tag"
+msgstr "Eintrag"
+
+#: exif/actions.c:149 exif/actions.c:151 exif/main.c:282
+msgid "Value"
+msgstr "Wert"
+
+#: exif/actions.c:157
+#, c-format
+msgid "EXIF data contains a thumbnail (%i bytes)."
+msgstr "EXIF Daten enthalten eine Vorschau (%i Bytes)."
+
+#: exif/actions.c:189
+#, c-format
+msgid "ThumbnailSize\t%i\n"
+msgstr ""
+
+#: exif/main.c:51
+#, c-format
+msgid "Internal error. Please contact <lib...@li...>."
+msgstr ""
+
+#: exif/main.c:61
 #, fuzzy, c-format
 msgid "EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':"
 msgstr "Der EXIF Eintrag '%s' (0x%x, '%s') existiert in '%s':"
 
-#: exif/main.c:110
+#: exif/main.c:98
 #, c-format
-msgid "  Format: '%s'"
-msgstr "  Format: '%s'"
+msgid "Not enough memory."
+msgstr ""
 
-#: exif/main.c:112
+#: exif/main.c:116
 #, c-format
-msgid "  Components: %i"
-msgstr "  Komponenten: %i"
+msgid "Too few components specified!"
+msgstr ""
 
-#: exif/main.c:114
+#: exif/main.c:146
 #, c-format
-msgid "  Value: '%s'"
-msgstr "  Wert: '%s'"
-
-#: exif/main.c:116
-msgid "  Data:"
-msgstr "  Daten: '%s'"
+msgid "Not yet implemented!"
+msgstr ""
 
-#: exif/main.c:148
+#: exif/main.c:165
 #, c-format
 msgid "Could not parse JPEG file '%s'."
 msgstr "Konnte die JPEG Datei '%s' nicht interpretieren."
 
-#: exif/main.c:160 exif/main.c:328
+#: exif/main.c:175
+#, c-format
+msgid "Too much EXIF data (%i bytes). Only %i bytes are allowed."
+msgstr ""
+
+#: exif/main.c:189 exif/main.c:435
 #, c-format
 msgid "Wrote file '%s'."
 msgstr "Schrieb Datei '%s'."
 
-#: exif/main.c:188
+#: exif/main.c:260
 msgid "Show IDs instead of tag names"
 msgstr "Zeige IDs anstelle der Namen der Einträge"
 
-#: exif/main.c:190
+#: exif/main.c:262
 msgid "Select tag"
 msgstr "Wähle Eintrag"
 
-#: exif/main.c:190
+#: exif/main.c:262
 msgid "tag"
 msgstr "Eintrag"
 
-#: exif/main.c:192
+#: exif/main.c:264
 #, fuzzy
 msgid "Select IFD"
 msgstr "Wähle Eintrag"
 
-#: exif/main.c:192
+#: exif/main.c:264
 #, fuzzy
 msgid "IFD"
 msgstr "IFD 0"
 
-#: exif/main.c:194
+#: exif/main.c:266
 msgid "List all EXIF tags"
 msgstr "Liste alle EXIF Einträge auf"
 
-#: exif/main.c:196
+#: exif/main.c:268
+#, fuzzy
+msgid "Show contents of tag MakerNote"
+msgstr "Zeige IDs anstelle der Namen der Einträge"
+
+#: exif/main.c:270
+msgid "Remove tag or ifd"
+msgstr ""
+
+#: exif/main.c:272
 msgid "Show description of tag"
 msgstr "Zeige Beschreibung von Eintrag"
 
-#: exif/main.c:198
+#: exif/main.c:274
 msgid "Extract thumbnail"
 msgstr "Extrahiere Vorschau"
 
-#: exif/main.c:200
+#: exif/main.c:276
+#, fuzzy
+msgid "Remove thumbnail"
+msgstr "Extrahiere Vorschau"
+
+#: exif/main.c:278
 msgid "Insert FILE as thumbnail"
 msgstr "Füge DATEI als Vorschau ein"
 
-#: exif/main.c:200 exif/main.c:202
+#: exif/main.c:278 exif/main.c:280
 msgid "FILE"
 msgstr "DATEI"
 
-#: exif/main.c:202
-msgid "Write output to FILE"
+#: exif/main.c:280
+#, fuzzy
+msgid "Write data to FILE"
 msgstr "Schreibe Ergebnis in DATEI"
 
-#: exif/actions.c:136 exif/actions.c:138 exif/main.c:204
-msgid "Value"
-msgstr "Wert"
+#: exif/main.c:284
+msgid "Output in a machine-readable (tab delimited) format"
+msgstr ""
 
-#: exif/main.c:216
+#: exif/main.c:287
+msgid "Show debugging messages"
+msgstr ""
+
+#: exif/main.c:304
 msgid "[OPTION...] file"
 msgstr "[OPTION...] datei"
 
-#: exif/main.c:228
+#: exif/main.c:321
 #, c-format
 msgid "Invalid tag '%s'!"
 msgstr "Ungültiger Eintrag '%s'!"
 
-#: exif/main.c:238
+#: exif/main.c:332
 #, c-format
 msgid ""
 "Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and "
 "'Interoperability'."
 msgstr ""
 
-#: exif/main.c:248
+#: exif/main.c:342
+#, c-format
 msgid "Please specify a tag!"
 msgstr "Bitte geben Sie einen Eintrag an!"
 
-#: exif/main.c:252
+#: exif/main.c:346
 #, c-format
 msgid "Tag '%s' (0x%04x, '%s'): %s"
 msgstr "Eintrag '%s' (0x%04x, '%s'): %s"
 
-#: exif/main.c:271
+#: exif/main.c:370
 #, c-format
 msgid "'%s' does not contain EXIF data!"
 msgstr "'%s' enthält keine EXIF Daten!"
 
-#: exif/main.c:296
+#: exif/main.c:396
 #, fuzzy, c-format
 msgid "IFD '%s' does not contain tag '%s'."
 msgstr "'%s' enthält keine EXIF Daten!"
 
-#: exif/main.c:310
+#: exif/main.c:410
 #, c-format
 msgid "'%s' does not contain a thumbnail!"
 msgstr "'%s' enthält keine Vorschau!"
 
-#: exif/main.c:321
+#: exif/main.c:422
 #, c-format
 msgid "Could not open '%s' for writing (%m)!"
 msgstr "Konnte '%s' nicht zum Schreiben öffnen (%m)!"
 
-#: exif/main.c:343
+#: exif/main.c:426
+#, fuzzy, c-format
+msgid "Could not open '%s' for writing (%s)!"
+msgstr "Konnte '%s' nicht zum Schreiben öffnen (%m)!"
+
+#: exif/main.c:464
 #, c-format
 msgid "Could not open '%s' (%m)!"
 msgstr "Konnte '%s' nicht öffnen (%m)!"
 
-#: exif/main.c:352
+#: exif/main.c:467
+#, fuzzy, c-format
+msgid "Could not open '%s' (%s)!"
+msgstr "Konnte '%s' nicht öffnen (%m)!"
+
+#: exif/main.c:478
 #, c-format
 msgid "Could not allocate %i byte(s)."
 msgstr "Konnte nicht %i Byte(s) zur Verfügung stellen."
 
-#: exif/main.c:361
+#: exif/main.c:488
 #, c-format
 msgid "Could not read '%s' (%m)."
 msgstr "Konnte nicht '%s' lesen (%m)."
 
-#: exif/main.c:374
-#, fuzzy
+#: exif/main.c:491
+#, fuzzy, c-format
+msgid "Could not read '%s' (%s)."
+msgstr "Konnte nicht '%s' lesen (%m)."
+
+#: exif/main.c:506
+#, fuzzy, c-format
 msgid "You need to specify a tag!"
 msgstr "Bitte geben Sie einen Eintrag an!"
 
-#: exif/main.c:382
+#: exif/main.c:515 exif/main.c:538
+#, c-format
 msgid "You need to specify an IFD!"
 msgstr ""
 
-#. e->data[s * i] = ;
-#: exif/main.c:429 exif/main.c:465
-msgid "Not yet implemented!"
-msgstr ""
+#: exif/main.c:554
+#, fuzzy, c-format
+msgid "IFD '%s' does not contain a tag '%s'!"
+msgstr "'%s' enthält keine EXIF Daten!"
 
-#: exif/main.c:436
-msgid "Internal error. Please contact <lib...@li...>."
-msgstr ""
+#, fuzzy
+#~ msgid "EXIF MakerNote tags in '%s' ('%s' byte order):"
+#~ msgstr "EXIF Einträge in '%s' ('%s' Byte-Reihenfolge):"
 
-#: exif/main.c:447
-msgid "Not enough memory."
-msgstr ""
+#, fuzzy
+#~ msgid "MakerNote entry '%s' (0x%x, '%s'):"
+#~ msgstr "Eintrag '%s' (0x%04x, '%s'): %s"
 
-#: exif/actions.c:61
-#, c-format
-msgid "EXIF tags in '%s':"
-msgstr "EXIF Einträge in '%s':"
+#, fuzzy
+#~ msgid "Select MakerNote tag"
+#~ msgstr "Wähle Eintrag"
 
-#: exif/actions.c:126
-#, c-format
-msgid "EXIF tags in '%s' ('%s' byte order):"
-msgstr "EXIF Einträge in '%s' ('%s' Byte-Reihenfolge):"
+#, fuzzy
+#~ msgid "ntag"
+#~ msgstr "Eintrag"
 
-#: exif/actions.c:131 exif/actions.c:133
-msgid "Tag"
-msgstr "Eintrag"
+#, fuzzy
+#~ msgid "List all EXIF MakerNote tags"
+#~ msgstr "Liste alle EXIF Einträge auf"
 
-#: exif/actions.c:144
-#, c-format
-msgid "EXIF data contains a thumbnail (%i bytes)."
-msgstr "EXIF Daten enthalten eine Vorschau (%i Bytes)."
+#, fuzzy
+#~ msgid "'%s' does not contain EXIF MakerNote data!"
+#~ msgstr "'%s' enthält keine EXIF Daten!"
+
+#, fuzzy
+#~ msgid "Invalid MakerNote tag '%s'!"
+#~ msgstr "Ungültiger Eintrag '%s'!"
+
+#, fuzzy
+#~ msgid "Please specify a MakerNote tag!"
+#~ msgstr "Bitte geben Sie einen Eintrag an!"
+
+#~ msgid "Could not parse data of tag '%s'."
+#~ msgstr "Konnte den Inhalt von Abschnitt '%s' nicht interpretieren."
+
+#~ msgid "Tag '%s' does not contain known information."
+#~ msgstr "Abschnitt '%s' enthält unbekannte Informationen."
+
+#~ msgid "Tag '%s' contains one piece of information:"
+#~ msgstr "Abschnitt '%s' enthält eine Information:"
+
+#~ msgid "Tag '%s' contains the following information:"
+#~ msgstr "Abschitt '%s' enhält folgende Informationen:"
+
+#~ msgid "  Format: '%s'"
+#~ msgstr "  Format: '%s'"
+
+#~ msgid "  Components: %i"
+#~ msgstr "  Komponenten: %i"
+
+#~ msgid "  Value: '%s'"
+#~ msgstr "  Wert: '%s'"
+
+#~ msgid "  Data:"
+#~ msgstr "  Daten: '%s'"
 
 #~ msgid "EXIF IFD"
 #~ msgstr "EXIF IFD"

[libexif-cvs] exif ChangeLog,1.38,1.39 Makefile.am,1.15,1.16 configure.in,1.31,1.32

[Lutz M?l. <lu...@us...>]

Update of /cvsroot/libexif/exif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15938

Modified Files:
	ChangeLog Makefile.am configure.in 
Log Message:

2004-05-27  Lutz Mueller <lu...@us...>

	* *: Now make distcheck works.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ChangeLog	24 May 2004 12:05:41 -0000	1.38
+++ ChangeLog	27 May 2004 17:45:51 -0000	1.39
@@ -1,3 +1,7 @@
+2004-05-27  Lutz Mueller <lu...@us...>
+
+	* *: Now make distcheck works.
+
 2004-05-24  Jan Patera <pa...@us...>
 
 	* libjpeg/jpeg-data.[c,h]: jpeg_data_append_section changed

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/exif/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	10 Jan 2004 21:08:59 -0000	1.15
+++ Makefile.am	27 May 2004 17:45:51 -0000	1.16
@@ -1,6 +1,8 @@
-SUBDIRS = libjpeg exif po
+SUBDIRS = m4 libjpeg exif po
 
 man_MANS = exif.1
 
 # newer versions of automake/autoconf require this, OK?
-EXTRA_DIST = exif.1 exif.spec
+EXTRA_DIST = mkinstalldirs  config.rpath mkinstalldirs  exif.1 exif.spec
+
+ACLOCAL_AMFLAGS = -I m4

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/exif/configure.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- configure.in	6 Apr 2004 13:13:50 -0000	1.31
+++ configure.in	27 May 2004 17:45:51 -0000	1.32
@@ -13,7 +13,7 @@
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The gettext domain we're
 using])
 ALL_LINGUAS="de es fr"
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
 
 dnl ---------------------------------------------------------------------------
 dnl libraries needed
@@ -85,6 +85,8 @@
   exif.spec
   libjpeg/Makefile
   exif/Makefile
+  m4/Makefile
+  po/Makefile.in
 ])
 
 echo "

[libexif-cvs] libexif ChangeLog,1.119,1.120

[Lutz M?l. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9391

Modified Files:
	ChangeLog 
Log Message:

2004-05-27  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c: Jan Patera pointed me to the fact that
	  last change is pointless.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- ChangeLog	26 May 2004 22:27:06 -0000	1.119
+++ ChangeLog	27 May 2004 17:11:39 -0000	1.120
@@ -1,5 +1,10 @@
 2004-05-27  Lutz Mueller <lu...@us...>
 
+	* libexif/exif-entry.c: Jan Patera pointed me to the fact that
+	  last change is pointless.
+
+2004-05-27  Lutz Mueller <lu...@us...>
+
 	* libexif/exif-entry.c: According to Ralf Holzer <rh...@cm...>,
 	  the user comment field does not have to be NULL terminated.
 

[libexif-cvs] libexif/libexif exif-entry.c,1.53,1.54

[Lutz M?l. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9391/libexif

Modified Files:
	exif-entry.c 
Log Message:

2004-05-27  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c: Jan Patera pointed me to the fact that
	  last change is pointless.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- exif-entry.c	26 May 2004 22:27:06 -0000	1.53
+++ exif-entry.c	27 May 2004 17:11:40 -0000	1.54
@@ -347,7 +347,6 @@
 		CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
 		if (e->size < 8) break;
 		strncpy (val, e->data + 8, MIN (e->size - 8, maxlen));
-		if (maxlen > e->size - 8) val[e->size - 8] = '\0';
 		break;
 
 	case EXIF_TAG_EXIF_VERSION:

[libexif-cvs] libexif/libexif exif-entry.c,1.52,1.53

[Lutz M?l. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8520/libexif

Modified Files:
	exif-entry.c 
Log Message:

2004-05-27  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c: According to Ralf Holzer <rh...@cm...>,
	  the user comment field does not have to be NULL terminated.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- exif-entry.c	24 May 2004 12:13:20 -0000	1.52
+++ exif-entry.c	26 May 2004 22:27:06 -0000	1.53
@@ -338,10 +338,18 @@
 
 	switch (e->tag) {
 	case EXIF_TAG_USER_COMMENT:
+
+		/*
+		 * According to Ralf Holzer <rh...@cm...>,
+		 * the user comment field does not have to be 
+		 * NULL terminated.
+		 */
 		CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
 		if (e->size < 8) break;
 		strncpy (val, e->data + 8, MIN (e->size - 8, maxlen));
+		if (maxlen > e->size - 8) val[e->size - 8] = '\0';
 		break;
+
 	case EXIF_TAG_EXIF_VERSION:
 		CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
 		CC (e->components, 4, val, maxlen);

[libexif-cvs] libexif ChangeLog,1.118,1.119

[Lutz M?l. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8520

Modified Files:
	ChangeLog 
Log Message:

2004-05-27  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c: According to Ralf Holzer <rh...@cm...>,
	  the user comment field does not have to be NULL terminated.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- ChangeLog	25 May 2004 22:30:47 -0000	1.118
+++ ChangeLog	26 May 2004 22:27:06 -0000	1.119
@@ -1,3 +1,8 @@
+2004-05-27  Lutz Mueller <lu...@us...>
+
+	* libexif/exif-entry.c: According to Ralf Holzer <rh...@cm...>,
+	  the user comment field does not have to be NULL terminated.
+
 2004-05-25  Lutz Mueller <lu...@us...>
 
 	* libexif/olympus/mnote-olympus-entry.c: Print bytes if tag is not

[libexif-cvs] libexif ChangeLog,1.117,1.118

[Lutz M?l. <lu...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10373

Modified Files:
	ChangeLog 
Log Message:

2004-05-25  Lutz Mueller <lu...@us...>

	* libexif/olympus/mnote-olympus-entry.c: Print bytes if tag is not
	  known.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- ChangeLog	24 May 2004 12:28:49 -0000	1.117
+++ ChangeLog	25 May 2004 22:30:47 -0000	1.118
@@ -1,3 +1,8 @@
+2004-05-25  Lutz Mueller <lu...@us...>
+
+	* libexif/olympus/mnote-olympus-entry.c: Print bytes if tag is not
+	  known.
+
 2004-05-24  Jan Patera <pa...@us...>
 
 	* libjpeg/jpeg-data.[c,h]: jpeg_data_append_section changed

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c,1.13,1.14 mnote-olympus-entry.c,1.10,1.11

[Lutz M?l. <lu...@us...>]

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10373/libexif/olympus

Modified Files:
	exif-mnote-data-olympus.c mnote-olympus-entry.c 
Log Message:

2004-05-25  Lutz Mueller <lu...@us...>

	* libexif/olympus/mnote-olympus-entry.c: Print bytes if tag is not
	  known.


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mnote-olympus-entry.c	24 May 2004 12:08:17 -0000	1.10
+++ mnote-olympus-entry.c	25 May 2004 22:30:53 -0000	1.11
@@ -158,7 +158,7 @@
 {
 	char         buf[32];
 	ExifLong     vl;
-	ExifShort    vs;
+	ExifShort    vs = 0;
 	ExifRational vr;
 	int          i, j;
 	double       r, b;
@@ -309,13 +309,16 @@
 		CF (entry->format, items[i].fmt, v, maxlen);
 		CC (entry->components, 1, v, maxlen);
 		switch (entry->format) {
-			case EXIF_FORMAT_BYTE:
-			case EXIF_FORMAT_UNDEFINED:
-				vs = entry->data[0];
-				break;
-			case EXIF_FORMAT_SHORT:
-				vs = exif_get_short(entry->data, entry->order);
-				break;
+		case EXIF_FORMAT_BYTE:
+		case EXIF_FORMAT_UNDEFINED:
+			vs = entry->data[0];
+			break;
+		case EXIF_FORMAT_SHORT:
+			vs = exif_get_short(entry->data, entry->order);
+			break;
+		default:
+			vs = 0;
+			break;
 		}
 		/* find the value */
 		for (j = 0; items[i].elem[j].string &&
@@ -499,21 +502,26 @@
 	default:
 		switch (entry->format) {
 		case EXIF_FORMAT_ASCII:
-		  strncpy (v, entry->data, MIN (maxlen, entry->components));
-		  break;
+			strncpy (v, entry->data,
+				 MIN (maxlen, entry->components));
+			break;
 		case EXIF_FORMAT_SHORT:
-		  vs = exif_get_short (entry->data, entry->order);
-		  snprintf (v, maxlen, "%hi", vs);
-		  break;
+			vs = exif_get_short (entry->data, entry->order);
+			snprintf (v, maxlen, "%hi", vs);
+			break;
 		case EXIF_FORMAT_LONG:
-		  vl = exif_get_long (entry->data, entry->order);
-		  snprintf (v, maxlen, "%li", vl);
-		  break;
+			vl = exif_get_long (entry->data, entry->order);
+			snprintf (v, maxlen, "%li", vl);
+			break;
 		case EXIF_FORMAT_UNDEFINED:
 		default:
-		  snprintf (v, maxlen, "%li bytes unknown data",
-			    entry->size);
-		  break;
+			snprintf (v, maxlen, "%li bytes unknown data:",
+				  entry->size);
+			for (i = 0; i < entry->size; i++) {
+				sprintf (buf, " %02x", entry->data[i]);
+				strncat (v, buf, maxlen);
+			}
+			break;
 		}
 		break;
 	}

Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- exif-mnote-data-olympus.c	20 May 2004 10:50:36 -0000	1.13
+++ exif-mnote-data-olympus.c	25 May 2004 22:30:49 -0000	1.14
@@ -64,6 +64,9 @@
 
 	if (!d) return NULL;
 	if (n->count <= i) return NULL;
+	exif_log (d->log, EXIF_LOG_CODE_DEBUG, "MnoteDataOlympus",
+		  "Querying value for tag '%s'...",
+		  mnote_olympus_tag_get_name (n->entries[i].tag));
 	return mnote_olympus_entry_get_value (&n->entries[i], val, maxlen);
 }
 

[libexif-cvs] libexif ChangeLog,1.116,1.117

[Jan P. <pa...@us...>]

Update of /cvsroot/libexif/libexif
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1796/libexif

Modified Files:
	ChangeLog 
Log Message:
2004-05-24  Jan Patera <pa...@us...>

	* libjpeg/jpeg-data.[c,h]: jpeg_data_append_section changed
	  from static to public
	* libexif/olumpus/mnote-olympus-entry.c: support of several
	  known but previously not supported Nikon (& 1 Olympus) tags
	* libexif/exif-entry.c: rational values printed as %2.2f and not %i/%i



Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- ChangeLog	20 May 2004 10:50:20 -0000	1.116
+++ ChangeLog	24 May 2004 12:28:49 -0000	1.117
@@ -1,3 +1,11 @@
+2004-05-24  Jan Patera <pa...@us...>
+
+	* libjpeg/jpeg-data.[c,h]: jpeg_data_append_section changed
+	  from static to public
+	* libexif/olumpus/mnote-olympus-entry.c: support of several
+	  known but previously not supported Nikon (& 1 Olympus) tags
+	* libexif/exif-entry.c: rational values printed as %2.2f and not %i/%i
+
 2004-05-15  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-log.[c,h]: New. Proposal for handling of debugging