diff --git a/doc/templates/Makefile b/doc/templates/Makefile index 2da39629..2be91cf8 100644 --- a/doc/templates/Makefile +++ b/doc/templates/Makefile @@ -45,9 +45,16 @@ # Only tested with GNU make. # -TABLES = Exif Canon CanonCs CanonSi CanonCf CanonPi CanonPa Fujifilm Minolta \ - MinoltaCsNew MinoltaCs5D MinoltaCs7D Nikon1 Nikon2 Nikon3 Olympus \ - Panasonic Sigma Sony +TABLES = Exif \ + Canon CanonCs CanonSi CanonCf CanonPi CanonPa \ + Fujifilm \ + Minolta MinoltaCsNew MinoltaCs5D MinoltaCs7D \ + Nikon1 Nikon2 Nikon3 \ + Olympus \ + Panasonic \ + Pentax \ + Sigma \ + Sony TAGLIST = ../../samples/taglist diff --git a/doc/templates/__index2__ b/doc/templates/__index2__ index 767e63ea..1a642afc 100644 --- a/doc/templates/__index2__ +++ b/doc/templates/__index2__ @@ -7,6 +7,7 @@
  • Nikon
  • Olympus
  • Panasonic
    • +
  • Pentax
  • Sigma/Foveon
  • Sony
  • IPTC datasets
    • diff --git a/doc/templates/__makernotes__ b/doc/templates/__makernotes__ index e1b5fedb..2661952f 100644 --- a/doc/templates/__makernotes__ +++ b/doc/templates/__makernotes__ @@ -125,6 +125,15 @@   + PENTAX + IFD at offset 6 + "AOC\0" followed by two bytes of unknown meaning +   +   + [11] +   + + SONY IFD without a next-IFD pointer at offset 12 "SONY DSC \0\0\0" @@ -133,7 +142,7 @@   Seen in Jpeg images, e.g., from DSC-W7, DSC-R1 - + SONY IFD None diff --git a/doc/templates/makernote.html.in b/doc/templates/makernote.html.in index a4d4744d..c3638856 100644 --- a/doc/templates/makernote.html.in +++ b/doc/templates/makernote.html.in @@ -77,8 +77,8 @@ __makernotes__ [9] Various Makernote specifications from the PHP JPEG Metadata Toolkit by Evan Hunter
    - [10] ExifTool, the most complete and up-to-date tool for reading and writing meta information in image files, by Phil Harvey

    - + [10] ExifTool, the most complete and up-to-date tool for reading and writing meta information in image files, by Phil Harvey
    + [11] EXIF: Pentax type3 Makernotes by Ger Vermeulen

    diff --git a/doc/templates/tags-pentax.html.in b/doc/templates/tags-pentax.html.in new file mode 100644 index 00000000..d9712b59 --- /dev/null +++ b/doc/templates/tags-pentax.html.in @@ -0,0 +1,19 @@ +__doctype__ + +__header2__ + + +
    +__index1__ +__index2__ +

    Pentax MakerNote Tags defined in Exiv2

    +
    +

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

    +

    Click on a column header to sort the table.

    +
    +__Pentax__ +
    + + + + diff --git a/samples/taglist.cpp b/samples/taglist.cpp index 93b7fbcb..a06b7089 100644 --- a/samples/taglist.cpp +++ b/samples/taglist.cpp @@ -55,7 +55,7 @@ try { } if (rc) { std::cout << "Usage: " << argv[0] - << " [Exif|Canon|CanonCs|CanonSi|CanonCf|Fujifilm|Nikon1|Nikon2|Nikon3|Olympus|Sigma|Sony|Iptc]\n" + << " [Exif|Canon|CanonCs|CanonSi|CanonCf|Fujifilm|Minolta|Nikon1|Nikon2|Nikon3|Olympus|Panasonic|Pentax|Sigma|Sony|Iptc]\n" << "Print Exif tags, MakerNote tags, or Iptc datasets\n"; } return rc; diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp index 6f602aa3..11ba8e72 100644 --- a/src/pentaxmn.cpp +++ b/src/pentaxmn.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2007 Michal Cihar + * Copyright (C) 2007 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -865,7 +865,7 @@ namespace Exiv2 { /* Some missing ! */ TagInfo(0x003f, "LensType", N_("Lens type"), N_("Lens type"), - pentaxIfdId, makerTags, unsignedLong, EXV_PRINT_COMBITAG(pentaxLensType, 2)), + pentaxIfdId, makerTags, unsignedByte, EXV_PRINT_COMBITAG(pentaxLensType, 2)), /* Some missing ! */ TagInfo(0x0041, "DigitalFilter", N_("Digital filter"), N_("Digital filter"), diff --git a/src/pentaxmn.hpp b/src/pentaxmn.hpp index a33a1012..21e41bd5 100644 --- a/src/pentaxmn.hpp +++ b/src/pentaxmn.hpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2007 Michal Cihar + * Copyright (C) 2007 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -128,16 +128,27 @@ namespace Exiv2 { }; //! @endcond + //! Print Pentax version static std::ostream& printPentaxVersion(std::ostream& os, const Value& value); + //! Print Pentax resolution static std::ostream& printPentaxResolution(std::ostream& os, const Value& value); + //! Print Pentax date static std::ostream& printPentaxDate(std::ostream& os, const Value& value); + //! Print Pentax time static std::ostream& printPentaxTime(std::ostream& os, const Value& value); + //! Print Pentax exposure static std::ostream& printPentaxExposure(std::ostream& os, const Value& value); + //! Print Pentax F value static std::ostream& printPentaxFValue(std::ostream& os, const Value& value); + //! Print Pentax focal length static std::ostream& printPentaxFocalLength(std::ostream& os, const Value& value); + //! Print Pentax compensation static std::ostream& printPentaxCompensation(std::ostream& os, const Value& value); + //! Print Pentax temperature static std::ostream& printPentaxTemperature(std::ostream& os, const Value& value); + //! Print Pentax flash compensation static std::ostream& printPentaxFlashCompensation(std::ostream& os, const Value& value); + //! Print Pentax bracketing static std::ostream& printPentaxBracketing(std::ostream& os, const Value& value); private: