From b1ed1bf24636f0a809cc1d3ad432b95eff1de020 Mon Sep 17 00:00:00 2001 From: clanmills Date: Tue, 21 May 2019 11:30:33 +0100 Subject: [PATCH] fix743_NikonSigmaArtLens --- src/nikonmn_int.cpp | 3 +++ test/data/issue_743.exv | Bin 0 -> 25225 bytes tests/bugfixes/github/test_issue_743.py | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 test/data/issue_743.exv create mode 100644 tests/bugfixes/github/test_issue_743.py diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index e038825a..ee003472 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2506,6 +2506,9 @@ fmountlens[] = { {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"}, +// {0,0,0,0,0,0,0,0,0,0,0, NULL, NULL, NULL} }; //------------------------------------------------------------------------------ diff --git a/test/data/issue_743.exv b/test/data/issue_743.exv new file mode 100644 index 0000000000000000000000000000000000000000..d7bc7e5119ec63906c8bfa302f6d53e40635019b GIT binary patch literal 25225 zcmeHv2Ur!ow)U{;O{A(ckq**9klvg0DuPPyy@S%LqDU7+Py`jEDAGg_X(B~b6r>}H zf*=Y=5$S(s?~NZQhwq$o|L5NOoa^umvnD&qBw3S8-nHIj14Gfz-bY~Ly-`09Y#>Ng zl@r2)AczmzWIVPHZS;0mAA7}&^b3y^8hatDyv(Qyz!<_BpB zz_k~g0zjq!*AZ}v1DOR}zk`z;fyxt(pB9FIM8K66JitC03z@$@kXg>5tejx?{ z0Wkr7F+mYX!Q98*id)~_$;sK=#f3r7($3u4#@Yj<-+KIWv9_i_$sAC67^^YU$WRu#{QP`;7+HVS7lD@Rz>9^6mV0qQIkQlD_5u0t z%l_-VfO2q=b%CFUftFznBY+IQu{Iz+#!Xawa0?;OG8_kUOE}g|R6DqU_}J+1{U8p` zmN>X*8E${PE#dfEWP&X+(H0pbLB8+fprBT0d8c=7r!csz@ChH_HGt^B3HO~D^i|W| z(bWY)0QGG4Q*jV~^ZnrG$AS>Zws;K+jtyjDkggxdxIhL?3ylLA4;?-OWPBjQ{c#=0 zgvejO4LFEEYWSTa19c!q=MQ1vKzq>gB@7}kHlUshhf{&K0FEyJ;_urMzJH5+0MrDo zn;3{g1LDKwkpnUBl$a3g>6s1lfVKDd4HtAlyh9f>J?v3y5?Y$Z0@61j1R>K_3PA!0(I-kh4K9 za2XQ0Frl0+&&@@L*MdHs2hs|HI442;0+2u4KJh><2H~)r1?2navcYAl0O7DMib41T zAj9uyC6FtDTnOZDAU^~$92WvQsz%2T1J9~O=L7##hYpVc;qW0RtEVc@zyQe_=xgya zpbiL)z&~y|b_#2Re-FWk$BMuTLH})RY+yl7Kzk7SKgbc}3|>vR zNs$M*=VyXK5czO9{~Ui>;9qJ1`27S4etpM(y$4Z{{SbXczTJ>Kco+EvVHxY^m*o){ z&frml7MxqJVAdgIQoSr~bdNNs#~(MVW3I@fn;LWe;|4yfW@s&*N+C=7sS@$Q&+Hg4 zhOha$jU{I`)E)7BGH`v#r~Vvo?`K`g&n|@pg;4i5`qYq5GL{6fWJ=5*l8cEap5DE2 zJL zLFbZ!OD*cJ%Dd$5)(@*ZS*e9&eOm(K^*KB7$JA9U2`9;F z^EFxV7iZ=%>Ez6d#1(>YI^@m&Q~d@|DSVhw*+*icnJ~5N6UbO`9k5 z%op{}aw>^4dwcl=BlNNJ`RjLUocduslu<+GYj(X?t(IdV-6W_FlJY3or*=?S)-Waz zCownL;&(^6pE$~PnDv-m$`aApdq;y7{7JJE=5jqe=?=|*T@+@u2+hKyuckj}KQscN{NH_G1?&c4i}H@xym<|cV8S&HOLvdq5L zr?+oZ=PeB!5tD9m4G1@lbHTl1nDQYf&_Y*3&nhIhkLvV&l>Ry2p!8qy5T$>_sYan< zkye{M^}#B%E2I7WoBD4RDHduxg(z_r#Cq5Ku;THn>HX>#-f+e&IDYXXxqq6fFE_+W zPea!tFsEy;KEIMwX(G5y27keek90XBiwo%oJ;?<9S!{$K$-9Z1V zBf9OKA0f8e_HX&!aFZw)_6X{gJjJ^Fyg9#48R-A3K-iFc8Q%ldu}iWWEg5I6jrV=B zsg%Q#1^Ryg^gk3P@U=9;Oj%S|O2;*=ozNhkz*uikPh5V>ANRv) z(wiXPfUrHyRR{F{t@>AKij%25S7K^*(v(F!^W1ltqE9M|Zt1qY5h6u%kqnwgDW$b} zdq;S+3rUU?I9Eo&`j4R#oPGWp*8ehPqd)Q2KD$rn>4unemL%@$9pE*6$o5L3E|-C@ zD31BcE2z6!*8QmW*xh4uSE7kAPK^gmcjw(Wl`-rw;7+=5Ct05Lc+Vv~MWxPknpU#M@)U?A&zAUI|II${U78Ax z@7>hD_02vi&r%Y9UB|ZYkwk)%^Pg@<6y|+ecOug$bO>lHs}*6ip{xs5A?E+szj$q# zHY})$q_9Q(zEJ(&z5g1zgMk@Cy?fcI!Y3@+tO(kyoS3_^*B{^DX`NWsJ~twnJt{+X z^U2jT!;YDfhZgxQ&puQA-TPmC62CT_6CVE;qBt#di{`3t<615TlHM~SYD;j?JaU*z zXxQ^ox430kUL>)$a4iQ#SBk$XYw5kb$0l^+Vjq$oIK6T&Y!dCMqsqOP{rdUj7oh*- z!6P-xF3zq5oWuBUdnZop|1Pe~(0qT6@2s&=JKXZS1MR$#sXHd^x3+*eDj`jL#Bo_KR<^ZvP4WfA8@-I4i^I9|4)AZ|LFh!^!NWy|Np-| z|NEo=Kl=ak{r|s<|NivCy{IfIC~KRfJa(~G>_76G_Ma{Ik9NdXG+>?A zyH15Jqm$_;{>y;vKi#jLYu|r?{0i8AnG&_)|B?N#qMArIwq|6NkOc30-~Aw&#TrpMPU+sTiQ1(9y+XpE7 zA4lACB6`CgS~3G)V#%^4=@_*4jYky$`~RZ>-2V~#-#;<_+u--*q^CQUxBj&Mu0?Y( z=slcm1oqz!VE^63|F@m1^?$ej`F#&Uu(8rlr8=k=(~i3NaaYai%6GV3Je`Qf|8jOb z_ZVRN-w(wL!4|{TpK&-A?Ud>|9TKhY#MU62D1Xy&td+N) z-*;UfSq)aLP_pMOCYiGl>`sctvJ1Yl@A0cQ?7mg^yQCIA=o{a?f0}C|<33b0r~A1n z+zan`im+~n_+$Xh=oufq^ri7@@9#y8AJ^#`3Cz*GsCNq*>pOmWChp;v{Do)v6oj#9 zJg+u{e>5NR^2nU?$Po0d^AXJrg5u6QiBZzrWr;f}QCqG_hTk|-hshzQRMd>L|8D93 zNc+#_{cQDCi5f{3kC-UqFLNlnFqm=#7$;OsDTb~d1@_-)c3}Ty+_eAFTps67c*iyA zL6EOQ$PC+mMUKM#|BFD_pxhSwzm>6x^%<1?ujD$vOeI?s!?%cJAtMK2Y1`$+r-Y{Y zkoSA1**NjH87H`*sm|ut<7*uH={-zQAI;y`eZQ);TpXz*!Fcd6kGg$k2fbw}Vj7fh|VR0NejtU3l&U?_JF?usEY})+#Ue8tp`gnL>xY>>=8S_>&cYhk&&i4OJ z{i{l_v+=3BUt2$*RY#P>l1NaaM)4z6Rte{j2s?#IQPpe3(p8yZ)v3E28}R{5Z$_4% zuY6=@bHDtZKlg{i8{-4)G zoh%_XCwktxk%&5RdaH3JUm%u2`+oxFh=KoyW_}#_e+)tYU#<$j`siln&?RZy7g^`s z-8{mtHsEso<^PFMBmdl9UR3z_3+jPBzD{m;d4y@^$)pYC~F{ILEVLeQ}U>r|6ag~&@A zyn25X>Xi@ugQIJ-n!(L`%v$-21sY8dWzI*i#+qv@Dql_PKX##$^WuW@mmrb{r}y^V z2(i#p)3pk`)kSsu9**7n6XR!S8qY{z4?VhjJ@;w_u2#>le?V&S0rIxu-T-lL7zR%q%92 zoLA9;!fo8(?|!6rj0m13IjA4u=91F#z1DHSypA!6Fp;^&nxZ?^Rf+x30d_Hy@TyhC z%vG0R+o=$aSMj<`D z546V40smj!8EfMc0%tRx<$>{^{sG^(+)x;QRcVCfUQuC59M`mX0)u>f#!07@UjDZ! zd)T1ciO*kq6bb4>(V|g7{4clp|1?wWcwztVvUL)3-jy*9rHjSQ^WAObC3Zq{Svpgp z*P?%zauMssa(-AP{OSKIWlE>LB{>+fMgQ~M-cMMgH++61XjOhWeCYE?`SrrAmlO0B zS2kqg$y3OxB&X-ur$*bljgsG~(W|9|WM-TeOlBmZAX zKg#}35A6RxuDD;zs1PPV1om_nuILn0qPTh^?jSd-Y621*Hz#eXvwqo)oWL|xYCA%8;A(?{#_W#ZmJYIqQzarK!|KswNMx_7m!=dIK{r_h? zQ2u`d;QufB(rQyh9jsz&J=*`VYX$WG`aNQ;dd2fCk=PE-(O6i`{uSR@r}yUvyy4_j zcKovUDD3}#7H;DS`~Tyf!}|Xc^bG0$x%O6TNB{q8F_izm1dRVBGYRXx%+U;;o!qmQ zh2dV_VEz}6apD{;Um%?v3(3hZwX&Lwvx_qh%XD(12j&!NrTxDLkv5v_nS}j6xJO|B zPs+YoB>zKc@%xVcpJO8^|L+Ch|0P^HahdUJ+z%TyZvsmzLeT$pqzpuP%@it+95EhR zEbDr3evGmSYZkKKd)!P{(mQ~Wu*TYM}9^HEtbo&x+mH|$YM{x<} z{ONkw|KCY?`YP=I-`52D|1+#dkn_L0*rPl8|I>9*{EsEz|Brn>@suR+dY-l-w%CVx znt-oB|0nLS?4`)NWgVmO$;vAC02Qk;iC;j*LQJ&n1@(g7SC1Gkn&yW2 zAFAmSNd8Buhck-*^9%pOgBr#E=mz``i>~{p@v(D5^x8Fa=hSn+_+{#H5={EaiLm{r)N#EU=70FI z!2A#VdI-t?`7nXCBmNUBLGeH60RMykFg~lkaV_2e3ro6eviM*u(Er-`gKlN#6q`7? zo1Z+17WL7!*!+-L>HvRuF z|0nSbivM#A@PEROzIvQy*8I*e-MK`;tPy{ATC|117<+`pM2as8 zpF-%q7R0&}2J?TyX*3I9{*Uqk%>NlZDUIa+_|}T=IQ|nbqWC|afd50tcf}Bw^<||9 zQF$9PhuXy_X@LJRh-E${KHC!?QL{Euvf2s0|0gbA;Gg_a_^yc9 z!=Sc3z%@aNq+Z!9PwlHfjf;F)LI~{tO?r0C1Rnp7N5c5el#>U^|C#XM+>!rdoQUH8 zgaZD@DiKH2a_F$#l91wZN41Fr570lG{b)y*oi)obVm4-G+rDmzD6OLeJx7iOXg?z& zpMd#4jyX!5F#m`5EByVB(ql#9znOv?zv6#n{}(Vu&HwKL{!bF=H+nUNPcp)#v1GDD zACe7#{%3A1<^^;NNoF_Q3m`H* z`VUj>Plt9GiprKO`D3|I2<_0XhF8 z*Q(o*|D{`n;(s9k{$ubX4T{ai&5Axzq|+!ey-X z8&IB+Jf2*(kK<{W-u1j89&9oBGc*B{)bRXYoV+_6=6?nU!sEaBl?3GcU+q36lK=ZF z|FeMr#s4e={Li6V^?S0&MT+fCpF&(aDG2c2!-~mQq5Cg}5OeD;41dWWaX%f$n;SBE zOGEcodrp_N8O;9?oD33&`9F)dVE*Sy(0L^PQ~h-8j{MIm0TlnY2-yE(3(w#F(kp$= zChHb831v0Ff1#Sk@FQo0@R}6!i z6=wZ1gKH!7Qd`*rzQ>hAVd^HO5wyWD{}c1-i^DMgv)LQwe-?06BKe;+>W_Bhf5v2^ z_`e?j|C995f$oibt)pUPM~*e$d`5H{=>M+2byma=Z|`)v2lEt*t*n^-wRrLBEa?GM z;)4!&F#nUr(>FwI)oIelP|(ypH65whz$k$p75Le^LPd z2`9Q=D{Zi?3m_&=RJn-4fBuK;x8c8suX^Hxy4FT`13Etj?EM}8HQr zoNv40KW~8lo_ub#AvqMRVxl(M?>d0Of8wo*+wh+>$Mk+(w>O-*e2!m;RDZ{Rk2BVg z`0v>x|6TE4BEWx$g@kn}wrB>9uiUeV0RQ;_{pVw7Y{P%!tBW)C0RJ%`oKsll`yKz` zFEkmIEQy#!ek)GtM{vj{hza zv?KA~+Yyyr@n0Rlf5Q!jc=Ae8JB(Lr7@tWbF+TXLRStHvHG5MB?X~xeya? zbwOQh2mIImV*rW&MB`0&#ed%c{v&;T|1=S9Zb*=$PWLfrY|!+*;I2iX;~ zBdgwi1Nd+Jcl@WqhK0m`WVj)_;=la>|2<`tz0{KUfNx@GD2!|nh5wv%2)E(CvMe^} z9?SFB8(K{IZ{Pin|2}-7MdCk$_Wir!KMa8Xa(MAsOHS0{<&d(ZKTZ=Lj05tNm;oTMg9S8XD0Kk6*+%GHFG0NLk*-`j! z-_qhX{1*Z6pKALpYQpsDlbt)@zx|C&Nc`6zetTE^_XyxWJt_04y!oDZjnK6bLNxw6 z$Ny;?{u6$pY}S43tALN4e3^9I@Az*RPYj9w?Bk_&#ecT|{$tw15p}#~*p5nAarqk> z|54koZNq=15n4xOI*%NiGkiwmzXSf$;TJ&SKNHo8UGZNSz<=cc|J?-mj}+iPO*H=d zeq(MM{(A`U-q#y(byILtpNO&Mf0$NAK*VViZ`57PaJ{$ z|Nd!(zRqpv?1xGundNe>1d0cXT-_zyo=7K#5lhnsfAe;ok-xmt#5#&#~w)Mf(v zU&fq5E)xGWZNq;8Q?_+!HpGdkM3xlpS-<1ID_tj$_%CVxN zeN+qp|M@L0#H5T~0REp>kH0+3*@pkzg@aYz>>2H!&|jgoQ~4eLX{7}t@!u8Cm0j_l z7r=ki>NoCoO77F1_ma$h`Ur*pw7wN>!+*Z}q8U^&xo6cy!o6g7z<*iAwn+TfZ)CYE z{&NQS?~uB^lEIII>}1W6RTsQb_^*%S{xHuni{6`nca*UG@QL5?pRr8fY$DJ{5M~g ziNt?n$p?1Df9C-H6UwdMLk{pCx$7weo;C{qO}uj5hX0B=b3-72|ArssbeWO;j{jsc zBa!&8S~7H3{FeampANu(C;Ft%9lL#tnwkQI|2*+Sx8c8vv3o{30RKIY2KdkScl%+;4z`MxPWkt~(fdDScWbij3_}b(RFM4iqvHDg_v3HG602wR4@l}tF}seo zT$Wv$rR_ZWg^n`EhaLBF-QYvswzGtq)-6ONFJ&Ja^^xr@31?-DTaEk}g{y2x(V=(l zuJKKiDlgih-qV33HRFlz3&{?7ej_3*54`M^OaAWZ33J-sQ_CJ7O^Wxs-J$*VQme2m zd2*WG=%QI}!a7fPGy@;T@~d~(Iot%jQ*XXJ#8WtU_!e~mcD^6py%5dUXBTJOAkyPI z@V~e?HQcZD95Ab60qcKZ{?Dsl*8k-Vn@=tv*Z*$vKYrnV0sl`ufub3UhI+d!)5x&| z)$#qjwT8lykxy=}T{^>*MAP!gkaO0{cHVac_!@t`?uGB&iaOWHNxwE&7vRrJV`k6^rD&&rGVO9z0>?G z?Z9`B_8|B3aV{~i9{P5#G!{Q9q(|2x7l_u|%|~ zP=b)*UG1Kn0E_M|tKL~17A|mh&1e*p`ODKQxYDr;$d>Y)oIX-4(roKe|3W2Twk6jiQKRXMSMyN~@@P^##C17F=+lCIw?b_7PU<=ZW_9c} z$-#AfUpM}l=80Pq&J)!K@%DEO$3^r8r??BLGl{Cde(F6=KjT_?vcU5Q%zEVGO<6w= zSWgO`7;|s0hkLvEoX`E$>&c3b7dMZfllLejQqIB+1YYlZC()}O+0m;WpOhp~B_V2> zCYkL?lyeypy5HQas9IK_SsfpKKZV1Q8t(;GJ$F9ud5PD79tpcl8m^%sd zaR9aIIer+;dQSpgPi&J%9LQDg7dpr+D;Td5r!v2=-PfJuE_ammu=LMW?+gCeVAfOU zAy0=u&w3u?okFg9hgUswzjQk1>rN8Z-SCk6D6o3e{K9&hqj$bCDpN%sN0ucyk!+0A z|FyiF0qUQuSFq~=deyV8RVZ@TgFSv<0qc#k>w?DqDcI}1)2;`f`rnT((HaIf?y+h; zQY_qf0#N~2&l}CRf3lu0EI6QNy|+WGk-Hvbcag$x{X5f%0P26d>Qx-i-2`y%|^6_xG514bIi= zyVQC+K=tazeD;?M+M#!(YmFVO;9n4zvJZSGI@7TE3O_XF$<18>0hFCFMzm^Lry-H!gsVg#2En}mlK9sZBD zJc9S6fglG+3Eq_KfB6CLzyr21Jnw0Q$%25VxsQ0Bu5}HHsk&a z*Nr-e6c6%)vM@0YK?qU|Oj3-ECm7kFaj;Q&qZ$U>BQUYBad7eQ2?+N>2n;SWo=_?XYb(Ye$ti0ku<-@9m#wSfrn_F7jUUzoA>F(+6>wiD;;p6Do zr}2r;-)86L7rrn4SX#yairqX=HQG`iQcxcR78WKJE?gfBgfCoKQY`F4{5WK?I=JTU zP+EArBA{Xxde8C=t`f3F|6GN_{;eAQtkBQ;Z1h7!nBd(e z#UzEKp>@bddeLNkNysU9>cQHq9n`x44Y{s-e06^Vsv2Hw&BCl#ARO%diX?k{fZUc&Db6g}~AH95SQKwcr zJC&=*F+@l6b;U@{*Byh&|^chT=iKDGJ@`tOu`$ zdltIba|c$VD0GLH*B@JGd7EWlk9VQanI(}5Ris-uTv5oLC96p917(L0aG187mQ|$T z4mX`#Uge?CDR0b8(~%40{z1^c6m0q?EXJ~?jDW-OR`}^c_S`{pP%Pa+M2s1Q&Ro|i zpY_@TY>Kj8kp~NF!N!pkKF8N;)CC9B9Xj-kj$ zz&=^&OTfN#p;AY!B78M0Ca|MA*tBP1j6!!{c?05K>|)OW4P*{Vbv;nNQbz`x0@6`# zLByEyEyya;*7{*ntTuwQ1wG3h;>(c~>*f`g2{=ra*Q?e|&q>`-6nBYn=*OlYAC}1u znSymj1M8-I0WKy1$7u3(7aK8;zL@dG2lL?E# z{0OQPLZLf_EHjiH7mrOrt=74`UPz&>ajmvz!7Mw}xLy&nv{*+51W`Qz&s&P5zOi#b_zdStY`Xf5!)BGn#~ z0kz;$axnq-4DLu&OsoZ|EqAfsay0%DkohPqhTD-aWq!Tv!2+o5iSK((uQkMQn|lnL zon8xAtrfVmxIPy=tQ0%FHU@fJ>_L7{HBMu?hmRMMkoI#kw{*1jVz98bwRe$ZoUX2AWU#lAWITREgHOXv z-rCMy<&1~5-Wg4O%QKFaqE?L3QVbG)Vt&qU&emS$41Uf|E}mk3l8ngA#efV4^D;6Z zqj)(=G8$=UGswGoSThLm2=VZ7Bllcp1bKK^*@)>XD4}xzcan_gqWb#!^7sn!xO&*~ z@{5X!^70Ar3J7q67~G!zE?(w-+%BF>n>i?0ds=$fyLs8Wx-h^wnp?Pfdr2~a=c5Yd z?DjL;9a{j7=q4ubVQuc^>Y?xI>LkgC+FTjlN}1v3&dKnEW=m9S1#>TJNk(`ZTW&r< zZhj&C&Fz$V_yrhwLG5_a)q};KttGYFyy(wwe_G&A3;bz;KP~X51^%?ae`pK*HQ%y! N0h26WFq_)w`+r-_MGXJ| literal 0 HcmV?d00001 diff --git a/tests/bugfixes/github/test_issue_743.py b/tests/bugfixes/github/test_issue_743.py new file mode 100644 index 00000000..bc45fabb --- /dev/null +++ b/tests/bugfixes/github/test_issue_743.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +from system_tests import CaseMeta, path + +class Issue743NikonSigmaArtLens(metaclass=CaseMeta): + """ + Regression test for the bug described in: + https://github.com/Exiv2/exiv2/issues/743 + """ + url = "https://github.com/Exiv2/exiv2/issues/743" + + filename = path("$data_path/issue_743.exv") + commands = ["$exiv2 -pa --grep lensid/i $filename"] + stderr = [""] + stdout = ["" + """Exif.NikonLd3.LensIDNumber Byte 1 Sigma 24-70mm F2,8 DG OS HSM Art +""" +] + retval = [0]