From b2af9ef350f1abeae86c39b3ecb459129a7e14c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Thu, 22 Dec 2022 22:30:39 +0100 Subject: [PATCH] Fixed #1858 Adding same ExtGState multiple times --- CHANGELOG.md | 1 + lib/gnujpdf.jar | Bin 210872 -> 210917 bytes libsrc/gnujpdf/src/gnu/jpdf/PDFPage.java | 4 +++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edc8b30d8..cf514971b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ All notable changes to this project will be documented in this file. - Exporting DefineJPEG3/4 with alpha channel to PNG produced JPEG instead - AS3 package level const with function value - separate P-code for trait and method - Slot/const trait proper p-code indentation +- [#1858] Adding same ExtGState multiple times ### Changed - Warning before switching deobfuscation is now optional diff --git a/lib/gnujpdf.jar b/lib/gnujpdf.jar index 4d54e562722c5d50078078d31390098695ca8a5a..a777497df2cb853c63a7061e086a53bf990869ed 100644 GIT binary patch delta 5542 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 O<>ms(X+D=B*8P8N(mY=P delta 5385 zcma)Ad3aRS6+h>^nauXG?+MEU5|Ye7CV?y@AP@qH1POr25v!oJ6>zOfi&hjXs6F?+nU^u0eE0{*Z zonWN9z)HV_RQe5!pxw&0MYPno7qaMn<()-zU(O?tKnEb3f-r^-LN)ynX47NPK!>1( zo`g<%N_n7#+_3_8n`l!SIFWW(oVsDtN~>UJ8= zqdy6^KP#1cBM>{iUdd>IR{u-|U1vhc_$Mq`!46*S(K181zT17s5x z2OCz<6vF0y{5m6e?SwpvAmE!59ss2f9EAuyijW`)E<6mJnRoJmy%Q(cpR!0yfIkE#V`C%RriU@Ha z@&9))(>u9R??Qo;rdfxO*bk>5V+l;077bGw>mgg^0NigG?jDA_H#(fU8luLlxtWQn zcs-O?E8LUV5nvy4e+X=_pXdH?1VoC?CE3p^^Dw zGIlmFGx0jSoF|aLsh)-PEb%loIGmx(>!D<(;qDxpMe()0JAn03>U#-f|lHGfYPvuRR&JL0{(X;E>u(DT}x^CBCRn35shjp zwK6e=A|fur7S(v)S}JtuONeohfbo!yaS=`#y3=A@qB16N}>udneJHI^fLSgN5l0Lp_ts$njl4b4R`5Nn|^(6|T& zqOoWUG%jm6Ymr=1p(HAoZf%KhI=8fV#_;M~cCDjs=5lcz<*Vg(yY^kri&xEt;Nn%Y zA-H(eYzQu1H5-D97d0+I@-WjFRoBCkNtL`T@imLTu4T!>`E#rJvqCB?Q90WRU=%c9 zFQ-xl7gS>(OR=yxl+-w$f-ltEUc82~{9TMZ89HWuM40&5Kr6 zk1*VUA>ghJ!L0|s+Ghvh6-2{3%y>^+0`EGV-t^F}wsO@w87{bR@HToHEcgtntM&iK zN|@k=sDMRL0iS2UBM}6x`s!OTjJI(xUM-(}2cRS>;0p}+;w1n#X&YU6ay_L-tmW%q z#1j#&F*=tRu!nlYX56CHGpy!4DeBOE2p(&3@>%@&946%%8-Rxv3LyYbvi$7W{cNKh z&gyZ9r}+Rr1IhRfjKFtsQjvhrfb?*7^s8%a<@(!-+jvzFH{*5@Sh@Z>%JqwYnK4pP zW{jaI)5O0fLs1ZpREhrS$uvh$5QAqk%>yK|#P-0iz=r1;{cGN|7r32VggX3Iox0YX z>UA#lAua&*dUNvE>)okd?@sl4cbckqr_xYID1l6MB3!q8eLu?i;I2t`BamO{Ogb0V3$i1klT~JKq+$NAo&v)hXVN#i1D8d#sqF=Zy{KC; zZ1zF;P9G2CfWM3iz^Y$^!sD*XcQ+g zcX`|pETonD@?+-ITeE18)#;LFktWAv6D!aE(s^irL=eV#o z0)6lIZwx}oQ|(KKw&zF%dZgqqrqHUM(}wosNU0I_T*6#7f^T}HRz;coqfv@yChkXYs`(=Ki0nGrJY9Wm-hfy>OE~9#=r`gcV z4X2&vKsPmjm*&DInh!Tp6WmG*U>`L@kgkMhXrUjTr$um_mcXa96uzQmh;$Vis1@U= zjmx?n%ZTr0)QR=v=89gy72Sm$v>JQpYTQX{@HW2I+)W|V}T13}VC*7d;LBGJIQaST4JbElr76h+4-kUsp(pB_ zTWMt1$iNrW_ zjJEKdGXVEWMGx{oJB&5ZH!cC1sH4JOxL>7Z+fD`Qr9qq6dtjjV!Au|UpXNSP(H!b! zJzb}mu2W18Q8e)J|5LtU@>3RfYRP3@qt%N)fb9_M;H(xs0x6=fQEk~OUH&ry;mxcw z65fJ83kJ7S<9*b=U$GQQmHY?9;EY1)ZL9vrL&Z@l%^372zm26*Gv2NoFO}-(^i4`u znRK~yd^aiCdni-cQYJYJmHP<#y`Bu^xiYC3Ey|Z=QjOuw#|f0~X_&1{JxnpmvT`=O z`z6-Ba+K1QJ>}AP!xzWG!?Wd5F`YZ18) EAI23QUjP6A diff --git a/libsrc/gnujpdf/src/gnu/jpdf/PDFPage.java b/libsrc/gnujpdf/src/gnu/jpdf/PDFPage.java index c5f1b17ac..b3bd7e67f 100644 --- a/libsrc/gnujpdf/src/gnu/jpdf/PDFPage.java +++ b/libsrc/gnujpdf/src/gnu/jpdf/PDFPage.java @@ -454,7 +454,9 @@ public class PDFPage extends PDFObject implements Serializable { } public void addExtGStateResource(String resource) { - extGStateResources.add(resource); + if (!extGStateResources.contains(resource)) { + extGStateResources.add(resource); + } } /**