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

Merge pull request #227 from frli8848/master

Browse Source 
Nikon mount - Sigma Lens Updates
This commit is contained in:
D4N 2018-02-22 11:57:03 +01:00 committed by GitHub
commit 9f74f247b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nikonmn_int.cpp
View File

@ -2100,7 +2100,7 @@ fmountlens[] = {
{0xEA,0x48,0x27,0x27,0x24,0x24,0x1C,0x02,0x00,0x00,0x00, "Sigma", "", "15mm F2.8 EX Diagonal Fisheye"},
//M "Sigma" "410" "18mm F3.5";
{0x26,0x58,0x31,0x31,0x14,0x14,0x1C,0x02,0x00,0x00,0x00, "Sigma", "411442", "20mm F1.8 EX DG Aspherical RF"},
{0x79,0x54,0x31,0x31,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "", "20mm F1.4 DG HSM | A"},
{0x79,0x54,0x31,0x31,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "412555", "20mm F1.4 DG HSM | A"},
{0x26,0x58,0x37,0x37,0x14,0x14,0x1C,0x02,0x00,0x00,0x00, "Sigma", "432447", "24mm F1.8 EX DG Aspherical Macro"},
{0xE1,0x58,0x37,0x37,0x14,0x14,0x1C,0x02,0x00,0x00,0x00, "Sigma", "432447", "24mm F1.8 EX DG Aspherical Macro"},
{0x02,0x46,0x37,0x37,0x25,0x25,0x02,0x00,0x00,0x00,0x00, "Sigma", "438", "24mm F2.8 Super Wide II Macro"},
@ -2109,7 +2109,7 @@ fmountlens[] = {
{0xF8,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "477554", "30mm F1.4 EX DC HSM"},
{0x91,0x54,0x44,0x44,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "", "35mm F1.4 DG HSM"},
{0xDE,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x01,0x00,0x00, "Sigma", "310554", "50mm F1.4 EX DG HSM"},
{0x88,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "", "50mm F1.4 DG HSM | A"},
{0x88,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x00,0x00,0x00, "Sigma", "311551", "50mm F1.4 DG HSM | A"},
{0x02,0x48,0x50,0x50,0x24,0x24,0x02,0x00,0x00,0x00,0x00, "Sigma", "", "Macro 50mm F2.8"},
{0x32,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x00, "Sigma", "346447", "Macro 50mm F2.8 EX DG"},
{0xE3,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x00,0x00, "Sigma", "", "Macro 50mm F2.8 EX DG"},
@ -2232,6 +2232,7 @@ fmountlens[] = {
{0x48,0x54,0x6F,0x8E,0x24,0x24,0x4B,0x02,0x03,0x00,0x00, "Sigma", "", "APO 120-300mm F2.8 EX DG HSM"},
{0x7A,0x54,0x6E,0x8E,0x24,0x24,0x4B,0x02,0x03,0x00,0x00, "Sigma", "135553", "APO 120-300mm F2.8 EX DG HSM"},
{0xFA,0x54,0x6E,0x8E,0x24,0x24,0x4B,0x02,0x03,0x00,0x00, "Sigma", "135553", "APO 120-300mm F2.8 EX DG HSM"},
{0x8D,0x48,0x6E,0x8E,0x24,0x24,0x4B,0x0E,0x00,0x00,0x00, "Sigma", "137557", "120-300mm F2.8 DG OS HSM | S"},
{0xCF,0x38,0x6E,0x98,0x34,0x3C,0x4B,0x0E,0x03,0x00,0x00, "Sigma", "728557", "APO 120-400mm F4.5-5.6 DG OS HSM"},
{0x26,0x44,0x73,0x98,0x34,0x3C,0x1C,0x02,0x00,0x00,0x00, "Sigma", "", "135-400mm F4.5-5.6 APO Aspherical"},
{0xCE,0x34,0x76,0xA0,0x38,0x40,0x4B,0x0E,0x03,0x00,0x00, "Sigma", "737559", "APO 150-500mm F5-6.3 DG OS HSM"},

BIN
test/data/Sigma_120-300_DG_OS_HSM_Sport_lens.exv Normal file
View File

Binary file not shown.

BIN
test/data/Sigma_20mm_F1.4_DG_HSM_A.exv Normal file
View File

Binary file not shown.

BIN
test/data/Sigma_50mm_F1.4_DG_HSM_A.exv Normal file
View File

Binary file not shown.

39
tests/bugfixes/github/test_issue_227.py Normal file
View File

@ -0,0 +1,39 @@
# -*- coding: utf-8 -*-
import system_tests
class SigmaLenses(system_tests.Case):
files = [
"Sigma_120-300_DG_OS_HSM_Sport_lens.exv",
"Sigma_20mm_F1.4_DG_HSM_A.exv",
"Sigma_50mm_F1.4_DG_HSM_A.exv"
]
commands = list(
map(lambda fname: "{exiv2} -pa --grep lens/i {data_path}/" + fname, files)
)
retval = 3 * [0]
stderr = 3 * [""]
stdout = [
"""Exif.Nikon3.LensType Byte 1 D G VR
Exif.Nikon3.Lens Rational 4 120-300mm F2.8
Exif.Nikon3.LensFStops Undefined 4 6
Exif.NikonLd3.LensIDNumber Byte 1 Sigma 120-300mm F2.8 DG OS HSM | S
Exif.NikonLd3.LensFStops Byte 1 F6.0
""",
"""Exif.Nikon3.LensType Byte 1 D G
Exif.Nikon3.Lens Rational 4 20mm F1.4
Exif.Nikon3.LensFStops Undefined 4 7
Exif.NikonLd3.LensIDNumber Byte 1 Sigma 20mm F1.4 DG HSM | A
Exif.NikonLd3.LensFStops Byte 1 F7.0
""",
"""Exif.Nikon3.LensType Byte 1 D G
Exif.Nikon3.Lens Rational 4 50mm F1.4
Exif.Nikon3.LensFStops Undefined 4 7
Exif.NikonLd3.LensIDNumber Byte 1 Sigma 50mm F1.4 DG HSM | A
Exif.NikonLd3.LensFStops Byte 1 F7.0
"""
]