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:
commit
43a0747770
@ -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
BIN
test/data/exiv2-bug1014.exv
Normal file
Binary file not shown.
BIN
test/data/exiv2-bug1014_2.exv
Normal file
BIN
test/data/exiv2-bug1014_2.exv
Normal file
Binary file not shown.
25
tests/bugfixes/github/test_issue_1014.py
Normal file
25
tests/bugfixes/github/test_issue_1014.py
Normal 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]
|
||||
Loading…
Reference in New Issue
Block a user