[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c,1.4,1.5 mnote-olympus-entry.c,1.2,1.3

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

Update of /cvsroot/libexif/libexif/libexif/olympus
In directory sc8-pr-cvs1:/tmp/cvs-serv23146/libexif/olympus

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

2003-12-01  Lutz Mueller <lu...@us...>

	* libexif: Various improvements by Jan Patera <pa...@pi...>.


Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- exif-mnote-data-olympus.c	30 Oct 2003 22:10:45 -0000	1.4
+++ exif-mnote-data-olympus.c	1 Dec 2003 18:09:29 -0000	1.5
@@ -86,13 +86,15 @@
 
 	/* Write the header and the number of entries. */
 	strcpy (*buf, "OLYMP");
-	exif_set_short (*buf + 8, n->order, n->count);
+	exif_set_short (*buf + 8, n->order, (ExifShort) n->count);
 
 	/* Save each entry */
 	for (i = 0; i < n->count; i++) {
 		o = 6 + 2 + 2 + i * 12;
-		exif_set_short (*buf + o + 0, n->order, n->entries[i].tag);
-		exif_set_short (*buf + o + 2, n->order, n->entries[i].format);
+		exif_set_short (*buf + o + 0, n->order,
+				(ExifShort) n->entries[i].tag);
+		exif_set_short (*buf + o + 2, n->order,
+				(ExifShort) n->entries[i].format);
 		exif_set_long  (*buf + o + 4, n->order,
 				n->entries[i].components);
 		o += 8;

Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mnote-olympus-entry.c	28 Oct 2003 22:50:07 -0000	1.2
+++ mnote-olympus-entry.c	1 Dec 2003 18:09:29 -0000	1.3
@@ -182,6 +182,7 @@
 	case MNOTE_OLYMPUS_TAG_VERSION:
 		CF (entry->format, EXIF_FORMAT_ASCII, v);
 		CC (entry->components, 5, v);
+		strncpy (v, entry->data, MIN (sizeof (v), entry->size));
 		break;
 	case MNOTE_OLYMPUS_TAG_INFO:
 		CF (entry->format, EXIF_FORMAT_ASCII, v);
@@ -190,6 +191,7 @@
 	case MNOTE_OLYMPUS_TAG_ID:
 		CF (entry->format, EXIF_FORMAT_UNDEFINED, v);
 		CC (entry->components, 32, v);
+		strncpy (v, entry->data, MIN (sizeof (v), entry->size));
 		break;
 	case MNOTE_OLYMPUS_TAG_UNKNOWN_4:
 		CF (entry->format, EXIF_FORMAT_LONG, v);