# HG changeset patch
# User gqview
# Date 1162864639 0
# Node ID deafec7cd99f01d28acb42649dba1fba254c4ef6
# Parent  d19b0de6d0bb795ff231559560c659d0f5f20c6a
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 -r d19b0de6d0bb -r deafec7cd99f ChangeLog
--- a/ChangeLog	Sat Nov 04 22:24:47 2006 +0000
+++ b/ChangeLog	Tue Nov 07 01:57:19 2006 +0000
@@ -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 -r d19b0de6d0bb -r deafec7cd99f src/format_olympus.c
--- a/src/format_olympus.c	Sat Nov 04 22:24:47 2006 +0000
+++ b/src/format_olympus.c	Tue Nov 07 01:57:19 2006 +0000
@@ -124,9 +124,9 @@
 { 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 @@
 { 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 },