From 9333f0d3f5e168b196ecf057f6b6743f9280fdfa Mon Sep 17 00:00:00 2001 From: clanmills Date: Mon, 6 Apr 2020 09:56:19 +0100 Subject: [PATCH] fix_1069_0.27 #1069 --- src/nikonmn_int.cpp | 2 ++ test/data/Tamron_SP_35mm_f1.4_Di_USD_F045.exv | Bin 0 -> 22357 bytes tests/bugfixes/github/test_issue_1069.py | 15 +++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 test/data/Tamron_SP_35mm_f1.4_Di_USD_F045.exv create mode 100644 tests/bugfixes/github/test_issue_1069.py diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 5a8d1239..8d732a62 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2541,6 +2541,8 @@ fmountlens[] = { {0xf4,0x4c,0x7c,0x7c,0x2c,0x2c,0x4b,0x02,0x00,0x00,0x00, "Sigma", "", "APO MACRO 180mm F3.5 EX DG"}, // https://github.com/Exiv2/exiv2/issues/1078 {0x80,0x48,0x1C,0x29,0x24,0x24,0x7A,0x06,0x00,0x00,0x00, "Tokina", "", "atx-i 11-16mm F2.8 CF"}, +// https://github.com/Exiv2/exiv2/issues/1069 +{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"}, // diff --git a/test/data/Tamron_SP_35mm_f1.4_Di_USD_F045.exv b/test/data/Tamron_SP_35mm_f1.4_Di_USD_F045.exv new file mode 100644 index 0000000000000000000000000000000000000000..1e2b5a0ca5cf7a3bc5a83ec53702a3d5005b1c5d GIT binary patch literal 22357 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%0D6KK**HKA{_H%z{D(U)M zb`!%3{iPBwkNEfo-r#w}k%puF|53D`4)pdbfbEq8(O&Ej?b{5|zP%9b>jlxiS`h6k z3(>yO5bdk~gY7dG?Hd52Jtsu__TbT8cs{VbW>#O7O=gx1KZ;ju)R(L+p7)OUM9fyV1;N; z5zO{d1-6$Gu)V_m0Nd-YSi2C|USwc<4FKC~DtzrtfoN}Ai1xOIXzy5Hd+`C=s|?s) z`x!afpOvF%{}0ciA=+CRqP@8w+H)PSJraTK(FSY}U5NIlWqUb5wD%N<_SOn5%$GvZ zo*5ABkqyzFgMpRw5bZx2?OA}?UU~b%_0_mV`+eWA^*T?|(;B9U_WTObp8Fu$@94iP z+7o~6zYfuU5Au!A)Pf&HVw{=32c;aBr(nIYPL8bo`Z2DVQu*uM(wuM76) z{ReEnSn&35!1lWYY(K~GY(K|wY`>IoY`;ce`#qtueVTexKC*J05zmnpJi-%t+lw6i zF!sCt+;7`YQ`rs?Q=}w4AlkRU2%`PHAlkocWMb>+o#JXr8q24WI@sX+%VhUF)rHw1h73PQKCJmZ~L_n z?SCKazmO8`|JJ8ZbgJ0m@QCtf!1j6oY%h^<(Y|J2e*)}36R|x@#<4wn#<4x6Fxzt~ zHQLkZpRhd#5!+Mbq~9(Y|F?%|@3+AAY6P|?f!Ut6!1nZmXzy;Y|6_>urgwfWVvE?G zS%w9vFxwBF_11qUW_ucGYLY@b2bu9+XKz^_x{ZG_|>ny%9!oz0sVgf^#2c_|Bs_#`=w&G@5R8uE3|Cir<@Cp zox^Nj!(Xs{m7)KqwLgXJ`w6psl`-4*%Ke(Z(*M)4eQ8GfMq0Ly_o@vg)nNa%VE<(_ zY@bp4Uxogk*8UW>pA=^Mj7EF+{7a+#AJVdY=}u={zYXL6C$PW!FW5fT!1krJKZWhH z6tjI2FxwlA|Fri1UAD&`iuUjMiS5m#e5Xi?WEl8tezKPE)j?SsES_-!3m(13UpZ@sq^myGATj!jXI`3Do@{20p1wo6ur3xeL)oT}| zZmWte-f#F&Mwv)>4bl0-z~uk!2HbyGe&ql5_R|_tqM~Tc8YS8qKV@bj@pEWmJu?Zd zaWH=St2(qc0tr^`c>k*c#$V*WoJMQ^z@k=!Dy(L85Oy7#MMg${uugPnl^zlameqo# z;wbBaS!>J%iMmD@x(lcvbQ4IFqjYFt4cK6vI=l`hT9IXRt;}OKV{2ue0-1KLOcEV+ z{kRg)(_uLVN~2vL6O}x=s^ut-+#PvLa2XpI!IFMpVkh_`M()94H!Ms{%uI|d%*@QJ ztSoFCypuTC**T{1OyT4e78IEwEGQ%-DluDHbf$v1kdTbJtO8j{RaI3)T4TXn<@vK! zRFzR7Bvw{d4t5TKNs|PW#e~F^|MWIeL2$DWA%r_UX(lWnMxy5?ja0)LeFTXSYKtn2 zH&~96fsu)sg_VsRG8A(WbR>FuItF@1Mzp30DF`iB$-vFXBc`OoG{tH)^UTe>%AxT` zSj2VDR`OXle~?gd_6}oZo60XRO;A!wT1Hk*b&eYR#;v(XPv2m%p^>qT?UJQ-%a+@( zadBPi=I*i1$9IdLf56tjox662?}>geS`0n2?qA zkm0hnZV_bSwbCafdHu6Oq%vEYwZlLE$YN}a^9fj6H*2%%%e>JiER0MH-MNy&Q{ryX zS?Tk_QlU^Fn@m<{q&}}DonKZ;6mhTxN@b9goFxgxTETg6z{*5N$WlpG);*IUD@ukg z5K2Zlc!{LcqdA#$s1TB|$Glr+1k!RC%VdQ}XC<{*ia|9eA)O?_n{+OTpjHH>tZ*?- zl9IAHszi8{Ob#77%Hpm87iFZB4Gn|(K1@huH8L?mI!RG_kW3j=t(y%|MF`mGM>