[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=c256d5e

The following commit has been merged in the master branch:
commit c256d5e57d8bfe6fb3e6cef9f7c752ee1937b219
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat May 29 07:56:31 2010 +0000

    Updated Nikon and Sony makernote doc.
---
 doc/templates/Makefile           | 14 +++++++++++++-
 doc/templates/tags-nikon.html.in | 30 ++++++++++++++++++++++++++++
 doc/templates/tags-sony.html.in  | 42 ++++++++++++++++++++++++++++++++++++++--
 src/minoltamn.cpp                |  2 +-
 4 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index e54ca23..78182d8 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -66,6 +66,12 @@ TABLES = Exif \
          NikonWt \
          NikonIi \
          NikonAf \
+         NikonAf2 \
+         NikonFi \
+         NikonMe \
+         NikonFl1 \
+         NikonFl2 \
+         NikonFl3 \
          NikonSiD80 \
          NikonSiD40 \
          NikonSiD300a \
@@ -93,7 +99,13 @@ TABLES = Exif \
          PanasonicRaw \
          Pentax \
          Sigma \
-         Sony
+         Sony1 \
+         SonyMinolta \
+         Sony1Cs \
+         Sony1Cs2 \
+         Sony1MltCs7D \
+         Sony1MltCsOld \
+         Sony1MltCsA100
 
 SCHEMA = xmp_dc \
          xmp_xmp \
diff --git a/doc/templates/tags-nikon.html.in b/doc/templates/tags-nikon.html.in
index 7a2b1c6..0bfee37 100644
--- a/doc/templates/tags-nikon.html.in
+++ b/doc/templates/tags-nikon.html.in
@@ -56,6 +56,36 @@ __NikonIi__
 __NikonAf__
 <br>
 
+<h3>Nikon Auto Focus 2 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonAf2__
+<br>
+
+<h3>Nikon File Info Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonFi__
+<br>
+
+<h3>Nikon Multi Exposure Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonMe__
+<br>
+
+<h3>Nikon Flash Info 1 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonFl1__
+<br>
+
+<h3>Nikon Flash Info 2 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonFl2__
+<br>
+
+<h3>Nikon Flash Info 3 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__NikonFl3__
+<br>
+
 <h3>Nikon Shot Info D80 Tags</h3>
 <p>Click on a column header to sort the table.</p>
 __NikonSiD80__
diff --git a/doc/templates/tags-sony.html.in b/doc/templates/tags-sony.html.in
index 944e723..4af010f 100644
--- a/doc/templates/tags-sony.html.in
+++ b/doc/templates/tags-sony.html.in
@@ -7,10 +7,48 @@ __header2__
 __index1__
 __index2__
 <h2>Sony MakerNote Tags defined in Exiv2</h2>
-<p>Tags found in the MakerNote of images taken with Sony cameras. Not much is known about the contents of the Sony makernote tags. They appear to be chunks of binary data and I am not aware of any description of this information.</p> 
+<div>
+<p>Tags found in the MakerNote of images taken with Sony cameras.</p> 
 <p>Click on a column header to sort the table.</p>
+</div>
+__Sony1__
+<br>
+
+<h3>Sony Minolta Tags</h3>
+<p>These are the same tags as found in the Minolta MakerNote. 
+In Sony images the group name is <b><code>SonyMinolta</code></b>.</p>
+<p>Click on a column header to sort the table.</p>
+__SonyMinolta__
+<br>
+
+<h3>Sony Camera Settings Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__Sony1Cs__
+<br>
+
+<h3>Sony Camera Settings 2 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__Sony1Cs2__
+<br>
+
+<h3>Sony Minolta Camera Settings Tags</h3>
+<p>These are the same tags as the Minolta Camera Settings in the Minolta MakerNote. 
+In Sony images the group name is <b><code>Sony1MltCsOld</code></b> or <b><code>Sony1MltCsNew</code></b>.</p>
+<p>Click on a column header to sort the table.</p>
+__Sony1MltCsOld__
+<br>
 
-__Sony__
+<h3>Sony Minolta Camera Settings 7D Tags</h3>
+<p>These are the same tags as the Minolta 7D Camera Settings in the Minolta MakerNote. 
+In Sony images the group name is <b><code>Sony1MltCs7D</code></b>.</p>
+<p>Click on a column header to sort the table.</p>
+__Sony1MltCs7D__
+<br>
+
+<h3>Sony Minolta Camera Settings A100 Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__Sony1MltCsA100__
+<br>
 
 </div>
 <!-- closes content -->
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 726f8c3..b298845 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1364,7 +1364,7 @@ namespace Exiv2 {
                 sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyColorSpaceA100)),
         TagInfo(0x0018, "Sharpness", N_("Sharpness"),
                 N_("Sharpness"),
-                sony1CsIfdId, makerTags, unsignedShort, printValue),
+                sony1MltCsA100IfdId, makerTags, unsignedShort, printValue),
         TagInfo(0x0019, "Contrast", N_("Contrast"),
                 N_("Contrast"),
                 sony1MltCsA100IfdId, makerTags, unsignedShort, printValue),

-- 
exiv2 packaging