Add swap-byte-order.sh to test libexif's byte order conversion function.

This is accomplished by adding a feature to test-parse.c to switch the
byte order before dumping the EXIF output. Additionally, the MakerNote
values are now logged in the dump as well, in the same way as the
regular tags, to better catch regressions.

This new test uncovered a bug in the decoding of the
MNOTE_NIKON_TAG_FIRMWARE tag whose data should not be treated as being
endian-specific.

diff --git a/libexif/olympus/mnote-olympus-entry.c b/libexif/olympus/mnote-olympus-entry.c
index 07d0087..3fa1cf8 100644 (file)
--- a/libexif/olympus/mnote-olympus-entry.c
+++ b/libexif/olympus/mnote-olympus-entry.c
@@ -300,7 +300,7 @@ mnote_olympus_entry_get_value (MnoteOlympusEntry *entry, char *v, unsigned int m
        case MNOTE_NIKON_TAG_FIRMWARE:
                CF (entry->format,  EXIF_FORMAT_UNDEFINED, v, maxlen);
                CC (entry->components, 4, v, maxlen);
-               vl = exif_get_long (entry->data, entry->order);
+               vl = exif_get_long (entry->data, EXIF_BYTE_ORDER_INTEL);
                if ((vl & 0xF0F0F0F0) == 0x30303030) {
                        memcpy (v, entry->data, MIN (maxlen, 4));
                } else {

diff --git a/test/Makefile.am b/test/Makefile.am
index 57ec617..c2dc498 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -12,11 +12,11 @@ SUBDIRS = nls
 #      here yet.
 
 TESTS = test-mem test-value test-integers test-parse test-tagtable test-sorted \
-       test-fuzzer parse-regression.sh
+       test-fuzzer parse-regression.sh swap-byte-order.sh
 
 check_PROGRAMS = test-mem test-mnote test-value test-integers test-parse \
        test-tagtable test-sorted test-fuzzer
 
 LDADD = $(top_builddir)/libexif/libexif.la $(LTLIBINTL)
 
-EXTRA_DIST = parse-regression.sh
+EXTRA_DIST = parse-regression.sh swap-byte-order.sh

diff --git a/test/swap-byte-order.sh b/test/swap-byte-order.sh
new file mode 100755 (executable)
index 0000000..59a9d44
--- /dev/null
+++ b/test/swap-byte-order.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Swaps the byte order of test EXIF files and ensures the data don't change.
+srcdir="${srcdir:-.}"
+TMPLOG="$(mktemp)"
+trap 'rm -f "${TMPLOG}"' 0
+# Ensure that names are untranslated
+LANG=
+LANGUAGE=
+LC_ALL=C
+export LANG LANGUAGE LC_ALL
+for fn in "${srcdir}"/testdata/*.jpg ; do
+    ./test-parse --swap-byte-order "${fn}" | sed -e '/^New byte order:/d' > "${TMPLOG}"
+    if ! diff "${fn}".parsed "${TMPLOG}"; then
+        echo Error parsing "$fn"
+        exit 1
+    fi
+done

diff --git a/test/test-parse.c b/test/test-parse.c
index 5b6bfba..c427c34 100644 (file)
--- a/test/test-parse.c
+++ b/test/test-parse.c
@@ -71,14 +71,15 @@ static void dump_makernote(ExifData *d) {
        if (!name)
            name = "(unknown)";
        printf("    Entry %u: %u, %s\n"
-              "      Size: %u\n", i, id, name, strlen(buf));
+              "      Size: %u\n"
+              "      Value: %s\n", i, id, name, strlen(buf), buf);
       }
     }
   }
 }
 
 /** Run EXIF parsing test on the given file. */
-static void test_parse(const char *filename, void *callback_data)
+static void test_parse(const char *filename, void *callback_data, int swap)
 {
   ExifData *d;
 
@@ -91,6 +92,21 @@ static void test_parse(const char *filename, void *callback_data)
   printf("File %s\n", fn);
 
   d = exif_data_new_from_file(filename);
+  printf("Byte order: %s\n",
+          exif_byte_order_get_name(exif_data_get_byte_order(d)));
+
+  if (swap) {
+      ExifByteOrder order = EXIF_BYTE_ORDER_INTEL;
+      if (exif_data_get_byte_order(d) == order) {
+          order = EXIF_BYTE_ORDER_MOTOROLA;
+      }
+      /* This switches the byte order of the entire EXIF data structure,
+       * including the MakerNote */
+      exif_data_set_byte_order(d, order);
+      printf("New byte order: %s\n",
+              exif_byte_order_get_name(exif_data_get_byte_order(d)));
+  }
+
   exif_data_foreach_content(d, data_foreach_func, callback_data);
 
   dump_makernote(d);
@@ -100,7 +116,7 @@ static void test_parse(const char *filename, void *callback_data)
 
 
 /** Callback function prototype for string parsing. */
-typedef void (*test_parse_func) (const char *filename, void *callback_data);
+typedef void (*test_parse_func) (const char *filename, void *callback_data, int swap);
 
 
 /** Split string at whitespace and call callback with each substring. */
@@ -117,7 +133,7 @@ static void split_ws_string(const char *string, test_parse_func func, void *call
        if (str) {
          memcpy(str, start, len);
          str[len] = '\0';
-         func(str, callback_data);
+         func(str, callback_data, 0);
          free(str);
          start = p+1;
        }
@@ -138,10 +154,17 @@ int main(const int argc, const char *argv[])
 {
   int i;
   void *callback_data = NULL;
+  int swap = 0;
+  int first = 1;
+
+  if (argc > 1 && !strcmp(argv[1], "--swap-byte-order")) {
+      swap = 1;
+      ++first;
+  }
 
-  if (argc > 1) {
-    for (i=1; i<argc; i++) {
-      test_parse(argv[i], callback_data);
+  if (argc > first) {
+    for (i=first; i<argc; i++) {
+      test_parse(argv[i], callback_data, swap);
     }
   } else {
     /* If no command-line argument is found, get the file names from

diff --git a/test/testdata/canon_makernote_variant_1.jpg.parsed b/test/testdata/canon_makernote_variant_1.jpg.parsed
index 0f9b719..6392355 100644 (file)
--- a/test/testdata/canon_makernote_variant_1.jpg.parsed
+++ b/test/testdata/canon_makernote_variant_1.jpg.parsed
@@ -1,4 +1,5 @@
 File canon_makernote_variant_1.jpg
+Byte order: Intel
   Content 0: ifd=0
     Entry 0: Make (ASCII)
       Size, Comps: 6, 6
@@ -145,193 +146,289 @@ File canon_makernote_variant_1.jpg
   MakerNote
     Entry 0: 1, Macro Mode
       Size: 6
+      Value: Normal
     Entry 1: 1, Self-timer
       Size: 3
+      Value: Off
     Entry 2: 1, Quality
       Size: 9
+      Value: Superfine
     Entry 3: 1, Flash Mode
       Size: 3
+      Value: Off
     Entry 4: 1, Drive Mode
       Size: 6
+      Value: Single
     Entry 5: 1, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 6: 1, Focus Mode
       Size: 6
+      Value: Single
     Entry 7: 1, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 8: 1, Record Mode
       Size: 4
+      Value: JPEG
     Entry 9: 1, Image Size
       Size: 5
+      Value: Small
     Entry 10: 1, Easy Shooting Mode
       Size: 9
+      Value: Landscape
     Entry 11: 1, Digital Zoom
       Size: 4
+      Value: None
     Entry 12: 1, Contrast
       Size: 6
+      Value: Normal
     Entry 13: 1, Saturation
       Size: 6
+      Value: Normal
     Entry 14: 1, Sharpness
       Size: 6
+      Value: Normal
     Entry 15: 1, ISO
       Size: 4
+      Value: Auto
     Entry 16: 1, Metering Mode
       Size: 10
+      Value: Evaluative
     Entry 17: 1, Focus Range
       Size: 4
+      Value: Auto
     Entry 18: 1, AF Point
       Size: 23
+      Value: Auto AF point selection
     Entry 19: 1, Exposure Mode
       Size: 13
+      Value: Easy shooting
     Entry 20: 1, (unknown)
       Size: 6
+      Value: 0x7fff
     Entry 21: 1, Lens Type
       Size: 6
+      Value: 0xffff
     Entry 22: 1, Long Focal Length of Lens
       Size: 3
+      Value: 662
     Entry 23: 1, Short Focal Length of Lens
       Size: 3
+      Value: 186
     Entry 24: 1, Focal Units per mm
       Size: 2
+      Value: 32
     Entry 25: 1, Maximal Aperture
       Size: 4
+      Value: 2.89
     Entry 26: 1, Minimal Aperture
       Size: 4
+      Value: 8.00
     Entry 27: 1, Flash Activity
       Size: 6
+      Value: 0xffff
     Entry 28: 1, Flash Details
       Size: 0
+      Value: 
     Entry 29: 1, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 30: 1, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 31: 1, Focus Mode
       Size: 6
+      Value: Single
     Entry 32: 1, AE Setting
       Size: 9
+      Value: Normal AE
     Entry 33: 1, Image Stabilization
       Size: 6
+      Value: 0xffff
     Entry 34: 1, Display Aperture
       Size: 4
+      Value: 0.00
     Entry 35: 1, Zoom Source Width
       Size: 4
+      Value: 3072
     Entry 36: 1, Zoom Target Width
       Size: 4
+      Value: 3072
     Entry 37: 1, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 38: 1, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 39: 1, Photo Effect
       Size: 3
+      Value: Off
     Entry 40: 1, Manual Flash Output
       Size: 3
+      Value: Off
     Entry 41: 1, Color Tone
       Size: 6
+      Value: 0x7fff
     Entry 42: 1, (unknown)
       Size: 6
+      Value: 0x7fff
     Entry 43: 1, (unknown)
       Size: 6
+      Value: 0x0001
     Entry 44: 1, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 45: 2, Focal Type
       Size: 4
+      Value: Zoom
     Entry 46: 2, Focal Length
       Size: 3
+      Value: 186
     Entry 47: 2, Focal Plane X Size
       Size: 7
+      Value: 7.39 mm
     Entry 48: 2, Focal Plane Y Size
       Size: 7
+      Value: 5.54 mm
     Entry 49: 3, (unknown)
       Size: 8
+      Value: 0 0 0 0 
     Entry 50: 4, Auto ISO
       Size: 5
+      Value: 1.000
     Entry 51: 4, Shot ISO
       Size: 2
+      Value: 50
     Entry 52: 4, Measured EV
       Size: 8
+      Value: -9.94 EV
     Entry 53: 4, Target Aperture
       Size: 4
+      Value: 2.80
     Entry 54: 4, Target Exposure Time
       Size: 1
+      Value: 1
     Entry 55: 4, Exposure Compensation
       Size: 7
+      Value: 0.00 EV
     Entry 56: 4, White Balance
       Size: 4
+      Value: Auto
     Entry 57: 4, Slow Shutter
       Size: 3
+      Value: Off
     Entry 58: 4, Sequence Number
       Size: 1
+      Value: 0
     Entry 59: 4, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 60: 4, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 61: 4, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 62: 4, Flash Guide Number
       Size: 4
+      Value: 0.00
     Entry 63: 4, AF Point
       Size: 6
+      Value: 0x0000
     Entry 64: 4, Flash Exposure Compensation
       Size: 7
+      Value: 0.00 EV
     Entry 65: 4, AE Bracketing
       Size: 3
+      Value: Off
     Entry 66: 4, AE Bracket Value
       Size: 7
+      Value: 0.00 EV
     Entry 67: 4, (unknown)
       Size: 6
+      Value: 0x0001
     Entry 68: 4, Focus Distance Upper
       Size: 7
+      Value: 6553 mm
     Entry 69: 4, Focus Distance Lower
       Size: 4
+      Value: 0 mm
     Entry 70: 4, F-Number
       Size: 4
+      Value: 2.89
     Entry 71: 4, Exposure Time
       Size: 1
+      Value: 1
     Entry 72: 4, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 73: 4, Bulb Duration
       Size: 6
+      Value: 0x0000
     Entry 74: 4, (unknown)
       Size: 6
+      Value: 0xffd0
     Entry 75: 4, Camera Type
       Size: 7
+      Value: Compact
     Entry 76: 4, Auto Rotate
       Size: 12
+      Value: Rotate 90 CW
     Entry 77: 4, ND Filter
       Size: 3
+      Value: Off
     Entry 78: 4, Self-timer
       Size: 3
+      Value: Off
     Entry 79: 4, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 80: 4, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 81: 4, (unknown)
       Size: 6
+      Value: 0x0000
     Entry 82: 4, Manual Flash Output
       Size: 3
+      Value: Off
     Entry 83: 0, (unknown)
       Size: 12
+      Value: 0 0 0 0 0 0 
     Entry 84: 0, (unknown)
       Size: 8
+      Value: 0 0 0 0 
     Entry 85: 18, (unknown)
       Size: 101
+      Value: 9 9 640 480 3072 230 553 41 64982 0 554 64982 0 554 64982 0 554 65492 65492 65492 0 0 0 44 44 44 0 0 
     Entry 86: 19, (unknown)
       Size: 8
+      Value: 0 0 0 0 
     Entry 87: 6, ImageType
       Size: 22
+      Value: IMG:PowerShot S70 JPEG
     Entry 88: 7, FirmwareVersion
       Size: 21
+      Value: Firmware Version 1.01
     Entry 89: 8, ImageNumber
       Size: 8
+      Value: 123-4567
     Entry 90: 9, OwnerName
       Size: 0
+      Value: 
     Entry 91: 16, (unknown)
       Size: 9
+      Value: 20447232 
     Entry 92: 0, (unknown)
       Size: 15
+      Value: 10 2 2 640 480 
     Entry 93: 24, (unknown)
       Size: 22
+      Value: 256 bytes unknown data
     Entry 94: 25, (unknown)
       Size: 2
+      Value: 1 
     Entry 95: 13, (unknown)
       Size: 118
+      Value: 72 9 512 512 512 512 512 512 512 512 512 65 0 0 65125 2 0 10 65504 65488 0 43 161 0 48 992 1024 0 0 0 0 0 0 0 192 351 

diff --git a/test/testdata/fuji_makernote_variant_1.jpg.parsed b/test/testdata/fuji_makernote_variant_1.jpg.parsed
index 0fa4306..8160509 100644 (file)
--- a/test/testdata/fuji_makernote_variant_1.jpg.parsed
+++ b/test/testdata/fuji_makernote_variant_1.jpg.parsed
@@ -1,4 +1,5 @@
 File fuji_makernote_variant_1.jpg
+Byte order: Intel
   Content 0: ifd=0
     Entry 0: Make (ASCII)
       Size, Comps: 9, 9
@@ -169,59 +170,88 @@ File fuji_makernote_variant_1.jpg
   MakerNote
     Entry 0: 0, Version
       Size: 4
+      Value: 0130
     Entry 1: 16, SerialNumber
       Size: 30
+      Value: 111111111120090123ABC11T111111
     Entry 2: 4096, Quality
       Size: 7
+      Value: NORMAL 
     Entry 3: 4097, Sharpness
       Size: 6
+      Value: Normal
     Entry 4: 4098, WhiteBalance
       Size: 4
+      Value: Auto
     Entry 5: 4099, ChromaticitySaturation
       Size: 8
+      Value: Standard
     Entry 6: 4112, FlashMode
       Size: 17
+      Value: Red-eye reduction
     Entry 7: 4113, FlashStrength
       Size: 6
+      Value: 0.0000
     Entry 8: 4128, MacroMode
       Size: 3
+      Value: Off
     Entry 9: 4129, FocusingMode
       Size: 4
+      Value: Auto
     Entry 10: 4130, (unknown)
       Size: 1
+      Value: 1
     Entry 11: 4131, FocusPoint
       Size: 8
+      Value: 320, 240
     Entry 12: 4144, SlowSynchro
       Size: 3
+      Value: Off
     Entry 13: 4145, PictureMode
       Size: 4
+      Value: Auto
     Entry 14: 4146, (unknown)
       Size: 1
+      Value: 1
     Entry 15: 4352, ContinuousTaking
       Size: 3
+      Value: Off
     Entry 16: 4353, ContinuousSequence
       Size: 1
+      Value: 0
     Entry 17: 4608, (unknown)
       Size: 1
+      Value: 0
     Entry 18: 4624, FinePixColor
       Size: 10
+      Value: F-Standard
     Entry 19: 4864, BlurCheck
       Size: 7
+      Value: No blur
     Entry 20: 4865, AutoFocusCheck
       Size: 12
+      Value: Out of focus
     Entry 21: 4866, AutoExposureCheck
       Size: 7
+      Value: AE good
     Entry 22: 5128, (unknown)
       Size: 20
+      Value: 4 bytes unknown data
     Entry 23: 5129, (unknown)
       Size: 20
+      Value: 4 bytes unknown data
     Entry 24: 5130, (unknown)
       Size: 1
+      Value: 5
     Entry 25: 16392, (unknown)
       Size: 1
+      Value: 0
     Entry 26: 16640, (unknown)
       Size: 1
+      Value: 0
     Entry 27: 16896, (unknown)
       Size: 1
+      Value: 0
     Entry 28: 61456, (unknown)
       Size: 23
+      Value: 2540 bytes unknown data

diff --git a/test/testdata/olympus_makernote_variant_2.jpg.parsed b/test/testdata/olympus_makernote_variant_2.jpg.parsed
index d84f5aa..a2f75d0 100644 (file)
--- a/test/testdata/olympus_makernote_variant_2.jpg.parsed
+++ b/test/testdata/olympus_makernote_variant_2.jpg.parsed
@@ -1,4 +1,5 @@
 File olympus_makernote_variant_2.jpg
+Byte order: Intel
   Content 0: ifd=0
     Entry 0: ImageDescription (ASCII)
       Size, Comps: 11, 11
@@ -157,77 +158,115 @@ File olympus_makernote_variant_2.jpg
   MakerNote
     Entry 0: 1, Firmware
       Size: 4
+      Value: 0200
     Entry 1: 2, ISO
       Size: 6
+      Value: ISO 80
     Entry 2: 3, ColorMode1
       Size: 6
+      Value: COLOR 
     Entry 3: 4, Quality
       Size: 6
+      Value: NORMAL
     Entry 4: 5, WhiteBalance
       Size: 12
+      Value: FLUORESCENT 
     Entry 5: 6, Sharpening
       Size: 6
+      Value: AUTO  
     Entry 6: 7, FocusMode
       Size: 6
+      Value: AF-C  
     Entry 7: 8, FlashSetting
       Size: 7
+      Value: NORMAL 
     Entry 8: 10, (unknown)
       Size: 5
+      Value: 7.791
     Entry 9: 11, WhiteBalanceFine
       Size: 1
+      Value: 0
     Entry 10: 15, ISOSelection
       Size: 6
+      Value: MANUAL
     Entry 11: 16, (unknown)
       Size: 24
+      Value: 1 bytes unknown data: 00
     Entry 12: 17, PreviewImage
       Size: 4
+      Value: 1816
     Entry 13: 26, (unknown)
       Size: 40
+      Value:                                         
     Entry 14: 33, (unknown)
       Size: 236
+      Value: 106 bytes unknown data: 00024001f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
     Entry 15: 38, (unknown)
       Size: 46
+      Value: Invalid number of components (18, expected 1).
     Entry 16: 45, (unknown)
       Size: 45
+      Value: Invalid number of components (2, expected 1).
     Entry 17: 46, (unknown)
       Size: 1
+      Value: 1
     Entry 18: 47, (unknown)
       Size: 1
+      Value: 0
     Entry 19: 48, (unknown)
       Size: 1
+      Value: 0
     Entry 20: 128, ImageAdjustment
       Size: 13
+      Value: NORMAL       
     Entry 21: 133, ManualFocusDistance
       Size: 25
+      Value: No manual focus selection
     Entry 22: 134, DigitalZoom
       Size: 5
+      Value: 1.000
     Entry 23: 136, AFFocusPosition
       Size: 19
+      Value: AF position: center
     Entry 24: 143, (unknown)
       Size: 15
+      Value:                
     Entry 25: 145, (unknown)
       Size: 1984
+      Value: 980 bytes unknown data: 000000011100000000000000000000000000000000000002bc006700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000400000500000600000700000800000900000a00000b00000c00000d00000e00000f00001000001100001200001300001400001500001600001700001800001900001a00001b00001c00001d00001e00001f00002000002100002200002300002400002500002600002700002800002900002a00002b00002c00002d00002e00002f00003000003100003200003300003400003500003600003700003800003900003a00003b00003c00003d00003e00003f00004000004100004200004300004400004500004600004700004800004900004a00004b00004c00004d00004e00004f00005000005100005200005300005400005500005600005700005800005900005a00005b00005c00005d00005e00005f00006000006100006200006300006400006500006600006700006800006900006a00006b00006c00006d00006e00006f00007000007100007200007300007400007500007600007700007800007900007a00007b00007c00007d00007e00007f00008000008100008200008300008400008500008600008700008800008900008a00008b00008c00008d00008e00008f00009000009100009200009300009400009500009600009700009800009900009a00009b00009c00009d00009e00009f0000a00000a10000a20000a30000a40000a50000a60000a70000a80000a90000aa0000ab0000ac0000ad0000ae0000af0000b00000b10000b20000b30000b40000b50000b60000b70000b80000b90000ba0000bb0000bc0000bd0000be0000bf0000c00000c10000c20000c30000c40000c50000c60000c70000c80000c90000ca0000cb0000cc0000cd0000ce0000cf0000d00000d10000d20000d30000d40000d50000d60000d70000d80000d90000da0000db0000dc0000dd0000de0000df0000e00000e10000e20000e30000e40000e50000e60000e70000e80000e90000ea0000eb0000ec0000ed0000ee0000ef0000f00000f10000f20000f30000f40000f50000f60000f70000f80000f90000fa0000fb0000fc0000fd0000fe0000ff0000
     Entry 26: 148, Saturation
       Size: 1
+      Value: 0
     Entry 27: 149, NoiseReduction,
       Size: 4
+      Value: OFF 
     Entry 28: 155, (unknown)
       Size: 26
+      Value: 2 bytes unknown data: 0000
     Entry 29: 156, (unknown)
       Size: 20
+      Value:                     
     Entry 30: 157, (unknown)
       Size: 1
+      Value: 0
     Entry 31: 158, (unknown)
       Size: 46
+      Value: Invalid number of components (10, expected 1).
     Entry 32: 159, (unknown)
       Size: 1
+      Value: 0
     Entry 33: 172, (unknown)
       Size: 11
+      Value: VR-OFF     
     Entry 34: 178, (unknown)
       Size: 8
+      Value: NORMAL  
     Entry 35: 181, (unknown)
       Size: 4
+      Value: 4113
     Entry 36: 61440, (unknown)
       Size: 30
+      Value: 4 bytes unknown data: 00000000
     Entry 37: 61441, (unknown)
       Size: 1
+      Value: 0

diff --git a/test/testdata/olympus_makernote_variant_3.jpg.parsed b/test/testdata/olympus_makernote_variant_3.jpg.parsed
index 2818c79..d10596c 100644 (file)
--- a/test/testdata/olympus_makernote_variant_3.jpg.parsed
+++ b/test/testdata/olympus_makernote_variant_3.jpg.parsed
@@ -1,4 +1,5 @@
 File olympus_makernote_variant_3.jpg
+Byte order: Intel
   Content 0: ifd=0
     Entry 0: ImageDescription (ASCII)
       Size, Comps: 32, 32
@@ -148,29 +149,43 @@ File olympus_makernote_variant_3.jpg
   MakerNote
     Entry 0: 512, Mode
       Size: 10
+      Value: Normal/0/0
     Entry 1: 513, Quality
       Size: 11
+      Value: Normal, SQ2
     Entry 2: 514, Macro
       Size: 11
+      Value: Super macro
     Entry 3: 515, BWMode
       Size: 2
+      Value: No
     Entry 4: 516, DigiZoom
       Size: 4
+      Value: 1.00
     Entry 5: 517, FocalPlaneDiagonal
       Size: 5
+      Value: 7.150
     Entry 6: 518, LensDistortionParams
       Size: 12
+      Value: 0 0 0 0 0 0 
     Entry 7: 519, FirmwareVersion
       Size: 5
+      Value: D4199
     Entry 8: 521, CameraID
       Size: 31
+      Value: OLYMPUS DIGITAL CAMERA         
     Entry 9: 8208, (unknown)
       Size: 336
+      Value: 156 bytes unknown data: 060000000700040000003031300000010200060000003c0500000101020020000000420500000201020020000000620500000301050001000000820500000401040001000000131000000000000044343139390031313131313131313120202020202020202020202020202020202020202020003131313131313131313131313131313120202020202020202020202020202000cb02000064000000
     Entry 10: 8224, (unknown)
       Size: 1288
+      Value: 632 bytes unknown data: 1c000000070004000000303130000002030001000000020000000102030001000000000000000202030001000000050000000003030001000000020000000103030001000000000000000203030001000000000000000303030001000000000000000403040040000000e006000000040300010000000000000001040a0001000000e00700000204030001000000000000000005030001000000000000000105030001000000000000000205080001000000000000000305080003000000e80700000405030001000000000000000505080003000000ee0700000605080003000000f40700000705030001000000000000000905030001000000180000000a05030001000000000000000b05030001000000000000000c05030001000000000000000d05050001000000fa0700000e0503000100000000000000000603000200000000000000030603000100000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000400000001000000
     Entry 11: 8240, (unknown)
       Size: 83
+      Value: 30 bytes unknown data: 02000000070004000000303130000b010300010000000000000000000000
     Entry 12: 8256, (unknown)
       Size: 520
+      Value: 248 bytes unknown data: 0f000000070004000000303130000001030002000000cb0094000002030009000000da0800000003030001000000130000001003030001000000880000000006030004000000ec08000000080b0009000000f408000000100300010000000000000001100300010000000000000002100300010000000000000003100300010000000300000004100300010000000900000010100300010000000000000011100300010000000000000012100300010000000000000000000000b100c4ff0800e6ffbb00dcfffdffbdffc500ff00ff00fe00fe00f9ca4fbbd2eeb03b3bc07bbb0eb70cbb2924163a666f82b9f9ca4fbbd2eeb03b3bc07bbb
     Entry 13: 8272, (unknown)
       Size: 1999
+      Value: 3534 bytes unknown data: 2e000000070004000000303130000002080002000000000100000102080002000000aa0400000202080002000000de040000030208000100000095f90000040208000200000083f983f90902030001000000ff0000000a02030001000000000000000b02030001000000000000000d02040001000000000000000e02040005000000460b00000f020400050000005a0b000010020300010000000000000011020400080000006e0b000012020400d00200008e0b00001302030001000000000000001402030001000000000000000003030001000000140000000103030001000000ed01000002030300010000000b00000003030300010000004901000004030300010000009f0100000503050001000000ce1600000703030001000000000000000803030001000000000000000c03030002000000000000000f030800010000001900000010030300010000000000000011030300010000000000000012030300020000004d009a031303080001000000ba010000140303000100000005000000150308000100000000000000160308000100000083f900001c03080001000000000000001d03080001000000000000001e030800010000000000000000120300010000000000000001120300020000000000000002120300010000000000000003120a0001000000d61600000412030001000000000000000512050001000000de16000006120300010000000000000007120300010000000000000008120300010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

diff --git a/test/testdata/olympus_makernote_variant_4.jpg.parsed b/test/testdata/olympus_makernote_variant_4.jpg.parsed
index 46381a5..7431319 100644 (file)
--- a/test/testdata/olympus_makernote_variant_4.jpg.parsed
+++ b/test/testdata/olympus_makernote_variant_4.jpg.parsed
@@ -1,4 +1,5 @@
 File olympus_makernote_variant_4.jpg
+Byte order: Intel
   Content 0: ifd=0
     Entry 0: ImageDescription (ASCII)
       Size, Comps: 32, 32
@@ -154,15 +155,22 @@ File olympus_makernote_variant_4.jpg
   MakerNote
     Entry 0: 512, Mode
       Size: 8
+      Value: Fast/1/0
     Entry 1: 521, CameraID
       Size: 31
+      Value: OLYMPUS DIGITAL CAMERA         
     Entry 2: 8208, (unknown)
       Size: 0
+      Value: 
     Entry 3: 8224, (unknown)
       Size: 0
+      Value: 
     Entry 4: 8240, (unknown)
       Size: 0
+      Value: 
     Entry 5: 8256, (unknown)
       Size: 0
+      Value: 
     Entry 6: 8272, (unknown)
       Size: 0
+      Value: 

diff --git a/test/testdata/olympus_makernote_variant_5.jpg.parsed b/test/testdata/olympus_makernote_variant_5.jpg.parsed
index 6b9bce0..e4df13c 100644 (file)
--- a/test/testdata/olympus_makernote_variant_5.jpg.parsed
+++ b/test/testdata/olympus_makernote_variant_5.jpg.parsed
@@ -1,4 +1,5 @@
 File olympus_makernote_variant_5.jpg
+Byte order: Intel
   Content 0: ifd=0
     Entry 0: ImageDescription (ASCII)
       Size, Comps: 32, 32
@@ -163,81 +164,121 @@ File olympus_makernote_variant_5.jpg
   MakerNote
     Entry 0: 256, ThumbnailImage
       Size: 1999
+      Value: 1033 bytes unknown data: 0407060506080707080a110b0a09090a150f100c1118151a19181518171b1e27211b1d251d1718222e222528292b2c2b1a202f332f2a32272a2b2a010708080a090a140b0b142a1c181c2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a020708080a090a140b0b142a1c181c2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2a2affc401a20000010501010101010100000000000000000102030405060708090a0b100002010303020403050504040000017d01020300041105122131410613516107227114328191a1082342b1c11552d1f02433627282090a161718191a25262728292a3435363738393a434445464748494a535455565758595a636465666768696a737475767778797a838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae1e2e3e4e5e6e7e8e9eaf1f2f3f4f5f6f7f8f9fa0100030101010101010101010000000000000102030405060708090a0b1100020102040403040705040400010277000102031104052131061241510761711322328108144291a1b1c109233352f0156272d10a162434e125f11718191a262728292a35363738393a434445464748494a535455565758595a636465666768696a737475767778797a82838485868788898a92939495969798999aa2a3a4a5a6a7a8a9aab2b3b4b5b6b7b8b9bac2c3c4c5c6c7c8c9cad2d3d4d5d6d7d8d9dae2e3e4e5e6e7e8e9eaf2f3f4f5f6f7f8f9faffc0001108007800a003012100021101031101ffda000c03010002110311003f00f9b68a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028a0028
     Entry 1: 512, Mode
       Size: 10
+      Value: Normal/0/0
     Entry 2: 513, Quality
       Size: 16
+      Value: Normal, standard
     Entry 3: 514, Macro
       Size: 2
+      Value: No
     Entry 4: 515, BWMode
       Size: 2
+      Value: No
     Entry 5: 516, DigiZoom
       Size: 4
+      Value: None
     Entry 6: 526, SequentialShot
       Size: 4
+      Value: None
     Entry 7: 527, WideRange
       Size: 3
+      Value: Off
     Entry 8: 528, ColorAdjustmentMode
       Size: 3
+      Value: Off
     Entry 9: 529, (unknown)
       Size: 1
+      Value: 1
     Entry 10: 530, FocusMode
       Size: 10
+      Value: Spot focus
     Entry 11: 531, QuickShot
       Size: 3
+      Value: Off
     Entry 12: 532, SelfTimer
       Size: 3
+      Value: Off
     Entry 13: 533, (unknown)
       Size: 1
+      Value: 1
     Entry 14: 534, VoiceMemo
       Size: 3
+      Value: Off
     Entry 15: 535, RecordShutterRelease
       Size: 17
+      Value: Record while down
     Entry 16: 536, FlickerReduce
       Size: 3
+      Value: Off
     Entry 17: 537, OpticalZoom
       Size: 2
+      Value: On
     Entry 18: 538, CCDSensitivity
       Size: 4
+      Value: Auto
     Entry 19: 539, DigitalZoom
       Size: 2
+      Value: On
     Entry 20: 540, (unknown)
       Size: 2
+      Value: 21
     Entry 21: 541, LightSourceSpecial
       Size: 3
+      Value: Off
     Entry 22: 542, Resaved
       Size: 2
+      Value: No
     Entry 23: 543, SceneSelect
       Size: 3
+      Value: Off
     Entry 24: 544, (unknown)
       Size: 1
+      Value: 7
     Entry 25: 545, (unknown)
       Size: 3
+      Value: 238
     Entry 26: 546, (unknown)
       Size: 1
+      Value: 0
     Entry 27: 547, ManualFocusDistance
       Size: 45
+      Value: Invalid number of components (8, expected 1).
     Entry 28: 548, SequenceShotInterval
       Size: 12
+      Value: 5 frames/sec
     Entry 29: 549, (unknown)
       Size: 0
+      Value: 
     Entry 30: 550, (unknown)
       Size: 1
+      Value: 0
     Entry 31: 551, (unknown)
       Size: 1
+      Value: 0
     Entry 32: 553, (unknown)
       Size: 1
+      Value: 0
     Entry 33: 3840, DataDump
       Size: 1999
+      Value: 2540 bytes unknown data: 00000000000000000000ff00000037390000000000000000236236230c11008147434486004f4c4100000000804000000001700100a7003200001119000f000f00a3003206041119000000000000010100a300320604111905200388084b0c4b0ccb0dcb0dcb0f0f00f801fb01b400f401f401c70000ffff0b3404ed0000000001b9ffe50021001d00260025001e0028000f0016ffff000c0021fffb002800250028002c00200024001d0023ff91001d00bbfff5008c009b0076007d005b006808d50b3406f107bf04ed06ad09990bf30703082004ed06ad0a360bf608d0096e04ed088a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001741741701ee05040001e838054600150000000100f42400008d24d000000fa0000007bb000000010000000000000fa0017c1cc700c829150057005800ea00004000000000570ccc0000000064000b7802828001005101d7001500150000000000000122000001230000000000000000000000000000000017517517020000000d7112b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffff000000000000000000000000000000000000000000001711711700ef6464640064640182013300ff0103015f014100dc014500aa00ed0123016800ba014400ba00d900464b06012300000a080e1300340b10220f00
     Entry 34: 3841, (unknown)
       Size: 1999
+      Value: 4048 bytes unknown data: 59636759ea000006ea00005fea00004fea000058ea000052ea000060ea000041ea000045e59fd188e3a044f0e3a05b4054f0e2856bc0e3a064f0e2867a80e3a074f0e2878d40e3a084f0e2889164e59f9008e5840020e3a00000e5850f96e3a00001e250fffd1aff0000e59500c0e2000080e3501140059f10a0058600c0e3501138059f10a00586af40e3a0a051e28aae80038aa00005860940e3a00001e2800198e5869020e3c99008e5840000e3a00004e5880010e3a00001e250fffd1affa005e38aa000e58600ece5960011e2000011e350fffb1aff0030e3a00000e5850000e59500c2e2000082e35010d0059f00c2e35010cc059f0040e35010c8059f0080e35010c4059f00c0e35010c0059f0b80e3a004f0e2801000e5800037eb000054eb000032ea000008e52d00a4e59f0000e5900004e58d8001e8bd0008e52d0094e59f0000e5900004e58d8001e8bd0008e52d0084e59f0000e5900004e58d8001e8bd0008e52d0074e59f0000e5900004e58d8001e8bd0008e52d0064e59f0000e5900004e58d8001e8bd0008e52d0054e59f0000e5900004e58d8001e8bd0008e52d0044e59f0000e5900004e58d8001e8bd100040000c3010503b3b002600270026110a210711071105110611041104110311031102fff843fffffc43ffffe843fffff043ffffec43ffffe443fffff443ffc000e59fff1ce12f000043fc303fe3a03f10ee063037e3a03f11ee0631dde3a03f12ee063000e3a03f13ee063f14ee063f15ee063f16ee063f17ee061fc0e3a01033e2811f50ee051f70ee051000e3a01f10ee021006e3a01f30ee021000e3a01f10ee033000e3a03f15ee073f16ee073f10ee113d40e3833005e3833f10ee01f00ee1a0ffffeaff70b8e59f5004e3a00b79e3a00082e2804001e3a030b0e1d037a3e1a00004e153fffb1aff0b79e3a00082e2803000e3a030b0e1c00ce2e3a00b40e28030b0e1c0007ce59f3cffe3c530b0e1c00b79e3a03ec0e3a030b0e1c00b79e3a00042e2803000e5903f40e38330b0e1c00b79e3a00040e2803000e3a030b0e1c00b79e3a00082e2804c80e3a04080e28430b0e1d00004e153fffc1aff6ec0e3a08040e3a01e0fe8b61e0fe8a78001e258fffb1aff007ce35550041285ffd91afff00ee1a0000043fce20e0001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
     Entry 35: 3842, (unknown)
       Size: 1
+      Value: 0
     Entry 36: 3843, (unknown)
       Size: 5
+      Value: 67686
     Entry 37: 3844, (unknown)
       Size: 46
+      Value: Invalid number of components (1, expected 30).
     Entry 38: 3845, (unknown)
       Size: 45
+      Value: Invalid number of components (2, expected 1).
     Entry 39: 3846, (unknown)
       Size: 45
+      Value: Invalid number of components (2, expected 1).

diff --git a/test/testdata/pentax_makernote_variant_2.jpg.parsed b/test/testdata/pentax_makernote_variant_2.jpg.parsed
index 07c458c..d72b889 100644 (file)
--- a/test/testdata/pentax_makernote_variant_2.jpg.parsed
+++ b/test/testdata/pentax_makernote_variant_2.jpg.parsed
@@ -1,4 +1,5 @@
 File pentax_makernote_variant_2.jpg
+Byte order: Motorola
   Content 0: ifd=0
     Entry 0: Make (ASCII)
       Size, Comps: 24, 24
@@ -136,65 +137,97 @@ File pentax_makernote_variant_2.jpg
   MakerNote
     Entry 0: 16386, PentaxPreviewSize
       Size: 8
+      Value: 320 240 
     Entry 1: 16387, PentaxPreviewLength
       Size: 2
+      Value: 4 
     Entry 2: 16388, PentaxPreviewStart
       Size: 5
+      Value: 1326 
     Entry 3: 24576, CasioPreviewStart
       Size: 20
+      Value: 4 bytes unknown data
     Entry 4: 24577, (unknown)
       Size: 4
+      Value: 0208
     Entry 5: 24578, (unknown)
       Size: 0
+      Value: 
     Entry 6: 24579, (unknown)
       Size: 20
+      Value: 8 bytes unknown data
     Entry 7: 24593, WhiteBalanceBias
       Size: 7
+      Value: 132 92 
     Entry 8: 24594, WhiteBalance
       Size: 3
+      Value: 12 
     Entry 9: 24595, (unknown)
       Size: 2
+      Value: 2 
     Entry 10: 24609, (unknown)
       Size: 24
+      Value: 65535 65535 65535 65535 
     Entry 11: 24610, ObjectDistance
       Size: 5
+      Value: 2000 
     Entry 12: 24611, (unknown)
       Size: 2
+      Value: 2 
     Entry 13: 24625, (unknown)
       Size: 20
+      Value: 2 bytes unknown data
     Entry 14: 24626, (unknown)
       Size: 20
+      Value: 2 bytes unknown data
     Entry 15: 24627, (unknown)
       Size: 2
+      Value: 1 
     Entry 16: 24628, FlashDistance
       Size: 5
+      Value: 1000 
     Entry 17: 28672, RecordMode
       Size: 3
+      Value: 10 
     Entry 18: 28673, SelfTimer
       Size: 2
+      Value: 7 
     Entry 19: 28674, CasioQuality
       Size: 2
+      Value: 1 
     Entry 20: 28675, CasioFocusMode
       Size: 2
+      Value: 6 
     Entry 21: 28677, (unknown)
       Size: 4
+      Value: 1 0 
     Entry 22: 28678, TimeZone
       Size: 3
+      Value: ABC
     Entry 23: 28679, BestshotMode
       Size: 3
+      Value: Off
     Entry 24: 28689, (unknown)
       Size: 20
+      Value: 2 bytes unknown data
     Entry 25: 28690, (unknown)
       Size: 20
+      Value: 2 bytes unknown data
     Entry 26: 28691, (unknown)
       Size: 20
+      Value: 2 bytes unknown data
     Entry 27: 28692, CCSISOSensitivity
       Size: 4
+      Value: 100 
     Entry 28: 28693, ColorMode
       Size: 2
+      Value: 0 
     Entry 29: 28694, Enhancement
       Size: 2
+      Value: 0 
     Entry 30: 28695, Finer
       Size: 2
+      Value: 0 
     Entry 31: 28696, (unknown)
       Size: 2
+      Value: 0 

diff --git a/test/testdata/pentax_makernote_variant_3.jpg.parsed b/test/testdata/pentax_makernote_variant_3.jpg.parsed
index 65021cd..91902f5 100644 (file)
--- a/test/testdata/pentax_makernote_variant_3.jpg.parsed
+++ b/test/testdata/pentax_makernote_variant_3.jpg.parsed
@@ -1,4 +1,5 @@
 File pentax_makernote_variant_3.jpg
+Byte order: Intel
   Content 0: ifd=0
     Entry 0: Make (ASCII)
       Size, Comps: 19, 19
@@ -139,81 +140,121 @@ File pentax_makernote_variant_3.jpg
   MakerNote
     Entry 0: 16385, Mode
       Size: 6
+      Value: Manual
     Entry 1: 16386, PentaxPreviewSize
       Size: 8
+      Value: 640 480 
     Entry 2: 16387, PentaxPreviewLength
       Size: 2
+      Value: 4 
     Entry 3: 16388, PentaxPreviewStart
       Size: 5
+      Value: 1898 
     Entry 4: 16389, ModelID
       Size: 6
+      Value: 76390 
     Entry 5: 16390, Date
       Size: 10
+      Value: 2009:10:11
     Entry 6: 16391, Time
       Size: 8
+      Value: 19:06:04
     Entry 7: 16392, Quality
       Size: 4
+      Value: Good
     Entry 8: 16393, ImageSize
       Size: 7
+      Value: 640x480
     Entry 9: 16395, PictureMode
       Size: 33
+      Value: Internal error (unknown value 21)
     Entry 10: 16396, FlashMode
       Size: 3
+      Value: Off
     Entry 11: 16397, FocusMode
       Size: 6
+      Value: Normal
     Entry 12: 16398, AFPointSelected
       Size: 4
+      Value: Auto
     Entry 13: 16399, AutoAFPoint
       Size: 8
+      Value: Multiple
     Entry 14: 16400, FocusPosition
       Size: 5
+      Value: 1013 
     Entry 15: 16402, ExposureTime
       Size: 7
+      Value: 100000 
     Entry 16: 16403, FNumber
       Size: 3
+      Value: 28 
     Entry 17: 16404, ISO
       Size: 2
+      Value: 9 
     Entry 18: 16405, (unknown)
       Size: 6
+      Value: 65533 
     Entry 19: 16406, ExposureCompensation
       Size: 3
+      Value: 50 
     Entry 20: 16407, MeteringMode
       Size: 2
+      Value: 0 
     Entry 21: 16408, AutoBracketing
       Size: 2
+      Value: 0 
     Entry 22: 16409, WhiteBalance
       Size: 4
+      Value: Auto
     Entry 23: 16411, BlueBalance
       Size: 2
+      Value: 0 
     Entry 24: 16412, RedBalance
       Size: 2
+      Value: 0 
     Entry 25: 16413, FocalLength
       Size: 3
+      Value: 78 
     Entry 26: 16414, DigitalZoom
       Size: 4
+      Value: 100 
     Entry 27: 16415, Saturation
       Size: 2
+      Value: 1 
     Entry 28: 16416, Contrast
       Size: 2
+      Value: 1 
     Entry 29: 16417, Sharpness
       Size: 2
+      Value: 1 
     Entry 30: 16418, WorldTimeLocation
       Size: 2
+      Value: 0 
     Entry 31: 16419, HometownCity
       Size: 3
+      Value: 20 
     Entry 32: 16420, DestinationCity
       Size: 3
+      Value: 15 
     Entry 33: 16421, HometownDST,
       Size: 2
+      Value: 0 
     Entry 34: 16422, DestinationDST
       Size: 2
+      Value: 0 
     Entry 35: 16423, (unknown)
       Size: 20
+      Value: 4 bytes unknown data
     Entry 36: 16425, FrameNumber
       Size: 2
+      Value: 0 
     Entry 37: 16434, ImageProcessing
       Size: 20
+      Value: 4 bytes unknown data
     Entry 38: 16449, (unknown)
       Size: 2
+      Value: 0 
     Entry 39: 17406, (unknown)
       Size: 22
+      Value: 494 bytes unknown data

diff --git a/test/testdata/pentax_makernote_variant_4.jpg.parsed b/test/testdata/pentax_makernote_variant_4.jpg.parsed
index ed2c385..266dd0d 100644 (file)
--- a/test/testdata/pentax_makernote_variant_4.jpg.parsed
+++ b/test/testdata/pentax_makernote_variant_4.jpg.parsed
@@ -1,4 +1,5 @@
 File pentax_makernote_variant_4.jpg
+Byte order: Motorola
   Content 0: ifd=0
     Entry 0: Make (ASCII)
       Size, Comps: 24, 24
@@ -148,321 +149,481 @@ File pentax_makernote_variant_4.jpg
   MakerNote
     Entry 0: 16386, PentaxPreviewSize
       Size: 8
+      Value: 320 240 
     Entry 1: 16387, PentaxPreviewLength
       Size: 2
+      Value: 4 
     Entry 2: 16388, PentaxPreviewStart
       Size: 5
+      Value: 9112 
     Entry 3: 16389, ModelID
       Size: 5
+      Value: 8216 
     Entry 4: 24576, CasioPreviewStart
       Size: 20
+      Value: 4 bytes unknown data
     Entry 5: 24577, (unknown)
       Size: 4
+      Value: 0906
     Entry 6: 24578, (unknown)
       Size: 0
+      Value: 
     Entry 7: 24579, (unknown)
       Size: 20
+      Value: 8 bytes unknown data
     Entry 8: 24580, (unknown)
       Size: 20
+      Value: 4 bytes unknown data
     Entry 9: 24581, (unknown)
       Size: 2
+      Value: 0 
     Entry 10: 24582, (unknown)
       Size: 20
+      Value: 1 bytes unknown data
     Entry 11: 24593, WhiteBalanceBias
       Size: 8
+      Value: 531 375 
     Entry 12: 24594, WhiteBalance
       Size: 3
+      Value: 12 
     Entry 13: 24595, (unknown)
       Size: 2
+      Value: 2 
     Entry 14: 24596, (unknown)
       Size: 21
+      Value: 36 bytes unknown data
     Entry 15: 24609, (unknown)
       Size: 24
+      Value: 65535 65535 65535 65535 
     Entry 16: 24610, ObjectDistance
       Size: 5
+      Value: 3221 
     Entry 17: 24611, (unknown)
       Size: 2
+      Value: 3 
     Entry 18: 24625, (unknown)
       Size: 20
+      Value: 2 bytes unknown data
     Entry 19: 24626, (unknown)
       Size: 20
+      Value: 2 bytes unknown data
     Entry 20: 24627, (unknown)
       Size: 2
+      Value: 1 
     Entry 21: 24628, FlashDistance
       Size: 4
+      Value: 806 
     Entry 22: 24629, (unknown)
       Size: 4
+      Value: 100 
     Entry 23: 24630, (unknown)
       Size: 10
+      Value: 144214016 
     Entry 24: 24631, (unknown)
       Size: 10
+      Value: 554106865 
     Entry 25: 24632, (unknown)
       Size: 2
+      Value: 0 
     Entry 26: 24633, (unknown)
       Size: 2
+      Value: 0 
     Entry 27: 24634, (unknown)
       Size: 5
+      Value: 1680 
     Entry 28: 24635, (unknown)
       Size: 10
+      Value: 1392 1993 
     Entry 29: 24636, (unknown)
       Size: 2
+      Value: 1 
     Entry 30: 24637, (unknown)
       Size: 6
+      Value: 15625 
     Entry 31: 24638, (unknown)
       Size: 6
+      Value: 62000 
     Entry 32: 24641, (unknown)
       Size: 5
+      Value: 1385 
     Entry 33: 24642, (unknown)
       Size: 5
+      Value: 1379 
     Entry 34: 24643, (unknown)
       Size: 3
+      Value: 33 
     Entry 35: 24644, (unknown)
       Size: 2
+      Value: 0 
     Entry 36: 24645, (unknown)
       Size: 2
+      Value: 6 
     Entry 37: 24646, (unknown)
       Size: 5
+      Value: 8265 
     Entry 38: 24647, (unknown)
       Size: 7
+      Value: 983040 
     Entry 39: 24648, (unknown)
       Size: 4
+      Value: 971 
     Entry 40: 24649, (unknown)
       Size: 5
+      Value: 1385 
     Entry 41: 24650, (unknown)
       Size: 2
+      Value: 6 
     Entry 42: 24651, (unknown)
       Size: 21
+      Value: 80 bytes unknown data
     Entry 43: 24657, (unknown)
       Size: 2
+      Value: 6 
     Entry 44: 24658, (unknown)
       Size: 9
+      Value: 55943347 
     Entry 45: 24659, (unknown)
       Size: 2
+      Value: 0 
     Entry 46: 24660, (unknown)
       Size: 11
+      Value: 2172740352 
     Entry 47: 24661, (unknown)
       Size: 2
+      Value: 0 
     Entry 48: 24662, (unknown)
       Size: 20
+      Value: 1 bytes unknown data
     Entry 49: 24663, (unknown)
       Size: 2
+      Value: 0 
     Entry 50: 24664, (unknown)
       Size: 2
+      Value: 0 
     Entry 51: 24665, (unknown)
       Size: 2
+      Value: 0 
     Entry 52: 24666, (unknown)
       Size: 23
+      Value: 2200 bytes unknown data
     Entry 53: 24667, (unknown)
       Size: 11
+      Value: 1845559811 
     Entry 54: 24668, (unknown)
       Size: 10
+      Value: 671219712 
     Entry 55: 24669, (unknown)
       Size: 7
+      Value: 131072 
     Entry 56: 24670, (unknown)
       Size: 7
+      Value: 131072 
     Entry 57: 24673, (unknown)
       Size: 2
+      Value: 0 
     Entry 58: 24674, (unknown)
       Size: 2
+      Value: 0 
     Entry 59: 24675, (unknown)
       Size: 2
+      Value: 0 
     Entry 60: 24676, (unknown)
       Size: 22
+      Value: 100 bytes unknown data
     Entry 61: 24677, (unknown)
       Size: 10
+      Value: 920694200 
     Entry 62: 24678, (unknown)
       Size: 10
+      Value: 439355600 
     Entry 63: 24689, (unknown)
       Size: 2
+      Value: 0 
     Entry 64: 24691, (unknown)
       Size: 4
+      Value: 100 
     Entry 65: 24693, (unknown)
       Size: 20
+      Value: 3 bytes unknown data
     Entry 66: 24694, (unknown)
       Size: 20
+      Value: 3 bytes unknown data
     Entry 67: 24695, (unknown)
       Size: 20
+      Value: 3 bytes unknown data
     Entry 68: 24697, (unknown)
       Size: 2
+      Value: 0 
     Entry 69: 24698, (unknown)
       Size: 2
+      Value: 0 
     Entry 70: 24699, (unknown)
       Size: 2
+      Value: 0 
     Entry 71: 24700, (unknown)
       Size: 5
+      Value: 1536 
     Entry 72: 24701, (unknown)
       Size: 2
+      Value: 0 
     Entry 73: 24702, (unknown)
       Size: 2
+      Value: 0 
     Entry 74: 24703, (unknown)
       Size: 2
+      Value: 0 
     Entry 75: 24705, (unknown)
       Size: 2
+      Value: 1 
     Entry 76: 24706, (unknown)
       Size: 5
+      Value: 4112 
     Entry 77: 24707, (unknown)
       Size: 22
+      Value: 256 bytes unknown data
     Entry 78: 24708, (unknown)
       Size: 20
+      Value: 1 bytes unknown data
     Entry 79: 24709, (unknown)
       Size: 2
+      Value: 0 
     Entry 80: 24710, (unknown)
       Size: 4
+      Value: 223 
     Entry 81: 24711, (unknown)
       Size: 4
+      Value: 255 
     Entry 82: 24712, (unknown)
       Size: 22
+      Value: 800 bytes unknown data
     Entry 83: 24713, (unknown)
       Size: 23
+      Value: 1216 bytes unknown data
     Entry 84: 24714, (unknown)
       Size: 23
+      Value: 1216 bytes unknown data
     Entry 85: 24715, (unknown)
       Size: 21
+      Value: 30 bytes unknown data
     Entry 86: 24716, (unknown)
       Size: 2
+      Value: 0 
     Entry 87: 24717, (unknown)
       Size: 2
+      Value: 0 
     Entry 88: 24718, (unknown)
       Size: 2
+      Value: 3 
     Entry 89: 24721, (unknown)
       Size: 20
+      Value: 1 bytes unknown data
     Entry 90: 24722, (unknown)
       Size: 20
+      Value: 1 bytes unknown data
     Entry 91: 24723, (unknown)
       Size: 6
+      Value: 65280 
     Entry 92: 24724, (unknown)
       Size: 21
+      Value: 60 bytes unknown data
     Entry 93: 24725, (unknown)
       Size: 4
+      Value: 255 
     Entry 94: 24726, (unknown)
       Size: 20
+      Value: 4 bytes unknown data
     Entry 95: 24727, (unknown)
       Size: 21
+      Value: 40 bytes unknown data
     Entry 96: 24728, (unknown)
       Size: 21
+      Value: 10 bytes unknown data
     Entry 97: 24729, (unknown)
       Size: 21
+      Value: 10 bytes unknown data
     Entry 98: 24730, (unknown)
       Size: 22
+      Value: 120 bytes unknown data
     Entry 99: 24737, (unknown)
       Size: 3
+      Value: 16 
     Entry 100: 24738, (unknown)
       Size: 4
+      Value: 0 0 
     Entry 101: 24739, (unknown)
       Size: 2
+      Value: 0 
     Entry 102: 24740, (unknown)
       Size: 2
+      Value: 0 
     Entry 103: 24741, (unknown)
       Size: 2
+      Value: 0 
     Entry 104: 24753, (unknown)
       Size: 2
+      Value: 0 
     Entry 105: 24754, (unknown)
       Size: 2
+      Value: 0 
     Entry 106: 24755, (unknown)
       Size: 2
+      Value: 0 
     Entry 107: 24756, (unknown)
       Size: 2
+      Value: 0 
     Entry 108: 24757, (unknown)
       Size: 4
+      Value: 0 0 
     Entry 109: 24768, (unknown)
       Size: 21
+      Value: 16 bytes unknown data
     Entry 110: 24769, (unknown)
       Size: 21
+      Value: 16 bytes unknown data
     Entry 111: 28672, RecordMode
       Size: 2
+      Value: 2 
     Entry 112: 28673, SelfTimer
       Size: 2
+      Value: 1 
     Entry 113: 28674, CasioQuality
       Size: 2
+      Value: 2 
     Entry 114: 28675, CasioFocusMode
       Size: 2
+      Value: 3 
     Entry 115: 28677, (unknown)
       Size: 4
+      Value: 0 0 
     Entry 116: 28678, TimeZone
       Size: 6
+      Value: London
     Entry 117: 28679, BestshotMode
       Size: 2
+      Value: On
     Entry 118: 28680, (unknown)
       Size: 2
+      Value: 1 
     Entry 119: 28681, (unknown)
       Size: 2
+      Value: 3 
     Entry 120: 28682, (unknown)
       Size: 6
+      Value: 4 217 
     Entry 121: 28689, (unknown)
       Size: 20
+      Value: 2 bytes unknown data
     Entry 122: 28690, (unknown)
       Size: 20
+      Value: 2 bytes unknown data
     Entry 123: 28691, (unknown)
       Size: 20
+      Value: 2 bytes unknown data
     Entry 124: 28692, CCSISOSensitivity
       Size: 4
+      Value: 400 
     Entry 125: 28693, ColorMode
       Size: 2
+      Value: 0 
     Entry 126: 28694, Enhancement
       Size: 2
+      Value: 0 
     Entry 127: 28695, Finer
       Size: 2
+      Value: 0 
     Entry 128: 28696, (unknown)
       Size: 2
+      Value: 0 
     Entry 129: 28697, (unknown)
       Size: 2
+      Value: 1 
     Entry 130: 28698, (unknown)
       Size: 2
+      Value: 0 
     Entry 131: 28699, (unknown)
       Size: 2
+      Value: 0 
     Entry 132: 28700, (unknown)
       Size: 2
+      Value: 0 
     Entry 133: 28701, (unknown)
       Size: 4
+      Value: 0 0 
     Entry 134: 28702, (unknown)
       Size: 2
+      Value: 0 
     Entry 135: 28703, (unknown)
       Size: 2
+      Value: 0 
     Entry 136: 28704, (unknown)
       Size: 4
+      Value: 0 0 
     Entry 137: 28705, (unknown)
       Size: 4
+      Value: 0 0 
     Entry 138: 28706, (unknown)
       Size: 4
+      Value: 0 0 
     Entry 139: 28707, (unknown)
       Size: 2
+      Value: 0 
     Entry 140: 28708, (unknown)
       Size: 2
+      Value: 1 
     Entry 141: 28709, (unknown)
       Size: 2
+      Value: 0 
     Entry 142: 28710, (unknown)
       Size: 2
+      Value: 0 
     Entry 143: 28711, (unknown)
       Size: 2
+      Value: 0 
     Entry 144: 28712, (unknown)
       Size: 2
+      Value: 0 
     Entry 145: 28713, (unknown)
       Size: 2
+      Value: 0 
     Entry 146: 28714, (unknown)
       Size: 2
+      Value: 6 
     Entry 147: 28715, (unknown)
       Size: 2
+      Value: 0 
     Entry 148: 28716, (unknown)
       Size: 2
+      Value: 0 
     Entry 149: 28717, (unknown)
       Size: 2
+      Value: 1 
     Entry 150: 28718, (unknown)
       Size: 4
+      Value: 0 0 
     Entry 151: 28719, (unknown)
       Size: 2
+      Value: 0 
     Entry 152: 28720, (unknown)
       Size: 2
+      Value: 6 
     Entry 153: 28929, (unknown)
       Size: 2
+      Value: 0 
     Entry 154: 28930, (unknown)
       Size: 2
+      Value: 0 
     Entry 155: 28931, (unknown)
       Size: 2
+      Value: 0 
     Entry 156: 28933, (unknown)
       Size: 2
+      Value: 0 
     Entry 157: 28934, (unknown)
       Size: 2
+      Value: 0 
     Entry 158: 28935, (unknown)
       Size: 2
+      Value: 0 
     Entry 159: 28936, (unknown)
       Size: 2
+      Value: 0