third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Discussion: https://github.com/Exiv2/exiv2/issues/1004#issuecomment-611064916

Browse Source
This commit is contained in:
clanmills
2020-04-08 18:34:48 +01:00
parent b9caa22733
commit 149688076d
6 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/canonmn_int.cpp
+4 -1
View File
@@ -928,6 +928,7 @@ namespace Exiv2 {
{ 142, "Canon EF 300mm f/2.8L IS USM" },
{ 143, "Canon EF 500mm f/4L IS USM" },
{ 143, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM" }, // 1
{ 143, "Sigma 24-105mm F4 DG OS HSM | A" }, // 2
{ 144, "Canon EF 35-135mm f/4-5.6 USM" },
{ 145, "Canon EF 100-300mm f/4.5-5.6 USM" },
{ 146, "Canon EF 70-210mm f/3.5-4.5 USM" },
@@ -1007,6 +1008,7 @@ namespace Exiv2 {
{ 173, "Sigma 10mm f/2.8 EX DC Fisheye" }, // 3
{ 173, "Sigma 15mm f/2.8 EX DG Diagonal Fisheye" }, // 4
{ 173, "Venus Laowa 100mm F2.8 2X Ultra Macro APO" }, // 5
{ 173, "Sigma 150-500mm f/5-6.3 APO DG OS HSM + 2x" }, // 6
{ 174, "Canon EF 135mm f/2L USM" },
{ 174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM" }, // 1
{ 174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM" }, // 2
@@ -1130,7 +1132,8 @@ namespace Exiv2 {
{ 252, "Canon EF 70-200mm f/2.8L IS III USM + 1.4x" }, // 1
{ 253, "Canon EF 70-200mm f/2.8L IS II USM + 2x" },
{ 253, "Canon EF 70-200mm f/2.8L IS III USM + 2x" }, // 1
{ 254, "Canon EF 100mm f/2.8L Macro IS USM" },
{ 254, "Canon EF 100mm f/2.8L Macro IS USM" }, // 1
{ 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1" }, // 2
{ 255, "Sigma 24-105mm f/4 DG OS HSM | A" },
{ 255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro" }, // 1
{ 368, "Sigma 14-24mm f/2.8 DG HSM | A" },
test/functions.source
+6 -2
View File
@@ -11,7 +11,7 @@ runTest()
if [ ! -z $EXIV2_ECHO ]; then
echoTest $VALGRIND $bin$prog "$@"
fi
$VALGRIND $bin$prog "$@"
$VALGRIND $bin$prog$exe "$@"
)
}
@@ -37,7 +37,7 @@ existsTest()
result=1
fi
else
if [ -e $bin$prog -o -e $bin$prog.exe ]; then
if [ -e $bin$prog -o -e $bin$prog$exe ]; then
result=1
fi
fi
@@ -464,6 +464,10 @@ prepareTest()
if [ "$PLATFORM" == cygwin -o "$PLATFORM" == mingw ]; then
exe=.exe
fi
if [ !-z $EXIV2_EXT ]; then
exe=$EXIV2_EXT
fi
if [ "$PLATFORM" == cygwin ]; then
# We need a private version of diff for linux compatibility
test/path-test.sh
+3 -3
View File
@@ -4,13 +4,13 @@ source ./functions.source
( cd "$testdir"
if [ $(existsTest path-test) == 1 ] ; then
if [ $(existsTest pathtest) == 1 ] ; then
copyTestFile path-test.txt
runTest path-test path-test.txt
runTest pathtest path-test.txt
else
echo "$0: path-test executable not found. Skipping path tests."
fi
)
# That's all Folks!
##
##
test/xmpparser-test.sh
+1
View File
@@ -17,6 +17,7 @@ fi
for f in ${files[@]} ; do
runTest xmpparser-test $f
# unix2dos -q ${f}-new
diff $f ${f}-new
done
tests/bugfixes/github/test_issue_20.py
+2 -2
View File
@@ -5,7 +5,7 @@ import system_tests
class TamronSupport(metaclass=system_tests.CaseMeta):
description = "Added support for 'Tamron SP 15-30mm f/2.8 Di VC USD A012' and 'Tamron SP 90mm f/2.8 Di VC USD MACRO1:1'"
description = "Added support for 'Tamron SP 15-30mm f/2.8 Di VC USD' and 'Tamron SP 90mm f/2.8 Di VC USD MACRO1:1'"
files = [
"exiv2-g20.exv",
@@ -36,7 +36,7 @@ Exif.Photo.LensSerialNumber Ascii 12 0000000000
""",
# TamronSP15-30mmF2.8DiVCUSDA012.exv"
"""Exif.CanonCs.LensType Short 1 Tamron SP 15-30mm f/2.8 Di VC USD A012
"""Exif.CanonCs.LensType Short 1 Tamron SP 15-30mm f/2.8 Di VC USD
""",
# TamronSP90mmF2.8DiVCUSDMacroF004.exv
tests/bugfixes/github/test_issue_45.py
+1 -1
View File
@@ -9,7 +9,7 @@ class Sigma24_105mmRecognization(metaclass=system_tests.CaseMeta):
filename = "$data_path/exiv2-g45.exv"
commands = ["$exiv2 -pa --grep lens/i " + filename]
stdout = ["""Exif.CanonCs.LensType Short 1 Sigma 24-105mm F4 DG OS HSM [Art 013]
stdout = ["""Exif.CanonCs.LensType Short 1 Sigma 24-105mm F4 DG OS HSM | A
Exif.CanonCs.Lens Short 3 24.0 - 105.0 mm
Exif.CanonCf.LensAFStopButton Short 1 0
Exif.Canon.LensModel Ascii 74 24-105mm F4 DG OS HSM | Art 013