diff --git a/doc/templates/Makefile b/doc/templates/Makefile index 2310dedf..97e3decc 100644 --- a/doc/templates/Makefile +++ b/doc/templates/Makefile @@ -14,7 +14,8 @@ # Only tested with GNU make. # -TABLES = Exif Canon CanonCs1 CanonCs2 CanonCf Fujifilm Nikon1 Nikon2 Nikon3 \ +TABLES = Exif Canon CanonCs1 CanonCs2 CanonCf Fujifilm Minolta MinoltaCsOld \ + MinoltaCsNew MinoltaCs5D MinoltaCs7D Nikon1 Nikon2 Nikon3 \ Olympus Panasonic Sigma Sony TAGLIST = ../../src/taglist diff --git a/doc/templates/__index2__ b/doc/templates/__index2__ index 4ae5c780..4a00c0f1 100644 --- a/doc/templates/__index2__ +++ b/doc/templates/__index2__ @@ -3,6 +3,7 @@
  • Exif
  • Canon
  • Fujifilm
    • +
  • Minolta
  • Nikon
  • Olympus
  • Panasonic
    • diff --git a/doc/templates/tags-minolta.html.in b/doc/templates/tags-minolta.html.in new file mode 100644 index 00000000..3ba4d8d2 --- /dev/null +++ b/doc/templates/tags-minolta.html.in @@ -0,0 +1,36 @@ +__doctype__ + +__header2__ + + +
    +__index1__ +__index2__ +

    Minolta MakerNote Tags defined in Exiv2

    +
    +

    Tags found in the MakerNote of images taken with Minolta cameras.

    +

    Click on a column header to sort the table.

    +
    +__Minolta__ +
    + +

    Minolta Camera Settings (tags from older and newer cameras)

    +

    Click on a column header to sort the table.

    +__MinoltaCsOld__ +
    + +

    Minolta 5D Camera Settings

    +

    Click on a column header to sort the table.

    +__MinoltaCs5D__ +
    + +

    Minolta 7D Camera Settings

    +

    Click on a column header to sort the table.

    +__MinoltaCs7D__ +
    + +
    + + + + diff --git a/doc/templates/tags.awk b/doc/templates/tags.awk index 50ddd750..b71280b0 100644 --- a/doc/templates/tags.awk +++ b/doc/templates/tags.awk @@ -10,7 +10,7 @@ ################################################################################ BEGIN { - FS = ", " + FS = ", " # ,\t print ""; print ""; diff --git a/src/doxygen.hpp b/src/doxygen.hpp index db601924..b0949556 100644 --- a/src/doxygen.hpp +++ b/src/doxygen.hpp @@ -42,6 +42,7 @@ - Standard Exif tags - Canon MakerNote tags - Fujifilm MakerNote tags + - Minolta MakerNote tags - Nikon MakerNote tags - Olympus MakerNote tags - Panasonic MakerNote tags diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp index 0df1c9a3..bd47f0e8 100644 --- a/src/minoltamn.cpp +++ b/src/minoltamn.cpp @@ -662,7 +662,7 @@ namespace Exiv2 { TagInfo(0x0028, "Saturation", "Saturation", "Saturation", minoltaCs7DIfdId, makerTags, unsignedShort, printValue), TagInfo(0x002D, "FreeMemoryCardImages", "Free Memory Card Images", "Free memory card images", minoltaCs7DIfdId, makerTags, unsignedShort, printValue), TagInfo(0x003F, "ColorTemperature", "Color Temperature", "Color temperature", minoltaCs7DIfdId, makerTags, signedShort, printValue), - TagInfo(0x0040, "Hue", "Hue", "Hue", minoltaCsNewIfdId, makerTags, unsignedShort, printValue), + TagInfo(0x0040, "Hue", "Hue", "Hue", minoltaCs7DIfdId, makerTags, unsignedShort, printValue), TagInfo(0x0046, "Rotation", "Rotation", "Rotation", minoltaCs7DIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaRotation7D)), TagInfo(0x0047, "FNumber", "FNumber", "FNumber", minoltaCs7DIfdId, makerTags, unsignedShort, printValue), TagInfo(0x0048, "ExposureTime", "Exposure Time", "Exposure time", minoltaCs7DIfdId, makerTags, unsignedShort, printValue), diff --git a/src/tags.cpp b/src/tags.cpp index f5ff473c..c0f5715b 100644 --- a/src/tags.cpp +++ b/src/tags.cpp @@ -714,14 +714,14 @@ namespace Exiv2 { std::ostream& operator<<(std::ostream& os, const TagInfo& ti) { ExifKey exifKey(ti.tag_, ExifTags::ifdItem(ti.ifdId_)); - return os << ExifTags::tagName(ti.tag_, ti.ifdId_) << ", " - << std::dec << ti.tag_ << ", " + return os << ExifTags::tagName(ti.tag_, ti.ifdId_) << ",\t" + << std::dec << ti.tag_ << ",\t" << "0x" << std::setw(4) << std::setfill('0') - << std::right << std::hex << ti.tag_ << ", " - << ExifTags::ifdName(ti.ifdId_) << ", " - << exifKey.key() << ", " + << std::right << std::hex << ti.tag_ << ",\t" + << ExifTags::ifdName(ti.ifdId_) << ",\t" + << exifKey.key() << ",\t" << TypeInfo::typeName( - ExifTags::tagType(ti.tag_, ti.ifdId_)) << ", " + ExifTags::tagType(ti.tag_, ti.ifdId_)) << ",\t" << ExifTags::tagDesc(ti.tag_, ti.ifdId_); }