From cfeceee41684eacd239cad1dde4fd777fb939fc4 Mon Sep 17 00:00:00 2001 From: andyrtr Date: Sun, 20 Jun 2021 22:15:01 +0200 Subject: [PATCH] add lens: Olympus M.ZUIKO DIGITAL ED 12-45mm F4.0 PRO (#1725) * add lens ID for Olympus M.Zuiko Digital ED 12-45mm F4.0 Pro #1723 * add test for #1723 checking the Olympus M.Zuiko Digital ED 12-45mm F4.0 Pro recognized correctly --- src/olympusmn_int.cpp | 1 + test/data/olympus-m.zuiko-12-45mm-f4-pro.exv | Bin 0 -> 15819 bytes tests/bugfixes/github/test_issue_1723.py | 13 +++++++++++++ 3 files changed, 14 insertions(+) create mode 100644 test/data/olympus-m.zuiko-12-45mm-f4-pro.exv create mode 100644 tests/bugfixes/github/test_issue_1723.py diff --git a/src/olympusmn_int.cpp b/src/olympusmn_int.cpp index 5fac8f6a..4abeeff4 100644 --- a/src/olympusmn_int.cpp +++ b/src/olympusmn_int.cpp @@ -1313,6 +1313,7 @@ namespace Exiv2 { { { 0, 50, 0 }, "Olympus Zuiko Digital ED 14-35mm F2.0 SWD" }, { { 0, 51, 0 }, "Olympus Zuiko Digital 25mm F2.8" }, { { 0, 52, 0 }, "Olympus Zuiko Digital ED 9-18mm F4.0-5.6" }, + { { 0, 52, 16 }, "Olympus M.Zuiko Digital ED 12-45mm F4.0 Pro" }, { { 0, 53, 0 }, "Olympus Zuiko Digital 14-54mm F2.8-3.5 II" }, { { 1, 1, 0 }, "Sigma 18-50mm F3.5-5.6 DC" }, { { 1, 1, 16 }, "Sigma 30mm F2.8 EX DN" }, diff --git a/test/data/olympus-m.zuiko-12-45mm-f4-pro.exv b/test/data/olympus-m.zuiko-12-45mm-f4-pro.exv new file mode 100644 index 0000000000000000000000000000000000000000..9eac8da79663695c0ddc42243301093c7cf49d81 GIT binary patch literal 15819 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 EKd@nUy#N3J literal 0 HcmV?d00001 diff --git a/tests/bugfixes/github/test_issue_1723.py b/tests/bugfixes/github/test_issue_1723.py new file mode 100644 index 00000000..e6aa3325 --- /dev/null +++ b/tests/bugfixes/github/test_issue_1723.py @@ -0,0 +1,13 @@ +# -*- coding: utf-8 -*- + +import system_tests + +class Olympus_MZuiko_12_45mm_f4_Pro(metaclass=system_tests.CaseMeta): + url = "https://github.com/Exiv2/exiv2/issues/1723" + + filename = "$data_path/olympus-m.zuiko-12-45mm-f4-pro.exv" + commands = ["$exiv2 -pa -K Exif.OlympusEq.LensType $filename"] + stderr = [""] + stdout = ["""Exif.OlympusEq.LensType Byte 6 Olympus M.Zuiko Digital ED 12-45mm F4.0 Pro +"""] + retval = [0]