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)
main
Robin Mills 5 years ago committed by GitHub
commit 21a0501e07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1315,6 +1315,7 @@ namespace Exiv2 {
{ { 0, 38, 16 }, "Olympus M.Zuiko Digital ED 12-100mm F4.0 IS Pro" }, { { 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, 39, 16 }, "Olympus M.Zuiko Digital ED 30mm F3.5 Macro" },
{ { 0, 40, 16 }, "Olympus M.Zuiko Digital ED 25mm F1.2 Pro" }, { { 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, 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, 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" }, { { 0, 50, 0 }, "Olympus Zuiko Digital ED 14-35mm F2.0 SWD" },

@ -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]
Loading…
Cancel
Save