[libexif-cvs] libexif/libexif/canon mnote-canon-entry.c,1.13,1.14

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

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

Modified Files:
	mnote-canon-entry.c 
Log Message:
libexif/Canon/mnote-canon-entry.c: Don't check size of MNOTE_CANON_TAG_OWNER
and MNOTE_CANON_TAG_FIRMWARE - I have seen many different values (14, 22, 24, 32...)


Index: mnote-canon-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -d -r1.13 -r1.14
--- mnote-canon-entry.c	27 Aug 2005 10:30:10 -0000	1.13
+++ mnote-canon-entry.c	24 Oct 2005 15:25:26 -0000	1.14
@@ -340,16 +340,17 @@ mnote_canon_entry_get_value (const Mnote
 		}
 		break;
 
-	case MNOTE_CANON_TAG_IMAGE_TYPE:
 	case MNOTE_CANON_TAG_OWNER:
-		CF (entry->format, EXIF_FORMAT_ASCII, val, maxlen);
 		CC (entry->components, 32, val, maxlen);
+		/* Fall through; ImageType can have many sizes */
+	case MNOTE_CANON_TAG_IMAGE_TYPE:
+		CF (entry->format, EXIF_FORMAT_ASCII, val, maxlen);
 		strncpy (val, (char *)data, MIN (entry->size, maxlen));
 		break;
 
 	case MNOTE_CANON_TAG_FIRMWARE:
 		CF (entry->format, EXIF_FORMAT_ASCII, val, maxlen);
-		CC2 (entry->components, 24, 32, val, maxlen);
+/*		CC2 (entry->components, 24, 32, val, maxlen); Can also be 22 */
 		strncpy (val, (char *)data, MIN (entry->size, maxlen));
 		break;