Merge pull request #1043 from Exiv2/mergify/bp/0.27-maintenance/pr-1032

Fixes #1014 Two Nikon lenses still not detected (bp #1032)
This commit is contained in:
Luis Díaz Más 2019-10-12 19:09:31 +02:00 committed by GitHub
commit 43a0747770
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 1 deletions

View File

@ -72,7 +72,7 @@ cd $EXIV_ROOT
mkdir build && cd build
cmake .. -DCMAKE_BUILD_TYPE=Release
cmake --build .
make test
make tests
sudo make install
```

BIN
test/data/exiv2-bug1014.exv Normal file

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
import system_tests
class NikonLens(metaclass=system_tests.CaseMeta):
filenames = ["$data_path/exiv2-bug1014.exv", "$data_path/exiv2-bug1014_2.exv"]
commands = ["$exiv2 -pa --grep lens/i %s" % filenames[0], "$exiv2 -pa --grep lens/i %s" % filenames[1]]
stdout = ["""Exif.Nikon3.LensType Byte 1 D G VR
Exif.Nikon3.Lens Rational 4 24-70mm F2.8
Exif.Nikon3.LensFStops Undefined 4 6
Exif.NikonLd3.LensIDNumber Byte 1 Nikon AF-S Nikkor 24-70mm f/2.8E ED VR
Exif.NikonLd3.LensFStops Byte 1 F6.0
""",
"""Exif.Nikon3.LensType Byte 1 D G VR
Exif.Nikon3.Lens Rational 4 70-200mm F2.8
Exif.Nikon3.LensFStops Undefined 4 6
Exif.NikonLd3.LensIDNumber Byte 1 Nikon AF-S Nikkor 70-200mm f/2.8E FL ED VR
Exif.NikonLd3.LensFStops Byte 1 F6.0
"""
]
stderr = ["", ""]
retval = [0, 0]