cul_image_props 0.3.3 → 0.3.4

data/lib/cul_image_props/image/properties/exif.rb

@@ -74,23 +74,24 @@ def self.process_file(f, opts={})
                 end
                 exif = EXIF_TAGS[0x0128] # resolution unit
                 label = 'Image ' + exif.name
+                tag_name = nil
                 if (data[offset+11] == X00)
-                  jfif[label] = IFD_Tag.new(exif.value[1],label,3,[0],offset+11,1)
+                  tag_name = exif.value[1]
                 elsif (data[offset+11] == X01)
-                  jfif[label] = IFD_Tag.new(exif.value[2],label,3,[0],offset+11,1)
+                  tag_name = exif.value[2]
                 elsif (data[offset+11] == X02)
-                  jfif[label] = IFD_Tag.new(exif.value[3],label,3,[0],offset+11,1)
+                  tag_name = exif.value[3]
                 else
                   puts "Unknown jfif tag: #{data[offset+11]}"
-                  jfif[label] = IFD_Tag.new("Unknown",label,3,[0],offset+11,1)
+                  tag_name = "Unknown"
                 end
+                jfif[label] = IFD_Tag.new(tag_name,3,exif,[0],offset+11,1)
                 xres= data[offset+12,2].unpack('n')[0]
                 yres= data[offset+14,2].unpack('n')[0]
-                exif = EXIF_TAGS[0x011a] # x resolution
                 label = 'Image ' + EXIF_TAGS[0x011a].name
-                jfif[label] = IFD_Tag.new(xres.to_s,label,5,[xres],offset+12,2)
+                jfif[label] = IFD_Tag.new(xres.to_s,5,EXIF_TAGS[0x011a],[xres],offset+12,2)
                 label = 'Image ' + EXIF_TAGS[0x011b].name # y resolution
-                jfif[label] = IFD_Tag.new(yres.to_s,label,5,[yres],offset+13,2)
+                jfif[label] = IFD_Tag.new(yres.to_s,5,EXIF_TAGS[0x011b],[yres],offset+13,2)
             else
                 if(data.length < fptr + 2)
                     break

data/lib/cul_image_props/image/properties/exif/constants.rb

@@ -142,10 +142,10 @@ FIELD_TYPES = [
 
 # dictionary of main EXIF tag names
 EXIF_TAGS = {
-    0x0100 => TagName.new('ImageWidth'),
-    0x0101 => TagName.new('ImageLength'),
-    0x0102 => TagName.new('BitsPerSample'),
-    0x0103 => TagName.new('Compression',
+    0x0100 => TagEntry.new('ImageWidth'),
+    0x0101 => TagEntry.new('ImageLength'),
+    0x0102 => TagEntry.new('BitsPerSample'),
+    0x0103 => TagEntry.new('Compression',
              {1 => 'Uncompressed',
               2 => 'CCITT 1D',
               3 => 'T4/Group 3 Fax',
@@ -176,15 +176,15 @@ EXIF_TAGS = {
               34713 => 'Nikon NEF Compressed',
               65000 => 'Kodak DCR Compressed',
               65535 => 'Pentax PEF Compressed'}),
-    0x0106 => TagName.new('PhotometricInterpretation'),
-    0x0107 => TagName.new('Thresholding'),
-    0x010A => TagName.new('FillOrder'),
-    0x010D => TagName.new('DocumentName'),
-    0x010E => TagName.new('ImageDescription'),
-    0x010F => TagName.new('Make'),
-    0x0110 => TagName.new('Model'),
-    0x0111 => TagName.new('StripOffsets'),
-    0x0112 => TagName.new('Orientation',
+    0x0106 => TagEntry.new('PhotometricInterpretation'),
+    0x0107 => TagEntry.new('Thresholding'),
+    0x010A => TagEntry.new('FillOrder'),
+    0x010D => TagEntry.new('DocumentName'),
+    0x010E => TagEntry.new('ImageDescription'),
+    0x010F => TagEntry.new('Make'),
+    0x0110 => TagEntry.new('Model'),
+    0x0111 => TagEntry.new('StripOffsets'),
+    0x0112 => TagEntry.new('Orientation',
              {1 => 'Horizontal (normal)',
               2 => 'Mirrored horizontal',
               3 => 'Rotated 180',
@@ -193,46 +193,46 @@ EXIF_TAGS = {
               6 => 'Rotated 90 CW',
               7 => 'Mirrored horizontal then rotated 90 CW',
               8 => 'Rotated 90 CCW'}),
-    0x0115 => TagName.new('SamplesPerPixel'),
-    0x0116 => TagName.new('RowsPerStrip'),
-    0x0117 => TagName.new('StripByteCounts'),
-    0x011A => TagName.new('XResolution'),
-    0x011B => TagName.new('YResolution'),
-    0x011C => TagName.new('PlanarConfiguration'),
-    0x011D => TagName.new('PageName', self.method(:ascii_bytes_to_filtered_string)),
-    0x0128 => TagName.new('ResolutionUnit',
+    0x0115 => TagEntry.new('SamplesPerPixel'),
+    0x0116 => TagEntry.new('RowsPerStrip'),
+    0x0117 => TagEntry.new('StripByteCounts'),
+    0x011A => TagEntry.new('XResolution'),
+    0x011B => TagEntry.new('YResolution'),
+    0x011C => TagEntry.new('PlanarConfiguration'),
+    0x011D => TagEntry.new('PageName', self.method(:ascii_bytes_to_filtered_string)),
+    0x0128 => TagEntry.new('ResolutionUnit',
              { 1 => 'Not Absolute',
                2 => 'Pixels/Inch',
                3 => 'Pixels/Centimeter' }),
-    0x012D => TagName.new('TransferFunction'),
-    0x0131 => TagName.new('Software'),
-    0x0132 => TagName.new('DateTime'),
-    0x013B => TagName.new('Artist'),
-    0x013E => TagName.new('WhitePoint'),
-    0x013F => TagName.new('PrimaryChromaticities'),
-    0x0156 => TagName.new('TransferRange'),
-    0x0200 => TagName.new('JPEGProc'),
-    0x0201 => TagName.new('JPEGInterchangeFormat'),
-    0x0202 => TagName.new('JPEGInterchangeFormatLength'),
-    0x0211 => TagName.new('YCbCrCoefficients'),
-    0x0212 => TagName.new('YCbCrSubSampling'),
-    0x0213 => TagName.new('YCbCrPositioning',
+    0x012D => TagEntry.new('TransferFunction'),
+    0x0131 => TagEntry.new('Software'),
+    0x0132 => TagEntry.new('DateTime'),
+    0x013B => TagEntry.new('Artist'),
+    0x013E => TagEntry.new('WhitePoint'),
+    0x013F => TagEntry.new('PrimaryChromaticities'),
+    0x0156 => TagEntry.new('TransferRange'),
+    0x0200 => TagEntry.new('JPEGProc'),
+    0x0201 => TagEntry.new('JPEGInterchangeFormat'),
+    0x0202 => TagEntry.new('JPEGInterchangeFormatLength'),
+    0x0211 => TagEntry.new('YCbCrCoefficients'),
+    0x0212 => TagEntry.new('YCbCrSubSampling'),
+    0x0213 => TagEntry.new('YCbCrPositioning',
              {1 => 'Centered',
               2 => 'Co-sited'}),
-    0x0214 => TagName.new('ReferenceBlackWhite'),
+    0x0214 => TagEntry.new('ReferenceBlackWhite'),
     
-    0x4746 => TagName.new('Rating'),
+    0x4746 => TagEntry.new('Rating'),
     
-    0x828D => TagName.new('CFARepeatPatternDim'),
-    0x828E => TagName.new('CFAPattern'),
-    0x828F => TagName.new('BatteryLevel'),
-    0x8298 => TagName.new('Copyright'),
-    0x829A => TagName.new('ExposureTime'),
-    0x829D => TagName.new('FNumber'),
-    0x83BB => TagName.new('IPTC/NAA'),
-    0x8769 => TagName.new('ExifOffset'),
-    0x8773 => TagName.new('InterColorProfile'),
-    0x8822 => TagName.new('ExposureProgram',
+    0x828D => TagEntry.new('CFARepeatPatternDim'),
+    0x828E => TagEntry.new('CFAPattern'),
+    0x828F => TagEntry.new('BatteryLevel'),
+    0x8298 => TagEntry.new('Copyright'),
+    0x829A => TagEntry.new('ExposureTime'),
+    0x829D => TagEntry.new('FNumber'),
+    0x83BB => TagEntry.new('IPTC/NAA'),
+    0x8769 => TagEntry.new('ExifOffset'),
+    0x8773 => TagEntry.new('InterColorProfile'),
+    0x8822 => TagEntry.new('ExposureProgram',
              {0 => 'Unidentified',
               1 => 'Manual',
               2 => 'Program Normal',
@@ -242,14 +242,14 @@ EXIF_TAGS = {
               6 => 'Program Action',
               7 => 'Portrait Mode',
               8 => 'Landscape Mode'}),
-    0x8824 => TagName.new('SpectralSensitivity'),
-    0x8825 => TagName.new('GPSInfo'),
-    0x8827 => TagName.new('ISOSpeedRatings'),
-    0x8828 => TagName.new('OECF'),
-    0x9000 => TagName.new('ExifVersion', self.method(:ascii_bytes_to_filtered_string)),
-    0x9003 => TagName.new('DateTimeOriginal'),
-    0x9004 => TagName.new('DateTimeDigitized'),
-    0x9101 => TagName.new('ComponentsConfiguration',
+    0x8824 => TagEntry.new('SpectralSensitivity'),
+    0x8825 => TagEntry.new('GPSInfo'),
+    0x8827 => TagEntry.new('ISOSpeedRatings'),
+    0x8828 => TagEntry.new('OECF'),
+    0x9000 => TagEntry.new('ExifVersion', self.method(:ascii_bytes_to_filtered_string)),
+    0x9003 => TagEntry.new('DateTimeOriginal'),
+    0x9004 => TagEntry.new('DateTimeDigitized'),
+    0x9101 => TagEntry.new('ComponentsConfiguration',
              {0 => '',
               1 => 'Y',
               2 => 'Cb',
@@ -257,21 +257,21 @@ EXIF_TAGS = {
               4 => 'Red',
               5 => 'Green',
               6 => 'Blue'}),
-    0x9102 => TagName.new('CompressedBitsPerPixel'),
-    0x9201 => TagName.new('ShutterSpeedValue'),
-    0x9202 => TagName.new('ApertureValue'),
-    0x9203 => TagName.new('BrightnessValue'),
-    0x9204 => TagName.new('ExposureBiasValue'),
-    0x9205 => TagName.new('MaxApertureValue'),
-    0x9206 => TagName.new('SubjectDistance'),
-    0x9207 => TagName.new('MeteringMode',
+    0x9102 => TagEntry.new('CompressedBitsPerPixel'),
+    0x9201 => TagEntry.new('ShutterSpeedValue'),
+    0x9202 => TagEntry.new('ApertureValue'),
+    0x9203 => TagEntry.new('BrightnessValue'),
+    0x9204 => TagEntry.new('ExposureBiasValue'),
+    0x9205 => TagEntry.new('MaxApertureValue'),
+    0x9206 => TagEntry.new('SubjectDistance'),
+    0x9207 => TagEntry.new('MeteringMode',
              {0 => 'Unidentified',
               1 => 'Average',
               2 => 'CenterWeightedAverage',
               3 => 'Spot',
               4 => 'MultiSpot',
               5 => 'Pattern'}),
-    0x9208 => TagName.new('LightSource',
+    0x9208 => TagEntry.new('LightSource',
              {0 => 'Unknown',
               1 => 'Daylight',
               2 => 'Fluorescent',
@@ -290,7 +290,7 @@ EXIF_TAGS = {
               21 => 'D65',
               22 => 'D75',
               255 => 'Other'}),
-    0x9209 => TagName.new('Flash',
+    0x9209 => TagEntry.new('Flash',
              {0 => 'No',
               1 => 'Fired',
               5 => 'Fired (?)', # no return sensed
@@ -304,37 +304,37 @@ EXIF_TAGS = {
               29 => 'Auto Fired (?)',
               31 => 'Auto Fired (!)',
               32 => 'Not Available'}),
-    0x920A => TagName.new('FocalLength'),
-    0x9214 => TagName.new('SubjectArea'),
-    0x927C => TagName.new('MakerNote'),
-    0x9286 => TagName.new('UserComment', self.method(:filter_encoded_string)),
-    0x9290 => TagName.new('SubSecTime'),
-    0x9291 => TagName.new('SubSecTimeOriginal'),
-    0x9292 => TagName.new('SubSecTimeDigitized'),
+    0x920A => TagEntry.new('FocalLength'),
+    0x9214 => TagEntry.new('SubjectArea'),
+    0x927C => TagEntry.new('MakerNote'),
+    0x9286 => TagEntry.new('UserComment', self.method(:filter_encoded_string)),
+    0x9290 => TagEntry.new('SubSecTime'),
+    0x9291 => TagEntry.new('SubSecTimeOriginal'),
+    0x9292 => TagEntry.new('SubSecTimeDigitized'),
     
     # used by Windows Explorer
-    0x9C9B => TagName.new('XPTitle'),
-    0x9C9C => TagName.new('XPComment'),
-    0x9C9D => TagName.new('XPAuthor'), #(ignored by Windows Explorer if Artist exists)
-    0x9C9E => TagName.new('XPKeywords'),
-    0x9C9F => TagName.new('XPSubject'),
+    0x9C9B => TagEntry.new('XPTitle'),
+    0x9C9C => TagEntry.new('XPComment'),
+    0x9C9D => TagEntry.new('XPAuthor'), #(ignored by Windows Explorer if Artist exists)
+    0x9C9E => TagEntry.new('XPKeywords'),
+    0x9C9F => TagEntry.new('XPSubject'),
 
-    0xA000 => TagName.new('FlashPixVersion', self.method(:ascii_bytes_to_filtered_string)),
-    0xA001 => TagName.new('ColorSpace',
+    0xA000 => TagEntry.new('FlashPixVersion', self.method(:ascii_bytes_to_filtered_string)),
+    0xA001 => TagEntry.new('ColorSpace',
              {1 => 'sRGB',
               2 => 'Adobe RGB',
               65535 => 'Uncalibrated'}),
-    0xA002 => TagName.new('ExifImageWidth'),
-    0xA003 => TagName.new('ExifImageLength'),
-    0xA005 => TagName.new('InteroperabilityOffset'),
-    0xA20B => TagName.new('FlashEnergy'),               # 0x920B in TIFF/EP
-    0xA20C => TagName.new('SpatialFrequencyResponse'),  # 0x920C
-    0xA20E => TagName.new('FocalPlaneXResolution'),     # 0x920E
-    0xA20F => TagName.new('FocalPlaneYResolution'),     # 0x920F
-    0xA210 => TagName.new('FocalPlaneResolutionUnit'),  # 0x9210
-    0xA214 => TagName.new('SubjectLocation'),           # 0x9214
-    0xA215 => TagName.new('ExposureIndex'),             # 0x9215
-    0xA217 => TagName.new('SensingMethod',                # 0x9217
+    0xA002 => TagEntry.new('ExifImageWidth'),
+    0xA003 => TagEntry.new('ExifImageLength'),
+    0xA005 => TagEntry.new('InteroperabilityOffset'),
+    0xA20B => TagEntry.new('FlashEnergy'),               # 0x920B in TIFF/EP
+    0xA20C => TagEntry.new('SpatialFrequencyResponse'),  # 0x920C
+    0xA20E => TagEntry.new('FocalPlaneXResolution'),     # 0x920E
+    0xA20F => TagEntry.new('FocalPlaneYResolution'),     # 0x920F
+    0xA210 => TagEntry.new('FocalPlaneResolutionUnit'),  # 0x9210
+    0xA214 => TagEntry.new('SubjectLocation'),           # 0x9214
+    0xA215 => TagEntry.new('ExposureIndex'),             # 0x9215
+    0xA217 => TagEntry.new('SensingMethod',                # 0x9217
              {1 => 'Not defined',
               2 => 'One-chip color area',
               3 => 'Two-chip color area',
@@ -342,62 +342,62 @@ EXIF_TAGS = {
               5 => 'Color sequential area',
               7 => 'Trilinear',
               8 => 'Color sequential linear'}),             
-    0xA300 => TagName.new('FileSource',
+    0xA300 => TagEntry.new('FileSource',
              {1 => 'Film Scanner',
               2 => 'Reflection Print Scanner',
               3 => 'Digital Camera'}),
-    0xA301 => TagName.new('SceneType',
+    0xA301 => TagEntry.new('SceneType',
              {1 => 'Directly Photographed'}),
-    0xA302 => TagName.new('CVAPattern'),
-    0xA401 => TagName.new('CustomRendered',
+    0xA302 => TagEntry.new('CVAPattern'),
+    0xA401 => TagEntry.new('CustomRendered',
              {0 => 'Normal',
               1 => 'Custom'}),
-    0xA402 => TagName.new('ExposureMode',
+    0xA402 => TagEntry.new('ExposureMode',
              {0 => 'Auto Exposure',
               1 => 'Manual Exposure',
               2 => 'Auto Bracket'}),
-    0xA403 => TagName.new('WhiteBalance',
+    0xA403 => TagEntry.new('WhiteBalance',
              {0 => 'Auto',
               1 => 'Manual'}),
-    0xA404 => TagName.new('DigitalZoomRatio'),
-    0xA405 => TagName.new('FocalLengthIn35mmFilm'),
-    0xA406 => TagName.new('SceneCaptureType',
+    0xA404 => TagEntry.new('DigitalZoomRatio'),
+    0xA405 => TagEntry.new('FocalLengthIn35mmFilm'),
+    0xA406 => TagEntry.new('SceneCaptureType',
              {0 => 'Standard',
               1 => 'Landscape',
               2 => 'Portrait',
               3 => 'Night)'}),
-    0xA407 => TagName.new('GainControl',
+    0xA407 => TagEntry.new('GainControl',
              {0 => 'None',
               1 => 'Low gain up',
               2 => 'High gain up',
               3 => 'Low gain down',
               4 => 'High gain down'}),
-    0xA408 => TagName.new('Contrast',
+    0xA408 => TagEntry.new('Contrast',
              {0 => 'Normal',
               1 => 'Soft',
               2 => 'Hard'}),
-    0xA409 => TagName.new('Saturation',
+    0xA409 => TagEntry.new('Saturation',
              {0 => 'Normal',
               1 => 'Soft',
               2 => 'Hard'}),
-    0xA40A => TagName.new('Sharpness',
+    0xA40A => TagEntry.new('Sharpness',
              {0 => 'Normal',
               1 => 'Soft',
               2 => 'Hard'}),
-    0xA40B => TagName.new('DeviceSettingDescription'),
-    0xA40C => TagName.new('SubjectDistanceRange'),
-    0xA500 => TagName.new('Gamma'),
-    0xC4A5 => TagName.new('PrintIM'),
-    0xEA1C =>	TagName.new('Padding')
+    0xA40B => TagEntry.new('DeviceSettingDescription'),
+    0xA40C => TagEntry.new('SubjectDistanceRange'),
+    0xA500 => TagEntry.new('Gamma'),
+    0xC4A5 => TagEntry.new('PrintIM'),
+    0xEA1C =>	TagEntry.new('Padding')
     }
 
 # interoperability tags
 INTR_TAGS = {
-    0x0001 => TagName.new('InteroperabilityIndex'),
-    0x0002 => TagName.new('InteroperabilityVersion'),
-    0x1000 => TagName.new('RelatedImageFileFormat'),
-    0x1001 => TagName.new('RelatedImageWidth'),
-    0x1002 => TagName.new('RelatedImageLength')
+    0x0001 => TagEntry.new('InteroperabilityIndex'),
+    0x0002 => TagEntry.new('InteroperabilityVersion'),
+    0x1000 => TagEntry.new('RelatedImageFileFormat'),
+    0x1001 => TagEntry.new('RelatedImageWidth'),
+    0x1002 => TagEntry.new('RelatedImageLength')
     }
 
 # Ignore these tags when quick processing
@@ -409,132 +409,132 @@ IGNORE_TAGS = [0x9286, 0x927C]
 MAKERNOTE_OLYMPUS_TAGS = {
     # ah HAH! those sneeeeeaky bastids! this is how they get past the fact
     # that a JPEG thumbnail is not allowed in an uncompressed TIFF file
-    0x0100 => TagName.new('JPEGThumbnail'),
-    0x0200 => TagName.new('SpecialMode', self.method(:olympus_special_mode)),
-    0x0201 => TagName.new('JPEGQual',
+    0x0100 => TagEntry.new('JPEGThumbnail'),
+    0x0200 => TagEntry.new('SpecialMode', self.method(:olympus_special_mode)),
+    0x0201 => TagEntry.new('JPEGQual',
              {1 => 'SQ',
               2 => 'HQ',
               3 => 'SHQ'}),
-    0x0202 => TagName.new('Macro',
+    0x0202 => TagEntry.new('Macro',
              {0 => 'Normal',
              1 => 'Macro',
              2 => 'SuperMacro'}),
-    0x0203 => TagName.new('BWMode',
+    0x0203 => TagEntry.new('BWMode',
              {0 => 'Off',
              1 => 'On'}),
-    0x0204 => TagName.new('DigitalZoom'),
-    0x0205 => TagName.new('FocalPlaneDiagonal'),
-    0x0206 => TagName.new('LensDistortionParams'),
-    0x0207 => TagName.new('SoftwareRelease'),
-    0x0208 => TagName.new('PictureInfo'),
-    0x0209 => TagName.new('CameraID', self.method(:ascii_bytes_to_filtered_string)), # print as string
-    0x0F00 => TagName.new('DataDump'),
-    0x0300 => TagName.new('PreCaptureFrames'),
-    0x0404 => TagName.new('SerialNumber'),
-    0x1000 => TagName.new('ShutterSpeedValue'),
-    0x1001 => TagName.new('ISOValue'),
-    0x1002 => TagName.new('ApertureValue'),
-    0x1003 => TagName.new('BrightnessValue'),
-    0x1004 => TagName.new('FlashMode'),
-    0x1004 => TagName.new('FlashMode',
+    0x0204 => TagEntry.new('DigitalZoom'),
+    0x0205 => TagEntry.new('FocalPlaneDiagonal'),
+    0x0206 => TagEntry.new('LensDistortionParams'),
+    0x0207 => TagEntry.new('SoftwareRelease'),
+    0x0208 => TagEntry.new('PictureInfo'),
+    0x0209 => TagEntry.new('CameraID', self.method(:ascii_bytes_to_filtered_string)), # print as string
+    0x0F00 => TagEntry.new('DataDump'),
+    0x0300 => TagEntry.new('PreCaptureFrames'),
+    0x0404 => TagEntry.new('SerialNumber'),
+    0x1000 => TagEntry.new('ShutterSpeedValue'),
+    0x1001 => TagEntry.new('ISOValue'),
+    0x1002 => TagEntry.new('ApertureValue'),
+    0x1003 => TagEntry.new('BrightnessValue'),
+    0x1004 => TagEntry.new('FlashMode'),
+    0x1004 => TagEntry.new('FlashMode',
        {2 => 'On',
         3 => 'Off'}),
-    0x1005 => TagName.new('FlashDevice',
+    0x1005 => TagEntry.new('FlashDevice',
        {0 => 'None',
         1 => 'Internal',
         4 => 'External',
         5 => 'Internal + External'}),
-    0x1006 => TagName.new('ExposureCompensation'),
-    0x1007 => TagName.new('SensorTemperature'),
-    0x1008 => TagName.new('LensTemperature'),
-    0x100b => TagName.new('FocusMode',
+    0x1006 => TagEntry.new('ExposureCompensation'),
+    0x1007 => TagEntry.new('SensorTemperature'),
+    0x1008 => TagEntry.new('LensTemperature'),
+    0x100b => TagEntry.new('FocusMode',
        {0 => 'Auto',
         1 => 'Manual'}),
-    0x1017 => TagName.new('RedBalance'),
-    0x1018 => TagName.new('BlueBalance'),
-    0x101a => TagName.new('SerialNumber'),
-    0x1023 => TagName.new('FlashExposureComp'),
-    0x1026 => TagName.new('ExternalFlashBounce',
+    0x1017 => TagEntry.new('RedBalance'),
+    0x1018 => TagEntry.new('BlueBalance'),
+    0x101a => TagEntry.new('SerialNumber'),
+    0x1023 => TagEntry.new('FlashExposureComp'),
+    0x1026 => TagEntry.new('ExternalFlashBounce',
        {0 => 'No',
         1 => 'Yes'}),
-    0x1027 => TagName.new('ExternalFlashZoom'),
-    0x1028 => TagName.new('ExternalFlashMode'),
-    0x1029 => TagName.new('Contrast 	int16u',
+    0x1027 => TagEntry.new('ExternalFlashZoom'),
+    0x1028 => TagEntry.new('ExternalFlashMode'),
+    0x1029 => TagEntry.new('Contrast 	int16u',
        {0 => 'High',
         1 => 'Normal',
         2 => 'Low'}),
-    0x102a => TagName.new('SharpnessFactor'),
-    0x102b => TagName.new('ColorControl'),
-    0x102c => TagName.new('ValidBits'),
-    0x102d => TagName.new('CoringFilter'),
-    0x102e => TagName.new('OlympusImageWidth'),
-    0x102f => TagName.new('OlympusImageHeight'),
-    0x1034 => TagName.new('CompressionRatio'),
-    0x1035 => TagName.new('PreviewImageValid',
+    0x102a => TagEntry.new('SharpnessFactor'),
+    0x102b => TagEntry.new('ColorControl'),
+    0x102c => TagEntry.new('ValidBits'),
+    0x102d => TagEntry.new('CoringFilter'),
+    0x102e => TagEntry.new('OlympusImageWidth'),
+    0x102f => TagEntry.new('OlympusImageHeight'),
+    0x1034 => TagEntry.new('CompressionRatio'),
+    0x1035 => TagEntry.new('PreviewImageValid',
        {0 => 'No',
         1 => 'Yes'}),
-    0x1036 => TagName.new('PreviewImageStart'),
-    0x1037 => TagName.new('PreviewImageLength'),
-    0x1039 => TagName.new('CCDScanMode',
+    0x1036 => TagEntry.new('PreviewImageStart'),
+    0x1037 => TagEntry.new('PreviewImageLength'),
+    0x1039 => TagEntry.new('CCDScanMode',
        {0 => 'Interlaced',
         1 => 'Progressive'}),
-    0x103a => TagName.new('NoiseReduction',
+    0x103a => TagEntry.new('NoiseReduction',
        {0 => 'Off',
         1 => 'On'}),
-    0x103b => TagName.new('InfinityLensStep'),
-    0x103c => TagName.new('NearLensStep'),
+    0x103b => TagEntry.new('InfinityLensStep'),
+    0x103c => TagEntry.new('NearLensStep'),
 
     # TODO - these need extra definitions
     # http =>//search.cpan.org/src/EXIFTOOL/Image-ExifTool-6.90/html/TagNames/Olympus.html
-    0x2010 => TagName.new('Equipment'),
-    0x2020 => TagName.new('CameraSettings'),
-    0x2030 => TagName.new('RawDevelopment'),
-    0x2040 => TagName.new('ImageProcessing'),
-    0x2050 => TagName.new('FocusInfo'),
-    0x3000 => TagName.new('RawInfo '),
+    0x2010 => TagEntry.new('Equipment'),
+    0x2020 => TagEntry.new('CameraSettings'),
+    0x2030 => TagEntry.new('RawDevelopment'),
+    0x2040 => TagEntry.new('ImageProcessing'),
+    0x2050 => TagEntry.new('FocusInfo'),
+    0x3000 => TagEntry.new('RawInfo '),
     }
 
 # 0x2020 CameraSettings
 MAKERNOTE_OLYMPUS_TAG_0x2020={
-    0x0100 => TagName.new('PreviewImageValid',
+    0x0100 => TagEntry.new('PreviewImageValid',
              {0 => 'No',
               1 => 'Yes'}),
-    0x0101 => TagName.new('PreviewImageStart'),
-    0x0102 => TagName.new('PreviewImageLength'),
-    0x0200 => TagName.new('ExposureMode',
+    0x0101 => TagEntry.new('PreviewImageStart'),
+    0x0102 => TagEntry.new('PreviewImageLength'),
+    0x0200 => TagEntry.new('ExposureMode',
              {1 => 'Manual',
               2 => 'Program',
               3 => 'Aperture-priority AE',
               4 => 'Shutter speed priority AE',
               5 => 'Program-shift'}),
-    0x0201 => TagName.new('AELock',
+    0x0201 => TagEntry.new('AELock',
              {0 => 'Off',
               1 => 'On'}),
-    0x0202 => TagName.new('MeteringMode',
+    0x0202 => TagEntry.new('MeteringMode',
              {2 => 'Center Weighted',
               3 => 'Spot',
               5 => 'ESP',
               261 => 'Pattern+AF',
               515 => 'Spot+Highlight control',
               1027 => 'Spot+Shadow control'}),
-    0x0300 => TagName.new('MacroMode',
+    0x0300 => TagEntry.new('MacroMode',
              {0 => 'Off',
               1 => 'On'}),
-    0x0301 => TagName.new('FocusMode',
+    0x0301 => TagEntry.new('FocusMode',
              {0 => 'Single AF',
               1 => 'Sequential shooting AF',
               2 => 'Continuous AF',
               3 => 'Multi AF',
               10 => 'MF'}),
-    0x0302 => TagName.new('FocusProcess',
+    0x0302 => TagEntry.new('FocusProcess',
              {0 => 'AF Not Used',
               1 => 'AF Used'}),
-    0x0303 => TagName.new('AFSearch',
+    0x0303 => TagEntry.new('AFSearch',
              {0 => 'Not Ready',
               1 => 'Ready'}),
-    0x0304 => TagName.new('AFAreas'),
-    0x0401 => TagName.new('FlashExposureCompensation'),
-    0x0500 => TagName.new('WhiteBalance2',
+    0x0304 => TagEntry.new('AFAreas'),
+    0x0401 => TagEntry.new('FlashExposureCompensation'),
+    0x0500 => TagEntry.new('WhiteBalance2',
              {0 => 'Auto',
              16 => '7500K (Fine Weather with Shade)',
              17 => '6000K (Cloudy)',
@@ -552,22 +552,22 @@ MAKERNOTE_OLYMPUS_TAG_0x2020={
              512 => 'Custom WB 5400K',
              513 => 'Custom WB 2900K',
              514 => 'Custom WB 8000K', }),
-    0x0501 => TagName.new('WhiteBalanceTemperature'),
-    0x0502 => TagName.new('WhiteBalanceBracket'),
-    0x0503 => TagName.new('CustomSaturation'), # (3 numbers => 1. CS Value, 2. Min, 3. Max)
-    0x0504 => TagName.new('ModifiedSaturation',
+    0x0501 => TagEntry.new('WhiteBalanceTemperature'),
+    0x0502 => TagEntry.new('WhiteBalanceBracket'),
+    0x0503 => TagEntry.new('CustomSaturation'), # (3 numbers => 1. CS Value, 2. Min, 3. Max)
+    0x0504 => TagEntry.new('ModifiedSaturation',
              {0 => 'Off',
               1 => 'CM1 (Red Enhance)',
               2 => 'CM2 (Green Enhance)',
               3 => 'CM3 (Blue Enhance)',
               4 => 'CM4 (Skin Tones)'}),
-    0x0505 => TagName.new('ContrastSetting'), # (3 numbers => 1. Contrast, 2. Min, 3. Max)
-    0x0506 => TagName.new('SharpnessSetting'), # (3 numbers => 1. Sharpness, 2. Min, 3. Max)
-    0x0507 => TagName.new('ColorSpace',
+    0x0505 => TagEntry.new('ContrastSetting'), # (3 numbers => 1. Contrast, 2. Min, 3. Max)
+    0x0506 => TagEntry.new('SharpnessSetting'), # (3 numbers => 1. Sharpness, 2. Min, 3. Max)
+    0x0507 => TagEntry.new('ColorSpace',
              {0 => 'sRGB',
               1 => 'Adobe RGB',
               2 => 'Pro Photo RGB'}),
-    0x0509 => TagName.new('SceneMode',
+    0x0509 => TagEntry.new('SceneMode',
              {0 => 'Standard',
               6 => 'Auto',
               7 => 'Sport',
@@ -593,105 +593,105 @@ MAKERNOTE_OLYMPUS_TAG_0x2020={
              45 => 'Low Key',
              46 => 'Children',
              48 => 'Nature Macro'}),
-    0x050a => TagName.new('NoiseReduction',
+    0x050a => TagEntry.new('NoiseReduction',
              {0 => 'Off',
               1 => 'Noise Reduction',
               2 => 'Noise Filter',
               3 => 'Noise Reduction + Noise Filter',
               4 => 'Noise Filter (ISO Boost)',
               5 => 'Noise Reduction + Noise Filter (ISO Boost)'}),
-    0x050b => TagName.new('DistortionCorrection',
+    0x050b => TagEntry.new('DistortionCorrection',
              {0 => 'Off',
               1 => 'On'}),
-    0x050c => TagName.new('ShadingCompensation',
+    0x050c => TagEntry.new('ShadingCompensation',
              {0 => 'Off',
               1 => 'On'}),
-    0x050d => TagName.new('CompressionFactor'),
-    0x050f => TagName.new('Gradation',
+    0x050d => TagEntry.new('CompressionFactor'),
+    0x050f => TagEntry.new('Gradation',
              {'-1 -1 1' => 'Low Key',
               '0 -1 1' => 'Normal',
               '1 -1 1' => 'High Key'}),
-    0x0520 => TagName.new('PictureMode',
+    0x0520 => TagEntry.new('PictureMode',
              {1 => 'Vivid',
               2 => 'Natural',
               3 => 'Muted',
               256 => 'Monotone',
               512 => 'Sepia'}),
-    0x0521 => TagName.new('PictureModeSaturation'),
-    0x0522 => TagName.new('PictureModeHue?'),
-    0x0523 => TagName.new('PictureModeContrast'),
-    0x0524 => TagName.new('PictureModeSharpness'),
-    0x0525 => TagName.new('PictureModeBWFilter',
+    0x0521 => TagEntry.new('PictureModeSaturation'),
+    0x0522 => TagEntry.new('PictureModeHue?'),
+    0x0523 => TagEntry.new('PictureModeContrast'),
+    0x0524 => TagEntry.new('PictureModeSharpness'),
+    0x0525 => TagEntry.new('PictureModeBWFilter',
              {0 => 'n/a',
               1 => 'Neutral',
               2 => 'Yellow',
               3 => 'Orange',
               4 => 'Red',
               5 => 'Green'}),
-    0x0526 => TagName.new('PictureModeTone',
+    0x0526 => TagEntry.new('PictureModeTone',
              {0 => 'n/a',
               1 => 'Neutral',
               2 => 'Sepia',
               3 => 'Blue',
               4 => 'Purple',
               5 => 'Green'}),
-    0x0600 => TagName.new('Sequence'), # 2 or 3 numbers => 1. Mode, 2. Shot number, 3. Mode bits
-    0x0601 => TagName.new('PanoramaMode'), # (2 numbers => 1. Mode, 2. Shot number)
-    0x0603 => TagName.new('ImageQuality2',
+    0x0600 => TagEntry.new('Sequence'), # 2 or 3 numbers => 1. Mode, 2. Shot number, 3. Mode bits
+    0x0601 => TagEntry.new('PanoramaMode'), # (2 numbers => 1. Mode, 2. Shot number)
+    0x0603 => TagEntry.new('ImageQuality2',
              {1 => 'SQ',
               2 => 'HQ',
               3 => 'SHQ',
               4 => 'RAW'}),
-    0x0901 => TagName.new('ManometerReading')
+    0x0901 => TagEntry.new('ManometerReading')
     }
 
 
 MAKERNOTE_CASIO_TAGS={
-    0x0001 => TagName.new('RecordingMode',
+    0x0001 => TagEntry.new('RecordingMode',
              {1 => 'Single Shutter',
               2 => 'Panorama',
               3 => 'Night Scene',
               4 => 'Portrait',
               5 => 'Landscape'}),
-    0x0002 => TagName.new('Quality',
+    0x0002 => TagEntry.new('Quality',
              {1 => 'Economy',
               2 => 'Normal',
               3 => 'Fine'}),
-    0x0003 => TagName.new('FocusingMode',
+    0x0003 => TagEntry.new('FocusingMode',
              {2 => 'Macro',
               3 => 'Auto Focus',
               4 => 'Manual Focus',
               5 => 'Infinity'}),
-    0x0004 => TagName.new('FlashMode',
+    0x0004 => TagEntry.new('FlashMode',
              {1 => 'Auto',
               2 => 'On',
               3 => 'Off',
               4 => 'Red Eye Reduction'}),
-    0x0005 => TagName.new('FlashIntensity',
+    0x0005 => TagEntry.new('FlashIntensity',
              {11 => 'Weak',
               13 => 'Normal',
               15 => 'Strong'}),
-    0x0006 => TagName.new('Object Distance'),
-    0x0007 => TagName.new('WhiteBalance',
+    0x0006 => TagEntry.new('Object Distance'),
+    0x0007 => TagEntry.new('WhiteBalance',
              {1 => 'Auto',
               2 => 'Tungsten',
               3 => 'Daylight',
               4 => 'Fluorescent',
               5 => 'Shade',
               129 => 'Manual'}),
-    0x000B => TagName.new('Sharpness',
+    0x000B => TagEntry.new('Sharpness',
              {0 => 'Normal',
               1 => 'Soft',
               2 => 'Hard'}),
-    0x000C => TagName.new('Contrast',
+    0x000C => TagEntry.new('Contrast',
              {0 => 'Normal',
               1 => 'Low',
               2 => 'High'}),
-    0x000D => TagName.new('Saturation',
+    0x000D => TagEntry.new('Saturation',
              {0 => 'Normal',
               1 => 'Low',
               2 => 'High'}),
-    0x0014 => TagName.new('CCDSpeed',
+    0x0014 => TagEntry.new('CCDSpeed',
              {64 => 'Normal',
               80 => 'Normal',
               100 => 'High',
@@ -701,15 +701,15 @@ MAKERNOTE_CASIO_TAGS={
     }
 
 MAKERNOTE_FUJIFILM_TAGS={
-    0x0000 => TagName.new('NoteVersion', self.method(:ascii_bytes_to_filtered_string)),
-    0x1000 => TagName.new('Quality'),
-    0x1001 => TagName.new('Sharpness',
+    0x0000 => TagEntry.new('NoteVersion', self.method(:ascii_bytes_to_filtered_string)),
+    0x1000 => TagEntry.new('Quality'),
+    0x1001 => TagEntry.new('Sharpness',
              {1 => 'Soft',
               2 => 'Soft',
               3 => 'Normal',
               4 => 'Hard',
               5 => 'Hard'}),
-    0x1002 => TagName.new('WhiteBalance',
+    0x1002 => TagEntry.new('WhiteBalance',
              {0 => 'Auto',
               256 => 'Daylight',
               512 => 'Cloudy',
@@ -718,30 +718,30 @@ MAKERNOTE_FUJIFILM_TAGS={
               770 => 'White-Fluorescent',
               1024 => 'Incandescent',
               3840 => 'Custom'}),
-    0x1003 => TagName.new('Color',
+    0x1003 => TagEntry.new('Color',
              {0 => 'Normal',
               256 => 'High',
               512 => 'Low'}),
-    0x1004 => TagName.new('Tone',
+    0x1004 => TagEntry.new('Tone',
              {0 => 'Normal',
               256 => 'High',
               512 => 'Low'}),
-    0x1010 => TagName.new('FlashMode',
+    0x1010 => TagEntry.new('FlashMode',
              {0 => 'Auto',
               1 => 'On',
               2 => 'Off',
               3 => 'Red Eye Reduction'}),
-    0x1011 => TagName.new('FlashStrength'),
-    0x1020 => TagName.new('Macro',
+    0x1011 => TagEntry.new('FlashStrength'),
+    0x1020 => TagEntry.new('Macro',
              {0 => 'Off',
               1 => 'On'}),
-    0x1021 => TagName.new('FocusMode',
+    0x1021 => TagEntry.new('FocusMode',
              {0 => 'Auto',
               1 => 'Manual'}),
-    0x1030 => TagName.new('SlowSync',
+    0x1030 => TagEntry.new('SlowSync',
              {0 => 'Off',
               1 => 'On'}),
-    0x1031 => TagName.new('PictureMode',
+    0x1031 => TagEntry.new('PictureMode',
              {0 => 'Auto',
               1 => 'Portrait',
               2 => 'Landscape',
@@ -751,38 +751,38 @@ MAKERNOTE_FUJIFILM_TAGS={
               256 => 'Aperture Priority AE',
               512 => 'Shutter Priority AE',
               768 => 'Manual Exposure'}),
-    0x1100 => TagName.new('MotorOrBracket',
+    0x1100 => TagEntry.new('MotorOrBracket',
              {0 => 'Off',
               1 => 'On'}),
-    0x1300 => TagName.new('BlurWarning',
+    0x1300 => TagEntry.new('BlurWarning',
              {0 => 'Off',
               1 => 'On'}),
-    0x1301 => TagName.new('FocusWarning',
+    0x1301 => TagEntry.new('FocusWarning',
              {0 => 'Off',
               1 => 'On'}),
-    0x1302 => TagName.new('AEWarning',
+    0x1302 => TagEntry.new('AEWarning',
              {0 => 'Off',
               1 => 'On'})
     }
 
 MAKERNOTE_CANON_TAGS = {
-    0x0006 => TagName.new('ImageType'),
-    0x0007 => TagName.new('FirmwareVersion'),
-    0x0008 => TagName.new('ImageNumber'),
-    0x0009 => TagName.new('OwnerName')
+    0x0006 => TagEntry.new('ImageType'),
+    0x0007 => TagEntry.new('FirmwareVersion'),
+    0x0008 => TagEntry.new('ImageNumber'),
+    0x0009 => TagEntry.new('OwnerName')
     }
 
 # this is in element offset, name, optional value dictionary format
 MAKERNOTE_CANON_TAG_0x001 = {
-    1 => TagName.new('Macromode',
+    1 => TagEntry.new('Macromode',
         {1 => 'Macro',
          2 => 'Normal'}),
-    2 => TagName.new('SelfTimer'),
-    3 => TagName.new('Quality',
+    2 => TagEntry.new('SelfTimer'),
+    3 => TagEntry.new('Quality',
         {2 => 'Normal',
          3 => 'Fine',
          5 => 'Superfine'}),
-    4 => TagName.new('FlashMode',
+    4 => TagEntry.new('FlashMode',
         {0 => 'Flash Not Fired',
          1 => 'Auto',
          2 => 'On',
@@ -791,10 +791,10 @@ MAKERNOTE_CANON_TAG_0x001 = {
          5 => 'Auto + Red-Eye Reduction',
          6 => 'On + Red-Eye Reduction',
          16 => 'external flash'}),
-    5 => TagName.new('ContinuousDriveMode',
+    5 => TagEntry.new('ContinuousDriveMode',
         {0 => 'Single Or Timer',
          1 => 'Continuous'}),
-    7 => TagName.new('FocusMode',
+    7 => TagEntry.new('FocusMode',
         {0 => 'One-Shot',
          1 => 'AI Servo',
          2 => 'AI Focus',
@@ -802,11 +802,11 @@ MAKERNOTE_CANON_TAG_0x001 = {
          4 => 'Single',
          5 => 'Continuous',
          6 => 'MF'}),
-    10 => TagName.new('ImageSize',
+    10 => TagEntry.new('ImageSize',
          {0 => 'Large',
           1 => 'Medium',
           2 => 'Small'}),
-    11 => TagName.new('EasyShootingMode',
+    11 => TagEntry.new('EasyShootingMode',
          {0 => 'Full Auto',
           1 => 'Manual',
           2 => 'Landscape',
@@ -819,70 +819,70 @@ MAKERNOTE_CANON_TAG_0x001 = {
           9 => 'Sports',
           10 => 'Macro/Close-Up',
           11 => 'Pan Focus'}),
-    12 => TagName.new('DigitalZoom',
+    12 => TagEntry.new('DigitalZoom',
          {0 => 'None',
           1 => '2x',
           2 => '4x'}),
-    13 => TagName.new('Contrast',
+    13 => TagEntry.new('Contrast',
          {0xFFFF => 'Low',
           0 => 'Normal',
           1 => 'High'}),
-    14 => TagName.new('Saturation',
+    14 => TagEntry.new('Saturation',
          {0xFFFF => 'Low',
           0 => 'Normal',
           1 => 'High'}),
-    15 => TagName.new('Sharpness',
+    15 => TagEntry.new('Sharpness',
          {0xFFFF => 'Low',
           0 => 'Normal',
           1 => 'High'}),
-    16 => TagName.new('ISO',
+    16 => TagEntry.new('ISO',
          {0 => 'See ISOSpeedRatings Tag',
           15 => 'Auto',
           16 => '50',
           17 => '100',
           18 => '200',
           19 => '400'}),
-    17 => TagName.new('MeteringMode',
+    17 => TagEntry.new('MeteringMode',
          {3 => 'Evaluative',
           4 => 'Partial',
           5 => 'Center-weighted'}),
-    18 => TagName.new('FocusType',
+    18 => TagEntry.new('FocusType',
          {0 => 'Manual',
           1 => 'Auto',
           3 => 'Close-Up (Macro)',
           8 => 'Locked (Pan Mode)'}),
-    19 => TagName.new('AFPointSelected',
+    19 => TagEntry.new('AFPointSelected',
          {0x3000 => 'None (MF)',
           0x3001 => 'Auto-Selected',
           0x3002 => 'Right',
           0x3003 => 'Center',
           0x3004 => 'Left'}),
-    20 => TagName.new('ExposureMode',
+    20 => TagEntry.new('ExposureMode',
          {0 => 'Easy Shooting',
           1 => 'Program',
           2 => 'Tv-priority',
           3 => 'Av-priority',
           4 => 'Manual',
           5 => 'A-DEP'}),
-    23 => TagName.new('LongFocalLengthOfLensInFocalUnits'),
-    24 => TagName.new('ShortFocalLengthOfLensInFocalUnits'),
-    25 => TagName.new('FocalUnitsPerMM'),
-    28 => TagName.new('FlashActivity',
+    23 => TagEntry.new('LongFocalLengthOfLensInFocalUnits'),
+    24 => TagEntry.new('ShortFocalLengthOfLensInFocalUnits'),
+    25 => TagEntry.new('FocalUnitsPerMM'),
+    28 => TagEntry.new('FlashActivity',
          {0 => 'Did Not Fire',
           1 => 'Fired'}),
-    29 => TagName.new('FlashDetails',
+    29 => TagEntry.new('FlashDetails',
          {14 => 'External E-TTL',
           13 => 'Internal Flash',
           11 => 'FP Sync Used',
           7 => '2nd("Rear")-Curtain Sync Used',
           4 => 'FP Sync Enabled'}),
-    32 => TagName.new('FocusMode',
+    32 => TagEntry.new('FocusMode',
          {0 => 'Single',
           1 => 'Continuous'})
     }
 
 MAKERNOTE_CANON_TAG_0x004 = {
-    7 => TagName.new('WhiteBalance',
+    7 => TagEntry.new('WhiteBalance',
         {0 => 'Auto',
          1 => 'Sunny',
          2 => 'Cloudy',
@@ -890,9 +890,9 @@ MAKERNOTE_CANON_TAG_0x004 = {
          4 => 'Fluorescent',
          5 => 'Flash',
          6 => 'Custom'}),
-    9 => TagName.new('SequenceNumber'),
-    14 => TagName.new('AFPointUsed'),
-    15 => TagName.new('FlashBias',
+    9 => TagEntry.new('SequenceNumber'),
+    14 => TagEntry.new('AFPointUsed'),
+    15 => TagEntry.new('FlashBias',
          {0xFFC0 => '-2 EV',
           0xFFCC => '-1.67 EV',
           0xFFD0 => '-1.50 EV',
@@ -910,62 +910,62 @@ MAKERNOTE_CANON_TAG_0x004 = {
           0x0030 => '1.50 EV',
           0x0034 => '1.67 EV',
           0x0040 => '2 EV'}),
-    19 => TagName.new('SubjectDistance')
+    19 => TagEntry.new('SubjectDistance')
     }
 
 # Nikon E99x MakerNote Tags
 MAKERNOTE_NIKON_NEWER_TAGS={
-    0x0001 => TagName.new('MakernoteVersion', self.method(:ascii_bytes_to_filtered_string)),	# Sometimes binary
-    0x0002 => TagName.new('ISOSetting', self.method(:ascii_bytes_to_filtered_string)),
-    0x0003 => TagName.new('ColorMode'),
-    0x0004 => TagName.new('Quality'),
-    0x0005 => TagName.new('Whitebalance'),
-    0x0006 => TagName.new('ImageSharpening'),
-    0x0007 => TagName.new('FocusMode'),
-    0x0008 => TagName.new('FlashSetting'),
-    0x0009 => TagName.new('AutoFlashMode'),
-    0x000B => TagName.new('WhiteBalanceBias'),
-    0x000C => TagName.new('WhiteBalanceRBCoeff'),
-    0x000D => TagName.new('ProgramShift', self.method(:nikon_ev_bias)),
+    0x0001 => TagEntry.new('MakernoteVersion', self.method(:ascii_bytes_to_filtered_string)),	# Sometimes binary
+    0x0002 => TagEntry.new('ISOSetting', self.method(:ascii_bytes_to_filtered_string)),
+    0x0003 => TagEntry.new('ColorMode'),
+    0x0004 => TagEntry.new('Quality'),
+    0x0005 => TagEntry.new('Whitebalance'),
+    0x0006 => TagEntry.new('ImageSharpening'),
+    0x0007 => TagEntry.new('FocusMode'),
+    0x0008 => TagEntry.new('FlashSetting'),
+    0x0009 => TagEntry.new('AutoFlashMode'),
+    0x000B => TagEntry.new('WhiteBalanceBias'),
+    0x000C => TagEntry.new('WhiteBalanceRBCoeff'),
+    0x000D => TagEntry.new('ProgramShift', self.method(:nikon_ev_bias)),
     # Nearly the same as the other EV vals, but step size is 1/12 EV (?)
-    0x000E => TagName.new('ExposureDifference', self.method(:nikon_ev_bias)),
-    0x000F => TagName.new('ISOSelection'),
-    0x0011 => TagName.new('NikonPreview'),
-    0x0012 => TagName.new('FlashCompensation', self.method(:nikon_ev_bias)),
-    0x0013 => TagName.new('ISOSpeedRequested'),
-    0x0016 => TagName.new('PhotoCornerCoordinates'),
-    0x0018 => TagName.new('FlashBracketCompensationApplied', self.method(:nikon_ev_bias)),
-    0x0019 => TagName.new('AEBracketCompensationApplied'),
-    0x001A => TagName.new('ImageProcessing'),
-    0x001B => TagName.new('CropHiSpeed'),
-    0x001D => TagName.new('SerialNumber'),	# Conflict with 0x00A0 ?
-    0x001E => TagName.new('ColorSpace'),
-    0x001F => TagName.new('VRInfo'),
-    0x0020 => TagName.new('ImageAuthentication'),
-    0x0022 => TagName.new('ActiveDLighting'),
-    0x0023 => TagName.new('PictureControl'),
-    0x0024 => TagName.new('WorldTime'),
-    0x0025 => TagName.new('ISOInfo'),
-    0x0080 => TagName.new('ImageAdjustment'),
-    0x0081 => TagName.new('ToneCompensation'),
-    0x0082 => TagName.new('AuxiliaryLens'),
-    0x0083 => TagName.new('LensType'),
-    0x0084 => TagName.new('LensMinMaxFocalMaxAperture'),
-    0x0085 => TagName.new('ManualFocusDistance'),
-    0x0086 => TagName.new('DigitalZoomFactor'),
-    0x0087 => TagName.new('FlashMode',
+    0x000E => TagEntry.new('ExposureDifference', self.method(:nikon_ev_bias)),
+    0x000F => TagEntry.new('ISOSelection'),
+    0x0011 => TagEntry.new('NikonPreview'),
+    0x0012 => TagEntry.new('FlashCompensation', self.method(:nikon_ev_bias)),
+    0x0013 => TagEntry.new('ISOSpeedRequested'),
+    0x0016 => TagEntry.new('PhotoCornerCoordinates'),
+    0x0018 => TagEntry.new('FlashBracketCompensationApplied', self.method(:nikon_ev_bias)),
+    0x0019 => TagEntry.new('AEBracketCompensationApplied'),
+    0x001A => TagEntry.new('ImageProcessing'),
+    0x001B => TagEntry.new('CropHiSpeed'),
+    0x001D => TagEntry.new('SerialNumber'),	# Conflict with 0x00A0 ?
+    0x001E => TagEntry.new('ColorSpace'),
+    0x001F => TagEntry.new('VRInfo'),
+    0x0020 => TagEntry.new('ImageAuthentication'),
+    0x0022 => TagEntry.new('ActiveDLighting'),
+    0x0023 => TagEntry.new('PictureControl'),
+    0x0024 => TagEntry.new('WorldTime'),
+    0x0025 => TagEntry.new('ISOInfo'),
+    0x0080 => TagEntry.new('ImageAdjustment'),
+    0x0081 => TagEntry.new('ToneCompensation'),
+    0x0082 => TagEntry.new('AuxiliaryLens'),
+    0x0083 => TagEntry.new('LensType'),
+    0x0084 => TagEntry.new('LensMinMaxFocalMaxAperture'),
+    0x0085 => TagEntry.new('ManualFocusDistance'),
+    0x0086 => TagEntry.new('DigitalZoomFactor'),
+    0x0087 => TagEntry.new('FlashMode',
              {0x00 => 'Did Not Fire',
               0x01 => 'Fired, Manual',
               0x07 => 'Fired, External',
               0x08 => 'Fired, Commander Mode ',
               0x09 => 'Fired, TTL Mode'}),
-    0x0088 => TagName.new('AFFocusPosition',
+    0x0088 => TagEntry.new('AFFocusPosition',
              {0x0000 => 'Center',
               0x0100 => 'Top',
               0x0200 => 'Bottom',
               0x0300 => 'Left',
               0x0400 => 'Right'}),
-    0x0089 => TagName.new('BracketingMode',
+    0x0089 => TagEntry.new('BracketingMode',
              {0x00 => 'Single frame, no bracketing',
               0x01 => 'Continuous, no bracketing',
               0x02 => 'Timer, no bracketing',
@@ -975,53 +975,53 @@ MAKERNOTE_NIKON_NEWER_TAGS={
               0x40 => 'Single frame, white balance bracketing',
               0x41 => 'Continuous, white balance bracketing',
               0x42 => 'Timer, white balance bracketing'}),
-    0x008A => TagName.new('AutoBracketRelease'),
-    0x008B => TagName.new('LensFStops'),
-    0x008C => TagName.new('NEFCurve1'),	# ExifTool calls this 'ContrastCurve'
-    0x008D => TagName.new('ColorMode'),
-    0x008F => TagName.new('SceneMode'),
-    0x0090 => TagName.new('LightingType'),
-    0x0091 => TagName.new('ShotInfo'),	# First 4 bytes are a version number in ASCII
-    0x0092 => TagName.new('HueAdjustment'),
+    0x008A => TagEntry.new('AutoBracketRelease'),
+    0x008B => TagEntry.new('LensFStops'),
+    0x008C => TagEntry.new('NEFCurve1'),	# ExifTool calls this 'ContrastCurve'
+    0x008D => TagEntry.new('ColorMode'),
+    0x008F => TagEntry.new('SceneMode'),
+    0x0090 => TagEntry.new('LightingType'),
+    0x0091 => TagEntry.new('ShotInfo'),	# First 4 bytes are a version number in ASCII
+    0x0092 => TagEntry.new('HueAdjustment'),
     # ExifTool calls this 'NEFCompression', should be 1-4
-    0x0093 => TagName.new('Compression'),
-    0x0094 => TagName.new('Saturation',
+    0x0093 => TagEntry.new('Compression'),
+    0x0094 => TagEntry.new('Saturation',
              {-3 => 'B&W',
               -2 => '-2',
               -1 => '-1',
               0 => '0',
               1 => '1',
               2 => '2'}),
-    0x0095 => TagName.new('NoiseReduction'),
-    0x0096 => TagName.new('NEFCurve2'),	# ExifTool calls this 'LinearizationTable'
-    0x0097 => TagName.new('ColorBalance'),	# First 4 bytes are a version number in ASCII
-    0x0098 => TagName.new('LensData'),	# First 4 bytes are a version number in ASCII
-    0x0099 => TagName.new('RawImageCenter'),
-    0x009A => TagName.new('SensorPixelSize'),
-    0x009C => TagName.new('Scene Assist'),
-    0x009E => TagName.new('RetouchHistory'),
-    0x00A0 => TagName.new('SerialNumber'),
-    0x00A2 => TagName.new('ImageDataSize'),
+    0x0095 => TagEntry.new('NoiseReduction'),
+    0x0096 => TagEntry.new('NEFCurve2'),	# ExifTool calls this 'LinearizationTable'
+    0x0097 => TagEntry.new('ColorBalance'),	# First 4 bytes are a version number in ASCII
+    0x0098 => TagEntry.new('LensData'),	# First 4 bytes are a version number in ASCII
+    0x0099 => TagEntry.new('RawImageCenter'),
+    0x009A => TagEntry.new('SensorPixelSize'),
+    0x009C => TagEntry.new('Scene Assist'),
+    0x009E => TagEntry.new('RetouchHistory'),
+    0x00A0 => TagEntry.new('SerialNumber'),
+    0x00A2 => TagEntry.new('ImageDataSize'),
     # 00A3 => unknown - a single byte 0
     # 00A4 => In NEF, looks like a 4 byte ASCII version number ('0200')
-    0x00A5 => TagName.new('ImageCount'),
-    0x00A6 => TagName.new('DeletedImageCount'),
-    0x00A7 => TagName.new('TotalShutterReleases'),
+    0x00A5 => TagEntry.new('ImageCount'),
+    0x00A6 => TagEntry.new('DeletedImageCount'),
+    0x00A7 => TagEntry.new('TotalShutterReleases'),
     # First 4 bytes are a version number in ASCII, with version specific
     # info to follow.  Its hard to treat it as a string due to embedded nulls.
-    0x00A8 => TagName.new('FlashInfo'),
-    0x00A9 => TagName.new('ImageOptimization'),
-    0x00AA => TagName.new('Saturation'),
-    0x00AB => TagName.new('DigitalVariProgram'),
-    0x00AC => TagName.new('ImageStabilization'),
-    0x00AD => TagName.new('Responsive AF'),	# 'AFResponse'
-    0x00B0 => TagName.new('MultiExposure'),
-    0x00B1 => TagName.new('HighISONoiseReduction'),
-    0x00B7 => TagName.new('AFInfo'),
-    0x00B8 => TagName.new('FileInfo'),
+    0x00A8 => TagEntry.new('FlashInfo'),
+    0x00A9 => TagEntry.new('ImageOptimization'),
+    0x00AA => TagEntry.new('Saturation'),
+    0x00AB => TagEntry.new('DigitalVariProgram'),
+    0x00AC => TagEntry.new('ImageStabilization'),
+    0x00AD => TagEntry.new('Responsive AF'),	# 'AFResponse'
+    0x00B0 => TagEntry.new('MultiExposure'),
+    0x00B1 => TagEntry.new('HighISONoiseReduction'),
+    0x00B7 => TagEntry.new('AFInfo'),
+    0x00B8 => TagEntry.new('FileInfo'),
     # 00B9 => unknown
-    0x0100 => TagName.new('DigitalICE'),
-    0x0103 => TagName.new('PreviewCompression',
+    0x0100 => TagEntry.new('DigitalICE'),
+    0x0103 => TagEntry.new('PreviewCompression',
              {1 => 'Uncompressed',
               2 => 'CCITT 1D',
               3 => 'T4/Group 3 Fax',
@@ -1052,37 +1052,37 @@ MAKERNOTE_NIKON_NEWER_TAGS={
               34713 => 'Nikon NEF Compressed',
               65000 => 'Kodak DCR Compressed',
               65535 => 'Pentax PEF Compressed',}),
-    0x0201 => TagName.new('PreviewImageStart'),
-    0x0202 => TagName.new('PreviewImageLength'),
-    0x0213 => TagName.new('PreviewYCbCrPositioning',
+    0x0201 => TagEntry.new('PreviewImageStart'),
+    0x0202 => TagEntry.new('PreviewImageLength'),
+    0x0213 => TagEntry.new('PreviewYCbCrPositioning',
              {1 => 'Centered',
               2 => 'Co-sited'}), 
-    0x0010 => TagName.new('DataDump'),
+    0x0010 => TagEntry.new('DataDump'),
     }
 
 MAKERNOTE_NIKON_OLDER_TAGS = {
-    0x0003 => TagName.new('Quality',
+    0x0003 => TagEntry.new('Quality',
              {1 => 'VGA Basic',
               2 => 'VGA Normal',
               3 => 'VGA Fine',
               4 => 'SXGA Basic',
               5 => 'SXGA Normal',
               6 => 'SXGA Fine'}),
-    0x0004 => TagName.new('ColorMode',
+    0x0004 => TagEntry.new('ColorMode',
              {1 => 'Color',
               2 => 'Monochrome'}),
-    0x0005 => TagName.new('ImageAdjustment',
+    0x0005 => TagEntry.new('ImageAdjustment',
              {0 => 'Normal',
               1 => 'Bright+',
               2 => 'Bright-',
               3 => 'Contrast+',
               4 => 'Contrast-'}),
-    0x0006 => TagName.new('CCDSpeed',
+    0x0006 => TagEntry.new('CCDSpeed',
              {0 => 'ISO 80',
               2 => 'ISO 160',
               4 => 'ISO 320',
               5 => 'ISO 100'}),
-    0x0007 => TagName.new('WhiteBalance',
+    0x0007 => TagEntry.new('WhiteBalance',
              {0 => 'Auto',
               1 => 'Preset',
               2 => 'Daylight',