[libexif-cvs] libexif/libexif exif-data.c, 1.91, 1.92 exif-entry.c, 1.98, 1.99

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

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

Modified Files:
	exif-data.c exif-entry.c 
Log Message:
1) exif-entry.c: resolved clash of EXIF_TAG_GPS_LATITUDE & EXIF_TAG_INTEROPERABILITY_VERSIO
2) exif-data.c: fixed previous change of H. Figuiere


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -d -r1.98 -r1.99
--- exif-entry.c	8 May 2007 16:45:27 -0000	1.98
+++ exif-entry.c	11 May 2007 06:20:14 -0000	1.99
@@ -969,9 +969,11 @@ exif_entry_get_value (ExifEntry *e, char
 			strncpy (val, _(list[i].strings[j]), maxlen - 1);
 		break; 	
 	case EXIF_TAG_INTEROPERABILITY_VERSION:
-		CF (e, EXIF_FORMAT_UNDEFINED, val, maxlen);
-		strncpy (val, (char *) e->data, MIN (maxlen, e->size));
-		break;
+		if (e->format == EXIF_FORMAT_UNDEFINED) {
+			strncpy (val, (char *) e->data, MIN (maxlen, e->size));
+			break;
+		}
+		/* Fall through - EXIF_TAG_GPS_LATITUDE is same as INTEROPERABILITY_VERSION */
 	default:
 		if (!e->components) break;
 		switch (e->format) {

Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -d -r1.91 -r1.92
--- exif-data.c	11 May 2007 02:59:57 -0000	1.91
+++ exif-data.c	11 May 2007 06:20:13 -0000	1.92
@@ -193,7 +193,7 @@ exif_data_load_data_entry (ExifData *dat
 
 	/* If this is the MakerNote, remember the offset */
 	if (entry->tag == EXIF_TAG_MAKER_NOTE) {
-		if (entry->data) {
+		if (!entry->data) {
 			exif_log (data->priv->log,
                                                EXIF_LOG_CODE_DEBUG, "ExifData",
                                                "MakerNote found with NULL data");