[libexif-cvs] libexif/libexif/olympus exif-mnote-data-olympus.c,1.22,1.23 mnote-olympus-entry.c,1.19,1.20

[Hans U. N. <hu...@us...>]

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

Modified Files:
	exif-mnote-data-olympus.c mnote-olympus-entry.c 
Log Message:
make libexif 'gcc-4.0 -Wall -Werror' clean

Index: mnote-olympus-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/mnote-olympus-entry.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -d -r1.19 -r1.20
--- mnote-olympus-entry.c	17 Sep 2004 20:59:15 -0000	1.19
+++ mnote-olympus-entry.c	5 May 2005 16:57:58 -0000	1.20
@@ -428,17 +428,17 @@ mnote_olympus_entry_get_value (MnoteOlym
 	case MNOTE_OLYMPUS_TAG_VERSION:
 		CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
 		CC2 (entry->components, 5, 8, v, maxlen);
-		strncpy (v, entry->data, MIN (maxlen, entry->size));
+		strncpy (v, (char *)entry->data, MIN (maxlen, entry->size));
 		break;
 	case MNOTE_OLYMPUS_TAG_INFO:
 		CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
 		CC2 (entry->components, 52, 53, v, maxlen);
-		strncpy (v, entry->data, MIN (maxlen, entry->size));
+		strncpy (v, (char *)entry->data, MIN (maxlen, entry->size));
 		break;
 	case MNOTE_OLYMPUS_TAG_ID:
 		CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);
 		CC (entry->components, 32, v, maxlen);
-		strncpy (v, entry->data, MIN (maxlen, entry->size));
+		strncpy (v, (char *)entry->data, MIN (maxlen, entry->size));
 		break;
 	case MNOTE_OLYMPUS_TAG_UNKNOWN_4:
 		CF (entry->format, EXIF_FORMAT_LONG, v, maxlen);
@@ -512,7 +512,7 @@ mnote_olympus_entry_get_value (MnoteOlym
 	default:
 		switch (entry->format) {
 		case EXIF_FORMAT_ASCII:
-			strncpy (v, entry->data,
+			strncpy (v, (char *)entry->data,
 				 MIN (maxlen, entry->components));
 			break;
 		case EXIF_FORMAT_SHORT:

Index: exif-mnote-data-olympus.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/olympus/exif-mnote-data-olympus.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -d -r1.22 -r1.23
--- exif-mnote-data-olympus.c	9 Mar 2005 20:49:28 -0000	1.22
+++ exif-mnote-data-olympus.c	5 May 2005 16:57:58 -0000	1.23
@@ -91,7 +91,7 @@ exif_mnote_data_olympus_save (ExifMnoteD
 		if (!*buf) return;
 
 		/* Write the header and the number of entries. */
-		strcpy (*buf, "OLYMP");
+		strcpy ((char *)*buf, "OLYMP");
 		o2 += 2;
 		datao = n->offset;
 		break;
@@ -105,7 +105,7 @@ exif_mnote_data_olympus_save (ExifMnoteD
 		if (!*buf) return;
 
 		/* Write the header and the number of entries. */
-		strcpy (*buf, "Nikon");
+		strcpy ((char *)*buf, "Nikon");
 		(*buf)[6] = n->version;
 		o2 += 2; *buf_size += 2;
 		if (n->version == 2) {
@@ -226,9 +226,9 @@ exif_mnote_data_olympus_load (ExifMnoteD
 			 */
 			datao = o2;
 			if (o2 >= buf_size) return;
-			if (!strncmp (&buf[o2], "II", 2))
+			if (!strncmp ((char *)&buf[o2], "II", 2))
 				n->order = EXIF_BYTE_ORDER_INTEL;
-			else if (!strncmp (&buf[o2], "MM", 2))
+			else if (!strncmp ((char *)&buf[o2], "MM", 2))
 				n->order = EXIF_BYTE_ORDER_MOTOROLA;
 			else {
 				exif_log (en->log, EXIF_LOG_CODE_DEBUG,