libexif-cvs — CVS commitlogs of all libexif CVS modules

[libexif-cvs] libexif ChangeLog,1.141,1.142

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

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

Modified Files:
	ChangeLog 
Log Message:

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

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


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- ChangeLog	8 Sep 2004 20:55:28 -0000	1.141
+++ ChangeLog	8 Sep 2004 21:02:10 -0000	1.142
@@ -1,5 +1,9 @@
 2004-09-08  Lutz Mueller <lu...@us...>
 
+	* libexif/exif-entry.c: Change comment to point to specification.
+
+2004-09-08  Lutz Mueller <lu...@us...>
+
 	* libexif/exif-entry.c: Redirect error messages to the logging 
 	  mechanism.
 	* libexif/exif-log.h: EXIF_LOG_CODE_CORRUPT_DATA: New.

[libexif-cvs] libexif/libexif exif-log.h,1.1,1.2 exif-entry.c,1.58,1.59

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

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

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

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

	* libexif/exif-entry.c: Redirect error messages to the logging 
	  mechanism.
	* libexif/exif-log.h: EXIF_LOG_CODE_CORRUPT_DATA: New.


Index: exif-log.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-log.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- exif-log.h	20 May 2004 10:50:35 -0000	1.1
+++ exif-log.h	8 Sep 2004 20:55:28 -0000	1.2
@@ -37,7 +37,8 @@
 typedef enum {
 	EXIF_LOG_CODE_NONE,
 	EXIF_LOG_CODE_DEBUG,
-	EXIF_LOG_CODE_NO_MEMORY
+	EXIF_LOG_CODE_NO_MEMORY,
+	EXIF_LOG_CODE_CORRUPT_DATA
 } ExifLogCode;
 
 typedef void (* ExifLogFunc) (ExifLog *log, ExifLogCode, const char *domain,

Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- exif-entry.c	7 Sep 2004 20:46:31 -0000	1.58
+++ exif-entry.c	8 Sep 2004 20:55:28 -0000	1.59
@@ -43,6 +43,19 @@
 /* This function is hidden in exif-data.c */
 ExifLog *exif_data_get_log (ExifData *);
 
+static void
+exif_entry_log (ExifEntry *e, ExifLogCode code, const char *format, ...)
+{
+	va_list args;
+	ExifLog *l = NULL;
+
+	if (e && e->parent && e->parent->parent)
+		l = exif_data_get_log (e->parent->parent);
+	va_start (args, format);
+	exif_logv (l, code, "ExifEntry", format, args);
+	va_end (args);
+}
+
 static void *
 exif_entry_alloc (ExifEntry *e, unsigned int i)
 {
@@ -131,24 +144,27 @@
 	printf ("%s  Value: %s\n", buf, exif_entry_get_value (e, value, sizeof(value)));
 }
 
-#define CF(format,target,v,maxlen)				\
-{								\
-	if (format != target) {					\
-		snprintf (v, maxlen,				\
-			_("Invalid format '%s', "		\
-			"expected '%s'."),			\
-			exif_format_get_name (format),		\
-			exif_format_get_name (target));		\
-		break;						\
-	}							\
+#define CF(entry,target,v,maxlen)					\
+{									\
+	if (entry->format != target) {					\
+		exif_entry_log (entry, EXIF_LOG_CODE_CORRUPT_DATA,	\
+			_("The tag '%s' contains data of an invalid "	\
+			"format ('%s', expected '%s')."),		\
+			exif_tag_get_name (entry->tag),			\
+			exif_format_get_name (entry->format),		\
+			exif_format_get_name (target));			\
+		break;							\
+	}								\
 }
 
-#define CC(number,target,v,maxlen)					\
+#define CC(entry,target,v,maxlen)					\
 {									\
-	if (number != target) {						\
-		snprintf (v, maxlen,					\
-			_("Invalid number of components (%i, "		\
-			"expected %i)."), (int) number, (int) target);	\
+	if (entry->components != target) {				\
+		exif_entry_log (entry, EXIF_LOG_CODE_CORRUPT_DATA,	\
+			_("The tag '%s' contains an invalid number of "	\
+			  "components (%i, expected %i)."),		\
+			exif_tag_get_name (entry->tag),		\
+			(int) entry->components, (int) target);		\
 		break;							\
 	}								\
 }
@@ -357,27 +373,23 @@
 
 		/*
 		 * The specification says UNDEFINED, but some
-		 * manufacturers don't care and use ASCII.
+		 * manufacturers don't care and use ASCII. If this is the
+		 * case here, only refuse to read it if there is no chance
+		 * of finding readable data.
 		 */
-		if (e->format == EXIF_FORMAT_ASCII) {
-			if ((e->size <= 8) || (
-			     memcmp (e->data, "ASCII\0\0\0", 8) &&
-			     memcmp (e->data, "UNICODE\0", 8) &&
-			     memcmp (e->data, "JIS\0\0\0\0\0", 8) &&
-			     memcmp (e->data, "\0\0\0\0\0\0\0\0", 8))) {
-				snprintf (val, maxlen, _("%s (illegal "
-					"format ASCII, expected UNDEFINED)"),
-					e->data);
-				break;
-			}
-		} else CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
+		if ((e->format != EXIF_FORMAT_ASCII) || 
+		    (e->size <= 8) ||
+		    ( memcmp (e->data, "ASCII\0\0\0"  , 8) &&
+		      memcmp (e->data, "UNICODE\0"    , 8) &&
+		      memcmp (e->data, "JIS\0\0\0\0\0", 8) &&
+		      memcmp (e->data, "\0\0\0\0\0\0\0\0", 8)))
+			CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
 
 		/*
 		 * According to Ralf Holzer <rh...@cm...>,
 		 * the user comment field does not have to be 
 		 * NULL terminated.
 		 */
-		CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
 		if (e->size < 8) break;
 		if (!memcmp (e->data, "ASCII\0\0\0", 8)) {
 			strncpy (val, e->data + 8, MIN (e->size - 8, maxlen));
@@ -395,8 +407,8 @@
 		break;
 
 	case EXIF_TAG_EXIF_VERSION:
-		CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
-		CC (e->components, 4, val, maxlen);
+		CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
+		CC (e, 4, val, maxlen);
 		strncpy (val, _("Unknown Exif Version"), maxlen);
 		for (i = 0; versions[i].label; i++) {
 			if (!memcmp (e->data, versions[i].label, 4)) {
@@ -409,8 +421,8 @@
 		}
 		break;
 	case EXIF_TAG_FLASH_PIX_VERSION:
-		CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
-		CC (e->components, 4, val, maxlen);
+		CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
+		CC (e, 4, val, maxlen);
 		if (!memcmp (e->data, "0100", 4))
 			strncpy (val, _("FlashPix Version 1.0"), maxlen);
 		else if (!memcmp (e->data, "0101", 4))
@@ -419,7 +431,7 @@
 			strncpy (val, _("Unknown FlashPix Version"), maxlen);
 		break;
 	case EXIF_TAG_COPYRIGHT:
-		CF (e->format, EXIF_FORMAT_ASCII, val, maxlen);
+		CF (e, EXIF_FORMAT_ASCII, val, maxlen);
 
 		/*
 		 * First part: Photographer.
@@ -447,16 +459,16 @@
 
 		break;
 	case EXIF_TAG_FNUMBER:
-		CF (e->format, EXIF_FORMAT_RATIONAL, val, maxlen);
-		CC (e->components, 1, val, maxlen);
+		CF (e, EXIF_FORMAT_RATIONAL, val, maxlen);
+		CC (e, 1, val, maxlen);
 		v_rat = exif_get_rational (e->data, o);
 		if (!v_rat.denominator) return NULL;
 		snprintf (val, maxlen, "f/%.01f", (float) v_rat.numerator /
 						    (float) v_rat.denominator);
 		break;
 	case EXIF_TAG_APERTURE_VALUE:
-		CF (e->format, EXIF_FORMAT_RATIONAL, val, maxlen);
-		CC (e->components, 1, val, maxlen);
+		CF (e, EXIF_FORMAT_RATIONAL, val, maxlen);
+		CC (e, 1, val, maxlen);
 		v_rat = exif_get_rational (e->data, o);
 		if (!v_rat.denominator) return NULL;
 		snprintf (val, maxlen, "f/%.01f",
@@ -464,8 +476,8 @@
 				    (float) v_rat.denominator) / 2.));
 		break;
 	case EXIF_TAG_FOCAL_LENGTH:
-		CF (e->format, EXIF_FORMAT_RATIONAL, val, maxlen);
-		CC (e->components, 1, val, maxlen);
+		CF (e, EXIF_FORMAT_RATIONAL, val, maxlen);
+		CC (e, 1, val, maxlen);
 		v_rat = exif_get_rational (e->data, o);
 		if (!v_rat.denominator) return NULL;
 
@@ -500,16 +512,16 @@
 			strncat (val, b, maxlen - strlen (val) - 1);
 		break;
 	case EXIF_TAG_SUBJECT_DISTANCE:
-		CF (e->format, EXIF_FORMAT_RATIONAL, val, maxlen);
-		CC (e->components, 1, val, maxlen);
+		CF (e, EXIF_FORMAT_RATIONAL, val, maxlen);
+		CC (e, 1, val, maxlen);
 		v_rat = exif_get_rational (e->data, o);
 		if (!v_rat.denominator) return NULL;
 		snprintf (val, maxlen, "%.1f m", (float) v_rat.numerator /
 						   (float) v_rat.denominator);
 		break;
 	case EXIF_TAG_EXPOSURE_TIME:
-		CF (e->format, EXIF_FORMAT_RATIONAL, val, maxlen);
-		CC (e->components, 1, val, maxlen);
+		CF (e, EXIF_FORMAT_RATIONAL, val, maxlen);
+		CC (e, 1, val, maxlen);
 		v_rat = exif_get_rational (e->data, o);
 		if (!v_rat.denominator) return NULL;
 		d = (double) v_rat.numerator / (double) v_rat.denominator;
@@ -522,8 +534,8 @@
 			strncat (val, " sec.", maxlen - strlen (val) - 1);
 		break;
 	case EXIF_TAG_SHUTTER_SPEED_VALUE:
-		CF (e->format, EXIF_FORMAT_SRATIONAL, val, maxlen);
-		CC (e->components, 1, val, maxlen);
+		CF (e, EXIF_FORMAT_SRATIONAL, val, maxlen);
+		CC (e, 1, val, maxlen);
 		v_srat = exif_get_srational (e->data, o);
 		if (!v_srat.denominator) return NULL;
 		snprintf (val, maxlen, "%.0f/%.0f", (float) v_srat.numerator,
@@ -537,24 +549,24 @@
 			strncat (val, b, maxlen - strlen (val) - 1);
 		break;
 	case EXIF_TAG_BRIGHTNESS_VALUE:
-		CF (e->format, EXIF_FORMAT_SRATIONAL, val, maxlen);
-		CC (e->components, 1, val, maxlen);
+		CF (e, EXIF_FORMAT_SRATIONAL, val, maxlen);
+		CC (e, 1, val, maxlen);
 		v_srat = exif_get_srational (e->data, o);
 		snprintf (val, maxlen, "%i/%i", (int) v_srat.numerator,
 						  (int) v_srat.denominator);
 		/* FIXME: How do I calculate the APEX value? */
 		break;
 	case EXIF_TAG_FILE_SOURCE:
-		CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
-		CC (e->components, 1, val, maxlen);
+		CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
+		CC (e, 1, val, maxlen);
 		switch (e->data[0]) {
 		case 0x03: strncpy (val, _("DSC"), maxlen); break;
 		default: snprintf (val, maxlen, "0x%02x", e->data[0]); break;
 		}
 		break;
 	case EXIF_TAG_COMPONENTS_CONFIGURATION:
-		CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
-		CC (e->components, 4, val, maxlen);
+		CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
+		CC (e, 4, val, maxlen);
 		for (i = 0; i < 4; i++) {
 			switch (e->data[i]) {
 			case 0: c = _("-"); break;
@@ -571,8 +583,8 @@
 		}
 		break;
 	case EXIF_TAG_EXPOSURE_BIAS_VALUE:
-		CF (e->format, EXIF_FORMAT_SRATIONAL, val, maxlen);
-		CC (e->components, 1, val, maxlen);
+		CF (e, EXIF_FORMAT_SRATIONAL, val, maxlen);
+		CC (e, 1, val, maxlen);
 		v_srat = exif_get_srational (e->data, o);
 		if (!v_srat.denominator)
 			return NULL;
@@ -582,8 +594,8 @@
 			  (double) v_srat.denominator);
 		break;
 	case EXIF_TAG_YCBCR_SUB_SAMPLING:
-		CF (e->format, EXIF_FORMAT_SHORT, val, maxlen);
-		CC (e->components, 2, val, maxlen);
+		CF (e, EXIF_FORMAT_SHORT, val, maxlen);
+		CC (e, 2, val, maxlen);
 		v_short  = exif_get_short (e->data, o);
 		v_short2 = exif_get_short (
 			e->data + exif_format_get_size (e->format),
@@ -596,12 +608,12 @@
 			snprintf (val, maxlen, "%i, %i", v_short, v_short2);
 		break;
 	case EXIF_TAG_MAKER_NOTE:
-		CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
+		CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
 		snprintf (val, maxlen, _("%i bytes unknown data"),
 			  (int) e->components);
 		break;
 	case EXIF_TAG_SUBJECT_AREA:
-		CF (e->format, EXIF_FORMAT_SHORT, val, maxlen);
+		CF (e, EXIF_FORMAT_SHORT, val, maxlen);
 		switch (e->components) {
 		case 2:
 			v_short  = exif_get_short (e->data, o);
@@ -642,8 +654,8 @@
 	case EXIF_TAG_FLASH:
 	case EXIF_TAG_SUBJECT_DISTANCE_RANGE:
 	case EXIF_TAG_COLOR_SPACE:
-		CF (e->format,EXIF_FORMAT_SHORT, val, maxlen);
-		CC (e->components, 1, val, maxlen);
+		CF (e,EXIF_FORMAT_SHORT, val, maxlen);
+		CC (e, 1, val, maxlen);
 		v_short = exif_get_short (e->data, o);
 
 		/* Search the tag */
@@ -686,8 +698,8 @@
 	case EXIF_TAG_SATURATION:
 	case EXIF_TAG_CONTRAST:
 	case EXIF_TAG_SHARPNESS:
-		CF (e->format, EXIF_FORMAT_SHORT, val, maxlen);
-		CC (e->components, 1, val, maxlen);
+		CF (e, EXIF_FORMAT_SHORT, val, maxlen);
+		CC (e, 1, val, maxlen);
 		v_short = exif_get_short (e->data, o);
 
 		/* Search the tag */

[libexif-cvs] libexif ChangeLog,1.140,1.141

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

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

Modified Files:
	ChangeLog 
Log Message:

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

	* libexif/exif-entry.c: Redirect error messages to the logging 
	  mechanism.
	* libexif/exif-log.h: EXIF_LOG_CODE_CORRUPT_DATA: New.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- ChangeLog	8 Sep 2004 06:00:03 -0000	1.140
+++ ChangeLog	8 Sep 2004 20:55:28 -0000	1.141
@@ -1,5 +1,11 @@
 2004-09-08  Lutz Mueller <lu...@us...>
 
+	* libexif/exif-entry.c: Redirect error messages to the logging 
+	  mechanism.
+	* libexif/exif-log.h: EXIF_LOG_CODE_CORRUPT_DATA: New.
+
+2004-09-08  Lutz Mueller <lu...@us...>
+
 	* libexif/exif-loader.c
 	* libexif/exif-data.c: Replace a couple of calls to malloc by 
 	  calls to calloc.

[libexif-cvs] libexif/libexif exif-data.c,1.46,1.47 exif-loader.c,1.8,1.9

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

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

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

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

	* libexif/exif-loader.c
	* libexif/exif-data.c: Replace a couple of calls to malloc by 
	  calls to calloc.


Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- exif-data.c	7 Sep 2004 06:15:38 -0000	1.46
+++ exif-data.c	8 Sep 2004 06:00:03 -0000	1.47
@@ -58,6 +58,19 @@
 	unsigned int offset_mnote;
 };
 
+static void *
+exif_data_alloc (ExifData *data, unsigned int i)
+{
+	void *d;
+
+	/* This is the only call to calloc in this file. */
+	d = calloc (i, 1);
+	if (d) return d;
+
+	if (data) EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", i);
+	return NULL;
+}
+
 ExifMnoteData *
 exif_data_get_mnote_data (ExifData *d)
 {
@@ -70,16 +83,10 @@
 	ExifData *data;
 	unsigned int i;
 
-	data = malloc (sizeof (ExifData));
-	if (!data)
-		return (NULL);
-	memset (data, 0, sizeof (ExifData));
-	data->priv = malloc (sizeof (ExifDataPrivate));
-	if (!data->priv) {
-		free (data);
-		return (NULL);
-	}
-	memset (data->priv, 0, sizeof (ExifDataPrivate));
+	data = exif_data_alloc (NULL, sizeof (ExifData));
+	if (!data) return (NULL);
+	data->priv = exif_data_alloc (data, sizeof (ExifDataPrivate));
+	if (!data->priv) { free (data); return (NULL); }
 	data->priv->ref_count = 1;
 
 	for (i = 0; i < EXIF_IFD_COUNT; i++) {
@@ -135,11 +142,8 @@
 	if (size < doff + s)
 		return;
 
-	entry->data = malloc (s);
-	if (!entry->data) {
-		EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", s);
-		return;
-	}
+	entry->data = exif_data_alloc (data, s);
+	if (!entry->data) return;
 	entry->size = s;
 	memcpy (entry->data, d + doff, s);
 
@@ -217,14 +221,10 @@
 			  (int) ds, (int) offset, (int) size);
 		return;
 	}
-	if (data->data)
-		free (data->data);
+	if (data->data) free (data->data);
 	data->size = size;
-	data->data = malloc (data->size);
-	if (!data->data) {
-		EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", data->size);
-		return;
-	}
+	data->data = exif_data_alloc (data, data->size);
+	if (!data->data) return;
 	memcpy (data->data, d + offset, data->size);
 }
 
@@ -727,9 +727,8 @@
 
 	/* Header */
 	*ds = 14;
-	*d = malloc (*ds);
-	if (!*d)
-	  	return;
+	*d = exif_data_alloc (data, *ds);
+	if (!*d) return;
 	memcpy (*d, ExifHeader, 6);
 
 	/* Order (offset 6) */

Index: exif-loader.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-loader.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- exif-loader.c	26 Aug 2004 20:08:09 -0000	1.8
+++ exif-loader.c	8 Sep 2004 06:00:03 -0000	1.9
@@ -31,6 +31,21 @@
 	ExifLog *log;
 };
 
+static void *
+exif_loader_alloc (ExifLoader *l, unsigned int i)
+{
+	void *d;
+
+	if (!i) return NULL;
+
+	/* This is the only call to calloc in this file. */
+	d = calloc (i, 1);
+	if (d) return d;
+
+	if (l) EXIF_LOG_NO_MEMORY (l->log, "ExifLog", i);
+	return NULL;
+}
+
 #undef  MIN
 #define MIN(a, b)  (((a) < (b)) ? (a) : (b))
 
@@ -143,7 +158,7 @@
 
 	if (eld->state == EL_EXIF_FOUND && len_remain > 0) {
 		if (eld->buf == NULL) {
-			eld->buf = malloc (sizeof (unsigned char) * eld->size);
+			eld->buf = exif_loader_alloc (eld, eld->size);
 			if (!eld->buf) return 0;
 			eld->bytes_read = 0;
 		}
@@ -168,10 +183,10 @@
 ExifLoader *
 exif_loader_new (void)
 {
-	ExifLoader *loader = malloc (sizeof (ExifLoader));
-
+	ExifLoader *loader;
+	
+	loader = exif_loader_alloc (NULL, sizeof (ExifLoader));
 	if (!loader) return NULL;
-	memset (loader, 0, sizeof (ExifLoader));
 	loader->ref_count = 1;
 
 	return loader;

[libexif-cvs] libexif ChangeLog,1.139,1.140

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

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

Modified Files:
	ChangeLog 
Log Message:

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

	* libexif/exif-loader.c
	* libexif/exif-data.c: Replace a couple of calls to malloc by 
	  calls to calloc.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- ChangeLog	7 Sep 2004 20:46:30 -0000	1.139
+++ ChangeLog	8 Sep 2004 06:00:03 -0000	1.140
@@ -1,3 +1,9 @@
+2004-09-08  Lutz Mueller <lu...@us...>
+
+	* libexif/exif-loader.c
+	* libexif/exif-data.c: Replace a couple of calls to malloc by 
+	  calls to calloc.
+
 2004-09-07  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-entry.c: Use calloc. Hint by Jan Patera

[libexif-cvs] libexif ChangeLog,1.138,1.139

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

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

Modified Files:
	ChangeLog 
Log Message:

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

	* libexif/exif-entry.c: Use calloc. Hint by Jan Patera
	  <pa...@pi...>.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- ChangeLog	7 Sep 2004 20:41:04 -0000	1.138
+++ ChangeLog	7 Sep 2004 20:46:30 -0000	1.139
@@ -1,5 +1,10 @@
 2004-09-07  Lutz Mueller <lu...@us...>
 
+	* libexif/exif-entry.c: Use calloc. Hint by Jan Patera
+	  <pa...@pi...>.
+
+2004-09-07  Lutz Mueller <lu...@us...>
+
 	* libexif/olympus
 	* libexif/pentax: Fix typo and wrong logic introduced during my
 	  last changes. Thanks to Jan Patera

[libexif-cvs] libexif/libexif exif-entry.c,1.57,1.58

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

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

Modified Files:
	exif-entry.c 
Log Message:

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

	* libexif/exif-entry.c: Use calloc. Hint by Jan Patera
	  <pa...@pi...>.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- exif-entry.c	7 Sep 2004 06:15:38 -0000	1.57
+++ exif-entry.c	7 Sep 2004 20:46:31 -0000	1.58
@@ -44,15 +44,15 @@
 ExifLog *exif_data_get_log (ExifData *);
 
 static void *
-exif_entry_malloc (ExifEntry *e, unsigned int i)
+exif_entry_alloc (ExifEntry *e, unsigned int i)
 {
 	void *d;
 	ExifLog *l = NULL;
 
 	if (!i) return NULL;
 
-	/* This is the only call to malloc in this file. */
-	d = malloc (i);
+	/* This is the only call to calloc in this file. */
+	d = calloc (i, 1);
 	if (d) return d;
 
 	if (e && e->parent && e->parent->parent)
@@ -67,12 +67,10 @@
 {
 	ExifEntry *e = NULL;
 
-	e = exif_entry_malloc (e, sizeof (ExifEntry));
+	e = exif_entry_alloc (e, sizeof (ExifEntry));
 	if (!e) return NULL;
-	memset (e, 0, sizeof (ExifEntry));
-	e->priv = exif_entry_malloc (e, sizeof (ExifEntryPrivate));
+	e->priv = exif_entry_alloc (e, sizeof (ExifEntryPrivate));
 	if (!e->priv) { free (e); return NULL; }
-	memset (e->priv, 0, sizeof (ExifEntryPrivate));
 	e->priv->ref_count = 1;
 
 	return (e);
@@ -844,8 +842,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_LONG;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
-		if (e->data) memset (e->data, 0, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		break;
 
 	/* SHORT, 1 component, no default */
@@ -873,7 +870,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		exif_set_short (e->data, o, 0);
 		break;
 
@@ -884,7 +881,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		exif_set_short (e->data, o, 1);
 		break;
 
@@ -894,7 +891,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		exif_set_short (e->data, o, 2);
 		break;
 
@@ -903,7 +900,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		exif_set_short (e->data, o, 3);
 		break;
 
@@ -911,7 +908,7 @@
 		e->components = 3;
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		if (!e->data) break;
 		exif_set_short (e->data, o, 8);
 		exif_set_short (
@@ -925,7 +922,7 @@
 		e->components = 2;
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		if (!e->data) break;
 		exif_set_short (e->data, o, 2);
 		exif_set_short (
@@ -940,8 +937,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_SRATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
-		if (e->data) memset (e->data, 0, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		break;
 
 	/* RATIONAL, 1 component, no default */
@@ -961,8 +957,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
-		if (e->data) memset (e->data, 0, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		break;
 
 	/* RATIONAL, 1 component, default 72/1 */
@@ -971,7 +966,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		r.numerator = 72;
 		r.denominator = 1;
 		exif_set_rational (e->data, o, r);
@@ -982,8 +977,7 @@
 		e->components = 2;
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
-		if (e->data) memset (e->data, 0, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		break;
 
 	/* RATIONAL, 6 components */
@@ -991,7 +985,7 @@
 		e->components = 6;
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		if (!e->data) break;
 		r.denominator = 1;
 		r.numerator = 0;
@@ -1022,7 +1016,7 @@
 		e->components = 20;
 		e->format = EXIF_FORMAT_ASCII;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		if (!e->data) break;
 		snprintf ((char *) e->data, e->size,
 			  "%04i:%02i:%02i %02i:%02i:%02i",
@@ -1047,7 +1041,7 @@
 		e->components = strlen ("[None]") + 1;
 		e->format = EXIF_FORMAT_ASCII;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		if (!e->data) break;
 		strncpy (e->data, "[None]", e->size);
 		break;
@@ -1055,7 +1049,7 @@
 		e->components = (strlen ("[None]") + 1) * 2;
 		e->format = EXIF_FORMAT_ASCII;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		if (!e->data) break;
 		strcpy (e->data +                     0, "[None]");
 		strcpy (e->data + strlen ("[None]") + 1, "[None]");
@@ -1075,7 +1069,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_UNDEFINED;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		if (!e->data) break;
 		e->data[0] = 0x01;
 		break;
@@ -1085,7 +1079,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_UNDEFINED;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = exif_entry_malloc (e, e->size);
+		e->data = exif_entry_alloc (e, e->size);
 		if (!e->data) break;
 		e->data[0] = 0x03;
 		break;
@@ -1095,7 +1089,7 @@
                 e->components = 4;
                 e->format = EXIF_FORMAT_UNDEFINED;
                 e->size = exif_format_get_size (e->format) * e->components;
-                e->data = exif_entry_malloc (e, e->size);
+                e->data = exif_entry_alloc (e, e->size);
 		if (!e->data) break;
                 memcpy (e->data, "0100", 4);
                 break;
@@ -1105,7 +1099,7 @@
                 e->components = 4;
                 e->format = EXIF_FORMAT_UNDEFINED;
                 e->size = exif_format_get_size (e->format) * e->components;
-                e->data = exif_entry_malloc (e, e->size);
+                e->data = exif_entry_alloc (e, e->size);
 		if (!e->data) break;
                 memcpy (e->data, "0210", 4);
                 break;

[libexif-cvs] libexif/libexif/pentax mnote-pentax-tag.c,1.3,1.4

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

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

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

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

	* libexif/olympus
	* libexif/pentax: Fix typo and wrong logic introduced during my
	  last changes. Thanks to Jan Patera
	  <pa...@pi...> for keeping an eye on me.


Index: mnote-pentax-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-tag.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mnote-pentax-tag.c	7 Sep 2004 06:33:54 -0000	1.3
+++ mnote-pentax-tag.c	7 Sep 2004 20:41:05 -0000	1.4
@@ -66,9 +66,9 @@
 {
 	unsigned int i;
 
-	for (i = 0; sizeof (table) / sizeof (table[0]); i++)
-		if (table[i].tag == t) break;
-	return (table[i].name);
+	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+		if (table[i].tag == t) return (table[i].name);
+	return NULL;
 }
 
 const char *
@@ -78,8 +78,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 *
@@ -89,6 +89,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/libexif/olympus mnote-olympus-tag.c,1.7,1.8

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

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

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

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

	* libexif/olympus
	* libexif/pentax: Fix typo and wrong logic introduced during my
	  last changes. Thanks to Jan Patera
	  <pa...@pi...> for keeping an eye on me.


Index: mnote-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-tag.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- mnote-olympus-tag.c	7 Sep 2004 06:33:54 -0000	1.7
+++ mnote-olympus-tag.c	7 Sep 2004 20:41:05 -0000	1.8
@@ -128,8 +128,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 *
@@ -139,8 +139,8 @@
 
 	bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_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 *
@@ -150,7 +150,6 @@
 
 	bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR);
 	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
-		if (table[i].tag == t) break;
-	if (!table[i].description) return NULL;
-	return (_(table[i].description));
+		if (table[i].tag == t) return (_(table[i].description));
+	return NULL;
 }

[libexif-cvs] libexif ChangeLog,1.137,1.138

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

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

Modified Files:
	ChangeLog 
Log Message:

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

	* libexif/olympus
	* libexif/pentax: Fix typo and wrong logic introduced during my
	  last changes. Thanks to Jan Patera
	  <pa...@pi...> for keeping an eye on me.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- ChangeLog	7 Sep 2004 06:33:53 -0000	1.137
+++ ChangeLog	7 Sep 2004 20:41:04 -0000	1.138
@@ -1,6 +1,13 @@
 2004-09-07  Lutz Mueller <lu...@us...>
 
 	* libexif/olympus
+	* libexif/pentax: Fix typo and wrong logic introduced during my
+	  last changes. Thanks to Jan Patera
+	  <pa...@pi...> for keeping an eye on me.
+
+2004-09-07  Lutz Mueller <lu...@us...>
+
+	* libexif/olympus
 	* libexif/pentax
 	* libexif/canon: Correctly return names, titles and descriptions of
 	  tages. Pointed out by Angela Wrobel.

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

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

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

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

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

	* libexif/olympus
	* libexif/pentax
	* libexif/canon: Correctly return names, titles and descriptions of
	  tages. Pointed out by Angela Wrobel.


Index: mnote-pentax-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-tag.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mnote-pentax-tag.c	1 Sep 2004 06:16:56 -0000	1.2
+++ mnote-pentax-tag.c	7 Sep 2004 06:33:54 -0000	1.3
@@ -66,7 +66,8 @@
 {
 	unsigned int i;
 
-	for (i = 0; table[i].name; i++) if (table[i].tag == t) break;
+	for (i = 0; sizeof (table) / sizeof (table[0]); i++)
+		if (table[i].tag == t) break;
 	return (table[i].name);
 }
 
@@ -76,7 +77,8 @@
 	unsigned int i;
 
 	bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
-	for (i = 0; table[i].title; i++) if (table[i].tag == t) break; 
+	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+		if (table[i].tag == t) break; 
 	return (_(table[i].title));
 }
 
@@ -86,6 +88,7 @@
 	unsigned int i;
 
 	bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
-	for (i = 0; table[i].description; i++) if (table[i].tag == t) break;
+	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+		if (table[i].tag == t) break;
 	return (_(table[i].description));
 }

[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c,1.17,1.18 mnote-olympus-tag.c,1.6,1.7

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

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

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

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

	* libexif/olympus
	* libexif/pentax
	* libexif/canon: Correctly return names, titles and descriptions of
	  tages. Pointed out by Angela Wrobel.


Index: mnote-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-tag.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mnote-olympus-tag.c	1 Sep 2004 06:16:56 -0000	1.6
+++ mnote-olympus-tag.c	7 Sep 2004 06:33:54 -0000	1.7
@@ -65,8 +65,8 @@
 	{MNOTE_NIKON_TAG_FLASHUSED,       "FLASHUSED", N_("Flash used"), NULL},
 	{MNOTE_NIKON_TAG_AFFOCUSPOSITION, "AFFOCUSPOSITION", N_("AF Focus position"), NULL},
 	{MNOTE_NIKON_TAG_BRACKETING,      "BRACKETING", N_("Bracketing"), NULL},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X008A,  "UNKNOWN_0X008A", N_("0x008a"), NULL},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X008B,  "UNKNOWN_0X008B", N_("0x008b"), NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X008A,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X008B,  NULL, NULL, NULL},
 	{MNOTE_NIKON_TAG_CURVE,           "CURVE,", N_("Contrast curve"), NULL},
 	{MNOTE_NIKON_TAG_COLORMODE,       "COLORMODE,", N_("Colormode"), NULL},
 	{MNOTE_NIKON_TAG_LIGHTYPE,        "LIGHTYPE,", N_("Lightype"), NULL},
@@ -127,7 +127,8 @@
 {
 	unsigned int i;
 
-	for (i = 0; table[i].name; i++) if (table[i].tag == t) break;
+	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+		if (table[i].tag == t) break;
 	return (table[i].name);
 }
 
@@ -137,7 +138,8 @@
 	unsigned int i;
 
 	bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR);
-	for (i = 0; table[i].title; i++) if (table[i].tag == t) break;
+	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+		if (table[i].tag == t) break;
 	return (_(table[i].title));
 }
 
@@ -147,7 +149,8 @@
 	unsigned int i;
 
 	bindtextdomain (GETTEXT_PACKAGE, LIBEXIF_LOCALEDIR);
-	for (i = 0; table[i].description; i++) if (table[i].tag == t) break;
+	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+		if (table[i].tag == t) break;
 	if (!table[i].description) return NULL;
 	return (_(table[i].description));
 }

Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- exif-mnote-data-olympus.c	26 Aug 2004 20:08:09 -0000	1.17
+++ exif-mnote-data-olympus.c	7 Sep 2004 06:33:54 -0000	1.18
@@ -325,7 +325,7 @@
 
 	if (!n) return NULL;
 	if (i >= n->count) return NULL;
-	return mnote_olympus_tag_get_title (n->entries[i].tag);
+	return mnote_olympus_tag_get_name (n->entries[i].tag);
 }
 
 static const char *

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

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

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

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

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

	* libexif/olympus
	* libexif/pentax
	* libexif/canon: Correctly return names, titles and descriptions of
	  tages. Pointed out by Angela Wrobel.


Index: mnote-canon-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-tag.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mnote-canon-tag.c	26 Oct 2003 10:06:17 -0000	1.1
+++ mnote-canon-tag.c	7 Sep 2004 06:33:54 -0000	1.2
@@ -47,7 +47,8 @@
 {
 	unsigned int i;
 
-	for (i = 0; table[i].name; i++) if (table[i].tag == t) break;
+	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+		if (table[i].tag == t) break;
 	return (_(table[i].name));
 }
 
@@ -57,7 +58,8 @@
 	unsigned int i;
 
 	bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR); 
-	for (i = 0; table[i].title; i++) if (table[i].tag == t) break; 
+	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+		if (table[i].tag == t) break; 
 	return (_(table[i].title));
 }
 
@@ -67,6 +69,7 @@
 	unsigned int i;
 
 	bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
-	for (i = 0; table[i].description; i++) if (table[i].tag == t) break;
+	for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
+		if (table[i].tag == t) break;
 	return (_(table[i].description));
 }

[libexif-cvs] libexif ChangeLog,1.136,1.137

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

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

Modified Files:
	ChangeLog 
Log Message:

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

	* libexif/olympus
	* libexif/pentax
	* libexif/canon: Correctly return names, titles and descriptions of
	  tages. Pointed out by Angela Wrobel.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- ChangeLog	7 Sep 2004 06:15:37 -0000	1.136
+++ ChangeLog	7 Sep 2004 06:33:53 -0000	1.137
@@ -1,5 +1,12 @@
 2004-09-07  Lutz Mueller <lu...@us...>
 
+	* libexif/olympus
+	* libexif/pentax
+	* libexif/canon: Correctly return names, titles and descriptions of
+	  tages. Pointed out by Angela Wrobel.
+
+2004-09-07  Lutz Mueller <lu...@us...>
+
 	* libexif/exif-entry.c: More guards against malloc returning NULL.
 	  Problem spotted by Angela Wrobel.
 

[libexif-cvs] libexif ChangeLog,1.135,1.136

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

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

Modified Files:
	ChangeLog 
Log Message:

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

	* libexif/exif-entry.c: More guards against malloc returning NULL.
	  Problem spotted by Angela Wrobel.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- ChangeLog	2 Sep 2004 18:50:33 -0000	1.135
+++ ChangeLog	7 Sep 2004 06:15:37 -0000	1.136
@@ -1,3 +1,8 @@
+2004-09-07  Lutz Mueller <lu...@us...>
+
+	* libexif/exif-entry.c: More guards against malloc returning NULL.
+	  Problem spotted by Angela Wrobel.
+
 2004-09-02  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-entry.c: First part of a patch to be less strict on

[libexif-cvs] libexif/libexif exif-data.c,1.45,1.46 exif-entry.c,1.56,1.57

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

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

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

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

	* libexif/exif-entry.c: More guards against malloc returning NULL.
	  Problem spotted by Angela Wrobel.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- exif-entry.c	2 Sep 2004 18:50:33 -0000	1.56
+++ exif-entry.c	7 Sep 2004 06:15:38 -0000	1.57
@@ -40,15 +40,37 @@
 	unsigned int ref_count;
 };
 
+/* This function is hidden in exif-data.c */
+ExifLog *exif_data_get_log (ExifData *);
+
+static void *
+exif_entry_malloc (ExifEntry *e, unsigned int i)
+{
+	void *d;
+	ExifLog *l = NULL;
+
+	if (!i) return NULL;
+
+	/* This is the only call to malloc in this file. */
+	d = malloc (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)
 {
-	ExifEntry *e;
+	ExifEntry *e = NULL;
 
-	e = malloc (sizeof (ExifEntry));
+	e = exif_entry_malloc (e, sizeof (ExifEntry));
 	if (!e) return NULL;
 	memset (e, 0, sizeof (ExifEntry));
-	e->priv = malloc (sizeof (ExifEntryPrivate));
+	e->priv = exif_entry_malloc (e, sizeof (ExifEntryPrivate));
 	if (!e->priv) { free (e); return NULL; }
 	memset (e->priv, 0, sizeof (ExifEntryPrivate));
 	e->priv->ref_count = 1;
@@ -822,7 +844,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_LONG;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
 		if (e->data) memset (e->data, 0, e->size);
 		break;
 
@@ -851,7 +873,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
 		exif_set_short (e->data, o, 0);
 		break;
 
@@ -862,7 +884,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
 		exif_set_short (e->data, o, 1);
 		break;
 
@@ -872,7 +894,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
 		exif_set_short (e->data, o, 2);
 		break;
 
@@ -881,7 +903,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
 		exif_set_short (e->data, o, 3);
 		break;
 
@@ -889,7 +911,8 @@
 		e->components = 3;
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
+		if (!e->data) break;
 		exif_set_short (e->data, o, 8);
 		exif_set_short (
 			e->data + exif_format_get_size (e->format),
@@ -902,7 +925,8 @@
 		e->components = 2;
 		e->format = EXIF_FORMAT_SHORT;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
+		if (!e->data) break;
 		exif_set_short (e->data, o, 2);
 		exif_set_short (
 			e->data + exif_format_get_size (e->format),
@@ -916,7 +940,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_SRATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
 		if (e->data) memset (e->data, 0, e->size);
 		break;
 
@@ -937,7 +961,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
 		if (e->data) memset (e->data, 0, e->size);
 		break;
 
@@ -947,7 +971,7 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
 		r.numerator = 72;
 		r.denominator = 1;
 		exif_set_rational (e->data, o, r);
@@ -958,7 +982,7 @@
 		e->components = 2;
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
 		if (e->data) memset (e->data, 0, e->size);
 		break;
 
@@ -967,7 +991,8 @@
 		e->components = 6;
 		e->format = EXIF_FORMAT_RATIONAL;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
+		if (!e->data) break;
 		r.denominator = 1;
 		r.numerator = 0;
 		exif_set_rational (e->data, o, r);
@@ -997,7 +1022,8 @@
 		e->components = 20;
 		e->format = EXIF_FORMAT_ASCII;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
+		if (!e->data) break;
 		snprintf ((char *) e->data, e->size,
 			  "%04i:%02i:%02i %02i:%02i:%02i",
 			  tm->tm_year + 1900, tm->tm_mon, tm->tm_mday,
@@ -1021,14 +1047,16 @@
 		e->components = strlen ("[None]") + 1;
 		e->format = EXIF_FORMAT_ASCII;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
+		if (!e->data) break;
 		strncpy (e->data, "[None]", e->size);
 		break;
 	case EXIF_TAG_COPYRIGHT:
 		e->components = (strlen ("[None]") + 1) * 2;
 		e->format = EXIF_FORMAT_ASCII;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
+		if (!e->data) break;
 		strcpy (e->data +                     0, "[None]");
 		strcpy (e->data + strlen ("[None]") + 1, "[None]");
 		break;
@@ -1039,7 +1067,7 @@
 		e->components = 0;
 		e->format = EXIF_FORMAT_UNDEFINED;
 		e->size = 0;
-		e->data = 0;
+		e->data = NULL;
 		break;
 
 	/* UNDEFINED, 1 component, default 1 */
@@ -1047,7 +1075,8 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_UNDEFINED;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
+		if (!e->data) break;
 		e->data[0] = 0x01;
 		break;
 
@@ -1056,7 +1085,8 @@
 		e->components = 1;
 		e->format = EXIF_FORMAT_UNDEFINED;
 		e->size = exif_format_get_size (e->format) * e->components;
-		e->data = malloc (e->size);
+		e->data = exif_entry_malloc (e, e->size);
+		if (!e->data) break;
 		e->data[0] = 0x03;
 		break;
 
@@ -1065,7 +1095,8 @@
                 e->components = 4;
                 e->format = EXIF_FORMAT_UNDEFINED;
                 e->size = exif_format_get_size (e->format) * e->components;
-                e->data = malloc (e->size);
+                e->data = exif_entry_malloc (e, e->size);
+		if (!e->data) break;
                 memcpy (e->data, "0100", 4);
                 break;
 
@@ -1074,7 +1105,8 @@
                 e->components = 4;
                 e->format = EXIF_FORMAT_UNDEFINED;
                 e->size = exif_format_get_size (e->format) * e->components;
-                e->data = malloc (e->size);
+                e->data = exif_entry_malloc (e, e->size);
+		if (!e->data) break;
                 memcpy (e->data, "0210", 4);
                 break;
 

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- exif-data.c	21 May 2004 14:23:07 -0000	1.45
+++ exif-data.c	7 Sep 2004 06:15:38 -0000	1.46
@@ -984,3 +984,12 @@
 	data->priv->log = log;
 	exif_log_ref (log);
 }
+
+/* Used internally within libexif */
+ExifLog *exif_data_get_log (ExifData *);
+ExifLog *
+exif_data_get_log (ExifData *data)
+{
+	if (!data || !data->priv) return NULL;
+	return data->priv->log;
+}

[libexif-cvs] libexif/libexif exif-entry.c,1.55,1.56

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

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

Modified Files:
	exif-entry.c 
Log Message:

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

	* libexif/exif-entry.c: First part of a patch to be less strict on
	  the USER_COMMENT-tag. Submitted by Angela Wrobel, slightly adapted.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- exif-entry.c	26 Aug 2004 20:08:09 -0000	1.55
+++ exif-entry.c	2 Sep 2004 18:50:33 -0000	1.56
@@ -336,12 +336,41 @@
 	case EXIF_TAG_USER_COMMENT:
 
 		/*
+		 * The specification says UNDEFINED, but some
+		 * manufacturers don't care and use ASCII.
+		 */
+		if (e->format == EXIF_FORMAT_ASCII) {
+			if ((e->size <= 8) || (
+			     memcmp (e->data, "ASCII\0\0\0", 8) &&
+			     memcmp (e->data, "UNICODE\0", 8) &&
+			     memcmp (e->data, "JIS\0\0\0\0\0", 8) &&
+			     memcmp (e->data, "\0\0\0\0\0\0\0\0", 8))) {
+				snprintf (val, maxlen, _("%s (illegal "
+					"format ASCII, expected UNDEFINED)"),
+					e->data);
+				break;
+			}
+		} else CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
+
+		/*
 		 * According to Ralf Holzer <rh...@cm...>,
 		 * the user comment field does not have to be 
 		 * NULL terminated.
 		 */
 		CF (e->format, EXIF_FORMAT_UNDEFINED, val, maxlen);
 		if (e->size < 8) break;
+		if (!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)) {
+			strncpy (val, _("Unsupported UNICODE string"), maxlen);
+			break;
+		}
+		if (!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));
 		break;
 

[libexif-cvs] libexif ChangeLog,1.134,1.135

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

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

Modified Files:
	ChangeLog 
Log Message:

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

	* libexif/exif-entry.c: First part of a patch to be less strict on
	  the USER_COMMENT-tag. Submitted by Angela Wrobel, slightly adapted.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- ChangeLog	1 Sep 2004 20:15:06 -0000	1.134
+++ ChangeLog	2 Sep 2004 18:50:33 -0000	1.135
@@ -1,3 +1,8 @@
+2004-09-02  Lutz Mueller <lu...@us...>
+
+	* libexif/exif-entry.c: First part of a patch to be less strict on
+	  the USER_COMMENT-tag. Submitted by Angela Wrobel, slightly adapted.
+
 2004-09-01  Lutz Mueller <lu...@us...>
 
 	* libexif/exif-tag.c: First ideas on how to support generation of

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

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

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

Modified Files:
	exif-tag.c 
Log Message:

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

	* libexif/exif-tag.c: First ideas on how to support generation of
	  mandatory exif tags for a new image.


Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- exif-tag.c	26 Aug 2004 22:17:20 -0000	1.16
+++ exif-tag.c	1 Sep 2004 20:15:06 -0000	1.17
@@ -24,11 +24,19 @@
 
 #include <stdlib.h>
 
+typedef enum {
+	ESL_MANDATORY    = 1, /* Mandatory               */
+	ESL_CMANDATORY   = 2, /* Conditionally mandatory */
+	ESL_OPTIONAL     = 3, /* Optional                */
+	ESL_NOT_RECORDED = 4  /* Not recorded            */
+} ExifSL;                     /* Exif Support Level      */
+
 static struct {
 	ExifTag tag;
 	const char *name;
 	const char *title;
 	const char *description;
+	ExifSL esl_0[4], esl_1[4], esl_exif[4], esl_gps[4];
 } ExifTagTable[] = {
 	{EXIF_TAG_INTEROPERABILITY_INDEX, "InteroperabilityIndex",
 	 "InteroperabilityIndex",
@@ -42,24 +50,29 @@
 	{EXIF_TAG_IMAGE_WIDTH, "ImageWidth", N_("Image Width"),
 	 N_("The number of columns of image data, equal to the number of "
 	    "pixels per row. In JPEG compressed data a JPEG marker is "
-	    "used instead of this tag.")},
+	    "used instead of this tag."),
+	 {ESL_MANDATORY, ESL_MANDATORY, ESL_MANDATORY, ESL_NOT_RECORDED}},
 	{EXIF_TAG_IMAGE_LENGTH, "ImageLength", N_("Image Length"),
 	 N_("The number of rows of image data. In JPEG compressed data a "
-	    "JPEG marker is used instead of this tag.")},
+	    "JPEG marker is used instead of this tag."), 
+	 {ESL_MANDATORY, ESL_MANDATORY, ESL_MANDATORY, ESL_NOT_RECORDED}},
 	{EXIF_TAG_BITS_PER_SAMPLE, "BitsPerSample", N_("Bits per Sample"),
 	 N_("The number of bits per image component. In this standard each "
 	    "component of the image is 8 bits, so the value for this "
 	    "tag is 9. See also <SamplesPerPixel>. In JPEG compressed data "
-	    "a JPEG marker is used instead of this tag.")},
+	    "a JPEG marker is used instead of this tag."),
+	 {ESL_MANDATORY, ESL_MANDATORY, ESL_MANDATORY, ESL_NOT_RECORDED}},
 	{EXIF_TAG_COMPRESSION, "Compression", N_("Compression"),
 	 N_("The compression scheme used for the image data. When a "
 	    "primary image is JPEG compressed, this designation is "
 	    "not necessary and is omitted. When thumbnails use JPEG "
-	    "compression, this tag value is set to 6.")},
+	    "compression, this tag value is set to 6."),
+	 {ESL_MANDATORY, ESL_MANDATORY, ESL_MANDATORY, ESL_NOT_RECORDED}},
 	{EXIF_TAG_PHOTOMETRIC_INTERPRETATION, "PhotometricInterpretation",
 	 N_("Photometric Interpretation"),
 	 N_("The pixel composition. In JPEG compressed data a JPEG "
-	    "marker is used instead of this tag.")},
+	    "marker is used instead of this tag."),
+	 {ESL_MANDATORY, ESL_MANDATORY, ESL_MANDATORY, ESL_NOT_RECORDED}},
 	{EXIF_TAG_FILL_ORDER, "FillOrder", N_("Fill Order"), ""},
 	{EXIF_TAG_DOCUMENT_NAME, "DocumentName", N_("Document Name"), ""},
 	{EXIF_TAG_IMAGE_DESCRIPTION, "ImageDescription",
@@ -68,26 +81,31 @@
 	    "a comment such as \"1988 company picnic\" or "
 	    "the like. Two-bytes character codes cannot be used. "
 	    "When a 2-bytes code is necessary, the Exif Private tag "
-	    "<UserComment> is to be used.")},
+	    "<UserComment> is to be used."),
+	 {ESL_CMANDATORY, ESL_CMANDATORY, ESL_CMANDATORY, ESL_CMANDATORY}},
 	{EXIF_TAG_MAKE, "Make", N_("Manufacturer"),
 	 N_("The manufacturer of the recording "
 	    "equipment. This is the manufacturer of the DSC, scanner, "
 	    "video digitizer or other equipment that generated the "
 	    "image. When the field is left blank, it is treated as "
-	    "unknown.")},
+	    "unknown."),
+	 {ESL_CMANDATORY, ESL_CMANDATORY, ESL_CMANDATORY, ESL_CMANDATORY}},
 	{EXIF_TAG_MODEL, "Model", N_("Model"),
 	 N_("The model name or model number of the equipment. This is the "
 	    "model name or number of the DSC, scanner, video digitizer "
 	    "or other equipment that generated the image. When the field "
-	    "is left blank, it is treated as unknown.")},
+	    "is left blank, it is treated as unknown."),
+	 {ESL_CMANDATORY, ESL_CMANDATORY, ESL_CMANDATORY, ESL_CMANDATORY}},
 	{EXIF_TAG_STRIP_OFFSETS, "StripOffsets", N_("Strip Offsets"),
 	 N_("For each strip, the byte offset of that strip. It is "
 	    "recommended that this be selected so the number of strip "
 	    "bytes does not exceed 64 Kbytes. With JPEG compressed "
 	    "data this designation is not needed and is omitted. See also "
-	    "<RowsPerStrip> and <StripByteCounts>.")},
+	    "<RowsPerStrip> and <StripByteCounts>."),
+	 {ESL_CMANDATORY, ESL_CMANDATORY, ESL_CMANDATORY, ESL_CMANDATORY}},
 	{EXIF_TAG_ORIENTATION, "Orientation", N_("Orientation"),
-	 N_("The image orientation viewed in terms of rows and columns.")},
+	 N_("The image orientation viewed in terms of rows and columns."),
+	 {ESL_CMANDATORY, ESL_CMANDATORY, ESL_CMANDATORY, ESL_CMANDATORY}},
 	{EXIF_TAG_SAMPLES_PER_PIXEL, "SamplesPerPixel",
 	 N_("Samples per Pixel"),
 	 N_("The number of components per pixel. Since this standard applies "

[libexif-cvs] libexif README,1.8,1.9 ChangeLog,1.133,1.134

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

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

Modified Files:
	README ChangeLog 
Log Message:

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

	* libexif/exif-tag.c: First ideas on how to support generation of
	  mandatory exif tags for a new image.


Index: README
===================================================================
RCS file: /cvsroot/libexif/libexif/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- README	4 Jun 2004 19:48:02 -0000	1.8
+++ README	1 Sep 2004 20:15:05 -0000	1.9
@@ -40,6 +40,7 @@
  - gtkam:    A GTK+ frontend to libgphoto2 (http://www.topfrose.de).
  - thirdeye: Digital photos organizer and driver for eComStation
              (http://ecomstation.ru/thirdeye).
+ - digicam:  
 If you would like to migrate your program to use libexif or add EXIF support
 to it, don't hesitate to contact the authors.
 
@@ -56,6 +57,12 @@
 syntax of JPEG files'. Please ignore it. It is a bug that it is 
 distributed, but I think it may be useful for other people.
 
+TODO
+----
+
+We should probably support the generation of an empty EXIF structure with all
+mandatory tags. First ideas are in exif-tag.c. This has not yet been finished.
+
 AUTHORS
 -------
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- ChangeLog	1 Sep 2004 06:16:55 -0000	1.133
+++ ChangeLog	1 Sep 2004 20:15:06 -0000	1.134
@@ -1,5 +1,10 @@
 2004-09-01  Lutz Mueller <lu...@us...>
 
+	* libexif/exif-tag.c: First ideas on how to support generation of
+	  mandatory exif tags for a new image.
+
+2004-09-01  Lutz Mueller <lu...@us...>
+
 	Suggestion by Angela Wrobel (http://www.wrobelnet.de/contact.html):
 
 	* libexif/pentax:

[libexif-cvs] libexif/libexif/olympus mnote-olympus-tag.c,1.5,1.6

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

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

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

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

	Suggestion by Angela Wrobel (http://www.wrobelnet.de/contact.html):

	* libexif/pentax:
	* libexif/olympus: Improve user experience by removing information
	  from the output that was only intended for developers.


Index: mnote-olympus-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-tag.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mnote-olympus-tag.c	22 Jun 2004 18:10:48 -0000	1.5
+++ mnote-olympus-tag.c	1 Sep 2004 06:16:56 -0000	1.6
@@ -34,91 +34,91 @@
 } table[] = {
 
 	/* Nikon v2 */
-	{MNOTE_NIKON_TAG_FIRMWARE,     "Firmware", N_("Firmware Version"), ""},
-	{MNOTE_NIKON_TAG_ISO,          "ISO", N_("ISO Setting"), ""},
-	{MNOTE_NIKON_TAG_COLORMODE1,   "COLORMODE1", N_("Colormode (?)"), ""},
-	{MNOTE_NIKON_TAG_QUALITY,      "QUALITY", N_("Quality"), ""},
-	{MNOTE_NIKON_TAG_WHITEBALANCE, "WHITEBALANCE", N_("Whitebalance"), ""},
-	{MNOTE_NIKON_TAG_SHARPENING,   "SHARPENING",   N_("Image Sharpening"), ""},
-	{MNOTE_NIKON_TAG_FOCUSMODE,    "FOCUSMODE",   N_("Focus Mode"), ""},
-	{MNOTE_NIKON_TAG_FLASHSETTING, "FLASHSETTING",   N_("Flash Setting"), ""},
-	{MNOTE_NIKON_TAG_FLASHMODE,    "FLASHMODE",    N_("Flash Mode"), ""},
-	{MNOTE_NIKON_TAG_WHITEBALANCEFINE,"WHITEBALANCEFINE",N_("Whitebalance fine ajustment"), ""},
-	{MNOTE_NIKON_TAG_WHITEBALANCERB,  "WHITEBALANCERB", N_("Whitebalance RB"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X000D,  "UNKNOWN_0X000D", N_("Unknown tag 0x000d"), ""},
-	{MNOTE_NIKON_TAG_ISOSELECTION,    "ISOSELECTION", N_("Isoselection"), ""},
-    {MNOTE_NIKON_TAG_UNKNOWN_0X0011,  "UNKNOWN_0X0011", N_("Unknown tag 0x0011"), ""},
-	{MNOTE_NIKON_TAG_EXPOSUREDIFF,    "EXPOSUREDIFF", N_("Exposurediff ?"), ""},
-	{MNOTE_NIKON_TAG_FLASHCOMPENSATION, "FLASHCOMPENSATION", N_("Flashcompensation ?"), ""},
-	{MNOTE_NIKON_TAG_ISO2,            "ISO", N_("ISO Setting"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X0016,  "UNKNOWN_0X0016", N_("Unknown tag 0x0016"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X0017,  "UNKNOWN_0X0017", N_("Unknown tag 0x0017"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X0018,  "UNKNOWN_0X0018", N_("Unknown tag 0x0018"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X0019,  "UNKNOWN_0X0019", N_("Unknown tag 0x0019"), ""},
-	{MNOTE_NIKON_TAG_IMAGEADJUSTMENT, "ImageAdjustment", N_("Image Adjustment"), ""},
-	{MNOTE_NIKON_TAG_TONECOMPENSATION, "TONECOMPENSATION", N_("Tonecompensation"), ""},
-	{MNOTE_NIKON_TAG_ADAPTER,         "Adapter", N_("Adapter"), ""},
-	{MNOTE_NIKON_TAG_LENSTYPE,        "LENSTYPE", N_("Lenstype"), ""},
-	{MNOTE_NIKON_TAG_LENS,            "LENS", N_("Lens"), ""},
-	{MNOTE_NIKON_TAG_MANUALFOCUSDISTANCE, "MANUALFOCUSDISTANCE", N_("Manual Focus Distance"), ""},
-	{MNOTE_NIKON_TAG_DIGITALZOOM,     "DigitalZoom", N_("Digital Zoom"), ""},
-	{MNOTE_NIKON_TAG_FLASHUSED,       "FLASHUSED", N_("Flash used"), ""},
-	{MNOTE_NIKON_TAG_AFFOCUSPOSITION, "AFFOCUSPOSITION", N_("AF Focus position"), ""},
-	{MNOTE_NIKON_TAG_BRACKETING,      "BRACKETING", N_("Bracketing"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X008A,  "UNKNOWN_0X008A", N_("Unknown tag 0x008a"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X008B,  "UNKNOWN_0X008B", N_("Unknown tag 0x008b"), ""},
-	{MNOTE_NIKON_TAG_CURVE,           "CURVE,", N_("Contrast curve"), ""},
-	{MNOTE_NIKON_TAG_COLORMODE,       "COLORMODE,", N_("Colormode"), ""},
-	{MNOTE_NIKON_TAG_LIGHTYPE,        "LIGHTYPE,", N_("Lightype"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X0091,  "UNKNOWN_0X0091", N_("Unknown tag 0x0091"), ""},
-	{MNOTE_NIKON_TAG_HUE,             "Hue,", N_("Hue Adjustment"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X0094,  "UNKNOWN_0X0094", N_("Unknown tag 0x0094"), ""},
-	{MNOTE_NIKON_TAG_NOISEREDUCTION,  "NOISEREDUCTION,", N_("Noisereduction"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X0097,  "UNKNOWN_0X0097", N_("Unknown tag 0x0097"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X0098,  "UNKNOWN_0X0098", N_("Unknown tag 0x0098"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X009A,  "UNKNOWN_0X009A", N_("Unknown tag 0x009a"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X009B,  "UNKNOWN_0X009B", N_("Unknown tag 0x009b"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X00A0,  "UNKNOWN_0X00A0", N_("Unknown tag 0x00a0"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X00A2,  "UNKNOWN_0X00A2", N_("Unknown tag 0x00a2"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X00A3,  "UNKNOWN_0X00A3", N_("Unknown tag 0x00a3"), ""},
-	{MNOTE_NIKON_TAG_TOTALPICTURES,   "TOTALPICTURES,", N_("Total number of pictures taken"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X00A8,  "UNKNOWN_0X00A8", N_("Unknown tag 0x00a8"), ""},
-	{MNOTE_NIKON_TAG_OPTIMIZATION,    "OPTIMIZATION,", N_("Optimize Image"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X00AA,  "UNKNOWN_0X00AA", N_("Unknown tag 0x00aa"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X00AB,  "UNKNOWN_0X00AB", N_("Unknown tag 0x00ab"), ""},
-	{MNOTE_NIKON_TAG_CAPTUREEDITORDATA, "CAPTUREEDITORDATA", N_("Capture Editor Data"), ""},
-	{MNOTE_NIKON_TAG_CAPTUREEDITORVER, "CAPTUREEDITORVER", N_("Capture Editor Version"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X0E0E,  "UNKNOWN_0X0E0E", N_("Unknown tag 0x0e0e"), ""},
-	{MNOTE_NIKON_TAG_UNKNOWN_0X0E10,  "UNKNOWN_0X0E10", N_("Unknown tag 0x0Ee10"), ""},
-	{MNOTE_NIKON1_TAG_UNKNOWN_0X0002, "UNKNOWN_0X0002", N_("Unknown tag 0x0002"), ""},
-	{MNOTE_NIKON1_TAG_QUALITY,        "QUALITY", N_("Quality"), ""},
-	{MNOTE_NIKON1_TAG_COLORMODE,      "COLORMODE,", N_("Colormode"), ""},
-	{MNOTE_NIKON1_TAG_IMAGEADJUSTMENT, "ImageAdjustment", N_("Image Adjustment"), ""},
-	{MNOTE_NIKON1_TAG_CCDSENSITIVITY, "CCDSensitivity", N_("CCD Sensitivity"), ""},
-	{MNOTE_NIKON1_TAG_WHITEBALANCE,   "WhiteBalance", N_("Whitebalance"), ""},
-	{MNOTE_NIKON1_TAG_FOCUS,          "Focus", N_("Focus"), ""},
-	{MNOTE_NIKON1_TAG_UNKNOWN_0X0009, "UNKNOWN_0X0009", N_("Unknown tag 0x0009"), ""},
-	{MNOTE_NIKON1_TAG_DIGITALZOOM,    "DigitalZoom", N_("Digital Zoom"), ""},
-	{MNOTE_NIKON1_TAG_CONVERTER,      "Converter", N_("Converter"), ""},
+	{MNOTE_NIKON_TAG_FIRMWARE,     "Firmware", N_("Firmware Version"), NULL},
+	{MNOTE_NIKON_TAG_ISO,          "ISO", N_("ISO Setting"), NULL},
+	{MNOTE_NIKON_TAG_COLORMODE1,   "COLORMODE1", N_("Colormode (?)"), NULL},
+	{MNOTE_NIKON_TAG_QUALITY,      "QUALITY", N_("Quality"), NULL},
+	{MNOTE_NIKON_TAG_WHITEBALANCE, "WHITEBALANCE", N_("Whitebalance"), NULL},
+	{MNOTE_NIKON_TAG_SHARPENING,   "SHARPENING",   N_("Image Sharpening"), NULL},
+	{MNOTE_NIKON_TAG_FOCUSMODE,    "FOCUSMODE",   N_("Focus Mode"), NULL},
+	{MNOTE_NIKON_TAG_FLASHSETTING, "FLASHSETTING",   N_("Flash Setting"), NULL},
+	{MNOTE_NIKON_TAG_FLASHMODE,    "FLASHMODE",    N_("Flash Mode"), NULL},
+	{MNOTE_NIKON_TAG_WHITEBALANCEFINE,"WHITEBALANCEFINE",N_("Whitebalance fine ajustment"), NULL},
+	{MNOTE_NIKON_TAG_WHITEBALANCERB,  "WHITEBALANCERB", N_("Whitebalance RB"), NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X000D,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_ISOSELECTION,    "ISOSELECTION", N_("Isoselection"), NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X0011,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_EXPOSUREDIFF,    "EXPOSUREDIFF", N_("Exposurediff ?"), NULL},
+	{MNOTE_NIKON_TAG_FLASHCOMPENSATION, "FLASHCOMPENSATION", N_("Flashcompensation ?"), NULL},
+	{MNOTE_NIKON_TAG_ISO2,            "ISO", N_("ISO Setting"), NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X0016,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X0017,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X0018,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X0019,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_IMAGEADJUSTMENT, "ImageAdjustment", N_("Image Adjustment"), NULL},
+	{MNOTE_NIKON_TAG_TONECOMPENSATION, "TONECOMPENSATION", N_("Tonecompensation"), NULL},
+	{MNOTE_NIKON_TAG_ADAPTER,         "Adapter", N_("Adapter"), NULL},
+	{MNOTE_NIKON_TAG_LENSTYPE,        "LENSTYPE", N_("Lenstype"), NULL},
+	{MNOTE_NIKON_TAG_LENS,            "LENS", N_("Lens"), NULL},
+	{MNOTE_NIKON_TAG_MANUALFOCUSDISTANCE, "MANUALFOCUSDISTANCE", N_("Manual Focus Distance"), NULL},
+	{MNOTE_NIKON_TAG_DIGITALZOOM,     "DigitalZoom", N_("Digital Zoom"), NULL},
+	{MNOTE_NIKON_TAG_FLASHUSED,       "FLASHUSED", N_("Flash used"), NULL},
+	{MNOTE_NIKON_TAG_AFFOCUSPOSITION, "AFFOCUSPOSITION", N_("AF Focus position"), NULL},
+	{MNOTE_NIKON_TAG_BRACKETING,      "BRACKETING", N_("Bracketing"), NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X008A,  "UNKNOWN_0X008A", N_("0x008a"), NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X008B,  "UNKNOWN_0X008B", N_("0x008b"), NULL},
+	{MNOTE_NIKON_TAG_CURVE,           "CURVE,", N_("Contrast curve"), NULL},
+	{MNOTE_NIKON_TAG_COLORMODE,       "COLORMODE,", N_("Colormode"), NULL},
+	{MNOTE_NIKON_TAG_LIGHTYPE,        "LIGHTYPE,", N_("Lightype"), NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X0091,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_HUE,             "Hue,", N_("Hue Adjustment"), NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X0094,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_NOISEREDUCTION,  "NOISEREDUCTION,", N_("Noisereduction"), NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X0097,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X0098,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X009A,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X009B,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X00A0,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X00A2,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X00A3,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_TOTALPICTURES,   "TOTALPICTURES,", N_("Total number of pictures taken"), NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X00A8,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_OPTIMIZATION,    "OPTIMIZATION,", N_("Optimize Image"), NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X00AA,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X00AB,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_CAPTUREEDITORDATA, "CAPTUREEDITORDATA", N_("Capture Editor Data"), NULL},
+	{MNOTE_NIKON_TAG_CAPTUREEDITORVER, "CAPTUREEDITORVER", N_("Capture Editor Version"), NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X0E0E,  NULL, NULL, NULL},
+	{MNOTE_NIKON_TAG_UNKNOWN_0X0E10,  NULL, NULL, NULL},
+	{MNOTE_NIKON1_TAG_UNKNOWN_0X0002, NULL, NULL, NULL},
+	{MNOTE_NIKON1_TAG_QUALITY,        "QUALITY", N_("Quality"), NULL},
+	{MNOTE_NIKON1_TAG_COLORMODE,      "COLORMODE,", N_("Colormode"), NULL},
+	{MNOTE_NIKON1_TAG_IMAGEADJUSTMENT, "ImageAdjustment", N_("Image Adjustment"), NULL},
+	{MNOTE_NIKON1_TAG_CCDSENSITIVITY, "CCDSensitivity", N_("CCD Sensitivity"), NULL},
+	{MNOTE_NIKON1_TAG_WHITEBALANCE,   "WhiteBalance", N_("Whitebalance"), NULL},
+	{MNOTE_NIKON1_TAG_FOCUS,          "Focus", N_("Focus"), NULL},
+	{MNOTE_NIKON1_TAG_UNKNOWN_0X0009, NULL, NULL, NULL},
+	{MNOTE_NIKON1_TAG_DIGITALZOOM,    "DigitalZoom", N_("Digital Zoom"), NULL},
+	{MNOTE_NIKON1_TAG_CONVERTER,      "Converter", N_("Converter"), NULL},
 
 	/* Olympus */
-	{MNOTE_OLYMPUS_TAG_MODE, "Mode", N_("Speed/Sequence/Panorama direction"), ""},
-	{MNOTE_OLYMPUS_TAG_QUALITY, "Quality", N_("Quality"), ""},
-	{MNOTE_OLYMPUS_TAG_MACRO, "Macro", N_("Macro"), ""},
-	{MNOTE_OLYMPUS_TAG_UNKNOWN_1, "Unknown1", N_("Unknown 1"), ""},
-	{MNOTE_OLYMPUS_TAG_DIGIZOOM, "DigiZoom", N_("Digital Zoom"), ""},
-	{MNOTE_OLYMPUS_TAG_UNKNOWN_2, "Unknown2", N_("Unknown 2"), ""},
-	{MNOTE_OLYMPUS_TAG_UNKNOWN_3, "Unknown3", N_("Unknown 3"), ""},
-	{MNOTE_OLYMPUS_TAG_VERSION, "FirmwareVersion", N_("Firmware version"), ""},
-	{MNOTE_OLYMPUS_TAG_INFO, "Info", N_("Info"), ""},
-	{MNOTE_OLYMPUS_TAG_ID, "CameraID", N_("Camera ID"), ""},
-	{MNOTE_OLYMPUS_TAG_UNKNOWN_4, "Unknown4", N_("Unknown 4"), ""},
-	{MNOTE_OLYMPUS_TAG_FLASHMODE, "FlashMode", N_("Flash Mode"), ""},
-	{MNOTE_OLYMPUS_TAG_FOCUSDIST, "ManualFocusDistance", N_("Manual Focus Distance"), ""},
-	{MNOTE_OLYMPUS_TAG_SHARPNESS, "Sharpness", N_("Sharpness Setting"), ""},
-	{MNOTE_OLYMPUS_TAG_WBALANCE, "WhiteBalance", N_("White Balance Setting"), ""},
-	{MNOTE_OLYMPUS_TAG_CONTRAST, "Contrast", N_("Contrast Setting"), ""},
-	{MNOTE_OLYMPUS_TAG_MANFOCUS, "ManualFocus", N_("Manual Focus"), ""},
+	{MNOTE_OLYMPUS_TAG_MODE, "Mode", N_("Speed/Sequence/Panorama direction"), NULL},
+	{MNOTE_OLYMPUS_TAG_QUALITY, "Quality", N_("Quality"), NULL},
+	{MNOTE_OLYMPUS_TAG_MACRO, "Macro", N_("Macro"), NULL},
+	{MNOTE_OLYMPUS_TAG_UNKNOWN_1, NULL, NULL, NULL},
+	{MNOTE_OLYMPUS_TAG_DIGIZOOM, "DigiZoom", N_("Digital Zoom"), NULL},
+	{MNOTE_OLYMPUS_TAG_UNKNOWN_2, NULL, NULL, NULL},
+	{MNOTE_OLYMPUS_TAG_UNKNOWN_3, NULL, NULL, NULL},
+	{MNOTE_OLYMPUS_TAG_VERSION, "FirmwareVersion", N_("Firmware version"), NULL},
+	{MNOTE_OLYMPUS_TAG_INFO, "Info", N_("Info"), NULL},
+	{MNOTE_OLYMPUS_TAG_ID, "CameraID", N_("Camera ID"), NULL},
+	{MNOTE_OLYMPUS_TAG_UNKNOWN_4, NULL, NULL, NULL},
+	{MNOTE_OLYMPUS_TAG_FLASHMODE, "FlashMode", N_("Flash Mode"), NULL},
+	{MNOTE_OLYMPUS_TAG_FOCUSDIST, "ManualFocusDistance", N_("Manual Focus Distance"), NULL},
+	{MNOTE_OLYMPUS_TAG_SHARPNESS, "Sharpness", N_("Sharpness Setting"), NULL},
+	{MNOTE_OLYMPUS_TAG_WBALANCE, "WhiteBalance", N_("White Balance Setting"), NULL},
+	{MNOTE_OLYMPUS_TAG_CONTRAST, "Contrast", N_("Contrast Setting"), NULL},
+	{MNOTE_OLYMPUS_TAG_MANFOCUS, "ManualFocus", N_("Manual Focus"), NULL},
 	{0, NULL, NULL, NULL}
 };
 

[libexif-cvs] libexif/libexif/pentax mnote-pentax-tag.c,1.1,1.2

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

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

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

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

	Suggestion by Angela Wrobel (http://www.wrobelnet.de/contact.html):

	* libexif/pentax:
	* libexif/olympus: Improve user experience by removing information
	  from the output that was only intended for developers.


Index: mnote-pentax-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-tag.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mnote-pentax-tag.c	26 Oct 2003 10:06:17 -0000	1.1
+++ mnote-pentax-tag.c	1 Sep 2004 06:16:56 -0000	1.2
@@ -31,33 +31,33 @@
 	const char *title;
 	const char *description;
 } table[] = {
-	{MNOTE_PENTAX_TAG_MODE, "Mode", N_("Capture Mode"), ""},
-	{MNOTE_PENTAX_TAG_QUALITY, "Quality", N_("Quality Level"), ""},
-	{MNOTE_PENTAX_TAG_FOCUS, "Focus", N_("Focus Mode"), ""},
-	{MNOTE_PENTAX_TAG_FLASH, "Flash", N_("Flash Mode"), ""},
-	{MNOTE_PENTAX_TAG_UNKNOWN_05, "Unknown5", N_("Unknown 5"), ""},
-	{MNOTE_PENTAX_TAG_UNKNOWN_06, "Unknown6", N_("Unknown 6"), ""},
-	{MNOTE_PENTAX_TAG_WHITE_BALANCE, "WhiteBalance", N_("White Balance"), ""},
-	{MNOTE_PENTAX_TAG_UNKNOWN_08, "Unknown8", N_("Unknown 8"), ""},
-	{MNOTE_PENTAX_TAG_UNKNOWN_09, "Unknown9", N_("Unknown 9"), ""},
-	{MNOTE_PENTAX_TAG_ZOOM, "Zoom", N_("Zoom"), ""},
-	{MNOTE_PENTAX_TAG_SHARPNESS, "Sharpness", N_("Sharpness"), ""},
-	{MNOTE_PENTAX_TAG_CONTRAST, "Contrast", N_("Contrast"), ""},
-	{MNOTE_PENTAX_TAG_SATURATION, "Saturation", N_("Saturation"), ""},
-	{MNOTE_PENTAX_TAG_UNKNOWN_14, "Unknown14", N_("Unknown 14"), ""},
-	{MNOTE_PENTAX_TAG_UNKNOWN_15, "Unknown15", N_("Unknown 15"), ""},
-	{MNOTE_PENTAX_TAG_UNKNOWN_16, "Unknown16", N_("Unknown 16"), ""},
-	{MNOTE_PENTAX_TAG_UNKNOWN_17, "Unknown17", N_("Unknown 17"), ""},
-	{MNOTE_PENTAX_TAG_UNKNOWN_18, "Unknown18", N_("Unknown 18"), ""},
-	{MNOTE_PENTAX_TAG_UNKNOWN_19, "Unknown19", N_("Unknown 19"), ""},
-	{MNOTE_PENTAX_TAG_ISO_SPEED, "ISOSpeed", N_("ISOSpeed"), ""},
-	{MNOTE_PENTAX_TAG_UNKNOWN_21, "Unknown21", N_("Unknown 21"), ""},
-	{MNOTE_PENTAX_TAG_COLOR, "Color", N_("Color"), ""},
-	{MNOTE_PENTAX_TAG_UNKNOWN_24, "Unknown24", N_("Unknown 24"), ""},
-	{MNOTE_PENTAX_TAG_UNKNOWN_25, "Unknown25", N_("Unknown 25"), ""},
-	{MNOTE_PENTAX_TAG_PRINTIM, "PrintIM", N_("PrintIM Settings"), ""},
-	{MNOTE_PENTAX_TAG_TZ_CITY, "TimeZone", N_("TimeZone"), ""},
-	{MNOTE_PENTAX_TAG_TZ_DST, "DaylightSavings", N_("DaylightSavings"), ""},
+	{MNOTE_PENTAX_TAG_MODE, "Mode", N_("Capture Mode"), NULL},
+	{MNOTE_PENTAX_TAG_QUALITY, "Quality", N_("Quality Level"), NULL},
+	{MNOTE_PENTAX_TAG_FOCUS, "Focus", N_("Focus Mode"), NULL},
+	{MNOTE_PENTAX_TAG_FLASH, "Flash", N_("Flash Mode"), NULL},
+	{MNOTE_PENTAX_TAG_UNKNOWN_05, NULL, NULL, NULL},
+	{MNOTE_PENTAX_TAG_UNKNOWN_06, NULL, NULL, NULL},
+	{MNOTE_PENTAX_TAG_WHITE_BALANCE, "WhiteBalance", N_("White Balance"), NULL},
+	{MNOTE_PENTAX_TAG_UNKNOWN_08, NULL, NULL, NULL},
+	{MNOTE_PENTAX_TAG_UNKNOWN_09, NULL, NULL, NULL},
+	{MNOTE_PENTAX_TAG_ZOOM, "Zoom", N_("Zoom"), NULL},
+	{MNOTE_PENTAX_TAG_SHARPNESS, "Sharpness", N_("Sharpness"), NULL},
+	{MNOTE_PENTAX_TAG_CONTRAST, "Contrast", N_("Contrast"), NULL},
+	{MNOTE_PENTAX_TAG_SATURATION, "Saturation", N_("Saturation"), NULL},
+	{MNOTE_PENTAX_TAG_UNKNOWN_14, NULL, NULL, NULL},
+	{MNOTE_PENTAX_TAG_UNKNOWN_15, NULL, NULL, NULL},
+	{MNOTE_PENTAX_TAG_UNKNOWN_16, NULL, NULL, NULL},
+	{MNOTE_PENTAX_TAG_UNKNOWN_17, NULL, NULL, NULL},
+	{MNOTE_PENTAX_TAG_UNKNOWN_18, NULL, NULL, NULL},
+	{MNOTE_PENTAX_TAG_UNKNOWN_19, NULL, NULL, NULL},
+	{MNOTE_PENTAX_TAG_ISO_SPEED, "ISOSpeed", N_("ISOSpeed"), NULL},
+	{MNOTE_PENTAX_TAG_UNKNOWN_21, NULL, NULL, NULL},
+	{MNOTE_PENTAX_TAG_COLOR, "Color", N_("Color"), NULL},
+	{MNOTE_PENTAX_TAG_UNKNOWN_24, NULL, NULL, NULL},
+	{MNOTE_PENTAX_TAG_UNKNOWN_25, NULL, NULL, NULL},
+	{MNOTE_PENTAX_TAG_PRINTIM, "PrintIM", N_("PrintIM Settings"), NULL},
+	{MNOTE_PENTAX_TAG_TZ_CITY, "TimeZone", N_("TimeZone"), NULL},
+	{MNOTE_PENTAX_TAG_TZ_DST, "DaylightSavings", N_("DaylightSavings"), NULL},
 	{0, NULL, NULL, NULL}
 };
 

[libexif-cvs] libexif ChangeLog,1.132,1.133

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

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

Modified Files:
	ChangeLog 
Log Message:

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

	Suggestion by Angela Wrobel (http://www.wrobelnet.de/contact.html):

	* libexif/pentax:
	* libexif/olympus: Improve user experience by removing information
	  from the output that was only intended for developers.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/libexif/ChangeLog,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- ChangeLog	31 Aug 2004 06:11:02 -0000	1.132
+++ ChangeLog	1 Sep 2004 06:16:55 -0000	1.133
@@ -1,3 +1,11 @@
+2004-09-01  Lutz Mueller <lu...@us...>
+
+	Suggestion by Angela Wrobel (http://www.wrobelnet.de/contact.html):
+
+	* libexif/pentax:
+	* libexif/olympus: Improve user experience by removing information
+	  from the output that was only intended for developers.
+
 2004-08-31  Lutz Mueller <lu...@us...>
 
 	* test/test-mem.c: Plug some memory leaks. Suggested by Angela Wrobel

[libexif-cvs] exif ChangeLog,1.44,1.45

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

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

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

	* exif/main.c,actions.*: action_mnote_list can print
	  mnote tag ID instead of its name.
	  Code submitted by Serge Droz <ser...@ps...>.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/libexif/exif/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ChangeLog	27 Aug 2004 16:28:18 -0000	1.44
+++ ChangeLog	31 Aug 2004 13:33:53 -0000	1.45
@@ -1,3 +1,9 @@
+2004-08-31  Jan Patera <pa...@us...>
+
+	* exif/main.c,actions.*: action_mnote_list can print
+	  mnote tag ID instead of its name.
+	  Code submitted by Serge Droz <ser...@ps...>.
+
 2004-08-27  Lutz Mueller <lu...@us...>
 
 	* exif/exif-i18n.c: Some users don't have iconv.

[libexif-cvs] exif/exif actions.c,1.19,1.20 actions.h,1.6,1.7 main.c,1.39,1.40

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

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

Modified Files:
	actions.c actions.h main.c 
Log Message:
2004-08-31  Jan Patera <pa...@us...>

	* exif/main.c,actions.*: action_mnote_list can print
	  mnote tag ID instead of its name.
	  Code submitted by Serge Droz <ser...@ps...>.


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- main.c	20 May 2004 10:51:58 -0000	1.39
+++ main.c	31 Aug 2004 13:33:29 -0000	1.40
@@ -569,7 +569,7 @@
 			} else if (machine_readable) {
 				action_tag_list_machine (*args, ed, eo.use_ids);
 			} else if (list_mnote) {
-				action_mnote_list (*args, ed);
+				action_mnote_list (*args, ed, eo.use_ids);
 			} else
 				action_tag_list (*args, ed, eo.use_ids);
 			exif_data_unref (ed);

Index: actions.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- actions.c	22 Jun 2004 18:01:19 -0000	1.19
+++ actions.c	31 Aug 2004 13:33:29 -0000	1.20
@@ -98,9 +98,9 @@
 }
 
 void
-action_mnote_list (const char *filename, ExifData *ed)
+action_mnote_list (const char *filename, ExifData *ed, unsigned char ids)
 {
-	unsigned int i, bs = 1024, c;
+	unsigned int i, bs = 1024, c, id;
 	char b[1024];
 	char b1[1024], b2[1024];
 	ExifMnoteData *n;
@@ -124,11 +124,26 @@
 		printf (_("MakerNote contains %i values:\n"), c);
 	}
 	for (i = 0; i < c; i++) {
-		p = C (exif_mnote_data_get_title (n, i));
-		strncpy (b1, p ? p : _("Unknown tag"), bs);
+	        if ( ids ) {
+			id = exif_mnote_data_get_id  (n,i);
+			sprintf(b1,"0x%04x",id);
+		} else {
+			p = C (exif_mnote_data_get_title (n, i));
+			strncpy (b1, p ? p : _("Unknown tag"), bs);
+		}
 		p = C (exif_mnote_data_get_value (n, i, b, bs));
 		strncpy (b2, p ? p : _("Unknown value"), bs);
-		printf ("%s: %s\n", b1, b2);
+		/* printf ("%s|%s\n", b1, b2); */
+        	if (ids)
+                	fprintf (stdout, "%-6.6s", b1);
+        	else
+                	fprintf (stdout, "%-20.20s", b1);
+		fputc ('|', stdout);
+        	if (ids)
+			fprintf (stdout, "%s", b2);
+        	else
+                	fprintf (stdout, "%-58.58s", b2);
+        	fputc ('\n', stdout);
 	}
 }
 

Index: actions.h
===================================================================
RCS file: /cvsroot/libexif/exif/exif/actions.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- actions.h	20 May 2004 10:51:58 -0000	1.6
+++ actions.h	31 Aug 2004 13:33:29 -0000	1.7
@@ -33,6 +33,7 @@
 void action_tag_list_machine (const char *filename, ExifData *,
 			      unsigned char ids);
 
-void action_mnote_list       (const char *filename, ExifData *);
+void action_mnote_list       (const char *filename, ExifData *,
+			      unsigned char ids);
 
 #endif /* __ACTIONS_H__ */