added some more nikon tags.

diff --git a/libexif/olympus/mnote-olympus-entry.c b/libexif/olympus/mnote-olympus-entry.c
index 6968551..0362357 100644 (file)
--- a/libexif/olympus/mnote-olympus-entry.c
+++ b/libexif/olympus/mnote-olympus-entry.c
@@ -225,7 +225,7 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
        case MNOTE_NIKON_TAG_FLASHMODE:
        case MNOTE_NIKON_TAG_IMAGEADJUSTMENT:
        case MNOTE_NIKON_TAG_ADAPTER:
-       case MNOTE_NIKON_TAG_SATURATION:
+       case MNOTE_NIKON_TAG_SATURATION2:
                 CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
                 memcpy(v, entry->data, MIN (maxlen, entry->components));
                 break;
@@ -252,6 +252,7 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
                 vl =  exif_get_long (entry->data, entry->order);
                 snprintf (v, maxlen, "%.1f",  ((long unsigned int) vl>>24)/6.0 );
                 break;
+       case MNOTE_NIKON_TAG_SATURATION:
        case MNOTE_NIKON_TAG_WHITEBALANCEFINE:
                 CF (entry->format, EXIF_FORMAT_SSHORT, v, maxlen);
                 CC (entry->components, 1, v, maxlen);

diff --git a/libexif/olympus/mnote-olympus-tag.c b/libexif/olympus/mnote-olympus-tag.c
index f58908c..3709bf1 100644 (file)
--- a/libexif/olympus/mnote-olympus-tag.c
+++ b/libexif/olympus/mnote-olympus-tag.c
@@ -57,7 +57,7 @@ static struct {
        {MNOTE_NIKON_TAG_EXPOSUREBRACKETVAL,  "EXPOSUREBRACKETVAL", N_("Exposure bracket value"), NULL},
        {MNOTE_NIKON_TAG_IMAGEADJUSTMENT, "ImageAdjustment", N_("Image Adjustment"), NULL},
        {MNOTE_NIKON_TAG_TONECOMPENSATION, "TONECOMPENSATION", N_("Tonecompensation"), NULL},
-       {MNOTE_NIKON_TAG_ADAPTER,         "Adapter", N_("Adapter"), NULL},
+       {MNOTE_NIKON_TAG_ADAPTER,         "ADAPTER", N_("Adapter"), NULL},
        {MNOTE_NIKON_TAG_LENSTYPE,        "LENSTYPE", N_("Lenstype"), NULL},
        {MNOTE_NIKON_TAG_LENS,            "LENS", N_("Lens"), NULL},
        {MNOTE_NIKON_TAG_MANUALFOCUSDISTANCE, "MANUALFOCUSDISTANCE", N_("Manual Focus Distance"), NULL},
@@ -69,17 +69,17 @@ static struct {
        {MNOTE_NIKON_TAG_LENS_FSTOPS,     "LENSFSTOPS", N_("Lens F stops"), NULL},
        {MNOTE_NIKON_TAG_CURVE,           "CURVE,", N_("Contrast curve"), NULL},
        {MNOTE_NIKON_TAG_COLORMODE,       "COLORMODE,", N_("Colormode"), NULL},
-       {MNOTE_NIKON_TAG_LIGHTYPE,        "LIGHTYPE,", N_("Lightype"), NULL},
+       {MNOTE_NIKON_TAG_LIGHTTYPE,       "LIGHTTYPE,", N_("Lighttype"), NULL},
        {MNOTE_NIKON_TAG_UNKNOWN_0X0091,  NULL, NULL, NULL},
-       {MNOTE_NIKON_TAG_HUE,             "Hue,", N_("Hue Adjustment"), NULL},
-       {MNOTE_NIKON_TAG_UNKNOWN_0X0094,  NULL, NULL, NULL},
+       {MNOTE_NIKON_TAG_HUE,             "HUE", N_("Hue Adjustment"), NULL},
+       {MNOTE_NIKON_TAG_SATURATION,      "SATURATION", N_("Saturation"), NULL},
        {MNOTE_NIKON_TAG_NOISEREDUCTION,  "NOISEREDUCTION,", N_("Noisereduction"), NULL},
        {MNOTE_NIKON_TAG_UNKNOWN_0X0097,  NULL, NULL, NULL},
        {MNOTE_NIKON_TAG_UNKNOWN_0X0098,  NULL, NULL, NULL},
        {MNOTE_NIKON_TAG_SENSORPIXELSIZE, "SENSORPIXELSIZE", N_("Sensor pixel size"), NULL},
        {MNOTE_NIKON_TAG_UNKNOWN_0X009B,  NULL, NULL, NULL},
-       {MNOTE_NIKON_TAG_UNKNOWN_0X00A0,  NULL, NULL, NULL},
-       {MNOTE_NIKON_TAG_UNKNOWN_0X00A2,  NULL, NULL, NULL},
+       {MNOTE_NIKON_TAG_SERIALNUMBER,    "SERIALNUMBER", N_("Serial number"), NULL},
+       {MNOTE_NIKON_TAG_IMAGE_DATASIZE,  "IMAGEDATASIZE", N_("Image datasize"), NULL},
        {MNOTE_NIKON_TAG_UNKNOWN_0X00A3,  NULL, NULL, NULL},
        {MNOTE_NIKON_TAG_TOTALPICTURES,   "TOTALPICTURES,", N_("Total number of pictures taken"), NULL},
        {MNOTE_NIKON_TAG_UNKNOWN_0X00A8,  NULL, NULL, NULL},

diff --git a/libexif/olympus/mnote-olympus-tag.h b/libexif/olympus/mnote-olympus-tag.h
index 75af244..1e4fb5f 100644 (file)
--- a/libexif/olympus/mnote-olympus-tag.h
+++ b/libexif/olympus/mnote-olympus-tag.h
@@ -63,22 +63,22 @@ enum _MnoteOlympusTag {
        MNOTE_NIKON_TAG_LENS_FSTOPS             = 0x008b,
        MNOTE_NIKON_TAG_CURVE                   = 0x008c,
        MNOTE_NIKON_TAG_COLORMODE               = 0x008d,
-       MNOTE_NIKON_TAG_LIGHTYPE                = 0x0090,
+       MNOTE_NIKON_TAG_LIGHTTYPE               = 0x0090,
        MNOTE_NIKON_TAG_UNKNOWN_0X0091          = 0x0091,
        MNOTE_NIKON_TAG_HUE                     = 0x0092,
-       MNOTE_NIKON_TAG_UNKNOWN_0X0094          = 0x0094,
+       MNOTE_NIKON_TAG_SATURATION              = 0x0094,
        MNOTE_NIKON_TAG_NOISEREDUCTION          = 0x0095,
        MNOTE_NIKON_TAG_UNKNOWN_0X0097          = 0x0097,
        MNOTE_NIKON_TAG_UNKNOWN_0X0098          = 0x0098,
        MNOTE_NIKON_TAG_SENSORPIXELSIZE         = 0x009a,
        MNOTE_NIKON_TAG_UNKNOWN_0X009B          = 0x009b,
-       MNOTE_NIKON_TAG_UNKNOWN_0X00A0          = 0x00a0,
-       MNOTE_NIKON_TAG_UNKNOWN_0X00A2          = 0x00a2,
+       MNOTE_NIKON_TAG_SERIALNUMBER            = 0x00a0,
+       MNOTE_NIKON_TAG_IMAGE_DATASIZE          = 0x00a2,
        MNOTE_NIKON_TAG_UNKNOWN_0X00A3          = 0x00a3,
        MNOTE_NIKON_TAG_TOTALPICTURES           = 0x00a7,
        MNOTE_NIKON_TAG_UNKNOWN_0X00A8          = 0x00a8,
        MNOTE_NIKON_TAG_OPTIMIZATION            = 0x00a9,
-       MNOTE_NIKON_TAG_SATURATION              = 0x00aa,
+       MNOTE_NIKON_TAG_SATURATION2             = 0x00aa,
        MNOTE_NIKON_TAG_VARIPROGRAM             = 0x00ab,
        MNOTE_NIKON_TAG_CAPTUREEDITORDATA       = 0x0e01,
        MNOTE_NIKON_TAG_CAPTUREEDITORVER        = 0x0e09,