diff --git a/test/data/test_reference_files/exiv2-test.out b/test/data/test_reference_files/exiv2-test.out index 79a63fb5..5345b3bc 100644 --- a/test/data/test_reference_files/exiv2-test.out +++ b/test/data/test_reference_files/exiv2-test.out @@ -1131,13 +1131,13 @@ File 6/16: 20030925_201850.jpg 20030925_201850.jpg Exif.CanonCs.0x001e Short 1 0 20030925_201850.jpg Exif.CanonCs.0x001f Short 1 0 20030925_201850.jpg Exif.CanonCs.FocusContinuous Short 1 (65535) -20030925_201850.jpg Exif.CanonCs.AESetting Short 1 (65535) +20030925_201850.jpg Exif.CanonCs.AESetting Short 1 n/a 20030925_201850.jpg Exif.CanonCs.ImageStabilization Short 1 (65535) 20030925_201850.jpg Exif.CanonCs.DisplayAperture Short 1 0 20030925_201850.jpg Exif.CanonCs.ZoomSourceWidth Short 1 3072 20030925_201850.jpg Exif.CanonCs.ZoomTargetWidth Short 1 3072 20030925_201850.jpg Exif.CanonCs.0x0026 Short 1 0 -20030925_201850.jpg Exif.CanonCs.SpotMeteringMode Short 1 (65535) +20030925_201850.jpg Exif.CanonCs.SpotMeteringMode Short 1 n/a 20030925_201850.jpg Exif.CanonCs.PhotoEffect Short 1 (65535) 20030925_201850.jpg Exif.CanonCs.ManualFlashOutput Short 1 n/a 20030925_201850.jpg Exif.CanonCs.ColorTone Short 1 0 @@ -1724,13 +1724,13 @@ Warning: Directory Canon has an unexpected next pointer; ignored. 20060802_095200.jpg Exif.CanonCs.0x001e Short 1 0 20060802_095200.jpg Exif.CanonCs.0x001f Short 1 0 20060802_095200.jpg Exif.CanonCs.FocusContinuous Short 1 Single -20060802_095200.jpg Exif.CanonCs.AESetting Short 1 (65535) +20060802_095200.jpg Exif.CanonCs.AESetting Short 1 n/a 20060802_095200.jpg Exif.CanonCs.ImageStabilization Short 1 (65535) 20060802_095200.jpg Exif.CanonCs.DisplayAperture Short 1 0 20060802_095200.jpg Exif.CanonCs.ZoomSourceWidth Short 1 0 20060802_095200.jpg Exif.CanonCs.ZoomTargetWidth Short 1 0 20060802_095200.jpg Exif.CanonCs.0x0026 Short 1 0 -20060802_095200.jpg Exif.CanonCs.SpotMeteringMode Short 1 (65535) +20060802_095200.jpg Exif.CanonCs.SpotMeteringMode Short 1 n/a 20060802_095200.jpg Exif.CanonCs.PhotoEffect Short 1 Off 20060802_095200.jpg Exif.CanonCs.ManualFlashOutput Short 1 (32767) 20060802_095200.jpg Exif.CanonCs.ColorTone Short 1 0 @@ -2772,13 +2772,13 @@ Compare image data and extracted data ------------------------------------ < 20030925_201850.jpg Exif.CanonCs.0x001e Short 1 0 < 20030925_201850.jpg Exif.CanonCs.0x001f Short 1 0 < 20030925_201850.jpg Exif.CanonCs.FocusContinuous Short 1 (65535) -< 20030925_201850.jpg Exif.CanonCs.AESetting Short 1 (65535) +< 20030925_201850.jpg Exif.CanonCs.AESetting Short 1 n/a < 20030925_201850.jpg Exif.CanonCs.ImageStabilization Short 1 (65535) < 20030925_201850.jpg Exif.CanonCs.DisplayAperture Short 1 0 < 20030925_201850.jpg Exif.CanonCs.ZoomSourceWidth Short 1 3072 < 20030925_201850.jpg Exif.CanonCs.ZoomTargetWidth Short 1 3072 < 20030925_201850.jpg Exif.CanonCs.0x0026 Short 1 0 -< 20030925_201850.jpg Exif.CanonCs.SpotMeteringMode Short 1 (65535) +< 20030925_201850.jpg Exif.CanonCs.SpotMeteringMode Short 1 n/a < 20030925_201850.jpg Exif.CanonCs.PhotoEffect Short 1 (65535) < 20030925_201850.jpg Exif.CanonCs.ManualFlashOutput Short 1 n/a < 20030925_201850.jpg Exif.CanonCs.ColorTone Short 1 0 @@ -3364,13 +3364,13 @@ Compare image data and extracted data ------------------------------------ < 20060802_095200.jpg Exif.CanonCs.0x001e Short 1 0 < 20060802_095200.jpg Exif.CanonCs.0x001f Short 1 0 < 20060802_095200.jpg Exif.CanonCs.FocusContinuous Short 1 Single -< 20060802_095200.jpg Exif.CanonCs.AESetting Short 1 (65535) +< 20060802_095200.jpg Exif.CanonCs.AESetting Short 1 n/a < 20060802_095200.jpg Exif.CanonCs.ImageStabilization Short 1 (65535) < 20060802_095200.jpg Exif.CanonCs.DisplayAperture Short 1 0 < 20060802_095200.jpg Exif.CanonCs.ZoomSourceWidth Short 1 0 < 20060802_095200.jpg Exif.CanonCs.ZoomTargetWidth Short 1 0 < 20060802_095200.jpg Exif.CanonCs.0x0026 Short 1 0 -< 20060802_095200.jpg Exif.CanonCs.SpotMeteringMode Short 1 (65535) +< 20060802_095200.jpg Exif.CanonCs.SpotMeteringMode Short 1 n/a < 20060802_095200.jpg Exif.CanonCs.PhotoEffect Short 1 Off < 20060802_095200.jpg Exif.CanonCs.ManualFlashOutput Short 1 (32767) < 20060802_095200.jpg Exif.CanonCs.ColorTone Short 1 0 @@ -4335,13 +4335,13 @@ Compare image data and extracted data ------------------------------------ > 20030925_201850.exv Exif.CanonCs.0x001e Short 1 0 > 20030925_201850.exv Exif.CanonCs.0x001f Short 1 0 > 20030925_201850.exv Exif.CanonCs.FocusContinuous Short 1 (65535) -> 20030925_201850.exv Exif.CanonCs.AESetting Short 1 (65535) +> 20030925_201850.exv Exif.CanonCs.AESetting Short 1 n/a > 20030925_201850.exv Exif.CanonCs.ImageStabilization Short 1 (65535) > 20030925_201850.exv Exif.CanonCs.DisplayAperture Short 1 0 > 20030925_201850.exv Exif.CanonCs.ZoomSourceWidth Short 1 3072 > 20030925_201850.exv Exif.CanonCs.ZoomTargetWidth Short 1 3072 > 20030925_201850.exv Exif.CanonCs.0x0026 Short 1 0 -> 20030925_201850.exv Exif.CanonCs.SpotMeteringMode Short 1 (65535) +> 20030925_201850.exv Exif.CanonCs.SpotMeteringMode Short 1 n/a > 20030925_201850.exv Exif.CanonCs.PhotoEffect Short 1 (65535) > 20030925_201850.exv Exif.CanonCs.ManualFlashOutput Short 1 n/a > 20030925_201850.exv Exif.CanonCs.ColorTone Short 1 0 @@ -4927,13 +4927,13 @@ Compare image data and extracted data ------------------------------------ > 20060802_095200.exv Exif.CanonCs.0x001e Short 1 0 > 20060802_095200.exv Exif.CanonCs.0x001f Short 1 0 > 20060802_095200.exv Exif.CanonCs.FocusContinuous Short 1 Single -> 20060802_095200.exv Exif.CanonCs.AESetting Short 1 (65535) +> 20060802_095200.exv Exif.CanonCs.AESetting Short 1 n/a > 20060802_095200.exv Exif.CanonCs.ImageStabilization Short 1 (65535) > 20060802_095200.exv Exif.CanonCs.DisplayAperture Short 1 0 > 20060802_095200.exv Exif.CanonCs.ZoomSourceWidth Short 1 0 > 20060802_095200.exv Exif.CanonCs.ZoomTargetWidth Short 1 0 > 20060802_095200.exv Exif.CanonCs.0x0026 Short 1 0 -> 20060802_095200.exv Exif.CanonCs.SpotMeteringMode Short 1 (65535) +> 20060802_095200.exv Exif.CanonCs.SpotMeteringMode Short 1 n/a > 20060802_095200.exv Exif.CanonCs.PhotoEffect Short 1 Off > 20060802_095200.exv Exif.CanonCs.ManualFlashOutput Short 1 (32767) > 20060802_095200.exv Exif.CanonCs.ColorTone Short 1 0 @@ -6136,13 +6136,13 @@ Compare original and inserted image data --------------------------------- < 20030925_201850.jpg Exif.CanonCs.0x001e Short 1 0 < 20030925_201850.jpg Exif.CanonCs.0x001f Short 1 0 < 20030925_201850.jpg Exif.CanonCs.FocusContinuous Short 1 (65535) -< 20030925_201850.jpg Exif.CanonCs.AESetting Short 1 (65535) +< 20030925_201850.jpg Exif.CanonCs.AESetting Short 1 n/a < 20030925_201850.jpg Exif.CanonCs.ImageStabilization Short 1 (65535) < 20030925_201850.jpg Exif.CanonCs.DisplayAperture Short 1 0 < 20030925_201850.jpg Exif.CanonCs.ZoomSourceWidth Short 1 3072 < 20030925_201850.jpg Exif.CanonCs.ZoomTargetWidth Short 1 3072 < 20030925_201850.jpg Exif.CanonCs.0x0026 Short 1 0 -< 20030925_201850.jpg Exif.CanonCs.SpotMeteringMode Short 1 (65535) +< 20030925_201850.jpg Exif.CanonCs.SpotMeteringMode Short 1 n/a < 20030925_201850.jpg Exif.CanonCs.PhotoEffect Short 1 (65535) < 20030925_201850.jpg Exif.CanonCs.ManualFlashOutput Short 1 n/a < 20030925_201850.jpg Exif.CanonCs.ColorTone Short 1 0 @@ -6728,13 +6728,13 @@ Compare original and inserted image data --------------------------------- < 20060802_095200.jpg Exif.CanonCs.0x001e Short 1 0 < 20060802_095200.jpg Exif.CanonCs.0x001f Short 1 0 < 20060802_095200.jpg Exif.CanonCs.FocusContinuous Short 1 Single -< 20060802_095200.jpg Exif.CanonCs.AESetting Short 1 (65535) +< 20060802_095200.jpg Exif.CanonCs.AESetting Short 1 n/a < 20060802_095200.jpg Exif.CanonCs.ImageStabilization Short 1 (65535) < 20060802_095200.jpg Exif.CanonCs.DisplayAperture Short 1 0 < 20060802_095200.jpg Exif.CanonCs.ZoomSourceWidth Short 1 0 < 20060802_095200.jpg Exif.CanonCs.ZoomTargetWidth Short 1 0 < 20060802_095200.jpg Exif.CanonCs.0x0026 Short 1 0 -< 20060802_095200.jpg Exif.CanonCs.SpotMeteringMode Short 1 (65535) +< 20060802_095200.jpg Exif.CanonCs.SpotMeteringMode Short 1 n/a < 20060802_095200.jpg Exif.CanonCs.PhotoEffect Short 1 Off < 20060802_095200.jpg Exif.CanonCs.ManualFlashOutput Short 1 (32767) < 20060802_095200.jpg Exif.CanonCs.ColorTone Short 1 0 @@ -7699,13 +7699,13 @@ Compare original and inserted image data --------------------------------- > 20030925_201850.exv Exif.CanonCs.0x001e Short 1 0 > 20030925_201850.exv Exif.CanonCs.0x001f Short 1 0 > 20030925_201850.exv Exif.CanonCs.FocusContinuous Short 1 (65535) -> 20030925_201850.exv Exif.CanonCs.AESetting Short 1 (65535) +> 20030925_201850.exv Exif.CanonCs.AESetting Short 1 n/a > 20030925_201850.exv Exif.CanonCs.ImageStabilization Short 1 (65535) > 20030925_201850.exv Exif.CanonCs.DisplayAperture Short 1 0 > 20030925_201850.exv Exif.CanonCs.ZoomSourceWidth Short 1 3072 > 20030925_201850.exv Exif.CanonCs.ZoomTargetWidth Short 1 3072 > 20030925_201850.exv Exif.CanonCs.0x0026 Short 1 0 -> 20030925_201850.exv Exif.CanonCs.SpotMeteringMode Short 1 (65535) +> 20030925_201850.exv Exif.CanonCs.SpotMeteringMode Short 1 n/a > 20030925_201850.exv Exif.CanonCs.PhotoEffect Short 1 (65535) > 20030925_201850.exv Exif.CanonCs.ManualFlashOutput Short 1 n/a > 20030925_201850.exv Exif.CanonCs.ColorTone Short 1 0 @@ -8291,13 +8291,13 @@ Compare original and inserted image data --------------------------------- > 20060802_095200.exv Exif.CanonCs.0x001e Short 1 0 > 20060802_095200.exv Exif.CanonCs.0x001f Short 1 0 > 20060802_095200.exv Exif.CanonCs.FocusContinuous Short 1 Single -> 20060802_095200.exv Exif.CanonCs.AESetting Short 1 (65535) +> 20060802_095200.exv Exif.CanonCs.AESetting Short 1 n/a > 20060802_095200.exv Exif.CanonCs.ImageStabilization Short 1 (65535) > 20060802_095200.exv Exif.CanonCs.DisplayAperture Short 1 0 > 20060802_095200.exv Exif.CanonCs.ZoomSourceWidth Short 1 0 > 20060802_095200.exv Exif.CanonCs.ZoomTargetWidth Short 1 0 > 20060802_095200.exv Exif.CanonCs.0x0026 Short 1 0 -> 20060802_095200.exv Exif.CanonCs.SpotMeteringMode Short 1 (65535) +> 20060802_095200.exv Exif.CanonCs.SpotMeteringMode Short 1 n/a > 20060802_095200.exv Exif.CanonCs.PhotoEffect Short 1 Off > 20060802_095200.exv Exif.CanonCs.ManualFlashOutput Short 1 (32767) > 20060802_095200.exv Exif.CanonCs.ColorTone Short 1 0