diff --git a/doc/ChangeLog b/doc/ChangeLog
index 3498af5d..a794501d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,10 +1,6 @@
Changes from version 0.18-pre2 to 0.18
--------------------------------------
-* MSVC related
- - [build environment] More fixes for the MSVC build environment.
- (Robin Mills)
-
* Exiv2 utility
- 0000580: [tools] -M option fails and reports success.
(Reported by Daniel Blueman)
@@ -45,7 +41,11 @@ Changes from version 0.18-pre2 to 0.18
- [translation] Updated German translation.
(Oliver Dörr)
- [translation] Updated Slovak translations.
- (Ivan Masár)
+ (Ivan Masar)
+
+* MSVC related
+ - 0000578: [build environment] More fixes for the MSVC build environment.
+ (Robin Mills)
Changes from version 0.18-pre1 to 0.18-pre2
diff --git a/doc/templates/__makernotes__ b/doc/templates/__makernotes__
index 41e75db6..ce4c4c66 100644
--- a/doc/templates/__makernotes__
+++ b/doc/templates/__makernotes__
@@ -97,6 +97,15 @@
| |
+ | OLYMPUS |
+ IFD, at offset 12 |
+ "OLYMPUS\0II" followed by two bytes of unknown meaning |
+ |
+ Relative to the beginning of the makernote |
+ |
+ |
+
+
| Sanyo |
IFD |
- |
@@ -105,7 +114,7 @@
[6] |
Not supported by Exiv2 yet |
-
+
| SIGMA, FOVEON |
IFD, at offset 10 |
"SIGMA\0\0\0" or "FOVEON\0\0" followed by two bytes
@@ -115,7 +124,7 @@
| [7] |
|
-
+
| Panasonic |
IFD without a next-IFD pointer at offset 12 |
"Panasonic\0\0\0" |
@@ -124,7 +133,7 @@
[8] |
|
-
+
| PENTAX |
IFD at offset 6 |
"AOC\0" followed by two bytes of unknown meaning |
@@ -133,7 +142,7 @@
[11] |
|
-
+
| SONY |
IFD without a next-IFD pointer at offset 12 |
"SONY DSC \0\0\0" |
@@ -142,7 +151,7 @@
|
Seen in Jpeg images, e.g., from DSC-W7, DSC-R1 |
-
+
| SONY |
IFD |
None |