From d59d929eb2446315fcdc8074bea2497fbf819238 Mon Sep 17 00:00:00 2001 From: sat3ll <37741639+sat3ll@users.noreply.github.com> Date: Mon, 26 Aug 2019 20:39:09 +0100 Subject: [PATCH 1/2] add ID for Sigma APO MACRO 180mm F3.5 EX DG (nikon) (cherry picked from commit 9852e21761d962a7deb1e5e9673b3b5f5018dbfb) --- src/nikonmn_int.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index 1cde88e3..0d212fb8 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -2537,6 +2537,8 @@ fmountlens[] = { // 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"}, // +{0xf4,0x4c,0x7c,0x7c,0x2c,0x2c,0x4b,0x02,0x00,0x00,0x00, "Sigma", "", "APO MACRO 180mm F3.5 EX DG"}, +// {0,0,0,0,0,0,0,0,0,0,0, NULL, NULL, NULL} }; //------------------------------------------------------------------------------ From aef107a9cae261570e3791f22ed8fbcaa62f06bf Mon Sep 17 00:00:00 2001 From: sat3ll <37741639+sat3ll@users.noreply.github.com> Date: Mon, 26 Aug 2019 20:49:15 +0100 Subject: [PATCH 2/2] add test case (cherry picked from commit 4329dfcc177e020eef39fdfc0909187e9470b6b9) --- test/data/Sigma_APO_MACRO_180_F3.5_EX_DG.exv | Bin 0 -> 11201 bytes tests/bugfixes/github/test_pr_992.py | 15 +++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 test/data/Sigma_APO_MACRO_180_F3.5_EX_DG.exv create mode 100644 tests/bugfixes/github/test_pr_992.py diff --git a/test/data/Sigma_APO_MACRO_180_F3.5_EX_DG.exv b/test/data/Sigma_APO_MACRO_180_F3.5_EX_DG.exv new file mode 100644 index 0000000000000000000000000000000000000000..fa024456a59e79a2398962239635217175c3d85d GIT binary patch literal 11201 zcmeI22UHZv7C?IjkRSr$5){KQhziIgKynyCf<(z;Ske$A?vO!Nl7ONTL{UtD2#N@( zEErb6fQS(h5sa7<0`gT>#GU_Yrg3Nga{k}_=lpZ_{4+Il*R40NURS;My1JVl4q-`r za4duKm@EqrfMGT^>X;aYVe;6om@q~FLK{ZlaS1}4aB9L}i!41x%^uL0;N;k+1lCZGNSoQa@M2b&U5F9jV2@OQwjz=pu8 zz(K&@5k;^`z*~TKq!BS);3nYUEZ$rsz>sP-kAG2y@#pdEd;%T$0s_n)pF7lI+>e8e zt)m0U+|k*|(V6LLz~K{KE; z4Cq>*_h$>T$$<^ksQjlkPwTJkCmNwLR-DF*%5DhJ9-Pa8$=Sa}dOpr(Ff1C*C_>}j ztOk8y+_No+3naKR=mHig;MurG*vqTI}jf_GdbSKwnsKAsL9Kz{cHJ4z5` zG=??6Gl8IjKuyAC!5C27;z2MQq(~oab3g~lQ$S9};Q+au8!1aGQuX^4ZS;JLtG};M+~Wi@`_%^vwrO z1nvT7Y{m6q_}Df$3Oe^3V5!~?Iuu}6;3D8lU?>fE2e2~8mx2R!LSHnlOOyLV_X4Bb z3x9mo-1fZb7iY|z9SK#pS9 z1@cDV*}(UKPXJc~j{=_rM#n-+{3T|ZA>3(^>J{jRT6eT?yyn#bZwu*=f|0emaRg?Gc=8( zZZ%b!4=|Z7b2yi8B&(195Rx?5u2vi?)fjr~iJVyPo4`BA2xeiLWm4uZ4XfjW3}!eM zHn`@$C<;7&-(!hr*|K3n{g}wweXUKRw@*CCynFA;a9!I5Yxfj|b64lbB+2HKRjC!1 zbVy$ar?r|*IlYvf)LYVYQu$(Oo665S4pgRXbKWz9+99>Jb@uL`dW>yPd1|QT8NKdb zR1_CfEq=RZ_$%>^gpbgzezR*U4}^vVs;l1XPU)NeprUX7gWWqsnth#*C;d`J|FT+g zU3a1Wo^!>vIWHokZ8GK0-cj7NN+-6{*DwE7nUC#tE9$}wg=;S)N)0jZw1nlEZCPvA zK4Z;Ud|=v}o+bH4Cd!YFN0)u=Nxb`3(`o7<%}?FB1)(tEBIJK!&? zx$w>7T}5Vlduaj7URtd@**ZYp6Xkd!;C;^Q52k*uA6BjMx^0_Cn(YLHW|P6Y z!-FyxgFPDLM>q?gxJ9yWq&s9^Obrbmb2OUk`tEC0%?f8Md8e6(%|A?MGSDOwE zceJ!5VVETiZalajGS;YGwWp80I$!bQ%$=;Xq1t9rXD9XISz={otCzB8PsQa$GzLRU z-K*Yq4yj(O>Q47|ihbIMs;tp|s|A*&`ckBbFBdLP*}T*uX|QAqMC%|#tKdKk!Oo>f zvHPa@kF+_q^PUZ$N=#`nr(b=-C-z2JNa zXzzXd(rl*I`h4zaV~?sm?BJBjjm}I~%9R+IBCmZiWT>in%0PX)OUDz@AhEuk4$Erq z31>SxW*eOv?6VnrI>}P>-I(?B#&c3zJv?)!UTgaB{p1fbl4p&|hdk?OQOl1_Y^3$S zmfONmw5qgLW$vV`mDYQ9@Q7@%;egYPise&Z9`wI*)7N&@F|B?ty^+Y^eRa(%x-!UT z?rL8tIy$$E?u7=g)7dL}!!$LX-IGqCOlMYP&o|$FOr+2^v{85Llg=S8r=+)qiF>{l zhvbrSO>ER(M|a8OF4kdnuJfyZlj)Oi-J5EdDRJ$ZM1~>N_j-bNhJ5m_luqxk#ha$x z>54bJxu)8#2UZ!Q_`_<|**&Ak#V-A0dBGW#wu5N3DjiI; zSh{)2<<>9ZB(h!zBt?($a#a&z)-8n{vdcF7TDR|t_T4iN47v_C%j^pdXwZjjEpfAA z-%k(Bev-NhRx9DTG4GC4@m4Fdc{Y{i+-!ZP)ew*3f0MHYR;y&C4-((MZ)%^qowr&& zcOH8x8Z_zgXNSJp)506=y7*dhr(^EVkDim&0HnNmhk1NFR}yE@3WVZ}-)|CZeRSB@C{mjAhs|A*ShkpCak?VO9I|GWHO zDfCh-fY3W&c4JrhK$x0(z`fj*8i@a;`R5@1+kC^0FZ$&Z{m^Qsb#Duk_KX$B7KS3#ec0|)+;>z8F>7?uP69qzRL1j+sV@5#$Pty-h}-qC%X9Sti-~%KSKQJ zpFZmz3&rDqsq(C1O=|94e~ACv^5Ppz6o0XoLMw+`ZyILj0K3edwBj1F1FloV!GJA;wuMS(Dr_j5n7rNAmR;`aU z?zmB1+|+(s_>H}Hsa0NWU*<4@Q2$xxtH`sT&Pf({c(%l~H+59ze3-p?&ZtZ}Ji%zI z#@5?PxvR&h7W=R05O_e~f&ZBY(Ay$-<%1c) zyPiDQm@eivHgL3mc`}-?Nknh&2n6Eq|A~+OXOG_YqQZGBUKSJ`9ce(NhDT9+{3Co> z6u*ctYP?S*l}@2iF(cFXNFTotRy4_%6&M_DOddSlOeO{U8}mFq=B%J#>qIuo zCDFmvFEPYV-=A!1LNbash!2YlV@3Or;=@A2qYUDW$z0+9=NX$&fZp$QtA zQ3>JEKJl92Q7YpWELc%~?BK}g;D~S%vgqR*5fg1phU4=F78d!V#;I=W;k%#Mmr58*d& onM@c)fl%N9fd>R05O_e~0f7hpzdi8V{T3@6ZnEOwZi>_UPl@pl6#xJL literal 0 HcmV?d00001 diff --git a/tests/bugfixes/github/test_pr_992.py b/tests/bugfixes/github/test_pr_992.py new file mode 100644 index 00000000..02230cfe --- /dev/null +++ b/tests/bugfixes/github/test_pr_992.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- + +import system_tests + +class NikonSigmaLens_APO_MACRO_180_F35_EX_DG(metaclass=system_tests.CaseMeta): + url = "https://github.com/Exiv2/exiv2/pull/992" + + filename = "$data_path/Sigma_APO_MACRO_180_F3.5_EX_DG.exv" + commands = ["$exiv2 -pa --grep lensid/i $filename"] + stderr = [""] + stdout = ["" + """Exif.NikonLd3.LensIDNumber Byte 1 Sigma APO MACRO 180mm F3.5 EX DG +""" +] + retval = [0]