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

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

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

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

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

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


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

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