Skip to content

Commit

Permalink
Match Canon's RF lens spacing
Browse files Browse the repository at this point in the history
  • Loading branch information
@kmilos
kmilos authored Jan 13, 2025
1 parent faaabec commit 314a66a
Showing 1 changed file with 78 additions and 78 deletions.
156 changes: 78 additions & 78 deletions src/canonmn_int.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2050,16 +2050,16 @@ constexpr TagDetails canonCsLensType[] = {
// All RF lenses seem to share the LensType value 61182;
// unique RFLensType tag below is to be preferred instead.
// Please keep this list in sync w/ RFLensType list
{61182, "Canon RF 50mm F1.2L USM"},
{61182, "Canon RF 24-105mm F4L IS USM"},
{61182, "Canon RF 28-70mm F2L USM"},
{61182, "Canon RF 50mm F1.2 L USM"},
{61182, "Canon RF 24-105mm F4 L IS USM"},
{61182, "Canon RF 28-70mm F2 L USM"},
{61182, "Canon RF 35mm F1.8 MACRO IS STM"},
{61182, "Canon RF 85mm F1.2L USM"},
{61182, "Canon RF 85mm F1.2L USM DS"},
{61182, "Canon RF 24-70mm F2.8L IS USM"},
{61182, "Canon RF 15-35mm F2.8L IS USM"},
{61182, "Canon RF 85mm F1.2 L USM"},
{61182, "Canon RF 85mm F1.2 L USM DS"},
{61182, "Canon RF 24-70mm F2.8 L IS USM"},
{61182, "Canon RF 15-35mm F2.8 L IS USM"},
{61182, "Canon RF 24-240mm F4-6.3 IS USM"},
{61182, "Canon RF 70-200mm F2.8L IS USM"},
{61182, "Canon RF 70-200mm F2.8 L IS USM"},
{61182, "Canon RF 85mm F2 MACRO IS STM"},
{61182, "Canon RF 600mm F11 IS STM"},
{61182, "Canon RF 600mm F11 IS STM + RF1.4x"},
Expand All @@ -2068,55 +2068,55 @@ constexpr TagDetails canonCsLensType[] = {
{61182, "Canon RF 800mm F11 IS STM + RF1.4x"},
{61182, "Canon RF 800mm F11 IS STM + RF2x"},
{61182, "Canon RF 24-105mm F4-7.1 IS STM"},
{61182, "Canon RF 100-500mm F4.5-7.1L IS USM"},
{61182, "Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x"},
{61182, "Canon RF 100-500mm F4.5-7.1L IS USM + RF2x"},
{61182, "Canon RF 70-200mm F4L IS USM"},
{61182, "Canon RF 100mm F2.8L MACRO IS USM"},
{61182, "Canon RF 100-500mm F4.5-7.1 L IS USM"},
{61182, "Canon RF 100-500mm F4.5-7.1 L IS USM + RF1.4x"},
{61182, "Canon RF 100-500mm F4.5-7.1 L IS USM + RF2x"},
{61182, "Canon RF 70-200mm F4 L IS USM"},
{61182, "Canon RF 100mm F2.8 L MACRO IS USM"},
{61182, "Canon RF 50mm F1.8 STM"},
{61182, "Canon RF 14-35mm F4L IS USM"},
{61182, "Canon RF 14-35mm F4 L IS USM"},
{61182, "Canon RF-S 18-45mm F4.5-6.3 IS STM"},
{61182, "Canon RF 100-400mm F5.6-8 IS USM"},
{61182, "Canon RF 100-400mm F5.6-8 IS USM + RF1.4x"},
{61182, "Canon RF 100-400mm F5.6-8 IS USM + RF2x"},
{61182, "Canon RF-S 18-150mm F3.5-6.3 IS STM"},
{61182, "Canon RF 24mm F1.8 MACRO IS STM"},
{61182, "Canon RF 16mm F2.8 STM"},
{61182, "Canon RF 400mm F2.8L IS USM"},
{61182, "Canon RF 400mm F2.8L IS USM + RF1.4x"},
{61182, "Canon RF 400mm F2.8L IS USM + RF2x"},
{61182, "Canon RF 600mm F4L IS USM"},
{61182, "Canon RF 600mm F4L IS USM + RF1.4x"},
{61182, "Canon RF 600mm F4L IS USM + RF2x"},
{61182, "Canon RF 800mm F5.6L IS USM"},
{61182, "Canon RF 800mm F5.6L IS USM + RF1.4x"},
{61182, "Canon RF 800mm F5.6L IS USM + RF2x"},
{61182, "Canon RF 1200mm F8L IS USM"},
{61182, "Canon RF 1200mm F8L IS USM + RF1.4x"},
{61182, "Canon RF 1200mm F8L IS USM + RF2x"},
{61182, "Canon RF 5.2mm F2.8L Dual Fisheye 3D VR"},
{61182, "Canon RF 400mm F2.8 L IS USM"},
{61182, "Canon RF 400mm F2.8 L IS USM + RF1.4x"},
{61182, "Canon RF 400mm F2.8 L IS USM + RF2x"},
{61182, "Canon RF 600mm F4 L IS USM"},
{61182, "Canon RF 600mm F4 L IS USM + RF1.4x"},
{61182, "Canon RF 600mm F4 L IS USM + RF2x"},
{61182, "Canon RF 800mm F5.6 L IS USM"},
{61182, "Canon RF 800mm F5.6 L IS USM + RF1.4x"},
{61182, "Canon RF 800mm F5.6 L IS USM + RF2x"},
{61182, "Canon RF 1200mm F8 L IS USM"},
{61182, "Canon RF 1200mm F8 L IS USM + RF1.4x"},
{61182, "Canon RF 1200mm F8 L IS USM + RF2x"},
{61182, "Canon RF 5.2mm F2.8 L Dual Fisheye 3D VR"},
{61182, "Canon RF 15-30mm F4.5-6.3 IS STM"},
{61182, "Canon RF 135mm F1.8L IS USM"},
{61182, "Canon RF 135mm F1.8 L IS USM"},
{61182, "Canon RF 24-50mm F4.5-6.3 IS STM"},
{61182, "Canon RF-S 55-210mm F5-7.1 IS STM"},
{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 100-300mm F2.8 L IS USM"},
{61182, "Canon RF 100-300mm F2.8 L IS USM + RF1.4x"},
{61182, "Canon RF 100-300mm F2.8 L 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 F4L IS STM"},
{61182, "Canon RF 10-20mm F4 L IS STM"},
{61182, "Canon RF 28mm F2.8 STM"},
{61182, "Canon RF 24-105mm F2.8L IS USM Z"},
{61182, "Canon RF 24-105mm F2.8 L IS USM Z"},
{61182, "Canon RF-S 10-18mm F4.5-6.3 IS STM"},
{61182, "Canon RF 35mm F1.4L VCM"},
{61182, "Canon RF 35mm F1.4 L VCM"},
{61182, "Canon RF-S 3.9mm F3.5 STM Dual Fisheye"},
{61182, "Canon RF 28-70mm F2.8 IS STM"},
{61182, "Canon RF 70-200mm F2.8L IS USM Z"},
{61182, "Canon RF 70-200mm F2.8L IS USM Z + RF1.4x"},
{61182, "Canon RF 70-200mm F2.8L IS USM Z + RF2x"},
{61182, "Canon RF 50mm F1.4L VCM"},
{61182, "Canon RF 24mm F1.4L VCM"},
{61182, "Canon RF 70-200mm F2.8 L IS USM Z"},
{61182, "Canon RF 70-200mm F2.8 L IS USM Z + RF1.4x"},
{61182, "Canon RF 70-200mm F2.8 L IS USM Z + RF2x"},
{61182, "Canon RF 50mm F1.4 L VCM"},
{61182, "Canon RF 24mm F1.4 L VCM"},
{65535, N_("n/a")},
};

Expand Down Expand Up @@ -2538,16 +2538,16 @@ constexpr TagDetails canonToningEffect[] = {
// from https://github.com/exiftool/exiftool/blob/13.12/lib/Image/ExifTool/Canon.pm#L6942
constexpr TagDetails canonRFLensType[] = {
{0, N_("n/a")},
{257, "Canon RF 50mm F1.2L USM"},
{258, "Canon RF 24-105mm F4L IS USM"},
{259, "Canon RF 28-70mm F2L USM"},
{257, "Canon RF 50mm F1.2 L USM"},
{258, "Canon RF 24-105mm F4 L IS USM"},
{259, "Canon RF 28-70mm F2 L USM"},
{260, "Canon RF 35mm F1.8 MACRO IS STM"},
{261, "Canon RF 85mm F1.2L USM"},
{262, "Canon RF 85mm F1.2L USM DS"},
{263, "Canon RF 24-70mm F2.8L IS USM"},
{264, "Canon RF 15-35mm F2.8L IS USM"},
{261, "Canon RF 85mm F1.2 L USM"},
{262, "Canon RF 85mm F1.2 L USM DS"},
{263, "Canon RF 24-70mm F2.8 L IS USM"},
{264, "Canon RF 15-35mm F2.8 L IS USM"},
{265, "Canon RF 24-240mm F4-6.3 IS USM"},
{266, "Canon RF 70-200mm F2.8L IS USM"},
{266, "Canon RF 70-200mm F2.8 L IS USM"},
{267, "Canon RF 85mm F2 MACRO IS STM"},
{268, "Canon RF 600mm F11 IS STM"},
{269, "Canon RF 600mm F11 IS STM + RF1.4x"},
Expand All @@ -2556,55 +2556,55 @@ constexpr TagDetails canonRFLensType[] = {
{272, "Canon RF 800mm F11 IS STM + RF1.4x"},
{273, "Canon RF 800mm F11 IS STM + RF2x"},
{274, "Canon RF 24-105mm F4-7.1 IS STM"},
{275, "Canon RF 100-500mm F4.5-7.1L IS USM"},
{276, "Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x"},
{277, "Canon RF 100-500mm F4.5-7.1L IS USM + RF2x"},
{278, "Canon RF 70-200mm F4L IS USM"},
{279, "Canon RF 100mm F2.8L MACRO IS USM"},
{275, "Canon RF 100-500mm F4.5-7.1 L IS USM"},
{276, "Canon RF 100-500mm F4.5-7.1 L IS USM + RF1.4x"},
{277, "Canon RF 100-500mm F4.5-7.1 L IS USM + RF2x"},
{278, "Canon RF 70-200mm F4 L IS USM"},
{279, "Canon RF 100mm F2.8 L MACRO IS USM"},
{280, "Canon RF 50mm F1.8 STM"},
{281, "Canon RF 14-35mm F4L IS USM"},
{281, "Canon RF 14-35mm F4 L IS USM"},
{282, "Canon RF-S 18-45mm F4.5-6.3 IS STM"},
{283, "Canon RF 100-400mm F5.6-8 IS USM"},
{284, "Canon RF 100-400mm F5.6-8 IS USM + RF1.4x"},
{285, "Canon RF 100-400mm F5.6-8 IS USM + RF2x"},
{286, "Canon RF-S 18-150mm F3.5-6.3 IS STM"},
{287, "Canon RF 24mm F1.8 MACRO IS STM"},
{288, "Canon RF 16mm F2.8 STM"},
{289, "Canon RF 400mm F2.8L IS USM"},
{290, "Canon RF 400mm F2.8L IS USM + RF1.4x"},
{291, "Canon RF 400mm F2.8L IS USM + RF2x"},
{292, "Canon RF 600mm F4L IS USM"},
{293, "Canon RF 600mm F4L IS USM + RF1.4x"},
{294, "Canon RF 600mm F4L IS USM + RF2x"},
{295, "Canon RF 800mm F5.6L IS USM"},
{296, "Canon RF 800mm F5.6L IS USM + RF1.4x"},
{297, "Canon RF 800mm F5.6L IS USM + RF2x"},
{298, "Canon RF 1200mm F8L IS USM"},
{299, "Canon RF 1200mm F8L IS USM + RF1.4x"},
{300, "Canon RF 1200mm F8L IS USM + RF2x"},
{301, "Canon RF 5.2mm F2.8L Dual Fisheye 3D VR"},
{289, "Canon RF 400mm F2.8 L IS USM"},
{290, "Canon RF 400mm F2.8 L IS USM + RF1.4x"},
{291, "Canon RF 400mm F2.8 L IS USM + RF2x"},
{292, "Canon RF 600mm F4 L IS USM"},
{293, "Canon RF 600mm F4 L IS USM + RF1.4x"},
{294, "Canon RF 600mm F4 L IS USM + RF2x"},
{295, "Canon RF 800mm F5.6 L IS USM"},
{296, "Canon RF 800mm F5.6 L IS USM + RF1.4x"},
{297, "Canon RF 800mm F5.6 L IS USM + RF2x"},
{298, "Canon RF 1200mm F8 L IS USM"},
{299, "Canon RF 1200mm F8 L IS USM + RF1.4x"},
{300, "Canon RF 1200mm F8 L IS USM + RF2x"},
{301, "Canon RF 5.2mm F2.8 L Dual Fisheye 3D VR"},
{302, "Canon RF 15-30mm F4.5-6.3 IS STM"},
{303, "Canon RF 135mm F1.8L IS USM"},
{303, "Canon RF 135mm F1.8 L IS USM"},
{304, "Canon RF 24-50mm F4.5-6.3 IS STM"},
{305, "Canon RF-S 55-210mm F5-7.1 IS STM"},
{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"},
{306, "Canon RF 100-300mm F2.8 L IS USM"},
{307, "Canon RF 100-300mm F2.8 L IS USM + RF1.4x"},
{308, "Canon RF 100-300mm F2.8 L 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 F4L IS STM"},
{312, "Canon RF 10-20mm F4 L IS STM"},
{313, "Canon RF 28mm F2.8 STM"},
{314, "Canon RF 24-105mm F2.8L IS USM Z"},
{314, "Canon RF 24-105mm F2.8 L IS USM Z"},
{315, "Canon RF-S 10-18mm F4.5-6.3 IS STM"},
{316, "Canon RF 35mm F1.4L VCM"},
{316, "Canon RF 35mm F1.4 L VCM"},
{317, "Canon RF-S 3.9mm F3.5 STM Dual Fisheye"},
{318, "Canon RF 28-70mm F2.8 IS STM"},
{319, "Canon RF 70-200mm F2.8L IS USM Z"},
{320, "Canon RF 70-200mm F2.8L IS USM Z + RF1.4x"},
{321, "Canon RF 70-200mm F2.8L IS USM Z + RF2x"},
{325, "Canon RF 50mm F1.4L VCM"},
{326, "Canon RF 24mm F1.4L VCM"},
{319, "Canon RF 70-200mm F2.8 L IS USM Z"},
{320, "Canon RF 70-200mm F2.8 L IS USM Z + RF1.4x"},
{321, "Canon RF 70-200mm F2.8 L IS USM Z + RF2x"},
{325, "Canon RF 50mm F1.4 L VCM"},
{326, "Canon RF 24mm F1.4 L VCM"},
};

// Canon File Info Tag
Expand Down

0 comments on commit 314a66a

Please sign in to comment.