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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:36:16 UTC 2017


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

The following commit has been merged in the master branch:
commit 159442044839175ec5d80f557321f3820bf1ef3b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu May 6 03:14:45 2004 +0000

    Various updates
---
 doc/exiv2.dot      |  39 +++++++----
 doc/exiv2.gif      | Bin 21085 -> 16713 bytes
 doc/makernote.html | 113 ++++++++++++++++++++++++++++++++
 doc/tags-canon.xml |  68 +++++++++++++++++++
 doc/tags-fuji.xml  | 132 +++++++++++++++++++++++++++++++++++++
 doc/tags-sigma.xml | 188 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 526 insertions(+), 14 deletions(-)

diff --git a/doc/exiv2.dot b/doc/exiv2.dot
index 3a70959..f20bac5 100644
--- a/doc/exiv2.dot
+++ b/doc/exiv2.dot
@@ -1,30 +1,41 @@
+################################################################################
+# File    exiv2.dot
+# Brief   Dot file for a graph showing the component dependencies 
+#         of the Exiv2 library. Run the following command to get the image:
+#         $ dot -Tgif -oexiv2.gif exiv2.dot
+# Version $Name:  $ $Revision: 1.2 $
+# Author  Andreas Huggel (ahu)
+#         <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
+# Date    18-Feb-04, ahu: created
+################################################################################
+
 digraph G {
 
 L1 [shape=plaintext] ;
 L2 [shape=plaintext] ;
 L3 [shape=plaintext] ;
 L4 [shape=plaintext] ;
+L5 [shape=plaintext] ;
 
-"L4" -> "L3" -> "L2" -> "L1" [style=invis] ;
+"L5" -> "L4" -> "L3" -> "L2" -> "L1" [style=invis] ;
 
-"exif"  [shape=box] ;
-"ifd"   [shape=box] ;
-"image" [shape=box] ;
-"tags"  [shape=box] ;
-"types" [shape=box] ;
-"value" [shape=box] ;
-"error" [shape=box] ;
-"exif" -> "ifd" ;
-"exif" -> "image" ;
+"exif"      [shape=box] ;
+"ifd"       [shape=box] ;
+"image"     [shape=box] ;
+"tags"      [shape=box] ;
+"value"     [shape=box] ;
+"types"     [shape=box] ;
+"error"     [shape=box] ;
+"makernote" [shape=box] ;
 "exif" -> "tags" ;
-"exif" -> "types" ;
-"exif" -> "value" ;
-"exif" -> "error" ;
+"exif" -> "makernote" ;
+"exif" -> "image" ;
+"makernote" -> "ifd" ;
+"makernote" -> "value" ;
 "ifd" -> "error" ;  
 "ifd" -> "types" ;
 "image" -> "types" ;
 "tags" -> "error" ;
-"tags" -> "types" ;
 "tags" -> "value" ;
 "value" -> "types" ;
 
diff --git a/doc/exiv2.gif b/doc/exiv2.gif
index 546371d..3041fbb 100644
Binary files a/doc/exiv2.gif and b/doc/exiv2.gif differ
diff --git a/doc/makernote.html b/doc/makernote.html
new file mode 100644
index 0000000..5aa8a26
--- /dev/null
+++ b/doc/makernote.html
@@ -0,0 +1,113 @@
+<html>
+<head>
+<title>Exif MakerNote Formats and Specifications</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+<h1>Exif MakerNote Formats and Specifications</h1>
+<p>The following table summarizes the structures of the MakerNote field used by 
+  different vendors.</p>
+<table width="100%" border="1">
+  <tr> 
+    <td width="6%"><b>Make</b></td>
+    <td width="12%"><b>Models</b></td>
+    <td width="40%"><b>Format</b></td>
+    <td width="10%"><b>Specifications</b></td>
+    <td width="32%"><b>Remarks</b></td>
+  </tr>
+  <tr> 
+    <td width="6%">Canon</td>
+    <td width="12%"> </td>
+    <td width="40%">IFD</td>
+    <td width="10%"> <a href="#R2">[2]</a></td>
+    <td width="32%"> </td>
+  </tr>
+  <tr> 
+    <td width="6%">Casio</td>
+    <td width="12%"> 
+      <p>QV-3000EX, QV-2000UX, QV-8000SX</p>
+    </td>
+    <td width="40%">IFD</td>
+    <td width="10%"><a href="#R4">[4]</a></td>
+    <td width="32%">"Early" versions of QV-2000UX and QV-8000SX only 
+      have 4 bytes in the MakerNote field.</td>
+  </tr>
+  <tr> 
+    <td width="6%">Fujifilm</td>
+    <td width="12%"> </td>
+    <td width="40%">IFD; starts with string "FUJIFILM" and an offset 
+      to the first IFD, offsets are relative to the beginning of the MakerNote</td>
+    <td width="10%"><a href="#R1">[1]</a></td>
+    <td width="32%">Fujifilm's Exif data uses Motorola alignment, but the MakerNote 
+      uses Intel alignment</td>
+  </tr>
+  <tr> 
+    <td width="6%">Minolta</td>
+    <td width="12%"> </td>
+    <td width="40%">IFD</td>
+    <td width="10%"><a href="#R5">[5]</a></td>
+    <td width="32%">MakerNote numbers are always stored in Motorola/Macintosh 
+      style</td>
+  </tr>
+  <tr> 
+    <td width="6%">Nikon</td>
+    <td width="12%">E990, D1</td>
+    <td width="40%">IFD (from offset 0x00)</td>
+    <td width="10%"><a href="#R3">[3]</a></td>
+    <td width="32%"> </td>
+  </tr>
+  <tr> 
+    <td width="6%">Nikon</td>
+    <td width="12%">E700, E800, E900, E900S, E910, E950</td>
+    <td width="40%">IFD; starts with string "Nikon", IFD from offset 
+      0x08</td>
+    <td width="10%"><a href="#R1">[1]</a></td>
+    <td width="32%"> </td>
+  </tr>
+  <tr> 
+    <td width="6%">Olympus </td>
+    <td width="12%">D450Z(C-920Z)</td>
+    <td width="40%">IFD; starts with string "OLYMP", IFD from offset 
+      0x07</td>
+    <td width="10%"><a href="#R1">[1]</a></td>
+    <td width="32%"> </td>
+  </tr>
+  <tr> 
+    <td width="6%">Sanyo</td>
+    <td width="12%">DSC-MZ2</td>
+    <td width="40%">IFD</td>
+    <td width="10%"><a href="#R6">[6]</a></td>
+    <td width="32%">Tag 0x00ff contains the offset to the start of the MakerNote(?). 
+      The semantics of the value is different in TIFF and JPEG images</td>
+  </tr>
+  <tr> 
+    <td width="6%">Sigma, Foveon</td>
+    <td width="12%"> </td>
+    <td width="40%">IFD; Starts with an 8-byte ID string "SIGMA

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list