libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif ChangeLog,1.266,1.267

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

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

Modified Files:
	ChangeLog 
Log Message:
2008-02-16  Lutz Mueller <lu...@us...>

	Jan Patera <pa...@pi...> spotted a problem with my last fix
	for #1774591:

	* libexif/exif-content.c: (exif_content_remove_entry) Recover
	correctly in case of error by remembering the original size of the
	realloc'ed data.
	* libexif/exif-data.c: (exif_data_save_data_entry),
	(exif_data_save_data_content) Same here.
	* libexif/canon/exif-mnote-data-canon.c:
	(exif_mnote_data_canon_save), (exif_mnote_data_canon_load) Same here.
        * libexif/fuji/exif-mnote-data-fuji.c:
        (exif_mnote_data_fuji_save), (exif_mnote_data_fuji_load) Same here.
        * libexif/olympus/exif-mnote-data-olympus.c:
        (exif_mnote_data_olympus_save) Same here.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -p -d -r1.266 -r1.267
--- ChangeLog	15 Feb 2008 04:38:32 -0000	1.266
+++ ChangeLog	16 Feb 2008 19:11:40 -0000	1.267
@@ -1,3 +1,20 @@
+2008-02-16  Lutz Mueller <lu...@us...>
+
+	Jan Patera <pa...@pi...> spotted a problem with my last fix
+	for #1774591:
+
+	* libexif/exif-content.c: (exif_content_remove_entry) Recover
+	correctly in case of error by remembering the original size of the
+	realloc'ed data.
+	* libexif/exif-data.c: (exif_data_save_data_entry),
+	(exif_data_save_data_content) Same here.
+	* libexif/canon/exif-mnote-data-canon.c:
+	(exif_mnote_data_canon_save), (exif_mnote_data_canon_load) Same here.
+        * libexif/fuji/exif-mnote-data-fuji.c:
+        (exif_mnote_data_fuji_save), (exif_mnote_data_fuji_load) Same here.
+        * libexif/olympus/exif-mnote-data-olympus.c:
+        (exif_mnote_data_olympus_save) Same here.
+
 2008-02-15  Lutz Mueller <lu...@us...>
 
 	* Changelog

[libexif-cvs] libexif/libexif/fuji exif-mnote-data-fuji.c,1.2,1.3

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

Update of /cvsroot/libexif/libexif/libexif/fuji
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25655/libexif/fuji

Modified Files:
	exif-mnote-data-fuji.c 
Log Message:
2008-02-16  Lutz Mueller <lu...@us...>

	Jan Patera <pa...@pi...> spotted a problem with my last fix
	for #1774591:

	* libexif/exif-content.c: (exif_content_remove_entry) Recover
	correctly in case of error by remembering the original size of the
	realloc'ed data.
	* libexif/exif-data.c: (exif_data_save_data_entry),
	(exif_data_save_data_content) Same here.
	* libexif/canon/exif-mnote-data-canon.c:
	(exif_mnote_data_canon_save), (exif_mnote_data_canon_load) Same here.
        * libexif/fuji/exif-mnote-data-fuji.c:
        (exif_mnote_data_fuji_save), (exif_mnote_data_fuji_load) Same here.
        * libexif/olympus/exif-mnote-data-olympus.c:
        (exif_mnote_data_olympus_save) Same here.


Index: exif-mnote-data-fuji.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/fuji/exif-mnote-data-fuji.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- exif-mnote-data-fuji.c	14 Feb 2008 19:20:22 -0000	1.2
+++ exif-mnote-data-fuji.c	16 Feb 2008 19:11:40 -0000	1.3
@@ -80,6 +80,7 @@ exif_mnote_data_fuji_save (ExifMnoteData
 	ExifMnoteDataFuji *n = (ExifMnoteDataFuji *) ne;
 	unsigned int i, o, s, doff;
 	unsigned char *t;
+	unsigned int ts;
 
 	if (!n || !buf || !buf_size) return;
 
@@ -114,16 +115,17 @@ exif_mnote_data_fuji_save (ExifMnoteData
 		s = exif_format_get_size (n->entries[i].format) *
 						n->entries[i].components;
 		if (s > 4) {
-			*buf_size += s;
+			ts = *buf_size + s;
 
 			/* Ensure even offsets. Set padding bytes to 0. */
-			if (s & 1) *buf_size += 1;
-			t = exif_mem_realloc (ne->mem, *buf, *buf_size);
+			if (s & 1) ts += 1;
+			t = exif_mem_realloc (ne->mem, *buf, ts);
 			if (!t) {
 				*buf_size = 0;
 				return;
 			}
 			*buf = t;
+			*buf_size = ts;
 			doff = *buf_size - s;
 			if (s & 1) { doff--; *(*buf + *buf_size - 1) = '\0'; }
 			exif_set_long (*buf + o, n->order, doff);
@@ -162,10 +164,10 @@ exif_mnote_data_fuji_load (ExifMnoteData
 		o = datao + 12 * i;
 		if (datao + 12 > buf_size) return;
 
-		n->count = i + 1;
 		t = exif_mem_realloc (en->mem, n->entries,
 				sizeof (MnoteFujiEntry) * (i + 1));
 		if (!t) return;
+		n->count = i + 1;
 		n->entries = t;
 		memset (&n->entries[i], 0, sizeof (MnoteFujiEntry));
 		n->entries[i].tag        = exif_get_short (buf + o, n->order);

[libexif-cvs] libexif/libexif exif-content.c, 1.23, 1.24 exif-data.c, 1.108, 1.109

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

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

Modified Files:
	exif-content.c exif-data.c 
Log Message:
2008-02-16  Lutz Mueller <lu...@us...>

	Jan Patera <pa...@pi...> spotted a problem with my last fix
	for #1774591:

	* libexif/exif-content.c: (exif_content_remove_entry) Recover
	correctly in case of error by remembering the original size of the
	realloc'ed data.
	* libexif/exif-data.c: (exif_data_save_data_entry),
	(exif_data_save_data_content) Same here.
	* libexif/canon/exif-mnote-data-canon.c:
	(exif_mnote_data_canon_save), (exif_mnote_data_canon_load) Same here.
        * libexif/fuji/exif-mnote-data-fuji.c:
        (exif_mnote_data_fuji_save), (exif_mnote_data_fuji_load) Same here.
        * libexif/olympus/exif-mnote-data-olympus.c:
        (exif_mnote_data_olympus_save) Same here.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -d -r1.108 -r1.109
--- exif-data.c	14 Feb 2008 19:20:21 -0000	1.108
+++ exif-data.c	16 Feb 2008 19:11:40 -0000	1.109
@@ -234,6 +234,7 @@ exif_data_save_data_entry (ExifData *dat
 {
 	unsigned int doff, s;
 	unsigned char *t;
+	unsigned int ts;
 
 	if (!data || !data->priv) 
 		return;
@@ -269,21 +270,22 @@ exif_data_save_data_entry (ExifData *dat
 	s = exif_format_get_size (e->format) * e->components;
 	if (s > 4) {
 		doff = *ds - 6;
-		*ds += s;
+		ts = *ds + s;
 
 		/*
 		 * According to the TIFF specification,
 		 * the offset must be an even number. If we need to introduce
 		 * a padding byte, we set it to 0.
 		 */
-		if (s & 1) 
-			(*ds)++;
-		t = exif_mem_realloc (data->priv->mem, *d, *ds);
+		if (s & 1)
+			ts++;
+		t = exif_mem_realloc (data->priv->mem, *d, ts);
 		if (!t) {
-			EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", *ds);
+			EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", ts);
 		  	return;
 		}
 		*d = t;
+		*ds = ts;
 		exif_set_long (*d + 6 + offset + 8, data->priv->order, doff);
 		if (s & 1) 
 			*(*d + *ds - 1) = '\0';
@@ -479,6 +481,7 @@ exif_data_save_data_content (ExifData *d
 	unsigned int j, n_ptr = 0, n_thumb = 0;
 	ExifIfd i;
 	unsigned char *t;
+	unsigned int ts;
 
 	if (!data || !data->priv || !ifd || !d || !ds) 
 		return;
@@ -523,13 +526,14 @@ exif_data_save_data_content (ExifData *d
 	 * Allocate enough memory for all entries
 	 * and the number of entries.
 	 */
-	*ds += (2 + (ifd->count + n_ptr + n_thumb) * 12 + 4);
-	t = exif_mem_realloc (data->priv->mem, *d, *ds);
+	ts = *ds + (2 + (ifd->count + n_ptr + n_thumb) * 12 + 4);
+	t = exif_mem_realloc (data->priv->mem, *d, ts);
 	if (!t) {
-		EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", *ds);
+		EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", ts);
 	  	return;
 	}
 	*d = t;
+	*ds = ts;
 
 	/* Save the number of entries */
 	exif_set_short (*d + 6 + offset, data->priv->order,
@@ -628,14 +632,15 @@ exif_data_save_data_content (ExifData *d
 					1);
 			exif_set_long  (*d + 6 + offset + 8, data->priv->order,
 					*ds - 6);
-			*ds += data->size;
-			t = exif_mem_realloc (data->priv->mem, *d, *ds);
+			ts = *ds + data->size;
+			t = exif_mem_realloc (data->priv->mem, *d, ts);
 			if (!t) {
 				EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData",
-						    *ds);
+						    ts);
 			  	return;
 			}
 			*d = t;
+			*ds = ts;
 			memcpy (*d + *ds - data->size, data->data, data->size);
 			offset += 12;
 

Index: exif-content.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-content.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -d -r1.23 -r1.24
--- exif-content.c	14 Feb 2008 19:20:21 -0000	1.23
+++ exif-content.c	16 Feb 2008 19:11:40 -0000	1.24
@@ -168,12 +168,14 @@ exif_content_remove_entry (ExifContent *
 	/* Remove the entry */
 	memmove (&c->entries[i], &c->entries[i + 1],
 		 sizeof (ExifEntry*) * (c->count - i - 1));
-	c->count--;
 	e->parent = NULL;
 	exif_entry_unref (e);
 	t = exif_mem_realloc (c->priv->mem, c->entries,
-					sizeof(ExifEntry*) * c->count);
-	if (t) c->entries = t;
+				sizeof(ExifEntry*) * (c->count - 1));
+	if (t) {
+		c->entries = t;
+		c->count--;
+	}
 }
 
 ExifEntry *

[libexif-cvs] libexif/libexif/canon exif-mnote-data-canon.c, 1.16, 1.17

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

Update of /cvsroot/libexif/libexif/libexif/canon
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25655/libexif/canon

Modified Files:
	exif-mnote-data-canon.c 
Log Message:
2008-02-16  Lutz Mueller <lu...@us...>

	Jan Patera <pa...@pi...> spotted a problem with my last fix
	for #1774591:

	* libexif/exif-content.c: (exif_content_remove_entry) Recover
	correctly in case of error by remembering the original size of the
	realloc'ed data.
	* libexif/exif-data.c: (exif_data_save_data_entry),
	(exif_data_save_data_content) Same here.
	* libexif/canon/exif-mnote-data-canon.c:
	(exif_mnote_data_canon_save), (exif_mnote_data_canon_load) Same here.
        * libexif/fuji/exif-mnote-data-fuji.c:
        (exif_mnote_data_fuji_save), (exif_mnote_data_fuji_load) Same here.
        * libexif/olympus/exif-mnote-data-olympus.c:
        (exif_mnote_data_olympus_save) Same here.


Index: exif-mnote-data-canon.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -d -r1.16 -r1.17
--- exif-mnote-data-canon.c	14 Feb 2008 19:20:22 -0000	1.16
+++ exif-mnote-data-canon.c	16 Feb 2008 19:11:40 -0000	1.17
@@ -120,6 +120,7 @@ exif_mnote_data_canon_save (ExifMnoteDat
 	ExifMnoteDataCanon *n = (ExifMnoteDataCanon *) ne;
 	unsigned int i, o, s, doff;
 	unsigned char *t;
+	unsigned int ts;
 
 	if (!n || !buf || !buf_size) return;
 
@@ -145,14 +146,15 @@ exif_mnote_data_canon_save (ExifMnoteDat
 		s = exif_format_get_size (n->entries[i].format) *
 						n->entries[i].components;
 		if (s > 4) {
-			*buf_size += s;
+			ts = *buf_size + s;
 
 			/* Ensure even offsets. Set padding bytes to 0. */
-			if (s & 1) *buf_size += 1;
+			if (s & 1) ts += 1;
 			t = exif_mem_realloc (ne->mem, *buf,
-						 sizeof (char) * *buf_size);
+						 sizeof (char) * ts);
 			if (!t) return;
 			*buf = t;
+			*buf_size = ts;
 			doff = *buf_size - s;
 			if (s & 1) { doff--; *(*buf + *buf_size - 1) = '\0'; }
 			exif_set_long (*buf + o, n->order, n->offset + doff);
@@ -201,10 +203,10 @@ exif_mnote_data_canon_load (ExifMnoteDat
 		o = 6 + 2 + n->offset + 12 * i;
 	  if (o + 8 > buf_size) return;
 
-		n->count = i + 1;
 		t = exif_mem_realloc (ne->mem, n->entries,
 				sizeof (MnoteCanonEntry) * (i + 1));
 		if (!t) return;
+		n->count = i + 1;
 		n->entries = t;
 		memset (&n->entries[i], 0, sizeof (MnoteCanonEntry));
 	  n->entries[i].tag        = exif_get_short (buf + o, n->order);

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c, 1.32, 1.33

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

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

Modified Files:
	exif-mnote-data-olympus.c 
Log Message:
2008-02-16  Lutz Mueller <lu...@us...>

	Jan Patera <pa...@pi...> spotted a problem with my last fix
	for #1774591:

	* libexif/exif-content.c: (exif_content_remove_entry) Recover
	correctly in case of error by remembering the original size of the
	realloc'ed data.
	* libexif/exif-data.c: (exif_data_save_data_entry),
	(exif_data_save_data_content) Same here.
	* libexif/canon/exif-mnote-data-canon.c:
	(exif_mnote_data_canon_save), (exif_mnote_data_canon_load) Same here.
        * libexif/fuji/exif-mnote-data-fuji.c:
        (exif_mnote_data_fuji_save), (exif_mnote_data_fuji_load) Same here.
        * libexif/olympus/exif-mnote-data-olympus.c:
        (exif_mnote_data_olympus_save) Same here.


Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -d -r1.32 -r1.33
--- exif-mnote-data-olympus.c	10 Nov 2007 08:02:33 -0000	1.32
+++ exif-mnote-data-olympus.c	16 Feb 2008 19:11:41 -0000	1.33
@@ -88,6 +88,8 @@ exif_mnote_data_olympus_save (ExifMnoteD
 	ExifMnoteDataOlympus *n = (ExifMnoteDataOlympus *) ne;
 	unsigned int i, o, s, doff, base = 0, o2 = 6 + 2;
 	int datao = 0;
+	unsigned char *t;
+	unsigned int ts;
 
 	if (!n || !buf || !buf_size) return;
 
@@ -173,10 +175,12 @@ exif_mnote_data_olympus_save (ExifMnoteD
 						n->entries[i].components;
 		if (s > 4) {
 			doff = *buf_size;
-			*buf_size += s;
-			*buf = exif_mem_realloc (ne->mem, *buf,
-						 sizeof (char) * *buf_size);
-			if (!*buf) return;
+			ts = *buf_size + s;
+			t = exif_mem_realloc (ne->mem, *buf,
+						 sizeof (char) * ts);
+			if (!t) return;
+			*buf = t;
+			*buf_size = ts;
 			exif_set_long (*buf + o, n->order, datao + doff);
 		} else
 			doff = o;

[libexif-cvs] libexif ChangeLog,1.265,1.266 README,1.15,1.16

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

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

Modified Files:
	ChangeLog README 
Log Message:
2008-02-15  Lutz Mueller <lu...@us...>

	* Changelog
	* README: use 'ue' instead of some stange German character.


Index: README
===================================================================
RCS file: /cvsroot/libexif/libexif/README,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- README	24 Jan 2008 18:45:22 -0000	1.15
+++ README	15 Feb 2008 04:38:32 -0000	1.16
@@ -114,7 +114,7 @@ AUTHORS
 
 libexif has originally been written by Curtis Galloway
 <cu...@us...>. Because of the original design not
-supporting editing and saving, Lutz Müller <lu...@us...>
+supporting editing and saving, Lutz Mueller <lu...@us...>
 rewrote libexif from scratch.
 
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -p -d -r1.265 -r1.266
--- ChangeLog	14 Feb 2008 19:20:13 -0000	1.265
+++ ChangeLog	15 Feb 2008 04:38:32 -0000	1.266
@@ -1,3 +1,8 @@
+2008-02-15  Lutz Mueller <lu...@us...>
+
+	* Changelog
+	* README: use 'ue' instead of some stange German character.
+
 2008-02-14  Lutz Mueller <lu...@us...>
 
 	Fix #1774591 (partially):
@@ -1161,85 +1166,85 @@
 
 	* libexif/exif-entry.c (exif_entry_get_value): Support USER_COMMENT.
 
-2002-12-31  Lutz Müller <lu...@us...>
+2002-12-31  Lutz Mueller <lu...@us...>
 
 	* README: Some information by Sander van Geloven
 	  <svg...@zo...>.
 
-2002-12-11  Lutz Müller <lu...@us...>
+2002-12-11  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-entry.c (exif_entry_initialize): Fix last commit.
 
-2002-12-11  Lutz Müller <lu...@us...>
+2002-12-11  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-entry.c (exif_entry_initialize): Support USER_COMMENT.
 	* configure.in: Version 0.5.9
 
-2002-12-09  Lutz Müller <lu...@us...>
+2002-12-09  Lutz Mueller <lu...@us...>
 
 	* README: New frontend 'thirdeye'.
 
-2002-12-07  Lutz Müller <lu...@us...>
+2002-12-07  Lutz Mueller <lu...@us...>
 
 	* configure.in: Version 0.5.8
 
-2002-12-02  Lutz Müller <lu...@us...>
+2002-12-02  Lutz Mueller <lu...@us...>
 
 	* libexif/Makefile.am: Forgot to remove the some subdirs.
 
-2002-12-02  Lutz Müller <lu...@us...>
+2002-12-02  Lutz Mueller <lu...@us...>
 
 	* configure.in: Remove some Makefiles
 
-2002-12-02  Lutz Müller <lu...@us...>
+2002-12-02  Lutz Mueller <lu...@us...>
 
 	* configure.in: Reflect removal of exif-note.h in version.
 
-2002-12-02  Lutz Müller <lu...@us...>
+2002-12-02  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-note.[c,h]: Removed. Now in libmnote.
 
-2002-09-16  Lutz Müller <lu...@us...>
+2002-09-16  Lutz Mueller <lu...@us...>
 
 	* libexif: Some fixes for Windows (Visual C++) by
 	  Andres <ap...@sm...>
 
-2002-09-15  Lutz Müller <lu...@us...>
+2002-09-15  Lutz Mueller <lu...@us...>
 
 	* configure.in: IRIS fixes by Andrea Suatoni
 	  <a.s...@te...>
 	
-2002-09-15  Lutz Müller <lu...@us...>
+2002-09-15  Lutz Mueller <lu...@us...>
 
 	* configure.in:
 	* po/es.po: Spanish translation by Fabian Mandelbaum
 	  <fa...@2v...>
 
-2002-08-30  Lutz Müller <lu...@us...>
+2002-08-30  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-data.c: Some cleanup.
 
-2002-08-29  Lutz Müller <lu...@us...>
+2002-08-29  Lutz Mueller <lu...@us...>
 
 	Renchi Raju <re...@po...> found another bug in 
 
 	* libexif/exif-data.c: Correctly save the data.
 	* configure.in: Version 0.5.6.
 
-2002-08-29  Lutz Müller <lu...@us...>
+2002-08-29  Lutz Mueller <lu...@us...>
 
 	Jason Sodergren <ja...@ta...> found a lot of bugs in
 
 	* libexif/exif-data.c: Correctly save the data.
 	* configure.in: Version 0.5.5.
 
-2002-08-29  Lutz Müller <lu...@us...>
+2002-08-29  Lutz Mueller <lu...@us...>
 
 	Another fixes related to #564019:
 
 	* libexif: Make code conform to ISO C standard, section 6.5.2.3.
 
-2002-08-29  Lutz Müller <lu...@us...>
+2002-08-29  Lutz Mueller <lu...@us...>
 
 	Bug reported by Jason Sodergren <ja...@ta...>:
 
@@ -1250,7 +1255,7 @@
 	* configure.in: Version 0.5.4dev
 		distinguish release versions from CVS versions
 
-2002-07-25  Lutz Müller <lu...@us...>
+2002-07-25  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-ifd.[c,h]: New.
 	* libexif/exif-data.h: Introduce an array of ExifContents. This 
@@ -1259,95 +1264,95 @@
 	  code to make it compile again.
 	* configure.in: Version 0.5.4.
 
-2002-07-25  Lutz Müller <lu...@us...>
+2002-07-25  Lutz Mueller <lu...@us...>
 
 	Patch by anonymous user:
 
 	* libexif/exif-[byte-order,format,result,tag].h: Make code comply with
 	  ISO C standard, section 6.5.2.3.
 
-2002-07-25  Lutz Müller <lu...@us...>
+2002-07-25  Lutz Mueller <lu...@us...>
 
 	Patch by Takuro Ashie <ma...@us...>:
 
 	* libexif/exif-data.c: Plug memory leak.
 
-2002-07-10  Lutz Müller <lu...@us...>
+2002-07-10  Lutz Mueller <lu...@us...>
 
 	Bug spotted by Andres <ap...@sm...>:
 
 	* libexif/exif-data.c: Save the EXIF_TAG_INTEROPERABILITY_IFD_POINTER
 	  in ifd_exif, not in ifd0.
 
-2002-06-26  Lutz Müller <lu...@us...>
+2002-06-26  Lutz Mueller <lu...@us...>
 
 	Patch by Jos van den Oever <oe...@fe...>: Make libexif c++
 	friendly.
 
-2002-06-14  Lutz Müller <lu...@us...>
+2002-06-14  Lutz Mueller <lu...@us...>
 
 	* configure.in: Correct -version-info.
 
-2002-06-11  Lutz Müller <lu...@us...>
+2002-06-11  Lutz Mueller <lu...@us...>
 
 	* configure.in: Version 0.5.3
 
-2002-06-11  Lutz Müller <lu...@us...>
+2002-06-11  Lutz Mueller <lu...@us...>
 
 	* libexif/Makefile.am: Oops, missed those konica entries.
 
-2002-06-10  Lutz Müller <lu...@us...>
+2002-06-10  Lutz Mueller <lu...@us...>
 
 	* configure.in: Version 0.5.2
 
-2002-06-10  Lutz Müller <lu...@us...>
+2002-06-10  Lutz Mueller <lu...@us...>
 
 	* configure.in: We need autoconf > 2.50.
 
-2002-06-09  Lutz Müller <lu...@us...>
+2002-06-09  Lutz Mueller <lu...@us...>
 
 	Internationalization.
 
-2002-06-08  Lutz Müller <lu...@us...>
+2002-06-08  Lutz Mueller <lu...@us...>
 
 	Patch by Guido Ostkamp <gui...@t-...>
 
 	* libexif/exif-data.c: Increment offset by 12.
 
-2002-06-06  Lutz Müller <lu...@us...>
+2002-06-06  Lutz Mueller <lu...@us...>
 
 	Bug spotted by Andres <ap...@sm...>:
 
 	* exif-entry.c: Fix typo.
 
-2002-06-05  Lutz Müller <lu...@us...>
+2002-06-05  Lutz Mueller <lu...@us...>
 
 	* COPYING: Check the text of the LGPL in, because otherwise, 
 	  automake --add-missing would use the text of the GPL.
 
-2002-06-03  Lutz Müller <lu...@us...>
+2002-06-03  Lutz Mueller <lu...@us...>
 
 	* configure.in: Version 0.5.1
 
-2002-05-01  Lutz Müller <lu...@us...>
+2002-05-01  Lutz Mueller <lu...@us...>
 
 	Patch by Arnaud Rouanet <ro...@la...>:
 
 	* libexif/exif-entry.c (exif_entry_get_value): Fix typo.
 
-2002-04-30  Lutz Müller <lu...@us...>
+2002-04-30  Lutz Mueller <lu...@us...>
 
 	Patch by Arnaud Rouanet <ro...@la...>:
 
 	* libexif/exif-entry.c (exif_entry_get_value): Support version 2.2.
 
-2002-04-18  Lutz Müller <lu...@us...>
+2002-04-18  Lutz Mueller <lu...@us...>
 
 	Patch by Marcus Meissner <ma...@je...>:
 
 	* libexif/*.h: Make header files c++ friendly.
 
-2002-04-16  Lutz Müller <lu...@us...>
+2002-04-16  Lutz Mueller <lu...@us...>
 
 	Enhancements by Semyon Sosin <se...@be...>, adapted:
 
@@ -1355,7 +1360,7 @@
 	* libexif/exif-entry.[c,h] (exif_entry_get_value_brief): New.
 	* README: Add a note about libjpeg.
 
-2002-04-15  Lutz Müller <lu...@us...>
+2002-04-15  Lutz Mueller <lu...@us...>
 
 	Enhancements by Semyon Sosin <se...@be...>, adapted:
 
@@ -1367,7 +1372,7 @@
 
 	* Makefile.am: dded .tar.bz2 packaging to "make dist"
 
-2002-03-01  Lutz Müller <lu...@us...>
+2002-03-01  Lutz Mueller <lu...@us...>
 
 	Patch by Mark Pulford <ma...@ky...>:
 
@@ -1375,98 +1380,98 @@
 	* configure.in:
 	* Makefile.am: Create libexif.spec
 
-2002-02-28  Lutz Müller <lu...@us...>
+2002-02-28  Lutz Mueller <lu...@us...>
 
 	Patch by Javier Achirica <ach...@tt...>:
 
 	* libexif/exif-data.c: Fix directory length and termination.
 
-2002-02-28  Lutz Müller <lu...@us...>
+2002-02-28  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-entry.c (exif_entry_get_value): Add support for
 	  EXIF_TAG_SUBJECT_AREA.
 
-2002-02-28  Lutz Müller <lu...@us...>
+2002-02-28  Lutz Mueller <lu...@us...>
 
 	Patch by Javier Achirica <ach...@tt...>:
 
 	* libexif/exif-tag.[c,h]:
 	* libexif/exif-entry.c: Support EXIF-2.2 tags.
 
-2002-02-25  Lutz MÜller <lu...@us...>
+2002-02-25  Lutz Mueller <lu...@us...>
 
 	Patch by Basil Dias <bas...@wi...>:
 
 	* libjpeg/jpeg-data.c: Missing realloc.
 
-2002-02-21  Lutz Müller <lu...@us...>
+2002-02-21  Lutz Mueller <lu...@us...>
 
 	* libexif/canon: Set up support for parsing MakerNotes.
 
-2002-02-20  Lutz Müller <lu...@us...>
+2002-02-20  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-data.c:
 	* libjpeg/jpeg-data.c: Read and write "rb" (Windows needs it).
 
-2002-02-18  Lutz Müller <lu...@us...>
+2002-02-18  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-data.c: Suppress output unless #ifdef DEBUG
 
-2002-02-17  Lutz Müller <lu...@us...>
+2002-02-17  Lutz Mueller <lu...@us...>
 
 	Patch from Fredrik <fr...@kr...>:
 
 	* libexif/exif-data.c: Better checks for size.
 
-2002-02-13  Lutz Müller <lu...@us...>
+2002-02-13  Lutz Mueller <lu...@us...>
 
 	* libexif/configure.in: Introduce proper versionning.
 
-2002-02-13  Lutz Müller <lu...@us...>
+2002-02-13  Lutz Mueller <lu...@us...>
 
 	* libexif: There's only one ByteOrder per ExifData.
 
-2002-02-12  Lutz Müller <lu...@us...>
+2002-02-12  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-entry.c: More initialization.
 
-2002-02-11  Lutz Müller <lu...@us...>
+2002-02-11  Lutz Mueller <lu...@us...>
 
 	* configure.in: Version 0.5
 
-2002-02-11  Lutz Müller <lu...@us...>
+2002-02-11  Lutz Mueller <lu...@us...>
 
 	* libexif/libexif-entry.c: More tags implemented in
 	  (exif_entry_get_value).
 
-2002-02-06  Lutz Müller <lu...@us...>
+2002-02-06  Lutz Mueller <lu...@us...>
 
 	* configure.in: Version 0.4
 
-2002-02-05  Lutz Müller <lu...@us...>
+2002-02-05  Lutz Mueller <lu...@us...>
 
 	* configure.in: Version 0.3
 
-2002-02-05  Lutz Müller <lu...@us...>
+2002-02-05  Lutz Mueller <lu...@us...>
 
 	* libexif: Implement saving.
 
-2002-01-29  Lutz Müller <lu...@us...>
+2002-01-29  Lutz Mueller <lu...@us...>
 
 	* configure.in: Version 0.2
 
-2002-01-06  Lutz Müller <ur...@rz...>
+2002-01-06  Lutz Mueller <ur...@rz...>
 
 	Merge new stuff from gtkam/libexif.
 
-2001-12-23  Lutz Müller <ur...@rz...>
+2001-12-23  Lutz Mueller <ur...@rz...>
 
 	Merge new stuff from gtkam/libexif.
 
-2001-12-21  Lutz Müller <ur...@rz...>
+2001-12-21  Lutz Mueller <ur...@rz...>
 
 	Move new version from gtkam to here.
 
-2001-12-11  Lutz Müller <ur...@rz...>
+2001-12-11  Lutz Mueller <ur...@rz...>
 
 	Initial automake setup.

[libexif-cvs] libexif/libexif/canon exif-mnote-data-canon.c, 1.15, 1.16

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

Update of /cvsroot/libexif/libexif/libexif/canon
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2627/libexif/canon

Modified Files:
	exif-mnote-data-canon.c 
Log Message:
2008-02-14  Lutz Mueller <lu...@us...>

	Fix #1774591 (partially):

	* libexif/exif-content.c: (exif_content_remove_entry) Check the
	return value of exif_mem_realloc.
	* libexif/exif-data.c: (exif_data_save_data_entry), 
	(exif_data_save_data_content) Same here.
	* libexif/canon/exif-mnote-data-canon.c:
	(exif_mnote_data_canon_save), (exif_mnote_data_canon_load) Same here.
	* libexif/fuji/exif-mnote-data-fuji.c:
	(exif_mnote_data_fuji_save), (exif_mnote_data_fuji_load) Same here.
	* libexif/olympus/exif-mnote-data-olympus.c:
	(exif_mnote_data_olympus_save) Same here.


Index: exif-mnote-data-canon.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- exif-mnote-data-canon.c	9 May 2007 06:15:23 -0000	1.15
+++ exif-mnote-data-canon.c	14 Feb 2008 19:20:22 -0000	1.16
@@ -119,6 +119,7 @@ exif_mnote_data_canon_save (ExifMnoteDat
 {
 	ExifMnoteDataCanon *n = (ExifMnoteDataCanon *) ne;
 	unsigned int i, o, s, doff;
+	unsigned char *t;
 
 	if (!n || !buf || !buf_size) return;
 
@@ -148,9 +149,10 @@ exif_mnote_data_canon_save (ExifMnoteDat
 
 			/* Ensure even offsets. Set padding bytes to 0. */
 			if (s & 1) *buf_size += 1;
-			*buf = exif_mem_realloc (ne->mem, *buf,
+			t = exif_mem_realloc (ne->mem, *buf,
 						 sizeof (char) * *buf_size);
-			if (!*buf) return;
+			if (!t) return;
+			*buf = t;
 			doff = *buf_size - s;
 			if (s & 1) { doff--; *(*buf + *buf_size - 1) = '\0'; }
 			exif_set_long (*buf + o, n->order, n->offset + doff);
@@ -186,6 +188,7 @@ exif_mnote_data_canon_load (ExifMnoteDat
 	ExifMnoteDataCanon *n = (ExifMnoteDataCanon *) ne;
 	ExifShort c;
 	unsigned int i, o, s;
+	MnoteCanonEntry *t;
 
 	if (!n || !buf || !buf_size || (buf_size < 6 + n->offset + 2)) return;
 
@@ -199,8 +202,10 @@ exif_mnote_data_canon_load (ExifMnoteDat
 	  if (o + 8 > buf_size) return;
 
 		n->count = i + 1;
-		n->entries = exif_mem_realloc (ne->mem, n->entries,
-				sizeof (MnoteCanonEntry) * (i+1));
+		t = exif_mem_realloc (ne->mem, n->entries,
+				sizeof (MnoteCanonEntry) * (i + 1));
+		if (!t) return;
+		n->entries = t;
 		memset (&n->entries[i], 0, sizeof (MnoteCanonEntry));
 	  n->entries[i].tag        = exif_get_short (buf + o, n->order);
 	  n->entries[i].format     = exif_get_short (buf + o + 2, n->order);

[libexif-cvs] libexif ChangeLog,1.264,1.265

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

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

Modified Files:
	ChangeLog 
Log Message:
2008-02-14  Lutz Mueller <lu...@us...>

	Fix #1774591 (partially):

	* libexif/exif-content.c: (exif_content_remove_entry) Check the
	return value of exif_mem_realloc.
	* libexif/exif-data.c: (exif_data_save_data_entry), 
	(exif_data_save_data_content) Same here.
	* libexif/canon/exif-mnote-data-canon.c:
	(exif_mnote_data_canon_save), (exif_mnote_data_canon_load) Same here.
	* libexif/fuji/exif-mnote-data-fuji.c:
	(exif_mnote_data_fuji_save), (exif_mnote_data_fuji_load) Same here.
	* libexif/olympus/exif-mnote-data-olympus.c:
	(exif_mnote_data_olympus_save) Same here.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -p -d -r1.264 -r1.265
--- ChangeLog	14 Feb 2008 18:52:28 -0000	1.264
+++ ChangeLog	14 Feb 2008 19:20:13 -0000	1.265
@@ -1,5 +1,20 @@
 2008-02-14  Lutz Mueller <lu...@us...>
 
+	Fix #1774591 (partially):
+
+	* libexif/exif-content.c: (exif_content_remove_entry) Check the
+	return value of exif_mem_realloc.
+	* libexif/exif-data.c: (exif_data_save_data_entry), 
+	(exif_data_save_data_content) Same here.
+	* libexif/canon/exif-mnote-data-canon.c:
+	(exif_mnote_data_canon_save), (exif_mnote_data_canon_load) Same here.
+	* libexif/fuji/exif-mnote-data-fuji.c:
+	(exif_mnote_data_fuji_save), (exif_mnote_data_fuji_load) Same here.
+	* libexif/olympus/exif-mnote-data-olympus.c:
+	(exif_mnote_data_olympus_save) Same here.
+
+2008-02-14  Lutz Mueller <lu...@us...>
+
 	Fix #1884609 (partially):
 
 	* libexif/exif-entry.c: (exif_entry_initialize) Initialize

[libexif-cvs] libexif/libexif/fuji exif-mnote-data-fuji.c,1.1,1.2

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

Update of /cvsroot/libexif/libexif/libexif/fuji
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2627/libexif/fuji

Modified Files:
	exif-mnote-data-fuji.c 
Log Message:
2008-02-14  Lutz Mueller <lu...@us...>

	Fix #1774591 (partially):

	* libexif/exif-content.c: (exif_content_remove_entry) Check the
	return value of exif_mem_realloc.
	* libexif/exif-data.c: (exif_data_save_data_entry), 
	(exif_data_save_data_content) Same here.
	* libexif/canon/exif-mnote-data-canon.c:
	(exif_mnote_data_canon_save), (exif_mnote_data_canon_load) Same here.
	* libexif/fuji/exif-mnote-data-fuji.c:
	(exif_mnote_data_fuji_save), (exif_mnote_data_fuji_load) Same here.
	* libexif/olympus/exif-mnote-data-olympus.c:
	(exif_mnote_data_olympus_save) Same here.


Index: exif-mnote-data-fuji.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/fuji/exif-mnote-data-fuji.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- exif-mnote-data-fuji.c	7 Dec 2007 08:46:49 -0000	1.1
+++ exif-mnote-data-fuji.c	14 Feb 2008 19:20:22 -0000	1.2
@@ -79,6 +79,7 @@ exif_mnote_data_fuji_save (ExifMnoteData
 {
 	ExifMnoteDataFuji *n = (ExifMnoteDataFuji *) ne;
 	unsigned int i, o, s, doff;
+	unsigned char *t;
 
 	if (!n || !buf || !buf_size) return;
 
@@ -117,11 +118,12 @@ exif_mnote_data_fuji_save (ExifMnoteData
 
 			/* Ensure even offsets. Set padding bytes to 0. */
 			if (s & 1) *buf_size += 1;
-			*buf = exif_mem_realloc (ne->mem, *buf, *buf_size);
-			if (!*buf) {
+			t = exif_mem_realloc (ne->mem, *buf, *buf_size);
+			if (!t) {
 				*buf_size = 0;
 				return;
 			}
+			*buf = t;
 			doff = *buf_size - s;
 			if (s & 1) { doff--; *(*buf + *buf_size - 1) = '\0'; }
 			exif_set_long (*buf + o, n->order, doff);
@@ -144,6 +146,7 @@ exif_mnote_data_fuji_load (ExifMnoteData
 	ExifMnoteDataFuji *n = (ExifMnoteDataFuji*) en;
 	ExifLong c;
 	unsigned int i, o, s, datao = 6 + n->offset;
+	MnoteFujiEntry *t;
 
 	if (!n || !buf || !buf_size || (buf_size < datao + 12)) return;
 
@@ -160,8 +163,10 @@ exif_mnote_data_fuji_load (ExifMnoteData
 		if (datao + 12 > buf_size) return;
 
 		n->count = i + 1;
-		n->entries = exif_mem_realloc (en->mem, n->entries,
-				sizeof (MnoteFujiEntry) * (i+1));
+		t = exif_mem_realloc (en->mem, n->entries,
+				sizeof (MnoteFujiEntry) * (i + 1));
+		if (!t) return;
+		n->entries = t;
 		memset (&n->entries[i], 0, sizeof (MnoteFujiEntry));
 		n->entries[i].tag        = exif_get_short (buf + o, n->order);
 		n->entries[i].format     = exif_get_short (buf + o + 2, n->order);

[libexif-cvs] libexif/libexif exif-content.c, 1.22, 1.23 exif-data.c, 1.107, 1.108

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

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

Modified Files:
	exif-content.c exif-data.c 
Log Message:
2008-02-14  Lutz Mueller <lu...@us...>

	Fix #1774591 (partially):

	* libexif/exif-content.c: (exif_content_remove_entry) Check the
	return value of exif_mem_realloc.
	* libexif/exif-data.c: (exif_data_save_data_entry), 
	(exif_data_save_data_content) Same here.
	* libexif/canon/exif-mnote-data-canon.c:
	(exif_mnote_data_canon_save), (exif_mnote_data_canon_load) Same here.
	* libexif/fuji/exif-mnote-data-fuji.c:
	(exif_mnote_data_fuji_save), (exif_mnote_data_fuji_load) Same here.
	* libexif/olympus/exif-mnote-data-olympus.c:
	(exif_mnote_data_olympus_save) Same here.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -d -r1.107 -r1.108
--- exif-data.c	10 Feb 2008 06:12:54 -0000	1.107
+++ exif-data.c	14 Feb 2008 19:20:21 -0000	1.108
@@ -233,6 +233,7 @@ exif_data_save_data_entry (ExifData *dat
 			   unsigned int offset)
 {
 	unsigned int doff, s;
+	unsigned char *t;
 
 	if (!data || !data->priv) 
 		return;
@@ -277,11 +278,12 @@ exif_data_save_data_entry (ExifData *dat
 		 */
 		if (s & 1) 
 			(*ds)++;
-		*d = exif_mem_realloc (data->priv->mem, *d, *ds);
-		if (!*d) {
+		t = exif_mem_realloc (data->priv->mem, *d, *ds);
+		if (!t) {
 			EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", *ds);
 		  	return;
 		}
+		*d = t;
 		exif_set_long (*d + 6 + offset + 8, data->priv->order, doff);
 		if (s & 1) 
 			*(*d + *ds - 1) = '\0';
@@ -476,6 +478,7 @@ exif_data_save_data_content (ExifData *d
 {
 	unsigned int j, n_ptr = 0, n_thumb = 0;
 	ExifIfd i;
+	unsigned char *t;
 
 	if (!data || !data->priv || !ifd || !d || !ds) 
 		return;
@@ -521,11 +524,12 @@ exif_data_save_data_content (ExifData *d
 	 * and the number of entries.
 	 */
 	*ds += (2 + (ifd->count + n_ptr + n_thumb) * 12 + 4);
-	*d = exif_mem_realloc (data->priv->mem, *d, *ds);
-	if (!*d) {
+	t = exif_mem_realloc (data->priv->mem, *d, *ds);
+	if (!t) {
 		EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", *ds);
 	  	return;
 	}
+	*d = t;
 
 	/* Save the number of entries */
 	exif_set_short (*d + 6 + offset, data->priv->order,
@@ -625,12 +629,13 @@ exif_data_save_data_content (ExifData *d
 			exif_set_long  (*d + 6 + offset + 8, data->priv->order,
 					*ds - 6);
 			*ds += data->size;
-			*d = exif_mem_realloc (data->priv->mem, *d, *ds);
-			if (!*d) {
+			t = exif_mem_realloc (data->priv->mem, *d, *ds);
+			if (!t) {
 				EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData",
 						    *ds);
 			  	return;
 			}
+			*d = t;
 			memcpy (*d + *ds - data->size, data->data, data->size);
 			offset += 12;
 

Index: exif-content.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-content.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- exif-content.c	30 Oct 2007 04:15:15 -0000	1.22
+++ exif-content.c	14 Feb 2008 19:20:21 -0000	1.23
@@ -157,6 +157,7 @@ void
 exif_content_remove_entry (ExifContent *c, ExifEntry *e)
 {
 	unsigned int i;
+	ExifEntry **t;
 
 	if (!c || !c->priv || !e || (e->parent != c)) return;
 
@@ -170,8 +171,9 @@ exif_content_remove_entry (ExifContent *
 	c->count--;
 	e->parent = NULL;
 	exif_entry_unref (e);
-	c->entries = exif_mem_realloc (c->priv->mem, c->entries,
+	t = exif_mem_realloc (c->priv->mem, c->entries,
 					sizeof(ExifEntry*) * c->count);
+	if (t) c->entries = t;
 }
 
 ExifEntry *

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

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

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

Modified Files:
	exif-entry.c 
Log Message:
2008-02-14  Lutz Mueller <lu...@us...>

	Fix #1884609 (partially):

	* libexif/exif-entry.c: (exif_entry_initialize) Initialize
	EXIF_TAG_FLASH and EXIF_TAG_COLOR_SPACE.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -d -r1.116 -r1.117
--- exif-entry.c	31 Jan 2008 08:25:33 -0000	1.116
+++ exif-entry.c	14 Feb 2008 18:52:29 -0000	1.117
@@ -1168,6 +1168,8 @@ exif_entry_initialize (ExifEntry *e, Exi
 	case EXIF_TAG_FOCAL_LENGTH_IN_35MM_FILM:
 	case EXIF_TAG_GAIN_CONTROL:
 	case EXIF_TAG_SUBJECT_DISTANCE_RANGE:
+	case EXIF_TAG_COLOR_SPACE:
+	case EXIF_TAG_FLASH:
 
 	/* SHORT, 1 component, default 0 */
 	case EXIF_TAG_IMAGE_WIDTH:

[libexif-cvs] libexif ChangeLog,1.263,1.264

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

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

Modified Files:
	ChangeLog 
Log Message:
2008-02-14  Lutz Mueller <lu...@us...>

	Fix #1884609 (partially):

	* libexif/exif-entry.c: (exif_entry_initialize) Initialize
	EXIF_TAG_FLASH and EXIF_TAG_COLOR_SPACE.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -p -d -r1.263 -r1.264
--- ChangeLog	27 Dec 2007 16:22:56 -0000	1.263
+++ ChangeLog	14 Feb 2008 18:52:28 -0000	1.264
@@ -1,3 +1,10 @@
+2008-02-14  Lutz Mueller <lu...@us...>
+
+	Fix #1884609 (partially):
+
+	* libexif/exif-entry.c: (exif_entry_initialize) Initialize
+	EXIF_TAG_FLASH and EXIF_TAG_COLOR_SPACE.
+
 2007-12-27  Lutz Mueller <lu...@us...>
 
 	Suggestion by Andreas Kleinert <And...@gm...>:

[libexif-cvs] exif ChangeLog,1.64,1.65

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

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

Modified Files:
	ChangeLog 
Log Message:
2008-02-10  Lutz Mueller <lu...@us...>

	Patch by Alexander Drozdov <dza...@mt...>:

	* exif/utils.c (exif_tag_from_string): Speed improvements.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -d -r1.64 -r1.65
--- ChangeLog	10 Jan 2008 06:19:39 -0000	1.64
+++ ChangeLog	10 Feb 2008 09:20:15 -0000	1.65
@@ -1,3 +1,9 @@
+2008-02-10  Lutz Mueller <lu...@us...>
+
+	Patch by Alexander Drozdov <dza...@mt...>:
+
+	* exif/utils.c (exif_tag_from_string): Speed improvements.
+
 2008-01-10  Jan Patera <pa...@us...>
 
 	* Added Svedish translation by Daniel Nylander <po...@da...>

[libexif-cvs] exif/exif utils.c,1.9,1.10

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

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

Modified Files:
	utils.c 
Log Message:
2008-02-10  Lutz Mueller <lu...@us...>

	Patch by Alexander Drozdov <dza...@mt...>:

	* exif/utils.c (exif_tag_from_string): Speed improvements.


Index: utils.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/utils.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- utils.c	27 Apr 2005 06:44:22 -0000	1.9
+++ utils.c	10 Feb 2008 09:20:17 -0000	1.10
@@ -23,104 +23,37 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 ExifTag
 exif_tag_from_string (const char *string)
 {
 	ExifTag tag;
-	unsigned int i, number, factor;
+	unsigned int i, number;
 	const char *name;
 
 	if (!string)
 		return 0xffff;
 
-	/* Is the string a tag's name or title? */
-	for (tag = 0xffff; tag > 0; tag--) {
-		name = exif_tag_get_name (tag);
-		if (name && !strcmp (string, name))
-			return (tag);
-		name = exif_tag_get_title (tag);
-		if (name && !strcmp (string, name))
-			return (tag);
-	}
-
 	/* Is the string a decimal number? */
 	if (strspn (string, "0123456789") == strlen (string))
 		return (atoi (string));
 
 	/* Is the string a hexadecimal number? */
-	for (i = 0; i < strlen (string); i++)
-		if (string[i] == 'x')
-			break;
-	if (i == strlen (string))
-		return 0xffff;
+	if (sscanf (string, "0x%x%n", &number, &i) == 1 && !string[i])
+		return ((ExifTag)number);
 
-	string += i + 1;
-        tag = 0;
-        for (i = strlen (string); i > 0; i--) {
-                switch (string[i - 1]) {
-                case '0':
-                        number = 0;
-                        break;
-                case '1':
-                        number = 1;
-                        break;
-                case '2':
-                        number = 2;
-                        break;
-                case '3':
-                        number = 3;
-                        break;
-                case '4':
-                        number = 4;
-                        break;
-                case '5':
-                        number = 5;
-                        break;
-                case '6':
-                        number = 6;
-                        break;
-                case '7':
-                        number = 7;
-                        break;
-                case '8':
-                        number = 8;
-                        break;
-                case '9':
-                        number = 9;
-                        break;
-                case 'a':
-                case 'A':
-                        number = 10;
-                        break;
-                case 'b':
-                case 'B':
-                        number = 11;
-                        break;
-                case 'c':
-                case 'C':
-                        number = 12;
-                        break;
-                case 'd':
-                case 'D':
-                        number = 13;
-                        break;
-                case 'e':
-                case 'E':
-                        number = 14;
-                        break; 
-                case 'f':
-                case 'F':
-                        number = 15;
-                        break; 
-                default:
-                        return (0);
-                }
-                factor = 1 << ((strlen (string) - i) * 4);
-                tag += (number * factor);
-        }
+	/* Is the string a tag's name? */
+	if ((tag = exif_tag_from_name (string)) != 0)
+		return (tag);
 
-        return (tag);
+	/* Is the string a tag's title? */
+	for (tag = 0xffff; (int)tag > 0; tag--) {
+		name = exif_tag_get_title (tag);
+		if (name && !strcmp (string, name))
+			return (tag);
+	}
+	return (0xffff);
 }
 
 ExifIfd

[libexif-cvs] libexif/libexif exif-data.c,1.106,1.107

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

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

Modified Files:
	exif-data.c 
Log Message:
Fixed an out of memory handling issue.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -d -r1.106 -r1.107
--- exif-data.c	1 Feb 2008 23:14:50 -0000	1.106
+++ exif-data.c	10 Feb 2008 06:12:54 -0000	1.107
@@ -536,8 +536,11 @@ exif_data_save_data_content (ExifData *d
 	exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
 		  "Saving %i entries (IFD '%s', offset: %i)...",
 		  ifd->count, exif_ifd_get_name (i), offset);
-	for (j = 0; j < ifd->count; j++)
+	for (j = 0; j < ifd->count; j++) {
 		exif_data_save_data_entry (data, ifd->entries[j], d, ds, offset + 12 * j);
+		if (!*d)
+			return;	/* out of memory */
+	}
 
 	offset += 12 * ifd->count;
 

[libexif-cvs] exif/exif main.c,1.60,1.61

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

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

Modified Files:
	main.c 
Log Message:
Cleaned up more consistently at exit.  Improved out of memory handling.
Added ENABLE_GLIBC_MEMDEBUG macro to allow some glibc memory checking
features to be manually enabled.


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -d -r1.60 -r1.61
--- main.c	1 Feb 2008 22:47:21 -0000	1.60
+++ main.c	10 Feb 2008 05:25:06 -0000	1.61
@@ -46,6 +46,10 @@
 #  include <locale.h>
 #endif
 
+#ifdef ENABLE_GLIBC_MEMDEBUG
+#include <mcheck.h>
+#endif
+
 /* Old versions of popt.h don't define POPT_TABLEEND */
 #ifndef POPT_TABLEEND
 #  define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL }
@@ -367,7 +371,7 @@ main (int argc, const char **argv)
 	poptContext ctx;
 	const char **args, *output = NULL;
 	const char *ithumbnail = NULL;
-	struct poptOption options[] = {
+	const struct poptOption options[] = {
 		POPT_AUTOHELP
     {"version", 'v', POPT_ARG_NONE, &show_version, 0,
       N_("Display software version"), NULL},
@@ -410,6 +414,11 @@ main (int argc, const char **argv)
 	FILE *f;
 	ExifLog *log = NULL;
 
+#ifdef ENABLE_GLIBC_MEMDEBUG
+	mcheck(NULL);
+	mtrace();
+#endif
+
 #ifdef ENABLE_NLS
 #ifdef HAVE_LOCALE_H
 	setlocale (LC_ALL, "");
@@ -423,6 +432,13 @@ main (int argc, const char **argv)
 	while (poptGetNextOpt (ctx) > 0)
 		;
 
+	/* Any command line parameters ? */
+	if (argc <= 1) {
+		poptPrintHelp (ctx, stdout, 0);
+		poptFreeContext(ctx);
+		return (1);
+	}
+
 	/*
 	 * When debugging, continue as far as possible. If not, make all errors
 	 * fatal.
@@ -430,19 +446,13 @@ main (int argc, const char **argv)
 	log = exif_log_new ();
 	exif_log_set_func (log, debug ? log_func : log_func_exit, NULL);
 
-	/* Any command line parameters ? */
-	if (argc <= 1) {
-		poptPrintHelp (ctx, stdout, 0);
+	if (show_version) {
+		printf ("%s\n", VERSION);
+		exif_log_free(log);
 		poptFreeContext(ctx);
-		return (1);
+		return 0;
 	}
 
-  if (show_version) {
-    printf ("%s\n", VERSION);
-    poptFreeContext(ctx);
-    return 0;
-  }
-
 	if (ifd_string) {
 		ifd = exif_ifd_from_string (ifd_string);
 		if ((ifd < EXIF_IFD_0) || (ifd >= EXIF_IFD_COUNT) ||
@@ -472,6 +482,9 @@ main (int argc, const char **argv)
 			C(exif_tag_get_name_in_ifd (eo.tag, ifd)));
 		printf ("%s\n",
 			C(exif_tag_get_description_in_ifd (eo.tag, ifd)));
+
+		exif_log_free(log);
+		poptFreeContext(ctx);
 		return (0);
 	}
 
@@ -513,6 +526,7 @@ main (int argc, const char **argv)
 
 			if (list_tags) {
 				action_tag_table (*args, ed);
+
 			} else if (tag && !set_value && !remove_tag) {
 				if ((ifd >= EXIF_IFD_0) &&
 				    (ifd < EXIF_IFD_COUNT)) {
@@ -526,6 +540,7 @@ main (int argc, const char **argv)
 				} else {
 					search_entry (ed, eo.tag, machine_readable);
 				}
+
 			} else if (extract_thumbnail) {
 
 				/* No thumbnail? Exit. */
@@ -625,6 +640,7 @@ main (int argc, const char **argv)
                                 convert_arg_to_entry (set_value, e,
 						exif_data_get_byte_order (ed));
 				save_exif_data_to_file (ed, log, *args, fname);
+
 			} else if (remove_tag) {
 				
 				/* We need an IFD. */
@@ -654,10 +670,13 @@ main (int argc, const char **argv)
 
 			} else if (machine_readable) {
 				action_tag_list_machine (*args, ed, eo.use_ids);
+
 			} else if (xml_output) {
 				action_tag_list_xml (*args, ed, eo.use_ids);
+
 			} else if (list_mnote) {
 				action_mnote_list (*args, ed, eo.use_ids);
+
 			} else
 				action_tag_list (*args, ed, eo.use_ids);
 
@@ -666,6 +685,7 @@ main (int argc, const char **argv)
 		}
 	} else {
 		poptPrintHelp (ctx, stdout, 0);
+		exif_log_free(log);
 		poptFreeContext(ctx);
 		return(1);
 	}

[libexif-cvs] exif/libjpeg jpeg-data.c,1.19,1.20

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

Update of /cvsroot/libexif/exif/libjpeg
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24562/libjpeg

Modified Files:
	jpeg-data.c 
Log Message:
Cleaned up more consistently at exit.  Improved out of memory handling.
Added ENABLE_GLIBC_MEMDEBUG macro to allow some glibc memory checking
features to be manually enabled.


Index: jpeg-data.c
===================================================================
RCS file: /cvsroot/libexif/exif/libjpeg/jpeg-data.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -d -r1.19 -r1.20
--- jpeg-data.c	21 May 2007 16:09:27 -0000	1.19
+++ jpeg-data.c	10 Feb 2008 05:25:07 -0000	1.20
@@ -30,6 +30,13 @@
  */
 #include "exif/exif-i18n.h"
 
+/* realloc that cleans up on memory failure and returns to caller */
+#define CLEANUP_REALLOC(p,s) { \
+	unsigned char *cleanup_ptr = realloc((p),(s)); \
+	if (!cleanup_ptr) { free(p); (p) = NULL; return; } \
+	(p) = cleanup_ptr; \
+}
+
 struct _JPEGDataPrivate
 {
 	unsigned int ref_count;
@@ -125,7 +132,7 @@ jpeg_data_save_data (JPEGData *data, uns
 		s = data->sections[i];
 
 		/* Write the marker */
-		*d = realloc (*d, sizeof (char) * (*ds + 2));
+		CLEANUP_REALLOC (*d, sizeof (char) * (*ds + 2));
 		(*d)[*ds + 0] = 0xff;
 		(*d)[*ds + 1] = s.marker;
 		*ds += 2;
@@ -137,17 +144,17 @@ jpeg_data_save_data (JPEGData *data, uns
 		case JPEG_MARKER_APP1:
 			exif_data_save_data (s.content.app1, &ed, &eds);
 			if (!ed) break;
-			*d = realloc (*d, sizeof (char) * (*ds + 2));
+			CLEANUP_REALLOC (*d, sizeof (char) * (*ds + 2));
 			(*d)[*ds + 0] = (eds + 2) >> 8;
 			(*d)[*ds + 1] = (eds + 2) >> 0;
 			*ds += 2;
-			*d = realloc (*d, sizeof (char) * (*ds + eds));
+			CLEANUP_REALLOC (*d, sizeof (char) * (*ds + eds));
 			memcpy (*d + *ds, ed, eds);
 			*ds += eds;
 			free (ed);
 			break;
 		default:
-			*d = realloc (*d, sizeof (char) *
+			CLEANUP_REALLOC (*d, sizeof (char) *
 					(*ds + s.content.generic.size + 2));
 			(*d)[*ds + 0] = (s.content.generic.size + 2) >> 8;
 			(*d)[*ds + 1] = (s.content.generic.size + 2) >> 0;
@@ -158,7 +165,7 @@ jpeg_data_save_data (JPEGData *data, uns
 
 			/* In case of SOS, we need to write the data. */
 			if (s.marker == JPEG_MARKER_SOS) {
-				*d = realloc (*d, *ds + data->size);
+				CLEANUP_REALLOC (*d, *ds + data->size);
 				memcpy (*d + *ds, data->data, data->size);
 				*ds += data->size;
 			}
@@ -230,9 +237,10 @@ jpeg_data_load_data (JPEGData *data, con
 							d + o - 4, len + 4);
 				break;
 			default:
-				s->content.generic.size = len;
 				s->content.generic.data =
 						malloc (sizeof (char) * len);
+				if (!s->content.generic.data) return;
+				s->content.generic.size = len;
 				memcpy (s->content.generic.data, &d[o], len);
 
 				/* In case of SOS, image data will follow. */
@@ -248,6 +256,7 @@ jpeg_data_load_data (JPEGData *data, con
 					}
 					data->data = malloc (
 						sizeof (char) * data->size);
+					if (!data->data) return;
 					memcpy (data->data, d + o + len,
 						data->size);
 					o += data->size;

[libexif-cvs] exif exif.1,1.8,1.9

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

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

Modified Files:
	exif.1 
Log Message:
Fixed some erroneous information for the --list-tags option.


Index: exif.1
===================================================================
RCS file: /cvsroot/libexif/exif/exif.1,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -d -r1.8 -r1.9
--- exif.1	8 Feb 2008 23:44:10 -0000	1.8
+++ exif.1	9 Feb 2008 23:57:08 -0000	1.9
@@ -61,8 +61,9 @@ Valid IFDs are "0", "1", "EXIF", "GPS", 
 Defaults to "0".
 .TP
 .BI "\-l, \-\-list\-tags"
-List all known EXIF tags.  A JPEG file with valid EXIF information must
-be given to use this option, but its contents are ignored.
+List all known EXIF tags and IFDs.  A JPEG image must be provided, and
+those tags which appear in the file are shown with an asterisk in the
+corresponding position in the list.
 .TP
 .BI "\-|, \-\-show\-mnote"
 Show the contents of the MakerNote tag.  The contents of this tag are nonstandard

[libexif-cvs] exif/po sv.po,1.1,1.2

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

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

Modified Files:
	sv.po 
Log Message:
Updated Swedish translation from Daniel Nylander


Index: sv.po
===================================================================
RCS file: /cvsroot/libexif/exif/po/sv.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- sv.po	10 Jan 2008 06:19:40 -0000	1.1
+++ sv.po	9 Feb 2008 20:42:41 -0000	1.2
@@ -1,19 +1,20 @@
 # Swedish translation for exif
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the exif package.
-# Daniel Nylander <po...@da...>, 2007.
+# Daniel Nylander <po...@da...>, 2007, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: exif\n"
+"Project-Id-Version: exif 0.6.16-pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-29 17:59+0200\n"
-"PO-Revision-Date: 2007-08-29 17:57+0100\n"
+"POT-Creation-Date: 2008-01-21 14:29-0800\n"
+"PO-Revision-Date: 2008-02-09 20:51+0100\n"
 "Last-Translator: Daniel Nylander <po...@da...>\n"
 "Language-Team: Swedish <tp...@li...>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: exif/actions.c:45
 #, c-format
@@ -32,248 +33,256 @@ msgstr "MakerNote innehåller inget vär
 
 #: exif/actions.c:124
 #, c-format
-msgid "MakerNote contains 1 value:\n"
-msgstr "MakerNote innehåller ett värde:\n"
-
-#: exif/actions.c:127
-#, c-format
-msgid "MakerNote contains %i values:\n"
-msgstr "MakerNote innehåller %i värden:\n"
+msgid "MakerNote contains %i value:\n"
+msgid_plural "MakerNote contains %i values:\n"
+msgstr[0] "MakerNote innehåller %i värde:\n"
+msgstr[1] "MakerNote innehåller %i värden:\n"
 
-#: exif/actions.c:135
+#: exif/actions.c:134
 msgid "Unknown tag"
 msgstr "Okänd tagg"
 
-#: exif/actions.c:138
+#: exif/actions.c:137
 msgid "Unknown value"
 msgstr "Okänt värde"
 
-#: exif/actions.c:163
+#: exif/actions.c:162
 #, c-format
 msgid "EXIF tags in '%s' ('%s' byte order):"
 msgstr "EXIF-taggar i \"%s\" (\"%s\" byteordning):"
 
-#: exif/actions.c:168 exif/actions.c:170
+#: exif/actions.c:167 exif/actions.c:169
 msgid "Tag"
 msgstr "Tagg"
 
-#: exif/actions.c:174 exif/actions.c:176 exif/main.c:353
+#: exif/actions.c:173 exif/actions.c:175 exif/main.c:361
 msgid "Value"
 msgstr "Värde"
 
-#: exif/actions.c:182
+#: exif/actions.c:181
 #, c-format
 msgid "EXIF data contains a thumbnail (%i bytes)."
 msgstr "EXIF-data innehåller en miniatyrbild (%i byte)."
 
-#: exif/actions.c:218
+#: exif/actions.c:217
 #, c-format
 msgid "ThumbnailSize\t%i\n"
 msgstr "Miniatyrbildsstorlek\t%i\n"
 
-#: exif/main.c:55
+#: exif/main.c:57
 #, c-format
 msgid "Internal error. Please contact <%s>."
 msgstr "Internt fel. Kontakta <%s>."
 
-#: exif/main.c:74
+#: exif/main.c:80
 #, c-format
-msgid "EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':"
-msgstr "EXIF-posten \"%s\" (0x%x, \"%s\") finns i IFD \"%s\":"
+msgid "EXIF entry '%s' "
+msgstr "EXIF-post \"%s\" "
 
-#: exif/main.c:112
+#: exif/main.c:82
+#, c-format
+msgid "(0x%x, '%s') "
+msgstr "(0x%x, \"%s\") "
+
+#: exif/main.c:85
+#, c-format
+msgid "exists in IFD '%s':\n"
+msgstr "finns i IFD \"%s\":\n"
+
+#: exif/main.c:120
 #, c-format
 msgid "Not enough memory."
 msgstr "Inte tillräckligt mycket minne."
 
-#: exif/main.c:130
+#: exif/main.c:138
 #, c-format
 msgid "Too few components specified!"
 msgstr "För få komponenter angivna!"
 
-#: exif/main.c:160
+#: exif/main.c:168
 #, c-format
 msgid "Not yet implemented!"
 msgstr "Ännu inte implementerat!"
 
-#: exif/main.c:233
+#: exif/main.c:241
 #, c-format
 msgid "Too much EXIF data (%i bytes). Only %i bytes are allowed."
 msgstr "För mycket EXIF-data (%i byte). Endast %i byte tillåts."
 
-#: exif/main.c:247 exif/main.c:499
+#: exif/main.c:255 exif/main.c:513
 #, c-format
 msgid "Wrote file '%s'."
 msgstr "Skrev filen \"%s\"."
 
-#: exif/main.c:329
+#: exif/main.c:337
 msgid "Display software version"
 msgstr "Visa programvaruversion"
 
-#: exif/main.c:331
+#: exif/main.c:339
 msgid "Show IDs instead of tag names"
 msgstr "Visa id:n istället för taggnamn"
 
-#: exif/main.c:333
+#: exif/main.c:341
 msgid "Select tag"
 msgstr "Välj tagg"
 
-#: exif/main.c:333
+#: exif/main.c:341
 msgid "tag"
 msgstr "tagg"
 
-#: exif/main.c:335
+#: exif/main.c:343
 msgid "Select IFD"
 msgstr "Välj IFD"
 
-#: exif/main.c:335
+#: exif/main.c:343
 msgid "IFD"
 msgstr "IFD"
 
-#: exif/main.c:337
+#: exif/main.c:345
 msgid "List all EXIF tags"
 msgstr "Lista alla EXIF-taggar"
 
-#: exif/main.c:339
+#: exif/main.c:347
 msgid "Show contents of tag MakerNote"
 msgstr "Visa innehållet i taggen MakerNote"
 
-#: exif/main.c:341
+#: exif/main.c:349
 msgid "Remove tag or ifd"
 msgstr "Ta bort tagg eller ifd"
 
-#: exif/main.c:343
+#: exif/main.c:351
 msgid "Show description of tag"
 msgstr "Visa beskrivning av tagg"
 
-#: exif/main.c:345
+#: exif/main.c:353
 msgid "Extract thumbnail"
 msgstr "Extrahera miniatyrbild"
 
-#: exif/main.c:347
+#: exif/main.c:355
 msgid "Remove thumbnail"
 msgstr "Ta bort miniatyrbild"
 
-#: exif/main.c:349
+#: exif/main.c:357
 msgid "Insert FILE as thumbnail"
 msgstr "Infoga FIL som miniatyrbild"
 
-#: exif/main.c:349 exif/main.c:351
+#: exif/main.c:357 exif/main.c:359
 msgid "FILE"
 msgstr "FIL"
 
-#: exif/main.c:351
+#: exif/main.c:359
 msgid "Write data to FILE"
 msgstr "Skriv data till FIL"
 
-#: exif/main.c:355
+#: exif/main.c:363
 msgid "Output in a machine-readable (tab delimited) format"
 msgstr "Skriv ut i ett läsbart format (tabulatoravgränsat)"
 
-#: exif/main.c:358
+#: exif/main.c:366
 msgid "Output in a XML format"
 msgstr "Skriv ut i ett XML-format"
 
-#: exif/main.c:361
+#: exif/main.c:369
 msgid "Show debugging messages"
 msgstr "Visa felsökningsmeddelanden"
 
-#: exif/main.c:378
+#: exif/main.c:386
 msgid "[OPTION...] file"
 msgstr "[FLAGGA...] fil"
 
-#: exif/main.c:406
+#: exif/main.c:414
 #, c-format
-msgid ""
-"Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and "
-"'Interoperability'."
-msgstr ""
-"Ogiltig IFD \"%s\". Giltiga IFD:er är \"0\", \"1\", \"EXIF\", \"GPS\" och "
-"\"Interoperability\"."
+msgid "Invalid IFD '%s'. Valid IFDs are '0', '1', 'EXIF', 'GPS', and 'Interoperability'."
+msgstr "Ogiltig IFD \"%s\". Giltiga IFD:er är \"0\", \"1\", \"EXIF\", \"GPS\" och \"Interoperability\"."
 
-#: exif/main.c:414
+#: exif/main.c:422
 #, c-format
 msgid "Invalid tag '%s'!"
 msgstr "Ogiltig tagg \"%s\"!"
 
-#: exif/main.c:419
+#: exif/main.c:427
 msgid "Please specify a tag!"
 msgstr "Ange en tagg!"
 
-#: exif/main.c:420
+#: exif/main.c:432
 #, c-format
-msgid "Tag '%s' (0x%04x, '%s'): %s"
-msgstr "Tagg \"%s\" (0x%04x, \"%s\"): %s"
+msgid "Tag '%s' "
+msgstr "Tagg \"%s\" "
 
-#: exif/main.c:449
+#: exif/main.c:434
+#, c-format
+msgid "(0x%04x, '%s'): "
+msgstr "(0x%04x, \"%s\"): "
+
+#: exif/main.c:463
 #, c-format
 msgid "'%s' does not contain EXIF data!"
 msgstr "\"%s\" innehåller inget EXIF-data!"
 
-#: exif/main.c:472
+#: exif/main.c:486
 #, c-format
 msgid "IFD '%s' does not contain tag '%s'."
 msgstr "IFD:n \"%s\" innehåller inte taggen \"%s\"."
 
-#: exif/main.c:481
+#: exif/main.c:495
 #, c-format
 msgid "'%s' does not contain a thumbnail!"
 msgstr "\"%s\" innehåller inte en miniatyrbild!"
 
-#: exif/main.c:489
+#: exif/main.c:503
 #, c-format
 msgid "Could not open '%s' for writing (%m)!"
 msgstr "Kunde inte öppna \"%s\" för skrivning (%m)!"
 
-#: exif/main.c:493
+#: exif/main.c:507
 #, c-format
 msgid "Could not open '%s' for writing (%s)!"
 msgstr "Kunde inte öppna \"%s\" för skrivning (%s)!"
 
-#: exif/main.c:528
+#: exif/main.c:542
 #, c-format
 msgid "Could not open '%s' (%m)!"
 msgstr "Kunde inte öppna \"%s\" (%m)!"
 
-#: exif/main.c:531
+#: exif/main.c:545
 #, c-format
 msgid "Could not open '%s' (%s)!"
 msgstr "Kunde inte öppna \"%s\" (%s)!"
 
-#: exif/main.c:543
+#: exif/main.c:557
 #, c-format
 msgid "Could not read '%s' (%m)."
 msgstr "Kunde inte läsa \"%s\" (%m)."
 
-#: exif/main.c:546
+#: exif/main.c:560
 #, c-format
 msgid "Could not read '%s' (%s)."
 msgstr "Kunde inte läsa \"%s\" (%s)."
 
-#. We need a tag...
-#: exif/main.c:557
+#: exif/main.c:571
 msgid "You need to specify a tag!"
 msgstr "Du måste ange en tagg!"
 
-#: exif/main.c:562 exif/main.c:581
+#: exif/main.c:576 exif/main.c:595
 msgid "You need to specify an IFD!"
 msgstr "Du måste ange en IFD!"
 
-#: exif/main.c:593
+#: exif/main.c:607
 #, c-format
 msgid "IFD '%s' does not contain a tag '%s'!"
 msgstr "IFD:n \"%s\" innehåller inte taggen \"%s\"!"
 
-#: ../libjpeg/jpeg-data.c:203
-msgid "Data does not follow JPEG specification."
-msgstr "Data följer inte JPEG-specifikationen."
+#~ msgid "MakerNote contains 1 value:\n"
+#~ msgstr "MakerNote innehåller ett värde:\n"
 
-#: ../libjpeg/jpeg-data.c:286
-#, c-format
-msgid "Path '%s' invalid."
-msgstr "Sökvägen \"%s\" är ogiltig."
+#~ msgid "EXIF entry '%s' (0x%x, '%s') exists in IFD '%s':"
+#~ msgstr "EXIF-posten \"%s\" (0x%x, \"%s\") finns i IFD \"%s\":"
 
-#: ../libjpeg/jpeg-data.c:304
-#, c-format
-msgid "Could not read '%s'."
-msgstr "Kunde inte läsa \"%s\"."
+#~ msgid "Data does not follow JPEG specification."
+#~ msgstr "Data följer inte JPEG-specifikationen."
+
+#~ msgid "Path '%s' invalid."
+#~ msgstr "Sökvägen \"%s\" är ogiltig."
+
+#~ msgid "Could not read '%s'."
+#~ msgstr "Kunde inte läsa \"%s\"."

[libexif-cvs] exif exif.1,1.7,1.8

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

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

Modified Files:
	exif.1 
Log Message:
Man page updates from Benno Schulenberg.


Index: exif.1
===================================================================
RCS file: /cvsroot/libexif/exif/exif.1,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -d -r1.7 -r1.8
--- exif.1	1 Feb 2008 22:50:33 -0000	1.7
+++ exif.1	8 Feb 2008 23:44:10 -0000	1.8
@@ -15,8 +15,9 @@
 .\" Modified 2002-09-08 by thomas
 .\" Modified 2005-03-23 by hun
 .\" Modified 2008-01-24 by dfandrich
+.\" Modified 2008-02-05 by Benno Schulenberg
 .\"
-.TH exif 1 "2008-02-01" "" "libexif command line frontend"
+.TH exif 1 "2008-02-05" "" "libexif command line frontend"
 .SH "NAME"
 exif \- shows EXIF information in JPEG files
 .SH "SYNOPSIS"
@@ -27,7 +28,7 @@ is a small command-line utility to show 
 .PP
 Most digital cameras produce EXIF files, which are JPEG files with extra tags that contain information about the image. The
 .B "exif"
-command line utility allows you to read EXIF information from and write EXIF information to those files.
+command-line utility allows you to read EXIF information from and write EXIF information to those files.
 .B "exif"
 internally uses the
 .B "libexif"
@@ -39,23 +40,24 @@ file is not readable or does not contain
 .SH "OPTIONS"
 .TP
 .BI "\-v, \-\-version"
-Display the exif version number
+Display the exif version number.
 .TP
 .BI "\-i, \-\-ids"
-Show ID numbers instead of tag names
+Show ID numbers instead of tag names.
 .TP
-.BI "\-t, \-\-tag=" "tag"
-Select only the given EXIF
-.I "tag"
-which is the textual short tag name, tag title, or numeric tag number
+.BI "\-t, \-\-tag=" "TAG"
+Select only this
+.IR "TAG" .
+.I "TAG"
+is the tag title, the short tag name, or the tag number
 (hexadecimal numbers are prefixed with 0x), from the IFD specified
-with \-\-ifd.  The tag title is dependent on the current locale, whereas the
+with \-\-ifd.  The tag title is dependent on the current locale, whereas
 name and number are locale-independent.
 .TP
 .BI "\-\-ifd=" "IFD"
-Select
-.I "IFD"
-where valid IFDs are "0", "1", "EXIF", "GPS", and "Interoperability".
+Select a tag from this
+.IR "IFD" .
+Valid IFDs are "0", "1", "EXIF", "GPS", and "Interoperability".
 Defaults to "0".
 .TP
 .BI "\-l, \-\-list\-tags"
@@ -63,60 +65,62 @@ List all known EXIF tags.  A JPEG file w
 be given to use this option, but its contents are ignored.
 .TP
 .BI "\-|, \-\-show\-mnote"
-Show contents of tag MakerNote. The contents of this tag is nonstandard (and
-often undocumented) and may therefore not be recognized, or if it is
-recognized it may not be necessarily correctly interpreted.
+Show the contents of the MakerNote tag.  The contents of this tag are nonstandard
+(and often undocumented) and may therefore not be recognized, or if they are
+recognized they may not necessarily be interpreted correctly.
 .TP
 .BI "\-\-remove"
-Remove tag or entire IFD (if no tag is specified).
+Remove the tag or (if no tag is specified) the entire IFD.
 .TP
 .BI "\-s, \-\-show\-description"
 Show description of tag.  The \-\-tag option must also be given.
 .TP
 .BI "\-e, \-\-extract\-thumbnail"
-Extract thumbnail, writing the thumbnail image to the file specified
+Extract the thumbnail, writing the thumbnail image to the file specified
 with \-\-output.
 .TP
 .BI "\-r, \-\-remove\-thumbnail"
-Remove thumbnail from image, writing the new image to the file specified
+Remove the thumbnail from the image, writing the new image to the file specified
 with \-\-output.
 .TP
 .BI "-n, \-\-insert\-thumbnail=" "FILE"
 Insert
 .I "FILE"
-as thumbnail.  No attempt is made to ensure that the contents of "FILE" is
-in a valid thumbnail format.
+as thumbnail.  No attempt is made to ensure that the contents of
+.I "FILE"
+are in a valid thumbnail format.
 .TP
 .BI "\-o, \-\-output=" "FILE"
 Write output image to
 .IR "FILE" .
 If this option is not given and an image file must be written, the
-name used is the same as the input file with a suffix ".modified.jpeg".
+name used is the same as the input file with the suffix ".modified.jpeg".
 .TP
 .BI "\-\-set\-value=" "VALUE"
-Set the data for the tag specified with \-\-tag and \-\-ifd to "VALUE".
+Set the data for the tag specified with \-\-tag and \-\-ifd to
+.IR "VALUE" .
 Compound values consisting of multiple components are separated with
 spaces.
 .TP
 .BI "\-m, \-\-machine\-readable"
-Output in machine-readable (tab delimited) format
+Produce output in a machine-readable (tab-delimited) format.
 The \-\-xml-output and \-\-machine\-readable options are mutually exclusive.
 .TP
 .BI "\-x, \-\-xml-output"
-Output in an XML format (when possible).
+Produce output in an XML format (when possible).
 The \-\-xml-output and \-\-machine\-readable options are mutually exclusive.
 .TP
 .BI "\-d, \-\-debug"
-Show debugging messages
+Show debugging messages.
 .SS "Help options"
 .TP
 .BI "\-?, \-\-help"
-Show help message
+Show help message.
 .TP
 .BI "\-\-usage"
-Display brief usage message
+Display brief usage message.
 .SH "AUTHOR"
-Written by Lutz Mueller <lu...@us...>
+Written by Lutz Mueller <lu...@us...>.
 .SH "SEE ALSO"
 .UR "http://www.sourceforge.net/projects/libexif"
 .BR "http://www.sourceforge.net/projects/libexif"

[libexif-cvs] exif/po nl.po,1.1,1.2

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

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

Modified Files:
	nl.po 
Log Message:
Updated Dutch translation by Erwin Poeze.


Index: nl.po
===================================================================
RCS file: /cvsroot/libexif/exif/po/nl.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- nl.po	29 Jan 2008 20:53:09 -0000	1.1
+++ nl.po	2 Feb 2008 16:14:17 -0000	1.2
@@ -58,17 +58,17 @@ msgstr "Tag"
 
 #: exif/actions.c:173 exif/actions.c:175 exif/main.c:361
 msgid "Value"
-msgstr "Waarde"
+msgstr "waarde"
 
 #: exif/actions.c:181
 #, c-format
 msgid "EXIF data contains a thumbnail (%i bytes)."
-msgstr "EXIF-gegevens bevatten een thumbnail (%i bytes)."
+msgstr "EXIF-gegevens bevatten een miniatuur (%i bytes)."
 
 #: exif/actions.c:217
 #, c-format
 msgid "ThumbnailSize\t%i\n"
-msgstr "Thumbnailgrootte\t%i\n"
+msgstr "Miniatuurgrootte\t%i\n"
 
 #: exif/main.c:57
 #, c-format
@@ -113,11 +113,11 @@ msgstr "Te veel EXIF-gegevens (%i bytes)
 #: exif/main.c:255 exif/main.c:513
 #, c-format
 msgid "Wrote file '%s'."
-msgstr "Bestand '%s' aangemaakt."
+msgstr "Bestand '%s' is aangemaakt."
 
 #: exif/main.c:337
 msgid "Display software version"
-msgstr "Programmaversie tonen"
+msgstr "programmaversie tonen"
 
 #: exif/main.c:339
 msgid "Show IDs instead of tag names"
@@ -125,7 +125,7 @@ msgstr "ID's in plaats van tagnamen tone
 
 #: exif/main.c:341
 msgid "Select tag"
-msgstr "Selecteer tag"
+msgstr "deze tag selecteren"
 
 #: exif/main.c:341
 msgid "tag"
@@ -133,7 +133,7 @@ msgstr "tag"
 
 #: exif/main.c:343
 msgid "Select IFD"
-msgstr "Selecteer IFD"
+msgstr "deze IFD selecteren"
 
 #: exif/main.c:343
 msgid "IFD"
@@ -141,31 +141,31 @@ msgstr "IFD"
 
 #: exif/main.c:345
 msgid "List all EXIF tags"
-msgstr "Alle EXIF-tags tonen"
+msgstr "alle EXIF-tags tonen"
 
 #: exif/main.c:347
 msgid "Show contents of tag MakerNote"
-msgstr "Inhoud van de tag MakerNote tonen"
+msgstr "inhoud van de tag MakerNote tonen"
 
 #: exif/main.c:349
 msgid "Remove tag or ifd"
-msgstr "Tag of IFD verwijderen"
+msgstr "tag of IFD verwijderen"
 
 #: exif/main.c:351
 msgid "Show description of tag"
-msgstr "Beschrijving van tag tonen"
+msgstr "beschrijving van tag tonen"
 
 #: exif/main.c:353
 msgid "Extract thumbnail"
-msgstr "Thumbnail uitlezen"
+msgstr "miniatuur uitlezen"
 
 #: exif/main.c:355
 msgid "Remove thumbnail"
-msgstr "Thumbnail verwijderen"
+msgstr "miniatuur verwijderen"
 
 #: exif/main.c:357
 msgid "Insert FILE as thumbnail"
-msgstr "BESTAND als thumbnail toevoegen"
+msgstr "BESTAND als miniatuur toevoegen"
 
 #: exif/main.c:357 exif/main.c:359
 msgid "FILE"
@@ -173,19 +173,19 @@ msgstr "BESTAND"
 
 #: exif/main.c:359
 msgid "Write data to FILE"
-msgstr "Gegevens naar BESTAND schrijven"
+msgstr "gegevens naar BESTAND schrijven"
 
 #: exif/main.c:363
 msgid "Output in a machine-readable (tab delimited) format"
-msgstr "Uitvoer in een machineleesbaar (tabgescheiden) formaat"
+msgstr "machineleesbare uitvoer produceren (tabgescheiden)"
 
 #: exif/main.c:366
 msgid "Output in a XML format"
-msgstr "Uitvoer in een XML-formaat"
+msgstr "XML-uitvoer produceren"
 
 #: exif/main.c:369
 msgid "Show debugging messages"
-msgstr "Debugmeldingen tonen"
+msgstr "debugmeldingen tonen"
 
 #: exif/main.c:386
 msgid "[OPTION...] file"
@@ -228,7 +228,7 @@ msgstr "IFD '%s' bevat geen tag '%s'."
 #: exif/main.c:495
 #, c-format
 msgid "'%s' does not contain a thumbnail!"
-msgstr "'%s' bevat geen thumbnail!"
+msgstr "'%s' bevat geen miniatuur!"
 
 #: exif/main.c:503
 #, c-format

[libexif-cvs] libexif/libexif exif-data.c, 1.105, 1.106 exif-loader.c, 1.26, 1.27

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

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

Modified Files:
	exif-data.c exif-loader.c 
Log Message:
Fixed an error checking weakness reported in bug #1536244. It looks like
that particular bug was actually solved earlier, but this doesn't hurt.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -d -r1.105 -r1.106
--- exif-data.c	16 Dec 2007 16:59:30 -0000	1.105
+++ exif-data.c	1 Feb 2008 23:14:50 -0000	1.106
@@ -916,14 +916,19 @@ exif_data_load_data (ExifData *data, con
 void
 exif_data_save_data (ExifData *data, unsigned char **d, unsigned int *ds)
 {
+	if (ds)
+		*ds = 0;	/* This means something went wrong */
+
 	if (!data || !d || !ds)
 		return;
 
 	/* Header */
 	*ds = 14;
 	*d = exif_data_alloc (data, *ds);
-	if (!*d) 
+	if (!*d)  {
+		*ds = 0;
 		return;
+	}
 	memcpy (*d, ExifHeader, 6);
 
 	/* Order (offset 6) */

Index: exif-loader.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -d -r1.26 -r1.27
--- exif-loader.c	14 Dec 2007 19:53:53 -0000	1.26
+++ exif-loader.c	1 Feb 2008 23:14:50 -0000	1.27
@@ -381,7 +381,7 @@ exif_loader_get_data (ExifLoader *loader
 {
 	ExifData *ed;
 
-	if (!loader) 
+	if (!loader || (loader->data_format == EL_DATA_FORMAT_UNKNOWN))
 		return NULL;
 
 	ed = exif_data_new_mem (loader->mem);

[libexif-cvs] exif/exif main.c,1.59,1.60

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

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

Modified Files:
	main.c 
Log Message:
Fixed an inconsequential memory leak.


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -d -r1.59 -r1.60
--- main.c	24 Jan 2008 21:36:41 -0000	1.59
+++ main.c	1 Feb 2008 22:47:21 -0000	1.60
@@ -273,13 +273,13 @@ save_exif_data_to_file (ExifData *ed, Ex
 	/* Make sure the EXIF data is not too big. */
 	exif_data_save_data (ed, &d, &ds);
 	if (ds) {
+		free (d);
 		if (ds > 0xffff) {
 			fprintf (stderr, _("Too much EXIF data (%i bytes). "
 				"Only %i bytes are allowed."), ds, 0xffff);
 			fputc ('\n', stderr);
 			return (1);
 		}
-		free (d);
 	};
 
 	jpeg_data_set_exif_data (jdata, ed);
@@ -495,9 +495,11 @@ main (int argc, const char **argv)
 						ed->ifd[EXIF_IFD_1]->count ||
 						ed->ifd[EXIF_IFD_EXIF]->count ||
 						ed->ifd[EXIF_IFD_GPS]->count ||
-						ed->ifd[EXIF_IFD_INTEROPERABILITY]->count))
+						ed->ifd[EXIF_IFD_INTEROPERABILITY]->count)) {
 				exif_log (log, -1, "exif", _("'%s' does not "
 							"contain EXIF data!"), *args);
+				/* Never gets here--exif_log has exit()ed */
+			}
 
 			/* Where do we save the output? */
 			memset (fname, 0, sizeof (fname));
@@ -658,6 +660,7 @@ main (int argc, const char **argv)
 				action_mnote_list (*args, ed, eo.use_ids);
 			} else
 				action_tag_list (*args, ed, eo.use_ids);
+
 			exif_data_unref (ed);
 			args++;
 		}

[libexif-cvs] libexif NEWS,1.35,1.36

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

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

Modified Files:
	NEWS 
Log Message:
Fixed an error checking weakness reported in bug #1536244. It looks like
that particular bug was actually solved earlier, but this doesn't hurt.


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -d -r1.35 -r1.36
--- NEWS	24 Jan 2008 01:16:27 -0000	1.35
+++ NEWS	1 Feb 2008 23:14:50 -0000	1.36
@@ -2,7 +2,7 @@ libexif-0.6.16.2:
   * Updated translations: cs, de, pl, sk, vi
   * New translations: nl, se, en_CA
   * Enabled sv translation by default
-  * Bug fixes: #1773810, #1774626, CVE-2007-6351, CVE-2007-6352
+  * Bug fixes: #1773810, #1774626, #1536244, CVE-2007-6351, CVE-2007-6352
   * Enhanced support of Canon and Olympus makernotes 
   * Added support for Fuji and Sanyo makernotes
   * Added support for the NO_VERBOSE_TAG_STRINGS and NO_VERBOSE_TAG_DATA

[libexif-cvs] exif exif.1,1.6,1.7

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

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

Modified Files:
	exif.1 
Log Message:
exif can handle multiple files on the command line.
Document that tag titles are locale-dependent.


Index: exif.1
===================================================================
RCS file: /cvsroot/libexif/exif/exif.1,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -d -r1.6 -r1.7
--- exif.1	24 Jan 2008 21:27:52 -0000	1.6
+++ exif.1	1 Feb 2008 22:50:33 -0000	1.7
@@ -16,11 +16,11 @@
 .\" Modified 2005-03-23 by hun
 .\" Modified 2008-01-24 by dfandrich
 .\"
-.TH exif 1 "2008-01-24" "" "libexif command line frontend"
+.TH exif 1 "2008-02-01" "" "libexif command line frontend"
 .SH "NAME"
 exif \- shows EXIF information in JPEG files
 .SH "SYNOPSIS"
-.BI "exif [ " "OPTION" " ] " "file"
+.BI "exif [ " "OPTION" " ] [ " "file..." " ]"
 .SH DESCRIPTION
 .B "exif"
 is a small command-line utility to show and change EXIF information in JPEG files.
@@ -28,11 +28,14 @@ is a small command-line utility to show 
 Most digital cameras produce EXIF files, which are JPEG files with extra tags that contain information about the image. The
 .B "exif"
 command line utility allows you to read EXIF information from and write EXIF information to those files.
-.PP
 .B "exif"
 internally uses the
 .B "libexif"
 library.
+.PP
+Each input file given on the command line is acted upon in turn, using 
+all the options given. Execution will be aborted immediately if one
+file is not readable or does not contain EXIF tags.
 .SH "OPTIONS"
 .TP
 .BI "\-v, \-\-version"
@@ -44,8 +47,10 @@ Show ID numbers instead of tag names
 .BI "\-t, \-\-tag=" "tag"
 Select only the given EXIF
 .I "tag"
-which is the textual short tag name or numeric tag number (hexadecimal
-numbers are prefixed with 0x), from the IFD specified with \-\-ifd
+which is the textual short tag name, tag title, or numeric tag number
+(hexadecimal numbers are prefixed with 0x), from the IFD specified
+with \-\-ifd.  The tag title is dependent on the current locale, whereas the
+name and number are locale-independent.
 .TP
 .BI "\-\-ifd=" "IFD"
 Select
@@ -60,7 +65,7 @@ be given to use this option, but its con
 .BI "\-|, \-\-show\-mnote"
 Show contents of tag MakerNote. The contents of this tag is nonstandard (and
 often undocumented) and may therefore not be recognized, or if it is
-recognized it may not be correctly interpreted.
+recognized it may not be necessarily correctly interpreted.
 .TP
 .BI "\-\-remove"
 Remove tag or entire IFD (if no tag is specified).