Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more Canon tags and lenses (backport #2881) #2885

Merged
merged 3 commits into from
Jan 8, 2024
Merged

Add more Canon tags and lenses (backport #2881) #2885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7332aa7
Add more Canon RF lenses
kmilos Jan 3, 2024
f973670
Add Canon DigitalLensOptimizer and DualPixelRaw tags
kmilos Jan 3, 2024
e20bba5
Update Canon test reference files
kmilos Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions src/canonmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,13 @@ constexpr TagDetails canonLongExposureNoiseReduction[] = {{0, N_("Off")}, {1, N_

// Canon HighISONoiseReduction, tag 0x0005
constexpr TagDetails canonHighISONoiseReduction[] = {
{0, N_("Standard")}, {1, N_("Low")}, {2, N_("Strong")}, {3, N_("off")}};
{0, N_("Standard")}, {1, N_("Low")}, {2, N_("Strong")}, {3, N_("Off")}};

// Canon DigitalLensOptimizer, tag 0x000a
constexpr TagDetails canonDigitalLensOptimizer[] = {{0, N_("Off")}, {1, N_("Standard")}, {2, N_("High")}};

// Canon DualPixelRaw, tag 0x000b
constexpr TagDetails canonDualPixelRaw[] = {{0, N_("Off")}, {1, N_("On")}};

// Canon LightingOpt Tag
constexpr TagInfo CanonMakerNote::tagInfoLiOp_[] = {
Expand All @@ -1019,6 +1025,10 @@ constexpr TagInfo CanonMakerNote::tagInfoLiOp_[] = {
IfdId::canonLiOpId, SectionId::makerTags, signedLong, -1, EXV_PRINT_TAG(canonLongExposureNoiseReduction)},
{0x0005, "HighISONoiseReduction", N_("High ISO Noise Reduction"), N_("High ISO Noise Reduction"),
IfdId::canonLiOpId, SectionId::makerTags, signedLong, -1, EXV_PRINT_TAG(canonHighISONoiseReduction)},
{0x000a, "DigitalLensOptimizer", N_("Digital Lens Optimizer"), N_("Digital Lens Optimizer"), IfdId::canonLiOpId,
SectionId::makerTags, signedLong, -1, EXV_PRINT_TAG(canonDigitalLensOptimizer)},
{0x000b, "DualPixelRaw", N_("Dual Pixel Raw"), N_("Dual Pixel Raw"), IfdId::canonLiOpId, SectionId::makerTags,
signedLong, -1, EXV_PRINT_TAG(canonDualPixelRaw)},
{0xffff, "(UnknownLightingOptimizationTag)", "(UnknownLightingOptimizationTag)",
N_("UnknownLightingOptimizationTag Selection Tag"), IfdId::canonLiOpId, SectionId::makerTags, signedLong, 1,
printValue} // important to add end of tag
Expand Down Expand Up @@ -1966,8 +1976,13 @@ constexpr TagDetails canonCsLensType[] = {{1, "Canon EF 50mm f/1.8"},
{61182, "Canon RF 100-300mm F2.8L IS USM"},
{61182, "Canon RF 100-300mm F2.8L IS USM + RF1.4x"},
{61182, "Canon RF 100-300mm F2.8L IS USM + RF2x"},
{61182, "Canon RF 200-800mm F6.3-9 IS USM"},
{61182, "Canon RF 200-800mm F6.3-9 IS USM + RF1.4x"},
{61182, "Canon RF 200-800mm F6.3-9 IS USM + RF2x"},
{61182, "Canon RF 10-20mm F4 L IS STM"},
{61182, "Canon RF 28mm F2.8 STM"},
{61182, "Canon RF 24-105mm F2.8 L IS USM Z"},
{61182, "Canon RF-S 10-18mm F4.5-6.3 IS STM"},
{65535, N_("n/a")}};

//! FlashActivity, tag 0x001c
Expand Down Expand Up @@ -2390,8 +2405,13 @@ constexpr TagDetails canonRFLensType[] = {{0, N_("n/a")},
{306, "Canon RF 100-300mm F2.8L IS USM"},
{307, "Canon RF 100-300mm F2.8L IS USM + RF1.4x"},
{308, "Canon RF 100-300mm F2.8L IS USM + RF2x"},
{309, "Canon RF 200-800mm F6.3-9 IS USM"},
{310, "Canon RF 200-800mm F6.3-9 IS USM + RF1.4x"},
{311, "Canon RF 200-800mm F6.3-9 IS USM + RF2x"},
{312, "Canon RF 10-20mm F4 L IS STM"},
{313, "Canon RF 28mm F2.8 STM"}};
{313, "Canon RF 28mm F2.8 STM"},
{314, "Canon RF 24-105mm F2.8 L IS USM Z"},
{315, "Canon RF-S 10-18mm F4.5-6.3 IS STM"}};

// Canon File Info Tag
constexpr TagInfo CanonMakerNote::tagInfoFi_[] = {
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/20220610_MG_7237.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/20220610_MG_7238.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/20220610_MG_7239.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/20220610_MG_7240.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/data/test_reference_files/20220610_MG_7241.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/data/test_reference_files/Sigma_14-24mm_F2.8_DG_HSM_A_for_EOS.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/data/test_reference_files/Sigma_28mm_F1.4_DG_HSM_A_for_EOS.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion test/data/test_reference_files/Sigma_35mm_F1.4_DG_HSM_A_for_EOS.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/data/test_reference_files/Sigma_40mm_F1.4_DG_HSM_A_for_EOS.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion test/data/test_reference_files/Sigma_50mm_F1.4_DG_HSM_A_for_EOS.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/data/test_reference_files/Sigma_60-600mm_F4.5-6.3_DG_OS_HSM_S_for_EOS.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/data/test_reference_files/canon_ef_100_400mm_f4.5_5.6_2x_.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/data/test_reference_files/exiv2-pr317.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/data/test_reference_files/issue_1782_canon_lens_sigma_30mm_f1.4_DC_DN_C.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/data/test_reference_files/pr_2216.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/data/test_reference_files/test_issue_981b.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/data/test_reference_files/test_issue_981c.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions test/data/test_reference_files/test_issue_981d.exv.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading