[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:32 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=ea32b96
The following commit has been merged in the master branch:
commit ea32b96bc9f8ea219e65e721388fb7011e37a031
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sat Apr 29 16:21:15 2006 +0000
Makernote doc update and minor fix
---
doc/templates/makernote.html.in | 151 ++++++++++++++++++++++++++--------------
src/makernote2.cpp | 2 +-
2 files changed, 100 insertions(+), 53 deletions(-)
diff --git a/doc/templates/makernote.html.in b/doc/templates/makernote.html.in
index 12b5065..5f567ba 100644
--- a/doc/templates/makernote.html.in
+++ b/doc/templates/makernote.html.in
@@ -10,7 +10,7 @@ __index1__
<h1>MakerNote Formats and Specifications</h1>
<p>
-The MakerNote is tag 0x927c in the Exif IFD. According to the
+The Makernote is tag 0x927c in the Exif IFD. According to the
<a title="The Exif 2.2 standard (PDF)" href="http://tsc.jeita.or.jp/avs/data/cp3451.pdf">
Exif 2.2 standard</a>, the makernote is <i>"a tag for manufacturers of
Exif writers to record any desired information. The contents are up to
@@ -36,119 +36,158 @@ etc. In my opinion, this is a bug in the specification. In fact, some vendors se
recognized this problem and use offsets relative to somewhere at the beginning of the makernote
field for the makernote IFD.</p>
-<p>The following table summarizes the structures of the MakerNote field used by some vendors.
+<p>The following table summarizes the structures of the makernote field used by some vendors.
Please let me know if you find further specifications on the Internet.</p>
<table class="ReportTable" id="report-1" cellspacing="0">
<colgroup>
<col>
<col>
<col>
+ <col>
+ <col>
<col align="center">
<col>
</colgroup>
<thead>
<tr>
- <th width="8%"><b>Make</b></th>
- <th width="12%"><b>Models</b></th>
- <th width="32%"><b>Format</b></th>
- <th width="8%"><b>Specs</b></th>
- <th width="40%"><b>Remarks</b></th>
+ <th><b>Make</b></th>
+ <th><b>Format</b></th>
+ <th><b>Header</b></th>
+ <th><b>Endian</b> <sup>1)</sup></th>
+ <th><b>Offsets</b> <sup>2)</sup></th>
+ <th><b>Ref</b></th>
+ <th><b>Remarks</b></th>
</tr>
</thead>
<tbody>
<tr class="OddRow">
<td>Canon</td>
- <td> </td>
<td>IFD</td>
- <td><a href="#R2">[2]</a></td>
+ <td>None</td>
+ <td> </td>
<td> </td>
+ <td><a href="#R2">[2]</a></td>
+ <td>Some CR2 images have a non-zero next-IFD pointer</td>
</tr>
<tr class="EvenRow">
<td>Casio</td>
- <td>QV-3000EX, QV-2000UX, QV-8000SX</td>
<td>IFD</td>
+ <td>-</td>
+ <td>-</td>
+ <td>-</td>
<td><a href="#R4">[4]</a></td>
- <td>"Early" versions of QV-2000UX and QV-8000SX only
- have 4 bytes in the MakerNote field.</td>
+ <td>Not supported by Exiv2 yet</td>
</tr>
<tr class="OddRow">
- <td>Fujifilm</td>
- <td> </td>
- <td>IFD; starts with string "FUJIFILM" and an offset
- to the first IFD, offsets are relative to the beginning of the MakerNote</td>
+ <td>FUJIFILM</td>
+ <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>Relative to the beginning of the makernote</td>
<td><a href="#R1">[1]</a></td>
- <td>Fujifilm's Exif data uses big endian (MM) byte order, but the MakerNote
- uses little endian (II) alignment</td>
+ <td>Exif data uses big endian (MM) byte order</td>
</tr>
- <tr class="EvenRow">
+ <tr class="EvenRow">
<td>Minolta</td>
- <td> </td>
<td>IFD</td>
+ <td>-</td>
+ <td>-</td>
+ <td>-</td>
<td><a href="#R5">[5]</a></td>
- <td>MakerNote numbers are always stored in big endian (MM) byte order</td>
+ <td>Not supported by Exiv2 yet</td>
</tr>
<tr class="OddRow">
- <td>Nikon (1)</td>
- <td>E990, D1</td>
- <td>IFD (from offset 0x00)</td>
- <td><a href="#R3">[3]</a></td>
+ <td>NIKON (1)</td>
+ <td>IFD</td>
+ <td>None</td>
<td> </td>
+ <td> </td>
+ <td><a href="#R3">[3]</a></td>
+ <td>Models using this makernote include E990, D1</td>
</tr>
<tr class="EvenRow">
- <td>Nikon (2)</td>
- <td>E700, E800, E900, E900S, E910, E950</td>
- <td>IFD; starts with string "Nikon
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list