From ea2e24362db1ef59bc00a6b47ae9e2222f84cc09 Mon Sep 17 00:00:00 2001
From: Andreas Huggel <ahuggel@gmx.net>
Date: Thu, 30 Oct 2008 13:41:55 +0000
Subject: [PATCH] Added new Olympus tag tables to doc and fixed several typos.

---
 doc/templates/Makefile             |  3 +-
 doc/templates/tags-olympus.html.in | 32 ++++++++++++++++++
 src/olympusmn.cpp                  | 53 ++++++++++++++++--------------
 3 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 4e748d19..7faea236 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -50,7 +50,8 @@ TABLES = Exif \
          Fujifilm \
          Minolta MinoltaCsNew MinoltaCs5D MinoltaCs7D \
          Nikon1 Nikon2 Nikon3 \
-         Olympus \
+         Olympus OlympusCs OlympusEq OlympusRd OlympusRd2 \
+         OlympusIp OlympusFi \
 	 Panasonic \
          Pentax \
          Sigma \
diff --git a/doc/templates/tags-olympus.html.in b/doc/templates/tags-olympus.html.in
index feb4e343..a58e7023 100644
--- a/doc/templates/tags-olympus.html.in
+++ b/doc/templates/tags-olympus.html.in
@@ -12,6 +12,38 @@ __index2__
 <p>Click on a column header to sort the table.</p>
 </div>
 __Olympus__
+<br>
+
+<h3>Olympus Camera Settings Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__OlympusCs__
+<br>
+
+<h3>Olympus Equipment Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__OlympusEq__
+<br>
+
+<h3>Olympus Raw Development Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__OlympusRd__
+<br>
+
+<h3>Olympus Raw Development 2 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__OlympusRd2__
+<br>
+
+<h3>Olympus Image Processing Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__OlympusIp__
+<br>
+
+<h3>Olympus Focus Info Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__OlympusFi__
+<br>
+
 </div>
 <!-- closes content -->
 
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index 398ac1af..99856e71 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -383,23 +383,26 @@ namespace Exiv2 {
                 N_("Near lens step"),
                 olympusIfdId, makerTags, unsignedShort, printValue),
         TagInfo(0x2010, "Equipment", N_("Equipment Info"),
-                N_("Camera equipment information"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                N_("Camera equipment sub-IFD"),
+                olympusIfdId, makerTags, unsignedLong, printValue),
         TagInfo(0x2020, "CameraSettings", N_("Camera Settings"),
-                N_("Camera Settings information"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                N_("Camera Settings sub-IFD"),
+                olympusIfdId, makerTags, unsignedLong, printValue),
         TagInfo(0x2030, "RawDevelopment", N_("Raw Development"),
-                N_("Raw development information"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                N_("Raw development sub-IFD"),
+                olympusIfdId, makerTags, unsignedLong, printValue),
+        TagInfo(0x2031, "RawDevelopment2", N_("Raw Development 2"),
+                N_("Raw development 2 sub-IFD"),
+                olympusIfdId, makerTags, unsignedLong, printValue),
         TagInfo(0x2040, "ImageProcessing", N_("Image Processing"),
-                N_("Image processing information"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                N_("Image processing sub-IFD"),
+                olympusIfdId, makerTags, unsignedLong, printValue),
         TagInfo(0x2050, "FocusInfo", N_("Focus Info"),
-                N_("Focus information"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                N_("Focus sub-IFD"),
+                olympusIfdId, makerTags, unsignedLong, printValue),
         TagInfo(0x3000, "RawInfo", N_("Raw Info"),
-                N_("Raw information"),
-                minoltaIfdId, makerTags, undefined, printValue),
+                N_("Raw sub-IFD"),
+                olympusIfdId, makerTags, unsignedLong, printValue),
 
         // End of list marker
         TagInfo(0xffff, "(UnknownOlympusMakerNoteTag)", "(UnknownOlympusMakerNoteTag)",
@@ -749,19 +752,19 @@ namespace Exiv2 {
 
     const TagInfo OlympusMakerNote::tagInfoRd_[] = {
         TagInfo(0x0000, "RawDevVersion", N_("Raw Development Version"), N_("Raw development version"), olympusRdIfdId, makerTags, undefined, printExifVersion),
-        TagInfo(0x0100, "ExposureBiasValue", N_("Exposure Bias Value"), N_("Exposure bias value"), olympusEqIfdId, makerTags, signedRational, printValue),
-        TagInfo(0x0101, "WhiteBalanceValue", N_("White Balance Value"), N_("White balance value"), olympusEqIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0102, "WBFineAdjustment", N_("WB Fine Adjustment"), N_("WB fine adjustment"), olympusEqIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0103, "GrayPoint", N_("Gray Point"), N_("Gray point"), olympusEqIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0104, "SaturationEmphasis", N_("Saturation Emphasis"), N_("Saturation emphasis"), olympusEqIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0105, "MemoryColorEmphasis", N_("Memory Color Emphasis"), N_("Memory color emphasis"), olympusEqIfdId, makerTags, unsignedShort, printValue),
-        TagInfo(0x0106, "ContrastValue", N_("Contrast Value"), N_("Contrast value"), olympusEqIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0107, "SharpnessValue", N_("Sharpness Value"), N_("Sharpness value"), olympusEqIfdId, makerTags, signedShort, printValue),
-        TagInfo(0x0108, "ColorSpace", N_("Color Space"), N_("Color space"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdColorSpace)),
-        TagInfo(0x0109, "Engine", N_("Engine"), N_("Engine"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdEngine)),
-        TagInfo(0x010a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusRdNoiseReduction)),
-        TagInfo(0x010b, "EditStatus", N_("Edit Status"), N_("Edit status"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdEditStatus)),
-        TagInfo(0x010c, "Settings", N_("Settings"), N_("Settings"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusRdSettings)),
+        TagInfo(0x0100, "ExposureBiasValue", N_("Exposure Bias Value"), N_("Exposure bias value"), olympusRdIfdId, makerTags, signedRational, printValue),
+        TagInfo(0x0101, "WhiteBalanceValue", N_("White Balance Value"), N_("White balance value"), olympusRdIfdId, makerTags, unsignedShort, printValue),
+        TagInfo(0x0102, "WBFineAdjustment", N_("WB Fine Adjustment"), N_("WB fine adjustment"), olympusRdIfdId, makerTags, signedShort, printValue),
+        TagInfo(0x0103, "GrayPoint", N_("Gray Point"), N_("Gray point"), olympusRdIfdId, makerTags, unsignedShort, printValue),
+        TagInfo(0x0104, "SaturationEmphasis", N_("Saturation Emphasis"), N_("Saturation emphasis"), olympusRdIfdId, makerTags, signedShort, printValue),
+        TagInfo(0x0105, "MemoryColorEmphasis", N_("Memory Color Emphasis"), N_("Memory color emphasis"), olympusRdIfdId, makerTags, unsignedShort, printValue),
+        TagInfo(0x0106, "ContrastValue", N_("Contrast Value"), N_("Contrast value"), olympusRdIfdId, makerTags, signedShort, printValue),
+        TagInfo(0x0107, "SharpnessValue", N_("Sharpness Value"), N_("Sharpness value"), olympusRdIfdId, makerTags, signedShort, printValue),
+        TagInfo(0x0108, "ColorSpace", N_("Color Space"), N_("Color space"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdColorSpace)),
+        TagInfo(0x0109, "Engine", N_("Engine"), N_("Engine"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdEngine)),
+        TagInfo(0x010a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusRdNoiseReduction)),
+        TagInfo(0x010b, "EditStatus", N_("Edit Status"), N_("Edit status"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdEditStatus)),
+        TagInfo(0x010c, "Settings", N_("Settings"), N_("Settings"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusRdSettings)),
         // End of list marker
         TagInfo(0xffff, "(UnknownOlympusRdTag)", "(UnknownOlympusRdTag)", N_("Unknown OlympusRd tag"), olympusRdIfdId, makerTags, invalidTypeId, printValue)
     };