diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp index f55627a6..1ee26694 100644 --- a/src/canonmn_int.cpp +++ b/src/canonmn_int.cpp @@ -2775,7 +2775,7 @@ namespace Exiv2 { // maybe short focal length max aperture and hyphen, surely at least single max aperture e.g.: f/4.5-5.6 // short and tele indicate apertures at the short (focal_length_min) and tele (focal_length_max) // position of the lens - "(?:(?:f\\/)|T)(?:([0-9]+(?:\\.[0-9]+)?)-)?([0-9]+(?:\\.[0-9])?)" + "(?:(?:f\\/)|T|F)(?:([0-9]+(?:\\.[0-9]+)?)-)?([0-9]+(?:\\.[0-9])?)" // check if there is a teleconverter pattern e.g. + 1.4x "(?:.*?\\+.*?([0-9.]+)x)?" ); diff --git a/tests/lens_tests/utils.py b/tests/lens_tests/utils.py index b3d61319..74b5af3e 100644 --- a/tests/lens_tests/utils.py +++ b/tests/lens_tests/utils.py @@ -19,7 +19,7 @@ LENS_META_DEFAULT_RE = re.compile( ".*?" # maybe short focal length max aperture and hyphen, surely at least single max aperture e.g.: f/4.5-5.6 # short and tele indicate apertures at the short (focal_length_min) and tele (focal_length_max) position of the lens - "(?:(?:f\/)|T)(?:(?P[0-9]+(?:\.[0-9]+)?)-)?(?P[0-9]+(?:\.[0-9])?)" + "(?:(?:f\/)|T|F)(?:(?P[0-9]+(?:\.[0-9]+)?)-)?(?P[0-9]+(?:\.[0-9])?)" # check if there is a teleconverter pattern e.g. + 1.4x "(?:.*?\+.*?(?P[0-9.]+)x)?" )