From: Jan Patera Date: Tue, 2 Nov 2004 08:32:14 +0000 (+0100) Subject: Added these tags: X-Git-Tag: libexif-0_6_21-release~706 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21fb4baf50ff1e92f9e6bd857fcf9b5116f76b74;p=platform%2Fupstream%2Flibexif.git Added these tags: EXIF_TAG_NEW_SUBFILE_TYPE = 0x00fe EXIF_TAG_SUB_IFDS = 0x014a EXIF_TAG_XML_PACKET = 0x02bc EXIF_TAG_IMAGE_RESOURCES = 0x8649 EXIF_TAG_TIFF_EP_STANDARD_ID = 0x9216 These tags are used in the Nikon Raw format .NEF. The primary reason why I added these items is that exif_data_load_data_content() gives parsing IFD up when it encounters an unknown tag. --- diff --git a/libexif/exif-tag.c b/libexif/exif-tag.c index c0e256d..61ea733 100644 --- a/libexif/exif-tag.c +++ b/libexif/exif-tag.c @@ -38,6 +38,9 @@ static struct { const char *description; ExifSL esl_0[4], esl_1[4], esl_exif[4], esl_gps[4]; } ExifTagTable[] = { + {EXIF_TAG_NEW_SUBFILE_TYPE, "NewSubfileType", + "New Subfile Type", N_("A general indication of the kind of data " + "contained in this subfile.")}, {EXIF_TAG_INTEROPERABILITY_INDEX, "InteroperabilityIndex", "InteroperabilityIndex", N_("Indicates the identification of the Interoperability rule. " @@ -169,6 +172,8 @@ static struct { "Normally this tag is not necessary, since colorspace is " "specified in the colorspace information tag ().")}, {EXIF_TAG_TRANSFER_RANGE, "TransferRange", N_("Transfer Range"), ""}, + {EXIF_TAG_SUB_IFDS, "SubIFDs", "SubIFD Offsets", N_("Defined by Adobe Corporation " + "to enable TIFF Trees within a TIFF file.")}, {EXIF_TAG_JPEG_PROC, "JPEGProc", "JPEGProc", ""}, {EXIF_TAG_JPEG_INTERCHANGE_FORMAT, "JPEGInterchangeFormat", N_("JPEG Interchange Format"), @@ -221,6 +226,7 @@ static struct { "in a color space information tag, with the default " "being the value that gives the optimal image characteristics " "Interoperability these conditions.")}, + {EXIF_TAG_XML_PACKET, "XMLPacket", N_("XML Packet"), N_("XMP Metadata")}, {EXIF_TAG_RELATED_IMAGE_FILE_FORMAT, "RelatedImageFileFormat", "RelatedImageFileFormat", ""}, {EXIF_TAG_RELATED_IMAGE_WIDTH, "RelatedImageWidth", @@ -261,6 +267,7 @@ static struct { {EXIF_TAG_FNUMBER, "FNumber", "FNumber", N_("The F number.")}, {EXIF_TAG_IPTC_NAA, "IPTC/NAA", "IPTC/NAA", ""}, + {EXIF_TAG_IMAGE_RESOURCES, "ImageResources", N_("Image Resources Block"), ""}, {EXIF_TAG_EXIF_IFD_POINTER, "ExifIFDPointer", "ExifIFDPointer", N_("A pointer to the Exif IFD. Interoperability, Exif IFD has the " "same structure as that of the IFD specified in TIFF. " @@ -532,6 +539,7 @@ static struct { {EXIF_TAG_SUBJECT_AREA, "SubjectArea", N_("Subject Area"), N_("This tag indicates the location and area of the main subject " "in the overall scene.")}, + {EXIF_TAG_TIFF_EP_STANDARD_ID, "TIFF/EPStandardID", N_("TIFF/EP Standard ID"), ""}, {EXIF_TAG_CUSTOM_RENDERED, "CustomRendered", N_("Custom Rendered"), N_("This tag indicates the use of special processing on image " "data, such as rendering geared to output. When special " diff --git a/libexif/exif-tag.h b/libexif/exif-tag.h index 1efe45e..adf1e20 100644 --- a/libexif/exif-tag.h +++ b/libexif/exif-tag.h @@ -28,6 +28,7 @@ extern "C" { typedef enum { EXIF_TAG_INTEROPERABILITY_INDEX = 0x0001, EXIF_TAG_INTEROPERABILITY_VERSION = 0x0002, + EXIF_TAG_NEW_SUBFILE_TYPE = 0x00fe, EXIF_TAG_IMAGE_WIDTH = 0x0100, EXIF_TAG_IMAGE_LENGTH = 0x0101, EXIF_TAG_BITS_PER_SAMPLE = 0x0102, @@ -54,6 +55,7 @@ typedef enum { EXIF_TAG_WHITE_POINT = 0x013e, EXIF_TAG_PRIMARY_CHROMATICITIES = 0x013f, EXIF_TAG_TRANSFER_RANGE = 0x0156, + EXIF_TAG_SUB_IFDS = 0x014a, EXIF_TAG_JPEG_PROC = 0x0200, EXIF_TAG_JPEG_INTERCHANGE_FORMAT = 0x0201, EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = 0x0202, @@ -61,6 +63,7 @@ typedef enum { EXIF_TAG_YCBCR_SUB_SAMPLING = 0x0212, EXIF_TAG_YCBCR_POSITIONING = 0x0213, EXIF_TAG_REFERENCE_BLACK_WHITE = 0x0214, + EXIF_TAG_XML_PACKET = 0x02bc, EXIF_TAG_RELATED_IMAGE_FILE_FORMAT = 0x1000, EXIF_TAG_RELATED_IMAGE_WIDTH = 0x1001, EXIF_TAG_RELATED_IMAGE_LENGTH = 0x1002, @@ -71,6 +74,7 @@ typedef enum { EXIF_TAG_EXPOSURE_TIME = 0x829a, EXIF_TAG_FNUMBER = 0x829d, EXIF_TAG_IPTC_NAA = 0x83bb, + EXIF_TAG_IMAGE_RESOURCES = 0x8649, EXIF_TAG_EXIF_IFD_POINTER = 0x8769, EXIF_TAG_INTER_COLOR_PROFILE = 0x8773, EXIF_TAG_EXPOSURE_PROGRAM = 0x8822, @@ -94,6 +98,7 @@ typedef enum { EXIF_TAG_FLASH = 0x9209, EXIF_TAG_FOCAL_LENGTH = 0x920a, EXIF_TAG_SUBJECT_AREA = 0x9214, + EXIF_TAG_TIFF_EP_STANDARD_ID = 0x9216, EXIF_TAG_MAKER_NOTE = 0x927c, EXIF_TAG_USER_COMMENT = 0x9286, EXIF_TAG_SUB_SEC_TIME = 0x9290,