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

Add Sigma APO MACRO 180mm F3.5 EX DG (Nikon Mount) #992

Merged
merged 2 commits into from
Aug 27, 2019
Merged

Add Sigma APO MACRO 180mm F3.5 EX DG (Nikon Mount) #992

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
9852e21
add ID for Sigma APO MACRO 180mm F3.5 EX DG (nikon)
sat3ll Aug 26, 2019
4329dfc
add test case
sat3ll Aug 26, 2019
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
2 changes: 2 additions & 0 deletions src/nikonmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2540,6 +2540,8 @@ fmountlens[] = {
// https://github.com/Exiv2/exiv2/issues/811
{0xC1,0x48,0x24,0x37,0x24,0x24,0x4b,0x46,0x00,0x00,0x00, "Sigma", "", "14-24mm F2.8 DG HSM Art"},
//
{0xf4,0x4c,0x7c,0x7c,0x2c,0x2c,0x4b,0x02,0x00,0x00,0x00, "Sigma", "", "APO MACRO 180mm F3.5 EX DG"},
//
{0,0,0,0,0,0,0,0,0,0,0, nullptr, nullptr, nullptr}
};
//------------------------------------------------------------------------------
Expand Down
Binary file added test/data/Sigma_APO_MACRO_180_F3.5_EX_DG.exv
View file
Open in desktop
Binary file not shown.
15 changes: 15 additions & 0 deletions tests/bugfixes/github/test_pr_992.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# -*- coding: utf-8 -*-

import system_tests

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

filename = "$data_path/Sigma_APO_MACRO_180_F3.5_EX_DG.exv"
commands = ["$exiv2 -pa --grep lensid/i $filename"]
stderr = [""]
stdout = [""
"""Exif.NikonLd3.LensIDNumber Byte 1 Sigma APO MACRO 180mm F3.5 EX DG
"""
]
retval = [0]