bugfix: change 0xa000 tag name (#38)

[platform/upstream/libexif.git] / libexif / exif-tag.c

diff --git a/libexif/exif-tag.c b/libexif/exif-tag.c
index aab1543..6c85e33 100644 (file)
--- a/libexif/exif-tag.c
+++ b/libexif/exif-tag.c
@@ -217,6 +217,9 @@ static const struct TagEntry {
        {EXIF_TAG_GPS_DIFFERENTIAL, "GPSDifferential", N_("GPS Differential Correction"),
          N_("Indicates whether differential correction is applied to the "
             "GPS receiver."), ESL_GPS},
+       {EXIF_TAG_GPS_H_POSITIONING_ERROR, "GPSHPositioningError", N_("GPS Horizontal Positioning Error"),
+         N_("Indicates the horizontal positioning errors in meters. This is "
+            "expressed as one RATIONAL value."), ESL_GPS},
        /* Not in EXIF 2.2 */
        {EXIF_TAG_NEW_SUBFILE_TYPE, "NewSubfileType",
         N_("New Subfile Type"), N_("A general indication of the kind of data "
@@ -665,7 +668,7 @@ static const struct TagEntry {
         N_("A character string giving the image subject, encoded in "
            "UTF-16LE."),
         { ESL_OOOO, ESL_NNNN, ESL_NNNN, ESL_NNNN, ESL_NNNN } },
-       {EXIF_TAG_FLASH_PIX_VERSION, "FlashPixVersion", "FlashPixVersion",
+       {EXIF_TAG_FLASH_PIX_VERSION, "FlashpixVersion", "FlashPixVersion",
         N_("The FlashPix format version supported by a FPXR file."),
         { ESL_NNNN, ESL_NNNN, ESL_MMMM, ESL_NNNN, ESL_NNNN } },
        {EXIF_TAG_COLOR_SPACE, "ColorSpace", N_("Color Space"),
@@ -863,10 +866,38 @@ static const struct TagEntry {
            "each image. It is recorded as an ASCII string equivalent "
            "to hexadecimal notation and 128-bit fixed length."),
         { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
-       /* Not in EXIF 2.2 */
+       /* EXIF 2.3 */
+       {EXIF_TAG_CAMERA_OWNER_NAME, "CameraOwnerName", N_("Camera Owner Name"),
+        N_("This tag indicates the name of the camera owner, "
+            "photographer or image creator."),
+        { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+       /* EXIF 2.3 */
+       {EXIF_TAG_BODY_SERIAL_NUMBER, "BodySerialNumber", N_("Body Serial Number"),
+        N_("This tag indicates the serial number of the body of the camera"),
+        { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+       /* EXIF 2.3 */
+       {EXIF_TAG_LENS_SPECIFICATION, "LensSpecification", N_("Lens Specification"),
+        N_("This tag indicates minimum focal length, "
+            "maximum focal length, minimum F number in the "
+            "minimum focal length, and minimum F number in "
+            "the maximum focal length."),
+        { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+       /* EXIF 2.3 */
+       {EXIF_TAG_LENS_MAKE, "LensMake", N_("Lens Make"),
+        N_("This tag indicates the lens manufacturer."),
+        { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+       /* EXIF 2.3 */
+       {EXIF_TAG_LENS_MODEL, "LensModel", N_("Lens Model"),
+        N_("This tag indicates the lens' model name and model number."),
+        { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+       /* EXIF 2.3 */
+       {EXIF_TAG_LENS_SERIAL_NUMBER, "LensSerialNumber", N_("Lens Serial Number"),
+        N_("This tag indicates the serial number of the interchangeable lens."),
+        { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
+       /* EXIF 2.3 */
        {EXIF_TAG_GAMMA, "Gamma", N_("Gamma"),
         N_("Indicates the value of coefficient gamma."),
-        ESL_UNKNOWN},
+        { ESL_NNNN, ESL_NNNN, ESL_OOOO, ESL_NNNN, ESL_NNNN } },
        /* Not in EXIF 2.2 */
        {EXIF_TAG_PRINT_IMAGE_MATCHING, "PrintImageMatching", N_("PRINT Image Matching"),
         N_("Related to Epson's PRINT Image Matching technology"),
@@ -889,7 +920,7 @@ static const struct TagEntry {
  * Return the number of entries in the EXIF tag table, including the
  * terminating NULL entry.
  */
-inline unsigned int
+unsigned int
 exif_tag_table_count (void)
 {
        return sizeof (ExifTagTable) / sizeof (ExifTagTable[0]);
@@ -995,14 +1026,7 @@ exif_tag_get_title_in_ifd (ExifTag tag, ExifIfd ifd)
                } else
                        return NULL; /* Recorded tag not found in the table */
        }
-       /* FIXME: This belongs to somewhere else. */
-       /* libexif should use the default system locale.
-        * If an application specifically requires UTF-8, then we
-        * must give the application a way to tell libexif that.
-        * 
-        * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-        */
-       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+       (void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        return _(ExifTagTable[i].title);
 }
 
@@ -1036,7 +1060,7 @@ exif_tag_get_description_in_ifd (ExifTag tag, ExifIfd ifd)
         * 
         * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
         */
-       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+       (void) bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        return _(ExifTagTable[i].description);
 }