third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1209 from Exiv2/fix_1208_NikonLens_0.27

Browse Source 
fix_1208_NikonLens_0.27
This commit is contained in:
Robin Mills 2020-05-18 23:27:09 +01:00 committed by GitHub
commit f6ccb8e8bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nikonmn_int.cpp
View File

@ -2531,10 +2531,8 @@ fmountlens[] = {
{0x00,0x48,0x80,0x80,0x30,0x30,0x00,0x00,0x00,0x00,0x00, "Nikon", "JAA313AA", "Nikkor 200mm f/4 AiS"},
{0x00,0x40,0x11,0x11,0x2C,0x2C,0x00,0x00,0x00,0x00,0x00, "Samyang", "", "8mm f/3.5 Fish-Eye"},
{0x00,0x58,0x64,0x64,0x20,0x20,0x00,0x00,0x00,0x00,0x00, "Soligor", "", "C/D Macro MC 90mm f/2.5"},
//
// https://github.com/Exiv2/exiv2/issues/743
{0xc9,0x48,0x37,0x5c,0x24,0x24,0x4b,0x4e,0x01,0x00,0x00, "Sigma", "", "24-70mm F2.8 DG OS HSM Art"},
//
// https://github.com/Exiv2/exiv2/issues/598 , https://github.com/Exiv2/exiv2/pull/891
{0xCF,0x47,0x5C,0x8E,0x31,0x3D,0xDF,0x0E,0x00,0x00,0x00, "Tamron", "A030", "SP 70-300mm F/4-5.6 Di VC USD"},
//
@ -2545,7 +2543,9 @@ fmountlens[] = {
{0xc8,0x54,0x44,0x44,0x0d,0x0d,0xdf,0x46,0x00,0x00,0x00, "Tamron", "F045", "SP 35mm f/1.4 Di USD"},
// https://github.com/Exiv2/exiv2/pull/1105
{0xCB,0x3C,0x2B,0x44,0x24,0x31,0xDF,0x46,0x00,0x00,0x00, "Tamron", "A037", "17-35mm F/2.8-4 Di OSD"},
//
// https://github.com/Exiv2/exiv2/issues/1208
{0xC8,0x54,0x62,0x62,0x0C,0x0C,0x4B,0x46,0x00,0x00,0x00, "Sigma", "321550", "85mm F1.4 DG HSM | A"},
// Always leave this at the end!
{0,0,0,0,0,0,0,0,0,0,0, NULL, NULL, NULL}
};
//------------------------------------------------------------------------------

BIN
test/data/exiv2-issue1208.exv Normal file
View File

Binary file not shown.

18
tests/bugfixes/github/test_issue_1208.py Normal file
View File

@ -0,0 +1,18 @@
# -*- coding: utf-8 -*-
from system_tests import CaseMeta, path
class Sigma_Art_85mm_F1_4Nikon_F_mount(metaclass=CaseMeta):
filename = path("$data_path/exiv2-issue1208.exv")
commands = ["$exiv2 -pa --grep lens/i $filename"]
stdout = ["""Exif.Nikon3.LensType Byte 1 D G
Exif.Nikon3.Lens Rational 4 85mm F1.4
Exif.Nikon3.LensFStops Undefined 4 7
Exif.NikonLd3.LensIDNumber Byte 1 Sigma 85mm F1.4 DG HSM | A
Exif.NikonLd3.LensFStops Byte 1 F7.0
"""
]
stderr = [""]
retval = [0]