diff --git a/test/data/test_reference_files/exiv2-test.out b/test/data/test_reference_files/exiv2-test.out index bc020513..11d52471 100644 --- a/test/data/test_reference_files/exiv2-test.out +++ b/test/data/test_reference_files/exiv2-test.out @@ -1173,7 +1173,7 @@ File 6/16: 20030925_201850.jpg 20030925_201850.jpg Exif.CanonSi.BulbDuration Short 1 0 20030925_201850.jpg Exif.CanonSi.0x0019 Short 1 0 20030925_201850.jpg Exif.CanonSi.CameraType Short 1 EOS Mid-range -20030925_201850.jpg Exif.CanonSi.AutoRotate Short 1 1 +20030925_201850.jpg Exif.CanonSi.AutoRotate Short 1 Rotate 90 CW 20030925_201850.jpg Exif.CanonSi.NDFilter Short 1 n/a 20030925_201850.jpg Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s 20030925_201850.jpg Exif.CanonSi.0x001e Short 1 0 @@ -1766,9 +1766,9 @@ Warning: Directory Canon has an unexpected next pointer; ignored. 20060802_095200.jpg Exif.CanonSi.BulbDuration Short 1 0 20060802_095200.jpg Exif.CanonSi.0x0019 Short 1 0 20060802_095200.jpg Exif.CanonSi.CameraType Short 1 EOS Mid-range -20060802_095200.jpg Exif.CanonSi.AutoRotate Short 1 0 +20060802_095200.jpg Exif.CanonSi.AutoRotate Short 1 None 20060802_095200.jpg Exif.CanonSi.NDFilter Short 1 n/a -20060802_095200.jpg Exif.CanonSi.SelfTimer2 Short 1 (0) +20060802_095200.jpg Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s 20060802_095200.jpg Exif.CanonSi.0x001e Short 1 0 20060802_095200.jpg Exif.CanonSi.0x001f Short 1 0 20060802_095200.jpg Exif.CanonSi.0x0020 Short 1 0 @@ -1946,7 +1946,7 @@ File 14/16: 20001004_015404.jpg 20001004_015404.jpg Exif.CanonCs.0x001e Short 1 0 20001004_015404.jpg Exif.CanonCs.0x001f Short 1 0 20001004_015404.jpg Exif.Canon.FocalLength Short 4 70.0 mm -20001004_015404.jpg Exif.Canon.0x0003 Short 4 100 0 0 0 +20001004_015404.jpg Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 20001004_015404.jpg Exif.CanonSi.0x0000 Short 1 50 20001004_015404.jpg Exif.CanonSi.AutoISO Short 1 100 20001004_015404.jpg Exif.CanonSi.ISOSpeed Short 1 100 @@ -2117,9 +2117,9 @@ File 15/16: 20060127_225027.jpg 20060127_225027.jpg Exif.CanonSi.BulbDuration Short 1 0 20060127_225027.jpg Exif.CanonSi.0x0019 Short 1 0 20060127_225027.jpg Exif.CanonSi.CameraType Short 1 Compact -20060127_225027.jpg Exif.CanonSi.AutoRotate Short 1 0 +20060127_225027.jpg Exif.CanonSi.AutoRotate Short 1 None 20060127_225027.jpg Exif.CanonSi.NDFilter Short 1 Off -20060127_225027.jpg Exif.CanonSi.SelfTimer2 Short 1 (0) +20060127_225027.jpg Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s 20060127_225027.jpg Exif.CanonSi.0x001e Short 1 0 20060127_225027.jpg Exif.CanonSi.0x001f Short 1 0 20060127_225027.jpg Exif.CanonSi.0x0020 Short 1 0 @@ -2786,7 +2786,7 @@ Compare image data and extracted data ------------------------------------ < 20030925_201850.jpg Exif.CanonCs.0x002c Short 1 65535 < 20030925_201850.jpg Exif.CanonCs.0x002d Short 1 65535 < 20030925_201850.jpg Exif.Canon.FocalLength Short 4 18.0 mm -< 20030925_201850.jpg Exif.Canon.0x0003 Short 4 100 0 0 0 +< 20030925_201850.jpg Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 < 20030925_201850.jpg Exif.CanonSi.0x0000 Short 1 66 < 20030925_201850.jpg Exif.CanonSi.AutoISO Short 1 100 < 20030925_201850.jpg Exif.CanonSi.ISOSpeed Short 1 100 @@ -2814,9 +2814,9 @@ Compare image data and extracted data ------------------------------------ < 20030925_201850.jpg Exif.CanonSi.BulbDuration Short 1 0 < 20030925_201850.jpg Exif.CanonSi.0x0019 Short 1 0 < 20030925_201850.jpg Exif.CanonSi.CameraType Short 1 EOS Mid-range -< 20030925_201850.jpg Exif.CanonSi.AutoRotate Short 1 1 +< 20030925_201850.jpg Exif.CanonSi.AutoRotate Short 1 Rotate 90 CW < 20030925_201850.jpg Exif.CanonSi.NDFilter Short 1 n/a -< 20030925_201850.jpg Exif.CanonSi.SelfTimer2 Short 1 (0) +< 20030925_201850.jpg Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s < 20030925_201850.jpg Exif.CanonSi.0x001e Short 1 0 < 20030925_201850.jpg Exif.CanonSi.0x001f Short 1 0 < 20030925_201850.jpg Exif.CanonSi.0x0020 Short 1 0 @@ -3406,9 +3406,9 @@ Compare image data and extracted data ------------------------------------ < 20060802_095200.jpg Exif.CanonSi.BulbDuration Short 1 0 < 20060802_095200.jpg Exif.CanonSi.0x0019 Short 1 0 < 20060802_095200.jpg Exif.CanonSi.CameraType Short 1 EOS Mid-range -< 20060802_095200.jpg Exif.CanonSi.AutoRotate Short 1 0 +< 20060802_095200.jpg Exif.CanonSi.AutoRotate Short 1 None < 20060802_095200.jpg Exif.CanonSi.NDFilter Short 1 n/a -< 20060802_095200.jpg Exif.CanonSi.SelfTimer2 Short 1 (0) +< 20060802_095200.jpg Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s < 20060802_095200.jpg Exif.CanonSi.0x001e Short 1 0 < 20060802_095200.jpg Exif.CanonSi.0x001f Short 1 0 < 20060802_095200.jpg Exif.CanonSi.0x0020 Short 1 0 @@ -3586,7 +3586,7 @@ Compare image data and extracted data ------------------------------------ < 20001004_015404.jpg Exif.CanonCs.0x001e Short 1 0 < 20001004_015404.jpg Exif.CanonCs.0x001f Short 1 0 < 20001004_015404.jpg Exif.Canon.FocalLength Short 4 70.0 mm -< 20001004_015404.jpg Exif.Canon.0x0003 Short 4 100 0 0 0 +< 20001004_015404.jpg Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 < 20001004_015404.jpg Exif.CanonSi.0x0000 Short 1 50 < 20001004_015404.jpg Exif.CanonSi.AutoISO Short 1 100 < 20001004_015404.jpg Exif.CanonSi.ISOSpeed Short 1 100 @@ -3757,9 +3757,9 @@ Compare image data and extracted data ------------------------------------ < 20060127_225027.jpg Exif.CanonSi.BulbDuration Short 1 0 < 20060127_225027.jpg Exif.CanonSi.0x0019 Short 1 0 < 20060127_225027.jpg Exif.CanonSi.CameraType Short 1 Compact -< 20060127_225027.jpg Exif.CanonSi.AutoRotate Short 1 0 +< 20060127_225027.jpg Exif.CanonSi.AutoRotate Short 1 None < 20060127_225027.jpg Exif.CanonSi.NDFilter Short 1 Off -< 20060127_225027.jpg Exif.CanonSi.SelfTimer2 Short 1 (0) +< 20060127_225027.jpg Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s < 20060127_225027.jpg Exif.CanonSi.0x001e Short 1 0 < 20060127_225027.jpg Exif.CanonSi.0x001f Short 1 0 < 20060127_225027.jpg Exif.CanonSi.0x0020 Short 1 0 @@ -4349,7 +4349,7 @@ Compare image data and extracted data ------------------------------------ > 20030925_201850.exv Exif.CanonCs.0x002c Short 1 65535 > 20030925_201850.exv Exif.CanonCs.0x002d Short 1 65535 > 20030925_201850.exv Exif.Canon.FocalLength Short 4 18.0 mm -> 20030925_201850.exv Exif.Canon.0x0003 Short 4 100 0 0 0 +> 20030925_201850.exv Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 > 20030925_201850.exv Exif.CanonSi.0x0000 Short 1 66 > 20030925_201850.exv Exif.CanonSi.AutoISO Short 1 100 > 20030925_201850.exv Exif.CanonSi.ISOSpeed Short 1 100 @@ -4377,9 +4377,9 @@ Compare image data and extracted data ------------------------------------ > 20030925_201850.exv Exif.CanonSi.BulbDuration Short 1 0 > 20030925_201850.exv Exif.CanonSi.0x0019 Short 1 0 > 20030925_201850.exv Exif.CanonSi.CameraType Short 1 EOS Mid-range -> 20030925_201850.exv Exif.CanonSi.AutoRotate Short 1 1 +> 20030925_201850.exv Exif.CanonSi.AutoRotate Short 1 Rotate 90 CW > 20030925_201850.exv Exif.CanonSi.NDFilter Short 1 n/a -> 20030925_201850.exv Exif.CanonSi.SelfTimer2 Short 1 (0) +> 20030925_201850.exv Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s > 20030925_201850.exv Exif.CanonSi.0x001e Short 1 0 > 20030925_201850.exv Exif.CanonSi.0x001f Short 1 0 > 20030925_201850.exv Exif.CanonSi.0x0020 Short 1 0 @@ -4969,9 +4969,9 @@ Compare image data and extracted data ------------------------------------ > 20060802_095200.exv Exif.CanonSi.BulbDuration Short 1 0 > 20060802_095200.exv Exif.CanonSi.0x0019 Short 1 0 > 20060802_095200.exv Exif.CanonSi.CameraType Short 1 EOS Mid-range -> 20060802_095200.exv Exif.CanonSi.AutoRotate Short 1 0 +> 20060802_095200.exv Exif.CanonSi.AutoRotate Short 1 None > 20060802_095200.exv Exif.CanonSi.NDFilter Short 1 n/a -> 20060802_095200.exv Exif.CanonSi.SelfTimer2 Short 1 (0) +> 20060802_095200.exv Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s > 20060802_095200.exv Exif.CanonSi.0x001e Short 1 0 > 20060802_095200.exv Exif.CanonSi.0x001f Short 1 0 > 20060802_095200.exv Exif.CanonSi.0x0020 Short 1 0 @@ -5149,7 +5149,7 @@ Compare image data and extracted data ------------------------------------ > 20001004_015404.exv Exif.CanonCs.0x001e Short 1 0 > 20001004_015404.exv Exif.CanonCs.0x001f Short 1 0 > 20001004_015404.exv Exif.Canon.FocalLength Short 4 70.0 mm -> 20001004_015404.exv Exif.Canon.0x0003 Short 4 100 0 0 0 +> 20001004_015404.exv Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 > 20001004_015404.exv Exif.CanonSi.0x0000 Short 1 50 > 20001004_015404.exv Exif.CanonSi.AutoISO Short 1 100 > 20001004_015404.exv Exif.CanonSi.ISOSpeed Short 1 100 @@ -5320,9 +5320,9 @@ Compare image data and extracted data ------------------------------------ > 20060127_225027.exv Exif.CanonSi.BulbDuration Short 1 0 > 20060127_225027.exv Exif.CanonSi.0x0019 Short 1 0 > 20060127_225027.exv Exif.CanonSi.CameraType Short 1 Compact -> 20060127_225027.exv Exif.CanonSi.AutoRotate Short 1 0 +> 20060127_225027.exv Exif.CanonSi.AutoRotate Short 1 None > 20060127_225027.exv Exif.CanonSi.NDFilter Short 1 Off -> 20060127_225027.exv Exif.CanonSi.SelfTimer2 Short 1 (0) +> 20060127_225027.exv Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s > 20060127_225027.exv Exif.CanonSi.0x001e Short 1 0 > 20060127_225027.exv Exif.CanonSi.0x001f Short 1 0 > 20060127_225027.exv Exif.CanonSi.0x0020 Short 1 0 @@ -6150,7 +6150,7 @@ Compare original and inserted image data --------------------------------- < 20030925_201850.jpg Exif.CanonCs.0x002c Short 1 65535 < 20030925_201850.jpg Exif.CanonCs.0x002d Short 1 65535 < 20030925_201850.jpg Exif.Canon.FocalLength Short 4 18.0 mm -< 20030925_201850.jpg Exif.Canon.0x0003 Short 4 100 0 0 0 +< 20030925_201850.jpg Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 < 20030925_201850.jpg Exif.CanonSi.0x0000 Short 1 66 < 20030925_201850.jpg Exif.CanonSi.AutoISO Short 1 100 < 20030925_201850.jpg Exif.CanonSi.ISOSpeed Short 1 100 @@ -6178,9 +6178,9 @@ Compare original and inserted image data --------------------------------- < 20030925_201850.jpg Exif.CanonSi.BulbDuration Short 1 0 < 20030925_201850.jpg Exif.CanonSi.0x0019 Short 1 0 < 20030925_201850.jpg Exif.CanonSi.CameraType Short 1 EOS Mid-range -< 20030925_201850.jpg Exif.CanonSi.AutoRotate Short 1 1 +< 20030925_201850.jpg Exif.CanonSi.AutoRotate Short 1 Rotate 90 CW < 20030925_201850.jpg Exif.CanonSi.NDFilter Short 1 n/a -< 20030925_201850.jpg Exif.CanonSi.SelfTimer2 Short 1 (0) +< 20030925_201850.jpg Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s < 20030925_201850.jpg Exif.CanonSi.0x001e Short 1 0 < 20030925_201850.jpg Exif.CanonSi.0x001f Short 1 0 < 20030925_201850.jpg Exif.CanonSi.0x0020 Short 1 0 @@ -6770,9 +6770,9 @@ Compare original and inserted image data --------------------------------- < 20060802_095200.jpg Exif.CanonSi.BulbDuration Short 1 0 < 20060802_095200.jpg Exif.CanonSi.0x0019 Short 1 0 < 20060802_095200.jpg Exif.CanonSi.CameraType Short 1 EOS Mid-range -< 20060802_095200.jpg Exif.CanonSi.AutoRotate Short 1 0 +< 20060802_095200.jpg Exif.CanonSi.AutoRotate Short 1 None < 20060802_095200.jpg Exif.CanonSi.NDFilter Short 1 n/a -< 20060802_095200.jpg Exif.CanonSi.SelfTimer2 Short 1 (0) +< 20060802_095200.jpg Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s < 20060802_095200.jpg Exif.CanonSi.0x001e Short 1 0 < 20060802_095200.jpg Exif.CanonSi.0x001f Short 1 0 < 20060802_095200.jpg Exif.CanonSi.0x0020 Short 1 0 @@ -6950,7 +6950,7 @@ Compare original and inserted image data --------------------------------- < 20001004_015404.jpg Exif.CanonCs.0x001e Short 1 0 < 20001004_015404.jpg Exif.CanonCs.0x001f Short 1 0 < 20001004_015404.jpg Exif.Canon.FocalLength Short 4 70.0 mm -< 20001004_015404.jpg Exif.Canon.0x0003 Short 4 100 0 0 0 +< 20001004_015404.jpg Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 < 20001004_015404.jpg Exif.CanonSi.0x0000 Short 1 50 < 20001004_015404.jpg Exif.CanonSi.AutoISO Short 1 100 < 20001004_015404.jpg Exif.CanonSi.ISOSpeed Short 1 100 @@ -7121,9 +7121,9 @@ Compare original and inserted image data --------------------------------- < 20060127_225027.jpg Exif.CanonSi.BulbDuration Short 1 0 < 20060127_225027.jpg Exif.CanonSi.0x0019 Short 1 0 < 20060127_225027.jpg Exif.CanonSi.CameraType Short 1 Compact -< 20060127_225027.jpg Exif.CanonSi.AutoRotate Short 1 0 +< 20060127_225027.jpg Exif.CanonSi.AutoRotate Short 1 None < 20060127_225027.jpg Exif.CanonSi.NDFilter Short 1 Off -< 20060127_225027.jpg Exif.CanonSi.SelfTimer2 Short 1 (0) +< 20060127_225027.jpg Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s < 20060127_225027.jpg Exif.CanonSi.0x001e Short 1 0 < 20060127_225027.jpg Exif.CanonSi.0x001f Short 1 0 < 20060127_225027.jpg Exif.CanonSi.0x0020 Short 1 0 @@ -7713,7 +7713,7 @@ Compare original and inserted image data --------------------------------- > 20030925_201850.exv Exif.CanonCs.0x002c Short 1 65535 > 20030925_201850.exv Exif.CanonCs.0x002d Short 1 65535 > 20030925_201850.exv Exif.Canon.FocalLength Short 4 18.0 mm -> 20030925_201850.exv Exif.Canon.0x0003 Short 4 100 0 0 0 +> 20030925_201850.exv Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 > 20030925_201850.exv Exif.CanonSi.0x0000 Short 1 66 > 20030925_201850.exv Exif.CanonSi.AutoISO Short 1 100 > 20030925_201850.exv Exif.CanonSi.ISOSpeed Short 1 100 @@ -7741,9 +7741,9 @@ Compare original and inserted image data --------------------------------- > 20030925_201850.exv Exif.CanonSi.BulbDuration Short 1 0 > 20030925_201850.exv Exif.CanonSi.0x0019 Short 1 0 > 20030925_201850.exv Exif.CanonSi.CameraType Short 1 EOS Mid-range -> 20030925_201850.exv Exif.CanonSi.AutoRotate Short 1 1 +> 20030925_201850.exv Exif.CanonSi.AutoRotate Short 1 Rotate 90 CW > 20030925_201850.exv Exif.CanonSi.NDFilter Short 1 n/a -> 20030925_201850.exv Exif.CanonSi.SelfTimer2 Short 1 (0) +> 20030925_201850.exv Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s > 20030925_201850.exv Exif.CanonSi.0x001e Short 1 0 > 20030925_201850.exv Exif.CanonSi.0x001f Short 1 0 > 20030925_201850.exv Exif.CanonSi.0x0020 Short 1 0 @@ -8333,9 +8333,9 @@ Compare original and inserted image data --------------------------------- > 20060802_095200.exv Exif.CanonSi.BulbDuration Short 1 0 > 20060802_095200.exv Exif.CanonSi.0x0019 Short 1 0 > 20060802_095200.exv Exif.CanonSi.CameraType Short 1 EOS Mid-range -> 20060802_095200.exv Exif.CanonSi.AutoRotate Short 1 0 +> 20060802_095200.exv Exif.CanonSi.AutoRotate Short 1 None > 20060802_095200.exv Exif.CanonSi.NDFilter Short 1 n/a -> 20060802_095200.exv Exif.CanonSi.SelfTimer2 Short 1 (0) +> 20060802_095200.exv Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s > 20060802_095200.exv Exif.CanonSi.0x001e Short 1 0 > 20060802_095200.exv Exif.CanonSi.0x001f Short 1 0 > 20060802_095200.exv Exif.CanonSi.0x0020 Short 1 0 @@ -8513,7 +8513,7 @@ Compare original and inserted image data --------------------------------- > 20001004_015404.exv Exif.CanonCs.0x001e Short 1 0 > 20001004_015404.exv Exif.CanonCs.0x001f Short 1 0 > 20001004_015404.exv Exif.Canon.FocalLength Short 4 70.0 mm -> 20001004_015404.exv Exif.Canon.0x0003 Short 4 100 0 0 0 +> 20001004_015404.exv Exif.Canon.CanonFlashInfo Short 4 100 0 0 0 > 20001004_015404.exv Exif.CanonSi.0x0000 Short 1 50 > 20001004_015404.exv Exif.CanonSi.AutoISO Short 1 100 > 20001004_015404.exv Exif.CanonSi.ISOSpeed Short 1 100 @@ -8684,9 +8684,9 @@ Compare original and inserted image data --------------------------------- > 20060127_225027.exv Exif.CanonSi.BulbDuration Short 1 0 > 20060127_225027.exv Exif.CanonSi.0x0019 Short 1 0 > 20060127_225027.exv Exif.CanonSi.CameraType Short 1 Compact -> 20060127_225027.exv Exif.CanonSi.AutoRotate Short 1 0 +> 20060127_225027.exv Exif.CanonSi.AutoRotate Short 1 None > 20060127_225027.exv Exif.CanonSi.NDFilter Short 1 Off -> 20060127_225027.exv Exif.CanonSi.SelfTimer2 Short 1 (0) +> 20060127_225027.exv Exif.CanonSi.SelfTimer2 Short 1 Selftimer 2s > 20060127_225027.exv Exif.CanonSi.0x001e Short 1 0 > 20060127_225027.exv Exif.CanonSi.0x001f Short 1 0 > 20060127_225027.exv Exif.CanonSi.0x0020 Short 1 0 diff --git a/tests/bugfixes/github/test_issue_247.py b/tests/bugfixes/github/test_issue_247.py index 8c4d45df..1b92de10 100644 --- a/tests/bugfixes/github/test_issue_247.py +++ b/tests/bugfixes/github/test_issue_247.py @@ -75,14 +75,18 @@ Exif.CanonSi.ISOSpeed Short 1 100 Exif.CanonSi.MeasuredEV Short 1 13.63 Exif.CanonSi.TargetAperture Short 1 F5 Exif.CanonSi.TargetShutterSpeed Short 1 1/501 s +Exif.CanonSi.ExposureCompensation Short 1 0 Exif.CanonSi.WhiteBalance Short 1 Auto Exif.CanonSi.SlowShutter Short 1 Off Exif.CanonSi.Sequence Short 1 0 +Exif.CanonSi.OpticalZoomCode Short 1 6 Exif.CanonSi.CameraTemperature Short 1 -- Exif.CanonSi.FlashGuideNumber Short 1 0 Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used Exif.CanonSi.FlashBias Short 1 0 EV Exif.CanonSi.AutoExposureBracketing Short 1 Off +Exif.CanonSi.AEBBracketValue Short 1 0 +Exif.CanonSi.ControlMode Short 1 1 Exif.CanonSi.SubjectDistance Short 1 7.82 m Exif.CanonSi.ApertureValue Short 1 F5 Exif.CanonSi.ShutterSpeedValue Short 1 1/523 s diff --git a/tests/bugfixes/github/test_issue_981.py b/tests/bugfixes/github/test_issue_981.py index 6cc0e622..3370c391 100644 --- a/tests/bugfixes/github/test_issue_981.py +++ b/tests/bugfixes/github/test_issue_981.py @@ -32,7 +32,7 @@ Exif.Canon.AFYPositions SShort 9 0 321 -321 603 0 -60 Exif.Canon.AFPointsInFocus Short 1 4 Exif.Canon.AFPointsSelected Short 1 8 Exif.Canon.AFPointsUnusable Short 1 (none) -Exif.Canon.AFInfo Short 273 546 2 63 61 6720 4480 6720 4480 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 0 0 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 0 0 65200 64790 64435 64099 63764 336 0 65200 64099 63764 1772 1437 1101 746 336 0 1437 1101 746 336 0 65200 64790 64435 336 0 65200 64790 64435 64099 63764 1772 64790 64435 64099 63764 1772 1437 1101 746 63764 1772 1437 1101 746 336 0 65200 1101 746 336 0 65200 64790 64435 64099 336 0 65200 1772 1437 0 0 547 625 625 625 625 821 821 821 308 308 625 625 625 625 547 547 308 308 308 274 274 274 308 308 0 0 0 0 0 0 0 308 65228 65228 65228 65228 0 0 0 0 64911 65228 65228 65228 65228 65262 65262 65262 64911 64911 64989 64989 64989 64911 64911 64911 64715 64715 64715 64911 64911 0 0 0 512 0 0 0 512 0 0 0 0 0 0 65535 +""" , """Exif.Canon.AFInfo Short 273 546 2 63 61 6720 4480 6720 4480 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 0 0 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 0 0 65200 64790 64435 64099 63764 336 0 65200 64099 63764 1772 1437 1101 746 336 0 1437 1101 746 336 0 65200 64790 64435 336 0 65200 64790 64435 64099 63764 1772 64790 64435 64099 63764 1772 1437 1101 746 63764 1772 1437 1101 746 336 0 65200 1101 746 336 0 65200 64790 64435 64099 336 0 65200 1772 1437 0 0 547 625 625 625 625 821 821 821 308 308 625 625 625 625 547 547 308 308 308 274 274 274 308 308 0 0 0 0 0 0 0 308 65228 65228 65228 65228 0 0 0 0 64911 65228 65228 65228 65228 65262 65262 65262 64911 64911 64989 64989 64989 64911 64911 64911 64715 64715 64715 64911 64911 0 0 0 512 0 0 0 512 0 0 0 0 0 0 65535 Exif.Canon.AFInfoSize SShort 1 546 Exif.Canon.AFAreaMode SShort 1 Single-point AF Exif.Canon.AFNumPoints SShort 1 63 @@ -50,18 +50,18 @@ Exif.Canon.AFPointsSelected Short 4 25 Exif.Canon.AFPointsUnusable Short 4 (none) Exif.Canon.AFMicroAdj Long 11 44 2 0 10 4294967295 0 10 0 10 0 10 Exif.Canon.AFConfig Long 20 80 4 0 0 1 0 0 0 0 1 0 1 32639 1 0 1 0 0 0 2 -Exif.Canon.AFNumPoints SShort 1 63 +""","""Exif.Canon.AFNumPoints SShort 1 63 Exif.Canon.AFValidPoints SShort 1 61 Exif.Canon.AFPointsInFocus Short 4 0 560 57344 0 Exif.Canon.AFPointsSelected Short 4 0 1848 57344 0 Exif.Canon.AFPointsUnusable Short 4 0 0 0 0 -Exif.Canon.AFNumPoints SShort 1 63 +""","""Exif.Canon.AFNumPoints SShort 1 63 Exif.Canon.AFValidPoints SShort 1 61 Exif.Canon.AFPointsInFocus Short 4 20,21,25,45,46,47 Exif.Canon.AFPointsSelected Short 4 19,20,21,24,25,26,45,46,47 Exif.Canon.AFPointsUnusable Short 4 (none) -Exif.Canon.AFPointsUnusable Short 4 3608 49152 792 6272 -Exif.Canon.AFPointsUnusable Short 4 3,4,9,10,11,30,31,35,36,40,41,55,59,60 +""","""Exif.Canon.AFPointsUnusable Short 4 3608 49152 792 6272 +""","""Exif.Canon.AFPointsUnusable Short 4 3,4,9,10,11,30,31,35,36,40,41,55,59,60 """ ] stderr = [""]*len(commands) diff --git a/tests/bugfixes/github/test_pr1475_HIF.py b/tests/bugfixes/github/test_pr1475_HIF.py index 2473e50a..278a740d 100644 --- a/tests/bugfixes/github/test_pr1475_HIF.py +++ b/tests/bugfixes/github/test_pr1475_HIF.py @@ -164,6 +164,7 @@ Exif.CanonCs.FlashActivity Short 1 Did not fire Exif.CanonCs.FlashDetails Short 1 E-TTL Exif.CanonCs.ManualFlashOutput Short 1 n/a Exif.Canon.CanonFlashInfo Short 4 0 0 0 0 +Exif.CanonSi.ExposureCompensation Short 1 0 Exif.CanonSi.FlashGuideNumber Short 1 0 Exif.CanonSi.FlashBias Short 1 0 EV Exif.CanonSi.AutoExposureBracketing Short 1 Off diff --git a/tests/bugfixes/redmine/test_issue_1122.py b/tests/bugfixes/redmine/test_issue_1122.py index 45cbd56d..73180252 100644 --- a/tests/bugfixes/redmine/test_issue_1122.py +++ b/tests/bugfixes/redmine/test_issue_1122.py @@ -11,15 +11,18 @@ class CheckLensDetectionTeleconverter(metaclass=system_tests.CaseMeta): "$exiv2 -pa -g Lens $filename", ] - stdout = [ """Exif.CanonCs.LensType Short 1 173 -Exif.CanonCs.Lens Short 3 1000 300 1 -Exif.Canon.LensModel Ascii 74 300-1000mm -Exif.Photo.LensSpecification Rational 4 300/1 1000/1 0/1 0/1 -Exif.Photo.LensModel Ascii 11 300-1000mm -Exif.Photo.LensSerialNumber Ascii 11 0000000000 -Exif.CanonCs.LensType Short 1 Sigma 150-500mm f/5-6.3 APO DG OS HSM + 2x + stdout = [ """0x0016 CanonCs LensType Short 1 173 +0x0017 CanonCs Lens Short 3 1000 300 1 +0x0095 Canon LensModel Ascii 74 300-1000mm +0x0000 CanonLe LensSerialNumber SLong 1 0 +0xa432 Photo LensSpecification Rational 4 300/1 1000/1 0/1 0/1 +0xa434 Photo LensModel Ascii 11 300-1000mm +0xa435 Photo LensSerialNumber Ascii 11 0000000000 +""", + """Exif.CanonCs.LensType Short 1 Sigma 150-500mm f/5-6.3 APO DG OS HSM + 2x Exif.CanonCs.Lens Short 3 300.0 - 1000.0 mm Exif.Canon.LensModel Ascii 74 300-1000mm +Exif.CanonLe.LensSerialNumber SLong 1 0 Exif.Photo.LensSpecification Rational 4 300/1 1000/1 0/1 0/1 Exif.Photo.LensModel Ascii 11 300-1000mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 diff --git a/tests/bugfixes/redmine/test_issue_1252.py b/tests/bugfixes/redmine/test_issue_1252.py index 3283af87..16413699 100644 --- a/tests/bugfixes/redmine/test_issue_1252.py +++ b/tests/bugfixes/redmine/test_issue_1252.py @@ -19,12 +19,19 @@ class CanonLenses(metaclass=system_tests.CaseMeta): stdout = ["""Exif.CanonCs.LensType Short 1 Sigma APO 120-300mm f/2.8 EX DG OS HSM *OR* Sigma 120-300mm f/2.8 DG OS HSM S013 Exif.CanonCs.Lens Short 3 120.0 - 300.0 mm Exif.Canon.LensModel Ascii 74 120-300mm +Exif.CanonLe.LensSerialNumber SLong 1 0 +Exif.CanonAfC.USMLensElectronicMF SLong 1 Enable After AF +Exif.CanonAfC.LensDriveWhenAFImpossible SLong 1 Continue Focus Search Exif.Photo.LensSpecification Rational 4 120/1 300/1 0/1 0/1 Exif.Photo.LensModel Ascii 10 120-300mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 -Exif.CanonCs.LensType Short 1 Sigma 150-500mm f/5-6.3 APO DG OS HSM +""", + """Exif.CanonCs.LensType Short 1 Sigma 150-500mm f/5-6.3 APO DG OS HSM Exif.CanonCs.Lens Short 3 150.0 - 500.0 mm Exif.Canon.LensModel Ascii 74 150-500mm +Exif.CanonLe.LensSerialNumber SLong 1 0 +Exif.CanonAfC.USMLensElectronicMF SLong 1 Enable After AF +Exif.CanonAfC.LensDriveWhenAFImpossible SLong 1 Continue Focus Search Exif.Photo.LensSpecification Rational 4 150/1 500/1 0/1 0/1 Exif.Photo.LensModel Ascii 10 150-500mm Exif.Photo.LensSerialNumber Ascii 11 0000000000 diff --git a/tests/bugfixes/redmine/test_issue_445.py b/tests/bugfixes/redmine/test_issue_445.py index 30e194c3..4ca88b0c 100644 --- a/tests/bugfixes/redmine/test_issue_445.py +++ b/tests/bugfixes/redmine/test_issue_445.py @@ -95,19 +95,19 @@ Exif.CanonSi.ISOSpeed Short 1 100 Exif.CanonSi.MeasuredEV Short 1 13.63 Exif.CanonSi.TargetAperture Short 1 F5 Exif.CanonSi.TargetShutterSpeed Short 1 1/501 s -Exif.CanonSi.0x0006 Short 1 0 +Exif.CanonSi.ExposureCompensation Short 1 0 Exif.CanonSi.WhiteBalance Short 1 Auto Exif.CanonSi.SlowShutter Short 1 Off Exif.CanonSi.Sequence Short 1 0 -Exif.CanonSi.0x000a Short 1 6 +Exif.CanonSi.OpticalZoomCode Short 1 6 Exif.CanonSi.0x000b Short 1 0 Exif.CanonSi.CameraTemperature Short 1 -- Exif.CanonSi.FlashGuideNumber Short 1 0 Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used Exif.CanonSi.FlashBias Short 1 0 EV Exif.CanonSi.AutoExposureBracketing Short 1 Off -Exif.CanonSi.0x0011 Short 1 0 -Exif.CanonSi.0x0012 Short 1 1 +Exif.CanonSi.AEBBracketValue Short 1 0 +Exif.CanonSi.ControlMode Short 1 1 Exif.CanonSi.SubjectDistance Short 1 7.82 m Exif.CanonSi.0x0014 Short 1 0 Exif.CanonSi.ApertureValue Short 1 F5