Skip to content

Commit 43a0747

Browse files
authored
Merge pull request #1043 from Exiv2/mergify/bp/0.27-maintenance/pr-1032
Fixes #1014 Two Nikon lenses still not detected (bp #1032)
2 parents e919688 + 49511ae commit 43a0747

File tree

4 files changed

+26
-1
lines changed

4 files changed

+26
-1
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ cd $EXIV_ROOT
7272
mkdir build && cd build
7373
cmake .. -DCMAKE_BUILD_TYPE=Release
7474
cmake --build .
75-
make test
75+
make tests
7676
sudo make install
7777
```
7878

test/data/exiv2-bug1014.exv

32.6 KB
Binary file not shown.

test/data/exiv2-bug1014_2.exv

10.9 KB
Binary file not shown.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# -*- coding: utf-8 -*-
2+
3+
import system_tests
4+
5+
6+
class NikonLens(metaclass=system_tests.CaseMeta):
7+
8+
filenames = ["$data_path/exiv2-bug1014.exv", "$data_path/exiv2-bug1014_2.exv"]
9+
commands = ["$exiv2 -pa --grep lens/i %s" % filenames[0], "$exiv2 -pa --grep lens/i %s" % filenames[1]]
10+
11+
stdout = ["""Exif.Nikon3.LensType Byte 1 D G VR
12+
Exif.Nikon3.Lens Rational 4 24-70mm F2.8
13+
Exif.Nikon3.LensFStops Undefined 4 6
14+
Exif.NikonLd3.LensIDNumber Byte 1 Nikon AF-S Nikkor 24-70mm f/2.8E ED VR
15+
Exif.NikonLd3.LensFStops Byte 1 F6.0
16+
""",
17+
"""Exif.Nikon3.LensType Byte 1 D G VR
18+
Exif.Nikon3.Lens Rational 4 70-200mm F2.8
19+
Exif.Nikon3.LensFStops Undefined 4 6
20+
Exif.NikonLd3.LensIDNumber Byte 1 Nikon AF-S Nikkor 70-200mm f/2.8E FL ED VR
21+
Exif.NikonLd3.LensFStops Byte 1 F6.0
22+
"""
23+
]
24+
stderr = ["", ""]
25+
retval = [0, 0]

0 commit comments

Comments
 (0)