[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:37:38 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=8f181e2
The following commit has been merged in the master branch:
commit 8f181e22705ac73c35dc74b78efda143368c51f0
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sun May 21 07:44:15 2006 +0000
Added Minolta makernote taglists to doxygen doc
---
doc/templates/Makefile | 3 ++-
doc/templates/__index2__ | 1 +
doc/templates/tags-minolta.html.in | 36 ++++++++++++++++++++++++++++++++++++
doc/templates/tags.awk | 2 +-
src/doxygen.hpp | 1 +
src/minoltamn.cpp | 2 +-
src/tags.cpp | 12 ++++++------
7 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 2310ded..97e3dec 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 4ae5c78..4a00c0f 100644
--- a/doc/templates/__index2__
+++ b/doc/templates/__index2__
@@ -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>
diff --git a/doc/templates/tags-minolta.html.in b/doc/templates/tags-minolta.html.in
new file mode 100644
index 0000000..3ba4d8d
--- /dev/null
+++ b/doc/templates/tags-minolta.html.in
@@ -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>
diff --git a/doc/templates/tags.awk b/doc/templates/tags.awk
index 50ddd75..b71280b 100644
--- a/doc/templates/tags.awk
+++ b/doc/templates/tags.awk
@@ -10,7 +10,7 @@
################################################################################
BEGIN {
- FS = ", "
+ FS = ", " # ,
print "<?xml version = '1.0'?>";
print "<?xml-stylesheet type=\"text/xsl\" href=\"tags.xsl\"?>";
diff --git a/src/doxygen.hpp b/src/doxygen.hpp
index db60192..b094955 100644
--- a/src/doxygen.hpp
+++ b/src/doxygen.hpp
@@ -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>
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 0df1c9a..bd47f0e 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 f5ff473..c0f5715 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_) << ", "
+ << std::dec << ti.tag_ << ", "
<< "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_ << ", "
+ << ExifTags::ifdName(ti.ifdId_) << ", "
+ << exifKey.key() << ", "
<< TypeInfo::typeName(
- ExifTags::tagType(ti.tag_, ti.ifdId_)) << ", "
+ ExifTags::tagType(ti.tag_, ti.ifdId_)) << ", "
<< ExifTags::tagDesc(ti.tag_, ti.ifdId_);
}
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list