third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Minolta makernote taglists to doxygen doc

Browse Source
This commit is contained in:
Andreas Huggel 2006-05-21 07:44:15 +00:00
parent 311eba8b3c
commit 8f181e2270
7 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/templates/Makefile vendored
View File

@ -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

1
doc/templates/__index2__ vendored
View File

@ -3,6 +3,7 @@
<li><a href="tags-exif.html"><span>Exif</span></a></li>
<li><a href="tags-canon.html"><span>Canon</span></a></li>
<li><a href="tags-fujifilm.html"><span>Fujifilm</span></a></li>
<li><a href="tags-minolta.html"><span>Minolta</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-panasonic.html"><span>Panasonic</span></a></li>

36
doc/templates/tags-minolta.html.in vendored Normal file
View File

@ -0,0 +1,36 @@
__doctype__
<html>
__header2__
<body>
<div id="content">
__index1__
__index2__
<h2>Minolta MakerNote Tags defined in Exiv2</h2>
<div>
<p>Tags found in the MakerNote of images taken with Minolta cameras.</p>
<p>Click on a column header to sort the table.</p>
</div>
__Minolta__
<br>
<h3>Minolta Camera Settings (tags from older and newer cameras)</h3>
<p>Click on a column header to sort the table.</p>
__MinoltaCsOld__
<br>
<h3>Minolta 5D Camera Settings</h3>
<p>Click on a column header to sort the table.</p>
__MinoltaCs5D__
<br>
<h3>Minolta 7D Camera Settings</h3>
<p>Click on a column header to sort the table.</p>
__MinoltaCs7D__
<br>
</div>
<!-- closes content -->
</body>
</html>

2
doc/templates/tags.awk vendored
View File

@ -10,7 +10,7 @@
################################################################################
BEGIN {
FS = ", "
FS = ", " # ,\t
print "<?xml version = '1.0'?>";
print "<?xml-stylesheet type=\"text/xsl\" href=\"tags.xsl\"?>";

1
src/doxygen.hpp
View File

@ -42,6 +42,7 @@
- <A HREF="tags-exif.html">Standard Exif tags</A>
- <A HREF="tags-canon.html">Canon MakerNote tags</A>
- <A HREF="tags-fujifilm.html">Fujifilm MakerNote tags</A>
- <A HREF="tags-minolta.html">Minolta MakerNote tags</A>
- <A HREF="tags-nikon.html">Nikon MakerNote tags</A>
- <A HREF="tags-olympus.html">Olympus MakerNote tags</A>
- <A HREF="tags-panasonic.html">Panasonic MakerNote tags</A>

2
src/minoltamn.cpp
View File

@ -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),

12
src/tags.cpp
View File

@ -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_);
}