Skip to content

Commit 21a0501

Browse files
authored
Merge pull request #1375 from olupton/add-olympus-m.zuiko-17mm-f1.2-pro
Add LensType entry for Olympus M.Zuiko Digital ED 17mm F1.2 Pro lens (0.27->master)
2 parents afb1e83 + b5c0058 commit 21a0501

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

src/olympusmn_int.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,6 +1315,7 @@ namespace Exiv2 {
13151315
{ { 0, 38, 16 }, "Olympus M.Zuiko Digital ED 12-100mm F4.0 IS Pro" },
13161316
{ { 0, 39, 16 }, "Olympus M.Zuiko Digital ED 30mm F3.5 Macro" },
13171317
{ { 0, 40, 16 }, "Olympus M.Zuiko Digital ED 25mm F1.2 Pro" },
1318+
{ { 0, 41, 16 }, "Olympus M.Zuiko Digital ED 17mm F1.2 Pro" },
13181319
{ { 0, 48, 0 }, "Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD" },
13191320
{ { 0, 49, 0 }, "Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD" },
13201321
{ { 0, 50, 0 }, "Olympus Zuiko Digital ED 14-35mm F2.0 SWD" },
16.4 KB
Binary file not shown.

tests/bugfixes/github/test_pr_1375.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# -*- coding: utf-8 -*-
2+
3+
import system_tests
4+
5+
class Olympus_MZuiko_17mm_f12_Pro(metaclass=system_tests.CaseMeta):
6+
url = "https://github.com/Exiv2/exiv2/pull/1375"
7+
8+
filename = "$data_path/olympus-m.zuiko-17mm-f1.2-pro.exv"
9+
commands = ["$exiv2 -pa -K Exif.OlympusEq.LensType $filename"]
10+
stderr = ["""Warning: Directory OlympusCs, entry 0x0101: Strip 0 is outside of the data area; ignored.
11+
"""]
12+
stdout = ["""Exif.OlympusEq.LensType Byte 6 Olympus M.Zuiko Digital ED 17mm F1.2 Pro
13+
"""]
14+
retval = [0]

0 commit comments

Comments
 (0)