From 59187208cdb0337084499155b7c5104401b42b7f Mon Sep 17 00:00:00 2001
From: Andreas Huggel
Date: Sat, 6 May 2006 16:41:23 +0000
Subject: [PATCH] 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 5f567baa..143cd1ec 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.
IFD, usually at offset 12 |
Starts with the string "FUJIFILM"
and a 4 byte pointer to the IFD |
- Little endian (II) |
+ Little-endian (II) |
Relative to the beginning of the makernote |
[1] |
- Exif data uses big endian (MM) byte order |
+ Exif data uses big-endian (MM) byte order |
- | Minolta |
+ Minolta, KONICA MINOLTA |
IFD |
- - |
- - |
- - |
+ None |
+   |
+   |
[5] |
- Not supported by Exiv2 yet |
+ Camera settings tag is encoded in big-endian (MM) style, regardless of
+ the encoding style of the Exif data |
- | NIKON (1) |
+ NIKON |
IFD |
None |
|
@@ -107,7 +108,7 @@ Please let me know if you find further specifications on the Internet.
Models using this makernote include E990, D1 |
- | NIKON (2) |
+ NIKON |
IFD, at offset 8 |
"Nikon\0" followed by two bytes of unknown meaning |
|
@@ -116,7 +117,7 @@ Please let me know if you find further specifications on the Internet.
Models using this makernote include E700, E800, E900, E900S, E910, E950 |
- | NIKON (3) |
+ NIKON |
IFD, usually at offset 18 |
"Nikon\0" followed by 4 bytes which look like a version code
and a TIFF header |
@@ -164,7 +165,7 @@ Please let me know if you find further specifications on the Internet.
|
- | SONY (1) |
+ SONY |
IFD without a next-IFD pointer at offset 12 |
"SONY DSC \0\0\0" |
|
@@ -173,7 +174,7 @@ Please let me know if you find further specifications on the Internet.
Seen in Jpeg images, e.g., from DSC-W7, DSC-R1 |
- | SONY (2) |
+ SONY |
IFD |
None |
|
diff --git a/src/minoltamn.hpp b/src/minoltamn.hpp
index 5dcbf323..bc15cd86 100644
--- a/src/minoltamn.hpp
+++ b/src/minoltamn.hpp
@@ -21,6 +21,8 @@
/*!
@file minoltamn.hpp
@brief Minolta MakerNote
+ References:
+ MakerNote by Dalibor Jelinek
@version $Rev$
@author Andreas Huggel (ahu)
ahuggel@gmx.net