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

Added Pentax Makernote tag doc, changed copyright.

Browse Source
v0.27.3
Andreas Huggel 18 years ago
parent e2ed3268eb
commit 3a3ca52f99
8 changed files with 57 additions and 10 deletions
Show Stats Download Patch File Download Diff File

13
doc/templates/Makefile vendored
Unescape Escape View File

@ -45,9 +45,16 @@
# Only tested with GNU make. # Only tested with GNU make.
# #
TABLES = Exif Canon CanonCs CanonSi CanonCf CanonPi CanonPa Fujifilm Minolta \ TABLES = Exif \
MinoltaCsNew MinoltaCs5D MinoltaCs7D Nikon1 Nikon2 Nikon3 Olympus \ Canon CanonCs CanonSi CanonCf CanonPi CanonPa \
Panasonic Sigma Sony Fujifilm \
Minolta MinoltaCsNew MinoltaCs5D MinoltaCs7D \
Nikon1 Nikon2 Nikon3 \
Olympus \
Panasonic \
Pentax \
Sigma \
Sony
TAGLIST = ../../samples/taglist TAGLIST = ../../samples/taglist

1
doc/templates/__index2__ vendored
Unescape Escape View File

@ -7,6 +7,7 @@
<li><a href="tags-nikon.html"><span>Nikon</span></a></li> <li><a href="tags-nikon.html"><span>Nikon</span></a></li>
<li><a href="tags-olympus.html"><span>Olympus</span></a></li> <li><a href="tags-olympus.html"><span>Olympus</span></a></li>
<li><a href="tags-panasonic.html"><span>Panasonic</span></a></li> <li><a href="tags-panasonic.html"><span>Panasonic</span></a></li>
<li><a href="tags-pentax.html"><span>Pentax</span></a></li>
<li><a href="tags-sigma.html"><span>Sigma/Foveon</span></a></li> <li><a href="tags-sigma.html"><span>Sigma/Foveon</span></a></li>
<li><a href="tags-sony.html"><span>Sony</span></a></li> <li><a href="tags-sony.html"><span>Sony</span></a></li>
<li><a href="tags-iptc.html"><span>IPTC&nbsp;datasets</span></a></li> <li><a href="tags-iptc.html"><span>IPTC&nbsp;datasets</span></a></li>

11
doc/templates/__makernotes__ vendored
Unescape Escape View File

@ -125,6 +125,15 @@
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr class="EvenRow"> <tr class="EvenRow">
<td>PENTAX</td>
<td>IFD at offset 6</td>
<td>&quot;AOC\0&quot; followed by two bytes of unknown meaning</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td><a href="#R11">[11]</a></td>
<td>&nbsp;</td>
</tr>
<tr class="OddRow">
<td>SONY</td> <td>SONY</td>
<td>IFD without a next-IFD pointer at offset 12</td> <td>IFD without a next-IFD pointer at offset 12</td>
<td>&quot;SONY DSC \0\0\0&quot;</td> <td>&quot;SONY DSC \0\0\0&quot;</td>
@ -133,7 +142,7 @@
<td>&nbsp;</td> <td>&nbsp;</td>
<td>Seen in Jpeg images, e.g., from DSC-W7, DSC-R1</td> <td>Seen in Jpeg images, e.g., from DSC-W7, DSC-R1</td>
</tr> </tr>
<tr class="OddRow"> <tr class="EvenRow">
<td>SONY</td> <td>SONY</td>
<td>IFD</td> <td>IFD</td>
<td>None</td> <td>None</td>

4
doc/templates/makernote.html.in vendored
Unescape Escape View File

@ -77,8 +77,8 @@ __makernotes__
<a name="R9">[9]</a> <a href="http://www.ozhiker.com/electronics/pjmt/jpeg_info/makernotes.html"> <a name="R9">[9]</a> <a href="http://www.ozhiker.com/electronics/pjmt/jpeg_info/makernotes.html">
Various Makernote specifications</a> from the <a href="http://www.ozhiker.com/electronics/pjmt/index.html"> Various Makernote specifications</a> from the <a href="http://www.ozhiker.com/electronics/pjmt/index.html">
PHP JPEG Metadata Toolkit</a> by Evan Hunter<br> PHP JPEG Metadata Toolkit</a> by Evan Hunter<br>
<a name="R10">[10]</a> <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a>, the most complete and up-to-date tool for reading and writing meta information in image files, by Phil Harvey</p> <a name="R10">[10]</a> <a href="http://www.sno.phy.queensu.ca/~phil/exiftool/">ExifTool</a>, the most complete and up-to-date tool for reading and writing meta information in image files, by Phil Harvey<br>
<a name="R11">[11]</a> <a href="http://www.gvsoft.homedns.org/exif/makernote-pentax-type3.html">EXIF: Pentax type3 Makernotes</a> by Ger Vermeulen</p>
</div> </div>
<!-- closes content --> <!-- closes content -->

19
doc/templates/tags-pentax.html.in vendored
Unescape Escape View File

@ -0,0 +1,19 @@
__doctype__
<html>
__header2__
<body>
<div id="content">
__index1__
__index2__
<h2>Pentax MakerNote Tags defined in Exiv2</h2>
<div>
<p>Tags found in the MakerNote of images taken with Pentax cameras.</p>
<p>Click on a column header to sort the table.</p>
</div>
__Pentax__
</div>
<!-- closes content -->
</body>
</html>

2
samples/taglist.cpp
Unescape Escape View File

@ -55,7 +55,7 @@ try {
} }
if (rc) { if (rc) {
std::cout << "Usage: " << argv[0] 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"; << "Print Exif tags, MakerNote tags, or Iptc datasets\n";
} }
return rc; return rc;

4
src/pentaxmn.cpp
Unescape Escape View File

@ -1,6 +1,6 @@
// ***************************************************************** -*- C++ -*- // ***************************************************************** -*- C++ -*-
/* /*
* Copyright (C) 2007 Michal Cihar <michal@cihar.com> * Copyright (C) 2007 Andreas Huggel <ahuggel@gmx.net>
* *
* This program is part of the Exiv2 distribution. * This program is part of the Exiv2 distribution.
* *
@ -865,7 +865,7 @@ namespace Exiv2 {
/* Some missing ! */ /* Some missing ! */
TagInfo(0x003f, "LensType", N_("Lens type"), TagInfo(0x003f, "LensType", N_("Lens type"),
N_("Lens type"), N_("Lens type"),
pentaxIfdId, makerTags, unsignedLong, EXV_PRINT_COMBITAG(pentaxLensType, 2)), pentaxIfdId, makerTags, unsignedByte, EXV_PRINT_COMBITAG(pentaxLensType, 2)),
/* Some missing ! */ /* Some missing ! */
TagInfo(0x0041, "DigitalFilter", N_("Digital filter"), TagInfo(0x0041, "DigitalFilter", N_("Digital filter"),
N_("Digital filter"), N_("Digital filter"),

13
src/pentaxmn.hpp
Unescape Escape View File

@ -1,6 +1,6 @@
// ***************************************************************** -*- C++ -*- // ***************************************************************** -*- C++ -*-
/* /*
* Copyright (C) 2007 Michal Cihar <michal@cihar.com> * Copyright (C) 2007 Andreas Huggel <ahuggel@gmx.net>
* *
* This program is part of the Exiv2 distribution. * This program is part of the Exiv2 distribution.
* *
@ -128,16 +128,27 @@ namespace Exiv2 {
}; };
//! @endcond //! @endcond
//! Print Pentax version
static std::ostream& printPentaxVersion(std::ostream& os, const Value& value); static std::ostream& printPentaxVersion(std::ostream& os, const Value& value);
//! Print Pentax resolution
static std::ostream& printPentaxResolution(std::ostream& os, const Value& value); static std::ostream& printPentaxResolution(std::ostream& os, const Value& value);
//! Print Pentax date
static std::ostream& printPentaxDate(std::ostream& os, const Value& value); static std::ostream& printPentaxDate(std::ostream& os, const Value& value);
//! Print Pentax time
static std::ostream& printPentaxTime(std::ostream& os, const Value& value); static std::ostream& printPentaxTime(std::ostream& os, const Value& value);
//! Print Pentax exposure
static std::ostream& printPentaxExposure(std::ostream& os, const Value& value); static std::ostream& printPentaxExposure(std::ostream& os, const Value& value);
//! Print Pentax F value
static std::ostream& printPentaxFValue(std::ostream& os, const Value& 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); static std::ostream& printPentaxFocalLength(std::ostream& os, const Value& value);
//! Print Pentax compensation
static std::ostream& printPentaxCompensation(std::ostream& os, const Value& value); static std::ostream& printPentaxCompensation(std::ostream& os, const Value& value);
//! Print Pentax temperature
static std::ostream& printPentaxTemperature(std::ostream& os, const Value& value); static std::ostream& printPentaxTemperature(std::ostream& os, const Value& value);
//! Print Pentax flash compensation
static std::ostream& printPentaxFlashCompensation(std::ostream& os, const Value& value); static std::ostream& printPentaxFlashCompensation(std::ostream& os, const Value& value);
//! Print Pentax bracketing
static std::ostream& printPentaxBracketing(std::ostream& os, const Value& value); static std::ostream& printPentaxBracketing(std::ostream& os, const Value& value);
private: private:

Write Preview
Loading…
Cancel
Save