From 60b0b842cf1654cf8e8ed0579ce017a3290f90e6 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Tue, 22 Mar 2016 15:03:34 +0000 Subject: [PATCH] #1170. Thank you, Marcus for reporting this and providing the test data. --- src/canonmn.cpp | 2 +- test/bugfixes-test.sh | 7 +++++++ test/data/bugfixes-test.out | Bin 1871756 -> 1872213 bytes 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/canonmn.cpp b/src/canonmn.cpp index 70369d3c..962ce7b0 100644 --- a/src/canonmn.cpp +++ b/src/canonmn.cpp @@ -995,7 +995,7 @@ namespace Exiv2 { { 160, printCsLensByFocalLength }, { 161, printCsLensByFocalLength }, { 168, printCsLensByFocalLength }, - { 169, printCsLensByFocalLength }, + { 169, printCsLensByFocalLengthAndMaxAperture }, { 172, printCsLensByFocalLength }, // not tested { 173, printCsLensByFocalLengthTC }, // works partly { 174, printCsLensByFocalLength }, // not tested diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh index a9a9788c..29179888 100755 --- a/test/bugfixes-test.sh +++ b/test/bugfixes-test.sh @@ -527,6 +527,13 @@ source ./functions.source copyTestFile $filename runTest exiv2 -pa --grep lens/i $filename + num=1170 + printf "$num " >&3 + filename=exiv2-bug$num.exv + echo '------>' Bug $num '<-------' >&2 + copyTestFile $filename + runTest exiv2 -pa --grep lens/i $filename + ) 3>&1 > $results 2>&1 printf "\n" diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out index a7a63407afd5d6d0376a102858f3dfb3d7649c40..6df659b21a0939131b4ca69d595896b6481065e3 100644 GIT binary patch delta 151 zcmeB~Uvza*Q9}!33sVbo3rh=Y3tJ0&3r7oQ3s(zw3r`Dg3ttO=i$IHDi%^Sji%5%T zi&%?zi$sfLi&TsB7MY&@>3<_-_!!NnSH#G;Pmha`VdFJ6&COLv(>K&JQE+jeF5f5P w$Yg9f{bGcSGo$JB4Sh29g2tx$h6-T90LTF1>5U~amTU^93P926alJBL05o_kqW}N^ delta 65 zcmV~$$qj-)006+qDWHJL;X##Dz+;}9Pyz`x&