libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c, 1.41, 1.42

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

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

Modified Files:
	exif-mnote-data-olympus.c 
Log Message:
Jan Patera's keen eyes noticed that my MakerNote unification changes
introduced a case where a NULL pointer would be dereferenced before
being checked for NULL.


Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -d -r1.41 -r1.42
--- exif-mnote-data-olympus.c	25 Sep 2009 06:35:48 -0000	1.41
+++ exif-mnote-data-olympus.c	25 Sep 2009 22:01:53 -0000	1.42
@@ -228,11 +228,15 @@ exif_mnote_data_olympus_load (ExifMnoteD
 {
 	ExifMnoteDataOlympus *n = (ExifMnoteDataOlympus *) en;
 	ExifShort c;
-	size_t i, tcount, o, o2 = 6 + n->offset, /* Start of interesting data */
-	       datao = 6, base = 0;
+	size_t i, tcount, o, o2, datao = 6, base = 0;
 
-	if (!n || !buf || !buf_size || (n->offset + 22 < n->offset) ||
-	    (n->offset + 22 < 22) || (n->offset + 22 > buf_size)) {
+	if (!n || !buf || !buf_size) {
+		exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
+			  "ExifMnoteDataOlympus", "Short MakerNote");
+		return;
+	}
+	o2 = 6 + n->offset; /* Start of interesting data */
+	if ((o2 + 10 < o2) || (o2 + 10 < 10) || (o2 + 10 > buf_size)) {
 		exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
 			  "ExifMnoteDataOlympus", "Short MakerNote");
 		return;

[libexif-cvs] libexif/libexif/canon exif-mnote-data-canon.c, 1.23, 1.24

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

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

Modified Files:
	exif-mnote-data-canon.c 
Log Message:
Jan Patera's keen eyes noticed that my MakerNote unification changes
introduced a case where a NULL pointer would be dereferenced before
being checked for NULL.


Index: exif-mnote-data-canon.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -d -r1.23 -r1.24
--- exif-mnote-data-canon.c	25 Sep 2009 06:35:48 -0000	1.23
+++ exif-mnote-data-canon.c	25 Sep 2009 22:01:50 -0000	1.24
@@ -201,10 +201,15 @@ exif_mnote_data_canon_load (ExifMnoteDat
 {
 	ExifMnoteDataCanon *n = (ExifMnoteDataCanon *) ne;
 	ExifShort c;
-	size_t i, tcount, o, datao = 6 + n->offset;
+	size_t i, tcount, o, datao;
 
-	if (!n || !buf || !buf_size || (datao + 2 < datao) ||
-	    (datao + 2 < 2) || (datao + 2 > buf_size)) {
+	if (!n || !buf || !buf_size) {
+		exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA,
+			  "ExifMnoteCanon", "Short MakerNote");
+		return;
+	}
+	datao = 6 + n->offset;
+	if ((datao + 2 < datao) || (datao + 2 < 2) || (datao + 2 > buf_size)) {
 		exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA,
 			  "ExifMnoteCanon", "Short MakerNote");
 		return;

[libexif-cvs] libexif/libexif/fuji exif-mnote-data-fuji.c, 1.9, 1.10

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

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

Modified Files:
	exif-mnote-data-fuji.c 
Log Message:
Jan Patera's keen eyes noticed that my MakerNote unification changes
introduced a case where a NULL pointer would be dereferenced before
being checked for NULL.


Index: exif-mnote-data-fuji.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/fuji/exif-mnote-data-fuji.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- exif-mnote-data-fuji.c	25 Sep 2009 06:35:48 -0000	1.9
+++ exif-mnote-data-fuji.c	25 Sep 2009 22:01:53 -0000	1.10
@@ -152,10 +152,15 @@ exif_mnote_data_fuji_load (ExifMnoteData
 {
 	ExifMnoteDataFuji *n = (ExifMnoteDataFuji*) en;
 	ExifLong c;
-	size_t i, tcount, o, datao = 6 + n->offset;
+	size_t i, tcount, o, datao;
 
-	if (!n || !buf || !buf_size || (datao + 12 < datao) ||
-	    (datao + 12 < 12) || (datao + 12 > buf_size)) {
+	if (!n || !buf || !buf_size) {
+		exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
+			  "ExifMnoteDataFuji", "Short MakerNote");
+		return;
+	}
+	datao = 6 + n->offset;
+	if ((datao + 12 < datao) || (datao + 12 < 12) || (datao + 12 > buf_size)) {
 		exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
 			  "ExifMnoteDataFuji", "Short MakerNote");
 		return;

[libexif-cvs] libexif/libexif/fuji exif-mnote-data-fuji.c,1.8,1.9

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

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

Modified Files:
	exif-mnote-data-fuji.c 
Log Message:
Fixed some problems in MakerNote parsing that could cause a
read past the end of a buffer and therefore a segfault.
Allow MakerNote parsing to continue even if one tag parses
incorrectly.
Log an error whenever memory allocation fails in MakerNote parsing.


Index: exif-mnote-data-fuji.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/fuji/exif-mnote-data-fuji.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -d -r1.8 -r1.9
--- exif-mnote-data-fuji.c	21 Mar 2009 22:03:09 -0000	1.8
+++ exif-mnote-data-fuji.c	25 Sep 2009 06:35:48 -0000	1.9
@@ -152,63 +152,89 @@ exif_mnote_data_fuji_load (ExifMnoteData
 {
 	ExifMnoteDataFuji *n = (ExifMnoteDataFuji*) en;
 	ExifLong c;
-	size_t i, o, s, datao = 6 + n->offset;
-	MnoteFujiEntry *t;
+	size_t i, tcount, o, datao = 6 + n->offset;
 
 	if (!n || !buf || !buf_size || (datao + 12 < datao) ||
-	    (datao + 12 < 12) || (datao + 12 > buf_size))
+	    (datao + 12 < 12) || (datao + 12 > buf_size)) {
+		exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
+			  "ExifMnoteDataFuji", "Short MakerNote");
 		return;
+	}
 
-	/* Read the number of entries and remove old ones. */
 	n->order = EXIF_BYTE_ORDER_INTEL;
 	datao += exif_get_long (buf + datao + 8, EXIF_BYTE_ORDER_INTEL);
-	if ((datao + 2 < datao) || (datao + 2 < 2))
+	if ((datao + 2 < datao) || (datao + 2 < 2) ||
+	    (datao + 2 > buf_size)) {
+		exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
+			  "ExifMnoteDataFuji", "Short MakerNote");
 		return;
+	}
+
+	/* Read the number of tags */
 	c = exif_get_short (buf + datao, EXIF_BYTE_ORDER_INTEL);
 	datao += 2;
+
+	/* Remove any old entries */
 	exif_mnote_data_fuji_clear (n);
 
-	/* Parse the entries */
-	for (i = 0; i < c; i++) {
-		o = datao + 12 * i;
-		if (datao + 12 > buf_size) {
+	/* Reserve enough space for all the possible MakerNote tags */
+	n->entries = exif_mem_alloc (en->mem, sizeof (MnoteFujiEntry) * c);
+	if (!n->entries) {
+		EXIF_LOG_NO_MEMORY(en->log, "ExifMnoteDataFuji", sizeof (MnoteFujiEntry) * c);
+		return;
+	}
+
+	/* Parse all c entries, storing ones that are successfully parsed */
+	tcount = 0;
+	for (i = c, o = datao; i; --i, o += 12) {
+		size_t s;
+		if ((o + 12 < o) || (o + 12 < 12) || (o + 12 > buf_size)) {
 			exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
 				  "ExifMnoteDataFuji", "Short MakerNote");
-			return;
+			break;
 		}
 
-		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);
-		n->entries[i].format     = exif_get_short (buf + o + 2, n->order);
-		n->entries[i].components = exif_get_long (buf + o + 4, n->order);
-		n->entries[i].order      = n->order;
+		n->entries[tcount].tag        = exif_get_short (buf + o, n->order);
+		n->entries[tcount].format     = exif_get_short (buf + o + 2, n->order);
+		n->entries[tcount].components = exif_get_long (buf + o + 4, n->order);
+		n->entries[tcount].order      = n->order;
+
+		exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataFuji",
+			  "Loading entry 0x%x ('%s')...", n->entries[tcount].tag,
+			  mnote_fuji_tag_get_name (n->entries[tcount].tag));
 
 		/*
 		 * Size? If bigger than 4 bytes, the actual data is not
 		 * in the entry but somewhere else (offset).
 		 */
-		s = exif_format_get_size (n->entries[i].format) * n->entries[i].components;
-		if (!s) return;
-		o += 8;
-		if (s > 4) o = exif_get_long (buf + o, n->order) + 6 + n->offset;
-		if ((o + s < o) || (o + s < s) || (o + s > buf_size)) {
-			exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
-			          "ExifMnoteDataFuji", "Tag data past end of "
-				  "buffer (%u > %u)", o + s, buf_size);
-			return;
+		s = exif_format_get_size (n->entries[tcount].format) * n->entries[tcount].components;
+		n->entries[tcount].size = s;
+		if (s) {
+			size_t dataofs = o + 8;
+			if (s > 4)
+				/* The data in this case is merely a pointer */
+				dataofs = exif_get_long (buf + dataofs, n->order) + 6 + n->offset;
+			if ((dataofs + s < dataofs) || (dataofs + s < s) ||
+				(dataofs + s >= buf_size)) {
+				exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
+						  "ExifMnoteDataFuji", "Tag data past end of "
+					  "buffer (%u >= %u)", dataofs + s, buf_size);
+				continue;
+			}
+
+			n->entries[tcount].data = exif_mem_alloc (en->mem, s);
+			if (!n->entries[tcount].data) {
+				EXIF_LOG_NO_MEMORY(en->log, "ExifMnoteDataFuji", s);
+				continue;
+			}
+			memcpy (n->entries[tcount].data, buf + dataofs, s);
 		}
 
-		/* Sanity check */
-		n->entries[i].data = exif_mem_alloc (en->mem, s);
-		if (!n->entries[i].data) return;
-		n->entries[i].size = s;
-		memcpy (n->entries[i].data, buf + o, s);
+		/* Tag was successfully parsed */
+		++tcount;
 	}
+	/* Store the count of successfully parsed tags */
+	n->count = tcount;
 }
 
 static unsigned int

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

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

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

Modified Files:
	exif-mem.c 
Log Message:
Fixed some problems in MakerNote parsing that could cause a
read past the end of a buffer and therefore a segfault.
Allow MakerNote parsing to continue even if one tag parses
incorrectly.
Log an error whenever memory allocation fails in MakerNote parsing.


Index: exif-mem.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-mem.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- exif-mem.c	11 May 2007 02:37:21 -0000	1.5
+++ exif-mem.c	25 Sep 2009 06:35:48 -0000	1.6
@@ -9,18 +9,21 @@ struct _ExifMem {
 	ExifMemFreeFunc free_func;
 };
 
+/*! Default memory allocation function. */
 static void *
 exif_mem_alloc_func (ExifLong ds)
 {
 	return calloc ((size_t) ds, 1);
 }
 
+/*! Default memory reallocation function. */
 static void *
 exif_mem_realloc_func (void *d, ExifLong ds)
 {
 	return realloc (d, (size_t) ds);
 }
 
+/*! Default memory free function. */
 static void
 exif_mem_free_func (void *d)
 {

[libexif-cvs] libexif/libexif/canon exif-mnote-data-canon.c, 1.22, 1.23

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

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

Modified Files:
	exif-mnote-data-canon.c 
Log Message:
Fixed some problems in MakerNote parsing that could cause a
read past the end of a buffer and therefore a segfault.
Allow MakerNote parsing to continue even if one tag parses
incorrectly.
Log an error whenever memory allocation fails in MakerNote parsing.


Index: exif-mnote-data-canon.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/exif-mnote-data-canon.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- exif-mnote-data-canon.c	21 Mar 2009 22:03:09 -0000	1.22
+++ exif-mnote-data-canon.c	25 Sep 2009 06:35:48 -0000	1.23
@@ -130,7 +130,10 @@ exif_mnote_data_canon_save (ExifMnoteDat
 	 */
 	*buf_size = 2 + n->count * 12 + 4;
 	*buf = exif_mem_alloc (ne->mem, sizeof (char) * *buf_size);
-	if (!*buf) return;
+	if (!*buf) {
+		EXIF_LOG_NO_MEMORY(ne->log, "ExifMnoteCanon", *buf_size);
+		return;
+	}
 
 	/* Save the number of entries */
 	exif_set_short (*buf, n->order, (ExifShort) n->count);
@@ -158,7 +161,10 @@ exif_mnote_data_canon_save (ExifMnoteDat
 			if (s & 1) ts += 1;
 			t = exif_mem_realloc (ne->mem, *buf,
 						 sizeof (char) * ts);
-			if (!t) return;
+			if (!t) {
+				EXIF_LOG_NO_MEMORY(ne->log, "ExifMnoteCanon", ts);
+				return;
+			}
 			*buf = t;
 			*buf_size = ts;
 			doff = *buf_size - s;
@@ -195,66 +201,85 @@ exif_mnote_data_canon_load (ExifMnoteDat
 {
 	ExifMnoteDataCanon *n = (ExifMnoteDataCanon *) ne;
 	ExifShort c;
-	size_t i, o, s;
-	MnoteCanonEntry *t;
+	size_t i, tcount, o, datao = 6 + n->offset;
 
-	if (!n || !buf || !buf_size || (buf_size < 6 + n->offset + 2)) return;
+	if (!n || !buf || !buf_size || (datao + 2 < datao) ||
+	    (datao + 2 < 2) || (datao + 2 > buf_size)) {
+		exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA,
+			  "ExifMnoteCanon", "Short MakerNote");
+		return;
+	}
 
-	/* Read the number of entries and remove old ones. */
-	c = exif_get_short (buf + 6 + n->offset, n->order);
+	/* Read the number of tags */
+	c = exif_get_short (buf + datao, n->order);
+	datao += 2;
+
+	/* Remove any old entries */
 	exif_mnote_data_canon_clear (n);
 
+	/* Reserve enough space for all the possible MakerNote tags */
+	n->entries = exif_mem_alloc (ne->mem, sizeof (MnoteCanonEntry) * c);
+	if (!n->entries) {
+		EXIF_LOG_NO_MEMORY(ne->log, "ExifMnoteCanon", sizeof (MnoteCanonEntry) * c);
+		return;
+	}
+
 	/* Parse the entries */
-	for (i = 0; i < c; i++) {
-		o = 6 + 2 + n->offset + 12 * i;
-		if (o + 8 > buf_size) {
+	tcount = 0;
+	for (i = c, o = datao; i; --i, o += 12) {
+		size_t s;
+		if ((o + 12 < o) || (o + 12 < 12) || (o + 12 > buf_size)) {
 			exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA,
 				"ExifMnoteCanon", "Short MakerNote");
-			return;
+			break;
 	        }
 
-		t = exif_mem_realloc (ne->mem, n->entries,
-			 sizeof (MnoteCanonEntry) * (i + 1));
-		if (!t) return; /* out of memory */
-		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);
-		n->entries[i].format     = exif_get_short (buf + o + 2, n->order);
-		n->entries[i].components = exif_get_long (buf + o + 4, n->order);
-		n->entries[i].order      = n->order;
+		n->entries[tcount].tag        = exif_get_short (buf + o, n->order);
+		n->entries[tcount].format     = exif_get_short (buf + o + 2, n->order);
+		n->entries[tcount].components = exif_get_long (buf + o + 4, n->order);
+		n->entries[tcount].order      = n->order;
 
 		exif_log (ne->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteCanon",
-			"Loading entry 0x%x ('%s')...", n->entries[i].tag,
-			 mnote_canon_tag_get_name (n->entries[i].tag));
+			"Loading entry 0x%x ('%s')...", n->entries[tcount].tag,
+			 mnote_canon_tag_get_name (n->entries[tcount].tag));
 
 		/*
 		 * Size? If bigger than 4 bytes, the actual data is not
 		 * in the entry but somewhere else (offset).
 		 */
-		s = exif_format_get_size (n->entries[i].format) * n->entries[i].components;
+		s = exif_format_get_size (n->entries[tcount].format) * 
+								  n->entries[tcount].components;
+		n->entries[tcount].size = s;
 		if (!s) {
 			exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA,
 				  "ExifMnoteCanon",
 				  "Invalid zero-length tag size");
-			return;
-		}
-		o += 8;
-		if (s > 4) o = exif_get_long (buf + o, n->order) + 6;
-		if ((o + s < s) || (o + s < o) || (o + s > buf_size)) {
-			exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA,
-				"ExifMnoteCanon",
-				"Tag data past end of buffer (%u > %u)",
-				o + s, buf_size);
-			return;
+			continue;
+
+		} else {
+			size_t dataofs = o + 8;
+			if (s > 4) dataofs = exif_get_long (buf + dataofs, n->order) + 6;
+			if ((dataofs + s < s) || (dataofs + s < dataofs) || (dataofs + s > buf_size)) {
+				exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA,
+					"ExifMnoteCanon",
+					"Tag data past end of buffer (%u > %u)",
+					dataofs + s, buf_size);
+				continue;
+			}
+
+			n->entries[tcount].data = exif_mem_alloc (ne->mem, s);
+			if (!n->entries[tcount].data) {
+				EXIF_LOG_NO_MEMORY(ne->log, "ExifMnoteCanon", s);
+				continue;
+			}
+			memcpy (n->entries[tcount].data, buf + dataofs, s);
 		}
 
-		/* Sanity check */
-		n->entries[i].data = exif_mem_alloc (ne->mem, sizeof (char) * s);
-		if (!n->entries[i].data) return; /* out of memory */
-		n->entries[i].size = s;
-		memcpy (n->entries[i].data, buf + o, s);
+		/* Tag was successfully parsed */
+		++tcount;
 	}
+	/* Store the count of successfully parsed tags */
+	n->count = tcount;
 }
 
 static unsigned int
@@ -325,7 +350,8 @@ exif_mnote_data_canon_new (ExifMem *mem,
 	if (!mem) return NULL;
 
 	d = exif_mem_alloc (mem, sizeof (ExifMnoteDataCanon));
-	if (!d) return NULL;
+	if (!d)
+		return NULL;
 
 	exif_mnote_data_construct (d, mem);
 

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c, 1.40, 1.41

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

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

Modified Files:
	exif-mnote-data-olympus.c 
Log Message:
Fixed some problems in MakerNote parsing that could cause a
read past the end of a buffer and therefore a segfault.
Allow MakerNote parsing to continue even if one tag parses
incorrectly.
Log an error whenever memory allocation fails in MakerNote parsing.


Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -d -r1.40 -r1.41
--- exif-mnote-data-olympus.c	21 Mar 2009 22:03:09 -0000	1.40
+++ exif-mnote-data-olympus.c	25 Sep 2009 06:35:48 -0000	1.41
@@ -109,7 +109,10 @@ exif_mnote_data_olympus_save (ExifMnoteD
 	case sanyoV1:
 	case epsonV1:
 		*buf = exif_mem_alloc (ne->mem, *buf_size);
-		if (!*buf) return;
+		if (!*buf) {
+			EXIF_LOG_NO_MEMORY(ne->log, "ExifMnoteDataOlympus", *buf_size);
+			return;
+		}
 
 		/* Write the header and the number of entries. */
 		strcpy ((char *)*buf, n->version==sanyoV1?"SANYO":
@@ -120,7 +123,10 @@ exif_mnote_data_olympus_save (ExifMnoteD
 	case olympusV2:
 		*buf_size += 8-6 + 4;
 		*buf = exif_mem_alloc (ne->mem, *buf_size);
-		if (!*buf) return;
+		if (!*buf) {
+			EXIF_LOG_NO_MEMORY(ne->log, "ExifMnoteDataOlympus", *buf_size);
+			return;
+		}
 
 		/* Write the header and the number of entries. */
 		strcpy ((char *)*buf, "OLYMPUS");
@@ -143,7 +149,10 @@ exif_mnote_data_olympus_save (ExifMnoteD
 		*buf_size += 8 + 2;
 		*buf_size += 4; /* Next IFD pointer */
 		*buf = exif_mem_alloc (ne->mem, *buf_size);
-		if (!*buf) return;
+		if (!*buf) {
+			EXIF_LOG_NO_MEMORY(ne->log, "ExifMnoteDataOlympus", *buf_size);
+			return;
+		}
 
 		/* Write the header and the number of entries. */
 		strcpy ((char *)*buf, "Nikon");
@@ -193,7 +202,10 @@ exif_mnote_data_olympus_save (ExifMnoteD
 			ts = *buf_size + s;
 			t = exif_mem_realloc (ne->mem, *buf,
 						 sizeof (char) * ts);
-			if (!t) return;
+			if (!t) {
+				EXIF_LOG_NO_MEMORY(ne->log, "ExifMnoteDataOlympus", ts);
+				return;
+			}
 			*buf = t;
 			*buf_size = ts;
 			exif_set_long (*buf + o, n->order, datao + doff);
@@ -216,12 +228,15 @@ exif_mnote_data_olympus_load (ExifMnoteD
 {
 	ExifMnoteDataOlympus *n = (ExifMnoteDataOlympus *) en;
 	ExifShort c;
-	size_t i, tcount, s, o, o2 = 0, datao = 6, base = 0;
-
-	if (!n || !buf) return;
+	size_t i, tcount, o, o2 = 6 + n->offset, /* Start of interesting data */
+	       datao = 6, base = 0;
 
-	/* Start of interesting data */
-	o2 = 6 + n->offset;
+	if (!n || !buf || !buf_size || (n->offset + 22 < n->offset) ||
+	    (n->offset + 22 < 22) || (n->offset + 22 > buf_size)) {
+		exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
+			  "ExifMnoteDataOlympus", "Short MakerNote");
+		return;
+	}
 
 	/*
 	 * Olympus headers start with "OLYMP" and need to have at least
@@ -244,7 +259,6 @@ exif_mnote_data_olympus_load (ExifMnoteD
 	 * two unknown bytes (0), "MM" or "II", another byte 0 and 
 	 * lastly 0x2A.
 	 */
-	if (buf_size - n->offset < 22) return;
 	if (!memcmp (buf + o2, "OLYMP", 6) || !memcmp (buf + o2, "SANYO", 6) ||
 	    !memcmp (buf + o2, "EPSON", 6)) {
 		exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus",
@@ -262,7 +276,7 @@ exif_mnote_data_olympus_load (ExifMnoteD
 		else if (buf[o2 + 6 + 1] == 1)
 			n->order = EXIF_BYTE_ORDER_MOTOROLA;
 		o2 += 8;
-		if (o2 >= buf_size) return;
+		if (o2 + 2 > buf_size) return;
 		c = exif_get_short (buf + o2, n->order);
 		if ((!(c & 0xFF)) && (c > 0x500)) {
 			if (n->order == EXIF_BYTE_ORDER_INTEL) {
@@ -309,7 +323,7 @@ exif_mnote_data_olympus_load (ExifMnoteD
 
 			base = MNOTE_NIKON1_TAG_BASE;
 			/* Fix endianness, if needed */
-			if (o2 >= buf_size) return;
+			if (o2 + 2 > buf_size) return;
 			c = exif_get_short (buf + o2, n->order);
 			if ((!(c & 0xFF)) && (c > 0x500)) {
 				if (n->order == EXIF_BYTE_ORDER_INTEL) {
@@ -348,7 +362,7 @@ exif_mnote_data_olympus_load (ExifMnoteD
 			o2 += 2;
 
 			/* Go to where the number of entries is. */
-			if (o2 >= buf_size) return;
+			if (o2 + 4 > buf_size) return;
 			o2 = datao + exif_get_long (buf + o2, n->order);
 			break;
 
@@ -366,21 +380,32 @@ exif_mnote_data_olympus_load (ExifMnoteD
 		return;
 	}
 
-	/* Number of entries */
-	if (o2 >= buf_size) return;
+	/* Sanity check the offset */
+	if ((o2 + 2 < o2) || (o2 + 2 < 2) || (o2 + 2 > buf_size)) {
+		exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
+			  "ExifMnoteOlympus", "Short MakerNote");
+		return;
+	}
+
+	/* Read the number of tags */
 	c = exif_get_short (buf + o2, n->order);
 	o2 += 2;
 
-	/* Read the number of entries and remove old ones. */
+	/* Remove any old entries */
 	exif_mnote_data_olympus_clear (n);
 
+	/* Reserve enough space for all the possible MakerNote tags */
 	n->entries = exif_mem_alloc (en->mem, sizeof (MnoteOlympusEntry) * c);
-	if (!n->entries) return;
+	if (!n->entries) {
+		EXIF_LOG_NO_MEMORY(en->log, "ExifMnoteOlympus", sizeof (MnoteOlympusEntry) * c);
+		return;
+	}
 
 	/* Parse all c entries, storing ones that are successfully parsed */
-	for (i = c, tcount = 0, o = o2; i; --i, o += 12) {
-		size_t dataofs;
-	    if ((o + 12 < o) || (o + 12 < 12) || (o + 12 > buf_size)) {
+	tcount = 0;
+	for (i = c, o = o2; i; --i, o += 12) {
+		size_t s;
+		if ((o + 12 < o) || (o + 12 < 12) || (o + 12 > buf_size)) {
 			exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
 				  "ExifMnoteOlympus", "Short MakerNote");
 			break;
@@ -394,12 +419,12 @@ exif_mnote_data_olympus_load (ExifMnoteD
 	    exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteOlympus",
 		      "Loading entry 0x%x ('%s')...", n->entries[tcount].tag,
 		      mnote_olympus_tag_get_name (n->entries[tcount].tag));
-	    exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteOlympus",
+/*	    exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteOlympus",
 			    "0x%x %d %ld*(%d)",
 		    n->entries[tcount].tag,
 		    n->entries[tcount].format,
 		    n->entries[tcount].components,
-		    (int)exif_format_get_size(n->entries[tcount].format));
+		    (int)exif_format_get_size(n->entries[tcount].format)); */
 
 	    /*
 	     * Size? If bigger than 4 bytes, the actual data is not
@@ -409,8 +434,9 @@ exif_mnote_data_olympus_load (ExifMnoteD
 		   			 n->entries[tcount].components;
 		n->entries[tcount].size = s;
 		if (s) {
-			dataofs = o + 8;
+			size_t dataofs = o + 8;
 			if (s > 4) {
+				/* The data in this case is merely a pointer */
 				dataofs = exif_get_long (buf + dataofs, n->order) + datao;
 #ifdef EXIF_OVERCOME_SANYO_OFFSET_BUG
 				/* Some Sanyo models (e.g. VPC-C5, C40) suffer from a bug when
@@ -436,9 +462,11 @@ exif_mnote_data_olympus_load (ExifMnoteD
 				continue;
 			}
 
-			/* Sanity check */
 			n->entries[tcount].data = exif_mem_alloc (en->mem, s);
-			if (!n->entries[tcount].data) continue;
+			if (!n->entries[tcount].data) {
+				EXIF_LOG_NO_MEMORY(en->log, "ExifMnoteOlympus", s);
+				continue;
+			}
 			memcpy (n->entries[tcount].data, buf + dataofs, s);
 		}
 

[libexif-cvs] libexif ChangeLog,1.317,1.318 NEWS,1.52,1.53

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

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

Modified Files:
	ChangeLog NEWS 
Log Message:
Fixed some problems in MakerNote parsing that could cause a
read past the end of a buffer and therefore a segfault.
Allow MakerNote parsing to continue even if one tag parses
incorrectly.
Log an error whenever memory allocation fails in MakerNote parsing.


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif/NEWS,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -d -r1.52 -r1.53
--- NEWS	3 Jun 2009 19:21:23 -0000	1.52
+++ NEWS	25 Sep 2009 06:35:45 -0000	1.53
@@ -1,6 +1,6 @@
 libexif-0.6.x:
-  * Updated translations: nl, pl, sk, vi
   * New translation: da
+  * Updated translations: cs, de, en_CA, nl, pl, sk, sv, vi
   * Added some example programs
   * libexif is now thread safe when the underlying C library is thread safe
     and when each object allocated by libexif isn't used by more than one
@@ -17,6 +17,11 @@ libexif-0.6.x:
     removed from a file
   * Changed exif_tag_get_support_level_in_ifd() to return a value when possible
     when the data type for the given tag is unknown
+  * Added support for writing Pentax and Casio type2 MakerNotes
+  * Improved display of Pentax and Casio type2 MakerNotes
+  * Completely fixed bug #1617997 to display APEX values correctly
+  * Stopped some crashes due to read-beyond-buffer accesses in MakerNotes
+  * Don't abort MakerNote parsing after the first invalid tag
 
 libexif-0.6.17 (2008-11-06):
   * Updated translations: cs, de, pl, sk, vi
@@ -114,7 +119,7 @@ General remarks:
   * This file contains changes visible to users.
 
   * Small bug fixes (typos, memory leaks, ...) and feature
-    enhancements (new tag types, ...) are not mentionened
+    enhancements (new tag types, ...) are not mentioned
     explicitly.
 
   * Apart from that, I would like to ask committers to update this

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -d -r1.317 -r1.318
--- ChangeLog	23 Sep 2009 18:00:12 -0000	1.317
+++ ChangeLog	25 Sep 2009 06:35:45 -0000	1.318
@@ -1,3 +1,11 @@
+2009-09-24  Dan Fandrich <da...@co...>
+
+	* Fixed some problems in MakerNote parsing that could cause a
+	  read past the end of a buffer and therefore a segfault.
+	* Allow MakerNote parsing to continue even if one tag parses
+	  incorrectly.
+	* Log an error whenever memory allocation fails in MakerNote parsing.
+
 2009-09-23  Dan Fandrich <da...@co...>
 
 	* Removed bogus "APEX" value from shutter speed display (thanks to

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

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

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

Modified Files:
	exif-mnote-data-pentax.c 
Log Message:
Fixed some problems in MakerNote parsing that could cause a
read past the end of a buffer and therefore a segfault.
Allow MakerNote parsing to continue even if one tag parses
incorrectly.
Log an error whenever memory allocation fails in MakerNote parsing.


Index: exif-mnote-data-pentax.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/exif-mnote-data-pentax.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -d -r1.16 -r1.17
--- exif-mnote-data-pentax.c	19 Sep 2009 05:16:04 -0000	1.16
+++ exif-mnote-data-pentax.c	25 Sep 2009 06:35:48 -0000	1.17
@@ -95,8 +95,10 @@ exif_mnote_data_pentax_save (ExifMnoteDa
 	case casioV2:
 		base = MNOTE_PENTAX2_TAG_BASE;
 		*buf = exif_mem_alloc (ne->mem, *buf_size);
-		if (!*buf) return;
-
+		if (!*buf) {
+			EXIF_LOG_NO_MEMORY(ne->log, "ExifMnoteDataPentax", *buf_size);
+			return;
+		}
 		/* Write the magic header */
 		strcpy ((char *)*buf, "QVC");
 		exif_set_short (*buf + 4, n->order, (ExifShort) 0);
@@ -106,7 +108,10 @@ exif_mnote_data_pentax_save (ExifMnoteDa
 	case pentaxV3:
 		base = MNOTE_PENTAX2_TAG_BASE;
 		*buf = exif_mem_alloc (ne->mem, *buf_size);
-		if (!*buf) return;
+		if (!*buf) {
+			EXIF_LOG_NO_MEMORY(ne->log, "ExifMnoteDataPentax", *buf_size);
+			return;
+		}
 
 		/* Write the magic header */
 		strcpy ((char *)*buf, "AOC");
@@ -119,7 +124,10 @@ exif_mnote_data_pentax_save (ExifMnoteDa
 	case pentaxV2:
 		base = MNOTE_PENTAX2_TAG_BASE;
 		*buf = exif_mem_alloc (ne->mem, *buf_size);
-		if (!*buf) return;
+		if (!*buf) {
+			EXIF_LOG_NO_MEMORY(ne->log, "ExifMnoteDataPentax", *buf_size);
+			return;
+		}
 
 		/* Write the magic header */
 		strcpy ((char *)*buf, "AOC");
@@ -132,7 +140,10 @@ exif_mnote_data_pentax_save (ExifMnoteDa
 		*buf_size -= 6;
 		o2 -= 6;
 		*buf = exif_mem_alloc (ne->mem, *buf_size);
-		if (!*buf) return;
+		if (!*buf) {
+			EXIF_LOG_NO_MEMORY(ne->log, "ExifMnoteDataPentax", *buf_size);
+			return;
+		}
 		break;
 
 	default:
@@ -170,7 +181,10 @@ exif_mnote_data_pentax_save (ExifMnoteDa
 			doff = *buf_size;
 			t = exif_mem_realloc (ne->mem, *buf,
 						 sizeof (char) * ts);
-			if (!t) return;
+			if (!t) {
+				EXIF_LOG_NO_MEMORY(ne->log, "ExifMnoteDataPentax", ts);
+				return;
+			}
 			*buf = t;
 			*buf_size = ts;
 			exif_set_long (*buf + o, n->order, datao + doff);
@@ -201,11 +215,17 @@ exif_mnote_data_pentax_load (ExifMnoteDa
 		const unsigned char *buf, unsigned int buf_size)
 {
 	ExifMnoteDataPentax *n = (ExifMnoteDataPentax *) en;
-	size_t i, o, s, datao = 6 + n->offset, base = 0;
+	size_t i, tcount, o, datao = 6 + n->offset, base = 0;
 	ExifShort c;
 
-	/* Number of entries */
-	if (buf_size < datao + (4 + 2) + 2) return;
+	if (!n || !buf || !buf_size || (datao + 8 < datao) ||
+	    (datao + 8 < 8) || (datao + 8 > buf_size)) {
+		exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
+			  "ExifMnoteDataPentax", "Short MakerNote");
+		return;
+	}
+
+	/* Detect varient of Pentax/Casio MakerNote found */
 	if (!memcmp(buf + datao, "AOC", 4)) {
 		if ((buf[datao + 4] == 'I') && (buf[datao + 5] == 'I')) {
 			n->version = pentaxV3;
@@ -233,56 +253,73 @@ exif_mnote_data_pentax_load (ExifMnoteDa
 			"Parsing Pentax maker note v1...");
 		n->version = pentaxV1;
 	}
+
+	/* Read the number of tags */
 	c = exif_get_short (buf + datao, n->order);
+	datao += 2;
+
+	/* Remove any old entries */
+	exif_mnote_data_pentax_clear (n);
+
+	/* Reserve enough space for all the possible MakerNote tags */
 	n->entries = exif_mem_alloc (en->mem, sizeof (MnotePentaxEntry) * c);
-	if (!n->entries) return;
+	if (!n->entries) {
+		EXIF_LOG_NO_MEMORY(en->log, "ExifMnoteDataPentax", sizeof (MnotePentaxEntry) * c);
+		return;
+	}
 
-	for (i = 0; i < c; i++) {
-		o = datao + 2 + 12 * i;
-		if (o + 8 > buf_size) {
+	/* Parse all c entries, storing ones that are successfully parsed */
+	tcount = 0;
+	for (i = c, o = datao; i; --i, o += 12) {
+		size_t s;
+		if ((o + 12 < o) || (o + 12 < 12) || (o + 12 > buf_size)) {
 			exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
 				  "ExifMnoteDataPentax", "Short MakerNote");
-			return;
+			break;
 		}
 
-		n->count = i + 1;
-		n->entries[i].tag        = exif_get_short (buf + o + 0, n->order) + base;
-		n->entries[i].format     = exif_get_short (buf + o + 2, n->order);
-		n->entries[i].components = exif_get_long  (buf + o + 4, n->order);
-		n->entries[i].order      = n->order;
+		n->entries[tcount].tag        = exif_get_short (buf + o + 0, n->order) + base;
+		n->entries[tcount].format     = exif_get_short (buf + o + 2, n->order);
+		n->entries[tcount].components = exif_get_long  (buf + o + 4, n->order);
+		n->entries[tcount].order      = n->order;
 
 		exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnotePentax",
-			  "Loading entry 0x%x ('%s')...", n->entries[i].tag,
-			  mnote_pentax_tag_get_name (n->entries[i].tag));
+			  "Loading entry 0x%x ('%s')...", n->entries[tcount].tag,
+			  mnote_pentax_tag_get_name (n->entries[tcount].tag));
 
 		/*
 		 * Size? If bigger than 4 bytes, the actual data is not
 		 * in the entry but somewhere else (offset).
 		 */
-		s = exif_format_get_size (n->entries[i].format) *
-                                      n->entries[i].components;
-		if (s > 65536) {
-			/* Corrupt data: EXIF data size is limited to the
-			 * maximum size of a JPEG segment (64 kb). 
-			 */
-			continue;
-		}
-		if (!s) return;
-		o += 8;
-		if (s > 4) o = exif_get_long (buf + o, n->order) + 6;
-		if ((o + s < o) || (o + s < s) || (o + s > buf_size)) {
-			exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
-			          "ExifMnoteDataPentax", "Tag data past end "
-				  "of buffer (%u > %u)", o + s, buf_size);
-			return;
+		s = exif_format_get_size (n->entries[tcount].format) *
+                                      n->entries[tcount].components;
+		n->entries[tcount].size = s;
+		if (s) {
+			size_t dataofs = o + 8;
+			if (s > 4)
+				/* The data in this case is merely a pointer */
+			   	dataofs = exif_get_long (buf + dataofs, n->order) + 6;
+			if ((dataofs + s < dataofs) || (dataofs + s < s) ||
+				(dataofs + s > buf_size)) {
+				exif_log (en->log, EXIF_LOG_CODE_CORRUPT_DATA,
+						  "ExifMnoteDataPentax", "Tag data past end "
+					  "of buffer (%u > %u)", dataofs + s, buf_size);
+				continue;
+			}
+
+			n->entries[tcount].data = exif_mem_alloc (en->mem, s);
+			if (!n->entries[tcount].data) {
+				EXIF_LOG_NO_MEMORY(en->log, "ExifMnoteDataPentax", s);
+				continue;
+			}
+			memcpy (n->entries[tcount].data, buf + dataofs, s);
 		}
-                                                                                
-		/* Sanity check */
-		n->entries[i].data = exif_mem_alloc (en->mem, s);
-		if (!n->entries[i].data) return;
-		n->entries[i].size = s;
-		memcpy (n->entries[i].data, buf + o, s);
-        }
+
+		/* Tag was successfully parsed */
+		++tcount;
+	}
+	/* Store the count of successfully parsed tags */
+	n->count = tcount;
 }
 
 static unsigned int

[libexif-cvs] gexif COPYING,NONE,1.1 ChangeLog,1.16,1.17

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

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

Modified Files:
	ChangeLog 
Added Files:
	COPYING 
Log Message:
Added the text of the LGPL V2.1 in COPYING so there isn't any
confusion as to the licensing terms of the project. GNU
autotools adds a GPL COPYING file by default if this doesn't
exist, which is wrong.


--- NEW FILE: COPYING ---
		  GNU LESSER GENERAL PUBLIC LICENSE
		       Version 2.1, February 1999

 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it.  You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.

  When we speak of free software, we are referring to freedom of use,
not price.  Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.

  To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights.  These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.

  To protect each distributor, we want to make it very clear that
there is no warranty for the free library.  Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.

  Finally, software patents pose a constant threat to the existence of
any free program.  We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder.  Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.

  Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License.  This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License.  We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.

  When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library.  The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom.  The Lesser General
Public License permits more lax criteria for linking other code with
the library.

  We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License.  It also provides other free software developers Less
of an advantage over competing non-free programs.  These disadvantages
are the reason we use the ordinary General Public License for many
libraries.  However, the Lesser license provides advantages in certain
special circumstances.

  For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard.  To achieve this, non-free programs must be
allowed to use the library.  A more frequent case is that a free
library does the same job as widely used non-free libraries.  In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.

  In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software.  For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.

  Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.

		  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.

  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.

  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.

  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.

  6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.

    c) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

    d) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    e) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.

  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.

  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded.  In such case, this License incorporates the limitation as if
written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.

  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

		     END OF TERMS AND CONDITIONS

           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change.  You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).

  To apply these terms, attach the following notices to the library.  It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.

    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.

    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

Also add information on how to contact you by electronic and paper mail.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice

That's all there is to it!



Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/gexif/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -d -r1.16 -r1.17
--- ChangeLog	24 Sep 2009 21:07:55 -0000	1.16
+++ ChangeLog	24 Sep 2009 21:10:42 -0000	1.17
@@ -1,6 +1,10 @@
 2009-09-24  Dan Fandrich <da...@co...>
 
 	* po/POTFILES.in: added additional file that needs translation
+	* Added the text of the LGPL V2.1 in COPYING so there isn't any
+	  confusion as to the licensing terms of the project. GNU
+	  autotools adds a GPL COPYING file by default if this doesn't
+	  exist, which is wrong.
 
 2008-11-05  Dan Fandrich <da...@co...>
 

[libexif-cvs] gexif/po POTFILES.in,1.2,1.3

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

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

Modified Files:
	POTFILES.in 
Log Message:
po/POTFILES.in: added additional file that needs translation


Index: POTFILES.in
===================================================================
RCS file: /cvsroot/libexif/gexif/po/POTFILES.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- POTFILES.in	23 Jul 2002 07:23:06 -0000	1.2
+++ POTFILES.in	24 Sep 2009 21:07:57 -0000	1.3
@@ -1 +1,2 @@
 gexif/gexif-main.c
+gexif/gexif-thumbnail.c

[libexif-cvs] gexif ChangeLog,1.15,1.16

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

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

Modified Files:
	ChangeLog 
Log Message:
po/POTFILES.in: added additional file that needs translation


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/gexif/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- ChangeLog	6 Nov 2008 02:05:23 -0000	1.15
+++ ChangeLog	24 Sep 2009 21:07:55 -0000	1.16
@@ -1,3 +1,7 @@
+2009-09-24  Dan Fandrich <da...@co...>
+
+	* po/POTFILES.in: added additional file that needs translation
+
 2008-11-05  Dan Fandrich <da...@co...>
 
 	* po/sv.po: Added Swedish translation by Daniel Nylander (closes

[libexif-cvs] libexif-gtk ChangeLog,1.24,1.25

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

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

Modified Files:
	ChangeLog 
Log Message:
po/POTFILES.in: added additional files that need translation


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -d -r1.24 -r1.25
--- ChangeLog	24 Sep 2009 19:46:10 -0000	1.24
+++ ChangeLog	24 Sep 2009 20:24:47 -0000	1.25
@@ -1,3 +1,7 @@
+2009-09-24  Dan Fandrich <da...@co...>
+
+	* po/POTFILES.in: added additional files that need translation
+
 2009-09-24  Lutz Mueller <lu...@us...>
 
 	* libexif-gtk/gtk-exif-entry-user-comment.c: Complete information

[libexif-cvs] libexif-gtk/po POTFILES.in,1.1,1.2

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

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

Modified Files:
	POTFILES.in 
Log Message:
po/POTFILES.in: added additional files that need translation


Index: POTFILES.in
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/po/POTFILES.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- POTFILES.in	23 Jul 2002 07:23:20 -0000	1.1
+++ POTFILES.in	24 Sep 2009 20:24:49 -0000	1.2
@@ -1,2 +1,11 @@
-libexif-gtk/gtk-exif-browser.c
 gtk-extensions/gtk-menu-option.c
+libexif-gtk/gtk-exif-browser.c
+libexif-gtk/gtk-exif-content-list.c
+libexif-gtk/gtk-exif-entry-copyright.c
+libexif-gtk/gtk-exif-entry-date.c
+libexif-gtk/gtk-exif-entry-number.c
+libexif-gtk/gtk-exif-entry-option.c
+libexif-gtk/gtk-exif-entry-rational.c
+libexif-gtk/gtk-exif-entry-resolution.c
+libexif-gtk/gtk-exif-entry-user-comment.c
+libexif-gtk/gtk-exif-entry-version.c

[libexif-cvs] libexif-gtk ChangeLog,1.23,1.24

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

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

Modified Files:
	ChangeLog 
Log Message:
2009-09-24  Lutz Mueller <lu...@us...>

	* libexif-gtk/gtk-exif-entry-user-comment.c: Complete information
          about copyright. Fixes #1673969.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -d -r1.23 -r1.24
--- ChangeLog	23 Sep 2009 21:16:01 -0000	1.23
+++ ChangeLog	24 Sep 2009 19:46:10 -0000	1.24
@@ -1,3 +1,8 @@
+2009-09-24  Lutz Mueller <lu...@us...>
+
+	* libexif-gtk/gtk-exif-entry-user-comment.c: Complete information
+          about copyright. Fixes #1673969.
+
 2009-09-23  Dan Fandrich <da...@co...>
 
 	* Added the text of the LGPL V2.1 in COPYING so there isn't any

[libexif-cvs] libexif-gtk/libexif-gtk gtk-exif-entry-user-comment.c, 1.3, 1.4

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

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

Modified Files:
	gtk-exif-entry-user-comment.c 
Log Message:
2009-09-24  Lutz Mueller <lu...@us...>

	* libexif-gtk/gtk-exif-entry-user-comment.c: Complete information
          about copyright. Fixes #1673969.


Index: gtk-exif-entry-user-comment.c
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/libexif-gtk/gtk-exif-entry-user-comment.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- gtk-exif-entry-user-comment.c	17 Oct 2004 15:32:47 -0000	1.3
+++ gtk-exif-entry-user-comment.c	24 Sep 2009 19:46:12 -0000	1.4
@@ -1,6 +1,21 @@
 /* gtk-exif-entry-user-comment.
  *
  * Copyright © 2002 Lutz Müller <lu...@us...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #include <config.h>

[libexif-cvs] libexif-gtk COPYING,NONE,1.1 ChangeLog,1.22,1.23

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

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

Modified Files:
	ChangeLog 
Added Files:
	COPYING 
Log Message:
Added the text of the LGPL V2.1 in COPYING so there isn't any
confusion as to the licensing terms of the project. GNU
autotools adds a GPL COPYING file by default if this doesn't
exist, which is wrong.


--- NEW FILE: COPYING ---
		  GNU LESSER GENERAL PUBLIC LICENSE
		       Version 2.1, February 1999

 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it.  You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.

  When we speak of free software, we are referring to freedom of use,
not price.  Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.

  To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights.  These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.

  To protect each distributor, we want to make it very clear that
there is no warranty for the free library.  Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.

  Finally, software patents pose a constant threat to the existence of
any free program.  We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder.  Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.

  Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License.  This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License.  We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.

  When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library.  The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom.  The Lesser General
Public License permits more lax criteria for linking other code with
the library.

  We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License.  It also provides other free software developers Less
of an advantage over competing non-free programs.  These disadvantages
are the reason we use the ordinary General Public License for many
libraries.  However, the Lesser license provides advantages in certain
special circumstances.

  For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard.  To achieve this, non-free programs must be
allowed to use the library.  A more frequent case is that a free
library does the same job as widely used non-free libraries.  In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.

  In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software.  For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.

  Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.

		  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.

  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.

  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.

  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.

  6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.

    c) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

    d) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    e) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.

  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.

  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded.  In such case, this License incorporates the limitation as if
written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.

  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

		     END OF TERMS AND CONDITIONS

           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change.  You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).

  To apply these terms, attach the following notices to the library.  It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.

    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.

    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

Also add information on how to contact you by electronic and paper mail.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice

That's all there is to it!



Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif-gtk/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- ChangeLog	15 Aug 2005 20:48:15 -0000	1.22
+++ ChangeLog	23 Sep 2009 21:16:01 -0000	1.23
@@ -1,3 +1,10 @@
+2009-09-23  Dan Fandrich <da...@co...>
+
+	* Added the text of the LGPL V2.1 in COPYING so there isn't any
+	  confusion as to the licensing terms of the project. GNU
+	  autotools adds a GPL COPYING file by default if this doesn't
+	  exist, which is wrong.
+
 2005-08-15  Lutz Mueller <lu...@us...>
 
 	Patch by Jakub Bogusz <qb...@pl...>:

[libexif-cvs] libexif/libexif exif-content.c, 1.30, 1.31 exif-entry.c, 1.133, 1.134

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

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

Modified Files:
	exif-content.c exif-entry.c 
Log Message:
Removed bogus "APEX" value from shutter speed display (thanks to
Jef Driesen for confirming this)
Fixed a couple of off-by-one unnecessary string truncations
Define M_PI for those systems that don't have it


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -d -r1.133 -r1.134
--- exif-entry.c	17 Sep 2009 22:32:59 -0000	1.133
+++ exif-entry.c	23 Sep 2009 18:00:16 -0000	1.134
@@ -32,6 +32,10 @@
 #include <time.h>
 #include <math.h>
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
 struct _ExifEntryPrivate
 {
 	unsigned int ref_count;
@@ -983,7 +987,7 @@ exif_entry_get_value (ExifEntry *e, char
 		snprintf (val, maxlen, _("%.02lf EV"), d);
 		snprintf (b, sizeof (b), _(" (f/%.01f)"), pow (2, d / 2.));
 		if (maxlen > strlen (val) + strlen (b))
-			strncat (val, b, maxlen - strlen (val) - 1);
+			strncat (val, b, maxlen - strlen (val));
 		break;
 	case EXIF_TAG_FOCAL_LENGTH:
 		CF (e, EXIF_FORMAT_RATIONAL, val, maxlen);
@@ -1022,7 +1026,7 @@ exif_entry_get_value (ExifEntry *e, char
 		d = (double) v_rat.numerator / (double) v_rat.denominator;
 		snprintf (val, maxlen, "%.1lf mm", d);
 		if (maxlen > strlen (val) + strlen (b))
-			strncat (val, b, maxlen - strlen (val) - 1);
+			strncat (val, b, maxlen - strlen (val));
 		break;
 	case EXIF_TAG_SUBJECT_DISTANCE:
 		CF (e, EXIF_FORMAT_RATIONAL, val, maxlen);
@@ -1049,7 +1053,7 @@ exif_entry_get_value (ExifEntry *e, char
 		else
 			snprintf (val, maxlen, "%i", (int) d);
 		if (maxlen > strlen (val) + strlen (_(" sec.")))
-			strncat (val, _(" sec."), maxlen - strlen (val) - 1);
+			strncat (val, _(" sec."), maxlen - strlen (val));
 		break;
 	case EXIF_TAG_SHUTTER_SPEED_VALUE:
 		CF (e, EXIF_FORMAT_SRATIONAL, val, maxlen);
@@ -1061,18 +1065,12 @@ exif_entry_get_value (ExifEntry *e, char
 		}
 		d = (double) v_srat.numerator / (double) v_srat.denominator;
 		snprintf (val, maxlen, _("%.02f EV"), d);
-		snprintf (b, sizeof (b), " (APEX: %i)", (int) pow (sqrt(2), d));
-		if (maxlen > strlen (val) + strlen (b))
-			strncat (val, b, maxlen - strlen (val) - 1);
 		d = 1. / pow (2, d);
 		if (d < 1)
-		  snprintf (b, sizeof (b), _(" 1/%d sec.)"), (int) (1. / d));
+		  snprintf (b, sizeof (b), _(" (1/%d sec.)"), (int) (1. / d));
 		else
-		  snprintf (b, sizeof (b), _(" %d sec.)"), (int) d);
-		if (maxlen > strlen (val) + strlen (b)) {
-		  val[strlen (val) - 1] = ',';
-		  strncat (val, b, maxlen - strlen (val) - 1);
-		}
+		  snprintf (b, sizeof (b), _(" (%d sec.)"), (int) d);
+		strncat (val, b, maxlen - strlen (val));
 		break;
 	case EXIF_TAG_BRIGHTNESS_VALUE:
 		CF (e, EXIF_FORMAT_SRATIONAL, val, maxlen);
@@ -1087,7 +1085,7 @@ exif_entry_get_value (ExifEntry *e, char
 		snprintf (b, sizeof (b), _(" (%.02f cd/m^2)"),
 			1. / (M_PI * 0.3048 * 0.3048) * pow (2, d));
 		if (maxlen > strlen (val) + strlen (b))
-			strncat (val, b, maxlen - strlen (val) - 1);
+			strncat (val, b, maxlen - strlen (val));
 		break;
 	case EXIF_TAG_FILE_SOURCE:
 		CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
@@ -1114,7 +1112,8 @@ exif_entry_get_value (ExifEntry *e, char
 			default: c = _("reserved"); break;
 			}
 			strncat (val, c, maxlen - strlen (val));
-			if (i < 3) strncat (val, " ", maxlen - strlen (val));
+			if (i < 3)
+				strncat (val, " ", maxlen - strlen (val));
 		}
 		break;
 	case EXIF_TAG_EXPOSURE_BIAS_VALUE:

Index: exif-content.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-content.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -d -r1.30 -r1.31
--- exif-content.c	21 Jan 2009 00:27:41 -0000	1.30
+++ exif-content.c	23 Sep 2009 18:00:15 -0000	1.31
@@ -289,6 +289,7 @@ exif_content_fix (ExifContent *c)
 			exif_content_remove_entry (c, e);
 			break;
 		case EXIF_SUPPORT_LEVEL_OPTIONAL:
+		case EXIF_SUPPORT_LEVEL_UNKNOWN:
 		default:
 			break;
 		}

[libexif-cvs] libexif ChangeLog,1.316,1.317

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

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

Modified Files:
	ChangeLog 
Log Message:
Removed bogus "APEX" value from shutter speed display (thanks to
Jef Driesen for confirming this)
Fixed a couple of off-by-one unnecessary string truncations
Define M_PI for those systems that don't have it


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -p -d -r1.316 -r1.317
--- ChangeLog	23 Sep 2009 06:47:09 -0000	1.316
+++ ChangeLog	23 Sep 2009 18:00:12 -0000	1.317
@@ -1,3 +1,10 @@
+2009-09-23  Dan Fandrich <da...@co...>
+
+	* Removed bogus "APEX" value from shutter speed display (thanks to
+	  Jef Driesen for confirming this)
+	* Fixed a couple of off-by-one unnecessary string truncations
+	* Define M_PI for those systems that don't have it
+
 2009-09-23  Jan Patera <pa...@us...>
 
 	* po/cs.po: Updated Czech translation by Jan Patera

[libexif-cvs] libexif ChangeLog,1.315,1.316

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

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

Modified Files:
	ChangeLog 
Log Message:
Updated Czech translation by Jan Patera


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -p -d -r1.315 -r1.316
--- ChangeLog	19 Sep 2009 05:16:02 -0000	1.315
+++ ChangeLog	23 Sep 2009 06:47:09 -0000	1.316
@@ -1,3 +1,7 @@
+2009-09-23  Jan Patera <pa...@us...>
+
+	* po/cs.po: Updated Czech translation by Jan Patera
+
 2009-09-18  Dan Fandrich <da...@co...>
 
 	* Added support for writing Pentax and Casio v2 MakerNotes

[libexif-cvs] libexif/po cs.po,1.16,1.17

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

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

Modified Files:
	cs.po 
Log Message:
Updated Czech translation


Index: cs.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/cs.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -d -r1.16 -r1.17
--- cs.po	20 Apr 2009 10:07:36 -0000	1.16
+++ cs.po	23 Sep 2009 06:45:19 -0000	1.17
@@ -1,13 +1,13 @@
 # Czech translation for libexif.
-# Copyright (C) Jan Patera <pa...@us...>, 2007.
+# Copyright (C) Jan Patera <pa...@us...>, 2007-2009.
 # This file is distributed under the same license as the libexif package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libexif 0.6.17-pre1\n"
+"Project-Id-Version: libexif 0.6.18-pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-31 15:37-0800\n"
[...1831 lines suppressed...]
 msgid "3008x2008 or 3040x2024"
-msgstr ""
+msgstr "3008x2008 nebo 3040x2024"
 
 #: libexif/pentax/mnote-pentax-entry.c:293
 msgid "Digital Filter?"
-msgstr ""
+msgstr "Digitální filtr (?)"
 
 #: libexif/pentax/mnote-pentax-entry.c:374
 #: libexif/pentax/mnote-pentax-entry.c:383
@@ -5404,7 +5406,7 @@ msgstr ""
 #: libexif/pentax/mnote-pentax-tag.c:36 libexif/pentax/mnote-pentax-tag.c:70
 #: libexif/pentax/mnote-pentax-tag.c:129
 msgid "Quality Level"
-msgstr ""
+msgstr "Úroveň kvality"
 
 #: libexif/pentax/mnote-pentax-tag.c:54
 msgid "ISOSpeed"

[libexif-cvs] libexif/po de.po,1.46,1.47

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

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

Modified Files:
	de.po 
Log Message:
po/de.po: Updated German translation by Marcus Meissner


Index: de.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/de.po,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -d -r1.46 -r1.47
--- de.po	19 Sep 2009 04:07:41 -0000	1.46
+++ de.po	22 Sep 2009 22:08:24 -0000	1.47
@@ -1,4 +1,4 @@
-# translation of de.po to Deutsch
+# translation of de.po to German
 # German Translation
 # Copyright:
 # This file is distributed under the same license as the libexif package.
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libexif 0.6.18-pre1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-09-16 22:05-0700\n"
-"PO-Revision-Date: 2009-09-18 10:37+0200\n"
+"PO-Revision-Date: 2009-09-20 18:19+0200\n"
 "Last-Translator: Marcus Meissner <ma...@je...>\n"
 "Language-Team: German <tra...@li...>\n"
 "MIME-Version: 1.0\n"
@@ -2717,7 +2717,7 @@ msgstr "YCbCr Positionierung"
 
 #: libexif/exif-tag.c:244
 msgid "The position of chrominance components in relation to the luminance component. This field is designated only for JPEG compressed data or uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr = 4:2:2 it is recommended in this standard that 2 (co-sited) be used to record data, in order to improve the image quality when viewed on TV systems. When this field does not exist, the reader shall assume the TIFF default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is recommended. If the reader does not have the capability of supporting both kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of the value in this field. It is preferable that readers be able to support both centered and co-sited positioning."
-msgstr ""
+msgstr "Die Position der Chrominance Komponenten in Relation zur Luminanzkomponente. Dieses Feld ist nur für JPEG komprimierte Daten oder für YCbCr Daten zulässig. Das TIFF Default ist 1 (zentriert), aber wenn Y:Cb:Cr = 4:2:2 verwendet wird schlägt dieser Standard vor das 2 (co-sited) zur Aufzeichnung von Daten verwendet wird, um die Bildqualität auf TV Systemen zu verbessern. Wenn dieses Feld nicht existiert, sollte das Leseprogramm den TIFF Default annehmen. Im Fall von Y:Cb:Cr = 4:2:0 wird der TIFF Default (zentriert) empfohlen. Wenn das Leseprogramm keine der beiden Varianten von <YCBCrPositioning> unterstützt, soll es den TIFF Defaults unabhängig vom Wert in diesem Feld verwenden. Es wird bevorzugt wenn der Leser sowohl zentrierte und co-sited Positionierung unterstützt."
 
 #: libexif/exif-tag.c:259
 msgid "Reference Black/White"
@@ -2765,7 +2765,7 @@ msgstr "Die F Nummer."
 
 #: libexif/exif-tag.c:320
 msgid "Image Resources Block"
-msgstr ""
+msgstr "Bild Resourcen Block"
 
 #: libexif/exif-tag.c:322
 msgid "A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure as that of the IFD specified in TIFF. ordinarily, however, it does not contain image data as in the case of TIFF."
@@ -2861,7 +2861,7 @@ msgstr "GPS Satelliten benutzt für Mess
 
 #: libexif/exif-tag.c:393
 msgid "Indicates the GPS satellites used for measurements. This tag can be used to describe the number of satellites, their ID number, angle of elevation, azimuth, SNR and other information in ASCII notation. The format is not specified. If the GPS receiver is incapable of taking measurements, value of the tag shall be set to NULL."
-msgstr ""
+msgstr "Gibt die GPS Satelliten an die für die Messung verwendet wurden. Dieses Tag kann zur Angabe der Zahl der Satellitten, deren ID Nummer, Höhenwinkel, Azimuth, SNR und anderer informationen in ASCII verwendet werden. Das Format ist nicht festgelegt. Wenn der GPS Empfänger nicht zu Messungen fähig ist, sollte dieses Tag auf NULL gesetzt werden."
 
 #: libexif/exif-tag.c:399
 msgid "GPS receiver status"
@@ -2941,69 +2941,63 @@ msgstr "Geodätische Survey Daten verwen
 
 #: libexif/exif-tag.c:431
 msgid "Indicates the geodetic survey data used by the GPS receiver. If the survey data is restricted to Japan, the value of this tag is 'TOKYO' or 'WGS-84'. If a GPS Info tag is recorded, it is strongly recommended that this tag be recorded."
-msgstr ""
+msgstr "Gibt die geodätischen Survey Daten des GPS Empfängers an. Wenn die Surveydaten auf Japan beschränkt sind, ist der Wert dieses Tags »TOKYO« oder »WGS-84«. Wenn ein GPS Info Tag aufgezeichnet wird, ist es empfohlen dieses Tag aufzuzeichnen."
 
 #: libexif/exif-tag.c:435
 msgid "Reference for latitude of destination"
-msgstr ""
+msgstr "Referenz des Breitengrades des Ziels"
 
 #: libexif/exif-tag.c:436
-#, fuzzy
 msgid "Indicates whether the latitude of the destination point is north or south latitude. The ASCII value 'N' indicates north latitude, and 'S' is south latitude."
 msgstr "Gibt an, ob die Breite in nördlicher oder südlicher Breite angegeben ist. Der ASCII Wert \"N\" gibt nördliche Breite an, der Wert \"S\" ist südliche Breite."
 
 #: libexif/exif-tag.c:439
 msgid "Latitude of destination"
-msgstr ""
+msgstr "Breitengrad des Ziels"
 
 #: libexif/exif-tag.c:440
-#, fuzzy
 msgid "Indicates the latitude of the destination point. The latitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If latitude is expressed as degrees, minutes and seconds, a typical format would be dd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be dd/1,mmmm/100,0/1."
-msgstr "Enthält den Breitengrad. Der Breitengrad wird durch drei RATIONAL Werte angegeben, den Grad, die Minuten und die Sekunden. Wenn Grad, Minuten und Sekunden angegeben werden, ist das Format dd/1, mm/1, ss/1. Wenn Grade und Minuten benutzt werden und, z.B., Minutenteil auf 2 Stellen Genauigkeit, dann ist das Format, dd/1, mmmm/100, 0/1."
+msgstr "Enthält den Breitengrad des Zielpunktes. Der Breitengrad wird durch drei RATIONAL Werte angegeben, den Grad, die Minuten und die Sekunden. Wenn Grad, Minuten und Sekunden angegeben werden, ist das Format dd/1, mm/1, ss/1. Wenn Grade und Minuten benutzt werden und, z.B., Minutenteil auf 2 Stellen Genauigkeit, dann ist das Format, dd/1, mmmm/100, 0/1."
 
 #: libexif/exif-tag.c:447
 msgid "Reference for longitude of destination"
-msgstr ""
+msgstr "Referenz des Längengrad des Zieles"
 
 #: libexif/exif-tag.c:448
-#, fuzzy
 msgid "Indicates whether the longitude of the destination point is east or west longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
 msgstr "Gibt an, ob die Länge östliche oder westliche Länge ist. ASCII 'E' steht für östliche Länge und 'W' für westliche."
 
 #: libexif/exif-tag.c:451
 msgid "Longitude of destination"
-msgstr ""
+msgstr "Längengrad des Zieles"
 
 #: libexif/exif-tag.c:452
-#, fuzzy
 msgid "Indicates the longitude of the destination point. The longitude is expressed as three RATIONAL values giving the degrees, minutes, and seconds, respectively. If longitude is expressed as degrees, minutes and seconds, a typical format would be ddd/1,mm/1,ss/1. When degrees and minutes are used and, for example, fractions of minutes are given up to two decimal places, the format would be ddd/1,mmmm/100,0/1."
-msgstr "Enthält den Längengrad. Der Längengrad wird durch drei RATIONAL Werte angegeben, den Grad, die Minuten und die Sekunden. Wenn Grad, Minuten und Sekunden angegeben werden, ist das Format dd/1, mm/1, ss/1. Wenn Grade und Minuten benutzt werden und, z.B., Minutenteil auf 2 Stellen Genauigkeit, dann ist das Format, dd/1, mmmm/100, 0/1."
+msgstr "Enthält den Längengrad des Zielpunktes. Der Längengrad wird durch drei RATIONAL Werte angegeben, den Grad, die Minuten und die Sekunden. Wenn Grad, Minuten und Sekunden angegeben werden, ist das Format dd/1, mm/1, ss/1. Wenn Grade und Minuten benutzt werden und, z.B., Minutenteil auf 2 Stellen Genauigkeit, dann ist das Format, dd/1, mmmm/100, 0/1."
 
 #: libexif/exif-tag.c:460
 msgid "Reference for bearing of destination"
-msgstr ""
+msgstr "Referenz für Richtung des Zieles"
 
 #: libexif/exif-tag.c:461
-#, fuzzy
 msgid "Indicates the reference used for giving the bearing to the destination point. 'T' denotes true direction and 'M' is magnetic direction."
-msgstr "Gibt die Referenz für die Richtung des Bildes bei der Aufname an. T gibt die wahre Richtung und M die magnetische Richtung an."
+msgstr "Gibt die Referenz für die Richtung des Zielpunktes bei der Aufname an. T gibt die wahre Richtung und M die magnetische Richtung an."
 
 #: libexif/exif-tag.c:464
 msgid "Bearing of destination"
-msgstr ""
+msgstr "Richtung des Zieles"
 
 #: libexif/exif-tag.c:465
-#, fuzzy
 msgid "Indicates the bearing to the destination point. The range of values is from 0.00 to 359.99."
-msgstr "Gibt die Richtung der Bildaufnahme an. Dieser Wert geht von 0.0 bis 359.99."
+msgstr "Gibt die Richtung der Bildaufnahme auf den Zielpunkts an. Dieser Wert geht von 0.0 bis 359.99."
 
 #: libexif/exif-tag.c:467
 msgid "Reference for distance to destination"
-msgstr ""
+msgstr "Referenz für Entfernung zum Zieles"
 
 #: libexif/exif-tag.c:468
 msgid "Indicates the unit used to express the distance to the destination point. 'K', 'M' and 'N' represent kilometers, miles and knots."
-msgstr ""
+msgstr "Gibt die Einheit der Entfernungsangabe zum Zielpunkts an. »K«, »M« und »N« sind respektive Kilometer, Meilen oder Knoten."
 
 #: libexif/exif-tag.c:471
 msgid "Distance to destination"
@@ -3027,7 +3021,7 @@ msgstr "Name des GPS Bereichs"
 
 #: libexif/exif-tag.c:480
 msgid "A character string recording the name of the GPS area. The first byte indicates the character code used, and this is followed by the name of the GPS area. Since the Type is not ASCII, NULL termination is not necessary."
-msgstr ""
+msgstr "Ein String der den Namen des GPS Gebietss enthält. Das erste Byte gibt den verwendeten Zeichensatz an und wird gefolgt vom Namen des GPS Gebiets. Da der Typ nicht ASCII ist, ist NULL Terminierung nicht nötig."
 
 #: libexif/exif-tag.c:484
 msgid "GPS date"
@@ -3035,7 +3029,7 @@ msgstr "GPS Zeit"
 
 #: libexif/exif-tag.c:485
 msgid "A character string recording date and time information relative to UTC (Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of the string is 11 bytes including NULL."
-msgstr ""
+msgstr "Ein String der Datum und Zeit relativ zu UTC (Universal Time Coordinated) angibt. Das Format ist »YYYY:MM:DD«. Die Länge des Strings ist 11 Byte inklusive der abschliessenden NULL."
 
 #: libexif/exif-tag.c:489
 msgid "GPS differential correction"
@@ -3231,7 +3225,7 @@ msgstr "XP Stichwörter"
 
 #: libexif/exif-tag.c:635
 msgid "A character string containing key words describing the image, encoded in UTF-16LE."
-msgstr ""
+msgstr "Ein String der Stichwörter die das Bild beschreiben angibt, kodiert in UTF-16LE.y"
 
 #: libexif/exif-tag.c:639
 msgid "XP Subject"
@@ -3239,7 +3233,7 @@ msgstr "XP Überschrift"
 
 #: libexif/exif-tag.c:640
 msgid "A character string giving the image subject, encoded in UTF-16LE."
-msgstr ""
+msgstr "Ein String der die Bildüberschrift angibt, kodiert in UTF-16LE."
 
 #: libexif/exif-tag.c:644
 msgid "The FlashPix format version supported by a FPXR file."
@@ -3404,11 +3398,11 @@ msgstr "Dieser Tag gibt an welche Art vo
 
 #: libexif/exif-tag.c:816
 msgid "Gain Control"
-msgstr ""
+msgstr "Verstärkungsreglung"
 
 #: libexif/exif-tag.c:817
 msgid "This tag indicates the degree of overall image gain adjustment."
-msgstr ""
+msgstr "Dieses Tag gibt den Grad der Verstärkungsregelung an."
 
 #: libexif/exif-tag.c:821
 msgid "This tag indicates the direction of contrast processing applied by the camera when the image was shot."

[libexif-cvs] libexif/po en_CA.po,1.9,1.10

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

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

Modified Files:
	en_CA.po 
Log Message:
Added a few characters from the extended ISO-8859-1 range that make sense


Index: en_CA.po
===================================================================
RCS file: /cvsroot/libexif/libexif/po/en_CA.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- en_CA.po	17 Sep 2009 05:40:19 -0000	1.9
+++ en_CA.po	22 Sep 2009 05:44:22 -0000	1.10
@@ -7,13 +7,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libexif 0.6.17.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 22:05-0700\n"
+"POT-Creation-Date: 2009-09-21 22:41-0700\n"
 "PO-Revision-Date: 2007-11-12 18:00-0800\n"
 "Last-Translator: Dan Fandrich <da...@co...>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=US-ASCII\n"
-"Content-Transfer-Encoding: 7bit\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n == 1 ? 0 : 1;\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
@@ -423,11 +423,11 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:154
 msgid "2x"
-msgstr ""
+msgstr "2×"
 
 #: libexif/canon/mnote-canon-entry.c:155
 msgid "4x"
-msgstr ""
+msgstr "4×"
 
 #: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:686
 #: libexif/exif-entry.c:716
@@ -662,7 +662,7 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:223
 msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
-msgstr ""
+msgstr "Canon MP-E 65mm f/2.8 1-5× Macro Photo"
 
 #: libexif/canon/mnote-canon-entry.c:224
 msgid "Canon TS-E 24mm f/3.5L"
@@ -1143,7 +1143,7 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:385
 msgid "2x2 matrix (clockwise)"
-msgstr ""
+msgstr "2×2 matrix (clockwise)"
 
 #: libexif/canon/mnote-canon-entry.c:391 libexif/canon/mnote-canon-entry.c:397
 #: libexif/canon/mnote-canon-entry.c:418 libexif/canon/mnote-canon-entry.c:428
@@ -1253,11 +1253,6 @@ msgstr ""
 msgid "%i (ms)"
 msgstr ""
 
-#: libexif/canon/mnote-canon-entry.c:582
-#, c-format
-msgid "%i"
-msgstr ""
-
 #: libexif/canon/mnote-canon-entry.c:621
 #, c-format
 msgid "%.2f mm"
@@ -1270,12 +1265,7 @@ msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:655 libexif/exif-entry.c:1048
 #, c-format
-msgid "1/%d"
-msgstr ""
-
-#: libexif/canon/mnote-canon-entry.c:657 libexif/exif-entry.c:1050
-#, c-format
-msgid "%d"
+msgid "1/%i"
 msgstr ""
 
 #: libexif/canon/mnote-canon-entry.c:667
@@ -2305,7 +2295,7 @@ msgstr ""
 #: libexif/exif-entry.c:1087
 #, c-format
 msgid " (%.02f cd/m^2)"
-msgstr ""
+msgstr " (%.02f cd/m²)"
 
 #: libexif/exif-entry.c:1097
 msgid "DSC"
@@ -2398,7 +2388,7 @@ msgid "Byte"
 msgstr ""
 
 #: libexif/exif-format.c:34
-msgid "Ascii"
+msgid "ASCII"
 msgstr ""
 
 #: libexif/exif-format.c:35
@@ -4071,7 +4061,7 @@ msgid "%2.2f mm"
 msgstr ""
 
 #: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
-#: libexif/pentax/mnote-pentax-entry.c:427
+#: libexif/pentax/mnote-pentax-entry.c:451
 #, c-format
 msgid "%i bytes unknown data"
 msgstr ""
@@ -4605,12 +4595,6 @@ msgstr ""
 msgid "panorama"
 msgstr ""
 
-#: libexif/olympus/mnote-olympus-entry.c:597
-#: libexif/olympus/mnote-olympus-entry.c:617
-#, c-format
-msgid "%li"
-msgstr ""
-
 #: libexif/olympus/mnote-olympus-entry.c:605
 msgid "left to right"
 msgstr ""
@@ -5120,15 +5104,15 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-entry.c:150
 msgid "2560x1920 or 2304x1728"
-msgstr ""
+msgstr "2560×1920 or 2304×1728"
 
 #: libexif/pentax/mnote-pentax-entry.c:156
 msgid "2304x1728 or 2592x1944"
-msgstr ""
+msgstr "2304×1728 or 2592×1944"
 
 #: libexif/pentax/mnote-pentax-entry.c:158
 msgid "2816x2212 or 2816x2112"
-msgstr ""
+msgstr "2816×2212 or 2816×2112"
 
 #: libexif/pentax/mnote-pentax-entry.c:169
 #: libexif/pentax/mnote-pentax-entry.c:295
@@ -5326,7 +5310,7 @@ msgstr ""
 
 #: libexif/pentax/mnote-pentax-entry.c:282
 msgid "3008x2008 or 3040x2024"
-msgstr ""
+msgstr "3008×2008 or 3040×2024"
 
 #: libexif/pentax/mnote-pentax-entry.c:293
 msgid "Digital Filter?"

[libexif-cvs] libexif-testsuite/tests check-readwrite-identity.sh, NONE, 1.1 Makefile.am, 1.23, 1.24

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

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

Modified Files:
	Makefile.am 
Added Files:
	check-readwrite-identity.sh 
Log Message:
Added check-readwrite-identity.sh test that passes each JPEG image
through a read/write/read pass to ensure that the final written tags equal
the originals


--- NEW FILE: check-readwrite-identity.sh ---
#!/bin/sh
# Read then write (unmodified) each image through exif.
# Check that the written image contains the same data as the original.

. check-vars.sh

tmpfile="./output.tmp"
tmpfile2="./output2.tmp"
tmpimg="./readwrite.out.jpg"

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

# Put exif output into canonical form by removing lines that could change
canonicalize () {
	# Remove the MakerNote tag (0x927c) as well. This really shouldn't be
	# necessary, but it seems that there are some problems with
	# several MakerNotes types so they aren't completely identical to
	# the originals right now.
	sed -i  -e '/^EXIF tags in /d' \
		-e '/^0x927c/d' \
	  "$1"
}

echo Testing "$EXIFEXE"

errors=0
total=0
total_img=0

for img in $ALLFILES
do
	test -f "$img" || continue

	if noexiftags "$img" ; then
		continue # skip image
	fi

	total_img=$(expr $total_img + 1)
	echo \#${total_img}

	# Create a copy of the image that has been processed by exif
	# Force this by attempting deleting a nonexistent tag
	echo -n "Copying image \`${img}'..."
	"$EXIFEXE" --remove --tag=0xbeef --output="${tmpimg}" "${img}" > "$tmpfile" 2>&1
	check_result

	# Listing original EXIF info
	echo -n "Listing EXIF info..."
	# Run this in the C language locale so the messages are known
	env LANG=C LANGUAGE=C "$EXIFEXE" --ids "${img}" > "$tmpfile" 2>&1
	check_result

	# Listing copied EXIF info
	echo -n "Listing EXIF info..."
	# Run this in the C language locale so the messages are known
	env LANG=C LANGUAGE=C "$EXIFEXE" --ids "${tmpimg}" > "$tmpfile2" 2>&1
	check_result $tmpfile2

	canonicalize "$tmpfile"
	canonicalize "$tmpfile2"
	echo -n "Comparing before and after..."
	"$DIFFEXE" "$tmpfile" "$tmpfile2"
	check_result

	# Listing original MakerNote info
	echo -n "Listing MakerNote info..."
	# Run this in the C language locale so the messages are known
	env LANG=C LANGUAGE=C "$EXIFEXE" --ids --show-mnote "${img}" > "$tmpfile" 2>&1
	check_result

	# Listing copied MakerNote info
	echo -n "Listing MakerNote info..."
	# Run this in the C language locale so the messages are known
	env LANG=C LANGUAGE=C "$EXIFEXE" --ids --show-mnote "${tmpimg}" > "$tmpfile2" 2>&1
	check_result $tmpfile2

	canonicalize "$tmpfile"
	canonicalize "$tmpfile2"
	echo -n "Comparing before and after..."
	"$DIFFEXE" "$tmpfile" "$tmpfile2"
	check_result

done

rm "$tmpfile"
rm "$tmpfile2"
rm "$tmpimg"

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

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -d -r1.23 -r1.24
--- Makefile.am	22 Jan 2009 07:47:50 -0000	1.23
+++ Makefile.am	19 Sep 2009 05:23:45 -0000	1.24
@@ -9,6 +9,7 @@ SUBDIRS = images
 EXTRA_DIST = \
 	check-exif-executable.sh \
 	check-general-images.sh \
+	check-readwrite-identity.sh \
 	check-no-unknown-tags.sh \
 	check-all-mandatory-tags.sh \
 	check-994706.sh check-994706.b.patch \
@@ -22,11 +23,14 @@ if HAVE_EXIF_CLI
 check_SCRIPTS = \
 	check-exif-executable.sh \
 	check-994706.sh \
-	check-1054321.sh check-1054322.sh check-1054323.sh \
+	check-1054321.sh \
+	check-1054322.sh \
+	check-1054323.sh \
 	check-1169170.sh
 
-# This check script may take a little long - but it is invaluable. :)
+# These check scripts may take a little long - but are invaluable. :)
 check_SCRIPTS += check-general-images.sh \
+	check-readwrite-identity.sh \
 	check-no-unknown-tags.sh \
 	check-all-mandatory-tags.sh
 

[libexif-cvs] libexif-testsuite NEWS,1.9,1.10

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

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

Modified Files:
	NEWS 
Log Message:
Added check-readwrite-identity.sh test that passes each JPEG image
through a read/write/read pass to ensure that the final written tags equal
the originals


Index: NEWS
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/NEWS,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- NEWS	22 Jan 2009 07:47:49 -0000	1.9
+++ NEWS	19 Sep 2009 05:23:44 -0000	1.10
@@ -6,6 +6,9 @@ New in 0.7.x:
     recognized
   * Added check-all-mandatory-tags.sh test to ensure that no EXIF tags need
     to be added because they are mandatory
+  * Added check-readwrite-identity.sh test that passes each JPEG image
+    through a read/write/read pass to ensure that the final written tags equal
+    the originals
 
 New in 0.7.13:
   * Working with libexif and exif ver. 0.6.17