From 8e0c8088443b3ef4e4276a03a01a1d6286b54095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Wed, 3 Jan 2024 13:07:16 +0100 Subject: [PATCH] Update Canon test reference files (cherry picked from commit 349c1f211503a5c2361c91bfcc55a90341b05c65) --- test/data/test_reference_files/20220610_MG_7237.exv.out | 2 +- test/data/test_reference_files/20220610_MG_7238.exv.out | 2 +- test/data/test_reference_files/20220610_MG_7239.exv.out | 2 +- test/data/test_reference_files/20220610_MG_7240.exv.out | 2 +- test/data/test_reference_files/20220610_MG_7241.exv.out | 2 +- .../Sigma_14-24mm_F2.8_DG_HSM_A_for_EOS.exv.out | 2 ++ .../Sigma_28mm_F1.4_DG_HSM_A_for_EOS.exv.out | 2 ++ .../Sigma_35mm_F1.4_DG_HSM_A_for_EOS.exv.out | 4 +++- .../Sigma_40mm_F1.4_DG_HSM_A_for_EOS.exv.out | 2 ++ .../Sigma_50mm_F1.4_DG_HSM_A_for_EOS.exv.out | 4 +++- .../Sigma_60-600mm_F4.5-6.3_DG_OS_HSM_S_for_EOS.exv.out | 2 ++ .../canon_ef_100_400mm_f4.5_5.6_2x_.exv.out | 2 ++ test/data/test_reference_files/exiv2-pr317.exv.out | 2 ++ .../issue_1782_canon_lens_sigma_30mm_f1.4_DC_DN_C.exv.out | 2 ++ test/data/test_reference_files/pr_2216.exv.out | 2 ++ test/data/test_reference_files/test_issue_981b.exv.out | 2 ++ test/data/test_reference_files/test_issue_981c.exv.out | 2 ++ test/data/test_reference_files/test_issue_981d.exv.out | 2 ++ 18 files changed, 33 insertions(+), 7 deletions(-) diff --git a/test/data/test_reference_files/20220610_MG_7237.exv.out b/test/data/test_reference_files/20220610_MG_7237.exv.out index 6d8aa9e2a3..bd95918f65 100644 --- a/test/data/test_reference_files/20220610_MG_7237.exv.out +++ b/test/data/test_reference_files/20220610_MG_7237.exv.out @@ -172,7 +172,7 @@ Exif.CanonLiOp.PeripheralIlluminationCorr SLong 1 1 On Exif.CanonLiOp.AutoLightingOptimizer SLong 1 3 Off Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 0 Off -Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 off +Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 Off Exif.CanonLe.LensSerialNumber Byte 5 28 0 0 0 0 1c00000000 Exif.CanonAm.AmbienceSelection SLong 1 0 Standard Exif.CanonMe.MultiExposure SLong 1 0 Off diff --git a/test/data/test_reference_files/20220610_MG_7238.exv.out b/test/data/test_reference_files/20220610_MG_7238.exv.out index 30ea41c8ab..2f98ca01e3 100644 --- a/test/data/test_reference_files/20220610_MG_7238.exv.out +++ b/test/data/test_reference_files/20220610_MG_7238.exv.out @@ -172,7 +172,7 @@ Exif.CanonLiOp.PeripheralIlluminationCorr SLong 1 1 On Exif.CanonLiOp.AutoLightingOptimizer SLong 1 3 Off Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 0 Off -Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 off +Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 Off Exif.CanonLe.LensSerialNumber Byte 5 28 0 0 0 0 1c00000000 Exif.CanonAm.AmbienceSelection SLong 1 0 Standard Exif.CanonMe.MultiExposure SLong 1 0 Off diff --git a/test/data/test_reference_files/20220610_MG_7239.exv.out b/test/data/test_reference_files/20220610_MG_7239.exv.out index 0497a1fa66..1a20bf6f8d 100644 --- a/test/data/test_reference_files/20220610_MG_7239.exv.out +++ b/test/data/test_reference_files/20220610_MG_7239.exv.out @@ -172,7 +172,7 @@ Exif.CanonLiOp.PeripheralIlluminationCorr SLong 1 1 On Exif.CanonLiOp.AutoLightingOptimizer SLong 1 3 Off Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 0 Off -Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 off +Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 Off Exif.CanonLe.LensSerialNumber Byte 5 28 0 0 0 0 1c00000000 Exif.CanonAm.AmbienceSelection SLong 1 0 Standard Exif.CanonMe.MultiExposure SLong 1 0 Off diff --git a/test/data/test_reference_files/20220610_MG_7240.exv.out b/test/data/test_reference_files/20220610_MG_7240.exv.out index d2d232f406..da13afd19c 100644 --- a/test/data/test_reference_files/20220610_MG_7240.exv.out +++ b/test/data/test_reference_files/20220610_MG_7240.exv.out @@ -172,7 +172,7 @@ Exif.CanonLiOp.PeripheralIlluminationCorr SLong 1 1 On Exif.CanonLiOp.AutoLightingOptimizer SLong 1 3 Off Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 0 Off -Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 off +Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 Off Exif.CanonLe.LensSerialNumber Byte 5 28 0 0 0 0 1c00000000 Exif.CanonAm.AmbienceSelection SLong 1 0 Standard Exif.CanonMe.MultiExposure SLong 1 0 Off diff --git a/test/data/test_reference_files/20220610_MG_7241.exv.out b/test/data/test_reference_files/20220610_MG_7241.exv.out index 68c41c2ef9..4e158df872 100644 --- a/test/data/test_reference_files/20220610_MG_7241.exv.out +++ b/test/data/test_reference_files/20220610_MG_7241.exv.out @@ -172,7 +172,7 @@ Exif.CanonLiOp.PeripheralIlluminationCorr SLong 1 1 On Exif.CanonLiOp.AutoLightingOptimizer SLong 1 3 Off Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 0 Off -Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 off +Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 Off Exif.CanonLe.LensSerialNumber Byte 5 28 0 0 0 0 1c00000000 Exif.CanonAm.AmbienceSelection SLong 1 0 Standard Exif.CanonMe.MultiExposure SLong 1 0 Off diff --git a/test/data/test_reference_files/Sigma_14-24mm_F2.8_DG_HSM_A_for_EOS.exv.out b/test/data/test_reference_files/Sigma_14-24mm_F2.8_DG_HSM_A_for_EOS.exv.out index 8166598013..04b4c6ba45 100644 --- a/test/data/test_reference_files/Sigma_14-24mm_F2.8_DG_HSM_A_for_EOS.exv.out +++ b/test/data/test_reference_files/Sigma_14-24mm_F2.8_DG_HSM_A_for_EOS.exv.out @@ -173,6 +173,8 @@ Exif.CanonLiOp.AutoLightingOptimizer SLong 1 3 Off Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 0 Off Exif.CanonLiOp.HighISONoiseReduction SLong 1 0 Standard +Exif.CanonLiOp.DigitalLensOptimizer SLong 1 0 Off +Exif.CanonLiOp.DualPixelRaw SLong 1 0 Off Exif.CanonLe.LensSerialNumber Byte 5 0 0 0 0 0 0000000000 Exif.CanonMe.MultiExposure SLong 1 0 Off Exif.CanonMe.MultiExposureControl SLong 1 0 Additive diff --git a/test/data/test_reference_files/Sigma_28mm_F1.4_DG_HSM_A_for_EOS.exv.out b/test/data/test_reference_files/Sigma_28mm_F1.4_DG_HSM_A_for_EOS.exv.out index 1a99822fdb..d9771ef030 100644 --- a/test/data/test_reference_files/Sigma_28mm_F1.4_DG_HSM_A_for_EOS.exv.out +++ b/test/data/test_reference_files/Sigma_28mm_F1.4_DG_HSM_A_for_EOS.exv.out @@ -174,6 +174,8 @@ Exif.CanonLiOp.AutoLightingOptimizer SLong 1 0 Standard Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 0 Off Exif.CanonLiOp.HighISONoiseReduction SLong 1 0 Standard +Exif.CanonLiOp.DigitalLensOptimizer SLong 1 0 Off +Exif.CanonLiOp.DualPixelRaw SLong 1 0 Off Exif.CanonLe.LensSerialNumber Byte 5 0 0 0 0 0 0000000000 Exif.CanonMe.MultiExposure SLong 1 0 Off Exif.CanonMe.MultiExposureControl SLong 1 0 Additive diff --git a/test/data/test_reference_files/Sigma_35mm_F1.4_DG_HSM_A_for_EOS.exv.out b/test/data/test_reference_files/Sigma_35mm_F1.4_DG_HSM_A_for_EOS.exv.out index 13a0382d38..c1c9b26641 100644 --- a/test/data/test_reference_files/Sigma_35mm_F1.4_DG_HSM_A_for_EOS.exv.out +++ b/test/data/test_reference_files/Sigma_35mm_F1.4_DG_HSM_A_for_EOS.exv.out @@ -173,7 +173,9 @@ Exif.CanonLiOp.PeripheralIlluminationCorr SLong 1 0 Off Exif.CanonLiOp.AutoLightingOptimizer SLong 1 3 Off Exif.CanonLiOp.HighlightTonePriority SLong 1 1 On Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 1 Auto -Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 off +Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 Off +Exif.CanonLiOp.DigitalLensOptimizer SLong 1 0 Off +Exif.CanonLiOp.DualPixelRaw SLong 1 0 Off Exif.CanonLe.LensSerialNumber Byte 5 0 0 0 0 0 0000000000 Exif.CanonMe.MultiExposure SLong 1 0 Off Exif.CanonMe.MultiExposureControl SLong 1 0 Additive diff --git a/test/data/test_reference_files/Sigma_40mm_F1.4_DG_HSM_A_for_EOS.exv.out b/test/data/test_reference_files/Sigma_40mm_F1.4_DG_HSM_A_for_EOS.exv.out index 0dceee3ab4..6cea86f5af 100644 --- a/test/data/test_reference_files/Sigma_40mm_F1.4_DG_HSM_A_for_EOS.exv.out +++ b/test/data/test_reference_files/Sigma_40mm_F1.4_DG_HSM_A_for_EOS.exv.out @@ -173,6 +173,8 @@ Exif.CanonLiOp.AutoLightingOptimizer SLong 1 3 Off Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 0 Off Exif.CanonLiOp.HighISONoiseReduction SLong 1 0 Standard +Exif.CanonLiOp.DigitalLensOptimizer SLong 1 0 Off +Exif.CanonLiOp.DualPixelRaw SLong 1 0 Off Exif.CanonLe.LensSerialNumber Byte 5 0 0 0 0 0 0000000000 Exif.CanonMe.MultiExposure SLong 1 0 Off Exif.CanonMe.MultiExposureControl SLong 1 0 Additive diff --git a/test/data/test_reference_files/Sigma_50mm_F1.4_DG_HSM_A_for_EOS.exv.out b/test/data/test_reference_files/Sigma_50mm_F1.4_DG_HSM_A_for_EOS.exv.out index 3cae6f21c6..8fe58e251f 100644 --- a/test/data/test_reference_files/Sigma_50mm_F1.4_DG_HSM_A_for_EOS.exv.out +++ b/test/data/test_reference_files/Sigma_50mm_F1.4_DG_HSM_A_for_EOS.exv.out @@ -173,7 +173,9 @@ Exif.CanonLiOp.PeripheralIlluminationCorr SLong 1 0 Off Exif.CanonLiOp.AutoLightingOptimizer SLong 1 3 Off Exif.CanonLiOp.HighlightTonePriority SLong 1 1 On Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 1 Auto -Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 off +Exif.CanonLiOp.HighISONoiseReduction SLong 1 3 Off +Exif.CanonLiOp.DigitalLensOptimizer SLong 1 0 Off +Exif.CanonLiOp.DualPixelRaw SLong 1 0 Off Exif.CanonLe.LensSerialNumber Byte 5 0 0 0 0 0 0000000000 Exif.CanonMe.MultiExposure SLong 1 0 Off Exif.CanonMe.MultiExposureControl SLong 1 0 Additive diff --git a/test/data/test_reference_files/Sigma_60-600mm_F4.5-6.3_DG_OS_HSM_S_for_EOS.exv.out b/test/data/test_reference_files/Sigma_60-600mm_F4.5-6.3_DG_OS_HSM_S_for_EOS.exv.out index ddd206cdae..5226bed47a 100644 --- a/test/data/test_reference_files/Sigma_60-600mm_F4.5-6.3_DG_OS_HSM_S_for_EOS.exv.out +++ b/test/data/test_reference_files/Sigma_60-600mm_F4.5-6.3_DG_OS_HSM_S_for_EOS.exv.out @@ -173,6 +173,8 @@ Exif.CanonLiOp.AutoLightingOptimizer SLong 1 3 Off Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 0 Off Exif.CanonLiOp.HighISONoiseReduction SLong 1 0 Standard +Exif.CanonLiOp.DigitalLensOptimizer SLong 1 0 Off +Exif.CanonLiOp.DualPixelRaw SLong 1 0 Off Exif.CanonLe.LensSerialNumber Byte 5 0 0 0 0 0 0000000000 Exif.CanonMe.MultiExposure SLong 1 0 Off Exif.CanonMe.MultiExposureControl SLong 1 0 Additive diff --git a/test/data/test_reference_files/canon_ef_100_400mm_f4.5_5.6_2x_.exv.out b/test/data/test_reference_files/canon_ef_100_400mm_f4.5_5.6_2x_.exv.out index 627c4e1a91..c87bf1d2db 100644 --- a/test/data/test_reference_files/canon_ef_100_400mm_f4.5_5.6_2x_.exv.out +++ b/test/data/test_reference_files/canon_ef_100_400mm_f4.5_5.6_2x_.exv.out @@ -178,6 +178,8 @@ Exif.CanonLiOp.AutoLightingOptimizer SLong 1 3 Off Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 0 Off Exif.CanonLiOp.HighISONoiseReduction SLong 1 0 Standard +Exif.CanonLiOp.DigitalLensOptimizer SLong 1 0 Off +Exif.CanonLiOp.DualPixelRaw SLong 1 0 Off Exif.CanonLe.LensSerialNumber Byte 5 52 144 0 144 117 3490009075 Exif.CanonMe.MultiExposure SLong 1 0 Off Exif.CanonMe.MultiExposureControl SLong 1 0 Additive diff --git a/test/data/test_reference_files/exiv2-pr317.exv.out b/test/data/test_reference_files/exiv2-pr317.exv.out index 28dbd4fd14..7ebe1ce427 100644 --- a/test/data/test_reference_files/exiv2-pr317.exv.out +++ b/test/data/test_reference_files/exiv2-pr317.exv.out @@ -154,6 +154,8 @@ Exif.CanonLiOp.AutoLightingOptimizer SLong 1 0 Standard Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 1 Auto Exif.CanonLiOp.HighISONoiseReduction SLong 1 1 Low +Exif.CanonLiOp.DigitalLensOptimizer SLong 1 0 Off +Exif.CanonLiOp.DualPixelRaw SLong 1 0 Off Exif.CanonAm.AmbienceSelection SLong 1 0 Standard Exif.Photo.UserComment Undefined 264 Exif.Photo.SubSecTime Ascii 3 40 40 diff --git a/test/data/test_reference_files/issue_1782_canon_lens_sigma_30mm_f1.4_DC_DN_C.exv.out b/test/data/test_reference_files/issue_1782_canon_lens_sigma_30mm_f1.4_DC_DN_C.exv.out index a778368dbf..60c5b8c765 100644 --- a/test/data/test_reference_files/issue_1782_canon_lens_sigma_30mm_f1.4_DC_DN_C.exv.out +++ b/test/data/test_reference_files/issue_1782_canon_lens_sigma_30mm_f1.4_DC_DN_C.exv.out @@ -176,6 +176,8 @@ Exif.CanonLiOp.AutoLightingOptimizer SLong 1 0 Standard Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 0 Off Exif.CanonLiOp.HighISONoiseReduction SLong 1 0 Standard +Exif.CanonLiOp.DigitalLensOptimizer SLong 1 1 Standard +Exif.CanonLiOp.DualPixelRaw SLong 1 0 Off Exif.CanonLe.LensSerialNumber Byte 5 0 0 0 0 0 0000000000 Exif.CanonAm.AmbienceSelection SLong 1 0 Standard Exif.CanonHdr.HDR SLong 1 0 Off diff --git a/test/data/test_reference_files/pr_2216.exv.out b/test/data/test_reference_files/pr_2216.exv.out index 79b4a16e6b..e90072080a 100644 --- a/test/data/test_reference_files/pr_2216.exv.out +++ b/test/data/test_reference_files/pr_2216.exv.out @@ -188,6 +188,8 @@ Exif.CanonLiOp.AutoLightingOptimizer SLong 1 0 Standard Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 1 Auto Exif.CanonLiOp.HighISONoiseReduction SLong 1 0 Standard +Exif.CanonLiOp.DigitalLensOptimizer SLong 1 1 Standard +Exif.CanonLiOp.DualPixelRaw SLong 1 0 Off Exif.CanonLe.LensSerialNumber Byte 5 0 0 2 166 32 000002a620 Exif.CanonAm.AmbienceSelection SLong 1 0 Standard Exif.CanonMe.MultiExposure SLong 1 0 Off diff --git a/test/data/test_reference_files/test_issue_981b.exv.out b/test/data/test_reference_files/test_issue_981b.exv.out index 5226acb416..4ee465c40c 100644 --- a/test/data/test_reference_files/test_issue_981b.exv.out +++ b/test/data/test_reference_files/test_issue_981b.exv.out @@ -174,6 +174,8 @@ Exif.CanonLiOp.AutoLightingOptimizer SLong 1 3 Off Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 2 On Exif.CanonLiOp.HighISONoiseReduction SLong 1 1 Low +Exif.CanonLiOp.DigitalLensOptimizer SLong 1 0 Off +Exif.CanonLiOp.DualPixelRaw SLong 1 0 Off Exif.CanonLe.LensSerialNumber Byte 5 0 0 0 0 0 0000000000 Exif.CanonMe.MultiExposure SLong 1 0 Off Exif.CanonMe.MultiExposureControl SLong 1 0 Additive diff --git a/test/data/test_reference_files/test_issue_981c.exv.out b/test/data/test_reference_files/test_issue_981c.exv.out index 5e3c61184d..383bd2a416 100644 --- a/test/data/test_reference_files/test_issue_981c.exv.out +++ b/test/data/test_reference_files/test_issue_981c.exv.out @@ -178,6 +178,8 @@ Exif.CanonLiOp.AutoLightingOptimizer SLong 1 0 Standard Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 1 Auto Exif.CanonLiOp.HighISONoiseReduction SLong 1 1 Low +Exif.CanonLiOp.DigitalLensOptimizer SLong 1 0 Off +Exif.CanonLiOp.DualPixelRaw SLong 1 0 Off Exif.CanonLe.LensSerialNumber Byte 5 0 0 0 0 0 0000000000 Exif.CanonMe.MultiExposure SLong 1 0 Off Exif.CanonMe.MultiExposureControl SLong 1 0 Additive diff --git a/test/data/test_reference_files/test_issue_981d.exv.out b/test/data/test_reference_files/test_issue_981d.exv.out index 5856d5fe96..bcb6b17b1e 100644 --- a/test/data/test_reference_files/test_issue_981d.exv.out +++ b/test/data/test_reference_files/test_issue_981d.exv.out @@ -178,6 +178,8 @@ Exif.CanonLiOp.AutoLightingOptimizer SLong 1 0 Standard Exif.CanonLiOp.HighlightTonePriority SLong 1 0 Off Exif.CanonLiOp.LongExposureNoiseReduction SLong 1 1 Auto Exif.CanonLiOp.HighISONoiseReduction SLong 1 1 Low +Exif.CanonLiOp.DigitalLensOptimizer SLong 1 0 Off +Exif.CanonLiOp.DualPixelRaw SLong 1 0 Off Exif.CanonLe.LensSerialNumber Byte 5 0 0 0 0 0 0000000000 Exif.CanonMe.MultiExposure SLong 1 0 Off Exif.CanonMe.MultiExposureControl SLong 1 0 Additive