From f2385a35aa30403fc44cc3b954506c40fc21a907 Mon Sep 17 00:00:00 2001 From: Sturmflut Date: Wed, 9 Feb 2022 17:41:51 +0100 Subject: [PATCH] [nikon] Add Tokina ATX-i 11-20mm F2.8 CF lens (#2072) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [nikon] Add Tokina ATX-i 11-20mm F2.8 CF lens * [nikon] Add test for Tokina ATX-i 11-20mm F2.8 CF lens Co-authored-by: Sturmflut Co-authored-by: Luis Díaz Más --- src/nikonmn_int.cpp | 1 + test/data/Tokina_ATX-i_11-20mm_F2.8_CF.exv | Bin 0 -> 8413 bytes tests/bugfixes/github/test_pr_2072.py | 12 ++++++++++++ 3 files changed, 13 insertions(+) create mode 100644 test/data/Tokina_ATX-i_11-20mm_F2.8_CF.exv create mode 100644 tests/bugfixes/github/test_pr_2072.py diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 1c8b47b125..b65c9a50d3 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2464,6 +2464,7 @@ fmountlens[] = { {0x00,0x48,0x1C,0x29,0x24,0x24,0x00,0x06,0x00,0x00,0x00, "Tokina", "T4111603", "AT-X 116 PRO DX (AF 11-16mm f/2.8)"}, {0x7A,0x48,0x1C,0x29,0x24,0x24,0x7E,0x06,0x00,0x00,0x00, "Tokina", "", "AT-X 116 PRO DX II (AF 11-16mm f/2.8)"}, {0x7A,0x48,0x1C,0x30,0x24,0x24,0x7E,0x06,0x00,0x00,0x00, "Tokina", "", "AT-X 11-20 F2.8 PRO DX (AF 11-20mm f/2.8)"}, +{0x8B,0x48,0x1C,0x30,0x24,0x24,0x85,0x06,0x00,0x00,0x00, "Tokina", "", "ATX-i 11-20mm F2.8 CF"}, {0x94,0x54,0x24,0x30,0x18,0x18,0x4a,0x06,0x00,0x00,0x00, "Tokina", "", "AT-X 14-20 F2 PRO DX"}, {0x00,0x3C,0x1F,0x37,0x30,0x30,0x00,0x06,0x00,0x00,0x00, "Tokina", "T4122403", "AT-X 124 AF PRO DX (AF 12-24mm f/4)"}, {0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x01,0x02,0x00, "Tokina", "T4122423", "AT-X 124 AF PRO DX II (AF 12-24mm f/4)"}, diff --git a/test/data/Tokina_ATX-i_11-20mm_F2.8_CF.exv b/test/data/Tokina_ATX-i_11-20mm_F2.8_CF.exv new file mode 100644 index 0000000000000000000000000000000000000000..f193b3ea5cbecabc0d711eef2ae02a8c37c91432 GIT binary patch literal 8413 zcmeHM3v?4z8oraZG--nb2~vw%ke%fjS`3s?mC4A_jp ztbvRMSPHBImWrZCFW>^;swYD}JAsES3*nL^__;D9-vEAM6N4y)7%_|a&$Ov`9Cq|*wVI?t4}aI^KUCDDXQZn$A;F*p`25zw+i?jV6}j0uDasA4f2sf>~~V!6vM}H zKX6o2$o_-C(M=(nQP33&7?4N=91k2L$Xg(9Z;B=_^(SNj@DsqPI4?tQ?gJzP?5qSqZ5ucB&{g$S<6DBk`^ z@Ouku5vCWp={k9fas}()4uZ4~4HAkGhyqGyw?20;2OT2rODVLK>2G^r1wtIzz1%L6go! z#rkQizL2H-uF)Nj8Yk$=2GYQB9Ia`nvS>)&4rY20@&k4=hLQ%+R$i%#+cWoM;8$gU z_B7v9w0&rgV(PB9!+0g4(5LHO@(xt!Z-DG)^Hgf9XY^#?H)lYt8LbZObP18e%1TPO z#mD285Rctf`v5|&f)WSfE)2>6od)f@nUK#wv?aBm98eyp2xJAB2jLus6|+^&L;mad zSnOoR5t0ll0c`|@kJeFFYZKnPlHwxA;fq;BFA6&7+&uXhw}HFJji3B6cb3yI{)uxZ zsfY=?hr^RbkwkLjnp{tHe-tH)>>@q6!hOtr&xx^HIt48Wxq$DIwm{>EMA zV&GL@?BNEI0>s7?AZ5R4&}WeU^{8KdHst|PUuL=}nQqp}e|t=xJezV}63L*3$#e%2 zs%Cypj+_uyp38(j^mIIt6E&HPoXjLv@-%57e~fz>_@RRas7Jl>|J;h>9eB` z*Yo+EXFyK&4Bxup)V$KBftLoat5|%#<$(Ny_tH8JNnDL@->ba)gKe~XVz93z%nh>7 znnJR^p>My{`=w=VMX57BgizNOjuAyf(7ibBzZy+Oc0z2-4CswCx181 zoA>RrGgL|aK!2}9Ox`p($*-ObZ&2aaES*(&_iV?({^rw_QGd4P+!{Udu1DUG*8lUF^lw^L zEUZ|u>*5_R^jkmnjB);yjSHWyzx>6%12$-D)?PMv4c|UDBb{}2n*45$H)wR4jZ%ZdE8X;&t5n+N$ouXAv$G`V z^|()&I-RV{?s-{fGdNhSZsSFJb++5k6pe_+U{ZPK4+&du^sxp z8TTo^)w|lIzD}plKHJl7^3Qd)4Z7+q)&<&G?-;exzyJKfW$jvfdHElJA`Jr2Sq`i|Mp^wKpQT&5igSUaijcP4E)(r?s1HS+Z;=jsFsxP}=5dRv3Rkt1S8=ODz^}ov3zbk&|8xo9WXKAp_Jipui0HH&2wZ+5&uc_ zZ^tj=4JU5B+;c`mX<>P0J@N+?6KVJ7;&qkFB{U>N=g- zV*5rK|I=R2ex)Dl$F+Nq|NZM(X{yVG{@d@9rW&1wIB(KPQ?OK;&DX#Aq!2&yhx$LJ zZEt@g5b!ULfAqrAPqbrgyVl%NTpUy){%pGsFCDc~<>O??T$x&_d|cVLct9>5 zB^cZ%@wT?RfoF@`y5s+Q9(_(9o@3A#<;rn89?|u5a$Vu;XeKE^J~qS`ix~cK`})}~ z5PGJmAmjK~RbAZQ=Zws%@xYHa%W-5SNMAH%>QuNY{}n?--_I}%zbB>p(GbyEi0I2H z4DL(G{gpPGHB+Us%u6pbRnMwOFRz}fsw=aqu*+5v-K08eS^1m_n|xNq>?%u^;@rLi z3VD?&OL5PbJawLRN=0Q=ZhcKfQT?>y^7=XD<4uZ56Xm+P%(}VOxfQlDdEH#IWnN}o zmV!5)2~624g`5|$&B;=f$e5WOD=yILcB8uGZGp zrq_;6udbP`${0U>yh^Q6X*6k&NSpVF#a33AW|=p%%K}?5ue_$pYOAWY$f?D$S=IAx zSqiKla%`^ky4h|sKn1Otg=MxX%j_(LTA_kxD#0}huSYuZR}`d2q$dMC8R*GCPX>B2 Y(364xw+#HWSE{gJgH(&15clc709aN*3IG5A literal 0 HcmV?d00001 diff --git a/tests/bugfixes/github/test_pr_2072.py b/tests/bugfixes/github/test_pr_2072.py new file mode 100644 index 0000000000..7a96c12ead --- /dev/null +++ b/tests/bugfixes/github/test_pr_2072.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- + +import system_tests + +class NikonTokinaLens_ATX_i_11_20mm_F2_8_CF(metaclass=system_tests.CaseMeta): + url = "https://github.com/Exiv2/exiv2/pull/2072" + + filename = "$data_path/Tokina_ATX-i_11-20mm_F2.8_CF.exv" + commands = ["$exiv2 -pa --grep lensid/i $filename"] + stderr = [""] + stdout = ["Exif.NikonLd3.LensIDNumber Byte 1 Tokina ATX-i 11-20mm F2.8 CF\n"] + retval = [0]