Skip to content

Commit 27ad395

Browse files
kmiloskmilos
committed
Match Canon's RF lens spacing
1 parent 0643639 commit 27ad395

File tree

1 file changed

+78
-78
lines changed

1 file changed

+78
-78
lines changed

‎src/canonmn_int.cpp‎

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -2050,16 +2050,16 @@ constexpr TagDetails canonCsLensType[] = {
20502050
// All RF lenses seem to share the LensType value 61182;
20512051
// unique RFLensType tag below is to be preferred instead.
20522052
// Please keep this list in sync w/ RFLensType list
2053-
{61182, "Canon RF 50mm F1.2L USM"},
2054-
{61182, "Canon RF 24-105mm F4L IS USM"},
2055-
{61182, "Canon RF 28-70mm F2L USM"},
2053+
{61182, "Canon RF 50mm F1.2 L USM"},
2054+
{61182, "Canon RF 24-105mm F4 L IS USM"},
2055+
{61182, "Canon RF 28-70mm F2 L USM"},
20562056
{61182, "Canon RF 35mm F1.8 MACRO IS STM"},
2057-
{61182, "Canon RF 85mm F1.2L USM"},
2058-
{61182, "Canon RF 85mm F1.2L USM DS"},
2059-
{61182, "Canon RF 24-70mm F2.8L IS USM"},
2060-
{61182, "Canon RF 15-35mm F2.8L IS USM"},
2057+
{61182, "Canon RF 85mm F1.2 L USM"},
2058+
{61182, "Canon RF 85mm F1.2 L USM DS"},
2059+
{61182, "Canon RF 24-70mm F2.8 L IS USM"},
2060+
{61182, "Canon RF 15-35mm F2.8 L IS USM"},
20612061
{61182, "Canon RF 24-240mm F4-6.3 IS USM"},
2062-
{61182, "Canon RF 70-200mm F2.8L IS USM"},
2062+
{61182, "Canon RF 70-200mm F2.8 L IS USM"},
20632063
{61182, "Canon RF 85mm F2 MACRO IS STM"},
20642064
{61182, "Canon RF 600mm F11 IS STM"},
20652065
{61182, "Canon RF 600mm F11 IS STM + RF1.4x"},
@@ -2068,55 +2068,55 @@ constexpr TagDetails canonCsLensType[] = {
20682068
{61182, "Canon RF 800mm F11 IS STM + RF1.4x"},
20692069
{61182, "Canon RF 800mm F11 IS STM + RF2x"},
20702070
{61182, "Canon RF 24-105mm F4-7.1 IS STM"},
2071-
{61182, "Canon RF 100-500mm F4.5-7.1L IS USM"},
2072-
{61182, "Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x"},
2073-
{61182, "Canon RF 100-500mm F4.5-7.1L IS USM + RF2x"},
2074-
{61182, "Canon RF 70-200mm F4L IS USM"},
2075-
{61182, "Canon RF 100mm F2.8L MACRO IS USM"},
2071+
{61182, "Canon RF 100-500mm F4.5-7.1 L IS USM"},
2072+
{61182, "Canon RF 100-500mm F4.5-7.1 L IS USM + RF1.4x"},
2073+
{61182, "Canon RF 100-500mm F4.5-7.1 L IS USM + RF2x"},
2074+
{61182, "Canon RF 70-200mm F4 L IS USM"},
2075+
{61182, "Canon RF 100mm F2.8 L MACRO IS USM"},
20762076
{61182, "Canon RF 50mm F1.8 STM"},
2077-
{61182, "Canon RF 14-35mm F4L IS USM"},
2077+
{61182, "Canon RF 14-35mm F4 L IS USM"},
20782078
{61182, "Canon RF-S 18-45mm F4.5-6.3 IS STM"},
20792079
{61182, "Canon RF 100-400mm F5.6-8 IS USM"},
20802080
{61182, "Canon RF 100-400mm F5.6-8 IS USM + RF1.4x"},
20812081
{61182, "Canon RF 100-400mm F5.6-8 IS USM + RF2x"},
20822082
{61182, "Canon RF-S 18-150mm F3.5-6.3 IS STM"},
20832083
{61182, "Canon RF 24mm F1.8 MACRO IS STM"},
20842084
{61182, "Canon RF 16mm F2.8 STM"},
2085-
{61182, "Canon RF 400mm F2.8L IS USM"},
2086-
{61182, "Canon RF 400mm F2.8L IS USM + RF1.4x"},
2087-
{61182, "Canon RF 400mm F2.8L IS USM + RF2x"},
2088-
{61182, "Canon RF 600mm F4L IS USM"},
2089-
{61182, "Canon RF 600mm F4L IS USM + RF1.4x"},
2090-
{61182, "Canon RF 600mm F4L IS USM + RF2x"},
2091-
{61182, "Canon RF 800mm F5.6L IS USM"},
2092-
{61182, "Canon RF 800mm F5.6L IS USM + RF1.4x"},
2093-
{61182, "Canon RF 800mm F5.6L IS USM + RF2x"},
2094-
{61182, "Canon RF 1200mm F8L IS USM"},
2095-
{61182, "Canon RF 1200mm F8L IS USM + RF1.4x"},
2096-
{61182, "Canon RF 1200mm F8L IS USM + RF2x"},
2097-
{61182, "Canon RF 5.2mm F2.8L Dual Fisheye 3D VR"},
2085+
{61182, "Canon RF 400mm F2.8 L IS USM"},
2086+
{61182, "Canon RF 400mm F2.8 L IS USM + RF1.4x"},
2087+
{61182, "Canon RF 400mm F2.8 L IS USM + RF2x"},
2088+
{61182, "Canon RF 600mm F4 L IS USM"},
2089+
{61182, "Canon RF 600mm F4 L IS USM + RF1.4x"},
2090+
{61182, "Canon RF 600mm F4 L IS USM + RF2x"},
2091+
{61182, "Canon RF 800mm F5.6 L IS USM"},
2092+
{61182, "Canon RF 800mm F5.6 L IS USM + RF1.4x"},
2093+
{61182, "Canon RF 800mm F5.6 L IS USM + RF2x"},
2094+
{61182, "Canon RF 1200mm F8 L IS USM"},
2095+
{61182, "Canon RF 1200mm F8 L IS USM + RF1.4x"},
2096+
{61182, "Canon RF 1200mm F8 L IS USM + RF2x"},
2097+
{61182, "Canon RF 5.2mm F2.8 L Dual Fisheye 3D VR"},
20982098
{61182, "Canon RF 15-30mm F4.5-6.3 IS STM"},
2099-
{61182, "Canon RF 135mm F1.8L IS USM"},
2099+
{61182, "Canon RF 135mm F1.8 L IS USM"},
21002100
{61182, "Canon RF 24-50mm F4.5-6.3 IS STM"},
21012101
{61182, "Canon RF-S 55-210mm F5-7.1 IS STM"},
2102-
{61182, "Canon RF 100-300mm F2.8L IS USM"},
2103-
{61182, "Canon RF 100-300mm F2.8L IS USM + RF1.4x"},
2104-
{61182, "Canon RF 100-300mm F2.8L IS USM + RF2x"},
2102+
{61182, "Canon RF 100-300mm F2.8 L IS USM"},
2103+
{61182, "Canon RF 100-300mm F2.8 L IS USM + RF1.4x"},
2104+
{61182, "Canon RF 100-300mm F2.8 L IS USM + RF2x"},
21052105
{61182, "Canon RF 200-800mm F6.3-9 IS USM"},
21062106
{61182, "Canon RF 200-800mm F6.3-9 IS USM + RF1.4x"},
21072107
{61182, "Canon RF 200-800mm F6.3-9 IS USM + RF2x"},
2108-
{61182, "Canon RF 10-20mm F4L IS STM"},
2108+
{61182, "Canon RF 10-20mm F4 L IS STM"},
21092109
{61182, "Canon RF 28mm F2.8 STM"},
2110-
{61182, "Canon RF 24-105mm F2.8L IS USM Z"},
2110+
{61182, "Canon RF 24-105mm F2.8 L IS USM Z"},
21112111
{61182, "Canon RF-S 10-18mm F4.5-6.3 IS STM"},
2112-
{61182, "Canon RF 35mm F1.4L VCM"},
2112+
{61182, "Canon RF 35mm F1.4 L VCM"},
21132113
{61182, "Canon RF-S 3.9mm F3.5 STM Dual Fisheye"},
21142114
{61182, "Canon RF 28-70mm F2.8 IS STM"},
2115-
{61182, "Canon RF 70-200mm F2.8L IS USM Z"},
2116-
{61182, "Canon RF 70-200mm F2.8L IS USM Z + RF1.4x"},
2117-
{61182, "Canon RF 70-200mm F2.8L IS USM Z + RF2x"},
2118-
{61182, "Canon RF 50mm F1.4L VCM"},
2119-
{61182, "Canon RF 24mm F1.4L VCM"},
2115+
{61182, "Canon RF 70-200mm F2.8 L IS USM Z"},
2116+
{61182, "Canon RF 70-200mm F2.8 L IS USM Z + RF1.4x"},
2117+
{61182, "Canon RF 70-200mm F2.8 L IS USM Z + RF2x"},
2118+
{61182, "Canon RF 50mm F1.4 L VCM"},
2119+
{61182, "Canon RF 24mm F1.4 L VCM"},
21202120
{65535, N_("n/a")},
21212121
};
21222122

@@ -2538,16 +2538,16 @@ constexpr TagDetails canonToningEffect[] = {
25382538
// from https://github.com/exiftool/exiftool/blob/13.12/lib/Image/ExifTool/Canon.pm#L6942
25392539
constexpr TagDetails canonRFLensType[] = {
25402540
{0, N_("n/a")},
2541-
{257, "Canon RF 50mm F1.2L USM"},
2542-
{258, "Canon RF 24-105mm F4L IS USM"},
2543-
{259, "Canon RF 28-70mm F2L USM"},
2541+
{257, "Canon RF 50mm F1.2 L USM"},
2542+
{258, "Canon RF 24-105mm F4 L IS USM"},
2543+
{259, "Canon RF 28-70mm F2 L USM"},
25442544
{260, "Canon RF 35mm F1.8 MACRO IS STM"},
2545-
{261, "Canon RF 85mm F1.2L USM"},
2546-
{262, "Canon RF 85mm F1.2L USM DS"},
2547-
{263, "Canon RF 24-70mm F2.8L IS USM"},
2548-
{264, "Canon RF 15-35mm F2.8L IS USM"},
2545+
{261, "Canon RF 85mm F1.2 L USM"},
2546+
{262, "Canon RF 85mm F1.2 L USM DS"},
2547+
{263, "Canon RF 24-70mm F2.8 L IS USM"},
2548+
{264, "Canon RF 15-35mm F2.8 L IS USM"},
25492549
{265, "Canon RF 24-240mm F4-6.3 IS USM"},
2550-
{266, "Canon RF 70-200mm F2.8L IS USM"},
2550+
{266, "Canon RF 70-200mm F2.8 L IS USM"},
25512551
{267, "Canon RF 85mm F2 MACRO IS STM"},
25522552
{268, "Canon RF 600mm F11 IS STM"},
25532553
{269, "Canon RF 600mm F11 IS STM + RF1.4x"},
@@ -2556,55 +2556,55 @@ constexpr TagDetails canonRFLensType[] = {
25562556
{272, "Canon RF 800mm F11 IS STM + RF1.4x"},
25572557
{273, "Canon RF 800mm F11 IS STM + RF2x"},
25582558
{274, "Canon RF 24-105mm F4-7.1 IS STM"},
2559-
{275, "Canon RF 100-500mm F4.5-7.1L IS USM"},
2560-
{276, "Canon RF 100-500mm F4.5-7.1L IS USM + RF1.4x"},
2561-
{277, "Canon RF 100-500mm F4.5-7.1L IS USM + RF2x"},
2562-
{278, "Canon RF 70-200mm F4L IS USM"},
2563-
{279, "Canon RF 100mm F2.8L MACRO IS USM"},
2559+
{275, "Canon RF 100-500mm F4.5-7.1 L IS USM"},
2560+
{276, "Canon RF 100-500mm F4.5-7.1 L IS USM + RF1.4x"},
2561+
{277, "Canon RF 100-500mm F4.5-7.1 L IS USM + RF2x"},
2562+
{278, "Canon RF 70-200mm F4 L IS USM"},
2563+
{279, "Canon RF 100mm F2.8 L MACRO IS USM"},
25642564
{280, "Canon RF 50mm F1.8 STM"},
2565-
{281, "Canon RF 14-35mm F4L IS USM"},
2565+
{281, "Canon RF 14-35mm F4 L IS USM"},
25662566
{282, "Canon RF-S 18-45mm F4.5-6.3 IS STM"},
25672567
{283, "Canon RF 100-400mm F5.6-8 IS USM"},
25682568
{284, "Canon RF 100-400mm F5.6-8 IS USM + RF1.4x"},
25692569
{285, "Canon RF 100-400mm F5.6-8 IS USM + RF2x"},
25702570
{286, "Canon RF-S 18-150mm F3.5-6.3 IS STM"},
25712571
{287, "Canon RF 24mm F1.8 MACRO IS STM"},
25722572
{288, "Canon RF 16mm F2.8 STM"},
2573-
{289, "Canon RF 400mm F2.8L IS USM"},
2574-
{290, "Canon RF 400mm F2.8L IS USM + RF1.4x"},
2575-
{291, "Canon RF 400mm F2.8L IS USM + RF2x"},
2576-
{292, "Canon RF 600mm F4L IS USM"},
2577-
{293, "Canon RF 600mm F4L IS USM + RF1.4x"},
2578-
{294, "Canon RF 600mm F4L IS USM + RF2x"},
2579-
{295, "Canon RF 800mm F5.6L IS USM"},
2580-
{296, "Canon RF 800mm F5.6L IS USM + RF1.4x"},
2581-
{297, "Canon RF 800mm F5.6L IS USM + RF2x"},
2582-
{298, "Canon RF 1200mm F8L IS USM"},
2583-
{299, "Canon RF 1200mm F8L IS USM + RF1.4x"},
2584-
{300, "Canon RF 1200mm F8L IS USM + RF2x"},
2585-
{301, "Canon RF 5.2mm F2.8L Dual Fisheye 3D VR"},
2573+
{289, "Canon RF 400mm F2.8 L IS USM"},
2574+
{290, "Canon RF 400mm F2.8 L IS USM + RF1.4x"},
2575+
{291, "Canon RF 400mm F2.8 L IS USM + RF2x"},
2576+
{292, "Canon RF 600mm F4 L IS USM"},
2577+
{293, "Canon RF 600mm F4 L IS USM + RF1.4x"},
2578+
{294, "Canon RF 600mm F4 L IS USM + RF2x"},
2579+
{295, "Canon RF 800mm F5.6 L IS USM"},
2580+
{296, "Canon RF 800mm F5.6 L IS USM + RF1.4x"},
2581+
{297, "Canon RF 800mm F5.6 L IS USM + RF2x"},
2582+
{298, "Canon RF 1200mm F8 L IS USM"},
2583+
{299, "Canon RF 1200mm F8 L IS USM + RF1.4x"},
2584+
{300, "Canon RF 1200mm F8 L IS USM + RF2x"},
2585+
{301, "Canon RF 5.2mm F2.8 L Dual Fisheye 3D VR"},
25862586
{302, "Canon RF 15-30mm F4.5-6.3 IS STM"},
2587-
{303, "Canon RF 135mm F1.8L IS USM"},
2587+
{303, "Canon RF 135mm F1.8 L IS USM"},
25882588
{304, "Canon RF 24-50mm F4.5-6.3 IS STM"},
25892589
{305, "Canon RF-S 55-210mm F5-7.1 IS STM"},
2590-
{306, "Canon RF 100-300mm F2.8L IS USM"},
2591-
{307, "Canon RF 100-300mm F2.8L IS USM + RF1.4x"},
2592-
{308, "Canon RF 100-300mm F2.8L IS USM + RF2x"},
2590+
{306, "Canon RF 100-300mm F2.8 L IS USM"},
2591+
{307, "Canon RF 100-300mm F2.8 L IS USM + RF1.4x"},
2592+
{308, "Canon RF 100-300mm F2.8 L IS USM + RF2x"},
25932593
{309, "Canon RF 200-800mm F6.3-9 IS USM"},
25942594
{310, "Canon RF 200-800mm F6.3-9 IS USM + RF1.4x"},
25952595
{311, "Canon RF 200-800mm F6.3-9 IS USM + RF2x"},
2596-
{312, "Canon RF 10-20mm F4L IS STM"},
2596+
{312, "Canon RF 10-20mm F4 L IS STM"},
25972597
{313, "Canon RF 28mm F2.8 STM"},
2598-
{314, "Canon RF 24-105mm F2.8L IS USM Z"},
2598+
{314, "Canon RF 24-105mm F2.8 L IS USM Z"},
25992599
{315, "Canon RF-S 10-18mm F4.5-6.3 IS STM"},
2600-
{316, "Canon RF 35mm F1.4L VCM"},
2600+
{316, "Canon RF 35mm F1.4 L VCM"},
26012601
{317, "Canon RF-S 3.9mm F3.5 STM Dual Fisheye"},
26022602
{318, "Canon RF 28-70mm F2.8 IS STM"},
2603-
{319, "Canon RF 70-200mm F2.8L IS USM Z"},
2604-
{320, "Canon RF 70-200mm F2.8L IS USM Z + RF1.4x"},
2605-
{321, "Canon RF 70-200mm F2.8L IS USM Z + RF2x"},
2606-
{325, "Canon RF 50mm F1.4L VCM"},
2607-
{326, "Canon RF 24mm F1.4L VCM"},
2603+
{319, "Canon RF 70-200mm F2.8 L IS USM Z"},
2604+
{320, "Canon RF 70-200mm F2.8 L IS USM Z + RF1.4x"},
2605+
{321, "Canon RF 70-200mm F2.8 L IS USM Z + RF2x"},
2606+
{325, "Canon RF 50mm F1.4 L VCM"},
2607+
{326, "Canon RF 24mm F1.4 L VCM"},
26082608
};
26092609

26102610
// Canon File Info Tag

0 commit comments

Comments
 (0)