[libexif-cvs] libexif/libexif exif-tag.c, 1.35, 1.36 exif-tag.h, 1.15, 1.16

[Dan F. <dfa...@us...>]

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

Modified Files:
	exif-tag.c exif-tag.h 
Log Message:
Renamed EXIF_TAG_UNKNOWN_C4A5 to EXIF_TAG_PRINT_IMAGE_MATCHING
The PIM entry seems to have a format consisting of an 8 byte
magic number, 6 byte version number, 2 byte record count field,
then a series of 6 byte records consisting of a 2 byte tag field
and an 4 byte data field.


Index: exif-tag.h
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- exif-tag.h	15 May 2007 18:23:28 -0000	1.15
+++ exif-tag.h	7 Nov 2007 06:53:20 -0000	1.16
@@ -142,8 +142,8 @@ typedef enum {
 	EXIF_TAG_DEVICE_SETTING_DESCRIPTION	= 0xa40b,
 	EXIF_TAG_SUBJECT_DISTANCE_RANGE		= 0xa40c,
 	EXIF_TAG_IMAGE_UNIQUE_ID		= 0xa420,
-	EXIF_TAG_GAMMA = 0xa500,
-	EXIF_TAG_UNKNOWN_C4A5 = 0xc4a5
+	EXIF_TAG_GAMMA				= 0xa500,
+	EXIF_TAG_PRINT_IMAGE_MATCHING		= 0xc4a5
 } ExifTag;
 
 /* GPS tags overlap with above ones. */
@@ -198,6 +198,9 @@ const char     *exif_tag_get_name       
 const char     *exif_tag_get_title       (ExifTag tag);
 const char     *exif_tag_get_description (ExifTag tag);
 
+/* Don't use these definitions. They are here for compatibility only. */
+#define EXIF_TAG_UNKNOWN_C4A5 EXIF_TAG_PRINT_IMAGE_MATCHING
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Index: exif-tag.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-tag.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -d -r1.35 -r1.36
--- exif-tag.c	30 Oct 2007 06:45:23 -0000	1.35
+++ exif-tag.c	7 Nov 2007 06:53:19 -0000	1.36
@@ -371,7 +371,7 @@ static const struct {
 	    "input device as specified in ISO 12232."),
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
 	{EXIF_TAG_OECF, "OECF", "OECF",
-	 N_("Indicates the Opto-Electoric Conversion Function (OECF) "
+	 N_("Indicates the Opto-Electronic Conversion Function (OECF) "
 	    "specified in ISO 14524. <OECF> is the relationship between "
 	    "the camera optical input and the image values."),
 	 { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
@@ -458,7 +458,7 @@ static const struct {
 	    "with NULL (\"00.h\"). ID codes are assigned by means of "
 	    "registration. The designation method and references for each "
 	    "character code are given in Table 6. The value of CountN "
-	    "is determinated based on the 8 bytes in the character code "
+	    "is determined based on the 8 bytes in the character code "
 	    "area and the number of bytes in the user comment part. Since "
 	    "the TYPE is not ASCII, NULL termination is not necessary "
 	    "(see Fig. 9). "
@@ -679,8 +679,8 @@ static const struct {
 	    "to hexadecimal notation and 128-bit fixed length.")},
 	{EXIF_TAG_GAMMA, "Gamma", N_("Gamma"),
 	 N_("Indicates the value of coefficient gamma.")},
-	{EXIF_TAG_UNKNOWN_C4A5, "UnknownC4A5", N_("Unknown"),
-	 N_("Unknown (related to Epson's PRINT Image Matching technology)")},
+	{EXIF_TAG_PRINT_IMAGE_MATCHING, "PrintImageMatching", N_("PRINT Image Matching"),
+	 N_("Related to Epson's PRINT Image Matching technology")},
 #endif
 	{0, NULL, NULL, NULL}
 };