xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added new Olympus tag tables to doc and fixed several typos.

Browse Source
v0.27.3
Andreas Huggel 17 years ago
parent ba10d70cdb
commit ea2e24362d
3 changed files with 62 additions and 26 deletions
Show Stats Download Patch File Download Diff File

3
doc/templates/Makefile vendored
Unescape Escape View File

@ -50,7 +50,8 @@ TABLES = Exif \
Fujifilm \ Fujifilm \
Minolta MinoltaCsNew MinoltaCs5D MinoltaCs7D \ Minolta MinoltaCsNew MinoltaCs5D MinoltaCs7D \
Nikon1 Nikon2 Nikon3 \ Nikon1 Nikon2 Nikon3 \
Olympus \ Olympus OlympusCs OlympusEq OlympusRd OlympusRd2 \
OlympusIp OlympusFi \
Panasonic \ Panasonic \
Pentax \ Pentax \
Sigma \ Sigma \

32
doc/templates/tags-olympus.html.in vendored
Unescape Escape View File

@ -12,6 +12,38 @@ __index2__
<p>Click on a column header to sort the table.</p> <p>Click on a column header to sort the table.</p>
</div> </div>
__Olympus__ __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> </div>
<!-- closes content --> <!-- closes content -->

53
src/olympusmn.cpp
Unescape Escape View File

@ -383,23 +383,26 @@ namespace Exiv2 {
N_("Near lens step"), N_("Near lens step"),
olympusIfdId, makerTags, unsignedShort, printValue), olympusIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x2010, "Equipment", N_("Equipment Info"), TagInfo(0x2010, "Equipment", N_("Equipment Info"),
N_("Camera equipment information"), N_("Camera equipment sub-IFD"),
minoltaIfdId, makerTags, undefined, printValue), olympusIfdId, makerTags, unsignedLong, printValue),
TagInfo(0x2020, "CameraSettings", N_("Camera Settings"), TagInfo(0x2020, "CameraSettings", N_("Camera Settings"),
N_("Camera Settings information"), N_("Camera Settings sub-IFD"),
minoltaIfdId, makerTags, undefined, printValue), olympusIfdId, makerTags, unsignedLong, printValue),
TagInfo(0x2030, "RawDevelopment", N_("Raw Development"), TagInfo(0x2030, "RawDevelopment", N_("Raw Development"),
N_("Raw development information"), N_("Raw development sub-IFD"),
minoltaIfdId, makerTags, undefined, printValue), 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"), TagInfo(0x2040, "ImageProcessing", N_("Image Processing"),
N_("Image processing information"), N_("Image processing sub-IFD"),
minoltaIfdId, makerTags, undefined, printValue), olympusIfdId, makerTags, unsignedLong, printValue),
TagInfo(0x2050, "FocusInfo", N_("Focus Info"), TagInfo(0x2050, "FocusInfo", N_("Focus Info"),
N_("Focus information"), N_("Focus sub-IFD"),
minoltaIfdId, makerTags, undefined, printValue), olympusIfdId, makerTags, unsignedLong, printValue),
TagInfo(0x3000, "RawInfo", N_("Raw Info"), TagInfo(0x3000, "RawInfo", N_("Raw Info"),
N_("Raw information"), N_("Raw sub-IFD"),
minoltaIfdId, makerTags, undefined, printValue), olympusIfdId, makerTags, unsignedLong, printValue),
// End of list marker // End of list marker
TagInfo(0xffff, "(UnknownOlympusMakerNoteTag)", "(UnknownOlympusMakerNoteTag)", TagInfo(0xffff, "(UnknownOlympusMakerNoteTag)", "(UnknownOlympusMakerNoteTag)",
@ -749,19 +752,19 @@ namespace Exiv2 {
const TagInfo OlympusMakerNote::tagInfoRd_[] = { const TagInfo OlympusMakerNote::tagInfoRd_[] = {
TagInfo(0x0000, "RawDevVersion", N_("Raw Development Version"), N_("Raw development version"), olympusRdIfdId, makerTags, undefined, printExifVersion), 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(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"), olympusEqIfdId, makerTags, unsignedShort, 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"), olympusEqIfdId, makerTags, signedShort, 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"), olympusEqIfdId, makerTags, unsignedShort, printValue), TagInfo(0x0103, "GrayPoint", N_("Gray Point"), N_("Gray point"), olympusRdIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0104, "SaturationEmphasis", N_("Saturation Emphasis"), N_("Saturation emphasis"), olympusEqIfdId, makerTags, signedShort, 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"), olympusEqIfdId, makerTags, unsignedShort, 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"), olympusEqIfdId, makerTags, signedShort, printValue), TagInfo(0x0106, "ContrastValue", N_("Contrast Value"), N_("Contrast value"), olympusRdIfdId, makerTags, signedShort, printValue),
TagInfo(0x0107, "SharpnessValue", N_("Sharpness Value"), N_("Sharpness value"), olympusEqIfdId, 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"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdColorSpace)), TagInfo(0x0108, "ColorSpace", N_("Color Space"), N_("Color space"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdColorSpace)),
TagInfo(0x0109, "Engine", N_("Engine"), N_("Engine"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdEngine)), TagInfo(0x0109, "Engine", N_("Engine"), N_("Engine"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdEngine)),
TagInfo(0x010a, "NoiseReduction", N_("Noise Reduction"), N_("Noise reduction"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusRdNoiseReduction)), 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"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdEditStatus)), TagInfo(0x010b, "EditStatus", N_("Edit Status"), N_("Edit status"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(olympusRdEditStatus)),
TagInfo(0x010c, "Settings", N_("Settings"), N_("Settings"), olympusEqIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusRdSettings)), TagInfo(0x010c, "Settings", N_("Settings"), N_("Settings"), olympusRdIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(olympusRdSettings)),
// End of list marker // End of list marker
TagInfo(0xffff, "(UnknownOlympusRdTag)", "(UnknownOlympusRdTag)", N_("Unknown OlympusRd tag"), olympusRdIfdId, makerTags, invalidTypeId, printValue) TagInfo(0xffff, "(UnknownOlympusRdTag)", "(UnknownOlympusRdTag)", N_("Unknown OlympusRd tag"), olympusRdIfdId, makerTags, invalidTypeId, printValue)
}; };

Write Preview
Loading…
Cancel
Save