diff --git a/doc/tags-nikon1.xml b/doc/tags-nikon1.xml new file mode 100644 index 00000000..6a117b43 --- /dev/null +++ b/doc/tags-nikon1.xml @@ -0,0 +1,125 @@ + + + +
+Nikon (format 1) MakerNote Tags defined in Exiv2 + +

Tags found in the MakerNote of images taken with Nikon cameras, such as the E990 and D1. These tags are defined by Exiv2 in accordance with [3].

+

Click on a column header to sort the table.

+
+
+ + + Version + 1 + 0x0001 + Makernote + Makernote.Nikon1.Version + Nikon Makernote version + + + ISOSpeed + 2 + 0x0002 + Makernote + Makernote.Nikon1.ISOSpeed + ISO speed setting + + + ColorMode + 3 + 0x0003 + Makernote + Makernote.Nikon1.ColorMode + Color mode + + + Quality + 4 + 0x0004 + Makernote + Makernote.Nikon1.Quality + Image quality setting + + + WhiteBalance + 5 + 0x0005 + Makernote + Makernote.Nikon1.WhiteBalance + White balance + + + Sharpening + 6 + 0x0006 + Makernote + Makernote.Nikon1.Sharpening + Image sharpening setting + + + Focus + 7 + 0x0007 + Makernote + Makernote.Nikon1.Focus + Focus mode + + + Flash + 8 + 0x0008 + Makernote + Makernote.Nikon1.Flash + Flash mode + + + ISOSelection + 15 + 0x000f + Makernote + Makernote.Nikon1.ISOSelection + ISO selection + + + ImageAdjustment + 128 + 0x0080 + Makernote + Makernote.Nikon1.ImageAdjustment + Image adjustment setting + + + Adapter + 130 + 0x0082 + Makernote + Makernote.Nikon1.Adapter + Adapter used + + + FocusDistance + 133 + 0x0085 + Makernote + Makernote.Nikon1.FocusDistance + Manual focus distance + + + DigitalZoom + 134 + 0x0086 + Makernote + Makernote.Nikon1.DigitalZoom + Digital zoom setting + + + AFFocusPos + 136 + 0x0088 + Makernote + Makernote.Nikon1.AFFocusPos + AF focus position + + +
diff --git a/doc/tags-nikon2.xml b/doc/tags-nikon2.xml new file mode 100644 index 00000000..d38a5152 --- /dev/null +++ b/doc/tags-nikon2.xml @@ -0,0 +1,77 @@ + + + +
+Nikon (format 2) MakerNote Tags defined in Exiv2 + +

Tags found in the MakerNote of images taken with Nikon cameras, including the E700, E800, E900, E900S, E910, E950. These tags are defined by Exiv2 in accordance with [1].

+

Click on a column header to sort the table.

+
+
+ + + Quality + 3 + 0x0003 + Makernote + Makernote.Nikon2.Quality + Image quality setting + + + ColorMode + 4 + 0x0004 + Makernote + Makernote.Nikon2.ColorMode + Color mode + + + ImageAdjustment + 5 + 0x0005 + Makernote + Makernote.Nikon2.ImageAdjustment + Image adjustment setting + + + ISOSpeed + 6 + 0x0006 + Makernote + Makernote.Nikon2.ISOSpeed + ISO speed setting + + + WhiteBalance + 7 + 0x0007 + Makernote + Makernote.Nikon2.WhiteBalance + White balance + + + Focus + 8 + 0x0008 + Makernote + Makernote.Nikon2.Focus + Focus mode + + + DigitalZoom + 10 + 0x000a + Makernote + Makernote.Nikon2.DigitalZoom + Digital zoom setting + + + Adapter + 11 + 0x000b + Makernote + Makernote.Nikon2.Adapter + Adapter used + + +
diff --git a/doc/tags-nikon3.xml b/doc/tags-nikon3.xml new file mode 100644 index 00000000..cc687a84 --- /dev/null +++ b/doc/tags-nikon3.xml @@ -0,0 +1,237 @@ + + + +
+Nikon (format 3) MakerNote Tags defined in Exiv2 + +

Tags found in the MakerNote of images taken with newer Nikon cameras, e.g., the E5400, SQ, D2H, D70.

+

Click on a column header to sort the table.

+
+
+ + + Version + 1 + 0x0001 + Makernote + Makernote.Nikon3.Version + Nikon Makernote version + + + ISOSpeed + 2 + 0x0002 + Makernote + Makernote.Nikon3.ISOSpeed + ISO speed setting + + + ColorMode + 3 + 0x0003 + Makernote + Makernote.Nikon3.ColorMode + Color mode + + + Quality + 4 + 0x0004 + Makernote + Makernote.Nikon3.Quality + Image quality setting + + + WhiteBalance + 5 + 0x0005 + Makernote + Makernote.Nikon3.WhiteBalance + White balance + + + Sharpening + 6 + 0x0006 + Makernote + Makernote.Nikon3.Sharpening + Image sharpening setting + + + Focus + 7 + 0x0007 + Makernote + Makernote.Nikon3.Focus + Focus mode + + + FlashSetting + 8 + 0x0008 + Makernote + Makernote.Nikon3.FlashSetting + Flash setting + + + FlashMode + 9 + 0x0009 + Makernote + Makernote.Nikon3.FlashMode + Flash mode + + + WhiteBalanceBias + 11 + 0x000b + Makernote + Makernote.Nikon3.WhiteBalanceBias + White balance bias + + + ExposureDiff + 14 + 0x000e + Makernote + Makernote.Nikon3.ExposureDiff + Exposure difference + + + ISOSelection + 15 + 0x000f + Makernote + Makernote.Nikon3.ISOSelection + ISO selection + + + ThumbOffset + 17 + 0x0011 + Makernote + Makernote.Nikon3.ThumbOffset + Thumbnail IFD offset + + + FlashBias + 18 + 0x0012 + Makernote + Makernote.Nikon3.FlashBias + Flash bias + + + ImageAdjustment + 128 + 0x0080 + Makernote + Makernote.Nikon3.ImageAdjustment + Image adjustment setting + + + ToneComp + 129 + 0x0081 + Makernote + Makernote.Nikon3.ToneComp + Tone compensation setting + + + LensType + 131 + 0x0083 + Makernote + Makernote.Nikon3.LensType + Lens type + + + Lens + 132 + 0x0084 + Makernote + Makernote.Nikon3.Lens + Lens + + + FocusDistance + 133 + 0x0085 + Makernote + Makernote.Nikon3.FocusDistance + Manual focus distance + + + DigitalZoom + 134 + 0x0086 + Makernote + Makernote.Nikon3.DigitalZoom + Digital zoom setting + + + FlashType + 135 + 0x0087 + Makernote + Makernote.Nikon3.FlashType + Type of flash used + + + AFFocusPos + 136 + 0x0088 + Makernote + Makernote.Nikon3.AFFocusPos + AF focus position + + + Bracketing + 137 + 0x0089 + Makernote + Makernote.Nikon3.Bracketing + Bracketing + + + ColorMode + 141 + 0x008d + Makernote + Makernote.Nikon3.ColorMode + Color mode + + + LightingType + 144 + 0x0090 + Makernote + Makernote.Nikon3.LightingType + Lighting type + + + Hue + 146 + 0x0092 + Makernote + Makernote.Nikon3.Hue + Hue adjustment + + + Saturation + 148 + 0x0094 + Makernote + Makernote.Nikon3.Saturation + Saturation adjustment + + + NoiseReduction + 149 + 0x0095 + Makernote + Makernote.Nikon3.NoiseReduction + Noise reduction + + +
diff --git a/src/doxygen.hpp b/src/doxygen.hpp index 699edcc7..dcb157ed 100644 --- a/src/doxygen.hpp +++ b/src/doxygen.hpp @@ -2,7 +2,7 @@ /*! @file doxygen.hpp @brief Additional documentation, this file contains no source code - @version $Name: $ $Revision: 1.12 $ + @version $Name: $ $Revision: 1.13 $ @author Andreas Huggel (ahu) ahuggel@gmx.net @date 07-Feb-04, ahu: created @@ -47,6 +47,9 @@ - Standard Exif tags - Canon MakerNote tags - Fujifilm MakerNote tags + - Nikon (format 1) MakerNote tags + - Nikon (format 2) MakerNote tags + - Nikon (format 3) MakerNote tags - Sigma/Foveon MakerNote tags @section makernote MakerNote Formats and Specifications