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

Olympus M.Zuiko Digital ED 17mm F1.2 Pro (master only) (bp #1375) #1378

Closed
wants to merge 2 commits into from
Closed

Olympus M.Zuiko Digital ED 17mm F1.2 Pro (master only) (bp #1375) #1378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a52a15
Add LensType entry for Olympus M.Zuiko Digital ED 17mm F1.2 Pro lens.
olupton Oct 20, 2020
8b6a10a
Add a test for PR 1375, checking the Olympus 17mm f/1.2 Pro lens is r…
olupton Oct 20, 2020
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
1 change: 1 addition & 0 deletions src/olympusmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,6 +1315,7 @@ namespace Exiv2 {
{ { 0, 38, 16 }, "Olympus M.Zuiko Digital ED 12-100mm F4.0 IS Pro" },
{ { 0, 39, 16 }, "Olympus M.Zuiko Digital ED 30mm F3.5 Macro" },
{ { 0, 40, 16 }, "Olympus M.Zuiko Digital ED 25mm F1.2 Pro" },
{ { 0, 41, 16 }, "Olympus M.Zuiko Digital ED 17mm F1.2 Pro" },
{ { 0, 48, 0 }, "Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD" },
{ { 0, 49, 0 }, "Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD" },
{ { 0, 50, 0 }, "Olympus Zuiko Digital ED 14-35mm F2.0 SWD" },
Expand Down
Binary file added test/data/olympus-m.zuiko-17mm-f1.2-pro.exv
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions tests/bugfixes/github/test_pr_1375.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# -*- coding: utf-8 -*-

import system_tests

class Olympus_MZuiko_17mm_f12_Pro(metaclass=system_tests.CaseMeta):
url = "https://github.com/Exiv2/exiv2/pull/1375"

filename = "$data_path/olympus-m.zuiko-17mm-f1.2-pro.exv"
commands = ["$exiv2 -pa -K Exif.OlympusEq.LensType $filename"]
stderr = ["""Warning: Directory OlympusCs, entry 0x0101: Strip 0 is outside of the data area; ignored.
"""]
stdout = ["""Exif.OlympusEq.LensType Byte 6 Olympus M.Zuiko Digital ED 17mm F1.2 Pro
"""]
retval = [0]