change print of Exif.Canon.SerialNumber

output now aligned with Canon Photo Digital Professional 4
as print0x000c was also used for 0x000a, new function print0x000a
as copy from old print0x000c

src/canonmn_int.cpp

@@ -490,7 +490,7 @@ constexpr TagInfo CanonMakerNote::tagInfo_[] = {
     {0x0009, "OwnerName", N_("Owner Name"), N_("Owner Name"), IfdId::canonId, SectionId::makerTags, asciiString, -1,
      printValue},
     {0x000a, "0x000a", N_("0x000a"), N_("Unknown"), IfdId::canonId, SectionId::makerTags, unsignedLong, -1,
-     print0x000c},
+     print0x000a},
     {0x000c, "SerialNumber", N_("Serial Number"), N_("Camera serial number"), IfdId::canonId, SectionId::makerTags,
      unsignedLong, -1, print0x000c},
     {0x000d, "CameraInfo", N_("Camera Info"), N_("Camera info"), IfdId::canonId, SectionId::makerTags, unsignedShort,
@@ -2811,7 +2811,7 @@ std::ostream& CanonMakerNote::print0x0008(std::ostream& os, const Value& value,
   return os << n.substr(0, n.length() - 4) << "-" << n.substr(n.length() - 4);
 }
 
-std::ostream& CanonMakerNote::print0x000c(std::ostream& os, const Value& value, const ExifData*) {
+std::ostream& CanonMakerNote::print0x000a(std::ostream& os, const Value& value, const ExifData*) {
   std::istringstream is(value.toString());
   uint32_t l = 0;
   is >> l;
@@ -2819,6 +2819,22 @@ std::ostream& CanonMakerNote::print0x000c(std::ostream& os, const Value& value,
             << std::setfill('0') << std::dec << (l & 0x0000ffff);
 }
 
+std::ostream& CanonMakerNote::print0x000c(std::ostream& os, const Value& value, const ExifData* exifData) {
+  std::istringstream is(value.toString());
+
+  ExifKey key("Exif.Canon.ModelID");
+  auto pos = exifData->findKey(key);
+  // if model is EOS D30
+  if (pos != exifData->end() && pos->value().count() == 1 && pos->value().toInt64() == 0x01140000) {
+    uint32_t l = 0;
+    is >> l;
+    return os << std::setw(4) << std::setfill('0') << std::hex << ((l & 0xffff0000) >> 16) << std::setw(5)
+              << std::setfill('0') << std::dec << (l & 0x0000ffff);
+  } else {
+    return os << value;
+  }
+}
+
 std::ostream& CanonMakerNote::printCs0x0002(std::ostream& os, const Value& value, const ExifData*) {
   if (value.typeId() != unsignedShort || value.count() == 0)
     return os << value;

src/canonmn_int.hpp

@@ -103,6 +103,8 @@ class CanonMakerNote {
   static std::ostream& printFocalLength(std::ostream& os, const Value& value, const ExifData*);
   //! Print the image number
   static std::ostream& print0x0008(std::ostream& os, const Value& value, const ExifData*);
+  //! Print 0x000a
+  static std::ostream& print0x000a(std::ostream& os, const Value& value, const ExifData*);
   //! Print the serial number of the camera
   static std::ostream& print0x000c(std::ostream& os, const Value& value, const ExifData*);
   //! Self timer

test/data/test_reference_files/CanonEF100mmF2.8LMacroISUSM.exv.out

@@ -91,7 +91,7 @@ Exif.Canon.ImageType                         Ascii      32  Canon EOS 5D Mark II
 Exif.Canon.FirmwareVersion                   Ascii      32  Firmware Version 2.0.8  Firmware Version 2.0.8
 Exif.Canon.FileNumber                        Long        1  0  (0)
 Exif.Canon.OwnerName                         Ascii      32    
-Exif.Canon.SerialNumber                      Long        1  210104331  0c8561451
+Exif.Canon.SerialNumber                      Long        1  210104331  210104331
 Exif.Canon.ModelID                           Long        1  2147484184  EOS 5D Mark II
 Exif.Canon.SerialNumberFormat                Long        1  2684354560  Format 2
 Exif.Canon.AFInfo                            Short      50  100 0 9 9 5616 3744 5616 3744 84 84 101 84 84 84 101 84 123 101 101 74 101 101 101 74 101 131 64363 64975 0 561 1173 561 0 64975 0 0 280 501 280 0 65256 65035 65256 0 256 0 0 65535 0 36000  100 0 9 9 5616 3744 5616 3744 84 84 101 84 84 84 101 84 123 101 101 74 101 101 101 74 101 131 64363 64975 0 561 1173 561 0 64975 0 0 280 501 280 0 65256 65035 65256 0 256 0 0 65535 0 36000

test/data/test_reference_files/crw-test.out

@@ -11,7 +11,7 @@ Exif.Canon.ImageType                         Ascii      30  CRW:High definition
 Exif.Canon.OwnerName                         Ascii      15  Andreas Huggel
 Exif.Image.Make                              Ascii       6  Canon
 Exif.Image.Model                             Ascii      20  Canon PowerShot S40
-Exif.Canon.SerialNumber                      Long        2  43b226716
+Exif.Canon.SerialNumber                      Long        2  1135765596 1446117789
 Exif.Canon.FirmwareVersion                   Ascii      22  Firmware Version 1.10
 Exif.Canon.FocalLength                       Short       4  7.1 mm
 Exif.CanonSi.AutoISO                         Short       1  100
@@ -93,7 +93,7 @@ Exif.Canon.ImageType                         Ascii      30  CRW:High definition
 Exif.Canon.OwnerName                         Ascii      16  Different owner
 Exif.Image.Make                              Ascii       6  Canon
 Exif.Image.Model                             Ascii      20  Canon PowerShot S40
-Exif.Canon.SerialNumber                      Long        2  000000001
+Exif.Canon.SerialNumber                      Long        2  1 0
 Exif.Canon.FirmwareVersion                   Ascii      17  Whatever version
 Exif.Canon.FocalLength                       Short       4  2 227 286 215
 Exif.CanonSi.AutoISO                         Short       1  100
@@ -134,7 +134,7 @@ Exif.Canon.ImageType                         Ascii      30  CRW:High definition
 Exif.Canon.OwnerName                         Ascii      15  Andreas Huggel
 Exif.Image.Make                              Ascii       6  Canon
 Exif.Image.Model                             Ascii      20  Canon PowerShot S40
-Exif.Canon.SerialNumber                      Long        2  43b226716
+Exif.Canon.SerialNumber                      Long        2  1135765596 1446117789
 Exif.Canon.FirmwareVersion                   Ascii      22  Firmware Version 1.10
 Exif.Canon.FocalLength                       Short       4  7.1 mm
 Exif.CanonSi.AutoISO                         Short       1  100
@@ -207,7 +207,7 @@ Exif.Photo.DateTimeOriginal                  Ascii      20  2005:04:23 18:54:36
 Exif.Canon.ImageType                         Ascii      30  CRW:High definition CCD image
 Exif.Image.Make                              Ascii       6  Canon
 Exif.Image.Model                             Ascii      20  Canon PowerShot S40
-Exif.Canon.SerialNumber                      Long        2  43b226716
+Exif.Canon.SerialNumber                      Long        2  1135765596 1446117789
 Exif.Canon.FirmwareVersion                   Ascii      22  Firmware Version 1.10
 Exif.Canon.FocalLength                       Short       4  7.1 mm
 Exif.CanonSi.AutoISO                         Short       1  100

test/data/test_reference_files/exiv2-bug1140.exv.out

@@ -90,7 +90,7 @@ Exif.CanonSi.FlashOutput                     Short       1  0  0
 Exif.Canon.ImageType                         Ascii      32  Canon EOS 30D  Canon EOS 30D
 Exif.Canon.FirmwareVersion                   Ascii      32  Firmware 1.0.5  Firmware 1.0.5
 Exif.Canon.OwnerName                         Ascii      32  unknown  unknown
-Exif.Canon.SerialNumber                      Long        1  1520906211  5aa712259
+Exif.Canon.SerialNumber                      Long        1  1520906211  1520906211
 Exif.Canon.CameraInfo                        Undefined 1024  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 Exif.CanonCf.NoiseReduction                  Short       1  256  256
 Exif.CanonCf.ShutterAeLock                   Short       1  513  513

test/data/test_reference_files/exiv2-bug1202.jpg.out

@@ -96,7 +96,7 @@ Exif.CanonFi.RawJpgSize                      SShort      1  -1  n/a
 Exif.CanonFi.NoiseReduction                  SShort      1  -1  (-1)
 Exif.Canon.ImageType                         Ascii      32  IMG:EOS 300D DIGITAL JPEG  IMG:EOS 300D DIGITAL JPEG
 Exif.Canon.FirmwareVersion                   Ascii      32  Firmware Version 1.0.2  Firmware Version 1.0.2
-Exif.Canon.SerialNumber                      Long        1  570004681  21f938089
+Exif.Canon.SerialNumber                      Long        1  570004681  570004681
 Exif.Canon.SerialNumberFormat                Long        1  2415919104  Format 1
 Exif.Canon.FileNumber                        Long        1  1030390  103-0390
 Exif.Canon.OwnerName                         Ascii      32    

test/data/test_reference_files/exiv2-canon-eos-20d.jpg.out

@@ -91,7 +91,7 @@ Exif.CanonSi.FlashOutput                     Short       1  0  0
 Exif.Canon.ImageType                         Ascii      32  Canon EOS 20D  Canon EOS 20D
 Exif.Canon.FirmwareVersion                   Ascii      32  Firmware 2.0.3  Firmware 2.0.3
 Exif.Canon.OwnerName                         Ascii      32  unknown  unknown
-Exif.Canon.SerialNumber                      Long        1  1731000068  672c63236
+Exif.Canon.SerialNumber                      Long        1  1731000068  1731000068
 Exif.Canon.CameraInfo                        Undefined 1024  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 Exif.CanonCf.NoiseReduction                  Short       1  1  1
 Exif.CanonCf.ShutterAeLock                   Short       1  256  256

test/data/test_reference_files/exiv2-canon-eos-300d.jpg.out

@@ -96,7 +96,7 @@ Exif.CanonFi.RawJpgSize                      SShort      1  -1  n/a
 Exif.CanonFi.NoiseReduction                  SShort      1  -1  (-1)
 Exif.Canon.ImageType                         Ascii      32  IMG:EOS 300D DIGITAL JPEG  IMG:EOS 300D DIGITAL JPEG
 Exif.Canon.FirmwareVersion                   Ascii      32  Firmware Version 1.0.2  Firmware Version 1.0.2
-Exif.Canon.SerialNumber                      Long        1  570004681  21f938089
+Exif.Canon.SerialNumber                      Long        1  570004681  570004681
 Exif.Canon.SerialNumberFormat                Long        1  2415919104  Format 1
 Exif.Canon.FileNumber                        Long        1  1030390  103-0390
 Exif.Canon.OwnerName                         Ascii      32    

test/data/test_reference_files/exiv2-canon-powershot-s40.crw.out

@@ -10,7 +10,7 @@ Exif.Canon.ImageType                         Ascii      30  CRW:High definition
 Exif.Canon.OwnerName                         Ascii      15  Andreas Huggel  Andreas Huggel
 Exif.Image.Make                              Ascii       6  Canon  Canon
 Exif.Image.Model                             Ascii      20  Canon PowerShot S40  Canon PowerShot S40
-Exif.Canon.SerialNumber                      Long        2  1135765596 1446117789  43b226716
+Exif.Canon.SerialNumber                      Long        2  1135765596 1446117789  1135765596 1446117789
 Exif.Canon.FirmwareVersion                   Ascii      22  Firmware Version 1.10  Firmware Version 1.10
 Exif.Canon.FocalLength                       Short       4  2 227 286 215  7.1 mm
 Exif.CanonSi.AutoISO                         Short       1  0  100

test/data/test_reference_files/exiv2-test.out

@@ -1193,7 +1193,7 @@ File  6/16: 20030925_201850.jpg
 20030925_201850.jpg   Exif.CanonFi.NoiseReduction                  SShort      1  (-1)
 20030925_201850.jpg   Exif.Canon.ImageType                         Ascii      32  IMG:EOS 300D DIGITAL JPEG
 20030925_201850.jpg   Exif.Canon.FirmwareVersion                   Ascii      32  Firmware Version 1.0.2
-20030925_201850.jpg   Exif.Canon.SerialNumber                      Long        1  21f938089
+20030925_201850.jpg   Exif.Canon.SerialNumber                      Long        1  570004681
 20030925_201850.jpg   Exif.Canon.SerialNumberFormat                Long        1  Format 1
 20030925_201850.jpg   Exif.Canon.FileNumber                        Long        1  103-0390
 20030925_201850.jpg   Exif.Canon.OwnerName                         Ascii      32  
@@ -1780,7 +1780,7 @@ Warning: Directory Canon has an unexpected next pointer; ignored.
 20060802_095200.jpg   Exif.Canon.ImageType                         Ascii      32  Canon EOS 20D
 20060802_095200.jpg   Exif.Canon.FirmwareVersion                   Ascii      32  Firmware 2.0.3
 20060802_095200.jpg   Exif.Canon.OwnerName                         Ascii      32  unknown
-20060802_095200.jpg   Exif.Canon.SerialNumber                      Long        1  672c63236
+20060802_095200.jpg   Exif.Canon.SerialNumber                      Long        1  1731000068
 20060802_095200.jpg   Exif.Canon.CameraInfo                        Undefined 1024  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 20060802_095200.jpg   Exif.CanonCf.0x0000                          Short       1  38
 20060802_095200.jpg   Exif.CanonCf.NoiseReduction                  Short       1  1
@@ -2834,7 +2834,7 @@ Compare image data and extracted data ------------------------------------
 < 20030925_201850.jpg   Exif.CanonFi.NoiseReduction                  SShort      1  (-1)
 < 20030925_201850.jpg   Exif.Canon.ImageType                         Ascii      32  IMG:EOS 300D DIGITAL JPEG
 < 20030925_201850.jpg   Exif.Canon.FirmwareVersion                   Ascii      32  Firmware Version 1.0.2
-< 20030925_201850.jpg   Exif.Canon.SerialNumber                      Long        1  21f938089
+< 20030925_201850.jpg   Exif.Canon.SerialNumber                      Long        1  570004681
 < 20030925_201850.jpg   Exif.Canon.SerialNumberFormat                Long        1  Format 1
 < 20030925_201850.jpg   Exif.Canon.FileNumber                        Long        1  103-0390
 < 20030925_201850.jpg   Exif.Canon.OwnerName                         Ascii      32  
@@ -3420,7 +3420,7 @@ Compare image data and extracted data ------------------------------------
 < 20060802_095200.jpg   Exif.Canon.ImageType                         Ascii      32  Canon EOS 20D
 < 20060802_095200.jpg   Exif.Canon.FirmwareVersion                   Ascii      32  Firmware 2.0.3
 < 20060802_095200.jpg   Exif.Canon.OwnerName                         Ascii      32  unknown
-< 20060802_095200.jpg   Exif.Canon.SerialNumber                      Long        1  672c63236
+< 20060802_095200.jpg   Exif.Canon.SerialNumber                      Long        1  1731000068
 < 20060802_095200.jpg   Exif.Canon.CameraInfo                        Undefined 1024  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 < 20060802_095200.jpg   Exif.CanonCf.0x0000                          Short       1  38
 < 20060802_095200.jpg   Exif.CanonCf.NoiseReduction                  Short       1  1
@@ -4397,7 +4397,7 @@ Compare image data and extracted data ------------------------------------
 > 20030925_201850.exv   Exif.CanonFi.NoiseReduction                  SShort      1  (-1)
 > 20030925_201850.exv   Exif.Canon.ImageType                         Ascii      32  IMG:EOS 300D DIGITAL JPEG
 > 20030925_201850.exv   Exif.Canon.FirmwareVersion                   Ascii      32  Firmware Version 1.0.2
-> 20030925_201850.exv   Exif.Canon.SerialNumber                      Long        1  21f938089
+> 20030925_201850.exv   Exif.Canon.SerialNumber                      Long        1  570004681
 > 20030925_201850.exv   Exif.Canon.SerialNumberFormat                Long        1  Format 1
 > 20030925_201850.exv   Exif.Canon.FileNumber                        Long        1  103-0390
 > 20030925_201850.exv   Exif.Canon.OwnerName                         Ascii      32  
@@ -4983,7 +4983,7 @@ Compare image data and extracted data ------------------------------------
 > 20060802_095200.exv   Exif.Canon.ImageType                         Ascii      32  Canon EOS 20D
 > 20060802_095200.exv   Exif.Canon.FirmwareVersion                   Ascii      32  Firmware 2.0.3
 > 20060802_095200.exv   Exif.Canon.OwnerName                         Ascii      32  unknown
-> 20060802_095200.exv   Exif.Canon.SerialNumber                      Long        1  672c63236
+> 20060802_095200.exv   Exif.Canon.SerialNumber                      Long        1  1731000068
 > 20060802_095200.exv   Exif.Canon.CameraInfo                        Undefined 1024  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 > 20060802_095200.exv   Exif.CanonCf.0x0000                          Short       1  38
 > 20060802_095200.exv   Exif.CanonCf.NoiseReduction                  Short       1  1
@@ -6198,7 +6198,7 @@ Compare original and inserted image data ---------------------------------
 < 20030925_201850.jpg   Exif.CanonFi.NoiseReduction                  SShort      1  (-1)
 < 20030925_201850.jpg   Exif.Canon.ImageType                         Ascii      32  IMG:EOS 300D DIGITAL JPEG
 < 20030925_201850.jpg   Exif.Canon.FirmwareVersion                   Ascii      32  Firmware Version 1.0.2
-< 20030925_201850.jpg   Exif.Canon.SerialNumber                      Long        1  21f938089
+< 20030925_201850.jpg   Exif.Canon.SerialNumber                      Long        1  570004681
 < 20030925_201850.jpg   Exif.Canon.SerialNumberFormat                Long        1  Format 1
 < 20030925_201850.jpg   Exif.Canon.FileNumber                        Long        1  103-0390
 < 20030925_201850.jpg   Exif.Canon.OwnerName                         Ascii      32  
@@ -6784,7 +6784,7 @@ Compare original and inserted image data ---------------------------------
 < 20060802_095200.jpg   Exif.Canon.ImageType                         Ascii      32  Canon EOS 20D
 < 20060802_095200.jpg   Exif.Canon.FirmwareVersion                   Ascii      32  Firmware 2.0.3
 < 20060802_095200.jpg   Exif.Canon.OwnerName                         Ascii      32  unknown
-< 20060802_095200.jpg   Exif.Canon.SerialNumber                      Long        1  672c63236
+< 20060802_095200.jpg   Exif.Canon.SerialNumber                      Long        1  1731000068
 < 20060802_095200.jpg   Exif.Canon.CameraInfo                        Undefined 1024  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 < 20060802_095200.jpg   Exif.CanonCf.0x0000                          Short       1  38
 < 20060802_095200.jpg   Exif.CanonCf.NoiseReduction                  Short       1  1
@@ -7761,7 +7761,7 @@ Compare original and inserted image data ---------------------------------
 > 20030925_201850.exv   Exif.CanonFi.NoiseReduction                  SShort      1  (-1)
 > 20030925_201850.exv   Exif.Canon.ImageType                         Ascii      32  IMG:EOS 300D DIGITAL JPEG
 > 20030925_201850.exv   Exif.Canon.FirmwareVersion                   Ascii      32  Firmware Version 1.0.2
-> 20030925_201850.exv   Exif.Canon.SerialNumber                      Long        1  21f938089
+> 20030925_201850.exv   Exif.Canon.SerialNumber                      Long        1  570004681
 > 20030925_201850.exv   Exif.Canon.SerialNumberFormat                Long        1  Format 1
 > 20030925_201850.exv   Exif.Canon.FileNumber                        Long        1  103-0390
 > 20030925_201850.exv   Exif.Canon.OwnerName                         Ascii      32  
@@ -8347,7 +8347,7 @@ Compare original and inserted image data ---------------------------------
 > 20060802_095200.exv   Exif.Canon.ImageType                         Ascii      32  Canon EOS 20D
 > 20060802_095200.exv   Exif.Canon.FirmwareVersion                   Ascii      32  Firmware 2.0.3
 > 20060802_095200.exv   Exif.Canon.OwnerName                         Ascii      32  unknown
-> 20060802_095200.exv   Exif.Canon.SerialNumber                      Long        1  672c63236
+> 20060802_095200.exv   Exif.Canon.SerialNumber                      Long        1  1731000068
 > 20060802_095200.exv   Exif.Canon.CameraInfo                        Undefined 1024  0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 > 20060802_095200.exv   Exif.CanonCf.0x0000                          Short       1  38
 > 20060802_095200.exv   Exif.CanonCf.NoiseReduction                  Short       1  1

test/data/test_reference_files/issue_1763_poc.exv.out

@@ -76,7 +76,7 @@ Exif.Canon.ImageType                         Ascii      32  Canon EOS 5D Mark II
 Exif.Canon.FirmwareVersion                   Ascii      32  Firmware Version 2.0.8  Firmware Version 2.0.8
 Exif.Canon.FileNumber                        Long        1  0  (0)
 Exif.Canon.OwnerName                         Ascii      32    
-Exif.Canon.SerialNumber                      Long        1  210104331  0c8561451
+Exif.Canon.SerialNumber                      Long        1  210104331  210104331
 Exif.Canon.ModelID                           Long        1  2147484184  EOS 5D Mark II
 Exif.Canon.SerialNumberFormat                Long        1  2684354560  Format 2
 Exif.Canon.AFInfo                            Short      50  100 0 9 9 5616 3744 5616 3744 84 84 101 84 84 84 101 84 123 101 101 74 101 101 101 74 101 131 64363 64975 0 561 1173 561 0 64975 0 0 280 501 280 0 65256 65035 65256 0 256 0 0 65535 0 36000  100 0 9 9 5616 3744 5616 3744 84 84 101 84 84 84 101 84 123 101 101 74 101 101 101 74 101 131 64363 64975 0 561 1173 561 0 64975 0 0 280 501 280 0 65256 65035 65256 0 256 0 0 65535 0 36000

test/data/test_reference_files/template.exv.out

@@ -91,7 +91,7 @@ Exif.Canon.ImageType                         Ascii      32  Canon EOS 5D Mark II
 Exif.Canon.FirmwareVersion                   Ascii      32  Firmware Version 2.0.8  Firmware Version 2.0.8
 Exif.Canon.FileNumber                        Long        1  0  (0)
 Exif.Canon.OwnerName                         Ascii      32    
-Exif.Canon.SerialNumber                      Long        1  210104331  0c8561451
+Exif.Canon.SerialNumber                      Long        1  210104331  210104331
 Exif.Canon.ModelID                           Long        1  2147484184  EOS 5D Mark II
 Exif.Canon.SerialNumberFormat                Long        1  2684354560  Format 2
 Exif.Canon.AFInfo                            Short      50  100 0 9 9 5616 3744 5616 3744 84 84 101 84 84 84 101 84 123 101 101 74 101 101 101 74 101 131 64363 64975 0 561 1173 561 0 64975 0 0 280 501 280 0 65256 65035 65256 0 256 0 0 65535 0 36000  100 0 9 9 5616 3744 5616 3744 84 84 101 84 84 84 101 84 123 101 101 74 101 101 101 74 101 131 64363 64975 0 561 1173 561 0 64975 0 0 280 501 280 0 65256 65035 65256 0 256 0 0 65535 0 36000

tests/bash_tests/test_easyaccess.py

@@ -98,7 +98,7 @@ Max aperture value    (Exif.Photo.MaxApertureValue        ) : F3.5
 Subject distance      (Exif.CanonSi.SubjectDistance       ) : Infinite
 Light source          (                                   ) : 
 Flash                 (Exif.Photo.Flash                   ) : No flash
-Camera serial number  (Exif.Canon.SerialNumber            ) : 21f938089
+Camera serial number  (Exif.Canon.SerialNumber            ) : 570004681
 Focal length          (Exif.Photo.FocalLength             ) : 18.0 mm
 Subject location/area (                                   ) : 
 Flash energy          (                                   ) :