Mon Nov 6 20:53:22 2006 John Ellis <johne@verizon.net>

        * format_olympus.c: Fix olympus makernote tag types to match image
        sample: Olympus.Bracket, Olympus.FocusDistance, Olympus.SerialNumber,
        and Olympus.FlashBias.

diff --git a/ChangeLog b/ChangeLog
index 9b910b0..a8f4607 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov  6 20:53:22 2006  John Ellis  <johne@verizon.net>
+
+       * format_olympus.c: Fix olympus makernote tag types to match image
+       sample: Olympus.Bracket, Olympus.FocusDistance, Olympus.SerialNumber,
+       and Olympus.FlashBias.
+
 Sat Nov  4 17:14:47 2006  John Ellis  <johne@verizon.net>
 
        * pan-view.c: Always recalculate canvas size when displaying popups.

diff --git a/src/format_olympus.c b/src/format_olympus.c
index cdbda46..0ea2738 100644 (file)
--- a/src/format_olympus.c
+++ b/src/format_olympus.c
@@ -124,9 +124,9 @@ static ExifMarker OlympusExifMarkersList[] = {
 { 0x020d, EXIF_FORMAT_STRING, -1,       "Epson.Manufacturer",  "Manufacturer",         NULL },
 { 0x0e00, EXIF_FORMAT_BYTE, -1,                 "Olympus.PrintImageMatching", "Print image matching", NULL },
 { 0x1004, EXIF_FORMAT_SHORT_UNSIGNED, 1, "Olympus.FlashMode",  "Flash mode",           OlympusTagFlashMode },
-{ 0x1006, EXIF_FORMAT_SHORT_UNSIGNED, 1, "Olympus.Bracket",    "Bracket",              NULL },
+{ 0x1006, EXIF_FORMAT_RATIONAL, 1,      "Olympus.Bracket",     "Bracket",              NULL },
 { 0x100b, EXIF_FORMAT_SHORT_UNSIGNED, 1, "Olympus.FocusMode",  "Focus mode",           OlympusTagFocusMode },
-{ 0x100c, EXIF_FORMAT_SHORT_UNSIGNED, 1, "Olympus.FocusDistance", "Focus distance",    NULL },
+{ 0x100c, EXIF_FORMAT_RATIONAL_UNSIGNED, 1, "Olympus.FocusDistance", "Focus distance", NULL },
 { 0x100d, EXIF_FORMAT_SHORT_UNSIGNED, 1, "Olympus.Zoom",       "Zoom",                 NULL },
 { 0x1006, EXIF_FORMAT_SHORT_UNSIGNED, 1, "Olympus.MacroFocus", "Macro focus",          NULL },
 { 0x100f, EXIF_FORMAT_SHORT_UNSIGNED, 1, "Olympus.Sharpness",  "Sharpness",            OlympusTagSharpness },
@@ -135,8 +135,8 @@ static ExifMarker OlympusExifMarkersList[] = {
 { 0x1015, EXIF_FORMAT_SHORT_UNSIGNED, 2, "Olympus.WhiteBalance", "White balance",      NULL },
 { 0x1017, EXIF_FORMAT_SHORT_UNSIGNED, 2, "Olympus.RedBias",    "Red bias",             NULL },
 { 0x1018, EXIF_FORMAT_SHORT_UNSIGNED, 2, "Olympus.BlueBias",   "Blue bias",            NULL },
-{ 0x101a, EXIF_FORMAT_SHORT_UNSIGNED, 1, "Olympus.SerialNumber", "Serial number",      NULL },
-{ 0x1023, EXIF_FORMAT_SHORT_UNSIGNED, 1, "Olympus.FlashBias",  "Flash bias",           NULL },
+{ 0x101a, EXIF_FORMAT_STRING, -1,       "Olympus.SerialNumber", "Serial number",       NULL },
+{ 0x1023, EXIF_FORMAT_RATIONAL, 1,      "Olympus.FlashBias",   "Flash bias",           NULL },
 { 0x1029, EXIF_FORMAT_SHORT_UNSIGNED, 1, "Olympus.Contrast",   "Contrast",             OlympusTagContrast },
 { 0x102a, EXIF_FORMAT_SHORT_UNSIGNED, 1, "Olympus.SharpnessFactor", "Sharpness factor",        NULL },
 { 0x102b, EXIF_FORMAT_SHORT_UNSIGNED, 6, "Olympus.ColorControl", "Color control",      NULL },