libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif ChangeLog,1.149,1.150

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

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

Modified Files:
	ChangeLog 
Log Message:

2004-10-02  Lutz Mueller <lu...@us...>

	* libexif/exif-mem.[c,h]: New. First attempt to offer out-sourcing
	  of memory management.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- ChangeLog	1 Oct 2004 12:26:17 -0000	1.149
+++ ChangeLog	2 Oct 2004 05:55:24 -0000	1.150
@@ -1,3 +1,8 @@
+2004-10-02  Lutz Mueller <lu...@us...>
+
+	* libexif/exif-mem.[c,h]: New. First attempt to offer out-sourcing
+	  of memory management.
+
 2004-10-01  Jan Patera <pa...@us...>
 
 	* libexif/exif-entry.c: exif_entry_fix:

[libexif-cvs] libexif/libexif/canon mnote-canon-entry.c,1.5,1.6

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

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

Modified Files:
	mnote-canon-entry.c 
Log Message:

2004-10-02  Lutz Mueller <lu...@us...>

	* libexif/exif-mem.[c,h]: New. First attempt to offer out-sourcing
	  of memory management.


Index: mnote-canon-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mnote-canon-entry.c	7 Jan 2004 14:53:04 -0000	1.5
+++ mnote-canon-entry.c	2 Oct 2004 05:55:26 -0000	1.6
@@ -537,7 +537,9 @@
 		CF (entry->format, EXIF_FORMAT_LONG, val, maxlen);
 		CC (entry->components, 1, val, maxlen);
 		vl = exif_get_long (data, entry->order);
-		snprintf (val, maxlen, "%03lu-%04lu", vl/10000,vl%10000);
+		snprintf (val, maxlen, "%03lu-%04lu",
+				(unsigned long) vl/10000,
+				(unsigned long) vl%10000);
 		break;
 
 	case MNOTE_CANON_TAG_SERIAL_NUMBER:

[libexif-cvs] libexif ChangeLog,1.148,1.149

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

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

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

	* libexif/exif-entry.c: exif_entry_fix:
	  exif_set_short: 2nd & 3rd args swapped



Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- ChangeLog	18 Sep 2004 06:55:14 -0000	1.148
+++ ChangeLog	1 Oct 2004 12:26:17 -0000	1.149
@@ -1,3 +1,8 @@
+2004-10-01  Jan Patera <pa...@us...>
+
+	* libexif/exif-entry.c: exif_entry_fix:
+	  exif_set_short: 2nd & 3rd args swapped
+
 2004-09-18  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-entry.c (exif_entry_fix): Enhance.

[libexif-cvs] libexif/libexif exif-entry.c,1.63,1.64

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

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

Modified Files:
	exif-entry.c 
Log Message:
2004-10-01  Jan Patera <pa...@us...>

	* libexif/exif-entry.c: exif_entry_fix:
	  exif_set_short: 2nd & 3rd args swapped



Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- exif-entry.c	18 Sep 2004 06:55:18 -0000	1.63
+++ exif-entry.c	1 Oct 2004 12:26:17 -0000	1.64
@@ -176,11 +176,11 @@
 				exif_set_short (
 					e->data + i *
 					exif_format_get_size (
-					EXIF_FORMAT_SHORT),
+					EXIF_FORMAT_SHORT), o,
 					(ExifShort) exif_get_long (
 					e->data + i *
 					exif_format_get_size (
-					EXIF_FORMAT_LONG), o), o);
+					EXIF_FORMAT_LONG), o));
 			e->format = EXIF_FORMAT_SHORT;
 			e->size = e->components *
 				exif_format_get_size (e->format);

[libexif-cvs] libexif/libexif exif-entry.c,1.62,1.63

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

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

Modified Files:
	exif-entry.c 
Log Message:

2004-09-18  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c (exif_entry_fix): Enhance.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- exif-entry.c	17 Sep 2004 20:59:15 -0000	1.62
+++ exif-entry.c	18 Sep 2004 06:55:18 -0000	1.63
@@ -145,10 +145,60 @@
 exif_entry_fix (ExifEntry *e)
 {
 	unsigned int i;
+	ExifByteOrder o;
 
 	if (!e) return;
 
 	switch (e->tag) {
+	
+	/* These tags all need to be of format SHORT. */
+	case EXIF_TAG_YCBCR_SUB_SAMPLING:
+	case EXIF_TAG_SUBJECT_AREA:
+	case EXIF_TAG_COLOR_SPACE:
+	case EXIF_TAG_PLANAR_CONFIGURATION:
+	case EXIF_TAG_SENSING_METHOD:
+	case EXIF_TAG_ORIENTATION:
+	case EXIF_TAG_YCBCR_POSITIONING:
+	case EXIF_TAG_PHOTOMETRIC_INTERPRETATION:
+	case EXIF_TAG_CUSTOM_RENDERED:
+	case EXIF_TAG_EXPOSURE_MODE:
+	case EXIF_TAG_WHITE_BALANCE:
+	case EXIF_TAG_SCENE_CAPTURE_TYPE:
+	case EXIF_TAG_GAIN_CONTROL:
+	case EXIF_TAG_SATURATION:
+	case EXIF_TAG_CONTRAST:
+	case EXIF_TAG_SHARPNESS:
+		switch (e->format) {
+		case EXIF_FORMAT_LONG:
+			if (!e->parent || !e->parent->parent) break;
+			o = exif_data_get_byte_order (e->parent->parent);
+			for (i = 0; i < e->components; i++)
+				exif_set_short (
+					e->data + i *
+					exif_format_get_size (
+					EXIF_FORMAT_SHORT),
+					(ExifShort) exif_get_long (
+					e->data + i *
+					exif_format_get_size (
+					EXIF_FORMAT_LONG), o), o);
+			e->format = EXIF_FORMAT_SHORT;
+			e->size = e->components *
+				exif_format_get_size (e->format);
+			e->data = exif_entry_realloc (e, e->data, e->size);
+			exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
+				"Tag '%s' was of format '%s' (which is "
+				"against specification) and has been "
+				"changed to format '%s'.",
+				exif_tag_get_name (e->tag), 
+				exif_format_get_name (EXIF_FORMAT_LONG),
+				exif_format_get_name (EXIF_FORMAT_SHORT));
+			break;
+		case EXIF_FORMAT_SHORT:
+		default:
+			break;
+		}
+		break;
+
 	case EXIF_TAG_USER_COMMENT:
 
 		/* Format needs to be UNDEFINED. */

[libexif-cvs] libexif ChangeLog,1.147,1.148

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

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

Modified Files:
	ChangeLog 
Log Message:

2004-09-18  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c (exif_entry_fix): Enhance.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- ChangeLog	17 Sep 2004 20:59:15 -0000	1.147
+++ ChangeLog	18 Sep 2004 06:55:14 -0000	1.148
@@ -1,3 +1,7 @@
+2004-09-18  Lutz Mueller <lu...@us...>
+
+	* libexif/exif-entry.c (exif_entry_fix): Enhance.
+
 2004-09-17  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-entry.c (exif_entry_fix): New. Fixes any violations

[libexif-cvs] libexif ChangeLog,1.146,1.147

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

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

Modified Files:
	ChangeLog 
Log Message:

2004-09-17  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c (exif_entry_fix): New. Fixes any violations
	  against the standard.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- ChangeLog	17 Sep 2004 20:06:41 -0000	1.146
+++ ChangeLog	17 Sep 2004 20:59:15 -0000	1.147
@@ -1,5 +1,10 @@
 2004-09-17  Lutz Mueller <lu...@us...>
 
+	* libexif/exif-entry.c (exif_entry_fix): New. Fixes any violations
+	  against the standard.
+
+2004-09-17  Lutz Mueller <lu...@us...>
+
 	* libexif/exif-entry.c: Kill some warnings. Read as much from the
 	  UserComment tag as possible (as suggested by Angela Wrobel).
 

[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c,1.18,1.19

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

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

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

2004-09-17  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c (exif_entry_fix): New. Fixes any violations
	  against the standard.


Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mnote-olympus-entry.c	15 Sep 2004 16:43:53 -0000	1.18
+++ mnote-olympus-entry.c	17 Sep 2004 20:59:15 -0000	1.19
@@ -189,7 +189,7 @@
 		if ((vl & 0xF0F0F0F0) == 0x30303030) {
 			memcpy (v, entry->data, MIN (maxlen, 4));
 		} else {
-			snprintf (v, maxlen, "%04lx", vl);
+			snprintf (v, maxlen, "%04lx", (long unsigned int) vl);
 		}
 		break;
 	case MNOTE_NIKON_TAG_ISO:
@@ -232,7 +232,7 @@
                 CF (entry->format, EXIF_FORMAT_LONG, v, maxlen);
                 CC (entry->components, 1, v, maxlen);
                 vl =  exif_get_long (entry->data, entry->order);
-                snprintf (v, maxlen, "%lu",  vl );
+                snprintf (v, maxlen, "%lu",  (long unsigned int) vl );
                 break;
 	case MNOTE_NIKON_TAG_WHITEBALANCEFINE:
                 CF (entry->format, EXIF_FORMAT_SSHORT, v, maxlen);
@@ -387,10 +387,10 @@
 			strncpy (v, _("panorama"), maxlen);
 			break;
 		default:
-			snprintf (v, maxlen, _("%li"), vl);
+			snprintf (v, maxlen, _("%li"), (long int) vl);
 		}
 		vl = exif_get_long (entry->data + 4, entry->order);
-		snprintf (buf, sizeof (buf), "/%li/", vl);
+		snprintf (buf, sizeof (buf), "/%li/", (long int) vl);
 		strncat (v, buf, maxlen - strlen (v));
 		vl = exif_get_long (entry->data + 4, entry->order);
 		switch (vl) {
@@ -407,7 +407,8 @@
 			strncat (v, _("top to bottom"), maxlen - strlen (v));
 			break;
 		default:
-			snprintf (buf, sizeof (buf), _("%li"), vl);
+			snprintf (buf, sizeof (buf), _("%li"),
+				  (long int) vl);
 			strncat (v, buf, maxlen - strlen (v));
 		}
 		break;
@@ -520,12 +521,12 @@
 			break;
 		case EXIF_FORMAT_LONG:
 			vl = exif_get_long (entry->data, entry->order);
-			snprintf (v, maxlen, "%li", vl);
+			snprintf (v, maxlen, "%li", (long int) vl);
 			break;
 		case EXIF_FORMAT_UNDEFINED:
 		default:
 			snprintf (v, maxlen, _("%li bytes unknown data: "),
-				  entry->size);
+				  (long int) entry->size);
 			for (i = 0; i < (int)entry->size; i++) {
 				sprintf (buf, "%02x", entry->data[i]);
 				strncat (v, buf, maxlen - strlen (v));

[libexif-cvs] libexif/libexif exif-data.c,1.47,1.48 exif-entry.c,1.61,1.62 exif-entry.h,1.10,1.11

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

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

Modified Files:
	exif-data.c exif-entry.c exif-entry.h 
Log Message:

2004-09-17  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c (exif_entry_fix): New. Fixes any violations
	  against the standard.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- exif-entry.c	17 Sep 2004 20:06:49 -0000	1.61
+++ exif-entry.c	17 Sep 2004 20:59:15 -0000	1.62
@@ -76,6 +76,25 @@
 	return NULL;
 }
 
+static void *
+exif_entry_realloc (ExifEntry *e, void *d_orig, unsigned int i)
+{
+	void *d;
+	ExifLog *l = NULL;
+
+	if (!i) { free (d_orig); return NULL; }
+
+	/* This is the only call to realloc in this file. */
+	d = realloc (d_orig, i);
+	if (d) return d;
+
+	if (e && e->parent && e->parent->parent)
+		l = exif_data_get_log (e->parent->parent);
+	EXIF_LOG_NO_MEMORY (l, "ExifEntry", i);
+
+	return NULL;
+}
+
 ExifEntry *
 exif_entry_new (void)
 {
@@ -123,6 +142,95 @@
 }
 
 void
+exif_entry_fix (ExifEntry *e)
+{
+	unsigned int i;
+
+	if (!e) return;
+
+	switch (e->tag) {
+	case EXIF_TAG_USER_COMMENT:
+
+		/* Format needs to be UNDEFINED. */
+		if (e->format != EXIF_FORMAT_UNDEFINED) {
+			exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
+				"Tag 'UserComment' had invalid format '%s'. "
+				"Format has been set to 'undefined'.",
+				exif_format_get_name (e->format));
+			e->format = EXIF_FORMAT_UNDEFINED;
+		}
+
+		/* Some cameras fill the tag with '\0' or ' '. */
+		for (i = 0; i < e->size &&
+			    (!e->data[i] || (e->data[i] == ' ')); i++);
+		if (i && (i == e->size)) {
+			exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
+				"Tag 'UserComment' contained unnecessary "
+				"data which has been removed.");
+			free (e->data);
+			e->data = NULL;
+			e->size = 0;
+			e->components = 0;
+		}
+
+		/* There need to be at least 8 bytes. */
+		if (e->size < 8) {
+			e->data = exif_entry_realloc (e, e->data, 8 + e->size);
+			if (!e->data) {
+				e->size = 0;
+				e->components = 0;
+				return;
+			}
+
+			/* Assume ASCII */
+			memmove (e->data + 8, e->data, e->size);
+			memcpy (e->data, "ASCII\0\0\0", 8);
+			exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
+				"Tag 'UserComment' has been expanded to at "
+				"least 8 bytes in order to follow the "
+				"specification.");
+			break;
+		}
+
+		/*
+		 * If the first 8 bytes are empty and real data starts
+		 * afterwards, let's assume ASCII and claim the 8 first
+		 * bytes for the format specifyer.
+		 */
+		if (i >= 8) {
+			exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
+				"Tag 'UserComment' did not start with "
+				"format identifyer. This has been fixed.");
+			memcpy (e->data, "ASCII\0\0\0", 8);
+		}
+
+		/* First 8 bytes need to follow the specification. */
+		if (memcmp (e->data, "ASCII\0\0\0"  , 8) &&
+		    memcmp (e->data, "UNICODE\0"    , 8) &&
+		    memcmp (e->data, "JIS\0\0\0\0\0", 8)) {
+			e->data = exif_entry_realloc (e, e->data, 8 + e->size);
+			if (!e->data) {
+				e->size = 0;
+				e->components = 0;
+				break;
+			}
+
+			/* Assume ASCII */
+			memmove (e->data + 8, e->data, e->size);
+			memcpy (e->data, "ASCII\0\0\0", 8);
+			exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
+				"Tag 'UserComment' did not start with "
+				"format identifyer. This has been fixed.");
+			break;
+		}
+
+		break;
+	default:
+		break;
+	}
+}
+
+void
 exif_entry_dump (ExifEntry *e, unsigned int indent)
 {
 	char buf[1024];

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- exif-data.c	8 Sep 2004 06:00:03 -0000	1.47
+++ exif-data.c	17 Sep 2004 20:59:15 -0000	1.48
@@ -143,13 +143,15 @@
 		return;
 
 	entry->data = exif_data_alloc (data, s);
-	if (!entry->data) return;
-	entry->size = s;
-	memcpy (entry->data, d + doff, s);
+	if (entry->data) {
+		entry->size = s;
+		memcpy (entry->data, d + doff, s);
+	}
 
 	/* If this is the MakerNote, remember the offset */
 	if (entry->tag == EXIF_TAG_MAKER_NOTE) {
-		exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",
+		if (entry->size > 6) exif_log (data->priv->log,
+			  EXIF_LOG_CODE_DEBUG, "ExifData",
 		          "MakerNote found (%02x %02x %02x %02x "
 			  "%02x %02x %02x...).",
 			  entry->data[0], entry->data[1], entry->data[2],
@@ -157,6 +159,8 @@
 			  entry->data[6]);
 		data->priv->offset_mnote = doff;
 	}
+
+	exif_entry_fix (entry);
 }
 
 static void

Index: exif-entry.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- exif-entry.h	7 Jan 2004 23:36:16 -0000	1.10
+++ exif-entry.h	17 Sep 2004 20:59:15 -0000	1.11
@@ -52,6 +52,7 @@
 void        exif_entry_free  (ExifEntry *entry);
 
 void        exif_entry_initialize (ExifEntry *entry, ExifTag tag);
+void        exif_entry_fix        (ExifEntry *entry);
 
 /* For your convenience */
 const char *exif_entry_get_value (ExifEntry *entry, char *val,

[libexif-cvs] libexif/libexif/pentax mnote-pentax-entry.c,1.7,1.8

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

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

Modified Files:
	mnote-pentax-entry.c 
Log Message:

2004-09-17  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c (exif_entry_fix): New. Fixes any violations
	  against the standard.


Index: mnote-pentax-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-entry.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mnote-pentax-entry.c	12 Sep 2004 19:52:39 -0000	1.7
+++ mnote-pentax-entry.c	17 Sep 2004 20:59:16 -0000	1.8
@@ -166,7 +166,7 @@
 		CF (entry->format, EXIF_FORMAT_LONG, val, maxlen);
 		CC (entry->components, 1, val, maxlen);
 		vl = exif_get_long (entry->data, entry->order);
-		snprintf (val, maxlen, "%li", vl);
+		snprintf (val, maxlen, "%li", (long int) vl);
 		break;
 	case MNOTE_PENTAX_TAG_PRINTIM:
 		CF (entry->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
@@ -195,7 +195,7 @@
 		  break;
 		case EXIF_FORMAT_LONG:
 		  vl = exif_get_long (entry->data, entry->order);
-		  snprintf (val, maxlen, "%li", vl);
+		  snprintf (val, maxlen, "%li", (long int) vl);
 		  break;
 		case EXIF_FORMAT_UNDEFINED:
 		default:

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

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

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

Modified Files:
	exif-entry.c 
Log Message:

2004-09-17  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c: Kill some warnings. Read as much from the
	  UserComment tag as possible (as suggested by Angela Wrobel).


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- exif-entry.c	8 Sep 2004 21:02:10 -0000	1.60
+++ exif-entry.c	17 Sep 2004 20:06:49 -0000	1.61
@@ -24,6 +24,7 @@
 #include "exif-utils.h"
 #include "i18n.h"
 
+#include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -386,24 +387,42 @@
 			CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
 
 		/*
-		 * According to the specification (V2.1, p 40),
+		 * Note that, according to the specification (V2.1, p 40),
 		 * the user comment field does not have to be 
 		 * NULL terminated.
 		 */
-		if (e->size < 8) break;
-		if (!memcmp (e->data, "ASCII\0\0\0", 8)) {
+		if ((e->size >= 8) && !memcmp (e->data, "ASCII\0\0\0", 8)) {
 			strncpy (val, e->data + 8, MIN (e->size - 8, maxlen));
 			break;
 		}
-		if (!memcmp (e->data, "UNICODE\0", 8)) {
+		if ((e->size >= 8) && !memcmp (e->data, "UNICODE\0", 8)) {
 			strncpy (val, _("Unsupported UNICODE string"), maxlen);
 			break;
 		}
-		if (!memcmp (e->data, "JIS\0\0\0\0\0", 8)) {
+		if ((e->size >= 8) && !memcmp (e->data, "JIS\0\0\0\0\0", 8)) {
 			strncpy (val, _("Unsupported JIS string"), maxlen);
 			break;
 		}
-		strncpy (val, e->data + 8, MIN (e->size - 8, maxlen));
+
+		/* Check if there is really some information in the tag. */
+		for (i = 0; (i < e->size) &&
+			    (!e->data[i] || (e->data[i] == ' ')); i++);
+		if (i == e->size) break;
+
+		/*
+		 * If we reach this point, the tag does not
+		 * comply with the standard and seems to contain data.
+		 * Print as much as possible.
+		 */
+		exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
+			"Tag UserComment does not comply "
+			"with standard but contains data.");
+		for (; (i < e->size)  && (strlen (val) < maxlen - 1); i++) {
+			exif_entry_log (e, EXIF_LOG_CODE_DEBUG,
+				"Byte at position %i: 0x%02x", i, e->data[i]);
+			val[strlen (val)] =
+				isprint (e->data[i]) ? e->data[i] : '.';
+		}
 		break;
 
 	case EXIF_TAG_EXIF_VERSION:
@@ -757,7 +776,8 @@
 				v_long = exif_get_long (e->data +
 					exif_format_get_size (e->format) *
 					i, o);
-				snprintf (b, sizeof (b), ", %li", v_long);
+				snprintf (b, sizeof (b), ", %li",
+					(long int) v_long);
 				strncat (val, b, maxlen);
 				maxlen -= strlen (b);
 				if ((signed)maxlen <= 0) break;
@@ -765,13 +785,14 @@
 			break;
 		case EXIF_FORMAT_SLONG:
 			v_slong = exif_get_slong (e->data, o);
-			snprintf (val, maxlen, "%li", v_slong);
+			snprintf (val, maxlen, "%li", (long int) v_slong);
 			maxlen -= strlen (val);
 			for (i = 1; i < e->components; i++) {
 				v_long = exif_get_slong (e->data +
 					exif_format_get_size (e->format) *
 					i, o);
-				snprintf (b, sizeof (b), ", %li", v_long);
+				snprintf (b, sizeof (b), ", %li",
+						(long int) v_long);
 				strncat (val, b, maxlen);
 				maxlen -= strlen (b);
 				if ((signed)maxlen <= 0) break;
@@ -824,7 +845,7 @@
 		}
 	}
 
-	return strlen (val) ? val : NULL;
+	return val;
 }
 
 void

[libexif-cvs] libexif ChangeLog,1.145,1.146

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

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

Modified Files:
	ChangeLog 
Log Message:

2004-09-17  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c: Kill some warnings. Read as much from the
	  UserComment tag as possible (as suggested by Angela Wrobel).


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- ChangeLog	15 Sep 2004 16:43:52 -0000	1.145
+++ ChangeLog	17 Sep 2004 20:06:41 -0000	1.146
@@ -1,3 +1,8 @@
+2004-09-17  Lutz Mueller <lu...@us...>
+
+	* libexif/exif-entry.c: Kill some warnings. Read as much from the
+	  UserComment tag as possible (as suggested by Angela Wrobel).
+
 2004-09-15  Jan Patera <pa...@us...>
 
 	* libexif/exif-loader.c: int -> unsigned int.

[libexif-cvs] libexif/libexif/olympus mnote-olympus-entry.c,1.17,1.18

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

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

Modified Files:
	mnote-olympus-entry.c 
Log Message:
2004-09-15  Jan Patera <pa...@us...>

	* libexif/exif-loader.c: int -> unsigned int.
	* libexif/olympus/mnote-olympus-entry.c: typecast.
	  Both changes made to avoid compiler warnings.



Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- mnote-olympus-entry.c	16 Aug 2004 14:48:14 -0000	1.17
+++ mnote-olympus-entry.c	15 Sep 2004 16:43:53 -0000	1.18
@@ -526,7 +526,7 @@
 		default:
 			snprintf (v, maxlen, _("%li bytes unknown data: "),
 				  entry->size);
-			for (i = 0; i < entry->size; i++) {
+			for (i = 0; i < (int)entry->size; i++) {
 				sprintf (buf, "%02x", entry->data[i]);
 				strncat (v, buf, maxlen - strlen (v));
 			}

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

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

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

Modified Files:
	exif-loader.c 
Log Message:
2004-09-15  Jan Patera <pa...@us...>

	* libexif/exif-loader.c: int -> unsigned int.
	* libexif/olympus/mnote-olympus-entry.c: typecast.
	  Both changes made to avoid compiler warnings.



Index: exif-loader.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- exif-loader.c	8 Sep 2004 06:00:03 -0000	1.9
+++ exif-loader.c	15 Sep 2004 16:43:53 -0000	1.10
@@ -75,7 +75,7 @@
 unsigned char
 exif_loader_write (ExifLoader *eld, unsigned char *buf, unsigned int len)
 {
-	int i, len_remain;
+	unsigned int i, len_remain;
 
 	if (!eld || !buf || !len) return 0;
 	if (eld->state == EL_FAILED) return 0;
@@ -156,7 +156,7 @@
 	len_remain = len - i;
 	if (!len_remain) return 1;
 
-	if (eld->state == EL_EXIF_FOUND && len_remain > 0) {
+	if (eld->state == EL_EXIF_FOUND) {
 		if (eld->buf == NULL) {
 			eld->buf = exif_loader_alloc (eld, eld->size);
 			if (!eld->buf) return 0;

[libexif-cvs] libexif ChangeLog,1.144,1.145

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

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

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

	* libexif/exif-loader.c: int -> unsigned int.
	* libexif/olympus/mnote-olympus-entry.c: typecast.
	  Both changes made to avoid compiler warnings.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- ChangeLog	12 Sep 2004 19:52:23 -0000	1.144
+++ ChangeLog	15 Sep 2004 16:43:52 -0000	1.145
@@ -1,3 +1,9 @@
+2004-09-15  Jan Patera <pa...@us...>
+
+	* libexif/exif-loader.c: int -> unsigned int.
+	* libexif/olympus/mnote-olympus-entry.c: typecast.
+	  Both changes made to avoid compiler warnings.
+
 2004-09-12  Lutz Mueller <lu...@us...>
 
 	Patch by mar...@us...: Some format string

[libexif-cvs] libexif/libexif/canon mnote-canon-tag.c,1.2,1.3

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

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

Modified Files:
	mnote-canon-tag.c 
Log Message:
Fixed wrong logic introduced on Sep 7th (This is the last module not yet fixed)


Index: mnote-canon-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mnote-canon-tag.c	7 Sep 2004 06:33:54 -0000	1.2
+++ mnote-canon-tag.c	15 Sep 2004 16:40:04 -0000	1.3
@@ -48,8 +48,8 @@
 	unsigned int i;
 
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
-		if (table[i].tag == t) break;
-	return (_(table[i].name));
+		if (table[i].tag == t) return (_(table[i].name));
+	return NULL;
 }
 
 const char *
@@ -59,8 +59,8 @@
 
 	bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR); 
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
-		if (table[i].tag == t) break; 
-	return (_(table[i].title));
+		if (table[i].tag == t) return (_(table[i].title));
+	return NULL;
 }
 
 const char *
@@ -70,6 +70,6 @@
 
 	bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
-		if (table[i].tag == t) break;
-	return (_(table[i].description));
+		if (table[i].tag == t) return (_(table[i].description));
+	return NULL;
 }

[libexif-cvs] libexif ChangeLog,1.143,1.144

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

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

Modified Files:
	ChangeLog 
Log Message:

2004-09-12  Lutz Mueller <lu...@us...>

	Patch by mar...@us...: Some format string
	fixes, wrong argument list fixed, format string problems avoided.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- ChangeLog	9 Sep 2004 06:27:21 -0000	1.143
+++ ChangeLog	12 Sep 2004 19:52:23 -0000	1.144
@@ -1,3 +1,8 @@
+2004-09-12  Lutz Mueller <lu...@us...>
+
+	Patch by mar...@us...: Some format string
+	fixes, wrong argument list fixed, format string problems avoided.
+
 2004-09-09  Lutz Mueller <lu...@us...>
 
 	* configure.in: Remove "([external])" after AM_GNU_GETTEXT as it

[libexif-cvs] libexif/libexif exif-log.h,1.3,1.4

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

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

Modified Files:
	exif-log.h 
Log Message:

2004-09-12  Lutz Mueller <lu...@us...>

	Patch by mar...@us...: Some format string
	fixes, wrong argument list fixed, format string problems avoided.


Index: exif-log.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-log.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- exif-log.h	9 Sep 2004 06:27:21 -0000	1.3
+++ exif-log.h	12 Sep 2004 19:52:23 -0000	1.4
@@ -49,7 +49,12 @@
 void     exif_log_set_func (ExifLog *log, ExifLogFunc func, void *data);
 
 void     exif_log  (ExifLog *log, ExifLogCode, const char *domain,
-		    const char *format, ...);
+		    const char *format, ...)
+#ifdef __GNUC__
+			__attribute__((__format__(printf,4,5)))
+#endif
+;
+
 void     exif_logv (ExifLog *log, ExifLogCode, const char *domain,
 		    const char *format, va_list args);
 

[libexif-cvs] libexif/libexif/pentax mnote-pentax-entry.c,1.6,1.7

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

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

Modified Files:
	mnote-pentax-entry.c 
Log Message:

2004-09-12  Lutz Mueller <lu...@us...>

	Patch by mar...@us...: Some format string
	fixes, wrong argument list fixed, format string problems avoided.


Index: mnote-pentax-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-entry.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mnote-pentax-entry.c	12 May 2004 12:03:47 -0000	1.6
+++ mnote-pentax-entry.c	12 Sep 2004 19:52:39 -0000	1.7
@@ -159,7 +159,7 @@
 				  "Internal error (unknown value %i)", vs);
 			break;
 		}
-		snprintf (val, maxlen, items[i].elem[j].string);
+		snprintf (val, maxlen, "%s", items[i].elem[j].string);
 		break;
 
 	case MNOTE_PENTAX_TAG_ZOOM:

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c,1.18,1.19

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

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

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

2004-09-12  Lutz Mueller <lu...@us...>

	Patch by mar...@us...: Some format string
	fixes, wrong argument list fixed, format string problems avoided.


Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- exif-mnote-data-olympus.c	7 Sep 2004 06:33:54 -0000	1.18
+++ exif-mnote-data-olympus.c	12 Sep 2004 19:52:39 -0000	1.19
@@ -110,7 +110,10 @@
 		(*buf)[6] = n->version;
 		o2 += 2; *buf_size += 2;
 		if (n->version == 2) {
-			exif_set_short (*buf + 10, n->order, (ExifShort) ((n->order == EXIF_BYTE_ORDER_INTEL) ? 'II' : 'MM'));
+			exif_set_short (*buf + 10, n->order, (ExifShort) (
+				(n->order == EXIF_BYTE_ORDER_INTEL) ?
+				('I' << 8) | 'I' :
+				('M' << 8) | 'M'));
 			exif_set_short (*buf + 12, n->order, (ExifShort) 0x2A);
 			exif_set_long (*buf + 14, n->order, (ExifShort) 8);
 			o2 += 2 + 8;
@@ -194,7 +197,7 @@
 		o2 += 6;
 		exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataOlympus",
 			"Parsing Nikon maker note (0x%02x, %02x, %02x, "
-			"%02x, %02x, %02x, %02x, %02x, %02x)...",
+			"%02x, %02x, %02x, %02x, %02x)...",
 			buf[o2 + 0], buf[o2 + 1], buf[o2 + 2], buf[o2 + 3], 
 			buf[o2 + 4], buf[o2 + 5], buf[o2 + 6], buf[o2 + 7]); 
 

[libexif-cvs] exif/exif main.c,1.40,1.41

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

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

Modified Files:
	main.c 
Log Message:

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

	* exif/configure.in: We depend on libexif 0.6.11.
	* exif/main.c: Use standard error titles and messages.


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- main.c	31 Aug 2004 13:33:29 -0000	1.40
+++ main.c	9 Sep 2004 06:28:26 -0000	1.41
@@ -210,11 +210,19 @@
 		printf ("\n");
 		break;
 	case EXIF_LOG_CODE_NO_MEMORY:
-		printf (COL_RED);
-		printf ("%s: ", domain);
-		vprintf (format, args);
-		printf (COL_NORMAL);
-		printf ("\n");
+	case EXIF_LOG_CODE_CORRUPT_DATA:
+		fprintf (stderr, "\033[31;1m");
+		fprintf (stderr, "\033[31;4m");
+		fprintf (stderr, exif_log_code_get_title (code));
+		fprintf (stderr, "\n");
+		fprintf (stderr, "\033[;0m");
+		fprintf (stderr, COL_RED);
+		fprintf (stderr, exif_log_code_get_message (code));
+		fprintf (stderr, "\n");
+		fprintf (stderr, "%s: ", domain);
+		vfprintf (stderr, format, args);
+		fprintf (stderr, COL_NORMAL);
+		fprintf (stderr, "\n");
 		break;
 	default:
 		printf (COL_BLUE);

[libexif-cvs] exif ChangeLog,1.45,1.46 configure.in,1.34,1.35

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

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

Modified Files:
	ChangeLog configure.in 
Log Message:

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

	* exif/configure.in: We depend on libexif 0.6.11.
	* exif/main.c: Use standard error titles and messages.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- ChangeLog	31 Aug 2004 13:33:53 -0000	1.45
+++ ChangeLog	9 Sep 2004 06:28:25 -0000	1.46
@@ -1,3 +1,8 @@
+2004-09-09  Lutz Mueller <lu...@us...>
+
+	* exif/configure.in: We depend on libexif 0.6.11.
+	* exif/main.c: Use standard error titles and messages.
+
 2004-08-31  Jan Patera <pa...@us...>
 
 	* exif/main.c,actions.*: action_mnote_list can print

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/exif/configure.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- configure.in	27 Aug 2004 16:28:18 -0000	1.34
+++ configure.in	9 Sep 2004 06:28:25 -0000	1.35
@@ -18,7 +18,7 @@
 dnl ---------------------------------------------------------------------------
 dnl libraries needed
 dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.6.9)
+PKG_CHECK_MODULES(LIBEXIF, libexif >= 0.6.11)
 AC_SUBST(LIBEXIF_LIBS)
 AC_SUBST(LIBEXIF_CFLAGS)
 

[libexif-cvs] libexif/libexif exif-log.c,1.2,1.3 exif-log.h,1.2,1.3

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

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

Modified Files:
	exif-log.c exif-log.h 
Log Message:

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

	* configure.in: Remove "([external])" after AM_GNU_GETTEXT as it
	  doesn't work for David MacMahon <da...@as...>.
	* libexif/exif-log.[c,h]: Provide some standard messages and titles.
	* configure.in: Increment version as interfaces have been added.


Index: exif-log.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-log.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-log.c	21 May 2004 14:28:56 -0000	1.2
+++ exif-log.c	9 Sep 2004 06:27:21 -0000	1.3
@@ -20,6 +20,7 @@
 
 #include <config.h>
 #include <libexif/exif-log.h>
+#include <libexif/i18n.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -31,6 +32,38 @@
 	void *data;
 };
 
+static struct {
+	ExifLogCode code;
+	const char *title;
+	const char *message;
+} codes[] = {
+	{ EXIF_LOG_CODE_DEBUG, N_("Debugging information"),
+	  N_("Debugging information is available.") },
+	{ EXIF_LOG_CODE_NO_MEMORY, N_("Not enough memory"),
+	  N_("The system cannot provide enough memory.") },
+	{ EXIF_LOG_CODE_CORRUPT_DATA, N_("Corrupt data"),
+	  N_("The data provided does not follow the specification.") },
+	{ 0, NULL, NULL }
+};
+
+const char *
+exif_log_code_get_title (ExifLogCode code)
+{
+	unsigned int i;
+
+	for (i = 0; codes[i].title; i++) if (codes[i].code == code) break;
+	return _(codes[i].title);
+}
+
+const char *
+exif_log_code_get_message (ExifLogCode code)
+{
+	unsigned int i;
+
+	for (i = 0; codes[i].message; i++) if (codes[i].code == code) break;
+	return _(codes[i].message);
+}
+
 ExifLog *
 exif_log_new (void)
 {

Index: exif-log.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-log.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-log.h	8 Sep 2004 20:55:28 -0000	1.2
+++ exif-log.h	9 Sep 2004 06:27:21 -0000	1.3
@@ -40,6 +40,8 @@
 	EXIF_LOG_CODE_NO_MEMORY,
 	EXIF_LOG_CODE_CORRUPT_DATA
 } ExifLogCode;
+const char *exif_log_code_get_title   (ExifLogCode); /* Title for dialog   */
+const char *exif_log_code_get_message (ExifLogCode); /* Message for dialog */
 
 typedef void (* ExifLogFunc) (ExifLog *log, ExifLogCode, const char *domain,
 			      const char *format, va_list args, void *data);

[libexif-cvs] libexif Makefile.am,1.28,1.29 ChangeLog,1.142,1.143 configure.in,1.66,1.67

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

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

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

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

	* configure.in: Remove "([external])" after AM_GNU_GETTEXT as it
	  doesn't work for David MacMahon <da...@as...>.
	* libexif/exif-log.[c,h]: Provide some standard messages and titles.
	* configure.in: Increment version as interfaces have been added.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- ChangeLog	8 Sep 2004 21:02:10 -0000	1.142
+++ ChangeLog	9 Sep 2004 06:27:21 -0000	1.143
@@ -1,3 +1,10 @@
+2004-09-09  Lutz Mueller <lu...@us...>
+
+	* configure.in: Remove "([external])" after AM_GNU_GETTEXT as it
+	  doesn't work for David MacMahon <da...@as...>.
+	* libexif/exif-log.[c,h]: Provide some standard messages and titles.
+	* configure.in: Increment version as interfaces have been added.
+
 2004-09-08  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-entry.c: Change comment to point to specification.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.am	6 Apr 2004 19:31:53 -0000	1.28
+++ Makefile.am	9 Sep 2004 06:27:21 -0000	1.29
@@ -1,4 +1,4 @@
-SUBDIRS = libexif libjpeg test po m4
+SUBDIRS =  libexif libjpeg test po m4
 
 EXTRA_DIST = @PACKAGE@.spec
 

Index: configure.in
===================================================================
RCS file: /cvsroot/libexif/libexif/configure.in,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- configure.in	27 Aug 2004 20:14:12 -0000	1.66
+++ configure.in	9 Sep 2004 06:27:21 -0000	1.67
@@ -16,7 +16,7 @@
 dnl ---------------------------------------------------------------------------
 LIBEXIF_AGE=0
 LIBEXIF_REVISION=0
-LIBEXIF_CURRENT=10
+LIBEXIF_CURRENT=11
 AC_SUBST(LIBEXIF_AGE)
 AC_SUBST(LIBEXIF_REVISION)
 AC_SUBST(LIBEXIF_CURRENT)
@@ -46,7 +46,7 @@
 else
 	AC_MSG_RESULT([no])
 fi
-AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT
 
 
 dnl ---------------------------------------------------------------------------
@@ -59,7 +59,7 @@
     AC_SUBST(LDFLAGS)
 fi
 
-AC_OUTPUT([ po/Makefile.in 
+AC_OUTPUT([
   Makefile
   libexif.spec
   libexif/Makefile

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

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

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

Modified Files:
	exif-entry.c 
Log Message:

2004-09-08  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c: Change comment to point to specification.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- exif-entry.c	8 Sep 2004 20:55:28 -0000	1.59
+++ exif-entry.c	8 Sep 2004 21:02:10 -0000	1.60
@@ -386,7 +386,7 @@
 			CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
 
 		/*
-		 * According to Ralf Holzer <rh...@cm...>,
+		 * According to the specification (V2.1, p 40),
 		 * the user comment field does not have to be 
 		 * NULL terminated.
 		 */