[libexif-cvs] libexif/libexif exif-entry.c,1.36,1.37 exif-tag.c,1.13,1.14 exif-tag.h,1.8,1.9 exif-utils.h,1.5,1.6

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

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

Modified Files:
	exif-entry.c exif-tag.c exif-tag.h exif-utils.h 
Log Message:

2003-08-06  Lutz Mueller <lu...@us...>

	* libexif/exif-entry.c (exif_entry_initialize): Support some more
	  tags.
	* libexif/exif-tag.[c,h]: Cosmetic fix.
	* libexif/exif-utils.h: Do not let above cosmetic fix break the API.


Index: exif-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-entry.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- exif-entry.c	29 Jul 2003 22:19:40 -0000	1.36
+++ exif-entry.c	6 Aug 2003 19:47:53 -0000	1.37
@@ -1374,6 +1374,8 @@
 		exif_set_rational (
 			e->data + 5 * exif_format_get_size (e->format), o, r);
 		break;
+	
+	/* ASCII, 20 components */
 	case EXIF_TAG_DATE_TIME:
 	case EXIF_TAG_DATE_TIME_ORIGINAL:
 	case EXIF_TAG_DATE_TIME_DIGITIZED:
@@ -1388,6 +1390,16 @@
 			  tm->tm_year + 1900, tm->tm_mon, tm->tm_mday,
 			  tm->tm_hour, tm->tm_min, tm->tm_sec);
 		break;
+	
+	/* ASCII, no default */
+	case EXIF_TAG_SUB_SEC_TIME:
+	case EXIF_TAG_SUB_SEC_TIME_ORIGINAL:
+	case EXIF_TAG_SUB_SEC_TIME_DIGITIZED:
+		e->components = 0;
+		e->format = EXIF_FORMAT_ASCII;
+		e->size = 0;
+		e->data = NULL;
+		break;
 	case EXIF_TAG_IMAGE_DESCRIPTION:
 	case EXIF_TAG_MAKE:
 	case EXIF_TAG_MODEL:
@@ -1409,6 +1421,7 @@
 		break;
 
 	/* UNDEFINED, no components, no default */
+	case EXIF_TAG_MAKER_NOTE:
 	case EXIF_TAG_USER_COMMENT:
 		e->components = 0;
 		e->format = EXIF_FORMAT_UNDEFINED;

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- exif-tag.c	28 Apr 2003 18:22:18 -0000	1.13
+++ exif-tag.c	6 Aug 2003 19:47:53 -0000	1.14
@@ -383,7 +383,7 @@
 	    "When a <UserComment> area is set aside, it is recommended that "
 	    "the ID code be ASCII and that the following user comment "
 	    "part be filled with blank characters [20.H].")},
-	{EXIF_TAG_SUBSEC_TIME, "SubsecTime", "SubsecTime",
+	{EXIF_TAG_SUB_SEC_TIME, "SubsecTime", "SubsecTime",
 	 N_("A tag used to record fractions of seconds for the "
 	    "<DateTime> tag.")},
 	{EXIF_TAG_SUB_SEC_TIME_ORIGINAL, "SubSecTimeOriginal",

Index: exif-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- exif-tag.h	15 Dec 2002 11:41:11 -0000	1.8
+++ exif-tag.h	6 Aug 2003 19:47:53 -0000	1.9
@@ -96,7 +96,7 @@
 	EXIF_TAG_SUBJECT_AREA			= 0x9214,
 	EXIF_TAG_MAKER_NOTE			= 0x927c,
 	EXIF_TAG_USER_COMMENT			= 0x9286,
-	EXIF_TAG_SUBSEC_TIME			= 0x9290,
+	EXIF_TAG_SUB_SEC_TIME			= 0x9290,
 	EXIF_TAG_SUB_SEC_TIME_ORIGINAL		= 0x9291,
 	EXIF_TAG_SUB_SEC_TIME_DIGITIZED		= 0x9292,
 	EXIF_TAG_FLASH_PIX_VERSION		= 0xa000,

Index: exif-utils.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-utils.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- exif-utils.h	15 Dec 2002 11:41:11 -0000	1.5
+++ exif-utils.h	6 Aug 2003 19:47:53 -0000	1.6
@@ -54,6 +54,9 @@
 void exif_set_srational (unsigned char *b, ExifByteOrder order,
 			 ExifSRational value);
 
+/* For compatibility with older versions */
+#define EXIF_TAG_SUBSEC_TIME EXIF_TAG_SUB_SEC_TIME
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */