diff --git a/src/canonmn.cpp b/src/canonmn.cpp index 2d45d8be..c0887d15 100644 --- a/src/canonmn.cpp +++ b/src/canonmn.cpp @@ -917,6 +917,7 @@ namespace Exiv2 { { 174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM" }, // 2 { 174, "Sigma 150-500mm f/5-6.3 APO DG OS HSM" }, // 3 { 174, "Zeiss Milvus 100mm f/2 Makro" }, // 4 + { 174, "Sigma 120-300mm f/2.8 EX APO DG OS HSM" }, // 5 { 175, "Canon EF 400mm f/2.8L" }, { 176, "Canon EF 24-85mm f/3.5-4.5 USM" }, { 177, "Canon EF 300mm f/4L IS" }, diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh index 8a76b4db..a8e8cc57 100755 --- a/test/bugfixes-test.sh +++ b/test/bugfixes-test.sh @@ -613,6 +613,14 @@ source ./functions.source copyTestFile $filename runTest exiv2 -pa $filename + num=1252 + for X in a b; do + filename=exiv2-bug$num$X.exv + echo '------>' Bug $filename '<-------' >&2 + copyTestFile $filename + runTest exiv2 -pa --grep lens/i $filename + done + ) 3>&1 > $results 2>&1 printf "\n" diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out index f502286a..c4966924 100644 Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ diff --git a/test/data/exiv2-bug1252a.exv b/test/data/exiv2-bug1252a.exv new file mode 100644 index 00000000..8fd233ac Binary files /dev/null and b/test/data/exiv2-bug1252a.exv differ diff --git a/test/data/exiv2-bug1252b.exv b/test/data/exiv2-bug1252b.exv new file mode 100644 index 00000000..c05390fe Binary files /dev/null and b/test/data/exiv2-bug1252b.exv differ