[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=5918720

The following commit has been merged in the master branch:
commit 59187208cdb0337084499155b7c5104401b42b7f
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat May 6 16:41:23 2006 +0000

    Minolta Makernote: Added reference to Dalibor Jelinek's page, updated doc
---
 doc/templates/makernote.html.in | 25 +++++++++++++------------
 src/minoltamn.hpp               |  2 ++
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/doc/templates/makernote.html.in b/doc/templates/makernote.html.in
index 5f567ba..143cd1e 100644
--- a/doc/templates/makernote.html.in
+++ b/doc/templates/makernote.html.in
@@ -83,22 +83,23 @@ Please let me know if you find further specifications on the Internet.</p>
     <td>IFD, usually at offset 12</td>
     <td>Starts with the string "FUJIFILM" 
     and a 4 byte pointer to the IFD</td>
-    <td>Little endian (II)</td>
+    <td>Little-endian (II)</td>
     <td>Relative to the beginning of the makernote</td>
     <td><a href="#R1">[1]</a></td>
-    <td>Exif data uses big endian (MM) byte order</td>
+    <td>Exif data uses big-endian (MM) byte order</td>
    </tr>
    <tr class="EvenRow">
-    <td>Minolta</td>
+    <td>Minolta, KONICA MINOLTA</td>
     <td>IFD</td>
-    <td>-</td>
-    <td>-</td>
-    <td>-</td>
+    <td>None</td>
+    <td>&nbsp</td>
+    <td>&nbsp</td>
     <td><a href="#R5">[5]</a></td>
-    <td>Not supported by Exiv2 yet</td>
+    <td>Camera settings tag is encoded in big-endian (MM) style, regardless of
+    the encoding style of the Exif data</td>
    </tr>
    <tr class="OddRow"> 
-    <td>NIKON (1)</td>
+    <td>NIKON</td>
     <td>IFD</td>
     <td>None</td>
     <td> </td>
@@ -107,7 +108,7 @@ Please let me know if you find further specifications on the Internet.</p>
     <td>Models using this makernote include E990, D1</td>
    </tr>
    <tr class="EvenRow"> 
-    <td>NIKON (2)</td>
+    <td>NIKON</td>
     <td>IFD, at offset 8</td>
     <td>"Nikon

-- 
exiv2 packaging