Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix 1004 Canon Lens Fixes (0.27->master) #1157

Merged
merged 1 commit into from
Apr 14, 2020
Merged

fix 1004 Canon Lens Fixes (0.27->master) #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
178 changes: 95 additions & 83 deletions src/canonmn_int.cpp
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions test/data/exiv2-test.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1890,7 +1890,7 @@ File 14/15: 20001004_015404.jpg
20001004_015404.jpg Exif.CanonCs.AFPoint Short 1 Auto-selected
20001004_015404.jpg Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av)
20001004_015404.jpg Exif.CanonCs.0x0015 Short 1 0
20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens
20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM
20001004_015404.jpg Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm
20001004_015404.jpg Exif.CanonCs.MaxAperture Short 1 F2.8
20001004_015404.jpg Exif.CanonCs.MinAperture Short 1 F22
Expand Down Expand Up @@ -3502,7 +3502,7 @@ Compare image data and extracted data ------------------------------------
< 20001004_015404.jpg Exif.CanonCs.AFPoint Short 1 Auto-selected
< 20001004_015404.jpg Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av)
< 20001004_015404.jpg Exif.CanonCs.0x0015 Short 1 0
< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens
< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM
< 20001004_015404.jpg Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm
< 20001004_015404.jpg Exif.CanonCs.MaxAperture Short 1 F2.8
< 20001004_015404.jpg Exif.CanonCs.MinAperture Short 1 F22
Expand Down Expand Up @@ -5043,7 +5043,7 @@ Compare image data and extracted data ------------------------------------
> 20001004_015404.exv Exif.CanonCs.AFPoint Short 1 Auto-selected
> 20001004_015404.exv Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av)
> 20001004_015404.exv Exif.CanonCs.0x0015 Short 1 0
> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens
> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM
> 20001004_015404.exv Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm
> 20001004_015404.exv Exif.CanonCs.MaxAperture Short 1 F2.8
> 20001004_015404.exv Exif.CanonCs.MinAperture Short 1 F22
Expand Down Expand Up @@ -6804,7 +6804,7 @@ Compare original and inserted image data ---------------------------------
< 20001004_015404.jpg Exif.CanonCs.AFPoint Short 1 Auto-selected
< 20001004_015404.jpg Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av)
< 20001004_015404.jpg Exif.CanonCs.0x0015 Short 1 0
< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens
< 20001004_015404.jpg Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM
< 20001004_015404.jpg Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm
< 20001004_015404.jpg Exif.CanonCs.MaxAperture Short 1 F2.8
< 20001004_015404.jpg Exif.CanonCs.MinAperture Short 1 F22
Expand Down Expand Up @@ -8345,7 +8345,7 @@ Compare original and inserted image data ---------------------------------
> 20001004_015404.exv Exif.CanonCs.AFPoint Short 1 Auto-selected
> 20001004_015404.exv Exif.CanonCs.ExposureProgram Short 1 Aperture priority (Av)
> 20001004_015404.exv Exif.CanonCs.0x0015 Short 1 0
> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM or Other Lens
> 20001004_015404.exv Exif.CanonCs.LensType Short 1 Canon EF 28-70mm f/2.8L USM
> 20001004_015404.exv Exif.CanonCs.Lens Short 3 28.0 - 70.0 mm
> 20001004_015404.exv Exif.CanonCs.MaxAperture Short 1 F2.8
> 20001004_015404.exv Exif.CanonCs.MinAperture Short 1 F22
Expand Down
8 changes: 6 additions & 2 deletions test/functions.source
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ runTest()
if [ ! -z $EXIV2_ECHO ]; then
echoTest $VALGRIND $bin$prog "$@"
fi
$VALGRIND $bin$prog "$@"
$VALGRIND $bin$prog$exe "$@"
)
}

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/path-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ source ./functions.source
)

# That's all Folks!
##
##
4 changes: 2 additions & 2 deletions test/xmpparser-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ fi

for f in ${files[@]} ; do
runTest xmpparser-test $f
diff $f ${f}-new
diff $diffargs $f ${f}-new
done

testfile=xmpsdk.xmp
runTest xmpparse ${testfile} > t1 2>&1
runTest xmpparse ${testfile}-new > t2 2>&1
diff t1 t2
diff $diffargs t1 t2

# ----------------------------------------------------------------------
# xmpsample
Expand Down
4 changes: 2 additions & 2 deletions tests/bugfixes/github/test_issue_20.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

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",
Expand Down Expand Up @@ -36,7 +36,7 @@ class TamronSupport(metaclass=system_tests.CaseMeta):
""",

# 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
Expand Down
2 changes: 1 addition & 1 deletion tests/bugfixes/github/test_issue_45.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down