From 2245df0ac30976960781f291bc45a2ad56cee064 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 6 Apr 2024 20:59:06 +1100 Subject: [PATCH 001/662] Only preserve IPTC_NAA_CHUNK tag if type is BYTE or UNDEFINED --- Tests/test_file_tiff.py | 13 +++++++++++++ src/PIL/TiffImagePlugin.py | 30 ++++++++++++++++++------------ 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 8821fb46a..0bc1e2d0e 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -621,6 +621,19 @@ class TestFileTiff: assert_image_equal_tofile(im, tmpfile) + def test_iptc(self, tmp_path: Path) -> None: + # Do not preserve IPTC_NAA_CHUNK by default if type is LONG + outfile = str(tmp_path / "temp.tif") + im = hopper() + ifd = TiffImagePlugin.ImageFileDirectory_v2() + ifd[33723] = 1 + ifd.tagtype[33723] = 4 + im.tag_v2 = ifd + im.save(outfile) + + with Image.open(outfile) as im: + assert 33723 not in im.tag_v2 + def test_rowsperstrip(self, tmp_path: Path) -> None: outfile = str(tmp_path / "temp.tif") im = hopper() diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 8bfcd2907..c3683efb3 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1653,6 +1653,16 @@ def _save(im, fp, filename): except Exception: pass # might not be an IFD. Might not have populated type + legacy_ifd = {} + if hasattr(im, "tag"): + legacy_ifd = im.tag.to_v2() + + supplied_tags = {**legacy_ifd, **getattr(im, "tag_v2", {})} + if SAMPLEFORMAT in supplied_tags: + # SAMPLEFORMAT is determined by the image format and should not be copied + # from legacy_ifd. + del supplied_tags[SAMPLEFORMAT] + # additions written by Greg Couch, gregc@cgl.ucsf.edu # inspired by image-sig posting from Kevin Cazabon, kcazabon@home.com if hasattr(im, "tag_v2"): @@ -1666,8 +1676,14 @@ def _save(im, fp, filename): XMP, ): if key in im.tag_v2: - ifd[key] = im.tag_v2[key] - ifd.tagtype[key] = im.tag_v2.tagtype[key] + if key == IPTC_NAA_CHUNK and im.tag_v2.tagtype[key] not in ( + TiffTags.BYTE, + TiffTags.UNDEFINED, + ): + del supplied_tags[key] + else: + ifd[key] = im.tag_v2[key] + ifd.tagtype[key] = im.tag_v2.tagtype[key] # preserve ICC profile (should also work when saving other formats # which support profiles as TIFF) -- 2008-06-06 Florian Hoech @@ -1807,16 +1823,6 @@ def _save(im, fp, filename): # Merge the ones that we have with (optional) more bits from # the original file, e.g x,y resolution so that we can # save(load('')) == original file. - legacy_ifd = {} - if hasattr(im, "tag"): - legacy_ifd = im.tag.to_v2() - - # SAMPLEFORMAT is determined by the image format and should not be copied - # from legacy_ifd. - supplied_tags = {**getattr(im, "tag_v2", {}), **legacy_ifd} - if SAMPLEFORMAT in supplied_tags: - del supplied_tags[SAMPLEFORMAT] - for tag, value in itertools.chain(ifd.items(), supplied_tags.items()): # Libtiff can only process certain core items without adding # them to the custom dictionary. From 34b3cb519c3235366c3881f4e8a59ef3bf2c22b2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 10 Apr 2024 23:37:38 +1000 Subject: [PATCH 002/662] Converted example images to WebP --- docs/deprecations.rst | 2 +- docs/example/anchors.png | Bin 9726 -> 0 bytes docs/example/anchors.py | 2 +- docs/example/anchors.webp | Bin 0 -> 6350 bytes docs/example/image_thumbnail.png | Bin 19241 -> 0 bytes docs/example/image_thumbnail.webp | Bin 0 -> 2560 bytes docs/example/imageops_contain.png | Bin 19241 -> 0 bytes docs/example/imageops_contain.webp | Bin 0 -> 2560 bytes docs/example/imageops_cover.png | Bin 38843 -> 0 bytes docs/example/imageops_cover.webp | Bin 0 -> 4164 bytes docs/example/imageops_fit.png | Bin 28146 -> 0 bytes docs/example/imageops_fit.webp | Bin 0 -> 3234 bytes docs/example/imageops_pad.png | Bin 19499 -> 0 bytes docs/example/imageops_pad.webp | Bin 0 -> 2566 bytes docs/example/size_vs_bbox.png | Bin 12934 -> 0 bytes docs/example/size_vs_bbox.webp | Bin 0 -> 4948 bytes docs/handbook/text-anchors.rst | 2 +- docs/handbook/tutorial.rst | 30 ++++++++++++++--------------- docs/reference/ImageOps.rst | 30 ++++++++++++++--------------- docs/releasenotes/9.2.0.rst | 2 +- 20 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 docs/example/anchors.png create mode 100644 docs/example/anchors.webp delete mode 100644 docs/example/image_thumbnail.png create mode 100644 docs/example/image_thumbnail.webp delete mode 100644 docs/example/imageops_contain.png create mode 100644 docs/example/imageops_contain.webp delete mode 100644 docs/example/imageops_cover.png create mode 100644 docs/example/imageops_cover.webp delete mode 100644 docs/example/imageops_fit.png create mode 100644 docs/example/imageops_fit.webp delete mode 100644 docs/example/imageops_pad.png create mode 100644 docs/example/imageops_pad.webp delete mode 100644 docs/example/size_vs_bbox.png create mode 100644 docs/example/size_vs_bbox.webp diff --git a/docs/deprecations.rst b/docs/deprecations.rst index c3d1ba4f0..f530d5741 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -264,7 +264,7 @@ Previously, the ``size`` methods returned a ``height`` that included the vertica offset of the text, while the new ``bbox`` methods distinguish this as a ``top`` offset. -.. image:: ./example/size_vs_bbox.png +.. image:: ./example/size_vs_bbox.webp :alt: In bbox methods, top measures the vertical distance above the text, while bottom measures that plus the vertical distance of the text itself. In size methods, height also measures the vertical distance above the text plus the vertical distance of the text itself. :align: center diff --git a/docs/example/anchors.png b/docs/example/anchors.png deleted file mode 100644 index 40476b0922b4494b8d154a81bf3788798b078d75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9726 zcmd^_XIPVYm&PMHDmsFS1*GYKAYHmrtze`ny$7X+D$=`U6j6#qdR2NyA@mXy1!+=3 z5duL(A`m*E1qgexv-|GM`|j?w`)$h?@#5ln@-L^{zxyQQmZs{V1E&rk5Qsy_8`rcE z2nIt0Vwdp#z3>}u#f}&R;_N5nwadERNwXsXw{#62(H8d^Uw&JX^Mdy}1Lkx>v|*bw z?_nv2YchuHDAxmg=vJeGIIGj|!gPC|9gz>WZ1@mm9W5Zla@U4MRpU2dO@{c-OaiQ- z^VW9@^&G;U@J-59);k^@wC>Z3B>Bz1>8x6NvpHOUxrvo$ z{ZIv=@cZ}gG~%Hf2M!!qqP3r2WDaHCdB47(3_p$zkIKWE58LgB4IpBUyoG;-c`SAz z5QZuZ3<$*A&G_e#lYhV4 zt_W^h5!1?BF1YRT@8jdrR-X@R#GSwFw>H<;ovs?4l2Wv=aPL!7lYL*FUjKA?c6GIJ zOH0cEW@ZCZ)1=nc)>@o{o!!gEv9A6?le)Gd)2g&Ec3Jzm;VMjq+s`lP#qXa^$vP)} zXl#_W?>$#&`0h#*tHZ3wxpTL!Uw?A+=+R@RPUS6*H|OW&0cPOxMRBcu4-{Cvr_7!gT~ zI=nWzx?-r#uY!?@Nv2a_IW)JhP?|hYEPLk6nJg@}*Tkkf?K+=?L=P5=Wwi`7DzOS- zWM-DN?M#twV#W9L+~w0uvXgNkI!;edx91nv+w;aRE!}sR4GRyK$<56rrAH`9NJ~rG zklN$rm3YDRZpF}vb9<{s=4h>+lZfJwoiXV}?(J>knc*s(lVaw*TN}%p z9?DzDARJ%0|4N^MJsN%6*|{j3;HE0f#fCFR^mp&U%XX=!O#*Kw6(Igi$xemk4E9TP3Zm8g2^ zv=CBTTN|Uav*o6^IaAu&(y|y+XcAzdC5E)P~37J351CZbBX|tBuUcaj##W zF16`6Hp8s&AYolq6XNP*C zOh8G`X!i-#d$VJiXya^}_e@=FaI!U#ouJ-rFZ?A?|4>nbW#1(yI- z>#uL`IK_+(t@-Ix^ldEvv<|&}`*!4BX0Dk4Y(0AAW8 z;`L+&AMMMRFGD@*p)Y>S(^mrR)gC9V^vY9to1()vo2Iow;t^!$b~(hYWZDxkPF@&m zbmAIs3R{jDsrJZc;!?;7<_-baNsildw1PSZs2?+_eQjd6f`S5Jc%gu@ zGV0T(PkFhyk%U=&xL=#jl)|9xfuO#4Nn1*=^45FyD_q{+9(oR-Oic2p@YxQutqr0N z2V@f-GMTc}Cg#wSfi$kX_r_E-HpTlpBOGsDWu@UsQPYKZou1+0g0!^X!Z_vi%gV}( z>wL=~Bco$u2lC6Yc?AW%Z>|RGYHO##4|{x;MuMbmIKv4#Uf-=&K7E+6P%eSs#y3!zge?Xr?L^ z=H#4n*!2DWkr6UdKvYx{;|^gZEh8g%_G~89lVecrn8Cm4ac3Pu_q7xGG==p?+ zf?D{BU&|hDOi)-@_ujp?f!kyhc|1Znrfov|&Yd?<4Y3|%{dvYS5)#_WKRX9XJC(>I zsmbzQdG+-~ev6e1kwV&1EY5C+woR;NV`Hn{p>3`-vAejlzOC+&c`e^xWR~CFu0Am_ zA;8bCdNr7-57I21gKfM^jqF=2r{y1{vNP@IOjDCUPo6nzbI1N|c?&#tF{G$j4f z#pV3rPtDDKSD)}gjlW5C4R7waYia4RIy2~8xCy%-Dz%MB@n1svC~(d5h=^#2h=|zR z+hZu>K@}$Dj@@t{Qf?&mj(ADc!NI}VB0MWkM00vv9BZ<25YgB~C4y^KXJG7}9jr(0 z-nUD|LwntudvkU4Ak=iSH3j75P2%I@1w}<;n#Ut~>z2RB=M@#{`}kDB{>~yh71xqr zG14wX1$y4h<96!nx0ckbt*j<9W6iZaJv|eBjO(H?n6yWa7(~pfbs@s=&`k7 zd$}q^UQvLYbkA?fDr)NSqC5^$%>_{893#GPf&1C!g_wUzs z#)_KRtAw5Eo1!KrCI--ADwLQwE_~BbI(zohjin7yPRr1Z&Ydl-Wv`$$FPk5qBl*sq z`)sn)pP%MCbRrv%*4EJ>%^76It-mmX0>y$_3&=v3A-DV1Ilt;^6xM0XG)Q{q}I5l^4sE*_WA7MZ9UZNL zajh9qvQ~}YaxxV)$R?|)t4sO#_;AvcL_`WZwwPnvtX0A}&_yVmbEr58?t$;jnfD6Y z6g=tM`^QaV_u^&=6@G0MYi!g)!mLJ3l4drWl-)}$vxsKPyLa!ZL%-3gO8jZzk?HhM zWw%v0(r=A z2N^?GJ1GCfCly;zwcDcvbkw2NSNX2wZNN6wt*kN_85zYF7Zy@we_@>t2_fS5+^&meA zcb2?YN*pGBvyo*!?CjEoyYO&5wO--jd31#zD>p6p!32td#`7VCxc7B_1)H5Ud37%o z4G7Ii{)+J9h{@asxaV*A-K30*4WEaH*UuhTD|9pySb<#%o;mYSC=-FGeEf@l!*oar zM7C^&>^T8}Za7m9%H(a(K3>MSK*b7K1mYW$N`t+smWyN;p1@vdD%ueze%000_5KA8 z`bX_c9?3a{sDAOFFC1D#9n@LlcXyviNJt!GVM&L6WmfHugp=g#cc}ZN!J)V=Yi7m~ zO5BLoXuy5BWDL#M?{QO;N-BYU=Igtw%cKr`eZZ!a*PJQm#rqj1gxR8~sAG^3=&7De zduQkVIC0Brf4|4!L%>Tk!O!RO@x_%R&c{!lTpOgixw&~P{XjzKtqsaBeCn9zkWk;c zii%)%=Nxa`Ij^*()_}VHto#Bi1EQKT?;uz{L5Bxow{0~RB*AXCv zrVVgZy`cFftv^AQ7i?tY!~0jbT@MID}*glZWrPP*=j=m314$>vPkdl)5)u+GG z)dtpU-kdITrlzLobmiz+pkHX*mqnv%_`)^jodsrkF9!AM5B1i-KV!C^TEfCYQjJ#4(x;v{bJ2oq)+ZgxItUw=AJ6rEp+blU`{liHC%Q@X5&yeQa({gpKML7}&yx z*zm>!d!|-LMn;k%Rk_5u11OOj6uef)aFv?|h(WZS-Q>N*8n1bo_wV16;%!sJK@i() zQ&;$Sc|S(Q#Q3%e8)H9TQ&CBXi8%r5P>T^3r@sphkN6Wbo>Zc&iwx8xQl9}z8lw&+ zy{!DYs%m0yukLcUDtCNB!YN6RS}YtKj?-jvKwYMrbi4lFfVx^iQ4^ zs6449>8cSj05qFh@Aq*_?NGFKe&~>xgVrBMTIm;?kBrFx=c?01ki>tncX`on{L%FE zhe+;n9j`Ax_Mi4u;9_B6u`DSm@&DJw9P{QGXHsog;!e60*h{>;+Fw0TjFM$mSa{HR zc~w8@5`)_7hzN1ZrgdR?_sN%$R!W;QlBp9A@uZ*1J5}OMaXZ_iJJOi;Y7er1t2ex# zgJbwk19dEzTOAPBsMIE`%5yeh?Onj8Cr``PMrY7!%r-uiX7%XtvPe3j@IN4qS*$bMEi?}IZw(JUD?BDzkIxR4s%j~1WB`J!MFMQYb%OXn zVm^HMfVFNr;Y29ckhJ~M3*i@)oIElo7bd>st?)b~q#F>lu*``v*{$Tk$rPNWk=Rcz zANz8YjcsbV)`K|q_DsC=vq<>fd^Sg9)T>ZKD(DY4avl2vGFGxA#O< zP0euLDX1aD5|D5=H8u6!+)6=Ob^00`8`A|EG`)-PD3^jEEKPr?f4W}+BX#%Veiwot z;4;g?u6)^L@zuGJ{Ls)}53$Rr11P{-`dxxH37QoH-3p;a?P8H}mXA_3U6@K{lZ9ze z1NvJp$FS_*x~wJoqmo=y!<(z|O}2^dSIoXOCwu!&L>suTFO11Vz}fq>IgeE9?PKQZ z1>!IG@ZpLXF3_we;%7Kynt_If#?ae4k58RC1%H1>kvf?U3(U*R%t|pXU zlFY$*ean9P-=bO}gQ9bik~;Lep+Ov(jRx)1!KX;s-D(ah=@0P-Br`xFL%?!Lvu=x- zY6@fb-I$22V>y=k2i2C#U%pKx^L~0~*_>BiuAgsEtncq%yR@|A+n1#eI#3Q`_U6r- zQtp$toQAMSH&T1|&(t8|nAhfTkyGU|g>-t8ZnZeYK;bG<+c&sMj65apS+MrgMC&w2 zRw&OzmK#^DJd$zz`ucXdihzOwy+Atk51{y8g06ok^4o7$AaV6IG{R1Z82>P%eL9Jn zobJo#>_2$$pw9jKC3FR!k&(gFmVD7oMXY{3Ek@WV4VGXI1xxTBWKtbh(3UF_(>&e{ zR8Oc)?`P-NOuD6`^9pE@7YRC8$I>z#93S7l@=H>u8TzZ-e!7EiGf$uy6r1-!S(@;y zDf3>ui|qN)@@fTg5QM#Esck2$H>eOo6b(i}f`U&8?-YtQfsz~f@*l%;Z*kDJL%`Nz z^ZhDQIy*zhDt8{4#&0w>HU<T~ZEvpmk!=9>Xq)o` z>@Kz4cN(hA2#+4`rghvJ{_!z{Mb2Y7YAwBjUDkOLNE;75bV#I=anJ7Sz~X@$ZKzgg zIRLV90aUDc(6+~R$LN+u_R4=3vIS$?GT9_;&VjqY6nr&N#t8#v=cgAZ%g}f}GAj4z zkt1)QFrhy^KmI&4v=@S^Z+Lh{ah`&8dT4hk>A0T+wOkEiS7e}Rk?KWA=r_BL!9JGO6%WtZ!bm!>1t|f#%i9faA4p2 zlpZfYmbdiuqM-z30g0hO;QIcERFx}~^_bS}>+hciL~s4_Mc>9I3-rarqBk#czIHhr zx~`tNc~Mu_Eo2Y)5ZNIt{Pxh&Pbv9VlD;J8i{ZAk!PJ0N$I=TQ$#Ru=6N$Wi`SQaU zQL{WWK5J@yaU47$UD!ti;lx|2t@E~4^OSpeRrOD>w^T5LxFB5TQm#&RLQ)dP{4(8| zl!VKb0&21O{PGN+vht`Y*ia+0QnIp}rh0DV@rH-Hi6sI80xFnJ>(N5+-`b(-wttS~ z(SUYQK`S(PNWp4A!w2KId~ojHxIF(7-8D=@;BHR$=U=PA2M4a?qvHRbf^_xtMm%f& z9pEbV7ZekdrMLMPV)Y9#IPmP^!LCEzyeR>xBMnZ74R8a!@6#m&xW~(2@?hDx>(C}P zHa3anv;T}&IKZoC3_ku4_tm(I$(oYro(!cCmD6m8f$S;D!vOMi3m*>BB^un-((>}k z$^fcD{!DHD@_D%g)Ndgd`PN%%*NA>jF+kU4@e3kIP#<$|=O7sfg|nI|3PzwnW@(~g zVx2!N?@cua(ztgPxrskP3gTC1354D{pL#WyAwDF%P^JW|4r&tmi868y?1#?{v8&pR zKG<(qcl_9~3<&QjFcf=99f<@He6$a1a)(&tM-G+-=6ejgEOzh8-`yO+JphF&8f=Bi z$_vR#0mgK5$TC8)|4uSN;|JOC(RaA}_>BFCOAk(4cvwK6po031dLS0<9nov?&3W4W78nD(f{*Q#FfP7b1z6-&C^5YImx4fLMU-*4{VV4zH5Y^yvlR8sJ zM{B;XInyxxtIpoP{%RG<{MzmEQ^tLPpFq)8R#tZQrzR%mXJut+&ijXRk8E`dH-1#6 ztgK%e5Len_9&g0``fQ#KYU=`jjGg`&;CQbi5LB-D|K}5^zl_~VP9w8$UT{#SUoJ5H zX#%&Gt&#tC+Q&Z*8|Sqf^XSo|T4hPit=;2|K>*71BmT<+f2QTXVb=fB8Q<0|7zXia zB=nBfjGbIJY2fY_>mHc2^iulkjMD2to!^=u56{)cr-yXFW5m3AwL%!BmE-05`ugZP z5D*XAyRN=IY1{1T)yFXIp*LDHPtdJlY?3OFFwwkpu6l7&tiRHAobD}x6rp!7i6(FI z4-(0K?86h^&Do0M+}y=yu0FN<@H^vBjaP9vmtr1;;{GH!SO|nMFOGVB#j*utLfoCOP^;@+7MBYKC$M$NWayY?om+sLI9Vk zfz;fLxwTRv*Cy|dBCWf5?))D!z$P$Dp~0L2$CWPsVXr>asca1xjcvdHphKv*_AW7K zXPar@o!^=>9g0$XNNhSLCJz0@D3>c&uBfBYxfShc*I&@RFA&M%O{}F>Ek{|{*w9~6 z6dgjvvobS30SIbOWo2j$S&qZ{Jbc_`&ijF3v73 zJzWC?p@5K(Bs2w^!4hi~Om0rjLM}TDBEkCYP~{G=g67r^vo<;r<`x&P2@FsxChZB1 zkv{_VGF6=B zx&71ExJYH!VF5g?Yi;Sa@aiP4WFrpPL22Z{tBQtYD*saQxZb*};E953t zOHmZe(~ll)$7?A&!F0(E;$W~oz%QGu@dw5ce?nITxWI!}G1E6PLi4g!5N36}K&doM z+~4Ts{6~Y5S;7pRD6;#k#mW!qnHPbB(Mp3vMyuB=YC(78Eszo*aFyC>2%XgFueR-4 zqn*Az&HD{$Pa^hj4^MWduY9$Pm;%dL8T$m}4hSWQmxR+kxSkaM3Lb2CeBcGc%q8=+MaK@!RU^pG5xc5ymv=R;M9PH?!czH+0DX3Zc%Py*it}_zsHFHb+5*1hUz|$xtTKBdEe; zO=a>6%hVs-+o4LHw!c|yRKav|mRM&3tLp{hC70e+jvb>mj4&KHOSl?;Y0Q2+^ zd%sOp6`FR%@6SWUr$yuzhpz_PC8bINNbpM`U7(%y*%*0I;|pPhLCwn4ugPfou+LeH zm-m`j?ZP9_J0MXqVKxx3y)rPX`HTaU81GcHfjN2&R{|8{8$|r;bkW|?F$&f+(H1Lh z-Fgg8&jISlDQWvCn9oP2rjFVK6z+>kv4eCeodMB5%jKOhS9Zv306*|njB2eKpiOms zv<{q}~+of7{-F56&_K}n_0IP0h`g^K^~;LW(!+qHP;Y5l-S`ZZsK2?p#326kOy`(Dni(o3N6X1p@j z4wQW^hL}`#xXt?QRg>ccIY-~k+^V2TEF2rc>)jXn#)1F>3$)oEAZnw zCrBiiQzOC3+^!Sitlr?+^)w`ClDz2pFHcp~PuuRE*mBMO=5XrYzSz^m>qU71GPoG$ zwae~tU`Q&%wxh*2&j0J*>iLVN`Y(NzX=Z1a=D Awg3PC diff --git a/docs/example/anchors.py b/docs/example/anchors.py index b5d76b4fe..2ee11103f 100644 --- a/docs/example/anchors.py +++ b/docs/example/anchors.py @@ -26,5 +26,5 @@ if __name__ == "__main__": d.line(((x * 200, y * 100), (x * 200, (y + 1) * 100)), "black", 3) if y != 0: d.line(((x * 200, y * 100), ((x + 1) * 200, y * 100)), "black", 3) - im.save("docs/example/anchors.png") + im.save("docs/example/anchors.webp") im.show() diff --git a/docs/example/anchors.webp b/docs/example/anchors.webp new file mode 100644 index 0000000000000000000000000000000000000000..216b6c235a26b7515e3b756e38bc26b2c16a9c56 GIT binary patch literal 6350 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 OdA)BXvok02N7 zy&fl?X676c+A+nU`yD8d|GL9V6|F=ciCb;byvpZ6*D9?EY}(dg3>Y>USW+&y+R|S> z&NTfWgLdbr5|&Hd-}g!qT#BVg1`+LKhq2;*?s)GAWrWA`27^T8Ff!!Z+C>&Xysw({ zF!g*6Eq8s=yd3E zMMHAHSq2QIys=Qip(o>3u=RDyE!U_n7xHBMHqd+`#aP)X;D$3{KF+z?(T0hkIAcH< zTzfw9W1W4}%%_0U9z~nvk;tj`|D)F^n0e?n<>42`ZPu$820^lU8qYs_h(6o?HHGiiFL= zKI{2M3B;;FwO}l|cO9KSh)AfdFwWM&W$JKYbVn)**e%SVNeuzS4GU+$Bu(-xWd6O@ zbm2^H>bl?$6#fd}17y4amWEnzNUtpkck(<$NE_pgjW2@*L`JImcE;__ot~EuOavIE zTwE+jG=Bci%qZ%|875jF<2+@uiu4(5{VG0C$8sd;{+ znvnEKQn@8G0EUx*0;S_(FK`2i#zn+QL?LL9P@ z?O7h<;9&=H_G=VU{OrV%?l01Fgz#p(Jzx6<4fw0uH zhsq?&T&^3Z>VPt`cm}W8tkA_Vw7ttR#@kXbloPiVc2e{3H{ceZ7$3T>9Y|5wd-5(j z=VLNM>frnKhGHhZvJ-gPo{>nyR_8hwyNMt;y(HCFRheMEPBkb%YP_9wD!MJUP2QT0 zs)98MJnQ%rhssR{OGJ=O(IVANpoc@|W{1RTIv6`JOl5kMCjPvbjo*Y2We3pV@j!8^ zb}LbEGV1aXD+jRfM3g^|5o-q>rwoA2w{}d)04PS-fIO0)QCU@{hfu}gVZJrtbI}D1 z-BUPiiWVZ3rNHD&4tWy1REWkp*}6b2u3&>k9y@bYu`gD%pT_e_CNEBk!TrJ zgH*Y^VR{u)SXD~Yr^Ab6If+7A9pX9G5?9w9Sc;%sYY=b8hSU=kW@S8emNyGkHofss z6$*6CXSrJ+g)nLoD3!PnRB(tq%yV2V9CKD#15is55zh7$m;*;@52)SnG##-RFVN9-zT^}* zJ8{Cpjlkd8)DZ_7ke}DsJU`5t9B)CDfQY}^&%#Aazy|^9?;=+4N!5b9BYB08{$P^m z0l$P;#@=Y-ho3@Fvo+jwRWV@QC2;$6VW0WAiC2#eD>WCes0v|P zpdUC78%M&4RcaiiSdOa(6&GK?W^8%f-s1a!k*QmBli2|=k&b~%kj^=}V_acjVzG?V zy;1EQkKQF+@RW}fT{e}(-SPNv6q#LxUFk7w`n;WmFIAWZYu1h=iqO^Ej~R% zJW6v!L_yfqZcemRSH#hC7JVR6o0+Yjv9&!Sk%q0#bT4-jKyi9Ws;;Xt!F-%*P=M8W zI_gz)TWp)XH62w1Y7%+Z@F@?JnhutUClHk+4gYCM(1&*Z_}$a>4W_ir%0m}DVB#mC;D8EL Q)Yh+1e63w>000000CfdR{r~^~ literal 0 HcmV?d00001 diff --git a/docs/example/image_thumbnail.png b/docs/example/image_thumbnail.png deleted file mode 100644 index 293b05794659734d56726ce7c21310f16773e0b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19241 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 QfB*mh07*qoM6N<$f=X7t3;+NC diff --git a/docs/example/image_thumbnail.webp b/docs/example/image_thumbnail.webp new file mode 100644 index 0000000000000000000000000000000000000000..9780f2852fe434eaaf8e3daf43fff9cca3799c29 GIT binary patch literal 2560 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 QfB*mh07*qoM6N<$f=X7t3;+NC diff --git a/docs/example/imageops_contain.webp b/docs/example/imageops_contain.webp new file mode 100644 index 0000000000000000000000000000000000000000..9780f2852fe434eaaf8e3daf43fff9cca3799c29 GIT binary patch literal 2560 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 Ta2hb800000NkvXXu0mjfV0nW_ diff --git a/docs/example/imageops_cover.webp b/docs/example/imageops_cover.webp new file mode 100644 index 0000000000000000000000000000000000000000..a0b6c10bf2ffc5c6686eba10c7065780313b1c3e GIT binary patch literal 4164 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 O3znKIDw7Iy0000#)g(Cp literal 0 HcmV?d00001 diff --git a/docs/example/imageops_fit.png b/docs/example/imageops_fit.png deleted file mode 100644 index 13a3d5e3febdf3cc465f2bcc45dacfb817a5e7f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28146 zcmV)=K!m@EP)dNklL zcd%t?avz9g=4Xz%_W4)dSNrbi?wP@O0}N*19Z3+NS&&PHxR5B3id9gt6t&U@BUU1U zyAhN`Vu{s?T9P0M28n?m%nUHV0OPxRdfIn&dHejk{+Q2X>W_2ZtLp9

RqO9bLC> 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�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 diff --git a/docs/example/imageops_pad.webp b/docs/example/imageops_pad.webp new file mode 100644 index 0000000000000000000000000000000000000000..0ab63ef42e02a5408d79beba6ea393c4d5fe47c0 GIT binary patch literal 2566 zcmV+h3i<|BMM6+kP&gp+2><}_EdZSXDr5kb06uLpl}4l^B%vx5+bEC? ziDCfJ^$Pz0JO96@p!|sO^wR&E<61D*$p2CPtJy}~Uo*e2KdxTxx^!FARqKC<@bAfg zt$n@zwa+#qUn%?L`tBkA6lw+RZ}nULU<2!i{67tyQ+y+?AwUn#9*DXS`n%XerD4+< zQ|GBD@`~w4cb-`8tjKJTIG>#v(h#tC0HU`tHuSEr5um=c?B99snuwqhCR(fzwAd0y z96j;-Wv!>kNeVL$C!_%uyb1UiXy zj^FbHjQsST>1KDqz^{_-MOLzAlY_i66m zKcK_?1|Rwf001=n(Gq-R#)X%}qx8Eigd-x&&G0vJlJWRO9?Ow;M-Zs~Uf0@?454U* zN|HXmM3zUg$O?9TdB2saWp0&jraQ2 zyM9YgPIT@Y^=S)AETbZC*=K+5cEM!!S3K5%Bpc9{k+W6(i5MpM{67Pa7ykaQd&TsD zD_Rmi9ZJo zPP)~Ucg)k3_f0+0RT#Eyg4WxjnN$iPzOouG&+cF4H3PRr_0jYxeog*WX*(OhI33CN zQgp(h*CICFcfve#+^qhF8$}TfIYn4Ui~p<6#)sKoGg|893UV;D$yx9d{+3=d#gfg< z**#~URZSapb8Ddej+@i3=p4db--wyhiP<1Ng+>NHyQBOZYeKz$Y*7tPa>vLK5!kV_ zpXbTb>@>2+lO*k+zDANfvHid`qoQ>)`^r#+@UnfZZ@gIU4Cw4dYFne!+!i`H<{)Qr z`-s%zp*B2moab{)4V5PC`CRPX*_?y^e|`eJ9cVE8*0c$laytL1h-fz}QztIs$|9I7 z4<&l;OL8Y6WgElZc00>W!y-2onzYX{2e!|}8zp6njQx;ISs zl=VGg)rz)$2GE7FD$MY0@X}tNtzENFxcg*oe99#p=#%I-y0ebp2G)Tg=u|<<6B)sc zyvEJ9S6uDV{j-7o6m7tsSj42?7w{9Y-F)&yfNFChlRS4uhp$zpp zNRgn^YXz>9*dy9d7fO~gObFD451h8zcCJLv=aV+epP@7q{EJD0pmGz0wgC+@YiCbj zwxF+)u37X7H&a;kn9J*g(7qkLFVxLgNgD)NmE?gF>qLElP*d)aP<;!6W+uDG`pqxT z+|e4wQO3pe%f^FSA9ln>zM87ejd1Re`eQRb{1XXoSG+bjqAXqxlLMqKGmxzN#J(AS%$ z`H4eb)Q+`og&|+8H7JQ~sV10(QEWQGYJR3`HciMsU6&$Z#~omu#YRJyRT3sUgo>sJ z#f8o7`jcB3^;_Pr7sv&M@JdMeAU4ePi1Q$AIhCQ2$|o^=*Psu@~|+Bgoq3 z0O(5S7rM72!E@>JCs|z^Mgr9br9R~WMhR%te?zH>jYJySivKXdZc;U8C=(P0dDG8r z0p4cdv0ytUwwQygUW@Q&B`ba#Z^2))rh(Oj=0sYKXq`A!xCAmde z&%Tf0=P(iiaA~RJ@aQ*fg#xDUTy|K6tvHNgUsJZvFKhrveSM&M-*^KHJ3Gt*%Y>$V zhL4ZqLsI4}Y$O=J5f;WUCVv7ZI_e$cq^92s6+3AErIJZteo6Zr+Sk^bn|*lGmq?aj zYshZ=iVk)q5guk5`_)8=7o!;Omcx~&(OPz4*{o-P3jkt$9_Vwm9vEu5`k_;t{H=qP zb>Mb-rgDhKF~NfgD$<4isav)!BIC1d=btt+i`q z4eIg(WC%3=z_Zf|Hy8gk+P+5J1p})EmQ%-DQ||BzCvmb+Np&xEO&q9`3LIYY|Gtk6X}gz$1@`h#_IZxf+QSH zPuHqPPE@El=s?46&UXO>PFfD9L`-YzaB`iakyKLs&nk%c=3?b9e^?*07J%lYp;eDF zaZu;qkSNax=dC8gjkF%4FZA&Q8kY2+7tm%m5j9VkKGRKZfC05Ljs--Rm=@+E%u5d! cs5@GC(gS8efiIaw&ZnBm!e}UV@)loZ1 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 diff --git a/docs/example/size_vs_bbox.webp b/docs/example/size_vs_bbox.webp new file mode 100644 index 0000000000000000000000000000000000000000..391162d2d4ba02f3ebf4d866a7fdf458c5612faf GIT binary patch literal 4948 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 SC^AeeSg-&9000000000w&A&VV literal 0 HcmV?d00001 diff --git a/docs/handbook/text-anchors.rst b/docs/handbook/text-anchors.rst index 3a9572ab2..48de4bc95 100644 --- a/docs/handbook/text-anchors.rst +++ b/docs/handbook/text-anchors.rst @@ -132,7 +132,7 @@ of the two lines. .. comment: Image generated with ../example/anchors.py -.. image:: ../example/anchors.png +.. image:: ../example/anchors.webp :alt: Text anchor examples :align: center diff --git a/docs/handbook/tutorial.rst b/docs/handbook/tutorial.rst index 523e2ad74..6cb1e2639 100644 --- a/docs/handbook/tutorial.rst +++ b/docs/handbook/tutorial.rst @@ -278,26 +278,26 @@ choose to resize relative to a given size. from PIL import Image, ImageOps size = (100, 150) - with Image.open("Tests/images/hopper.png") as im: - ImageOps.contain(im, size).save("imageops_contain.png") - ImageOps.cover(im, size).save("imageops_cover.png") - ImageOps.fit(im, size).save("imageops_fit.png") - ImageOps.pad(im, size, color="#f00").save("imageops_pad.png") + with Image.open("Tests/images/hopper.webp") as im: + ImageOps.contain(im, size).save("imageops_contain.webp") + ImageOps.cover(im, size).save("imageops_cover.webp") + ImageOps.fit(im, size).save("imageops_fit.webp") + ImageOps.pad(im, size, color="#f00").save("imageops_pad.webp") # thumbnail() can also be used, # but will modify the image object in place im.thumbnail(size) - im.save("imageops_thumbnail.png") + im.save("image_thumbnail.webp") -+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+ -| | :py:meth:`~PIL.Image.Image.thumbnail` | :py:meth:`~PIL.ImageOps.contain` | :py:meth:`~PIL.ImageOps.cover` | :py:meth:`~PIL.ImageOps.fit` | :py:meth:`~PIL.ImageOps.pad` | -+================+===========================================+============================================+==========================================+========================================+========================================+ -|Given size | ``(100, 150)`` | ``(100, 150)`` | ``(100, 150)`` | ``(100, 150)`` | ``(100, 150)`` | -+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+ -|Resulting image | .. image:: ../example/image_thumbnail.png | .. image:: ../example/imageops_contain.png | .. image:: ../example/imageops_cover.png | .. image:: ../example/imageops_fit.png | .. image:: ../example/imageops_pad.png | -+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+ -|Resulting size | ``100×100`` | ``100×100`` | ``150×150`` | ``100×150`` | ``100×150`` | -+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+ ++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+ +| | :py:meth:`~PIL.Image.Image.thumbnail` | :py:meth:`~PIL.ImageOps.contain` | :py:meth:`~PIL.ImageOps.cover` | :py:meth:`~PIL.ImageOps.fit` | :py:meth:`~PIL.ImageOps.pad` | ++================+============================================+=============================================+===========================================+=========================================+=========================================+ +|Given size | ``(100, 150)`` | ``(100, 150)`` | ``(100, 150)`` | ``(100, 150)`` | ``(100, 150)`` | ++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+ +|Resulting image | .. image:: ../example/image_thumbnail.webp | .. image:: ../example/imageops_contain.webp | .. image:: ../example/imageops_cover.webp | .. image:: ../example/imageops_fit.webp | .. image:: ../example/imageops_pad.webp | ++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+ +|Resulting size | ``100×100`` | ``100×100`` | ``150×150`` | ``100×150`` | ``100×150`` | ++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+ .. _color-transforms: diff --git a/docs/reference/ImageOps.rst b/docs/reference/ImageOps.rst index 051fdcfc9..fcaa3c8f6 100644 --- a/docs/reference/ImageOps.rst +++ b/docs/reference/ImageOps.rst @@ -36,26 +36,26 @@ Resize relative to a given size from PIL import Image, ImageOps size = (100, 150) - with Image.open("Tests/images/hopper.png") as im: - ImageOps.contain(im, size).save("imageops_contain.png") - ImageOps.cover(im, size).save("imageops_cover.png") - ImageOps.fit(im, size).save("imageops_fit.png") - ImageOps.pad(im, size, color="#f00").save("imageops_pad.png") + with Image.open("Tests/images/hopper.webp") as im: + ImageOps.contain(im, size).save("imageops_contain.webp") + ImageOps.cover(im, size).save("imageops_cover.webp") + ImageOps.fit(im, size).save("imageops_fit.webp") + ImageOps.pad(im, size, color="#f00").save("imageops_pad.webp") # thumbnail() can also be used, # but will modify the image object in place im.thumbnail(size) - im.save("imageops_thumbnail.png") + im.save("image_thumbnail.webp") -+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+ -| | :py:meth:`~PIL.Image.Image.thumbnail` | :py:meth:`~PIL.ImageOps.contain` | :py:meth:`~PIL.ImageOps.cover` | :py:meth:`~PIL.ImageOps.fit` | :py:meth:`~PIL.ImageOps.pad` | -+================+===========================================+============================================+==========================================+========================================+========================================+ -|Given size | ``(100, 150)`` | ``(100, 150)`` | ``(100, 150)`` | ``(100, 150)`` | ``(100, 150)`` | -+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+ -|Resulting image | .. image:: ../example/image_thumbnail.png | .. image:: ../example/imageops_contain.png | .. image:: ../example/imageops_cover.png | .. image:: ../example/imageops_fit.png | .. image:: ../example/imageops_pad.png | -+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+ -|Resulting size | ``100×100`` | ``100×100`` | ``150×150`` | ``100×150`` | ``100×150`` | -+----------------+-------------------------------------------+--------------------------------------------+------------------------------------------+----------------------------------------+----------------------------------------+ ++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+ +| | :py:meth:`~PIL.Image.Image.thumbnail` | :py:meth:`~PIL.ImageOps.contain` | :py:meth:`~PIL.ImageOps.cover` | :py:meth:`~PIL.ImageOps.fit` | :py:meth:`~PIL.ImageOps.pad` | ++================+============================================+=============================================+===========================================+=========================================+=========================================+ +|Given size | ``(100, 150)`` | ``(100, 150)`` | ``(100, 150)`` | ``(100, 150)`` | ``(100, 150)`` | ++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+ +|Resulting image | .. image:: ../example/image_thumbnail.webp | .. image:: ../example/imageops_contain.webp | .. image:: ../example/imageops_cover.webp | .. image:: ../example/imageops_fit.webp | .. image:: ../example/imageops_pad.webp | ++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+ +|Resulting size | ``100×100`` | ``100×100`` | ``150×150`` | ``100×150`` | ``100×150`` | ++----------------+--------------------------------------------+---------------------------------------------+-------------------------------------------+-----------------------------------------+-----------------------------------------+ .. autofunction:: contain .. autofunction:: cover diff --git a/docs/releasenotes/9.2.0.rst b/docs/releasenotes/9.2.0.rst index fe29f2e4f..6e0647343 100644 --- a/docs/releasenotes/9.2.0.rst +++ b/docs/releasenotes/9.2.0.rst @@ -98,7 +98,7 @@ Previously, the ``size`` methods returned a ``height`` that included the vertica offset of the text, while the new ``bbox`` methods distinguish this as a ``top`` offset. -.. image:: ../example/size_vs_bbox.png +.. image:: ../example/size_vs_bbox.webp :alt: In bbox methods, top measures the vertical distance above the text, while bottom measures that plus the vertical distance of the text itself. In size methods, height also measures the vertical distance above the text plus the vertical distance of the text itself. :align: center From 98a0515494bc4cb43f2ede5fd80af82ee8f4fc59 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 22 Apr 2024 08:05:59 +1000 Subject: [PATCH 003/662] Read images as RGB, rather than RGBX --- src/PIL/ImImagePlugin.py | 2 +- src/PIL/TiffImagePlugin.py | 16 ++++++++-------- src/libImaging/Unpack.c | 4 ++++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/PIL/ImImagePlugin.py b/src/PIL/ImImagePlugin.py index 4613e40b6..6463572f5 100644 --- a/src/PIL/ImImagePlugin.py +++ b/src/PIL/ImImagePlugin.py @@ -78,7 +78,7 @@ OPEN = { "LA image": ("LA", "LA;L"), "PA image": ("LA", "PA;L"), "RGBA image": ("RGBA", "RGBA;L"), - "RGBX image": ("RGBX", "RGBX;L"), + "RGBX image": ("RGB", "RGBX;L"), "CMYK image": ("CMYK", "CMYK;L"), "YCC image": ("YCbCr", "YCbCr;L"), } diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 10ac9ea3a..e37140590 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -200,12 +200,12 @@ OPEN_INFO = { (MM, 2, (1,), 2, (8, 8, 8), ()): ("RGB", "RGB;R"), (II, 2, (1,), 1, (8, 8, 8, 8), ()): ("RGBA", "RGBA"), # missing ExtraSamples (MM, 2, (1,), 1, (8, 8, 8, 8), ()): ("RGBA", "RGBA"), # missing ExtraSamples - (II, 2, (1,), 1, (8, 8, 8, 8), (0,)): ("RGBX", "RGBX"), - (MM, 2, (1,), 1, (8, 8, 8, 8), (0,)): ("RGBX", "RGBX"), - (II, 2, (1,), 1, (8, 8, 8, 8, 8), (0, 0)): ("RGBX", "RGBXX"), - (MM, 2, (1,), 1, (8, 8, 8, 8, 8), (0, 0)): ("RGBX", "RGBXX"), - (II, 2, (1,), 1, (8, 8, 8, 8, 8, 8), (0, 0, 0)): ("RGBX", "RGBXXX"), - (MM, 2, (1,), 1, (8, 8, 8, 8, 8, 8), (0, 0, 0)): ("RGBX", "RGBXXX"), + (II, 2, (1,), 1, (8, 8, 8, 8), (0,)): ("RGB", "RGBX"), + (MM, 2, (1,), 1, (8, 8, 8, 8), (0,)): ("RGB", "RGBX"), + (II, 2, (1,), 1, (8, 8, 8, 8, 8), (0, 0)): ("RGB", "RGBXX"), + (MM, 2, (1,), 1, (8, 8, 8, 8, 8), (0, 0)): ("RGB", "RGBXX"), + (II, 2, (1,), 1, (8, 8, 8, 8, 8, 8), (0, 0, 0)): ("RGB", "RGBXXX"), + (MM, 2, (1,), 1, (8, 8, 8, 8, 8, 8), (0, 0, 0)): ("RGB", "RGBXXX"), (II, 2, (1,), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBa"), (MM, 2, (1,), 1, (8, 8, 8, 8), (1,)): ("RGBA", "RGBa"), (II, 2, (1,), 1, (8, 8, 8, 8, 8), (1, 0)): ("RGBA", "RGBaX"), @@ -224,8 +224,8 @@ OPEN_INFO = { (MM, 2, (1,), 1, (16, 16, 16), ()): ("RGB", "RGB;16B"), (II, 2, (1,), 1, (16, 16, 16, 16), ()): ("RGBA", "RGBA;16L"), (MM, 2, (1,), 1, (16, 16, 16, 16), ()): ("RGBA", "RGBA;16B"), - (II, 2, (1,), 1, (16, 16, 16, 16), (0,)): ("RGBX", "RGBX;16L"), - (MM, 2, (1,), 1, (16, 16, 16, 16), (0,)): ("RGBX", "RGBX;16B"), + (II, 2, (1,), 1, (16, 16, 16, 16), (0,)): ("RGB", "RGBX;16L"), + (MM, 2, (1,), 1, (16, 16, 16, 16), (0,)): ("RGB", "RGBX;16B"), (II, 2, (1,), 1, (16, 16, 16, 16), (1,)): ("RGBA", "RGBa;16L"), (MM, 2, (1,), 1, (16, 16, 16, 16), (1,)): ("RGBA", "RGBa;16B"), (II, 2, (1,), 1, (16, 16, 16, 16), (2,)): ("RGBA", "RGBA;16L"), diff --git a/src/libImaging/Unpack.c b/src/libImaging/Unpack.c index a84dc0a6f..f15769c43 100644 --- a/src/libImaging/Unpack.c +++ b/src/libImaging/Unpack.c @@ -1599,10 +1599,14 @@ static struct { {"RGB", "BGR;15", 16, ImagingUnpackBGR15}, {"RGB", "RGB;16", 16, ImagingUnpackRGB16}, {"RGB", "BGR;16", 16, ImagingUnpackBGR16}, + {"RGB", "RGBX;16L", 64, unpackRGBA16L}, + {"RGB", "RGBX;16B", 64, unpackRGBA16B}, {"RGB", "RGB;4B", 16, ImagingUnpackRGB4B}, {"RGB", "BGR;5", 16, ImagingUnpackBGR15}, /* compat */ {"RGB", "RGBX", 32, copy4}, {"RGB", "RGBX;L", 32, unpackRGBAL}, + {"RGB", "RGBXX", 40, copy4skip1}, + {"RGB", "RGBXXX", 48, copy4skip2}, {"RGB", "RGBA;L", 32, unpackRGBAL}, {"RGB", "RGBA;15", 16, ImagingUnpackRGBA15}, {"RGB", "BGRX", 32, ImagingUnpackBGRX}, From 5f805c39cccd6ccc5c695a885e274f8a2b4624f9 Mon Sep 17 00:00:00 2001 From: Nulano Date: Mon, 29 Apr 2024 23:19:36 +0200 Subject: [PATCH 004/662] Added type hints for PixelAccess methods and others --- docs/reference/ImageDraw.rst | 18 +----------- docs/reference/PixelAccess.rst | 41 ++------------------------ docs/reference/PyAccess.rst | 1 + src/PIL/Image.py | 53 +++++++++++++++++++++++++--------- src/PIL/ImageDraw.py | 13 +++++++-- src/PIL/ImageGrab.py | 15 +++++++--- src/PIL/PyAccess.py | 48 ++++++++++++++++++------------ 7 files changed, 97 insertions(+), 92 deletions(-) diff --git a/docs/reference/ImageDraw.rst b/docs/reference/ImageDraw.rst index 4ccfacae7..e7339ecbe 100644 --- a/docs/reference/ImageDraw.rst +++ b/docs/reference/ImageDraw.rst @@ -679,23 +679,7 @@ Methods :param hints: An optional list of hints. :returns: A (drawing context, drawing resource factory) tuple. -.. py:method:: floodfill(image, xy, value, border=None, thresh=0) - - .. warning:: This method is experimental. - - Fills a bounded region with a given color. - - :param image: Target image. - :param xy: Seed position (a 2-item coordinate tuple). - :param value: Fill color. - :param border: Optional border value. If given, the region consists of - pixels with a color different from the border color. If not given, - the region consists of pixels having the same color as the seed - pixel. - :param thresh: Optional threshold value which specifies a maximum - tolerable difference of a pixel value from the 'background' in - order for it to be replaced. Useful for filling regions of non- - homogeneous, but similar, colors. +.. autofunction:: PIL.ImageDraw.floodfill .. _BCP 47 language code: https://www.w3.org/International/articles/language-tags/ .. _OpenType docs: https://learn.microsoft.com/en-us/typography/opentype/spec/featurelist diff --git a/docs/reference/PixelAccess.rst b/docs/reference/PixelAccess.rst index 04d6f5dcd..026f488d8 100644 --- a/docs/reference/PixelAccess.rst +++ b/docs/reference/PixelAccess.rst @@ -44,42 +44,7 @@ Access using negative indexes is also possible. :: ----------------------------- .. class:: PixelAccess + :canonical: PIL.Image.PixelAccess - .. method:: __setitem__(self, xy, color): - - Modifies the pixel at x,y. The color is given as a single - numerical value for single band images, and a tuple for - multi-band images - - :param xy: The pixel coordinate, given as (x, y). - :param color: The pixel value according to its mode. e.g. tuple (r, g, b) for RGB mode) - - .. method:: __getitem__(self, xy): - - Returns the pixel at x,y. The pixel is returned as a single - value for single band images or a tuple for multiple band - images - - :param xy: The pixel coordinate, given as (x, y). - :returns: a pixel value for single band images, a tuple of - pixel values for multiband images. - - .. method:: putpixel(self, xy, color): - - Modifies the pixel at x,y. The color is given as a single - numerical value for single band images, and a tuple for - multi-band images. In addition to this, RGB and RGBA tuples - are accepted for P and PA images. - - :param xy: The pixel coordinate, given as (x, y). - :param color: The pixel value according to its mode. e.g. tuple (r, g, b) for RGB mode) - - .. method:: getpixel(self, xy): - - Returns the pixel at x,y. The pixel is returned as a single - value for single band images or a tuple for multiple band - images - - :param xy: The pixel coordinate, given as (x, y). - :returns: a pixel value for single band images, a tuple of - pixel values for multiband images. + .. automethod:: PIL.Image.PixelAccess.__getitem__ + .. automethod:: PIL.Image.PixelAccess.__setitem__ diff --git a/docs/reference/PyAccess.rst b/docs/reference/PyAccess.rst index ed58ca3a5..04b2a47ee 100644 --- a/docs/reference/PyAccess.rst +++ b/docs/reference/PyAccess.rst @@ -44,3 +44,4 @@ Access using negative indexes is also possible. :: .. autoclass:: PIL.PyAccess.PyAccess() :members: + :special-members: __getitem__, __setitem__ diff --git a/src/PIL/Image.py b/src/PIL/Image.py index a17edfa39..c1b8a2b2f 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -41,7 +41,7 @@ import warnings from collections.abc import Callable, MutableMapping from enum import IntEnum from types import ModuleType -from typing import IO, TYPE_CHECKING, Any, Literal, Protocol, cast +from typing import IO, TYPE_CHECKING, Any, Literal, Protocol, SupportsInt, cast # VERSION was removed in Pillow 6.0.0. # PILLOW_VERSION was removed in Pillow 9.0.0. @@ -482,6 +482,31 @@ def _getscaleoffset(expr): # Implementation wrapper +class PixelAccess(Protocol): + def __getitem__(self, xy: tuple[int, int]) -> float | tuple[int, ...]: + """ + Returns the pixel at x,y. The pixel is returned as a single + value for single band images or a tuple for multi-band images. + + :param xy: The pixel coordinate, given as (x, y). + :returns: a pixel value for single band images, a tuple of + pixel values for multiband images. + """ + raise NotImplementedError() + + def __setitem__(self, xy: tuple[int, int], color: float | tuple[int, ...]) -> None: + """ + Modifies the pixel at x,y. The color is given as a single + numerical value for single band images, and a tuple for + multi-band images. + + :param xy: The pixel coordinate, given as (x, y). + :param color: The pixel value according to its mode, + e.g. tuple (r, g, b) for RGB mode. + """ + raise NotImplementedError() + + class Image: """ This class represents an image object. To create @@ -834,7 +859,7 @@ class Image: msg = "cannot decode image data" raise ValueError(msg) - def load(self): + def load(self) -> PixelAccess | None: """ Allocates storage for the image and loads the pixel data. In normal cases, you don't need to call this method, since the @@ -847,7 +872,7 @@ class Image: operations. See :ref:`file-handling` for more information. :returns: An image access object. - :rtype: :ref:`PixelAccess` or :py:class:`PIL.PyAccess` + :rtype: :py:class:`.PixelAccess` or :py:class:`.PyAccess` """ if self.im is not None and self.palette and self.palette.dirty: # realize palette @@ -876,6 +901,7 @@ class Image: if self.pyaccess: return self.pyaccess return self.im.pixel_access(self.readonly) + return None def verify(self): """ @@ -1485,7 +1511,7 @@ class Image: self._exif._loaded = False self.getexif() - def get_child_images(self): + def get_child_images(self) -> list[ImageFile.ImageFile]: child_images = [] exif = self.getexif() ifds = [] @@ -1509,10 +1535,7 @@ class Image: fp = self.fp thumbnail_offset = ifd.get(513) if thumbnail_offset is not None: - try: - thumbnail_offset += self._exif_offset - except AttributeError: - pass + thumbnail_offset += getattr(self, "_exif_offset", 0) self.fp.seek(thumbnail_offset) data = self.fp.read(ifd.get(514)) fp = io.BytesIO(data) @@ -1578,7 +1601,7 @@ class Image: or "transparency" in self.info ) - def apply_transparency(self): + def apply_transparency(self) -> None: """ If a P mode image has a "transparency" key in the info dictionary, remove the key and instead apply the transparency to the palette. @@ -1590,6 +1613,7 @@ class Image: from . import ImagePalette palette = self.getpalette("RGBA") + assert palette is not None transparency = self.info["transparency"] if isinstance(transparency, bytes): for i, alpha in enumerate(transparency): @@ -1601,7 +1625,9 @@ class Image: del self.info["transparency"] - def getpixel(self, xy): + def getpixel( + self, xy: tuple[SupportsInt, SupportsInt] + ) -> float | tuple[int, ...] | None: """ Returns the pixel value at a given position. @@ -1865,7 +1891,7 @@ class Image: lut = [round(i) for i in lut] return self._new(self.im.point(lut, mode)) - def putalpha(self, alpha): + def putalpha(self, alpha: Image | int) -> None: """ Adds or replaces the alpha layer in this image. If the image does not have an alpha layer, it's converted to "LA" or "RGBA". @@ -1912,6 +1938,7 @@ class Image: alpha = alpha.convert("L") else: # constant alpha + alpha = cast(int, alpha) # see python/typing#1013 try: self.im.fillband(band, alpha) except (AttributeError, ValueError): @@ -1975,7 +2002,7 @@ class Image: self.palette.mode = "RGB" self.load() # install new palette - def putpixel(self, xy, value): + def putpixel(self, xy: tuple[int, int], value: float | tuple[int, ...]) -> None: """ Modifies the pixel at the given position. The color is given as a single numerical value for single-band images, and a tuple for @@ -2015,7 +2042,7 @@ class Image: value = value[:3] value = self.palette.getcolor(value, self) if self.mode == "PA": - value = (value, alpha) + value = (value, alpha) # type: ignore[assignment] return self.im.putpixel(xy, value) def remap_palette(self, dest_map, source_palette=None): diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py index d3efe6486..5c179000c 100644 --- a/src/PIL/ImageDraw.py +++ b/src/PIL/ImageDraw.py @@ -898,9 +898,17 @@ def getdraw(im=None, hints=None): return im, handler -def floodfill(image: Image.Image, xy, value, border=None, thresh=0) -> None: +def floodfill( + image: Image.Image, + xy: tuple[int, int], + value: float | tuple[int, ...], + border: float | tuple[int, ...] | None = None, + thresh: float = 0, +) -> None: """ - (experimental) Fills a bounded region with a given color. + .. warning:: This method is experimental. + + Fills a bounded region with a given color. :param image: Target image. :param xy: Seed position (a 2-item coordinate tuple). See @@ -918,6 +926,7 @@ def floodfill(image: Image.Image, xy, value, border=None, thresh=0) -> None: # based on an implementation by Eric S. Raymond # amended by yo1995 @20180806 pixel = image.load() + assert pixel is not None x, y = xy try: background = pixel[x, y] diff --git a/src/PIL/ImageGrab.py b/src/PIL/ImageGrab.py index 3f3be706d..f52dd301d 100644 --- a/src/PIL/ImageGrab.py +++ b/src/PIL/ImageGrab.py @@ -22,11 +22,17 @@ import shutil import subprocess import sys import tempfile +from typing import Union, cast from . import Image -def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=None): +def grab( + bbox: tuple[int, int, int, int] | None = None, + include_layered_windows: bool = False, + all_screens: bool = False, + xdisplay: str | None = None, +) -> Image.Image: if xdisplay is None: if sys.platform == "darwin": fh, filepath = tempfile.mkstemp(".png") @@ -36,7 +42,7 @@ def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=N left, top, right, bottom = bbox args += ["-R", f"{left},{top},{right-left},{bottom-top}"] subprocess.call(args + ["-x", filepath]) - im = Image.open(filepath) + im: Image.Image = Image.open(filepath) im.load() os.unlink(filepath) if bbox: @@ -63,6 +69,7 @@ def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=N left, top, right, bottom = bbox im = im.crop((left - x0, top - y0, right - x0, bottom - y0)) return im + xdisplay = cast(Union[str, None], xdisplay) # type: ignore[redundant-cast, unused-ignore] try: if not Image.core.HAVE_XCB: msg = "Pillow was built without XCB support" @@ -77,7 +84,7 @@ def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=N fh, filepath = tempfile.mkstemp(".png") os.close(fh) subprocess.call(["gnome-screenshot", "-f", filepath]) - im = Image.open(filepath) + im: Image.Image = Image.open(filepath) im.load() os.unlink(filepath) if bbox: @@ -94,7 +101,7 @@ def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=N return im -def grabclipboard(): +def grabclipboard() -> Image.Image | list[str] | None: if sys.platform == "darwin": fh, filepath = tempfile.mkstemp(".png") os.close(fh) diff --git a/src/PIL/PyAccess.py b/src/PIL/PyAccess.py index 2c831913d..af9595666 100644 --- a/src/PIL/PyAccess.py +++ b/src/PIL/PyAccess.py @@ -22,6 +22,7 @@ from __future__ import annotations import logging import sys +from typing import TYPE_CHECKING from ._deprecate import deprecate @@ -50,7 +51,7 @@ logger = logging.getLogger(__name__) class PyAccess: - def __init__(self, img, readonly=False): + def __init__(self, img: Image.Image, readonly: bool = False) -> None: deprecate("PyAccess", 11) vals = dict(img.im.unsafe_ptrs) self.readonly = readonly @@ -70,14 +71,15 @@ class PyAccess: # logger.debug("%s", vals) self._post_init() - def _post_init(self): + def _post_init(self) -> None: pass - def __setitem__(self, xy, color): + def __setitem__(self, xy: tuple[int, int], color: float | tuple[int, ...]) -> None: """ Modifies the pixel at x,y. The color is given as a single numerical value for single band images, and a tuple for - multi-band images + multi-band images. In addition to this, RGB and RGBA tuples + are accepted for P and PA images. :param xy: The pixel coordinate, given as (x, y). See :ref:`coordinate-system`. @@ -104,11 +106,11 @@ class PyAccess: color = color[:3] color = self._palette.getcolor(color, self._img) if self._im.mode == "PA": - color = (color, alpha) + color = (color, alpha) # type: ignore[assignment] return self.set_pixel(x, y, color) - def __getitem__(self, xy): + def __getitem__(self, xy: tuple[int, int]) -> float | tuple[int, ...]: """ Returns the pixel at x,y. The pixel is returned as a single value for single band images or a tuple for multiple band @@ -130,13 +132,19 @@ class PyAccess: putpixel = __setitem__ getpixel = __getitem__ - def check_xy(self, xy): + def check_xy(self, xy: tuple[int, int]) -> tuple[int, int]: (x, y) = xy if not (0 <= x < self.xsize and 0 <= y < self.ysize): msg = "pixel location out of range" raise ValueError(msg) return xy + def get_pixel(self, x: int, y: int) -> float | tuple[int, ...]: + raise NotImplementedError() + + def set_pixel(self, x: int, y: int, color: float | tuple[int, ...]) -> None: + raise NotImplementedError() + class _PyAccess32_2(PyAccess): """PA, LA, stored in first and last bytes of a 32 bit word""" @@ -144,7 +152,7 @@ class _PyAccess32_2(PyAccess): def _post_init(self, *args, **kwargs): self.pixels = ffi.cast("struct Pixel_RGBA **", self.image32) - def get_pixel(self, x, y): + def get_pixel(self, x: int, y: int) -> tuple[int, int]: pixel = self.pixels[y][x] return pixel.r, pixel.a @@ -161,7 +169,7 @@ class _PyAccess32_3(PyAccess): def _post_init(self, *args, **kwargs): self.pixels = ffi.cast("struct Pixel_RGBA **", self.image32) - def get_pixel(self, x, y): + def get_pixel(self, x: int, y: int) -> tuple[int, int, int]: pixel = self.pixels[y][x] return pixel.r, pixel.g, pixel.b @@ -180,7 +188,7 @@ class _PyAccess32_4(PyAccess): def _post_init(self, *args, **kwargs): self.pixels = ffi.cast("struct Pixel_RGBA **", self.image32) - def get_pixel(self, x, y): + def get_pixel(self, x: int, y: int) -> tuple[int, int, int, int]: pixel = self.pixels[y][x] return pixel.r, pixel.g, pixel.b, pixel.a @@ -199,7 +207,7 @@ class _PyAccess8(PyAccess): def _post_init(self, *args, **kwargs): self.pixels = self.image8 - def get_pixel(self, x, y): + def get_pixel(self, x: int, y: int) -> int: return self.pixels[y][x] def set_pixel(self, x, y, color): @@ -217,7 +225,7 @@ class _PyAccessI16_N(PyAccess): def _post_init(self, *args, **kwargs): self.pixels = ffi.cast("unsigned short **", self.image) - def get_pixel(self, x, y): + def get_pixel(self, x: int, y: int) -> int: return self.pixels[y][x] def set_pixel(self, x, y, color): @@ -235,7 +243,7 @@ class _PyAccessI16_L(PyAccess): def _post_init(self, *args, **kwargs): self.pixels = ffi.cast("struct Pixel_I16 **", self.image) - def get_pixel(self, x, y): + def get_pixel(self, x: int, y: int) -> int: pixel = self.pixels[y][x] return pixel.l + pixel.r * 256 @@ -256,7 +264,7 @@ class _PyAccessI16_B(PyAccess): def _post_init(self, *args, **kwargs): self.pixels = ffi.cast("struct Pixel_I16 **", self.image) - def get_pixel(self, x, y): + def get_pixel(self, x: int, y: int) -> int: pixel = self.pixels[y][x] return pixel.l * 256 + pixel.r @@ -277,7 +285,7 @@ class _PyAccessI32_N(PyAccess): def _post_init(self, *args, **kwargs): self.pixels = self.image32 - def get_pixel(self, x, y): + def get_pixel(self, x: int, y: int) -> int: return self.pixels[y][x] def set_pixel(self, x, y, color): @@ -296,7 +304,7 @@ class _PyAccessI32_Swap(PyAccess): chars[0], chars[1], chars[2], chars[3] = chars[3], chars[2], chars[1], chars[0] return ffi.cast("int *", chars)[0] - def get_pixel(self, x, y): + def get_pixel(self, x: int, y: int) -> int: return self.reverse(self.pixels[y][x]) def set_pixel(self, x, y, color): @@ -309,7 +317,7 @@ class _PyAccessF(PyAccess): def _post_init(self, *args, **kwargs): self.pixels = ffi.cast("float **", self.image32) - def get_pixel(self, x, y): + def get_pixel(self, x: int, y: int) -> float: return self.pixels[y][x] def set_pixel(self, x, y, color): @@ -357,9 +365,13 @@ else: mode_map["I;32B"] = _PyAccessI32_N -def new(img, readonly=False): +def new(img: Image.Image, readonly: bool = False) -> PyAccess | None: access_type = mode_map.get(img.mode, None) if not access_type: logger.debug("PyAccess Not Implemented: %s", img.mode) return None return access_type(img, readonly) + + +if TYPE_CHECKING: + from . import Image From 74b87ae7486e475c032044a648c33605514844ed Mon Sep 17 00:00:00 2001 From: Nulano Date: Tue, 30 Apr 2024 16:32:29 +0200 Subject: [PATCH 005/662] Move import to top of file --- src/PIL/PyAccess.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/PIL/PyAccess.py b/src/PIL/PyAccess.py index af9595666..cc8e2e359 100644 --- a/src/PIL/PyAccess.py +++ b/src/PIL/PyAccess.py @@ -49,6 +49,9 @@ except ImportError as ex: logger = logging.getLogger(__name__) +if TYPE_CHECKING: + from . import Image + class PyAccess: def __init__(self, img: Image.Image, readonly: bool = False) -> None: @@ -371,7 +374,3 @@ def new(img: Image.Image, readonly: bool = False) -> PyAccess | None: logger.debug("PyAccess Not Implemented: %s", img.mode) return None return access_type(img, readonly) - - -if TYPE_CHECKING: - from . import Image From c2cb9445141476283ff0a94be06ad70d4422e535 Mon Sep 17 00:00:00 2001 From: Nulano Date: Tue, 30 Apr 2024 16:32:44 +0200 Subject: [PATCH 006/662] Ignore incorrect mypy warning --- src/PIL/ImageGrab.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/ImageGrab.py b/src/PIL/ImageGrab.py index f52dd301d..f16e95544 100644 --- a/src/PIL/ImageGrab.py +++ b/src/PIL/ImageGrab.py @@ -84,7 +84,7 @@ def grab( fh, filepath = tempfile.mkstemp(".png") os.close(fh) subprocess.call(["gnome-screenshot", "-f", filepath]) - im: Image.Image = Image.open(filepath) + im: Image.Image = Image.open(filepath) # type: ignore[no-redef, unused-ignore] im.load() os.unlink(filepath) if bbox: From b15ce5a4bce4c5ec5d2816e271e0496e7198ae06 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 13 May 2024 21:51:16 +1000 Subject: [PATCH 007/662] Do not detect Ultra HDR images as MPO --- Tests/images/ultrahdr.jpg | Bin 0 -> 520842 bytes Tests/test_file_mpo.py | 5 +++++ src/PIL/JpegImagePlugin.py | 4 ++++ 3 files changed, 9 insertions(+) create mode 100644 Tests/images/ultrahdr.jpg diff --git a/Tests/images/ultrahdr.jpg b/Tests/images/ultrahdr.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1c5cc4adfe07ff4bbf80e79a784caf287c3b867f GIT binary patch literal 520842 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%0AWLXd`zuo~ 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 literal 0 HcmV?d00001 diff --git a/Tests/test_file_mpo.py b/Tests/test_file_mpo.py index a50188700..39b9c60b7 100644 --- a/Tests/test_file_mpo.py +++ b/Tests/test_file_mpo.py @@ -226,6 +226,11 @@ def test_eoferror() -> None: im.seek(n_frames - 1) +def test_ultra_hdr() -> None: + with Image.open("Tests/images/ultrahdr.jpg") as im: + assert im.format == "JPEG" + + @pytest.mark.parametrize("test_file", test_files) def test_image_grab(test_file: str) -> None: with Image.open(test_file) as im: diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 7a3c99b6c..10940179a 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -843,6 +843,10 @@ def jpeg_factory(fp=None, filename=None): try: mpheader = im._getmp() if mpheader[45057] > 1: + for segment, content in im.applist: + if segment == "APP1" and b' hdrgm:Version="' in content: + # Ultra HDR images are not yet supported + return im # It's actually an MPO from .MpoImagePlugin import MpoImageFile From 1036aa74a7d91eda68d3f3f0bf4f59a87c020b0b Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 16 May 2024 17:47:35 +1000 Subject: [PATCH 008/662] Added Image.WARN_POSSIBLE_FORMATS --- Tests/test_image.py | 11 +++++++++++ docs/reference/Image.rst | 5 +++++ src/PIL/Image.py | 15 ++++++++------- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Tests/test_image.py b/Tests/test_image.py index 742d0dfe4..7ec4195e5 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -116,6 +116,17 @@ class TestImage: assert im.mode == "RGB" assert im.size == (128, 128) + def test_open_verbose_failure(self) -> None: + im = io.BytesIO(b"") + Image.WARN_POSSIBLE_FORMATS = True + try: + with pytest.warns(UserWarning): + with pytest.raises(UnidentifiedImageError): + with Image.open(im): + pass + finally: + Image.WARN_POSSIBLE_FORMATS = False + def test_width_height(self) -> None: im = Image.new("RGB", (1, 2)) assert im.width == 1 diff --git a/docs/reference/Image.rst b/docs/reference/Image.rst index 0d9b4d93d..f25c9cd9d 100644 --- a/docs/reference/Image.rst +++ b/docs/reference/Image.rst @@ -374,6 +374,11 @@ Constants Set to 89,478,485, approximately 0.25GB for a 24-bit (3 bpp) image. See :py:meth:`~PIL.Image.open` for more information about how this is used. +.. data:: WARN_POSSIBLE_FORMATS + + Set to false. If true, when an image cannot be identified, warnings will be raised + from formats that attempted to read the data. + Transpose methods ^^^^^^^^^^^^^^^^^ diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 958b95e3b..89c649981 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -76,6 +76,8 @@ class DecompressionBombError(Exception): pass +WARN_POSSIBLE_FORMATS: bool = False + # Limit to around a quarter gigabyte for a 24-bit (3 bpp) image MAX_IMAGE_PIXELS: int | None = int(1024 * 1024 * 1024 // 4 // 3) @@ -3344,7 +3346,7 @@ def open( preinit() - accept_warnings: list[str] = [] + warning_messages: list[str] = [] def _open_core( fp: IO[bytes], @@ -3360,16 +3362,15 @@ def open( factory, accept = OPEN[i] result = not accept or accept(prefix) if isinstance(result, str): - accept_warnings.append(result) + warning_messages.append(result) elif result: fp.seek(0) im = factory(fp, filename) _decompression_bomb_check(im.size) return im - except (SyntaxError, IndexError, TypeError, struct.error): - # Leave disabled by default, spams the logs with image - # opening failures that are entirely expected. - # logger.debug("", exc_info=True) + except (SyntaxError, IndexError, TypeError, struct.error) as e: + if WARN_POSSIBLE_FORMATS: + warning_messages.append(i + " opening failed. " + str(e)) continue except BaseException: if exclusive_fp: @@ -3395,7 +3396,7 @@ def open( if exclusive_fp: fp.close() - for message in accept_warnings: + for message in warning_messages: warnings.warn(message) msg = "cannot identify image file %r" % (filename if filename else fp) raise UnidentifiedImageError(msg) From 2a703a2d4c94eefb224de1cbd7c2209af643a258 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 17 May 2024 08:04:20 +1000 Subject: [PATCH 009/662] Removed continue --- src/PIL/Image.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 89c649981..514a543c2 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -3371,7 +3371,6 @@ def open( except (SyntaxError, IndexError, TypeError, struct.error) as e: if WARN_POSSIBLE_FORMATS: warning_messages.append(i + " opening failed. " + str(e)) - continue except BaseException: if exclusive_fp: fp.close() From 7554e2cfbf25ea3a9b2da322a36b06be2a840b56 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 17 May 2024 08:44:04 +1000 Subject: [PATCH 010/662] Use monkeypatch --- Tests/test_image.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Tests/test_image.py b/Tests/test_image.py index 7ec4195e5..a03e5eced 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -116,16 +116,14 @@ class TestImage: assert im.mode == "RGB" assert im.size == (128, 128) - def test_open_verbose_failure(self) -> None: + def test_open_verbose_failure(self, monkeypatch: pytest.MonkeyPatch) -> None: + monkeypatch.setattr(Image, "WARN_POSSIBLE_FORMATS", True) + im = io.BytesIO(b"") - Image.WARN_POSSIBLE_FORMATS = True - try: - with pytest.warns(UserWarning): - with pytest.raises(UnidentifiedImageError): - with Image.open(im): - pass - finally: - Image.WARN_POSSIBLE_FORMATS = False + with pytest.warns(UserWarning): + with pytest.raises(UnidentifiedImageError): + with Image.open(im): + pass def test_width_height(self) -> None: im = Image.new("RGB", (1, 2)) From fb21c50fb664cefff2ef68ea972f5079d49f227e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 17 May 2024 10:46:32 +1000 Subject: [PATCH 011/662] Restore original thread state --- src/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/display.c b/src/display.c index abf94f1e1..990f4b0a5 100644 --- a/src/display.c +++ b/src/display.c @@ -618,7 +618,7 @@ windowCallback(HWND wnd, UINT message, WPARAM wParam, LPARAM lParam) { if (callback) { /* restore thread state */ PyEval_SaveThread(); - PyThreadState_Swap(threadstate); + PyThreadState_Swap(current_threadstate); } return status; From 0f1a0fc5018cfda48a1e9368d4f421734eca4a18 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 20 May 2024 23:11:50 +1000 Subject: [PATCH 012/662] Improved consistency of XMP handling --- Tests/test_file_jpeg.py | 1 + Tests/test_file_png.py | 1 + Tests/test_file_tiff.py | 1 + Tests/test_file_webp_metadata.py | 1 + Tests/test_image.py | 4 ++++ docs/reference/Image.rst | 1 + docs/releasenotes/8.3.0.rst | 6 +++--- src/PIL/Image.py | 16 ++++++++++++---- src/PIL/ImageOps.py | 3 +++ src/PIL/JpegImagePlugin.py | 17 ++--------------- src/PIL/PngImagePlugin.py | 15 ++------------- src/PIL/TiffImagePlugin.py | 13 ++++--------- src/PIL/WebPImagePlugin.py | 9 --------- 13 files changed, 35 insertions(+), 53 deletions(-) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index 5d2157651..c895c3a8d 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -943,6 +943,7 @@ class TestFileJpeg: ): assert im.getxmp() == {} else: + assert "xmp" in im.info xmp = im.getxmp() description = xmp["xmpmeta"]["RDF"]["Description"] diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py index 19462dcb5..eb2c8a5f1 100644 --- a/Tests/test_file_png.py +++ b/Tests/test_file_png.py @@ -683,6 +683,7 @@ class TestFilePng: ): assert im.getxmp() == {} else: + assert "xmp" in im.info xmp = im.getxmp() description = xmp["xmpmeta"]["RDF"]["Description"] diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 8821fb46a..56b9148d1 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -759,6 +759,7 @@ class TestFileTiff: ): assert im.getxmp() == {} else: + assert "xmp" in im.info xmp = im.getxmp() description = xmp["xmpmeta"]["RDF"]["Description"] diff --git a/Tests/test_file_webp_metadata.py b/Tests/test_file_webp_metadata.py index 875941240..c3df4ad7b 100644 --- a/Tests/test_file_webp_metadata.py +++ b/Tests/test_file_webp_metadata.py @@ -129,6 +129,7 @@ def test_getxmp() -> None: ): assert im.getxmp() == {} else: + assert "xmp" in im.info assert ( im.getxmp()["xmpmeta"]["xmptk"] == "Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27 " diff --git a/Tests/test_image.py b/Tests/test_image.py index 742d0dfe4..042c0dccb 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -897,6 +897,10 @@ class TestImage: assert tag not in exif.get_ifd(0x8769) assert exif.get_ifd(0xA005) + def test_empty_xmp(self) -> None: + with Image.open("Tests/images/hopper.gif") as im: + assert im.getxmp() == {} + @pytest.mark.parametrize("size", ((1, 0), (0, 1), (0, 0))) def test_zero_tobytes(self, size: tuple[int, int]) -> None: im = Image.new("RGB", size) diff --git a/docs/reference/Image.rst b/docs/reference/Image.rst index 0d9b4d93d..767c833b3 100644 --- a/docs/reference/Image.rst +++ b/docs/reference/Image.rst @@ -197,6 +197,7 @@ This helps to get the bounding box coordinates of the input image:: .. automethod:: PIL.Image.Image.getpalette .. automethod:: PIL.Image.Image.getpixel .. automethod:: PIL.Image.Image.getprojection +.. automethod:: PIL.Image.Image.getxmp .. automethod:: PIL.Image.Image.histogram .. automethod:: PIL.Image.Image.paste .. automethod:: PIL.Image.Image.point diff --git a/docs/releasenotes/8.3.0.rst b/docs/releasenotes/8.3.0.rst index 9f46cc1e9..4ef914f64 100644 --- a/docs/releasenotes/8.3.0.rst +++ b/docs/releasenotes/8.3.0.rst @@ -18,9 +18,9 @@ is not secure. - :py:meth:`~PIL.Image.Image.getexif` has used ``xml`` to potentially retrieve orientation data since Pillow 7.2.0. It has been refactored to use ``re`` instead. -- :py:meth:`~PIL.JpegImagePlugin.JpegImageFile.getxmp` was added in Pillow 8.2.0. It - will now use ``defusedxml`` instead. If the dependency is not present, an empty - dictionary will be returned and a warning raised. +- ``getxmp()`` was added to :py:class:`~PIL.JpegImagePlugin.JpegImageFile` in Pillow + 8.2.0. It will now use ``defusedxml`` instead. If the dependency is not present, an + empty dictionary will be returned and a warning raised. Deprecations ============ diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 958b95e3b..7d54b124b 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1439,7 +1439,14 @@ class Image: return tuple(self.im.getband(i).getextrema() for i in range(self.im.bands)) return self.im.getextrema() - def _getxmp(self, xmp_tags): + def getxmp(self): + """ + Returns a dictionary containing the XMP tags. + Requires defusedxml to be installed. + + :returns: XMP tags in a dictionary. + """ + def get_name(tag): return re.sub("^{[^}]+}", "", tag) @@ -1466,9 +1473,10 @@ class Image: if ElementTree is None: warnings.warn("XMP data cannot be read without defusedxml dependency") return {} - else: - root = ElementTree.fromstring(xmp_tags) - return {get_name(root.tag): get_value(root)} + if "xmp" not in self.info: + return {} + root = ElementTree.fromstring(self.info["xmp"]) + return {get_name(root.tag): get_value(root)} def getexif(self) -> Exif: """ diff --git a/src/PIL/ImageOps.py b/src/PIL/ImageOps.py index 33db8fa50..48bde39fe 100644 --- a/src/PIL/ImageOps.py +++ b/src/PIL/ImageOps.py @@ -717,6 +717,9 @@ def exif_transpose(image: Image.Image, *, in_place: bool = False) -> Image.Image exif_image.info["XML:com.adobe.xmp"] = re.sub( pattern, "", exif_image.info["XML:com.adobe.xmp"] ) + exif_image.info["xmp"] = re.sub( + pattern.encode(), b"", exif_image.info["xmp"] + ) if not in_place: return transposed_image elif not in_place: diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 909911dfe..be6b6959a 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -94,6 +94,8 @@ def APP(self, marker): else: self.info["exif"] = s self._exif_offset = self.fp.tell() - n + 6 + elif marker == 0xFFE1 and s[:29] == b"http://ns.adobe.com/xap/1.0/\x00": + self.info["xmp"] = s.split(b"\x00")[1] elif marker == 0xFFE2 and s[:5] == b"FPXR\0": # extract FlashPix information (incomplete) self.info["flashpix"] = s # FIXME: value will change @@ -499,21 +501,6 @@ class JpegImageFile(ImageFile.ImageFile): def _getmp(self): return _getmp(self) - def getxmp(self): - """ - Returns a dictionary containing the XMP tags. - Requires defusedxml to be installed. - - :returns: XMP tags in a dictionary. - """ - - for segment, content in self.applist: - if segment == "APP1": - marker, xmp_tags = content.split(b"\x00")[:2] - if marker == b"http://ns.adobe.com/xap/1.0/": - return self._getxmp(xmp_tags) - return {} - def _getexif(self): if "exif" not in self.info: diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index c74cbccf1..14622349b 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -606,6 +606,8 @@ class PngStream(ChunkStream): return s else: return s + if k == b"XML:com.adobe.xmp": + self.im_info["xmp"] = v try: k = k.decode("latin-1", "strict") lang = lang.decode("utf-8", "strict") @@ -1032,19 +1034,6 @@ class PngImageFile(ImageFile.ImageFile): return super().getexif() - def getxmp(self): - """ - Returns a dictionary containing the XMP tags. - Requires defusedxml to be installed. - - :returns: XMP tags in a dictionary. - """ - return ( - self._getxmp(self.info["XML:com.adobe.xmp"]) - if "XML:com.adobe.xmp" in self.info - else {} - ) - # -------------------------------------------------------------------- # PNG writer diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 54faa59c5..7ba71b58e 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1192,6 +1192,10 @@ class TiffImageFile(ImageFile.ImageFile): self.__frame += 1 self.fp.seek(self._frame_pos[frame]) self.tag_v2.load(self.fp) + if XMP in self.tag_v2: + self.info["xmp"] = self.tag_v2[XMP] + elif "xmp" in self.info: + del self.info["xmp"] self._reload_exif() # fill the legacy tag/ifd entries self.tag = self.ifd = ImageFileDirectory_v1.from_v2(self.tag_v2) @@ -1202,15 +1206,6 @@ class TiffImageFile(ImageFile.ImageFile): """Return the current frame number""" return self.__frame - def getxmp(self): - """ - Returns a dictionary containing the XMP tags. - Requires defusedxml to be installed. - - :returns: XMP tags in a dictionary. - """ - return self._getxmp(self.tag_v2[XMP]) if XMP in self.tag_v2 else {} - def get_photoshop_blocks(self): """ Returns a dictionary of Photoshop "Image Resource Blocks". diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index cae124e9f..43e1410c7 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -100,15 +100,6 @@ class WebPImageFile(ImageFile.ImageFile): return None return self.getexif()._get_merged_dict() - def getxmp(self): - """ - Returns a dictionary containing the XMP tags. - Requires defusedxml to be installed. - - :returns: XMP tags in a dictionary. - """ - return self._getxmp(self.info["xmp"]) if "xmp" in self.info else {} - def seek(self, frame: int) -> None: if not self._seek_check(frame): return From 2dedeef832eb170dd8490ca12aa496ade95de478 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 22 May 2024 20:05:07 +1000 Subject: [PATCH 013/662] Support unpacking more rawmodes to RGBA palette --- Tests/test_image_putpalette.py | 1 + src/PIL/DdsImagePlugin.py | 1 + src/PIL/GifImagePlugin.py | 2 +- src/PIL/Image.py | 12 ++++++------ src/_imaging.c | 6 +++--- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Tests/test_image_putpalette.py b/Tests/test_image_putpalette.py index cc7cf58f0..75d9d2fc1 100644 --- a/Tests/test_image_putpalette.py +++ b/Tests/test_image_putpalette.py @@ -79,6 +79,7 @@ def test_putpalette_with_alpha_values() -> None: ( ("RGBA", (1, 2, 3, 4)), ("RGBAX", (1, 2, 3, 4, 0)), + ("ARGB", (4, 1, 2, 3)), ), ) def test_rgba_palette(mode: str, palette: tuple[int, ...]) -> None: diff --git a/src/PIL/DdsImagePlugin.py b/src/PIL/DdsImagePlugin.py index 1575f2d88..285e4b9db 100644 --- a/src/PIL/DdsImagePlugin.py +++ b/src/PIL/DdsImagePlugin.py @@ -379,6 +379,7 @@ class DdsImageFile(ImageFile.ImageFile): elif pfflags & DDPF.PALETTEINDEXED8: self._mode = "P" self.palette = ImagePalette.raw("RGBA", self.fp.read(1024)) + self.palette.mode = "RGBA" elif pfflags & DDPF.FOURCC: offset = header_size + 4 if fourcc == D3DFMT.DXT1: diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index eede41549..151feb17d 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -429,7 +429,7 @@ class GifImageFile(ImageFile.ImageFile): self._prev_im = self.im if self._frame_palette: self.im = Image.core.fill("P", self.size, self._frame_transparency or 0) - self.im.putpalette(*self._frame_palette.getdata()) + self.im.putpalette("RGB", *self._frame_palette.getdata()) else: self.im = None self._mode = temp_mode diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 958b95e3b..7a957e769 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -873,7 +873,7 @@ class Image: if self.im is not None and self.palette and self.palette.dirty: # realize palette mode, arr = self.palette.getdata() - self.im.putpalette(mode, arr) + self.im.putpalette(self.palette.mode, mode, arr) self.palette.dirty = 0 self.palette.rawmode = None if "transparency" in self.info and mode in ("LA", "PA"): @@ -883,9 +883,9 @@ class Image: self.im.putpalettealphas(self.info["transparency"]) self.palette.mode = "RGBA" else: - palette_mode = "RGBA" if mode.startswith("RGBA") else "RGB" - self.palette.mode = palette_mode - self.palette.palette = self.im.getpalette(palette_mode, palette_mode) + self.palette.palette = self.im.getpalette( + self.palette.mode, self.palette.mode + ) if self.im is not None: if cffi and USE_CFFI_ACCESS: @@ -1998,7 +1998,7 @@ class Image: palette = ImagePalette.raw(rawmode, data) self._mode = "PA" if "A" in self.mode else "P" self.palette = palette - self.palette.mode = "RGB" + self.palette.mode = "RGBA" if "A" in rawmode else "RGB" self.load() # install new palette def putpixel(self, xy, value): @@ -2113,7 +2113,7 @@ class Image: # m_im.putpalette(mapping_palette, 'L') # converts to 'P' # or just force it. # UNDONE -- this is part of the general issue with palettes - m_im.im.putpalette(palette_mode + ";L", m_im.palette.tobytes()) + m_im.im.putpalette(palette_mode, palette_mode + ";L", m_im.palette.tobytes()) m_im = m_im.convert("L") diff --git a/src/_imaging.c b/src/_imaging.c index c565c21bb..d2d29bfdf 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -1725,10 +1725,11 @@ _putpalette(ImagingObject *self, PyObject *args) { ImagingShuffler unpack; int bits; - char *rawmode, *palette_mode; + char *palette_mode, *rawmode; UINT8 *palette; Py_ssize_t palettesize; - if (!PyArg_ParseTuple(args, "sy#", &rawmode, &palette, &palettesize)) { + if (!PyArg_ParseTuple( + args, "ssy#", &palette_mode, &rawmode, &palette, &palettesize)) { return NULL; } @@ -1738,7 +1739,6 @@ _putpalette(ImagingObject *self, PyObject *args) { return NULL; } - palette_mode = strncmp("RGBA", rawmode, 4) == 0 ? "RGBA" : "RGB"; unpack = ImagingFindUnpacker(palette_mode, rawmode, &bits); if (!unpack) { PyErr_SetString(PyExc_ValueError, wrong_raw_mode); From 804fe7bbf86826a34067846b8ca29837ccc8d2af Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 23 May 2024 17:50:50 +1000 Subject: [PATCH 014/662] Do not read layers when opening --- Tests/test_file_psd.py | 24 +++++++++++++++--------- src/PIL/PsdImagePlugin.py | 30 +++++++++++++++++++++++++----- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/Tests/test_file_psd.py b/Tests/test_file_psd.py index 484a1be8f..91539e0e4 100644 --- a/Tests/test_file_psd.py +++ b/Tests/test_file_psd.py @@ -4,7 +4,7 @@ import warnings import pytest -from PIL import Image, PsdImagePlugin, UnidentifiedImageError +from PIL import Image, PsdImagePlugin from .helper import assert_image_equal_tofile, assert_image_similar, hopper, is_pypy @@ -150,14 +150,6 @@ def test_combined_larger_than_size() -> None: @pytest.mark.parametrize( "test_file,raises", [ - ( - "Tests/images/timeout-1ee28a249896e05b83840ae8140622de8e648ba9.psd", - UnidentifiedImageError, - ), - ( - "Tests/images/timeout-598843abc37fc080ec36a2699ebbd44f795d3a6f.psd", - UnidentifiedImageError, - ), ("Tests/images/timeout-c8efc3fded6426986ba867a399791bae544f59bc.psd", OSError), ("Tests/images/timeout-dedc7a4ebd856d79b4359bbcc79e8ef231ce38f6.psd", OSError), ], @@ -167,3 +159,17 @@ def test_crashes(test_file: str, raises) -> None: with pytest.raises(raises): with Image.open(f): pass + + +@pytest.mark.parametrize( + "test_file", + [ + "Tests/images/timeout-1ee28a249896e05b83840ae8140622de8e648ba9.psd", + "Tests/images/timeout-598843abc37fc080ec36a2699ebbd44f795d3a6f.psd", + ], +) +def test_layer_crashes(test_file: str) -> None: + with open(test_file, "rb") as f: + with Image.open(f) as im: + with pytest.raises(SyntaxError): + im.layers diff --git a/src/PIL/PsdImagePlugin.py b/src/PIL/PsdImagePlugin.py index 86c1a6763..edf698bf0 100644 --- a/src/PIL/PsdImagePlugin.py +++ b/src/PIL/PsdImagePlugin.py @@ -18,6 +18,7 @@ from __future__ import annotations import io +from functools import cached_property from . import Image, ImageFile, ImagePalette from ._binary import i8 @@ -118,18 +119,17 @@ class PsdImageFile(ImageFile.ImageFile): # # layer and mask information - self.layers = [] + self._layers_position = None size = i32(read(4)) if size: end = self.fp.tell() + size size = i32(read(4)) if size: - _layer_data = io.BytesIO(ImageFile._safe_read(self.fp, size)) - self.layers = _layerinfo(_layer_data, size) + self._layers_position = self.fp.tell() + self._layers_size = size self.fp.seek(end) - self.n_frames = len(self.layers) - self.is_animated = self.n_frames > 1 + self._n_frames: int | None = None # # image descriptor @@ -141,6 +141,26 @@ class PsdImageFile(ImageFile.ImageFile): self.frame = 1 self._min_frame = 1 + @cached_property + def layers(self): + layers = [] + if self._layers_position is not None: + self._fp.seek(self._layers_position) + _layer_data = io.BytesIO(ImageFile._safe_read(self._fp, self._layers_size)) + layers = _layerinfo(_layer_data, self._layers_size) + self._n_frames = len(layers) + return layers + + @property + def n_frames(self) -> int: + if self._n_frames is None: + self._n_frames = len(self.layers) + return self._n_frames + + @property + def is_animated(self) -> bool: + return len(self.layers) > 1 + def seek(self, layer: int) -> None: if not self._seek_check(layer): return From 930c423db1b4d571755768b0502067676b30eb58 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 27 May 2024 17:08:13 +1000 Subject: [PATCH 015/662] Added ImageFont.load_default_imagefont() --- Tests/test_imagefontpil.py | 47 +++--- docs/reference/ImageFont.rst | 1 + src/PIL/ImageFont.py | 273 ++++++++++++++++++----------------- 3 files changed, 164 insertions(+), 157 deletions(-) diff --git a/Tests/test_imagefontpil.py b/Tests/test_imagefontpil.py index 3b1c14b4e..acbaecab2 100644 --- a/Tests/test_imagefontpil.py +++ b/Tests/test_imagefontpil.py @@ -9,51 +9,54 @@ from PIL import Image, ImageDraw, ImageFont, _util, features from .helper import assert_image_equal_tofile -original_core = ImageFont.core +fonts = [ImageFont.load_default_imagefont()] +if not features.check_module("freetype2"): + default_font = ImageFont.load_default() + if isinstance(default_font, ImageFont.ImageFont): + fonts.append(default_font) -def setup_module() -> None: - if features.check_module("freetype2"): - ImageFont.core = _util.DeferredError(ImportError) - - -def teardown_module() -> None: - ImageFont.core = original_core - - -def test_default_font() -> None: +@pytest.mark.parametrize("font", fonts) +def test_default_font(font: ImageFont.ImageFont) -> None: # Arrange txt = 'This is a "better than nothing" default font.' im = Image.new(mode="RGB", size=(300, 100)) draw = ImageDraw.Draw(im) # Act - default_font = ImageFont.load_default() - draw.text((10, 10), txt, font=default_font) + draw.text((10, 10), txt, font=font) # Assert assert_image_equal_tofile(im, "Tests/images/default_font.png") -def test_size_without_freetype() -> None: - with pytest.raises(ImportError): - ImageFont.load_default(size=14) +def test_without_freetype() -> None: + original_core = ImageFont.core + if features.check_module("freetype2"): + ImageFont.core = _util.DeferredError(ImportError) + try: + assert isinstance(ImageFont.load_default(), ImageFont.ImageFont) + + with pytest.raises(ImportError): + ImageFont.load_default(size=14) + finally: + ImageFont.core = original_core -def test_unicode() -> None: +@pytest.mark.parametrize("font", fonts) +def test_unicode(font: ImageFont.ImageFont) -> None: # should not segfault, should return UnicodeDecodeError # issue #2826 - font = ImageFont.load_default() with pytest.raises(UnicodeEncodeError): font.getbbox("’") -def test_textbbox() -> None: +@pytest.mark.parametrize("font", fonts) +def test_textbbox(font: ImageFont.ImageFont) -> None: im = Image.new("RGB", (200, 200)) d = ImageDraw.Draw(im) - default_font = ImageFont.load_default() - assert d.textlength("test", font=default_font) == 24 - assert d.textbbox((0, 0), "test", font=default_font) == (0, 0, 24, 11) + assert d.textlength("test", font=font) == 24 + assert d.textbbox((0, 0), "test", font=font) == (0, 0, 24, 11) def test_decompression_bomb() -> None: diff --git a/docs/reference/ImageFont.rst b/docs/reference/ImageFont.rst index 6edf4b05c..edbdd9a32 100644 --- a/docs/reference/ImageFont.rst +++ b/docs/reference/ImageFont.rst @@ -53,6 +53,7 @@ Functions .. autofunction:: PIL.ImageFont.load_path .. autofunction:: PIL.ImageFont.truetype .. autofunction:: PIL.ImageFont.load_default +.. autofunction:: PIL.ImageFont.load_default_imagefont Methods ------- diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index ad5f75459..87ff8315e 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -867,6 +867,142 @@ def load_path(filename): raise OSError(msg) +def load_default_imagefont() -> ImageFont: + f = ImageFont() + f._load_pilfont_data( + # courB08 + BytesIO( + base64.b64decode( + b""" +UElMZm9udAo7Ozs7OzsxMDsKREFUQQoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAA//8AAQAAAAAAAAABAAEA +BgAAAAH/+gADAAAAAQAAAAMABgAGAAAAAf/6AAT//QADAAAABgADAAYAAAAA//kABQABAAYAAAAL +AAgABgAAAAD/+AAFAAEACwAAABAACQAGAAAAAP/5AAUAAAAQAAAAFQAHAAYAAP////oABQAAABUA +AAAbAAYABgAAAAH/+QAE//wAGwAAAB4AAwAGAAAAAf/5AAQAAQAeAAAAIQAIAAYAAAAB//kABAAB +ACEAAAAkAAgABgAAAAD/+QAE//0AJAAAACgABAAGAAAAAP/6AAX//wAoAAAALQAFAAYAAAAB//8A +BAACAC0AAAAwAAMABgAAAAD//AAF//0AMAAAADUAAQAGAAAAAf//AAMAAAA1AAAANwABAAYAAAAB +//kABQABADcAAAA7AAgABgAAAAD/+QAFAAAAOwAAAEAABwAGAAAAAP/5AAYAAABAAAAARgAHAAYA +AAAA//kABQAAAEYAAABLAAcABgAAAAD/+QAFAAAASwAAAFAABwAGAAAAAP/5AAYAAABQAAAAVgAH +AAYAAAAA//kABQAAAFYAAABbAAcABgAAAAD/+QAFAAAAWwAAAGAABwAGAAAAAP/5AAUAAABgAAAA +ZQAHAAYAAAAA//kABQAAAGUAAABqAAcABgAAAAD/+QAFAAAAagAAAG8ABwAGAAAAAf/8AAMAAABv +AAAAcQAEAAYAAAAA//wAAwACAHEAAAB0AAYABgAAAAD/+gAE//8AdAAAAHgABQAGAAAAAP/7AAT/ +/gB4AAAAfAADAAYAAAAB//oABf//AHwAAACAAAUABgAAAAD/+gAFAAAAgAAAAIUABgAGAAAAAP/5 +AAYAAQCFAAAAiwAIAAYAAP////oABgAAAIsAAACSAAYABgAA////+gAFAAAAkgAAAJgABgAGAAAA +AP/6AAUAAACYAAAAnQAGAAYAAP////oABQAAAJ0AAACjAAYABgAA////+gAFAAAAowAAAKkABgAG +AAD////6AAUAAACpAAAArwAGAAYAAAAA//oABQAAAK8AAAC0AAYABgAA////+gAGAAAAtAAAALsA +BgAGAAAAAP/6AAQAAAC7AAAAvwAGAAYAAP////oABQAAAL8AAADFAAYABgAA////+gAGAAAAxQAA +AMwABgAGAAD////6AAUAAADMAAAA0gAGAAYAAP////oABQAAANIAAADYAAYABgAA////+gAGAAAA +2AAAAN8ABgAGAAAAAP/6AAUAAADfAAAA5AAGAAYAAP////oABQAAAOQAAADqAAYABgAAAAD/+gAF +AAEA6gAAAO8ABwAGAAD////6AAYAAADvAAAA9gAGAAYAAAAA//oABQAAAPYAAAD7AAYABgAA//// ++gAFAAAA+wAAAQEABgAGAAD////6AAYAAAEBAAABCAAGAAYAAP////oABgAAAQgAAAEPAAYABgAA +////+gAGAAABDwAAARYABgAGAAAAAP/6AAYAAAEWAAABHAAGAAYAAP////oABgAAARwAAAEjAAYA +BgAAAAD/+gAFAAABIwAAASgABgAGAAAAAf/5AAQAAQEoAAABKwAIAAYAAAAA//kABAABASsAAAEv +AAgABgAAAAH/+QAEAAEBLwAAATIACAAGAAAAAP/5AAX//AEyAAABNwADAAYAAAAAAAEABgACATcA +AAE9AAEABgAAAAH/+QAE//wBPQAAAUAAAwAGAAAAAP/7AAYAAAFAAAABRgAFAAYAAP////kABQAA +AUYAAAFMAAcABgAAAAD/+wAFAAABTAAAAVEABQAGAAAAAP/5AAYAAAFRAAABVwAHAAYAAAAA//sA +BQAAAVcAAAFcAAUABgAAAAD/+QAFAAABXAAAAWEABwAGAAAAAP/7AAYAAgFhAAABZwAHAAYAAP// +//kABQAAAWcAAAFtAAcABgAAAAD/+QAGAAABbQAAAXMABwAGAAAAAP/5AAQAAgFzAAABdwAJAAYA +AP////kABgAAAXcAAAF+AAcABgAAAAD/+QAGAAABfgAAAYQABwAGAAD////7AAUAAAGEAAABigAF +AAYAAP////sABQAAAYoAAAGQAAUABgAAAAD/+wAFAAABkAAAAZUABQAGAAD////7AAUAAgGVAAAB +mwAHAAYAAAAA//sABgACAZsAAAGhAAcABgAAAAD/+wAGAAABoQAAAacABQAGAAAAAP/7AAYAAAGn +AAABrQAFAAYAAAAA//kABgAAAa0AAAGzAAcABgAA////+wAGAAABswAAAboABQAGAAD////7AAUA +AAG6AAABwAAFAAYAAP////sABgAAAcAAAAHHAAUABgAAAAD/+wAGAAABxwAAAc0ABQAGAAD////7 +AAYAAgHNAAAB1AAHAAYAAAAA//sABQAAAdQAAAHZAAUABgAAAAH/+QAFAAEB2QAAAd0ACAAGAAAA +Av/6AAMAAQHdAAAB3gAHAAYAAAAA//kABAABAd4AAAHiAAgABgAAAAD/+wAF//0B4gAAAecAAgAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAB +//sAAwACAecAAAHpAAcABgAAAAD/+QAFAAEB6QAAAe4ACAAGAAAAAP/5AAYAAAHuAAAB9AAHAAYA +AAAA//oABf//AfQAAAH5AAUABgAAAAD/+QAGAAAB+QAAAf8ABwAGAAAAAv/5AAMAAgH/AAACAAAJ +AAYAAAAA//kABQABAgAAAAIFAAgABgAAAAH/+gAE//sCBQAAAggAAQAGAAAAAP/5AAYAAAIIAAAC +DgAHAAYAAAAB//kABf/+Ag4AAAISAAUABgAA////+wAGAAACEgAAAhkABQAGAAAAAP/7AAX//gIZ +AAACHgADAAYAAAAA//wABf/9Ah4AAAIjAAEABgAAAAD/+QAHAAACIwAAAioABwAGAAAAAP/6AAT/ ++wIqAAACLgABAAYAAAAA//kABP/8Ai4AAAIyAAMABgAAAAD/+gAFAAACMgAAAjcABgAGAAAAAf/5 +AAT//QI3AAACOgAEAAYAAAAB//kABP/9AjoAAAI9AAQABgAAAAL/+QAE//sCPQAAAj8AAgAGAAD/ +///7AAYAAgI/AAACRgAHAAYAAAAA//kABgABAkYAAAJMAAgABgAAAAH//AAD//0CTAAAAk4AAQAG +AAAAAf//AAQAAgJOAAACUQADAAYAAAAB//kABP/9AlEAAAJUAAQABgAAAAH/+QAF//4CVAAAAlgA +BQAGAAD////7AAYAAAJYAAACXwAFAAYAAP////kABgAAAl8AAAJmAAcABgAA////+QAGAAACZgAA +Am0ABwAGAAD////5AAYAAAJtAAACdAAHAAYAAAAA//sABQACAnQAAAJ5AAcABgAA////9wAGAAAC +eQAAAoAACQAGAAD////3AAYAAAKAAAAChwAJAAYAAP////cABgAAAocAAAKOAAkABgAA////9wAG +AAACjgAAApUACQAGAAD////4AAYAAAKVAAACnAAIAAYAAP////cABgAAApwAAAKjAAkABgAA//// ++gAGAAACowAAAqoABgAGAAAAAP/6AAUAAgKqAAACrwAIAAYAAP////cABQAAAq8AAAK1AAkABgAA +////9wAFAAACtQAAArsACQAGAAD////3AAUAAAK7AAACwQAJAAYAAP////gABQAAAsEAAALHAAgA +BgAAAAD/9wAEAAACxwAAAssACQAGAAAAAP/3AAQAAALLAAACzwAJAAYAAAAA//cABAAAAs8AAALT +AAkABgAAAAD/+AAEAAAC0wAAAtcACAAGAAD////6AAUAAALXAAAC3QAGAAYAAP////cABgAAAt0A +AALkAAkABgAAAAD/9wAFAAAC5AAAAukACQAGAAAAAP/3AAUAAALpAAAC7gAJAAYAAAAA//cABQAA +Au4AAALzAAkABgAAAAD/9wAFAAAC8wAAAvgACQAGAAAAAP/4AAUAAAL4AAAC/QAIAAYAAAAA//oA +Bf//Av0AAAMCAAUABgAA////+gAGAAADAgAAAwkABgAGAAD////3AAYAAAMJAAADEAAJAAYAAP// +//cABgAAAxAAAAMXAAkABgAA////9wAGAAADFwAAAx4ACQAGAAD////4AAYAAAAAAAoABwASAAYA +AP////cABgAAAAcACgAOABMABgAA////+gAFAAAADgAKABQAEAAGAAD////6AAYAAAAUAAoAGwAQ +AAYAAAAA//gABgAAABsACgAhABIABgAAAAD/+AAGAAAAIQAKACcAEgAGAAAAAP/4AAYAAAAnAAoA +LQASAAYAAAAA//gABgAAAC0ACgAzABIABgAAAAD/+QAGAAAAMwAKADkAEQAGAAAAAP/3AAYAAAA5 +AAoAPwATAAYAAP////sABQAAAD8ACgBFAA8ABgAAAAD/+wAFAAIARQAKAEoAEQAGAAAAAP/4AAUA +AABKAAoATwASAAYAAAAA//gABQAAAE8ACgBUABIABgAAAAD/+AAFAAAAVAAKAFkAEgAGAAAAAP/5 +AAUAAABZAAoAXgARAAYAAAAA//gABgAAAF4ACgBkABIABgAAAAD/+AAGAAAAZAAKAGoAEgAGAAAA +AP/4AAYAAABqAAoAcAASAAYAAAAA//kABgAAAHAACgB2ABEABgAAAAD/+AAFAAAAdgAKAHsAEgAG +AAD////4AAYAAAB7AAoAggASAAYAAAAA//gABQAAAIIACgCHABIABgAAAAD/+AAFAAAAhwAKAIwA +EgAGAAAAAP/4AAUAAACMAAoAkQASAAYAAAAA//gABQAAAJEACgCWABIABgAAAAD/+QAFAAAAlgAK +AJsAEQAGAAAAAP/6AAX//wCbAAoAoAAPAAYAAAAA//oABQABAKAACgClABEABgAA////+AAGAAAA +pQAKAKwAEgAGAAD////4AAYAAACsAAoAswASAAYAAP////gABgAAALMACgC6ABIABgAA////+QAG +AAAAugAKAMEAEQAGAAD////4AAYAAgDBAAoAyAAUAAYAAP////kABQACAMgACgDOABMABgAA//// ++QAGAAIAzgAKANUAEw== +""" + ) + ), + Image.open( + BytesIO( + base64.b64decode( + b""" +iVBORw0KGgoAAAANSUhEUgAAAx4AAAAUAQAAAAArMtZoAAAEwElEQVR4nABlAJr/AHVE4czCI/4u +Mc4b7vuds/xzjz5/3/7u/n9vMe7vnfH/9++vPn/xyf5zhxzjt8GHw8+2d83u8x27199/nxuQ6Od9 +M43/5z2I+9n9ZtmDBwMQECDRQw/eQIQohJXxpBCNVE6QCCAAAAD//wBlAJr/AgALyj1t/wINwq0g +LeNZUworuN1cjTPIzrTX6ofHWeo3v336qPzfEwRmBnHTtf95/fglZK5N0PDgfRTslpGBvz7LFc4F +IUXBWQGjQ5MGCx34EDFPwXiY4YbYxavpnhHFrk14CDAAAAD//wBlAJr/AgKqRooH2gAgPeggvUAA +Bu2WfgPoAwzRAABAAAAAAACQgLz/3Uv4Gv+gX7BJgDeeGP6AAAD1NMDzKHD7ANWr3loYbxsAD791 +NAADfcoIDyP44K/jv4Y63/Z+t98Ovt+ub4T48LAAAAD//wBlAJr/AuplMlADJAAAAGuAphWpqhMx +in0A/fRvAYBABPgBwBUgABBQ/sYAyv9g0bCHgOLoGAAAAAAAREAAwI7nr0ArYpow7aX8//9LaP/9 +SjdavWA8ePHeBIKB//81/83ndznOaXx379wAAAD//wBlAJr/AqDxW+D3AABAAbUh/QMnbQag/gAY +AYDAAACgtgD/gOqAAAB5IA/8AAAk+n9w0AAA8AAAmFRJuPo27ciC0cD5oeW4E7KA/wD3ECMAn2tt +y8PgwH8AfAxFzC0JzeAMtratAsC/ffwAAAD//wBlAJr/BGKAyCAA4AAAAvgeYTAwHd1kmQF5chkG +ABoMIHcL5xVpTfQbUqzlAAAErwAQBgAAEOClA5D9il08AEh/tUzdCBsXkbgACED+woQg8Si9VeqY +lODCn7lmF6NhnAEYgAAA/NMIAAAAAAD//2JgjLZgVGBg5Pv/Tvpc8hwGBjYGJADjHDrAwPzAjv/H +/Wf3PzCwtzcwHmBgYGcwbZz8wHaCAQMDOwMDQ8MCBgYOC3W7mp+f0w+wHOYxO3OG+e376hsMZjk3 +AAAAAP//YmCMY2A4wMAIN5e5gQETPD6AZisDAwMDgzSDAAPjByiHcQMDAwMDg1nOze1lByRu5/47 +c4859311AYNZzg0AAAAA//9iYGDBYihOIIMuwIjGL39/fwffA8b//xv/P2BPtzzHwCBjUQAAAAD/ +/yLFBrIBAAAA//9i1HhcwdhizX7u8NZNzyLbvT97bfrMf/QHI8evOwcSqGUJAAAA//9iYBB81iSw +pEE170Qrg5MIYydHqwdDQRMrAwcVrQAAAAD//2J4x7j9AAMDn8Q/BgYLBoaiAwwMjPdvMDBYM1Tv +oJodAAAAAP//Yqo/83+dxePWlxl3npsel9lvLfPcqlE9725C+acfVLMEAAAA//9i+s9gwCoaaGMR +evta/58PTEWzr21hufPjA8N+qlnBwAAAAAD//2JiWLci5v1+HmFXDqcnULE/MxgYGBj+f6CaJQAA +AAD//2Ji2FrkY3iYpYC5qDeGgeEMAwPDvwQBBoYvcTwOVLMEAAAA//9isDBgkP///0EOg9z35v// +Gc/eeW7BwPj5+QGZhANUswMAAAD//2JgqGBgYGBgqEMXlvhMPUsAAAAA//8iYDd1AAAAAP//AwDR +w7IkEbzhVQAAAABJRU5ErkJggg== +""" + ) + ) + ), + ) + return f + + def load_default(size: float | None = None) -> FreeTypeFont | ImageFont: """If FreeType support is available, load a version of Aileron Regular, https://dotcolon.net/font/aileron, with a more limited character set. @@ -882,7 +1018,7 @@ def load_default(size: float | None = None) -> FreeTypeFont | ImageFont: :return: A font object. """ if core.__class__.__name__ == "module" or size is not None: - f = truetype( + return truetype( BytesIO( base64.b64decode( b""" @@ -1112,137 +1248,4 @@ AAAAAAQAAAADa3tfFAAAAANAan9kAAAAA4QodoQ== 10 if size is None else size, layout_engine=Layout.BASIC, ) - else: - f = ImageFont() - f._load_pilfont_data( - # courB08 - BytesIO( - base64.b64decode( - b""" -UElMZm9udAo7Ozs7OzsxMDsKREFUQQoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAA//8AAQAAAAAAAAABAAEA -BgAAAAH/+gADAAAAAQAAAAMABgAGAAAAAf/6AAT//QADAAAABgADAAYAAAAA//kABQABAAYAAAAL -AAgABgAAAAD/+AAFAAEACwAAABAACQAGAAAAAP/5AAUAAAAQAAAAFQAHAAYAAP////oABQAAABUA -AAAbAAYABgAAAAH/+QAE//wAGwAAAB4AAwAGAAAAAf/5AAQAAQAeAAAAIQAIAAYAAAAB//kABAAB -ACEAAAAkAAgABgAAAAD/+QAE//0AJAAAACgABAAGAAAAAP/6AAX//wAoAAAALQAFAAYAAAAB//8A -BAACAC0AAAAwAAMABgAAAAD//AAF//0AMAAAADUAAQAGAAAAAf//AAMAAAA1AAAANwABAAYAAAAB -//kABQABADcAAAA7AAgABgAAAAD/+QAFAAAAOwAAAEAABwAGAAAAAP/5AAYAAABAAAAARgAHAAYA -AAAA//kABQAAAEYAAABLAAcABgAAAAD/+QAFAAAASwAAAFAABwAGAAAAAP/5AAYAAABQAAAAVgAH -AAYAAAAA//kABQAAAFYAAABbAAcABgAAAAD/+QAFAAAAWwAAAGAABwAGAAAAAP/5AAUAAABgAAAA -ZQAHAAYAAAAA//kABQAAAGUAAABqAAcABgAAAAD/+QAFAAAAagAAAG8ABwAGAAAAAf/8AAMAAABv -AAAAcQAEAAYAAAAA//wAAwACAHEAAAB0AAYABgAAAAD/+gAE//8AdAAAAHgABQAGAAAAAP/7AAT/ -/gB4AAAAfAADAAYAAAAB//oABf//AHwAAACAAAUABgAAAAD/+gAFAAAAgAAAAIUABgAGAAAAAP/5 -AAYAAQCFAAAAiwAIAAYAAP////oABgAAAIsAAACSAAYABgAA////+gAFAAAAkgAAAJgABgAGAAAA -AP/6AAUAAACYAAAAnQAGAAYAAP////oABQAAAJ0AAACjAAYABgAA////+gAFAAAAowAAAKkABgAG -AAD////6AAUAAACpAAAArwAGAAYAAAAA//oABQAAAK8AAAC0AAYABgAA////+gAGAAAAtAAAALsA -BgAGAAAAAP/6AAQAAAC7AAAAvwAGAAYAAP////oABQAAAL8AAADFAAYABgAA////+gAGAAAAxQAA -AMwABgAGAAD////6AAUAAADMAAAA0gAGAAYAAP////oABQAAANIAAADYAAYABgAA////+gAGAAAA -2AAAAN8ABgAGAAAAAP/6AAUAAADfAAAA5AAGAAYAAP////oABQAAAOQAAADqAAYABgAAAAD/+gAF -AAEA6gAAAO8ABwAGAAD////6AAYAAADvAAAA9gAGAAYAAAAA//oABQAAAPYAAAD7AAYABgAA//// -+gAFAAAA+wAAAQEABgAGAAD////6AAYAAAEBAAABCAAGAAYAAP////oABgAAAQgAAAEPAAYABgAA -////+gAGAAABDwAAARYABgAGAAAAAP/6AAYAAAEWAAABHAAGAAYAAP////oABgAAARwAAAEjAAYA -BgAAAAD/+gAFAAABIwAAASgABgAGAAAAAf/5AAQAAQEoAAABKwAIAAYAAAAA//kABAABASsAAAEv -AAgABgAAAAH/+QAEAAEBLwAAATIACAAGAAAAAP/5AAX//AEyAAABNwADAAYAAAAAAAEABgACATcA -AAE9AAEABgAAAAH/+QAE//wBPQAAAUAAAwAGAAAAAP/7AAYAAAFAAAABRgAFAAYAAP////kABQAA -AUYAAAFMAAcABgAAAAD/+wAFAAABTAAAAVEABQAGAAAAAP/5AAYAAAFRAAABVwAHAAYAAAAA//sA -BQAAAVcAAAFcAAUABgAAAAD/+QAFAAABXAAAAWEABwAGAAAAAP/7AAYAAgFhAAABZwAHAAYAAP// -//kABQAAAWcAAAFtAAcABgAAAAD/+QAGAAABbQAAAXMABwAGAAAAAP/5AAQAAgFzAAABdwAJAAYA -AP////kABgAAAXcAAAF+AAcABgAAAAD/+QAGAAABfgAAAYQABwAGAAD////7AAUAAAGEAAABigAF -AAYAAP////sABQAAAYoAAAGQAAUABgAAAAD/+wAFAAABkAAAAZUABQAGAAD////7AAUAAgGVAAAB -mwAHAAYAAAAA//sABgACAZsAAAGhAAcABgAAAAD/+wAGAAABoQAAAacABQAGAAAAAP/7AAYAAAGn -AAABrQAFAAYAAAAA//kABgAAAa0AAAGzAAcABgAA////+wAGAAABswAAAboABQAGAAD////7AAUA -AAG6AAABwAAFAAYAAP////sABgAAAcAAAAHHAAUABgAAAAD/+wAGAAABxwAAAc0ABQAGAAD////7 -AAYAAgHNAAAB1AAHAAYAAAAA//sABQAAAdQAAAHZAAUABgAAAAH/+QAFAAEB2QAAAd0ACAAGAAAA -Av/6AAMAAQHdAAAB3gAHAAYAAAAA//kABAABAd4AAAHiAAgABgAAAAD/+wAF//0B4gAAAecAAgAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAB -//sAAwACAecAAAHpAAcABgAAAAD/+QAFAAEB6QAAAe4ACAAGAAAAAP/5AAYAAAHuAAAB9AAHAAYA -AAAA//oABf//AfQAAAH5AAUABgAAAAD/+QAGAAAB+QAAAf8ABwAGAAAAAv/5AAMAAgH/AAACAAAJ -AAYAAAAA//kABQABAgAAAAIFAAgABgAAAAH/+gAE//sCBQAAAggAAQAGAAAAAP/5AAYAAAIIAAAC -DgAHAAYAAAAB//kABf/+Ag4AAAISAAUABgAA////+wAGAAACEgAAAhkABQAGAAAAAP/7AAX//gIZ -AAACHgADAAYAAAAA//wABf/9Ah4AAAIjAAEABgAAAAD/+QAHAAACIwAAAioABwAGAAAAAP/6AAT/ -+wIqAAACLgABAAYAAAAA//kABP/8Ai4AAAIyAAMABgAAAAD/+gAFAAACMgAAAjcABgAGAAAAAf/5 -AAT//QI3AAACOgAEAAYAAAAB//kABP/9AjoAAAI9AAQABgAAAAL/+QAE//sCPQAAAj8AAgAGAAD/ -///7AAYAAgI/AAACRgAHAAYAAAAA//kABgABAkYAAAJMAAgABgAAAAH//AAD//0CTAAAAk4AAQAG -AAAAAf//AAQAAgJOAAACUQADAAYAAAAB//kABP/9AlEAAAJUAAQABgAAAAH/+QAF//4CVAAAAlgA -BQAGAAD////7AAYAAAJYAAACXwAFAAYAAP////kABgAAAl8AAAJmAAcABgAA////+QAGAAACZgAA -Am0ABwAGAAD////5AAYAAAJtAAACdAAHAAYAAAAA//sABQACAnQAAAJ5AAcABgAA////9wAGAAAC -eQAAAoAACQAGAAD////3AAYAAAKAAAAChwAJAAYAAP////cABgAAAocAAAKOAAkABgAA////9wAG -AAACjgAAApUACQAGAAD////4AAYAAAKVAAACnAAIAAYAAP////cABgAAApwAAAKjAAkABgAA//// -+gAGAAACowAAAqoABgAGAAAAAP/6AAUAAgKqAAACrwAIAAYAAP////cABQAAAq8AAAK1AAkABgAA -////9wAFAAACtQAAArsACQAGAAD////3AAUAAAK7AAACwQAJAAYAAP////gABQAAAsEAAALHAAgA -BgAAAAD/9wAEAAACxwAAAssACQAGAAAAAP/3AAQAAALLAAACzwAJAAYAAAAA//cABAAAAs8AAALT -AAkABgAAAAD/+AAEAAAC0wAAAtcACAAGAAD////6AAUAAALXAAAC3QAGAAYAAP////cABgAAAt0A -AALkAAkABgAAAAD/9wAFAAAC5AAAAukACQAGAAAAAP/3AAUAAALpAAAC7gAJAAYAAAAA//cABQAA -Au4AAALzAAkABgAAAAD/9wAFAAAC8wAAAvgACQAGAAAAAP/4AAUAAAL4AAAC/QAIAAYAAAAA//oA -Bf//Av0AAAMCAAUABgAA////+gAGAAADAgAAAwkABgAGAAD////3AAYAAAMJAAADEAAJAAYAAP// -//cABgAAAxAAAAMXAAkABgAA////9wAGAAADFwAAAx4ACQAGAAD////4AAYAAAAAAAoABwASAAYA -AP////cABgAAAAcACgAOABMABgAA////+gAFAAAADgAKABQAEAAGAAD////6AAYAAAAUAAoAGwAQ -AAYAAAAA//gABgAAABsACgAhABIABgAAAAD/+AAGAAAAIQAKACcAEgAGAAAAAP/4AAYAAAAnAAoA -LQASAAYAAAAA//gABgAAAC0ACgAzABIABgAAAAD/+QAGAAAAMwAKADkAEQAGAAAAAP/3AAYAAAA5 -AAoAPwATAAYAAP////sABQAAAD8ACgBFAA8ABgAAAAD/+wAFAAIARQAKAEoAEQAGAAAAAP/4AAUA -AABKAAoATwASAAYAAAAA//gABQAAAE8ACgBUABIABgAAAAD/+AAFAAAAVAAKAFkAEgAGAAAAAP/5 -AAUAAABZAAoAXgARAAYAAAAA//gABgAAAF4ACgBkABIABgAAAAD/+AAGAAAAZAAKAGoAEgAGAAAA -AP/4AAYAAABqAAoAcAASAAYAAAAA//kABgAAAHAACgB2ABEABgAAAAD/+AAFAAAAdgAKAHsAEgAG -AAD////4AAYAAAB7AAoAggASAAYAAAAA//gABQAAAIIACgCHABIABgAAAAD/+AAFAAAAhwAKAIwA -EgAGAAAAAP/4AAUAAACMAAoAkQASAAYAAAAA//gABQAAAJEACgCWABIABgAAAAD/+QAFAAAAlgAK -AJsAEQAGAAAAAP/6AAX//wCbAAoAoAAPAAYAAAAA//oABQABAKAACgClABEABgAA////+AAGAAAA -pQAKAKwAEgAGAAD////4AAYAAACsAAoAswASAAYAAP////gABgAAALMACgC6ABIABgAA////+QAG -AAAAugAKAMEAEQAGAAD////4AAYAAgDBAAoAyAAUAAYAAP////kABQACAMgACgDOABMABgAA//// -+QAGAAIAzgAKANUAEw== -""" - ) - ), - Image.open( - BytesIO( - base64.b64decode( - b""" -iVBORw0KGgoAAAANSUhEUgAAAx4AAAAUAQAAAAArMtZoAAAEwElEQVR4nABlAJr/AHVE4czCI/4u -Mc4b7vuds/xzjz5/3/7u/n9vMe7vnfH/9++vPn/xyf5zhxzjt8GHw8+2d83u8x27199/nxuQ6Od9 -M43/5z2I+9n9ZtmDBwMQECDRQw/eQIQohJXxpBCNVE6QCCAAAAD//wBlAJr/AgALyj1t/wINwq0g -LeNZUworuN1cjTPIzrTX6ofHWeo3v336qPzfEwRmBnHTtf95/fglZK5N0PDgfRTslpGBvz7LFc4F -IUXBWQGjQ5MGCx34EDFPwXiY4YbYxavpnhHFrk14CDAAAAD//wBlAJr/AgKqRooH2gAgPeggvUAA -Bu2WfgPoAwzRAABAAAAAAACQgLz/3Uv4Gv+gX7BJgDeeGP6AAAD1NMDzKHD7ANWr3loYbxsAD791 -NAADfcoIDyP44K/jv4Y63/Z+t98Ovt+ub4T48LAAAAD//wBlAJr/AuplMlADJAAAAGuAphWpqhMx -in0A/fRvAYBABPgBwBUgABBQ/sYAyv9g0bCHgOLoGAAAAAAAREAAwI7nr0ArYpow7aX8//9LaP/9 -SjdavWA8ePHeBIKB//81/83ndznOaXx379wAAAD//wBlAJr/AqDxW+D3AABAAbUh/QMnbQag/gAY -AYDAAACgtgD/gOqAAAB5IA/8AAAk+n9w0AAA8AAAmFRJuPo27ciC0cD5oeW4E7KA/wD3ECMAn2tt -y8PgwH8AfAxFzC0JzeAMtratAsC/ffwAAAD//wBlAJr/BGKAyCAA4AAAAvgeYTAwHd1kmQF5chkG -ABoMIHcL5xVpTfQbUqzlAAAErwAQBgAAEOClA5D9il08AEh/tUzdCBsXkbgACED+woQg8Si9VeqY -lODCn7lmF6NhnAEYgAAA/NMIAAAAAAD//2JgjLZgVGBg5Pv/Tvpc8hwGBjYGJADjHDrAwPzAjv/H -/Wf3PzCwtzcwHmBgYGcwbZz8wHaCAQMDOwMDQ8MCBgYOC3W7mp+f0w+wHOYxO3OG+e376hsMZjk3 -AAAAAP//YmCMY2A4wMAIN5e5gQETPD6AZisDAwMDgzSDAAPjByiHcQMDAwMDg1nOze1lByRu5/47 -c4859311AYNZzg0AAAAA//9iYGDBYihOIIMuwIjGL39/fwffA8b//xv/P2BPtzzHwCBjUQAAAAD/ -/yLFBrIBAAAA//9i1HhcwdhizX7u8NZNzyLbvT97bfrMf/QHI8evOwcSqGUJAAAA//9iYBB81iSw -pEE170Qrg5MIYydHqwdDQRMrAwcVrQAAAAD//2J4x7j9AAMDn8Q/BgYLBoaiAwwMjPdvMDBYM1Tv -oJodAAAAAP//Yqo/83+dxePWlxl3npsel9lvLfPcqlE9725C+acfVLMEAAAA//9i+s9gwCoaaGMR -evta/58PTEWzr21hufPjA8N+qlnBwAAAAAD//2JiWLci5v1+HmFXDqcnULE/MxgYGBj+f6CaJQAA -AAD//2Ji2FrkY3iYpYC5qDeGgeEMAwPDvwQBBoYvcTwOVLMEAAAA//9isDBgkP///0EOg9z35v// -Gc/eeW7BwPj5+QGZhANUswMAAAD//2JgqGBgYGBgqEMXlvhMPUsAAAAA//8iYDd1AAAAAP//AwDR -w7IkEbzhVQAAAABJRU5ErkJggg== -""" - ) - ) - ), - ) - return f + return load_default_imagefont() From f34360d1e3c8f29f1a0b0ccae62b5f7c95700440 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 27 May 2024 18:09:46 +1000 Subject: [PATCH 016/662] When saving multiple frames, convert to mode rather than raw mode --- Tests/test_file_png.py | 5 +++-- src/PIL/PngImagePlugin.py | 17 +++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py index 19462dcb5..55db5ef85 100644 --- a/Tests/test_file_png.py +++ b/Tests/test_file_png.py @@ -655,11 +655,12 @@ class TestFilePng: png.call(cid, 0, 0) ImageFile.LOAD_TRUNCATED_IMAGES = False - def test_specify_bits(self, tmp_path: Path) -> None: + @pytest.mark.parametrize("save_all", (True, False)) + def test_specify_bits(self, save_all: bool, tmp_path: Path) -> None: im = hopper("P") out = str(tmp_path / "temp.png") - im.save(out, bits=4) + im.save(out, bits=4, save_all=save_all) with Image.open(out) as reloaded: assert len(reloaded.png.im_palette[1]) == 48 diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 0d5751962..6b6c01d1b 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -1104,7 +1104,7 @@ class _fdat: self.seq_num += 1 -def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images): +def _write_multiple_frames(im, fp, chunk, mode, rawmode, default_image, append_images): duration = im.encoderinfo.get("duration", im.info.get("duration", 0)) loop = im.encoderinfo.get("loop", im.info.get("loop", 0)) disposal = im.encoderinfo.get("disposal", im.info.get("disposal", Disposal.OP_NONE)) @@ -1119,10 +1119,10 @@ def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images) frame_count = 0 for im_seq in chain: for im_frame in ImageSequence.Iterator(im_seq): - if im_frame.mode == rawmode: + if im_frame.mode == mode: im_frame = im_frame.copy() else: - im_frame = im_frame.convert(rawmode) + im_frame = im_frame.convert(mode) encoderinfo = im.encoderinfo.copy() if isinstance(duration, (list, tuple)): encoderinfo["duration"] = duration[frame_count] @@ -1184,8 +1184,8 @@ def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images) # default image IDAT (if it exists) if default_image: - if im.mode != rawmode: - im = im.convert(rawmode) + if im.mode != mode: + im = im.convert(mode) ImageFile._save(im, _idat(fp, chunk), [("zip", (0, 0) + im.size, 0, rawmode)]) seq_num = 0 @@ -1262,6 +1262,7 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False): size = im.size mode = im.mode + outmode = mode if mode == "P": # # attempt to minimize storage requirements for palette images @@ -1282,7 +1283,7 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False): bits = 2 else: bits = 4 - mode = f"{mode};{bits}" + outmode += f";{bits}" # encoder options im.encoderconfig = ( @@ -1294,7 +1295,7 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False): # get the corresponding PNG mode try: - rawmode, bit_depth, color_type = _OUTMODES[mode] + rawmode, bit_depth, color_type = _OUTMODES[outmode] except KeyError as e: msg = f"cannot write mode {mode} as PNG" raise OSError(msg) from e @@ -1415,7 +1416,7 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False): if save_all: im = _write_multiple_frames( - im, fp, chunk, rawmode, default_image, append_images + im, fp, chunk, mode, rawmode, default_image, append_images ) if im: ImageFile._save(im, _idat(fp, chunk), [("zip", (0, 0) + im.size, 0, rawmode)]) From 7f977f65229cd7037bfc4896fccc22b2c279d749 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 30 May 2024 09:10:28 +1000 Subject: [PATCH 017/662] Updated xz to 5.6.2 --- .github/workflows/wheels-dependencies.sh | 2 +- winbuild/build_prepare.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 0d45d5a20..0df3bf179 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -20,7 +20,7 @@ HARFBUZZ_VERSION=8.4.0 LIBPNG_VERSION=1.6.43 JPEGTURBO_VERSION=3.0.2 OPENJPEG_VERSION=2.5.2 -XZ_VERSION=5.4.5 +XZ_VERSION=5.6.2 TIFF_VERSION=4.6.0 LCMS2_VERSION=2.16 if [[ -n "$IS_MACOS" ]]; then diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 0d6da7754..1df8db17b 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -120,7 +120,7 @@ V = { "LIBWEBP": "1.3.2", "OPENJPEG": "2.5.2", "TIFF": "4.6.0", - "XZ": "5.4.5", + "XZ": "5.6.2", "ZLIB": "1.3.1", } V["LIBPNG_DOTLESS"] = V["LIBPNG"].replace(".", "") From e9c9f19c26c3a361c4fa17947b6b5d860e516c2c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 4 Jun 2024 18:46:35 +1000 Subject: [PATCH 018/662] Do not use first frame duration for other frames when saving --- Tests/test_file_apng.py | 15 +++++++++++++-- src/PIL/PngImagePlugin.py | 13 ++++++------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Tests/test_file_apng.py b/Tests/test_file_apng.py index 1b393a3ff..e95850212 100644 --- a/Tests/test_file_apng.py +++ b/Tests/test_file_apng.py @@ -706,10 +706,21 @@ def test_different_modes_in_later_frames( assert reloaded.mode == mode -def test_apng_repeated_seeks_give_correct_info() -> None: +def test_different_durations(tmp_path: Path) -> None: + test_file = str(tmp_path / "temp.png") + with Image.open("Tests/images/apng/different_durations.png") as im: - for i in range(3): + for _ in range(3): im.seek(0) assert im.info["duration"] == 4000 + im.seek(1) assert im.info["duration"] == 1000 + + im.save(test_file, save_all=True) + + with Image.open(test_file) as reloaded: + assert reloaded.info["duration"] == 4000 + + reloaded.seek(1) + assert reloaded.info["duration"] == 1000 diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 0d5751962..dde45e587 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -1105,7 +1105,7 @@ class _fdat: def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images): - duration = im.encoderinfo.get("duration", im.info.get("duration", 0)) + duration = im.encoderinfo.get("duration") loop = im.encoderinfo.get("loop", im.info.get("loop", 0)) disposal = im.encoderinfo.get("disposal", im.info.get("disposal", Disposal.OP_NONE)) blend = im.encoderinfo.get("blend", im.info.get("blend", Blend.OP_SOURCE)) @@ -1126,6 +1126,8 @@ def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images) encoderinfo = im.encoderinfo.copy() if isinstance(duration, (list, tuple)): encoderinfo["duration"] = duration[frame_count] + elif duration is None and "duration" in im_frame.info: + encoderinfo["duration"] = im_frame.info["duration"] if isinstance(disposal, (list, tuple)): encoderinfo["disposal"] = disposal[frame_count] if isinstance(blend, (list, tuple)): @@ -1160,15 +1162,12 @@ def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images) not bbox and prev_disposal == encoderinfo.get("disposal") and prev_blend == encoderinfo.get("blend") + and "duration" in encoderinfo ): - previous["encoderinfo"]["duration"] += encoderinfo.get( - "duration", duration - ) + previous["encoderinfo"]["duration"] += encoderinfo["duration"] continue else: bbox = None - if "duration" not in encoderinfo: - encoderinfo["duration"] = duration im_frames.append({"im": im_frame, "bbox": bbox, "encoderinfo": encoderinfo}) if len(im_frames) == 1 and not default_image: @@ -1198,7 +1197,7 @@ def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images) im_frame = im_frame.crop(bbox) size = im_frame.size encoderinfo = frame_data["encoderinfo"] - frame_duration = int(round(encoderinfo["duration"])) + frame_duration = int(round(encoderinfo.get("duration", 0))) frame_disposal = encoderinfo.get("disposal", disposal) frame_blend = encoderinfo.get("blend", blend) # frame control From ac7967cfc0d554a494739891f468d8d3dd10595c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 7 Jun 2024 13:25:56 +1000 Subject: [PATCH 019/662] Do not preserve EXIFIFD tag by default --- Tests/test_file_libtiff.py | 13 +++++++++---- src/PIL/TiffImagePlugin.py | 12 ++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py index 22bcd2856..20c0bae92 100644 --- a/Tests/test_file_libtiff.py +++ b/Tests/test_file_libtiff.py @@ -685,13 +685,18 @@ class TestFileLibTiff(LibTiffTestCase): assert reloaded.tag_v2[530] == (1, 1) assert reloaded.tag_v2[532] == (0, 255, 128, 255, 128, 255) - def test_exif_ifd(self, tmp_path: Path) -> None: - outfile = str(tmp_path / "temp.tif") + def test_exif_ifd(self) -> None: + out = io.BytesIO() with Image.open("Tests/images/tiff_adobe_deflate.tif") as im: assert im.tag_v2[34665] == 125456 - im.save(outfile) + im.save(out, "TIFF") - with Image.open(outfile) as reloaded: + with Image.open(out) as reloaded: + assert 34665 not in reloaded.tag_v2 + + im.save(out, "TIFF", tiffinfo={34665: 125456}) + + with Image.open(out) as reloaded: if Image.core.libtiff_support_custom_tags: assert reloaded.tag_v2[34665] == 125456 diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 04f36744b..ab5934816 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1816,11 +1816,15 @@ def _save(im, fp, filename): if hasattr(im, "tag"): legacy_ifd = im.tag.to_v2() - # SAMPLEFORMAT is determined by the image format and should not be copied - # from legacy_ifd. supplied_tags = {**getattr(im, "tag_v2", {}), **legacy_ifd} - if SAMPLEFORMAT in supplied_tags: - del supplied_tags[SAMPLEFORMAT] + for tag in ( + # IFD offset that may not be correct in the saved image + EXIFIFD, + # Determined by the image format and should not be copied from legacy_ifd. + SAMPLEFORMAT, + ): + if tag in supplied_tags: + del supplied_tags[tag] for tag, value in itertools.chain(ifd.items(), supplied_tags.items()): # Libtiff can only process certain core items without adding From 08b5a2e9a7d290f4cd2cfb35dd556d50145a7dea Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 8 Jun 2024 14:35:10 +1000 Subject: [PATCH 020/662] Corrected using a 1 mode mask with I;16* images --- Tests/images/imagedraw_polygon_width_I.tiff | Bin 0 -> 20122 bytes Tests/test_imagedraw.py | 13 ++++++++++ src/libImaging/Paste.c | 26 +++++++++++++++++--- 3 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 Tests/images/imagedraw_polygon_width_I.tiff diff --git a/Tests/images/imagedraw_polygon_width_I.tiff b/Tests/images/imagedraw_polygon_width_I.tiff new file mode 100644 index 0000000000000000000000000000000000000000..ce1917d61fe9f4a8d04e6d2bdf0cfd057c0d8e9d GIT binary patch literal 20122 zcmeI$K@Ng25QX8X7^6Gg=*ER>Z^Fh?cnU9%Ekk3GZXl3!nxDkjG==cKSJc?HPdSRn zNyP2N`O(|ITr%Fdrk_9i`DPf0b%$hp8P%4 DH7N{| literal 0 HcmV?d00001 diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py index c221fe008..505bba80c 100644 --- a/Tests/test_imagedraw.py +++ b/Tests/test_imagedraw.py @@ -631,6 +631,19 @@ def test_polygon(points: Coords) -> None: assert_image_equal_tofile(im, "Tests/images/imagedraw_polygon.png") +@pytest.mark.parametrize("points", POINTS) +def test_polygon_width_I16(points: Coords) -> None: + # Arrange + im = Image.new("I;16", (W, H)) + draw = ImageDraw.Draw(im) + + # Act + draw.polygon(points, outline=0xFFFF, width=2) + + # Assert + assert_image_equal_tofile(im, "Tests/images/imagedraw_polygon_width_I.tiff") + + @pytest.mark.parametrize("mode", ("RGB", "L")) @pytest.mark.parametrize("kite_points", KITE_POINTS) def test_polygon_kite( diff --git a/src/libImaging/Paste.c b/src/libImaging/Paste.c index a018225b2..dc67cb41d 100644 --- a/src/libImaging/Paste.c +++ b/src/libImaging/Paste.c @@ -65,15 +65,32 @@ paste_mask_1( int x, y; if (imOut->image8) { + int in_i16 = strncmp(imIn->mode, "I;16", 4) == 0; + int out_i16 = strncmp(imOut->mode, "I;16", 4) == 0; for (y = 0; y < ysize; y++) { UINT8 *out = imOut->image8[y + dy] + dx; + if (out_i16) { + out += dx; + } UINT8 *in = imIn->image8[y + sy] + sx; + if (in_i16) { + in += sx; + } UINT8 *mask = imMask->image8[y + sy] + sx; for (x = 0; x < xsize; x++) { - if (*mask++) { + if (*mask) { *out = *in; } - out++, in++; + if (in_i16) { + in++; + } + if (out_i16) { + out++; + if (*mask) { + *out = *in; + } + } + out++, in++, mask++; } } @@ -415,15 +432,16 @@ fill_mask_L( unsigned int tmp1; if (imOut->image8) { + int i16 = strncmp(imOut->mode, "I;16", 4) == 0; for (y = 0; y < ysize; y++) { UINT8 *out = imOut->image8[y + dy] + dx; - if (strncmp(imOut->mode, "I;16", 4) == 0) { + if (i16) { out += dx; } UINT8 *mask = imMask->image8[y + sy] + sx; for (x = 0; x < xsize; x++) { *out = BLEND(*mask, *out, ink[0], tmp1); - if (strncmp(imOut->mode, "I;16", 4) == 0) { + if (i16) { out++; *out = BLEND(*mask, *out, ink[1], tmp1); } From 0d73721c65d71e968a1a3b07d4252dd99b154772 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 8 Jun 2024 19:11:51 +1000 Subject: [PATCH 021/662] Allow float center for rotate operations --- src/PIL/Image.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 611d6960d..1e46c4ee4 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -2305,7 +2305,7 @@ class Image: angle: float, resample: Resampling = Resampling.NEAREST, expand: int | bool = False, - center: tuple[int, int] | None = None, + center: tuple[float, float] | None = None, translate: tuple[int, int] | None = None, fillcolor: float | tuple[float, ...] | str | None = None, ) -> Image: @@ -2373,10 +2373,7 @@ class Image: else: post_trans = translate if center is None: - # FIXME These should be rounded to ints? - rotn_center = (w / 2.0, h / 2.0) - else: - rotn_center = center + center = (w / 2, h / 2) angle = -math.radians(angle) matrix = [ @@ -2393,10 +2390,10 @@ class Image: return a * x + b * y + c, d * x + e * y + f matrix[2], matrix[5] = transform( - -rotn_center[0] - post_trans[0], -rotn_center[1] - post_trans[1], matrix + -center[0] - post_trans[0], -center[1] - post_trans[1], matrix ) - matrix[2] += rotn_center[0] - matrix[5] += rotn_center[1] + matrix[2] += center[0] + matrix[5] += center[1] if expand: # calculate output size From 1a14957c1954b18368a65bff06d8a959731d9e55 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 9 Jun 2024 15:16:17 +1000 Subject: [PATCH 022/662] Added type hints --- Tests/test_decompression_bomb.py | 2 +- Tests/test_file_jpeg.py | 17 ++++++++++------- Tests/test_file_tiff.py | 2 +- Tests/test_image_mode.py | 6 +++++- Tests/test_image_quantize.py | 2 +- Tests/test_image_reduce.py | 12 ++++++++---- Tests/test_image_thumbnail.py | 2 +- Tests/test_imagedraw.py | 6 +++++- Tests/test_imagefont.py | 2 +- Tests/test_imageops.py | 2 +- Tests/test_imagewin_pointers.py | 2 +- Tests/test_main.py | 2 +- 12 files changed, 36 insertions(+), 21 deletions(-) diff --git a/Tests/test_decompression_bomb.py b/Tests/test_decompression_bomb.py index 9c21efa45..c140156f9 100644 --- a/Tests/test_decompression_bomb.py +++ b/Tests/test_decompression_bomb.py @@ -12,7 +12,7 @@ ORIGINAL_LIMIT = Image.MAX_IMAGE_PIXELS class TestDecompressionBomb: - def teardown_method(self, method) -> None: + def teardown_method(self) -> None: Image.MAX_IMAGE_PIXELS = ORIGINAL_LIMIT def test_no_warning_small_file(self) -> None: diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index 18dc752d8..8e4d694c1 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -443,7 +443,9 @@ class TestFileJpeg: assert_image(im1, im2.mode, im2.size) def test_subsampling(self) -> None: - def getsampling(im: JpegImagePlugin.JpegImageFile): + def getsampling( + im: JpegImagePlugin.JpegImageFile, + ) -> tuple[int, int, int, int, int, int]: layer = im.layer return layer[0][1:3] + layer[1][1:3] + layer[2][1:3] @@ -917,24 +919,25 @@ class TestFileJpeg: with Image.open("Tests/images/icc-after-SOF.jpg") as im: assert im.info["icc_profile"] == b"profile" - def test_jpeg_magic_number(self) -> None: + def test_jpeg_magic_number(self, monkeypatch: pytest.MonkeyPatch) -> None: size = 4097 buffer = BytesIO(b"\xFF" * size) # Many xFF bytes - buffer.max_pos = 0 + max_pos = 0 orig_read = buffer.read - def read(n=-1): + def read(n: int | None = -1) -> bytes: + nonlocal max_pos res = orig_read(n) - buffer.max_pos = max(buffer.max_pos, buffer.tell()) + max_pos = max(max_pos, buffer.tell()) return res - buffer.read = read + monkeypatch.setattr(buffer, "read", read) with pytest.raises(UnidentifiedImageError): with Image.open(buffer): pass # Assert the entire file has not been read - assert 0 < buffer.max_pos < size + assert 0 < max_pos < size def test_getxmp(self) -> None: with Image.open("Tests/images/xmp_test.jpg") as im: diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 8821fb46a..06591a29a 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -113,7 +113,7 @@ class TestFileTiff: outfile = str(tmp_path / "temp.tif") im.save(outfile, save_all=True, append_images=[im], tiffinfo=im.tag_v2) - def test_seek_too_large(self): + def test_seek_too_large(self) -> None: with pytest.raises(ValueError, match="Unable to seek to frame"): Image.open("Tests/images/seek_too_large.tif") diff --git a/Tests/test_image_mode.py b/Tests/test_image_mode.py index 8e94aafc5..20d3a160e 100644 --- a/Tests/test_image_mode.py +++ b/Tests/test_image_mode.py @@ -68,7 +68,11 @@ def test_sanity() -> None: ), ) def test_properties( - mode, expected_base, expected_type, expected_bands, expected_band_names + mode: str, + expected_base: str, + expected_type: str, + expected_bands: int, + expected_band_names: tuple[str, ...], ) -> None: assert Image.getmodebase(mode) == expected_base assert Image.getmodetype(mode) == expected_type diff --git a/Tests/test_image_quantize.py b/Tests/test_image_quantize.py index 2daaf5c3c..2d461d985 100644 --- a/Tests/test_image_quantize.py +++ b/Tests/test_image_quantize.py @@ -98,7 +98,7 @@ def test_quantize_dither_diff() -> None: @pytest.mark.parametrize( "method", (Image.Quantize.MEDIANCUT, Image.Quantize.MAXCOVERAGE) ) -def test_quantize_kmeans(method) -> None: +def test_quantize_kmeans(method: Image.Quantize) -> None: im = hopper() no_kmeans = im.quantize(kmeans=0, method=method) kmeans = im.quantize(kmeans=1, method=method) diff --git a/Tests/test_image_reduce.py b/Tests/test_image_reduce.py index f6609a1a0..6771b46b0 100644 --- a/Tests/test_image_reduce.py +++ b/Tests/test_image_reduce.py @@ -56,10 +56,12 @@ def test_args_factor(size: int | tuple[int, int], expected: tuple[int, int]) -> @pytest.mark.parametrize( "size, expected_error", ((0, ValueError), (2.0, TypeError), ((0, 10), ValueError)) ) -def test_args_factor_error(size: float | tuple[int, int], expected_error) -> None: +def test_args_factor_error( + size: float | tuple[int, int], expected_error: type[Exception] +) -> None: im = Image.new("L", (10, 10)) with pytest.raises(expected_error): - im.reduce(size) + im.reduce(size) # type: ignore[arg-type] @pytest.mark.parametrize( @@ -86,10 +88,12 @@ def test_args_box(size: tuple[int, int, int, int], expected: tuple[int, int]) -> ((5, 0, 5, 10), ValueError), ), ) -def test_args_box_error(size: str | tuple[int, int, int, int], expected_error) -> None: +def test_args_box_error( + size: str | tuple[int, int, int, int], expected_error: type[Exception] +) -> None: im = Image.new("L", (10, 10)) with pytest.raises(expected_error): - im.reduce(2, size).size + im.reduce(2, size).size # type: ignore[arg-type] @pytest.mark.parametrize("mode", ("P", "1", "I;16")) diff --git a/Tests/test_image_thumbnail.py b/Tests/test_image_thumbnail.py index 1593eaaf7..1606d8939 100644 --- a/Tests/test_image_thumbnail.py +++ b/Tests/test_image_thumbnail.py @@ -16,7 +16,7 @@ from .helper import ( def test_sanity() -> None: im = hopper() - assert im.thumbnail((100, 100)) is None + assert im.thumbnail((100, 100)) is None # type: ignore[func-returns-value] assert im.size == (100, 100) diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py index c221fe008..51543d785 100644 --- a/Tests/test_imagedraw.py +++ b/Tests/test_imagedraw.py @@ -1562,7 +1562,11 @@ def test_compute_regular_polygon_vertices( ], ) def test_compute_regular_polygon_vertices_input_error_handling( - n_sides, bounding_circle, rotation, expected_error, error_message + n_sides: int, + bounding_circle: int | tuple[int | tuple[int] | str, ...], + rotation: int | str, + expected_error: type[Exception], + error_message: str, ) -> None: with pytest.raises(expected_error) as e: ImageDraw._compute_regular_polygon_vertices(bounding_circle, n_sides, rotation) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 4398f8a30..73cad513e 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -224,7 +224,7 @@ def test_render_multiline(font: ImageFont.FreeTypeFont) -> None: draw = ImageDraw.Draw(im) line_spacing = font.getbbox("A")[3] + 4 lines = TEST_TEXT.split("\n") - y = 0 + y: float = 0 for line in lines: draw.text((0, y), line, font=font) y += line_spacing diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py index d6bdaf450..27a6090c5 100644 --- a/Tests/test_imageops.py +++ b/Tests/test_imageops.py @@ -454,7 +454,7 @@ def test_autocontrast_cutoff() -> None: # Test the cutoff argument of autocontrast with Image.open("Tests/images/bw_gradient.png") as img: - def autocontrast(cutoff: int | tuple[int, int]): + def autocontrast(cutoff: int | tuple[int, int]) -> list[int]: return ImageOps.autocontrast(img, cutoff).histogram() assert autocontrast(10) == autocontrast((10, 10)) diff --git a/Tests/test_imagewin_pointers.py b/Tests/test_imagewin_pointers.py index f59ee7284..e6c312a0c 100644 --- a/Tests/test_imagewin_pointers.py +++ b/Tests/test_imagewin_pointers.py @@ -70,7 +70,7 @@ if is_win32(): ] CreateDIBSection.restype = ctypes.wintypes.HBITMAP - def serialize_dib(bi, pixels) -> bytearray: + def serialize_dib(bi: BITMAPINFOHEADER, pixels: ctypes.c_void_p) -> bytearray: bf = BITMAPFILEHEADER() bf.bfType = 0x4D42 bf.bfOffBits = ctypes.sizeof(bf) + bi.biSize diff --git a/Tests/test_main.py b/Tests/test_main.py index e9e12b24a..2582dbee3 100644 --- a/Tests/test_main.py +++ b/Tests/test_main.py @@ -11,7 +11,7 @@ import pytest "args, report", ((["PIL"], False), (["PIL", "--report"], True), (["PIL.report"], True)), ) -def test_main(args, report) -> None: +def test_main(args: list[str], report: bool) -> None: args = [sys.executable, "-m"] + args out = subprocess.check_output(args).decode("utf-8") lines = out.splitlines() From de0779eee876ae92c48458d38778a3c557566312 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Sun, 9 Jun 2024 18:09:54 +1000 Subject: [PATCH 023/662] Removed return value assertion --- Tests/test_image_thumbnail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_image_thumbnail.py b/Tests/test_image_thumbnail.py index 1606d8939..bdbf09c40 100644 --- a/Tests/test_image_thumbnail.py +++ b/Tests/test_image_thumbnail.py @@ -16,7 +16,7 @@ from .helper import ( def test_sanity() -> None: im = hopper() - assert im.thumbnail((100, 100)) is None # type: ignore[func-returns-value] + im.thumbnail((100, 100)) assert im.size == (100, 100) From e225f9f589e07d46ad5d1f79e7c233addf9c3836 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 10 Jun 2024 11:50:13 +1000 Subject: [PATCH 024/662] Deprecate ImageDraw.getdraw hints argument --- Tests/test_imagedraw.py | 5 +++++ docs/deprecations.rst | 7 +++++++ docs/releasenotes/10.4.0.rst | 5 +++++ src/PIL/ImageDraw.py | 24 ++++++++---------------- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py index c221fe008..61d7b5c6a 100644 --- a/Tests/test_imagedraw.py +++ b/Tests/test_imagedraw.py @@ -1624,3 +1624,8 @@ def test_incorrectly_ordered_coordinates(xy: tuple[int, int, int, int]) -> None: draw.rectangle(xy) with pytest.raises(ValueError): draw.rounded_rectangle(xy) + + +def test_getdraw(): + with pytest.warns(DeprecationWarning): + ImageDraw.getdraw(None, []) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index b2cd968fe..8a03d858c 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -115,6 +115,13 @@ Support for LibTIFF earlier than 4 Support for LibTIFF earlier than version 4 has been deprecated. Upgrade to a newer version of LibTIFF instead. +ImageDraw.getdraw hints argument +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 10.4.0 + +The ``hints`` argument in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecated. + Removed features ---------------- diff --git a/docs/releasenotes/10.4.0.rst b/docs/releasenotes/10.4.0.rst index e0d695a8b..8c49e0842 100644 --- a/docs/releasenotes/10.4.0.rst +++ b/docs/releasenotes/10.4.0.rst @@ -34,6 +34,11 @@ Support for LibTIFF earlier than 4 Support for LibTIFF earlier than version 4 has been deprecated. Upgrade to a newer version of LibTIFF instead. +ImageDraw.getdraw hints argument +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The ``hints`` argument in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecated. + API Changes =========== diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py index 73ed3d4a9..ec15b535f 100644 --- a/src/PIL/ImageDraw.py +++ b/src/PIL/ImageDraw.py @@ -37,6 +37,7 @@ import struct from typing import TYPE_CHECKING, AnyStr, Sequence, cast from . import Image, ImageColor +from ._deprecate import deprecate from ._typing import Coords """ @@ -902,26 +903,17 @@ except AttributeError: def getdraw(im=None, hints=None): """ - (Experimental) A more advanced 2D drawing interface for PIL images, - based on the WCK interface. - :param im: The image to draw in. - :param hints: An optional list of hints. + :param hints: An optional list of hints. Deprecated. :returns: A (drawing context, drawing resource factory) tuple. """ - # FIXME: this needs more work! - # FIXME: come up with a better 'hints' scheme. - handler = None - if not hints or "nicest" in hints: - try: - from . import _imagingagg as handler - except ImportError: - pass - if handler is None: - from . import ImageDraw2 as handler + if hints is not None: + deprecate("'hints' argument", 12) + from . import ImageDraw2 + if im: - im = handler.Draw(im) - return im, handler + im = ImageDraw2.Draw(im) + return im, ImageDraw2 def floodfill( From 2d1fe7572f461e13ed70f4f6162d5266d8440df0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 10 Jun 2024 14:15:28 +1000 Subject: [PATCH 025/662] Added type hints --- src/PIL/BlpImagePlugin.py | 15 ++++++++++----- src/PIL/BmpImagePlugin.py | 4 ++-- src/PIL/BufrStubImagePlugin.py | 2 +- src/PIL/DdsImagePlugin.py | 2 +- src/PIL/GifImagePlugin.py | 6 +++--- src/PIL/GribStubImagePlugin.py | 2 +- src/PIL/Hdf5StubImagePlugin.py | 2 +- src/PIL/IcnsImagePlugin.py | 19 +++++++++---------- src/PIL/IcoImagePlugin.py | 2 +- src/PIL/ImImagePlugin.py | 4 +++- src/PIL/Image.py | 26 +++++++++++++++++--------- src/PIL/ImageDraw.py | 16 ++++++++++------ src/PIL/ImageFile.py | 2 +- src/PIL/Jpeg2KImagePlugin.py | 6 ++++-- src/PIL/JpegImagePlugin.py | 6 +++--- src/PIL/MpoImagePlugin.py | 2 +- src/PIL/MspImagePlugin.py | 2 +- src/PIL/PcxImagePlugin.py | 2 +- src/PIL/PdfImagePlugin.py | 2 +- src/PIL/PdfParser.py | 13 ++++++------- src/PIL/PngImagePlugin.py | 2 +- src/PIL/PpmImagePlugin.py | 2 +- src/PIL/QoiImagePlugin.py | 16 ++++++++++------ src/PIL/SgiImagePlugin.py | 7 ++++--- src/PIL/SpiderImagePlugin.py | 7 ++++--- src/PIL/TgaImagePlugin.py | 2 +- src/PIL/TiffImagePlugin.py | 4 ++-- src/PIL/WebPImagePlugin.py | 8 ++++---- src/PIL/WmfImagePlugin.py | 2 +- src/PIL/XbmImagePlugin.py | 2 +- 30 files changed, 106 insertions(+), 81 deletions(-) diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py index 2db115ccc..003fa9b24 100644 --- a/src/PIL/BlpImagePlugin.py +++ b/src/PIL/BlpImagePlugin.py @@ -31,6 +31,7 @@ BLP files come in many different flavours: from __future__ import annotations +import abc import os import struct from enum import IntEnum @@ -276,7 +277,7 @@ class BlpImageFile(ImageFile.ImageFile): class _BLPBaseDecoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer): + def decode(self, buffer: bytes) -> tuple[int, int]: try: self._read_blp_header() self._load() @@ -285,6 +286,10 @@ class _BLPBaseDecoder(ImageFile.PyDecoder): raise OSError(msg) from e return -1, 0 + @abc.abstractmethod + def _load(self) -> None: + pass + def _read_blp_header(self) -> None: assert self.fd is not None self.fd.seek(4) @@ -318,7 +323,7 @@ class _BLPBaseDecoder(ImageFile.PyDecoder): ret.append((b, g, r, a)) return ret - def _read_bgra(self, palette): + def _read_bgra(self, palette: list[tuple[int, int, int, int]]) -> bytearray: data = bytearray() _data = BytesIO(self._safe_read(self._blp_lengths[0])) while True: @@ -327,7 +332,7 @@ class _BLPBaseDecoder(ImageFile.PyDecoder): except struct.error: break b, g, r, a = palette[offset] - d = (r, g, b) + d: tuple[int, ...] = (r, g, b) if self._blp_alpha_depth: d += (a,) data.extend(d) @@ -431,7 +436,7 @@ class BLPEncoder(ImageFile.PyEncoder): data += b"\x00" * 4 return data - def encode(self, bufsize): + def encode(self, bufsize: int) -> tuple[int, int, bytes]: palette_data = self._write_palette() offset = 20 + 16 * 4 * 2 + len(palette_data) @@ -449,7 +454,7 @@ class BLPEncoder(ImageFile.PyEncoder): return len(data), 0, data -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if im.mode != "P": msg = "Unsupported BLP image mode" raise ValueError(msg) diff --git a/src/PIL/BmpImagePlugin.py b/src/PIL/BmpImagePlugin.py index 2df1d8d33..45c1ea941 100644 --- a/src/PIL/BmpImagePlugin.py +++ b/src/PIL/BmpImagePlugin.py @@ -395,12 +395,12 @@ SAVE = { } -def _dib_save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _dib_save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: _save(im, fp, filename, False) def _save( - im: Image.Image, fp: IO[bytes], filename: str, bitmap_header: bool = True + im: Image.Image, fp: IO[bytes], filename: str | bytes, bitmap_header: bool = True ) -> None: try: rawmode, bits, colors = SAVE[im.mode] diff --git a/src/PIL/BufrStubImagePlugin.py b/src/PIL/BufrStubImagePlugin.py index 7388a2b8a..0ee2f653b 100644 --- a/src/PIL/BufrStubImagePlugin.py +++ b/src/PIL/BufrStubImagePlugin.py @@ -60,7 +60,7 @@ class BufrStubImageFile(ImageFile.StubImageFile): return _handler -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if _handler is None or not hasattr(_handler, "save"): msg = "BUFR save handler not installed" raise OSError(msg) diff --git a/src/PIL/DdsImagePlugin.py b/src/PIL/DdsImagePlugin.py index a3efadb03..861a1eca0 100644 --- a/src/PIL/DdsImagePlugin.py +++ b/src/PIL/DdsImagePlugin.py @@ -511,7 +511,7 @@ class DdsRgbDecoder(ImageFile.PyDecoder): return -1, 0 -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if im.mode not in ("RGB", "RGBA", "L", "LA"): msg = f"cannot write mode {im.mode} as DDS" raise OSError(msg) diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index f41bc2b32..a540595b8 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -715,12 +715,12 @@ def _write_multiple_frames(im, fp, palette): return True -def _save_all(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: _save(im, fp, filename, save_all=True) def _save( - im: Image.Image, fp: IO[bytes], filename: str, save_all: bool = False + im: Image.Image, fp: IO[bytes], filename: str | bytes, save_all: bool = False ) -> None: # header if "palette" in im.encoderinfo or "palette" in im.info: @@ -796,7 +796,7 @@ def _write_local_header(fp, im, offset, flags): fp.write(o8(8)) # bits -def _save_netpbm(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save_netpbm(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: # Unused by default. # To use, uncomment the register_save call at the end of the file. # diff --git a/src/PIL/GribStubImagePlugin.py b/src/PIL/GribStubImagePlugin.py index d3655f4dd..e9aa084b2 100644 --- a/src/PIL/GribStubImagePlugin.py +++ b/src/PIL/GribStubImagePlugin.py @@ -60,7 +60,7 @@ class GribStubImageFile(ImageFile.StubImageFile): return _handler -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if _handler is None or not hasattr(_handler, "save"): msg = "GRIB save handler not installed" raise OSError(msg) diff --git a/src/PIL/Hdf5StubImagePlugin.py b/src/PIL/Hdf5StubImagePlugin.py index b789c215f..cc9e73deb 100644 --- a/src/PIL/Hdf5StubImagePlugin.py +++ b/src/PIL/Hdf5StubImagePlugin.py @@ -60,7 +60,7 @@ class HDF5StubImageFile(ImageFile.StubImageFile): return _handler -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if _handler is None or not hasattr(_handler, "save"): msg = "HDF5 save handler not installed" raise OSError(msg) diff --git a/src/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py index 0a86ba883..2a89d498c 100644 --- a/src/PIL/IcnsImagePlugin.py +++ b/src/PIL/IcnsImagePlugin.py @@ -22,6 +22,7 @@ import io import os import struct import sys +from typing import IO from . import Image, ImageFile, PngImagePlugin, features @@ -312,7 +313,7 @@ class IcnsImageFile(ImageFile.ImageFile): return px -def _save(im, fp, filename): +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: """ Saves the image as a series of PNG files, that are then combined into a .icns file. @@ -346,29 +347,27 @@ def _save(im, fp, filename): entries = [] for type, size in sizes.items(): stream = size_streams[size] - entries.append( - {"type": type, "size": HEADERSIZE + len(stream), "stream": stream} - ) + entries.append((type, HEADERSIZE + len(stream), stream)) # Header fp.write(MAGIC) file_length = HEADERSIZE # Header file_length += HEADERSIZE + 8 * len(entries) # TOC - file_length += sum(entry["size"] for entry in entries) + file_length += sum(entry[1] for entry in entries) fp.write(struct.pack(">i", file_length)) # TOC fp.write(b"TOC ") fp.write(struct.pack(">i", HEADERSIZE + len(entries) * HEADERSIZE)) for entry in entries: - fp.write(entry["type"]) - fp.write(struct.pack(">i", entry["size"])) + fp.write(entry[0]) + fp.write(struct.pack(">i", entry[1])) # Data for entry in entries: - fp.write(entry["type"]) - fp.write(struct.pack(">i", entry["size"])) - fp.write(entry["stream"]) + fp.write(entry[0]) + fp.write(struct.pack(">i", entry[1])) + fp.write(entry[2]) if hasattr(fp, "flush"): fp.flush() diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py index af94e5a2e..227fcf35c 100644 --- a/src/PIL/IcoImagePlugin.py +++ b/src/PIL/IcoImagePlugin.py @@ -40,7 +40,7 @@ from ._binary import o32le as o32 _MAGIC = b"\0\0\1\0" -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: fp.write(_MAGIC) # (2+2) bmp = im.encoderinfo.get("bitmap_format") == "bmp" sizes = im.encoderinfo.get( diff --git a/src/PIL/ImImagePlugin.py b/src/PIL/ImImagePlugin.py index c98cfb098..015c2febe 100644 --- a/src/PIL/ImImagePlugin.py +++ b/src/PIL/ImImagePlugin.py @@ -326,7 +326,7 @@ SAVE = { } -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: try: image_type, rawmode = SAVE[im.mode] except KeyError as e: @@ -341,6 +341,8 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: # or: SyntaxError("not an IM file") # 8 characters are used for "Name: " and "\r\n" # Keep just the filename, ditch the potentially overlong path + if isinstance(filename, bytes): + filename = filename.decode("ascii") name, ext = os.path.splitext(os.path.basename(filename)) name = "".join([name[: 92 - len(ext)], ext]) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index f6ffac8a7..af1748610 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -626,7 +626,7 @@ class Image: self.load() def _dump( - self, file: str | None = None, format: str | None = None, **options + self, file: str | None = None, format: str | None = None, **options: Any ) -> str: suffix = "" if format: @@ -649,10 +649,12 @@ class Image: return filename - def __eq__(self, other): + def __eq__(self, other: object) -> bool: + if self.__class__ is not other.__class__: + return False + assert isinstance(other, Image) return ( - self.__class__ is other.__class__ - and self.mode == other.mode + self.mode == other.mode and self.size == other.size and self.info == other.info and self.getpalette() == other.getpalette() @@ -2965,7 +2967,7 @@ class ImageTransformHandler: # Debugging -def _wedge(): +def _wedge() -> Image: """Create grayscale wedge (for debugging only)""" return Image()._new(core.wedge("L")) @@ -3566,7 +3568,9 @@ def register_mime(id: str, mimetype: str) -> None: MIME[id.upper()] = mimetype -def register_save(id: str, driver) -> None: +def register_save( + id: str, driver: Callable[[Image, IO[bytes], str | bytes], None] +) -> None: """ Registers an image save function. This function should not be used in application code. @@ -3577,7 +3581,9 @@ def register_save(id: str, driver) -> None: SAVE[id.upper()] = driver -def register_save_all(id: str, driver) -> None: +def register_save_all( + id: str, driver: Callable[[Image, IO[bytes], str | bytes], None] +) -> None: """ Registers an image function to save all the frames of a multiframe format. This function should not be @@ -3651,7 +3657,7 @@ def register_encoder(name: str, encoder: type[ImageFile.PyEncoder]) -> None: # Simple display support. -def _show(image, **options) -> None: +def _show(image: Image, **options: Any) -> None: from . import ImageShow ImageShow.show(image, **options) @@ -3661,7 +3667,9 @@ def _show(image, **options) -> None: # Effects -def effect_mandelbrot(size, extent, quality): +def effect_mandelbrot( + size: tuple[int, int], extent: tuple[int, int, int, int], quality: int +) -> Image: """ Generate a Mandelbrot set covering the given extent. diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py index 73ed3d4a9..01f99c119 100644 --- a/src/PIL/ImageDraw.py +++ b/src/PIL/ImageDraw.py @@ -219,7 +219,9 @@ class ImageDraw: # This is a straight line, so no joint is required continue - def coord_at_angle(coord, angle): + def coord_at_angle( + coord: Sequence[float], angle: float + ) -> tuple[float, float]: x, y = coord angle -= 90 distance = width / 2 - 1 @@ -1109,11 +1111,13 @@ def _compute_regular_polygon_vertices( return [_compute_polygon_vertex(angle) for angle in angles] -def _color_diff(color1, color2: float | tuple[int, ...]) -> float: +def _color_diff( + color1: float | tuple[int, ...], color2: float | tuple[int, ...] +) -> float: """ Uses 1-norm distance to calculate difference between two values. """ - if isinstance(color2, tuple): - return sum(abs(color1[i] - color2[i]) for i in range(0, len(color2))) - else: - return abs(color1 - color2) + first = color1 if isinstance(color1, tuple) else (color1,) + second = color2 if isinstance(color2, tuple) else (color2,) + + return sum(abs(first[i] - second[i]) for i in range(0, len(second))) diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index f0e492387..6bef681e9 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -763,7 +763,7 @@ class PyEncoder(PyCodec): def pushes_fd(self): return self._pushes_fd - def encode(self, bufsize): + def encode(self, bufsize: int) -> tuple[int, int, bytes]: """ Override to perform the encoding process. diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py index 5a0ef0d01..72c2cb85e 100644 --- a/src/PIL/Jpeg2KImagePlugin.py +++ b/src/PIL/Jpeg2KImagePlugin.py @@ -329,11 +329,13 @@ def _accept(prefix: bytes) -> bool: # Save support -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: # Get the keyword arguments info = im.encoderinfo - if filename.endswith(".j2k") or info.get("no_jp2", False): + if isinstance(filename, str): + filename = filename.encode() + if filename.endswith(b".j2k") or info.get("no_jp2", False): kind = "j2k" else: kind = "jp2" diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 4d0b75e77..0c8a67888 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -42,7 +42,7 @@ import subprocess import sys import tempfile import warnings -from typing import Any +from typing import IO, Any from . import Image, ImageFile from ._binary import i16be as i16 @@ -644,7 +644,7 @@ def get_sampling(im): return samplings.get(sampling, -1) -def _save(im, fp, filename): +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if im.width == 0 or im.height == 0: msg = "cannot write empty image as JPEG" raise ValueError(msg) @@ -827,7 +827,7 @@ def _save(im, fp, filename): ImageFile._save(im, fp, [("jpeg", (0, 0) + im.size, 0, rawmode)], bufsize) -def _save_cjpeg(im, fp, filename): +def _save_cjpeg(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: # ALTERNATIVE: handle JPEGs via the IJG command line utilities. tempfile = im._dump() subprocess.check_call(["cjpeg", "-outfile", filename, tempfile]) diff --git a/src/PIL/MpoImagePlugin.py b/src/PIL/MpoImagePlugin.py index 6716722f2..152e19e23 100644 --- a/src/PIL/MpoImagePlugin.py +++ b/src/PIL/MpoImagePlugin.py @@ -33,7 +33,7 @@ from . import ( from ._binary import o32le -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: JpegImagePlugin._save(im, fp, filename) diff --git a/src/PIL/MspImagePlugin.py b/src/PIL/MspImagePlugin.py index 65cc70624..0a75c868b 100644 --- a/src/PIL/MspImagePlugin.py +++ b/src/PIL/MspImagePlugin.py @@ -164,7 +164,7 @@ Image.register_decoder("MSP", MspDecoder) # write MSP files (uncompressed only) -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if im.mode != "1": msg = f"cannot write mode {im.mode} as MSP" raise OSError(msg) diff --git a/src/PIL/PcxImagePlugin.py b/src/PIL/PcxImagePlugin.py index 026bfd9a0..dd42003b5 100644 --- a/src/PIL/PcxImagePlugin.py +++ b/src/PIL/PcxImagePlugin.py @@ -144,7 +144,7 @@ SAVE = { } -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: try: version, bits, planes, rawmode = SAVE[im.mode] except KeyError as e: diff --git a/src/PIL/PdfImagePlugin.py b/src/PIL/PdfImagePlugin.py index ccd28f343..f0da1e047 100644 --- a/src/PIL/PdfImagePlugin.py +++ b/src/PIL/PdfImagePlugin.py @@ -40,7 +40,7 @@ from . import Image, ImageFile, ImageSequence, PdfParser, __version__, features # 5. page contents -def _save_all(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: _save(im, fp, filename, save_all=True) diff --git a/src/PIL/PdfParser.py b/src/PIL/PdfParser.py index a6c24e671..52e835801 100644 --- a/src/PIL/PdfParser.py +++ b/src/PIL/PdfParser.py @@ -76,7 +76,7 @@ class PdfFormatError(RuntimeError): pass -def check_format_condition(condition, error_message): +def check_format_condition(condition: bool, error_message: str) -> None: if not condition: raise PdfFormatError(error_message) @@ -93,12 +93,11 @@ class IndirectReference(IndirectReferenceTuple): def __bytes__(self) -> bytes: return self.__str__().encode("us-ascii") - def __eq__(self, other): - return ( - other.__class__ is self.__class__ - and other.object_id == self.object_id - and other.generation == self.generation - ) + def __eq__(self, other: object) -> bool: + if self.__class__ is not other.__class__: + return False + assert isinstance(other, IndirectReference) + return other.object_id == self.object_id and other.generation == self.generation def __ne__(self, other): return not (self == other) diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 76ffdef3f..9aaadb47d 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -1234,7 +1234,7 @@ def _write_multiple_frames(im, fp, chunk, rawmode, default_image, append_images) seq_num = fdat_chunks.seq_num -def _save_all(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: _save(im, fp, filename, save_all=True) diff --git a/src/PIL/PpmImagePlugin.py b/src/PIL/PpmImagePlugin.py index 94bf430b8..16c9ccbba 100644 --- a/src/PIL/PpmImagePlugin.py +++ b/src/PIL/PpmImagePlugin.py @@ -328,7 +328,7 @@ class PpmDecoder(ImageFile.PyDecoder): # -------------------------------------------------------------------- -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if im.mode == "1": rawmode, head = "1;I", b"P4" elif im.mode == "L": diff --git a/src/PIL/QoiImagePlugin.py b/src/PIL/QoiImagePlugin.py index f2cf06d0d..202ef52d0 100644 --- a/src/PIL/QoiImagePlugin.py +++ b/src/PIL/QoiImagePlugin.py @@ -37,6 +37,8 @@ class QoiImageFile(ImageFile.ImageFile): class QoiDecoder(ImageFile.PyDecoder): _pulls_fd = True + _previous_pixel: bytes | bytearray | None = None + _previously_seen_pixels: dict[int, bytes | bytearray] = {} def _add_to_previous_pixels(self, value: bytes | bytearray) -> None: self._previous_pixel = value @@ -45,9 +47,10 @@ class QoiDecoder(ImageFile.PyDecoder): hash_value = (r * 3 + g * 5 + b * 7 + a * 11) % 64 self._previously_seen_pixels[hash_value] = value - def decode(self, buffer): + def decode(self, buffer: bytes) -> tuple[int, int]: + assert self.fd is not None + self._previously_seen_pixels = {} - self._previous_pixel = None self._add_to_previous_pixels(bytearray((0, 0, 0, 255))) data = bytearray() @@ -55,7 +58,8 @@ class QoiDecoder(ImageFile.PyDecoder): dest_length = self.state.xsize * self.state.ysize * bands while len(data) < dest_length: byte = self.fd.read(1)[0] - if byte == 0b11111110: # QOI_OP_RGB + value: bytes | bytearray + if byte == 0b11111110 and self._previous_pixel: # QOI_OP_RGB value = bytearray(self.fd.read(3)) + self._previous_pixel[3:] elif byte == 0b11111111: # QOI_OP_RGBA value = self.fd.read(4) @@ -66,7 +70,7 @@ class QoiDecoder(ImageFile.PyDecoder): value = self._previously_seen_pixels.get( op_index, bytearray((0, 0, 0, 0)) ) - elif op == 1: # QOI_OP_DIFF + elif op == 1 and self._previous_pixel: # QOI_OP_DIFF value = bytearray( ( (self._previous_pixel[0] + ((byte & 0b00110000) >> 4) - 2) @@ -77,7 +81,7 @@ class QoiDecoder(ImageFile.PyDecoder): self._previous_pixel[3], ) ) - elif op == 2: # QOI_OP_LUMA + elif op == 2 and self._previous_pixel: # QOI_OP_LUMA second_byte = self.fd.read(1)[0] diff_green = (byte & 0b00111111) - 32 diff_red = ((second_byte & 0b11110000) >> 4) - 8 @@ -90,7 +94,7 @@ class QoiDecoder(ImageFile.PyDecoder): ) ) value += self._previous_pixel[3:] - elif op == 3: # QOI_OP_RUN + elif op == 3 and self._previous_pixel: # QOI_OP_RUN run_length = (byte & 0b00111111) + 1 value = self._previous_pixel if bands == 3: diff --git a/src/PIL/SgiImagePlugin.py b/src/PIL/SgiImagePlugin.py index 7bd84ebd4..50d979109 100644 --- a/src/PIL/SgiImagePlugin.py +++ b/src/PIL/SgiImagePlugin.py @@ -125,7 +125,7 @@ class SgiImageFile(ImageFile.ImageFile): ] -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if im.mode not in {"RGB", "RGBA", "L"}: msg = "Unsupported SGI image mode" raise ValueError(msg) @@ -171,8 +171,9 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: # Maximum Byte value (255 = 8bits per pixel) pinmax = 255 # Image name (79 characters max, truncated below in write) - filename = os.path.basename(filename) - img_name = os.path.splitext(filename)[0].encode("ascii", "ignore") + img_name = os.path.splitext(os.path.basename(filename))[0] + if isinstance(img_name, str): + img_name = img_name.encode("ascii", "ignore") # Standard representation of pixel in the file colormap = 0 fp.write(struct.pack(">h", magic_number)) diff --git a/src/PIL/SpiderImagePlugin.py b/src/PIL/SpiderImagePlugin.py index 98dd91c0e..a6cc00019 100644 --- a/src/PIL/SpiderImagePlugin.py +++ b/src/PIL/SpiderImagePlugin.py @@ -263,7 +263,7 @@ def makeSpiderHeader(im: Image.Image) -> list[bytes]: return [struct.pack("f", v) for v in hdr] -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if im.mode[0] != "F": im = im.convert("F") @@ -279,9 +279,10 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))]) -def _save_spider(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save_spider(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: # get the filename extension and register it with Image - ext = os.path.splitext(filename)[1] + filename_ext = os.path.splitext(filename)[1] + ext = filename_ext.decode() if isinstance(filename_ext, bytes) else filename_ext Image.register_extension(SpiderImageFile.format, ext) _save(im, fp, filename) diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py index 401a83f9f..f16f075df 100644 --- a/src/PIL/TgaImagePlugin.py +++ b/src/PIL/TgaImagePlugin.py @@ -178,7 +178,7 @@ SAVE = { } -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: try: rawmode, bits, colormaptype, imagetype = SAVE[im.mode] except KeyError as e: diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 0b9601755..08ee506b1 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -387,7 +387,7 @@ class IFDRational(Rational): def __hash__(self): return self._val.__hash__() - def __eq__(self, other): + def __eq__(self, other: object) -> bool: val = self._val if isinstance(other, IFDRational): other = other._val @@ -2149,7 +2149,7 @@ class AppendingTiffWriter: self.rewriteLastLong(offset) -def _save_all(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: encoderinfo = im.encoderinfo.copy() encoderconfig = im.encoderconfig append_images = list(encoderinfo.get("append_images", [])) diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index 463d6a623..97debc2ed 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -1,7 +1,7 @@ from __future__ import annotations from io import BytesIO -from typing import Any +from typing import IO, Any from . import Image, ImageFile @@ -182,7 +182,7 @@ class WebPImageFile(ImageFile.ImageFile): return self.__logical_frame -def _save_all(im, fp, filename): +def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: encoderinfo = im.encoderinfo.copy() append_images = list(encoderinfo.get("append_images", [])) @@ -195,7 +195,7 @@ def _save_all(im, fp, filename): _save(im, fp, filename) return - background = (0, 0, 0, 0) + background: int | tuple[int, ...] = (0, 0, 0, 0) if "background" in encoderinfo: background = encoderinfo["background"] elif "background" in im.info: @@ -325,7 +325,7 @@ def _save_all(im, fp, filename): fp.write(data) -def _save(im, fp, filename): +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: lossless = im.encoderinfo.get("lossless", False) quality = im.encoderinfo.get("quality", 80) alpha_quality = im.encoderinfo.get("alpha_quality", 100) diff --git a/src/PIL/WmfImagePlugin.py b/src/PIL/WmfImagePlugin.py index a68f705a0..3d5cddcc8 100644 --- a/src/PIL/WmfImagePlugin.py +++ b/src/PIL/WmfImagePlugin.py @@ -163,7 +163,7 @@ class WmfStubImageFile(ImageFile.StubImageFile): return super().load() -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if _handler is None or not hasattr(_handler, "save"): msg = "WMF save handler not installed" raise OSError(msg) diff --git a/src/PIL/XbmImagePlugin.py b/src/PIL/XbmImagePlugin.py index eee727436..6d11bbfcf 100644 --- a/src/PIL/XbmImagePlugin.py +++ b/src/PIL/XbmImagePlugin.py @@ -70,7 +70,7 @@ class XbmImageFile(ImageFile.ImageFile): self.tile = [("xbm", (0, 0) + self.size, m.end(), None)] -def _save(im: Image.Image, fp: IO[bytes], filename: str) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if im.mode != "1": msg = f"cannot write mode {im.mode} as XBM" raise OSError(msg) From 9f831317fe98633214ad0266417d349b44e5d6bf Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:47:18 +1000 Subject: [PATCH 026/662] Updated text Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- docs/deprecations.rst | 6 +++--- docs/releasenotes/10.4.0.rst | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index 8a03d858c..627672e1f 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -115,12 +115,12 @@ Support for LibTIFF earlier than 4 Support for LibTIFF earlier than version 4 has been deprecated. Upgrade to a newer version of LibTIFF instead. -ImageDraw.getdraw hints argument -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +ImageDraw.getdraw hints parameter +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. deprecated:: 10.4.0 -The ``hints`` argument in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecated. +The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecated. Removed features ---------------- diff --git a/docs/releasenotes/10.4.0.rst b/docs/releasenotes/10.4.0.rst index 8c49e0842..44727efd4 100644 --- a/docs/releasenotes/10.4.0.rst +++ b/docs/releasenotes/10.4.0.rst @@ -34,10 +34,10 @@ Support for LibTIFF earlier than 4 Support for LibTIFF earlier than version 4 has been deprecated. Upgrade to a newer version of LibTIFF instead. -ImageDraw.getdraw hints argument -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +ImageDraw.getdraw hints parameter +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The ``hints`` argument in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecated. +The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecated. API Changes =========== From 4679e4bf9e542ffae8c81e68603d5c944108389f Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Mon, 10 Jun 2024 16:47:52 +1000 Subject: [PATCH 027/662] Updated deprecation warning --- src/PIL/ImageDraw.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py index ec15b535f..23d7e6973 100644 --- a/src/PIL/ImageDraw.py +++ b/src/PIL/ImageDraw.py @@ -908,7 +908,7 @@ def getdraw(im=None, hints=None): :returns: A (drawing context, drawing resource factory) tuple. """ if hints is not None: - deprecate("'hints' argument", 12) + deprecate("'hints' parameter", 12) from . import ImageDraw2 if im: From 8e8ee1e4c4b8037c9b755e2ba26a7297dfa5d6ac Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 10 Jun 2024 17:38:17 +1000 Subject: [PATCH 028/662] Accept 't' suffix for libtiff version --- Tests/test_features.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tests/test_features.py b/Tests/test_features.py index de418115e..b7eefa09a 100644 --- a/Tests/test_features.py +++ b/Tests/test_features.py @@ -38,7 +38,9 @@ def test_version() -> None: assert function(name) == version if name != "PIL": if name == "zlib" and version is not None: - version = version.replace(".zlib-ng", "") + version = re.sub(".zlib-ng$", "", version) + elif name == "libtiff" and version is not None: + version = re.sub("t$", "", version) assert version is None or re.search(r"\d+(\.\d+)*$", version) for module in features.modules: From b84c970fbf3f08825cabf9c5a132e20f868907f1 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 10 Jun 2024 19:19:06 +1000 Subject: [PATCH 029/662] Wait until all markers are read to process EXIF --- Tests/images/multiple_exif.jpg | Bin 364 -> 391 bytes Tests/test_file_jpeg.py | 2 +- src/PIL/JpegImagePlugin.py | 68 +++++++++++++++++---------------- 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/Tests/images/multiple_exif.jpg b/Tests/images/multiple_exif.jpg index 32e0aa301a94dfa13dc47faeb3071c25a5d8b573..f9f343507e73c5fe2df844deaa5d025f5cd013ec 100644 GIT binary patch delta 66 zcmaFE)XqFX++5wYA~TJF!Pl2Ti-CcGgMpEekAVru;sIhQAZAF*EGjPf|B!(nqOdqM NIX^FjVWY7nBLK0l4od(4 delta 39 qcmZo?e#10DT!z=RA~TJFAuY40xa9vs20jS4I5jyxFJ+^jB_jX@Ck-qB diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index 18dc752d8..342c9e47b 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -870,7 +870,7 @@ class TestFileJpeg: def test_multiple_exif(self) -> None: with Image.open("Tests/images/multiple_exif.jpg") as im: - assert im.info["exif"] == b"Exif\x00\x00firstsecond" + assert im.getexif()[270] == "firstsecond" @mark_if_feature_version( pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing" diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 4d0b75e77..a9a89e58b 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -159,38 +159,6 @@ def APP(self, marker): # plus constant header size self.info["mpoffset"] = self.fp.tell() - n + 4 - # If DPI isn't in JPEG header, fetch from EXIF - if "dpi" not in self.info and "exif" in self.info: - try: - exif = self.getexif() - resolution_unit = exif[0x0128] - x_resolution = exif[0x011A] - try: - dpi = float(x_resolution[0]) / x_resolution[1] - except TypeError: - dpi = x_resolution - if math.isnan(dpi): - msg = "DPI is not a number" - raise ValueError(msg) - if resolution_unit == 3: # cm - # 1 dpcm = 2.54 dpi - dpi *= 2.54 - self.info["dpi"] = dpi, dpi - except ( - struct.error, - KeyError, - SyntaxError, - TypeError, - ValueError, - ZeroDivisionError, - ): - # struct.error for truncated EXIF - # KeyError for dpi not included - # SyntaxError for invalid/unreadable EXIF - # ValueError or TypeError for dpi being an invalid float - # ZeroDivisionError for invalid dpi rational value - self.info["dpi"] = 72, 72 - def COM(self: JpegImageFile, marker: int) -> None: # @@ -409,6 +377,8 @@ class JpegImageFile(ImageFile.ImageFile): msg = "no marker found" raise SyntaxError(msg) + self._read_dpi_from_exif() + def load_read(self, read_bytes: int) -> bytes: """ internal: read more image data @@ -497,6 +467,40 @@ class JpegImageFile(ImageFile.ImageFile): def _getexif(self) -> dict[str, Any] | None: return _getexif(self) + def _read_dpi_from_exif(self) -> None: + # If DPI isn't in JPEG header, fetch from EXIF + if "dpi" in self.info or "exif" not in self.info: + return + try: + exif = self.getexif() + resolution_unit = exif[0x0128] + x_resolution = exif[0x011A] + try: + dpi = float(x_resolution[0]) / x_resolution[1] + except TypeError: + dpi = x_resolution + if math.isnan(dpi): + msg = "DPI is not a number" + raise ValueError(msg) + if resolution_unit == 3: # cm + # 1 dpcm = 2.54 dpi + dpi *= 2.54 + self.info["dpi"] = dpi, dpi + except ( + struct.error, + KeyError, + SyntaxError, + TypeError, + ValueError, + ZeroDivisionError, + ): + # struct.error for truncated EXIF + # KeyError for dpi not included + # SyntaxError for invalid/unreadable EXIF + # ValueError or TypeError for dpi being an invalid float + # ZeroDivisionError for invalid dpi rational value + self.info["dpi"] = 72, 72 + def _getmp(self): return _getmp(self) From 9afe9d2769d9241385a4fd8f8e2376fbdca74981 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 10 Jun 2024 16:08:06 +1000 Subject: [PATCH 030/662] Added type hints --- Tests/test_file_gif.py | 9 +- src/PIL/GifImagePlugin.py | 204 +++++++++++++++++++++++--------------- src/PIL/Image.py | 20 ++-- src/PIL/ImageOps.py | 2 +- src/PIL/ImagePalette.py | 13 ++- 5 files changed, 153 insertions(+), 95 deletions(-) diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py index 4e790926b..e19c88a47 100644 --- a/Tests/test_file_gif.py +++ b/Tests/test_file_gif.py @@ -53,6 +53,7 @@ def test_closed_file() -> None: def test_seek_after_close() -> None: im = Image.open("Tests/images/iss634.gif") + assert isinstance(im, GifImagePlugin.GifImageFile) im.load() im.close() @@ -377,7 +378,8 @@ def test_save_netpbm_bmp_mode(tmp_path: Path) -> None: img = img.convert("RGB") tempfile = str(tmp_path / "temp.gif") - GifImagePlugin._save_netpbm(img, 0, tempfile) + b = BytesIO() + GifImagePlugin._save_netpbm(img, b, tempfile) with Image.open(tempfile) as reloaded: assert_image_similar(img, reloaded.convert("RGB"), 0) @@ -388,7 +390,8 @@ def test_save_netpbm_l_mode(tmp_path: Path) -> None: img = img.convert("L") tempfile = str(tmp_path / "temp.gif") - GifImagePlugin._save_netpbm(img, 0, tempfile) + b = BytesIO() + GifImagePlugin._save_netpbm(img, b, tempfile) with Image.open(tempfile) as reloaded: assert_image_similar(img, reloaded.convert("L"), 0) @@ -648,7 +651,7 @@ def test_dispose2_palette(tmp_path: Path) -> None: assert rgb_img.getpixel((50, 50)) == circle # Check that frame transparency wasn't added unnecessarily - assert img._frame_transparency is None + assert getattr(img, "_frame_transparency") is None def test_dispose2_diff(tmp_path: Path) -> None: diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index a540595b8..a305e8de6 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -29,9 +29,10 @@ import itertools import math import os import subprocess +import sys from enum import IntEnum from functools import cached_property -from typing import IO +from typing import IO, TYPE_CHECKING, Any, List, Literal, NamedTuple, Union from . import ( Image, @@ -46,6 +47,9 @@ from ._binary import i16le as i16 from ._binary import o8 from ._binary import o16le as o16 +if TYPE_CHECKING: + from . import _imaging + class LoadingStrategy(IntEnum): """.. versionadded:: 9.1.0""" @@ -118,7 +122,7 @@ class GifImageFile(ImageFile.ImageFile): self._seek(0) # get ready to read first frame @property - def n_frames(self): + def n_frames(self) -> int: if self._n_frames is None: current = self.tell() try: @@ -163,11 +167,11 @@ class GifImageFile(ImageFile.ImageFile): msg = "no more images in GIF file" raise EOFError(msg) from e - def _seek(self, frame, update_image=True): + def _seek(self, frame: int, update_image: bool = True) -> None: if frame == 0: # rewind self.__offset = 0 - self.dispose = None + self.dispose: _imaging.ImagingCore | None = None self.__frame = -1 self._fp.seek(self.__rewind) self.disposal_method = 0 @@ -195,9 +199,9 @@ class GifImageFile(ImageFile.ImageFile): msg = "no more images in GIF file" raise EOFError(msg) - palette = None + palette: ImagePalette.ImagePalette | Literal[False] | None = None - info = {} + info: dict[str, Any] = {} frame_transparency = None interlace = None frame_dispose_extent = None @@ -213,7 +217,7 @@ class GifImageFile(ImageFile.ImageFile): # s = self.fp.read(1) block = self.data() - if s[0] == 249: + if s[0] == 249 and block is not None: # # graphic control extension # @@ -249,14 +253,14 @@ class GifImageFile(ImageFile.ImageFile): info["comment"] = comment s = None continue - elif s[0] == 255 and frame == 0: + elif s[0] == 255 and frame == 0 and block is not None: # # application extension # info["extension"] = block, self.fp.tell() if block[:11] == b"NETSCAPE2.0": block = self.data() - if len(block) >= 3 and block[0] == 1: + if block and len(block) >= 3 and block[0] == 1: self.info["loop"] = i16(block, 1) while self.data(): pass @@ -345,51 +349,52 @@ class GifImageFile(ImageFile.ImageFile): else: return (color, color, color) + self.dispose = None self.dispose_extent = frame_dispose_extent - try: - if self.disposal_method < 2: - # do not dispose or none specified - self.dispose = None - elif self.disposal_method == 2: - # replace with background colour + if self.dispose_extent and self.disposal_method >= 2: + try: + if self.disposal_method == 2: + # replace with background colour - # only dispose the extent in this frame - x0, y0, x1, y1 = self.dispose_extent - dispose_size = (x1 - x0, y1 - y0) - - Image._decompression_bomb_check(dispose_size) - - # by convention, attempt to use transparency first - dispose_mode = "P" - color = self.info.get("transparency", frame_transparency) - if color is not None: - if self.mode in ("RGB", "RGBA"): - dispose_mode = "RGBA" - color = _rgb(color) + (0,) - else: - color = self.info.get("background", 0) - if self.mode in ("RGB", "RGBA"): - dispose_mode = "RGB" - color = _rgb(color) - self.dispose = Image.core.fill(dispose_mode, dispose_size, color) - else: - # replace with previous contents - if self.im is not None: # only dispose the extent in this frame - self.dispose = self._crop(self.im, self.dispose_extent) - elif frame_transparency is not None: x0, y0, x1, y1 = self.dispose_extent dispose_size = (x1 - x0, y1 - y0) Image._decompression_bomb_check(dispose_size) + + # by convention, attempt to use transparency first dispose_mode = "P" - color = frame_transparency - if self.mode in ("RGB", "RGBA"): - dispose_mode = "RGBA" - color = _rgb(frame_transparency) + (0,) + color = self.info.get("transparency", frame_transparency) + if color is not None: + if self.mode in ("RGB", "RGBA"): + dispose_mode = "RGBA" + color = _rgb(color) + (0,) + else: + color = self.info.get("background", 0) + if self.mode in ("RGB", "RGBA"): + dispose_mode = "RGB" + color = _rgb(color) self.dispose = Image.core.fill(dispose_mode, dispose_size, color) - except AttributeError: - pass + else: + # replace with previous contents + if self.im is not None: + # only dispose the extent in this frame + self.dispose = self._crop(self.im, self.dispose_extent) + elif frame_transparency is not None: + x0, y0, x1, y1 = self.dispose_extent + dispose_size = (x1 - x0, y1 - y0) + + Image._decompression_bomb_check(dispose_size) + dispose_mode = "P" + color = frame_transparency + if self.mode in ("RGB", "RGBA"): + dispose_mode = "RGBA" + color = _rgb(frame_transparency) + (0,) + self.dispose = Image.core.fill( + dispose_mode, dispose_size, color + ) + except AttributeError: + pass if interlace is not None: transparency = -1 @@ -498,7 +503,12 @@ def _normalize_mode(im: Image.Image) -> Image.Image: return im.convert("L") -def _normalize_palette(im, palette, info): +_Palette = Union[bytes, bytearray, List[int], ImagePalette.ImagePalette] + + +def _normalize_palette( + im: Image.Image, palette: _Palette | None, info: dict[str, Any] +) -> Image.Image: """ Normalizes the palette for image. - Sets the palette to the incoming palette, if provided. @@ -526,8 +536,10 @@ def _normalize_palette(im, palette, info): source_palette = bytearray(i // 3 for i in range(768)) im.palette = ImagePalette.ImagePalette("RGB", palette=source_palette) + used_palette_colors: list[int] | None if palette: used_palette_colors = [] + assert source_palette is not None for i in range(0, len(source_palette), 3): source_color = tuple(source_palette[i : i + 3]) index = im.palette.colors.get(source_color) @@ -561,7 +573,7 @@ def _normalize_palette(im, palette, info): def _write_single_frame( im: Image.Image, fp: IO[bytes], - palette: bytes | bytearray | list[int] | ImagePalette.ImagePalette, + palette: _Palette | None, ) -> None: im_out = _normalize_mode(im) for k, v in im_out.info.items(): @@ -585,7 +597,7 @@ def _write_single_frame( def _getbbox( base_im: Image.Image, im_frame: Image.Image -) -> tuple[Image.Image, tuple[int, int, int, int]]: +) -> tuple[Image.Image, tuple[int, int, int, int] | None]: if _get_palette_bytes(im_frame) != _get_palette_bytes(base_im): im_frame = im_frame.convert("RGBA") base_im = base_im.convert("RGBA") @@ -593,12 +605,20 @@ def _getbbox( return delta, delta.getbbox(alpha_only=False) -def _write_multiple_frames(im, fp, palette): +class _Frame(NamedTuple): + im: Image.Image + bbox: tuple[int, int, int, int] | None + encoderinfo: dict[str, Any] + + +def _write_multiple_frames( + im: Image.Image, fp: IO[bytes], palette: _Palette | None +) -> bool: duration = im.encoderinfo.get("duration") disposal = im.encoderinfo.get("disposal", im.info.get("disposal")) - im_frames = [] - previous_im = None + im_frames: list[_Frame] = [] + previous_im: Image.Image | None = None frame_count = 0 background_im = None for imSequence in itertools.chain([im], im.encoderinfo.get("append_images", [])): @@ -624,24 +644,22 @@ def _write_multiple_frames(im, fp, palette): frame_count += 1 diff_frame = None - if im_frames: + if im_frames and previous_im: # delta frame delta, bbox = _getbbox(previous_im, im_frame) if not bbox: # This frame is identical to the previous frame if encoderinfo.get("duration"): - im_frames[-1]["encoderinfo"]["duration"] += encoderinfo[ - "duration" - ] + im_frames[-1].encoderinfo["duration"] += encoderinfo["duration"] continue - if im_frames[-1]["encoderinfo"].get("disposal") == 2: + if im_frames[-1].encoderinfo.get("disposal") == 2: if background_im is None: color = im.encoderinfo.get( "transparency", im.info.get("transparency", (0, 0, 0)) ) background = _get_background(im_frame, color) background_im = Image.new("P", im_frame.size, background) - background_im.putpalette(im_frames[0]["im"].palette) + background_im.putpalette(im_frames[0].im.palette) bbox = _getbbox(background_im, im_frame)[1] elif encoderinfo.get("optimize") and im_frame.mode != "1": if "transparency" not in encoderinfo: @@ -687,31 +705,29 @@ def _write_multiple_frames(im, fp, palette): else: bbox = None previous_im = im_frame - im_frames.append( - {"im": diff_frame or im_frame, "bbox": bbox, "encoderinfo": encoderinfo} - ) + im_frames.append(_Frame(diff_frame or im_frame, bbox, encoderinfo)) if len(im_frames) == 1: if "duration" in im.encoderinfo: # Since multiple frames will not be written, use the combined duration - im.encoderinfo["duration"] = im_frames[0]["encoderinfo"]["duration"] - return + im.encoderinfo["duration"] = im_frames[0].encoderinfo["duration"] + return False for frame_data in im_frames: - im_frame = frame_data["im"] - if not frame_data["bbox"]: + im_frame = frame_data.im + if not frame_data.bbox: # global header - for s in _get_global_header(im_frame, frame_data["encoderinfo"]): + for s in _get_global_header(im_frame, frame_data.encoderinfo): fp.write(s) offset = (0, 0) else: # compress difference if not palette: - frame_data["encoderinfo"]["include_color_table"] = True + frame_data.encoderinfo["include_color_table"] = True - im_frame = im_frame.crop(frame_data["bbox"]) - offset = frame_data["bbox"][:2] - _write_frame_data(fp, im_frame, offset, frame_data["encoderinfo"]) + im_frame = im_frame.crop(frame_data.bbox) + offset = frame_data.bbox[:2] + _write_frame_data(fp, im_frame, offset, frame_data.encoderinfo) return True @@ -748,7 +764,9 @@ def get_interlace(im: Image.Image) -> int: return interlace -def _write_local_header(fp, im, offset, flags): +def _write_local_header( + fp: IO[bytes], im: Image.Image, offset: tuple[int, int], flags: int +) -> None: try: transparency = im.encoderinfo["transparency"] except KeyError: @@ -849,7 +867,7 @@ def _save_netpbm(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: _FORCE_OPTIMIZE = False -def _get_optimize(im, info): +def _get_optimize(im: Image.Image, info: dict[str, Any]) -> list[int] | None: """ Palette optimization is a potentially expensive operation. @@ -893,6 +911,7 @@ def _get_optimize(im, info): and current_palette_size > 2 ): return used_palette_colors + return None def _get_color_table_size(palette_bytes: bytes) -> int: @@ -933,7 +952,10 @@ def _get_palette_bytes(im: Image.Image) -> bytes: return im.palette.palette if im.palette else b"" -def _get_background(im, info_background): +def _get_background( + im: Image.Image, + info_background: int | tuple[int, int, int] | tuple[int, int, int, int] | None, +) -> int: background = 0 if info_background: if isinstance(info_background, tuple): @@ -956,7 +978,7 @@ def _get_background(im, info_background): return background -def _get_global_header(im, info): +def _get_global_header(im: Image.Image, info: dict[str, Any]) -> list[bytes]: """Return a list of strings representing a GIF header""" # Header Block @@ -1018,7 +1040,12 @@ def _get_global_header(im, info): return header -def _write_frame_data(fp, im_frame, offset, params): +def _write_frame_data( + fp: IO[bytes], + im_frame: Image.Image, + offset: tuple[int, int], + params: dict[str, Any], +) -> None: try: im_frame.encoderinfo = params @@ -1038,7 +1065,9 @@ def _write_frame_data(fp, im_frame, offset, params): # Legacy GIF utilities -def getheader(im, palette=None, info=None): +def getheader( + im: Image.Image, palette: _Palette | None = None, info: dict[str, Any] | None = None +) -> tuple[list[bytes], list[int] | None]: """ Legacy Method to get Gif data from image. @@ -1050,11 +1079,11 @@ def getheader(im, palette=None, info=None): :returns: tuple of(list of header items, optimized palette) """ - used_palette_colors = _get_optimize(im, info) - if info is None: info = {} + used_palette_colors = _get_optimize(im, info) + if "background" not in info and "background" in im.info: info["background"] = im.info["background"] @@ -1066,7 +1095,9 @@ def getheader(im, palette=None, info=None): return header, used_palette_colors -def getdata(im, offset=(0, 0), **params): +def getdata( + im: Image.Image, offset: tuple[int, int] = (0, 0), **params: Any +) -> list[bytes]: """ Legacy Method @@ -1083,12 +1114,23 @@ def getdata(im, offset=(0, 0), **params): :returns: List of bytes containing GIF encoded frame data """ + from io import BytesIO - class Collector: + class Collector(BytesIO): data = [] - def write(self, data: bytes) -> None: - self.data.append(data) + if sys.version_info >= (3, 12): + from collections.abc import Buffer + + def write(self, data: Buffer) -> int: + self.data.append(data) + return len(data) + + else: + + def write(self, data: Any) -> int: + self.data.append(data) + return len(data) im.load() # make sure raster data is available diff --git a/src/PIL/Image.py b/src/PIL/Image.py index af1748610..bdd869ccc 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -41,7 +41,7 @@ import warnings from collections.abc import Callable, MutableMapping from enum import IntEnum from types import ModuleType -from typing import IO, TYPE_CHECKING, Any, Literal, Protocol, Sequence, cast +from typing import IO, TYPE_CHECKING, Any, Literal, Protocol, Sequence, Tuple, cast # VERSION was removed in Pillow 6.0.0. # PILLOW_VERSION was removed in Pillow 9.0.0. @@ -1367,7 +1367,7 @@ class Image: """ return ImageMode.getmode(self.mode).bands - def getbbox(self, *, alpha_only: bool = True) -> tuple[int, int, int, int]: + def getbbox(self, *, alpha_only: bool = True) -> tuple[int, int, int, int] | None: """ Calculates the bounding box of the non-zero regions in the image. @@ -3029,12 +3029,18 @@ def new( color = ImageColor.getcolor(color, mode) im = Image() - if mode == "P" and isinstance(color, (list, tuple)) and len(color) in [3, 4]: - # RGB or RGBA value for a P image - from . import ImagePalette + if ( + mode == "P" + and isinstance(color, (list, tuple)) + and all(isinstance(i, int) for i in color) + ): + color_ints: tuple[int, ...] = cast(Tuple[int, ...], tuple(color)) + if len(color_ints) == 3 or len(color_ints) == 4: + # RGB or RGBA value for a P image + from . import ImagePalette - im.palette = ImagePalette.ImagePalette() - color = im.palette.getcolor(color) + im.palette = ImagePalette.ImagePalette() + color = im.palette.getcolor(color_ints) return im._new(core.fill(mode, size, color)) diff --git a/src/PIL/ImageOps.py b/src/PIL/ImageOps.py index 33db8fa50..cbe189cc9 100644 --- a/src/PIL/ImageOps.py +++ b/src/PIL/ImageOps.py @@ -497,7 +497,7 @@ def expand( color = _color(fill, image.mode) if image.palette: palette = ImagePalette.ImagePalette(palette=image.getpalette()) - if isinstance(color, tuple): + if isinstance(color, tuple) and (len(color) == 3 or len(color) == 4): color = palette.getcolor(color) else: palette = None diff --git a/src/PIL/ImagePalette.py b/src/PIL/ImagePalette.py index 057ccd1d7..1ff05a3ef 100644 --- a/src/PIL/ImagePalette.py +++ b/src/PIL/ImagePalette.py @@ -18,10 +18,13 @@ from __future__ import annotations import array -from typing import IO, Sequence +from typing import IO, TYPE_CHECKING, Sequence from . import GimpGradientFile, GimpPaletteFile, ImageColor, PaletteFile +if TYPE_CHECKING: + from . import Image + class ImagePalette: """ @@ -128,7 +131,11 @@ class ImagePalette: raise ValueError(msg) from e return index - def getcolor(self, color, image=None) -> int: + def getcolor( + self, + color: tuple[int, int, int] | tuple[int, int, int, int], + image: Image.Image | None = None, + ) -> int: """Given an rgb tuple, allocate palette entry. .. warning:: This method is experimental. @@ -163,7 +170,7 @@ class ImagePalette: self.dirty = 1 return index else: - msg = f"unknown color specifier: {repr(color)}" + msg = f"unknown color specifier: {repr(color)}" # type: ignore[unreachable] raise ValueError(msg) def save(self, fp: str | IO[str]) -> None: From 84b284723259f2a7d1e079daea0670e0138c4980 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 11 Jun 2024 07:15:47 +1000 Subject: [PATCH 031/662] Accept 't' suffix for libtiff version --- Tests/test_file_libtiff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py index 22bcd2856..fe9d017c0 100644 --- a/Tests/test_file_libtiff.py +++ b/Tests/test_file_libtiff.py @@ -54,7 +54,7 @@ class TestFileLibTiff(LibTiffTestCase): def test_version(self) -> None: version = features.version_codec("libtiff") assert version is not None - assert re.search(r"\d+\.\d+\.\d+$", version) + assert re.search(r"\d+\.\d+\.\d+t?$", version) def test_g4_tiff(self, tmp_path: Path) -> None: """Test the ordinary file path load path""" From 474ef6ff8d152effba530f364d7c3c5a0653358f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 00:01:02 +0000 Subject: [PATCH 032/662] Update dependency cibuildwheel to v2.19.0 --- .ci/requirements-cibw.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-cibw.txt b/.ci/requirements-cibw.txt index 7e257b75c..bf1d1315b 100644 --- a/.ci/requirements-cibw.txt +++ b/.ci/requirements-cibw.txt @@ -1 +1 @@ -cibuildwheel==2.18.1 +cibuildwheel==2.19.0 From 780d85b667f3201c02c1563ca7c09581f8871237 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 11 Jun 2024 23:18:11 +1000 Subject: [PATCH 033/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index dc4016d76..d7231ebea 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,12 @@ Changelog (Pillow) 10.4.0 (unreleased) ------------------- +- Accept 't' suffix for libtiff version #8126, #8129 + [radarhere] + +- Deprecate ImageDraw.getdraw hints parameter #8124 + [radarhere, hugovk] + - Added ImageDraw circle() #8085 [void4, hugovk, radarhere] From 1eb960f7e3e662b489c7cfc2b97b88e5317ffff5 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 11 Jun 2024 23:26:00 +1000 Subject: [PATCH 034/662] Added type hints --- src/PIL/BlpImagePlugin.py | 20 ++++++++-------- src/PIL/BmpImagePlugin.py | 3 ++- src/PIL/DdsImagePlugin.py | 3 ++- src/PIL/EpsImagePlugin.py | 45 ++++++++++++++++++------------------ src/PIL/FitsImagePlugin.py | 2 +- src/PIL/FpxImagePlugin.py | 2 +- src/PIL/ImageFile.py | 2 +- src/PIL/Jpeg2KImagePlugin.py | 15 ++++++------ src/PIL/MicImagePlugin.py | 2 +- src/PIL/MpoImagePlugin.py | 15 ++++-------- src/PIL/PSDraw.py | 2 +- src/PIL/PalmImagePlugin.py | 10 ++++---- src/PIL/PdfParser.py | 3 +-- src/PIL/PngImagePlugin.py | 2 +- src/PIL/TarIO.py | 8 +------ src/PIL/TiffImagePlugin.py | 29 +++++++++++------------ 16 files changed, 78 insertions(+), 85 deletions(-) diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py index 003fa9b24..59246c6e2 100644 --- a/src/PIL/BlpImagePlugin.py +++ b/src/PIL/BlpImagePlugin.py @@ -61,7 +61,9 @@ def unpack_565(i: int) -> tuple[int, int, int]: return ((i >> 11) & 0x1F) << 3, ((i >> 5) & 0x3F) << 2, (i & 0x1F) << 3 -def decode_dxt1(data, alpha=False): +def decode_dxt1( + data: bytes, alpha: bool = False +) -> tuple[bytearray, bytearray, bytearray, bytearray]: """ input: one "row" of data (i.e. will produce 4*width pixels) """ @@ -69,9 +71,9 @@ def decode_dxt1(data, alpha=False): blocks = len(data) // 8 # number of blocks in row ret = (bytearray(), bytearray(), bytearray(), bytearray()) - for block in range(blocks): + for block_index in range(blocks): # Decode next 8-byte block. - idx = block * 8 + idx = block_index * 8 color0, color1, bits = struct.unpack_from(" tuple[bytearray, bytearray, bytearray, bytearray]: """ input: one "row" of data (i.e. will produce 4*width pixels) """ @@ -124,8 +126,8 @@ def decode_dxt3(data): blocks = len(data) // 16 # number of blocks in row ret = (bytearray(), bytearray(), bytearray(), bytearray()) - for block in range(blocks): - idx = block * 16 + for block_index in range(blocks): + idx = block_index * 16 block = data[idx : idx + 16] # Decode next 16-byte block. bits = struct.unpack_from("<8B", block) @@ -169,7 +171,7 @@ def decode_dxt3(data): return ret -def decode_dxt5(data): +def decode_dxt5(data: bytes) -> tuple[bytearray, bytearray, bytearray, bytearray]: """ input: one "row" of data (i.e. will produce 4 * width pixels) """ @@ -177,8 +179,8 @@ def decode_dxt5(data): blocks = len(data) // 16 # number of blocks in row ret = (bytearray(), bytearray(), bytearray(), bytearray()) - for block in range(blocks): - idx = block * 16 + for block_index in range(blocks): + idx = block_index * 16 block = data[idx : idx + 16] # Decode next 16-byte block. a0, a1 = struct.unpack_from(" tuple[int, int]: + assert self.fd is not None rle4 = self.args[1] data = bytearray() x = 0 diff --git a/src/PIL/DdsImagePlugin.py b/src/PIL/DdsImagePlugin.py index 861a1eca0..e74727007 100644 --- a/src/PIL/DdsImagePlugin.py +++ b/src/PIL/DdsImagePlugin.py @@ -480,7 +480,8 @@ class DdsImageFile(ImageFile.ImageFile): class DdsRgbDecoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer): + def decode(self, buffer: bytes) -> tuple[int, int]: + assert self.fd is not None bitcount, masks = self.args # Some masks will be padded with zeros, e.g. R 0b11 G 0b1100 diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index d24a2ba80..380b1cf0e 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -27,6 +27,7 @@ import re import subprocess import sys import tempfile +from typing import IO from . import Image, ImageFile from ._binary import i32le as i32 @@ -236,7 +237,7 @@ class EpsImageFile(ImageFile.ImageFile): msg = 'EPS header missing "%%BoundingBox" comment' raise SyntaxError(msg) - def _read_comment(s): + def _read_comment(s: str) -> bool: nonlocal reading_trailer_comments try: m = split.match(s) @@ -244,27 +245,25 @@ class EpsImageFile(ImageFile.ImageFile): msg = "not an EPS file" raise SyntaxError(msg) from e - if m: - k, v = m.group(1, 2) - self.info[k] = v - if k == "BoundingBox": - if v == "(atend)": - reading_trailer_comments = True - elif not self._size or ( - trailer_reached and reading_trailer_comments - ): - try: - # Note: The DSC spec says that BoundingBox - # fields should be integers, but some drivers - # put floating point values there anyway. - box = [int(float(i)) for i in v.split()] - self._size = box[2] - box[0], box[3] - box[1] - self.tile = [ - ("eps", (0, 0) + self.size, offset, (length, box)) - ] - except Exception: - pass - return True + if not m: + return False + + k, v = m.group(1, 2) + self.info[k] = v + if k == "BoundingBox": + if v == "(atend)": + reading_trailer_comments = True + elif not self._size or (trailer_reached and reading_trailer_comments): + try: + # Note: The DSC spec says that BoundingBox + # fields should be integers, but some drivers + # put floating point values there anyway. + box = [int(float(i)) for i in v.split()] + self._size = box[2] - box[0], box[3] - box[1] + self.tile = [("eps", (0, 0) + self.size, offset, (length, box))] + except Exception: + pass + return True while True: byte = self.fp.read(1) @@ -413,7 +412,7 @@ class EpsImageFile(ImageFile.ImageFile): # -------------------------------------------------------------------- -def _save(im, fp, filename, eps=1): +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes, eps: int = 1) -> None: """EPS Writer for the Python Imaging Library.""" # make sure image data is available diff --git a/src/PIL/FitsImagePlugin.py b/src/PIL/FitsImagePlugin.py index 071918925..a169b6083 100644 --- a/src/PIL/FitsImagePlugin.py +++ b/src/PIL/FitsImagePlugin.py @@ -122,7 +122,7 @@ class FitsImageFile(ImageFile.ImageFile): class FitsGzipDecoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer): + def decode(self, buffer: bytes) -> tuple[int, int]: assert self.fd is not None value = gzip.decompress(self.fd.read()) diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py index b3e6c6e36..c1927bd26 100644 --- a/src/PIL/FpxImagePlugin.py +++ b/src/PIL/FpxImagePlugin.py @@ -241,7 +241,7 @@ class FpxImageFile(ImageFile.ImageFile): self.ole.close() super().close() - def __exit__(self, *args): + def __exit__(self, *args: object) -> None: self.ole.close() super().__exit__() diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 6bef681e9..5d67409ea 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -487,7 +487,7 @@ class Parser: def __enter__(self): return self - def __exit__(self, *args): + def __exit__(self, *args: object) -> None: self.close() def close(self): diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py index 72c2cb85e..60f3bff0a 100644 --- a/src/PIL/Jpeg2KImagePlugin.py +++ b/src/PIL/Jpeg2KImagePlugin.py @@ -18,7 +18,7 @@ from __future__ import annotations import io import os import struct -from typing import IO +from typing import IO, Tuple, cast from . import Image, ImageFile, ImagePalette, _binary @@ -59,7 +59,7 @@ class BoxReader: self.remaining_in_box -= num_bytes return data - def read_fields(self, field_format): + def read_fields(self, field_format: str) -> tuple[int | bytes, ...]: size = struct.calcsize(field_format) data = self._read_bytes(size) return struct.unpack(field_format, data) @@ -82,9 +82,9 @@ class BoxReader: self.remaining_in_box = -1 # Read the length and type of the next box - lbox, tbox = self.read_fields(">I4s") + lbox, tbox = cast(Tuple[int, bytes], self.read_fields(">I4s")) if lbox == 1: - lbox = self.read_fields(">Q")[0] + lbox = cast(int, self.read_fields(">Q")[0]) hlen = 16 else: hlen = 8 @@ -127,12 +127,13 @@ def _parse_codestream(fp): return size, mode -def _res_to_dpi(num, denom, exp): +def _res_to_dpi(num: int, denom: int, exp: int) -> float | None: """Convert JPEG2000's (numerator, denominator, exponent-base-10) resolution, calculated as (num / denom) * 10^exp and stored in dots per meter, to floating-point dots per inch.""" - if denom != 0: - return (254 * num * (10**exp)) / (10000 * denom) + if denom == 0: + return None + return (254 * num * (10**exp)) / (10000 * denom) def _parse_jp2_header(fp): diff --git a/src/PIL/MicImagePlugin.py b/src/PIL/MicImagePlugin.py index 5aef94dfb..ed2ea2849 100644 --- a/src/PIL/MicImagePlugin.py +++ b/src/PIL/MicImagePlugin.py @@ -93,7 +93,7 @@ class MicImageFile(TiffImagePlugin.TiffImageFile): self.ole.close() super().close() - def __exit__(self, *args): + def __exit__(self, *args: object) -> None: self.__fp.close() self.ole.close() super().__exit__() diff --git a/src/PIL/MpoImagePlugin.py b/src/PIL/MpoImagePlugin.py index 152e19e23..f21570661 100644 --- a/src/PIL/MpoImagePlugin.py +++ b/src/PIL/MpoImagePlugin.py @@ -37,19 +37,14 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: JpegImagePlugin._save(im, fp, filename) -def _save_all(im, fp, filename): +def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: append_images = im.encoderinfo.get("append_images", []) - if not append_images: - try: - animated = im.is_animated - except AttributeError: - animated = False - if not animated: - _save(im, fp, filename) - return + if not append_images and not getattr(im, "is_animated", False): + _save(im, fp, filename) + return mpf_offset = 28 - offsets = [] + offsets: list[int] = [] for imSequence in itertools.chain([im], append_images): for im_frame in ImageSequence.Iterator(imSequence): if not offsets: diff --git a/src/PIL/PSDraw.py b/src/PIL/PSDraw.py index 4e2b9788e..673eae1d1 100644 --- a/src/PIL/PSDraw.py +++ b/src/PIL/PSDraw.py @@ -138,7 +138,7 @@ class PSDraw: sx = x / im.size[0] sy = y / im.size[1] self.fp.write(b"%f %f scale\n" % (sx, sy)) - EpsImagePlugin._save(im, self.fp, None, 0) + EpsImagePlugin._save(im, self.fp, "", 0) self.fp.write(b"\ngrestore\n") diff --git a/src/PIL/PalmImagePlugin.py b/src/PIL/PalmImagePlugin.py index 85f9fe1bf..fc83918b5 100644 --- a/src/PIL/PalmImagePlugin.py +++ b/src/PIL/PalmImagePlugin.py @@ -8,6 +8,8 @@ ## from __future__ import annotations +from typing import IO + from . import Image, ImageFile from ._binary import o8 from ._binary import o16be as o16b @@ -82,10 +84,10 @@ _Palm8BitColormapValues = ( # so build a prototype image to be used for palette resampling -def build_prototype_image(): +def build_prototype_image() -> Image.Image: image = Image.new("L", (1, len(_Palm8BitColormapValues))) image.putdata(list(range(len(_Palm8BitColormapValues)))) - palettedata = () + palettedata: tuple[int, ...] = () for colormapValue in _Palm8BitColormapValues: palettedata += colormapValue palettedata += (0, 0, 0) * (256 - len(_Palm8BitColormapValues)) @@ -112,7 +114,7 @@ _COMPRESSION_TYPES = {"none": 0xFF, "rle": 0x01, "scanline": 0x00} # (Internal) Image save plugin for the Palm format. -def _save(im, fp, filename): +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if im.mode == "P": # we assume this is a color Palm image with the standard colormap, # unless the "info" dict has a "custom-colormap" field @@ -141,7 +143,7 @@ def _save(im, fp, filename): raise OSError(msg) # we ignore the palette here - im.mode = "P" + im._mode = "P" rawmode = f"P;{bpp}" version = 1 diff --git a/src/PIL/PdfParser.py b/src/PIL/PdfParser.py index 52e835801..9e2231347 100644 --- a/src/PIL/PdfParser.py +++ b/src/PIL/PdfParser.py @@ -404,9 +404,8 @@ class PdfParser: def __enter__(self) -> PdfParser: return self - def __exit__(self, exc_type, exc_value, traceback): + def __exit__(self, *args: object) -> None: self.close() - return False # do not suppress exceptions def start_writing(self) -> None: self.close_buf() diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 9aaadb47d..ba9598065 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -178,7 +178,7 @@ class ChunkStream: def __enter__(self) -> ChunkStream: return self - def __exit__(self, *args): + def __exit__(self, *args: object) -> None: self.close() def close(self) -> None: diff --git a/src/PIL/TarIO.py b/src/PIL/TarIO.py index 7470663b4..cba26d4b0 100644 --- a/src/PIL/TarIO.py +++ b/src/PIL/TarIO.py @@ -16,7 +16,6 @@ from __future__ import annotations import io -from types import TracebackType from . import ContainerIO @@ -61,12 +60,7 @@ class TarIO(ContainerIO.ContainerIO[bytes]): def __enter__(self) -> TarIO: return self - def __exit__( - self, - exc_type: type[BaseException] | None, - exc_val: BaseException | None, - exc_tb: TracebackType | None, - ) -> None: + def __exit__(self, *args: object) -> None: self.close() def close(self) -> None: diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 08ee506b1..702d8f33b 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -717,7 +717,7 @@ class ImageFileDirectory_v2(_IFDv2Base): # Unspec'd, and length > 1 dest[tag] = values - def __delitem__(self, tag): + def __delitem__(self, tag: int) -> None: self._tags_v2.pop(tag, None) self._tags_v1.pop(tag, None) self._tagdata.pop(tag, None) @@ -1106,7 +1106,7 @@ class TiffImageFile(ImageFile.ImageFile): super().__init__(fp, filename) - def _open(self): + def _open(self) -> None: """Open the first image in a TIFF file""" # Header @@ -1123,8 +1123,8 @@ class TiffImageFile(ImageFile.ImageFile): self.__first = self.__next = self.tag_v2.next self.__frame = -1 self._fp = self.fp - self._frame_pos = [] - self._n_frames = None + self._frame_pos: list[int] = [] + self._n_frames: int | None = None logger.debug("*** TiffImageFile._open ***") logger.debug("- __first: %s", self.__first) @@ -1998,10 +1998,9 @@ class AppendingTiffWriter: def __enter__(self) -> AppendingTiffWriter: return self - def __exit__(self, exc_type, exc_value, traceback): + def __exit__(self, *args: object) -> None: if self.close_fp: self.close() - return False def tell(self) -> int: return self.f.tell() - self.offsetOfNewPage @@ -2043,42 +2042,42 @@ class AppendingTiffWriter: def write(self, data): return self.f.write(data) - def readShort(self): + def readShort(self) -> int: (value,) = struct.unpack(self.shortFmt, self.f.read(2)) return value - def readLong(self): + def readLong(self) -> int: (value,) = struct.unpack(self.longFmt, self.f.read(4)) return value - def rewriteLastShortToLong(self, value): + def rewriteLastShortToLong(self, value: int) -> None: self.f.seek(-2, os.SEEK_CUR) bytes_written = self.f.write(struct.pack(self.longFmt, value)) if bytes_written is not None and bytes_written != 4: msg = f"wrote only {bytes_written} bytes but wanted 4" raise RuntimeError(msg) - def rewriteLastShort(self, value): + def rewriteLastShort(self, value: int) -> None: self.f.seek(-2, os.SEEK_CUR) bytes_written = self.f.write(struct.pack(self.shortFmt, value)) if bytes_written is not None and bytes_written != 2: msg = f"wrote only {bytes_written} bytes but wanted 2" raise RuntimeError(msg) - def rewriteLastLong(self, value): + def rewriteLastLong(self, value: int) -> None: self.f.seek(-4, os.SEEK_CUR) bytes_written = self.f.write(struct.pack(self.longFmt, value)) if bytes_written is not None and bytes_written != 4: msg = f"wrote only {bytes_written} bytes but wanted 4" raise RuntimeError(msg) - def writeShort(self, value): + def writeShort(self, value: int) -> None: bytes_written = self.f.write(struct.pack(self.shortFmt, value)) if bytes_written is not None and bytes_written != 2: msg = f"wrote only {bytes_written} bytes but wanted 2" raise RuntimeError(msg) - def writeLong(self, value): + def writeLong(self, value: int) -> None: bytes_written = self.f.write(struct.pack(self.longFmt, value)) if bytes_written is not None and bytes_written != 4: msg = f"wrote only {bytes_written} bytes but wanted 4" @@ -2097,9 +2096,9 @@ class AppendingTiffWriter: field_size = self.fieldSizes[field_type] total_size = field_size * count is_local = total_size <= 4 + offset: int | None if not is_local: - offset = self.readLong() - offset += self.offsetOfNewPage + offset = self.readLong() + self.offsetOfNewPage self.rewriteLastLong(offset) if tag in self.Tags: From 2e15dc9f534be4411e4eddbf3d85b2034384b6a3 Mon Sep 17 00:00:00 2001 From: mamg22 <45301823+mamg22@users.noreply.github.com> Date: Tue, 11 Jun 2024 22:00:08 -0400 Subject: [PATCH 035/662] Improve xdg directory support in Linux --- src/PIL/ImageFont.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index fa5608e6c..163bb7006 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -837,12 +837,19 @@ def truetype( if windir: dirs.append(os.path.join(windir, "fonts")) elif sys.platform in ("linux", "linux2"): - lindirs = os.environ.get("XDG_DATA_DIRS") - if not lindirs: - # According to the freedesktop spec, XDG_DATA_DIRS should - # default to /usr/share - lindirs = "/usr/share" - dirs += [os.path.join(lindir, "fonts") for lindir in lindirs.split(":")] + data_home = os.environ.get("XDG_DATA_HOME") + if not data_home: + # The freedesktop spec defines the following default directory for + # when XDG_DATA_HOME is unset or empty. This user-level directory + # takes precedence over system-level directories. + data_home = os.path.expanduser("~/.local/share") + dirs.append(os.path.join(data_home, "fonts")) + + data_dirs = os.environ.get("XDG_DATA_DIRS") + if not data_dirs: + # Similarly, defaults are defined for the system-level directories + data_dirs = "/usr/local/share:/usr/share" + dirs += [os.path.join(ddir, "fonts") for ddir in data_dirs.split(":")] elif sys.platform == "darwin": dirs += [ "/Library/Fonts", From 1175e53d53ccd1fa86a94b2f8d2365dbc0a3336a Mon Sep 17 00:00:00 2001 From: mamg22 <45301823+mamg22@users.noreply.github.com> Date: Tue, 11 Jun 2024 22:08:53 -0400 Subject: [PATCH 036/662] Set XDG_DATA_HOME on font tests --- Tests/test_imagefont.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 4398f8a30..3cba726d6 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -564,6 +564,7 @@ def test_find_font( # catching syntax like errors monkeypatch.setattr(sys, "platform", platform) if platform == "linux": + monkeypatch.setenv("XDG_DATA_HOME", "/home/__pillow__/.local/share") monkeypatch.setenv("XDG_DATA_DIRS", "/usr/share/:/usr/local/share/") def fake_walker(path: str) -> list[tuple[str, list[str], list[str]]]: From be73b13ad33a88a17e8055e74993d02c5d3f68a0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 12 Jun 2024 21:15:55 +1000 Subject: [PATCH 037/662] Added type hints --- src/PIL/BdfFontFile.py | 2 +- src/PIL/ImageDraw.py | 20 ++++++------ src/PIL/ImagePalette.py | 12 +++++--- src/PIL/MicImagePlugin.py | 4 +-- src/PIL/PngImagePlugin.py | 63 +++++++++++++++++++++++++------------- src/PIL/TiffImagePlugin.py | 31 +++++++++++-------- src/PIL/_imaging.pyi | 2 +- src/PIL/features.py | 18 ++++++----- 8 files changed, 95 insertions(+), 57 deletions(-) diff --git a/src/PIL/BdfFontFile.py b/src/PIL/BdfFontFile.py index e3eda4fe9..bc1416c74 100644 --- a/src/PIL/BdfFontFile.py +++ b/src/PIL/BdfFontFile.py @@ -103,7 +103,7 @@ def bdf_char( class BdfFontFile(FontFile.FontFile): """Font file plugin for the X11 BDF format.""" - def __init__(self, fp: BinaryIO): + def __init__(self, fp: BinaryIO) -> None: super().__init__() s = fp.readline() diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py index e74fab9fb..41a3eb0cb 100644 --- a/src/PIL/ImageDraw.py +++ b/src/PIL/ImageDraw.py @@ -34,12 +34,16 @@ from __future__ import annotations import math import numbers import struct +from types import ModuleType from typing import TYPE_CHECKING, AnyStr, Sequence, cast from . import Image, ImageColor from ._deprecate import deprecate from ._typing import Coords +if TYPE_CHECKING: + from . import ImageDraw2, ImageFont + """ A simple 2D drawing interface for PIL images.

@@ -93,9 +97,6 @@ class ImageDraw: self.fontmode = "L" # aliasing is okay for other modes self.fill = False - if TYPE_CHECKING: - from . import ImageFont - def getfont( self, ) -> ImageFont.ImageFont | ImageFont.FreeTypeFont | ImageFont.TransposedFont: @@ -879,7 +880,7 @@ class ImageDraw: return bbox -def Draw(im, mode: str | None = None) -> ImageDraw: +def Draw(im: Image.Image, mode: str | None = None) -> ImageDraw: """ A simple 2D drawing interface for PIL images. @@ -891,7 +892,7 @@ def Draw(im, mode: str | None = None) -> ImageDraw: defaults to the mode of the image. """ try: - return im.getdraw(mode) + return getattr(im, "getdraw")(mode) except AttributeError: return ImageDraw(im, mode) @@ -903,7 +904,9 @@ except AttributeError: Outline = None -def getdraw(im=None, hints=None): +def getdraw( + im: Image.Image | None = None, hints: list[str] | None = None +) -> tuple[ImageDraw2.Draw | None, ModuleType]: """ :param im: The image to draw in. :param hints: An optional list of hints. Deprecated. @@ -913,9 +916,8 @@ def getdraw(im=None, hints=None): deprecate("'hints' parameter", 12) from . import ImageDraw2 - if im: - im = ImageDraw2.Draw(im) - return im, ImageDraw2 + draw = ImageDraw2.Draw(im) if im is not None else None + return draw, ImageDraw2 def floodfill( diff --git a/src/PIL/ImagePalette.py b/src/PIL/ImagePalette.py index 1ff05a3ef..6473c4577 100644 --- a/src/PIL/ImagePalette.py +++ b/src/PIL/ImagePalette.py @@ -54,7 +54,7 @@ class ImagePalette: self._palette = palette @property - def colors(self): + def colors(self) -> dict[tuple[int, int, int] | tuple[int, int, int, int], int]: if self._colors is None: mode_len = len(self.mode) self._colors = {} @@ -66,7 +66,9 @@ class ImagePalette: return self._colors @colors.setter - def colors(self, colors): + def colors( + self, colors: dict[tuple[int, int, int] | tuple[int, int, int, int], int] + ) -> None: self._colors = colors def copy(self) -> ImagePalette: @@ -107,11 +109,13 @@ class ImagePalette: # Declare tostring as an alias for tobytes tostring = tobytes - def _new_color_index(self, image=None, e=None): + def _new_color_index( + self, image: Image.Image | None = None, e: Exception | None = None + ) -> int: if not isinstance(self.palette, bytearray): self._palette = bytearray(self.palette) index = len(self.palette) // 3 - special_colors = () + special_colors: tuple[int | tuple[int, ...] | None, ...] = () if image: special_colors = ( image.info.get("background"), diff --git a/src/PIL/MicImagePlugin.py b/src/PIL/MicImagePlugin.py index ed2ea2849..07239887f 100644 --- a/src/PIL/MicImagePlugin.py +++ b/src/PIL/MicImagePlugin.py @@ -63,7 +63,7 @@ class MicImageFile(TiffImagePlugin.TiffImageFile): msg = "not an MIC file; no image entries" raise SyntaxError(msg) - self.frame = None + self.frame = -1 self._n_frames = len(self.images) self.is_animated = self._n_frames > 1 @@ -85,7 +85,7 @@ class MicImageFile(TiffImagePlugin.TiffImageFile): self.frame = frame - def tell(self): + def tell(self) -> int: return self.frame def close(self) -> None: diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index ba9598065..927d6c0cf 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -39,7 +39,7 @@ import struct import warnings import zlib from enum import IntEnum -from typing import IO, Any +from typing import IO, TYPE_CHECKING, Any, NoReturn from . import Image, ImageChops, ImageFile, ImagePalette, ImageSequence from ._binary import i16be as i16 @@ -48,6 +48,9 @@ from ._binary import o8 from ._binary import o16be as o16 from ._binary import o32be as o32 +if TYPE_CHECKING: + from . import _imaging + logger = logging.getLogger(__name__) is_cid = re.compile(rb"\w\w\w\w").match @@ -249,6 +252,9 @@ class iTXt(str): """ + lang: str | bytes | None + tkey: str | bytes | None + @staticmethod def __new__(cls, text, lang=None, tkey=None): """ @@ -270,10 +276,10 @@ class PngInfo: """ - def __init__(self): - self.chunks = [] + def __init__(self) -> None: + self.chunks: list[tuple[bytes, bytes, bool]] = [] - def add(self, cid, data, after_idat=False): + def add(self, cid: bytes, data: bytes, after_idat: bool = False) -> None: """Appends an arbitrary chunk. Use with caution. :param cid: a byte string, 4 bytes long. @@ -283,12 +289,16 @@ class PngInfo: """ - chunk = [cid, data] - if after_idat: - chunk.append(True) - self.chunks.append(tuple(chunk)) + self.chunks.append((cid, data, after_idat)) - def add_itxt(self, key, value, lang="", tkey="", zip=False): + def add_itxt( + self, + key: str | bytes, + value: str | bytes, + lang: str | bytes = "", + tkey: str | bytes = "", + zip: bool = False, + ) -> None: """Appends an iTXt chunk. :param key: latin-1 encodable text key name @@ -316,7 +326,9 @@ class PngInfo: else: self.add(b"iTXt", key + b"\0\0\0" + lang + b"\0" + tkey + b"\0" + value) - def add_text(self, key, value, zip=False): + def add_text( + self, key: str | bytes, value: str | bytes | iTXt, zip: bool = False + ) -> None: """Appends a text chunk. :param key: latin-1 encodable text key name @@ -326,7 +338,13 @@ class PngInfo: """ if isinstance(value, iTXt): - return self.add_itxt(key, value, value.lang, value.tkey, zip=zip) + return self.add_itxt( + key, + value, + value.lang if value.lang is not None else b"", + value.tkey if value.tkey is not None else b"", + zip=zip, + ) # The tEXt chunk stores latin-1 text if not isinstance(value, bytes): @@ -434,7 +452,7 @@ class PngStream(ChunkStream): raise SyntaxError(msg) return s - def chunk_IDAT(self, pos, length): + def chunk_IDAT(self, pos: int, length: int) -> NoReturn: # image data if "bbox" in self.im_info: tile = [("zip", self.im_info["bbox"], pos, self.im_rawmode)] @@ -447,7 +465,7 @@ class PngStream(ChunkStream): msg = "image data found" raise EOFError(msg) - def chunk_IEND(self, pos, length): + def chunk_IEND(self, pos: int, length: int) -> NoReturn: msg = "end of PNG image" raise EOFError(msg) @@ -821,7 +839,10 @@ class PngImageFile(ImageFile.ImageFile): msg = "no more images in APNG file" raise EOFError(msg) from e - def _seek(self, frame, rewind=False): + def _seek(self, frame: int, rewind: bool = False) -> None: + assert self.png is not None + + self.dispose: _imaging.ImagingCore | None if frame == 0: if rewind: self._fp.seek(self.__rewind) @@ -906,14 +927,14 @@ class PngImageFile(ImageFile.ImageFile): if self._prev_im is None and self.dispose_op == Disposal.OP_PREVIOUS: self.dispose_op = Disposal.OP_BACKGROUND + self.dispose = None if self.dispose_op == Disposal.OP_PREVIOUS: - self.dispose = self._prev_im.copy() - self.dispose = self._crop(self.dispose, self.dispose_extent) + if self._prev_im: + self.dispose = self._prev_im.copy() + self.dispose = self._crop(self.dispose, self.dispose_extent) elif self.dispose_op == Disposal.OP_BACKGROUND: self.dispose = Image.core.fill(self.mode, self.size) self.dispose = self._crop(self.dispose, self.dispose_extent) - else: - self.dispose = None def tell(self) -> int: return self.__frame @@ -1026,7 +1047,7 @@ class PngImageFile(ImageFile.ImageFile): return None return self.getexif()._get_merged_dict() - def getexif(self): + def getexif(self) -> Image.Exif: if "exif" not in self.info: self.load() @@ -1346,7 +1367,7 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False): chunk(fp, cid, data) elif cid[1:2].islower(): # Private chunk - after_idat = info_chunk[2:3] + after_idat = len(info_chunk) == 3 and info_chunk[2] if not after_idat: chunk(fp, cid, data) @@ -1425,7 +1446,7 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False): cid, data = info_chunk[:2] if cid[1:2].islower(): # Private chunk - after_idat = info_chunk[2:3] + after_idat = len(info_chunk) == 3 and info_chunk[2] if after_idat: chunk(fp, cid, data) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 702d8f33b..833e12d2b 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -50,7 +50,7 @@ import warnings from collections.abc import MutableMapping from fractions import Fraction from numbers import Number, Rational -from typing import IO, TYPE_CHECKING, Any, Callable +from typing import IO, TYPE_CHECKING, Any, Callable, NoReturn from . import ExifTags, Image, ImageFile, ImageOps, ImagePalette, TiffTags from ._binary import i16be as i16 @@ -384,7 +384,7 @@ class IFDRational(Rational): def __repr__(self) -> str: return str(float(self._val)) - def __hash__(self): + def __hash__(self) -> int: return self._val.__hash__() def __eq__(self, other: object) -> bool: @@ -551,7 +551,12 @@ class ImageFileDirectory_v2(_IFDv2Base): _load_dispatch: dict[int, Callable[[ImageFileDirectory_v2, bytes, bool], Any]] = {} _write_dispatch: dict[int, Callable[..., Any]] = {} - def __init__(self, ifh=b"II\052\0\0\0\0\0", prefix=None, group=None): + def __init__( + self, + ifh: bytes = b"II\052\0\0\0\0\0", + prefix: bytes | None = None, + group: int | None = None, + ) -> None: """Initialize an ImageFileDirectory. To construct an ImageFileDirectory from a real file, pass the 8-byte @@ -575,7 +580,7 @@ class ImageFileDirectory_v2(_IFDv2Base): raise SyntaxError(msg) self._bigtiff = ifh[2] == 43 self.group = group - self.tagtype = {} + self.tagtype: dict[int, int] = {} """ Dictionary of tag types """ self.reset() (self.next,) = ( @@ -587,18 +592,18 @@ class ImageFileDirectory_v2(_IFDv2Base): offset = property(lambda self: self._offset) @property - def legacy_api(self): + def legacy_api(self) -> bool: return self._legacy_api @legacy_api.setter - def legacy_api(self, value): + def legacy_api(self, value: bool) -> NoReturn: msg = "Not allowing setting of legacy api" raise Exception(msg) - def reset(self): - self._tags_v1 = {} # will remain empty if legacy_api is false - self._tags_v2 = {} # main tag storage - self._tagdata = {} + def reset(self) -> None: + self._tags_v1: dict[int, Any] = {} # will remain empty if legacy_api is false + self._tags_v2: dict[int, Any] = {} # main tag storage + self._tagdata: dict[int, bytes] = {} self.tagtype = {} # added 2008-06-05 by Florian Hoech self._next = None self._offset = None @@ -2039,7 +2044,7 @@ class AppendingTiffWriter: num_tags = self.readShort() self.f.seek(num_tags * 12, os.SEEK_CUR) - def write(self, data): + def write(self, data: bytes) -> int | None: return self.f.write(data) def readShort(self) -> int: @@ -2122,7 +2127,9 @@ class AppendingTiffWriter: # skip the locally stored value that is not an offset self.f.seek(4, os.SEEK_CUR) - def fixOffsets(self, count, isShort=False, isLong=False): + def fixOffsets( + self, count: int, isShort: bool = False, isLong: bool = False + ) -> None: if not isShort and not isLong: msg = "offset is neither short nor long" raise RuntimeError(msg) diff --git a/src/PIL/_imaging.pyi b/src/PIL/_imaging.pyi index 1fe954417..b233eb34d 100644 --- a/src/PIL/_imaging.pyi +++ b/src/PIL/_imaging.pyi @@ -12,5 +12,5 @@ class ImagingDraw: class PixelAccess: def __getattr__(self, name: str) -> Any: ... -def font(image, glyphdata: bytes) -> ImagingFont: ... +def font(image: ImagingCore, glyphdata: bytes) -> ImagingFont: ... def __getattr__(name: str) -> Any: ... diff --git a/src/PIL/features.py b/src/PIL/features.py index 16c749f14..13908c4eb 100644 --- a/src/PIL/features.py +++ b/src/PIL/features.py @@ -4,6 +4,7 @@ import collections import os import sys import warnings +from typing import IO import PIL @@ -223,7 +224,7 @@ def get_supported() -> list[str]: return ret -def pilinfo(out=None, supported_formats=True): +def pilinfo(out: IO[str] | None = None, supported_formats: bool = True) -> None: """ Prints information about this installation of Pillow. This function can be called with ``python3 -m PIL``. @@ -244,9 +245,9 @@ def pilinfo(out=None, supported_formats=True): print("-" * 68, file=out) print(f"Pillow {PIL.__version__}", file=out) - py_version = sys.version.splitlines() - print(f"Python {py_version[0].strip()}", file=out) - for py_version in py_version[1:]: + py_version_lines = sys.version.splitlines() + print(f"Python {py_version_lines[0].strip()}", file=out) + for py_version in py_version_lines[1:]: print(f" {py_version.strip()}", file=out) print("-" * 68, file=out) print(f"Python executable is {sys.executable or 'unknown'}", file=out) @@ -282,9 +283,12 @@ def pilinfo(out=None, supported_formats=True): ("xcb", "XCB (X protocol)"), ]: if check(name): - if name == "jpg" and check_feature("libjpeg_turbo"): - v = "libjpeg-turbo " + version_feature("libjpeg_turbo") - else: + v: str | None = None + if name == "jpg": + libjpeg_turbo_version = version_feature("libjpeg_turbo") + if libjpeg_turbo_version is not None: + v = "libjpeg-turbo " + libjpeg_turbo_version + if v is None: v = version(name) if v is not None: version_static = name in ("pil", "jpg") From eea3ac765c2793f1931ca5696555f497011e0b0e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 12 Jun 2024 22:44:03 +1000 Subject: [PATCH 038/662] Deprecate non-image and unsupported modes --- Tests/test_imagecms.py | 9 ++++++++- docs/deprecations.rst | 9 +++++++++ docs/releasenotes/10.4.0.rst | 7 +++++++ src/PIL/ImageCms.py | 25 +++++++++++++++++++++++++ src/_imagingcms.c | 10 ++++++---- 5 files changed, 55 insertions(+), 5 deletions(-) diff --git a/Tests/test_imagecms.py b/Tests/test_imagecms.py index 55f72c3b9..dbbd46dcf 100644 --- a/Tests/test_imagecms.py +++ b/Tests/test_imagecms.py @@ -678,7 +678,8 @@ def test_auxiliary_channels_isolated() -> None: def test_long_modes() -> None: p = ImageCms.getOpenProfile("Tests/icc/sGrey-v2-nano.icc") - ImageCms.buildTransform(p, p, "ABCDEFGHI", "ABCDEFGHI") + with pytest.warns(DeprecationWarning): + ImageCms.buildTransform(p, p, "ABCDEFGHI", "ABCDEFGHI") @pytest.mark.parametrize("mode", ("RGB", "RGBA", "RGBX")) @@ -699,3 +700,9 @@ def test_deprecation() -> None: assert ImageCms.VERSION == "1.0.0 pil" with pytest.warns(DeprecationWarning): assert isinstance(ImageCms.FLAGS, dict) + + profile = ImageCmsProfile(ImageCms.createProfile("sRGB")) + with pytest.warns(DeprecationWarning): + ImageCms.ImageCmsTransform(profile, profile, "RGBA;16B", "RGB") + with pytest.warns(DeprecationWarning): + ImageCms.ImageCmsTransform(profile, profile, "RGB", "RGBA;16B") diff --git a/docs/deprecations.rst b/docs/deprecations.rst index 627672e1f..e6566eae2 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -107,6 +107,15 @@ BGR;15, BGR 16 and BGR;24 The experimental BGR;15, BGR;16 and BGR;24 modes have been deprecated. +Non-image modes in ImageCms +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 10.4.0 + +The use in :py:mod:`.ImageCms` of input modes and output modes that are not Pillow +image modes has been deprecated. Defaulting to "L" or "1" if the mode cannot be mapped +is also deprecated. + Support for LibTIFF earlier than 4 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/releasenotes/10.4.0.rst b/docs/releasenotes/10.4.0.rst index 44727efd4..96300c008 100644 --- a/docs/releasenotes/10.4.0.rst +++ b/docs/releasenotes/10.4.0.rst @@ -28,6 +28,13 @@ BGR;15, BGR 16 and BGR;24 The experimental BGR;15, BGR;16 and BGR;24 modes have been deprecated. +Non-image modes in ImageCms +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The use in :py:mod:`.ImageCms` of input modes and output modes that are not Pillow +image modes has been deprecated. Defaulting to "L" or "1" if the mode cannot be mapped +is also deprecated. + Support for LibTIFF earlier than 4 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/PIL/ImageCms.py b/src/PIL/ImageCms.py index 19a79facc..ec10230f1 100644 --- a/src/PIL/ImageCms.py +++ b/src/PIL/ImageCms.py @@ -299,6 +299,31 @@ class ImageCmsTransform(Image.ImagePointHandler): proof_intent: Intent = Intent.ABSOLUTE_COLORIMETRIC, flags: Flags = Flags.NONE, ): + supported_modes = ( + "RGB", + "RGBA", + "RGBX", + "CMYK", + "I;16", + "I;16L", + "I;16B", + "YCbCr", + "LAB", + "L", + "1", + ) + for mode in (input_mode, output_mode): + if mode not in supported_modes: + deprecate( + mode, + 12, + { + "L;16": "I;16 or I;16L", + "L:16B": "I;16B", + "YCCA": "YCbCr", + "YCC": "YCbCr", + }.get(mode), + ) if proof is None: self.transform = core.buildTransform( input.profile, output.profile, input_mode, output_mode, intent, flags diff --git a/src/_imagingcms.c b/src/_imagingcms.c index 2b9612db7..590e1b983 100644 --- a/src/_imagingcms.c +++ b/src/_imagingcms.c @@ -223,20 +223,22 @@ findLCMStype(char *PILmode) { if (strcmp(PILmode, "CMYK") == 0) { return TYPE_CMYK_8; } - if (strcmp(PILmode, "L;16") == 0) { + if (strcmp(PILmode, "I;16") == 0 || strcmp(PILmode, "I;16L") == 0 || + strcmp(PILmode, "L;16") == 0) { return TYPE_GRAY_16; } - if (strcmp(PILmode, "L;16B") == 0) { + if (strcmp(PILmode, "I;16B") == 0 || strcmp(PILmode, "L;16B") == 0) { return TYPE_GRAY_16_SE; } - if (strcmp(PILmode, "YCCA") == 0 || strcmp(PILmode, "YCC") == 0) { + if (strcmp(PILmode, "YCbCr") == 0 || strcmp(PILmode, "YCCA") == 0 || + strcmp(PILmode, "YCC") == 0) { return TYPE_YCbCr_8; } if (strcmp(PILmode, "LAB") == 0) { // LabX equivalent like ALab, but not reversed -- no #define in lcms2 return (COLORSPACE_SH(PT_LabV2) | CHANNELS_SH(3) | BYTES_SH(1) | EXTRA_SH(1)); } - /* presume "L" by default */ + /* presume "1" or "L" by default */ return TYPE_GRAY_8; } From c9a9e81749c12fdc4c7187284fe661810c9bc5c4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 13 Jun 2024 00:03:16 +1000 Subject: [PATCH 039/662] Use latest Ubuntu --- .readthedocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index b83ba05b1..def6282dd 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -3,7 +3,7 @@ version: 2 formats: [pdf] build: - os: ubuntu-22.04 + os: ubuntu-lts-latest tools: python: "3" jobs: From 00161099c7df3aa76bcbd7106aa144072b45a592 Mon Sep 17 00:00:00 2001 From: mamg22 <45301823+mamg22@users.noreply.github.com> Date: Wed, 12 Jun 2024 12:36:14 -0400 Subject: [PATCH 040/662] Update docs for ImageFont.truetype [ci skip] --- src/PIL/ImageFont.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 163bb7006..235a76325 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -775,10 +775,15 @@ def truetype( :param font: A filename or file-like object containing a TrueType font. If the file is not found in this filename, the loader may also - search in other directories, such as the :file:`fonts/` - directory on Windows or :file:`/Library/Fonts/`, - :file:`/System/Library/Fonts/` and :file:`~/Library/Fonts/` on - macOS. + search in other directories, such as: + + * The :file:`fonts/` directory on Windows, + * :file:`/Library/Fonts/`, :file:`/System/Library/Fonts/` + and :file:`~/Library/Fonts/` on macOS. + * :file:`~/.local/share/fonts`, :file:`/usr/local/share/fonts`, + and :file:`/usr/share/fonts` on Linux; or those specified by + the ``XDG_DATA_HOME`` and ``XDG_DATA_DIRS`` environment variables + for user-installed and system-wide fonts, respectively. :param size: The requested size, in pixels. :param index: Which font face to load (default is first available face). From ed828d23df58f8e59f69933b74db12d7fba87c8c Mon Sep 17 00:00:00 2001 From: mamg22 <45301823+mamg22@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:08:48 -0400 Subject: [PATCH 041/662] Update changes in release notes [ci skip] --- docs/releasenotes/10.4.0.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/releasenotes/10.4.0.rst b/docs/releasenotes/10.4.0.rst index 44727efd4..0a54cc7a3 100644 --- a/docs/releasenotes/10.4.0.rst +++ b/docs/releasenotes/10.4.0.rst @@ -42,6 +42,14 @@ The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecat API Changes =========== +ImageFont.truetype +^^^^^^^^^^^^^^^^^^ + +:py:function:`~PIL.ImageFont.truetype` now searches for fonts in the directory +indicated by the ``XDG_DATA_HOME`` in addition to those specified in ``XDG_DATA_DIRS``. +Additionally, the default for ``XDG_DATA_DIRS`` has been updated to match the +freedesktop spec. + TODO ^^^^ From 7e14364cee9e5f78d0bb658dbf470a4e7e580e34 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 1 May 2024 22:03:33 +1000 Subject: [PATCH 042/662] putalpha does not allow other color values --- src/PIL/Image.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index da61ef4dd..5416524c0 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1933,8 +1933,7 @@ class Image: The new layer must be either "L" or "1". :param alpha: The new alpha layer. This can either be an "L" or "1" - image having the same size as this image, or an integer or - other color value. + image having the same size as this image, or an integer. """ self._ensure_mutable() From eb56f3ed56c9f72e5579943f9c87a2fcc9846587 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 30 May 2024 23:20:13 +1000 Subject: [PATCH 043/662] Removed ignores --- src/PIL/Image.py | 5 ++--- src/PIL/ImageGrab.py | 5 +++-- src/PIL/PyAccess.py | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 5416524c0..faf70b718 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -2074,9 +2074,8 @@ class Image: if self.mode == "PA": alpha = value[3] if len(value) == 4 else 255 value = value[:3] - value = self.palette.getcolor(value, self) - if self.mode == "PA": - value = (value, alpha) # type: ignore[assignment] + palette_index = self.palette.getcolor(value, self) + value = (palette_index, alpha) if self.mode == "PA" else palette_index return self.im.putpixel(xy, value) def remap_palette(self, dest_map, source_palette=None): diff --git a/src/PIL/ImageGrab.py b/src/PIL/ImageGrab.py index f16e95544..96a28bb35 100644 --- a/src/PIL/ImageGrab.py +++ b/src/PIL/ImageGrab.py @@ -33,6 +33,7 @@ def grab( all_screens: bool = False, xdisplay: str | None = None, ) -> Image.Image: + im: Image.Image if xdisplay is None: if sys.platform == "darwin": fh, filepath = tempfile.mkstemp(".png") @@ -42,7 +43,7 @@ def grab( left, top, right, bottom = bbox args += ["-R", f"{left},{top},{right-left},{bottom-top}"] subprocess.call(args + ["-x", filepath]) - im: Image.Image = Image.open(filepath) + im = Image.open(filepath) im.load() os.unlink(filepath) if bbox: @@ -84,7 +85,7 @@ def grab( fh, filepath = tempfile.mkstemp(".png") os.close(fh) subprocess.call(["gnome-screenshot", "-f", filepath]) - im: Image.Image = Image.open(filepath) # type: ignore[no-redef, unused-ignore] + im = Image.open(filepath) im.load() os.unlink(filepath) if bbox: diff --git a/src/PIL/PyAccess.py b/src/PIL/PyAccess.py index cc8e2e359..5663a7e48 100644 --- a/src/PIL/PyAccess.py +++ b/src/PIL/PyAccess.py @@ -107,9 +107,8 @@ class PyAccess: if self._im.mode == "PA": alpha = color[3] if len(color) == 4 else 255 color = color[:3] - color = self._palette.getcolor(color, self._img) - if self._im.mode == "PA": - color = (color, alpha) # type: ignore[assignment] + palette_index = self._palette.getcolor(color, self._img) + color = (palette_index, alpha) if self._im.mode == "PA" else palette_index return self.set_pixel(x, y, color) From 2a2033eea1bd36637645f211239033bb7fad482d Mon Sep 17 00:00:00 2001 From: Nulano Date: Wed, 12 Jun 2024 21:35:22 +0200 Subject: [PATCH 044/662] mypy fixes after merge --- src/PIL/Image.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 76ea48510..6dee3fe23 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1128,7 +1128,10 @@ class Image: del new_im.info["transparency"] if trns is not None: try: - new_im.info["transparency"] = new_im.palette.getcolor(trns, new_im) + new_im.info["transparency"] = new_im.palette.getcolor( + cast(Tuple[int, int, int], trns), # trns was converted to RGB + new_im, + ) except Exception: # if we can't make a transparent color, don't leave the old # transparency hanging around to mess us up. @@ -1178,7 +1181,10 @@ class Image: if trns is not None: if new_im.mode == "P": try: - new_im.info["transparency"] = new_im.palette.getcolor(trns, new_im) + new_im.info["transparency"] = new_im.palette.getcolor( + cast(Tuple[int, int, int], trns), # trns was converted to RGB + new_im, + ) except ValueError as e: del new_im.info["transparency"] if str(e) != "cannot allocate more than 256 colors": From 238110303c7bf829c0e56e5f721bcd80ad715699 Mon Sep 17 00:00:00 2001 From: Nulano Date: Wed, 12 Jun 2024 22:17:10 +0200 Subject: [PATCH 045/662] getpixel and putpixel also support a list argument --- src/PIL/Image.py | 6 ++++-- src/PIL/PyAccess.py | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 6dee3fe23..9c60bbb7a 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1676,7 +1676,7 @@ class Image: del self.info["transparency"] def getpixel( - self, xy: tuple[SupportsInt, SupportsInt] + self, xy: tuple[int, int] | list[int] ) -> float | tuple[int, ...] | None: """ Returns the pixel value at a given position. @@ -2058,7 +2058,9 @@ class Image: self.palette.mode = "RGB" self.load() # install new palette - def putpixel(self, xy: tuple[int, int], value: float | tuple[int, ...]) -> None: + def putpixel( + self, xy: tuple[int, int], value: float | tuple[int, ...] | list[int] + ) -> None: """ Modifies the pixel at the given position. The color is given as a single numerical value for single-band images, and a tuple for diff --git a/src/PIL/PyAccess.py b/src/PIL/PyAccess.py index 5663a7e48..d41f00aea 100644 --- a/src/PIL/PyAccess.py +++ b/src/PIL/PyAccess.py @@ -77,7 +77,11 @@ class PyAccess: def _post_init(self) -> None: pass - def __setitem__(self, xy: tuple[int, int], color: float | tuple[int, ...]) -> None: + def __setitem__( + self, + xy: tuple[int, int] | list[int], + color: float | tuple[int, ...] | list[int], + ) -> None: """ Modifies the pixel at x,y. The color is given as a single numerical value for single band images, and a tuple for @@ -112,7 +116,7 @@ class PyAccess: return self.set_pixel(x, y, color) - def __getitem__(self, xy: tuple[int, int]) -> float | tuple[int, ...]: + def __getitem__(self, xy: tuple[int, int] | list[int]) -> float | tuple[int, ...]: """ Returns the pixel at x,y. The pixel is returned as a single value for single band images or a tuple for multiple band From 0a2baab6c1744a42422713858bc2bc2872805794 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 20:19:17 +0000 Subject: [PATCH 046/662] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/PIL/Image.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 9c60bbb7a..5619915ea 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -48,7 +48,6 @@ from typing import ( Literal, Protocol, Sequence, - SupportsInt, Tuple, cast, ) From 142cb11dcce7b82df56c018a457e6d9876c7397e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 13 Jun 2024 10:58:51 +1000 Subject: [PATCH 047/662] Use GitHub URL for xz --- winbuild/build_prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 1df8db17b..0bc739ea8 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -176,7 +176,7 @@ DEPS = { "libs": [r"*.lib"], }, "xz": { - "url": f"{SF_PROJECTS}/lzmautils/files/xz-{V['XZ']}.tar.gz/download", + "url": f"https://github.com/tukaani-project/xz/releases/download/v{V['XZ']}/xz-{V['XZ']}.tar.gz", "filename": f"xz-{V['XZ']}.tar.gz", "dir": f"xz-{V['XZ']}", "license": "COPYING", From 6cf08afb1587bfb148334907f91ae7dbe4d8a41b Mon Sep 17 00:00:00 2001 From: mamg22 <45301823+mamg22@users.noreply.github.com> Date: Thu, 13 Jun 2024 00:03:03 -0400 Subject: [PATCH 048/662] Fix broken reference in release notes [ci skip] Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- docs/releasenotes/10.4.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/releasenotes/10.4.0.rst b/docs/releasenotes/10.4.0.rst index 0a54cc7a3..36c2758f9 100644 --- a/docs/releasenotes/10.4.0.rst +++ b/docs/releasenotes/10.4.0.rst @@ -45,7 +45,7 @@ API Changes ImageFont.truetype ^^^^^^^^^^^^^^^^^^ -:py:function:`~PIL.ImageFont.truetype` now searches for fonts in the directory +:py:func:`~PIL.ImageFont.truetype` now searches for fonts in the directory indicated by the ``XDG_DATA_HOME`` in addition to those specified in ``XDG_DATA_DIRS``. Additionally, the default for ``XDG_DATA_DIRS`` has been updated to match the freedesktop spec. From 48606afeb6e69483c329535106383c3dd79a323c Mon Sep 17 00:00:00 2001 From: mamg22 <45301823+mamg22@users.noreply.github.com> Date: Thu, 13 Jun 2024 00:12:07 -0400 Subject: [PATCH 049/662] Add missing wording for envvar in release notes [ci skip] --- docs/releasenotes/10.4.0.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/releasenotes/10.4.0.rst b/docs/releasenotes/10.4.0.rst index 36c2758f9..00506a094 100644 --- a/docs/releasenotes/10.4.0.rst +++ b/docs/releasenotes/10.4.0.rst @@ -45,10 +45,10 @@ API Changes ImageFont.truetype ^^^^^^^^^^^^^^^^^^ -:py:func:`~PIL.ImageFont.truetype` now searches for fonts in the directory -indicated by the ``XDG_DATA_HOME`` in addition to those specified in ``XDG_DATA_DIRS``. -Additionally, the default for ``XDG_DATA_DIRS`` has been updated to match the -freedesktop spec. +:py:func:`~PIL.ImageFont.truetype` now searches for fonts in the directory indicated +by the ``XDG_DATA_HOME`` envirnorment variable in addition to those specified in +``XDG_DATA_DIRS``. Additionally, the default for ``XDG_DATA_DIRS`` has been updated +to match the freedesktop spec. TODO ^^^^ From d56ffebf2a18ffd94043300418bcb98819a6a776 Mon Sep 17 00:00:00 2001 From: mamg22 <45301823+mamg22@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:43:40 -0400 Subject: [PATCH 050/662] Fix typo in release notes [ci skip] Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- docs/releasenotes/10.4.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/releasenotes/10.4.0.rst b/docs/releasenotes/10.4.0.rst index 00506a094..1678b460c 100644 --- a/docs/releasenotes/10.4.0.rst +++ b/docs/releasenotes/10.4.0.rst @@ -46,7 +46,7 @@ ImageFont.truetype ^^^^^^^^^^^^^^^^^^ :py:func:`~PIL.ImageFont.truetype` now searches for fonts in the directory indicated -by the ``XDG_DATA_HOME`` envirnorment variable in addition to those specified in +by the ``XDG_DATA_HOME`` environment variable in addition to those specified in ``XDG_DATA_DIRS``. Additionally, the default for ``XDG_DATA_DIRS`` has been updated to match the freedesktop spec. From 20ce7ad9f8c23bf6b02fd0a68cd39b20f12b58b7 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 13 Jun 2024 19:36:32 +1000 Subject: [PATCH 051/662] Updated type hint --- src/PIL/PyAccess.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/PIL/PyAccess.py b/src/PIL/PyAccess.py index d41f00aea..3be1ccace 100644 --- a/src/PIL/PyAccess.py +++ b/src/PIL/PyAccess.py @@ -148,7 +148,9 @@ class PyAccess: def get_pixel(self, x: int, y: int) -> float | tuple[int, ...]: raise NotImplementedError() - def set_pixel(self, x: int, y: int, color: float | tuple[int, ...]) -> None: + def set_pixel( + self, x: int, y: int, color: float | tuple[int, ...] | list[int] + ) -> None: raise NotImplementedError() From 05a70e7861f37d2eb65be0186345ea8ea62fc3fe Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 14 Jun 2024 20:59:12 +1000 Subject: [PATCH 052/662] Corrected Ghostscript path --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 92a04a021..6ce5200b6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -35,7 +35,7 @@ install: - curl -fsSL -o nasm-win64.zip https://raw.githubusercontent.com/python-pillow/pillow-depends/main/nasm-2.16.03-win64.zip - 7z x nasm-win64.zip -oc:\ - choco install ghostscript --version=10.3.1 -- path c:\nasm-2.16.03;C:\Program Files\gs\gs10.00.0\bin;%PATH% +- path c:\nasm-2.16.03;C:\Program Files\gs\gs10.03.1\bin;%PATH% - cd c:\pillow\winbuild\ - ps: | c:\python38\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\ From dfd53564ff6a3fc7d35a5884bc0ef03939bcec0a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 15 Jun 2024 11:51:02 +1000 Subject: [PATCH 053/662] Ignore brew dependencies for libraqm on macOS 13 --- .github/workflows/macos-install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh index 28124d7f7..f8f191d38 100755 --- a/.github/workflows/macos-install.sh +++ b/.github/workflows/macos-install.sh @@ -7,11 +7,15 @@ brew install \ ghostscript \ libimagequant \ libjpeg \ - libraqm \ libtiff \ little-cms2 \ openjpeg \ webp +if [[ "$ImageOS" == "macos13" ]]; then + brew install --ignore-dependencies libraqm +else + brew install libraqm +fi export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig" # TODO Update condition when cffi supports 3.13 From b3e3784b8ebf4fc8c29d9a28d1987fb21ec57c65 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 15 Jun 2024 16:05:58 +1000 Subject: [PATCH 054/662] Added byte support to FreeTypeFont --- Tests/test_imagefont.py | 17 +++++++++++ src/PIL/ImageFont.py | 8 +++--- src/PIL/_imagingft.pyi | 4 +-- src/_imagingft.c | 64 +++++++++++++++++++---------------------- 4 files changed, 53 insertions(+), 40 deletions(-) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 4398f8a30..4ca882aab 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -1096,6 +1096,23 @@ def test_too_many_characters(font: ImageFont.FreeTypeFont) -> None: imagefont.getmask("A" * 1_000_001) +def test_bytes(font: ImageFont.FreeTypeFont) -> None: + assert font.getlength(b"test") == font.getlength("test") + + assert font.getbbox(b"test") == font.getbbox("test") + + assert_image_equal( + Image.Image()._new(font.getmask(b"test")), + Image.Image()._new(font.getmask("test")), + ) + + assert_image_equal( + Image.Image()._new(font.getmask2(b"test")[0]), + Image.Image()._new(font.getmask2("test")[0]), + ) + assert font.getmask2(b"test")[1] == font.getmask2("test")[1] + + @pytest.mark.parametrize( "test_file", [ diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index fa5608e6c..ac85f48be 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -279,7 +279,7 @@ class FreeTypeFont: return self.font.ascent, self.font.descent def getlength( - self, text: str, mode="", direction=None, features=None, language=None + self, text: str | bytes, mode="", direction=None, features=None, language=None ) -> float: """ Returns length (in pixels with 1/64 precision) of given text when rendered @@ -354,7 +354,7 @@ class FreeTypeFont: def getbbox( self, - text: str, + text: str | bytes, mode: str = "", direction: str | None = None, features: list[str] | None = None, @@ -511,7 +511,7 @@ class FreeTypeFont: def getmask2( self, - text: str, + text: str | bytes, mode="", direction=None, features=None, @@ -730,7 +730,7 @@ class TransposedFont: return 0, 0, height, width return 0, 0, width, height - def getlength(self, text: str, *args, **kwargs) -> float: + def getlength(self, text: str | bytes, *args, **kwargs) -> float: if self.orientation in (Image.Transpose.ROTATE_90, Image.Transpose.ROTATE_270): msg = "text length is undefined for text rotated by 90 or 270 degrees" raise ValueError(msg) diff --git a/src/PIL/_imagingft.pyi b/src/PIL/_imagingft.pyi index 6e0ddd2f1..5e97b40b2 100644 --- a/src/PIL/_imagingft.pyi +++ b/src/PIL/_imagingft.pyi @@ -27,7 +27,7 @@ class Font: def glyphs(self) -> int: ... def render( self, - string: str, + string: str | bytes, fill, mode=..., dir=..., @@ -51,7 +51,7 @@ class Font: /, ) -> tuple[tuple[int, int], tuple[int, int]]: ... def getlength( - self, string: str, mode=..., dir=..., features=..., lang=..., / + self, string: str | bytes, mode=..., dir=..., features=..., lang=..., / ) -> float: ... def getvarnames(self) -> list[bytes]: ... def getvaraxes(self) -> list[_Axis] | None: ... diff --git a/src/_imagingft.c b/src/_imagingft.c index e83ddfec1..ba36cc72c 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -233,18 +233,6 @@ getfont(PyObject *self_, PyObject *args, PyObject *kw) { return (PyObject *)self; } -static int -font_getchar(PyObject *string, int index, FT_ULong *char_out) { - if (PyUnicode_Check(string)) { - if (index >= PyUnicode_GET_LENGTH(string)) { - return 0; - } - *char_out = PyUnicode_READ_CHAR(string, index); - return 1; - } - return 0; -} - #ifdef HAVE_RAQM static size_t @@ -266,28 +254,34 @@ text_layout_raqm( goto failed; } + Py_ssize_t size; + int set_text; if (PyUnicode_Check(string)) { Py_UCS4 *text = PyUnicode_AsUCS4Copy(string); - Py_ssize_t size = PyUnicode_GET_LENGTH(string); + size = PyUnicode_GET_LENGTH(string); if (!text || !size) { /* return 0 and clean up, no glyphs==no size, and raqm fails with empty strings */ goto failed; } - int set_text = raqm_set_text(rq, text, size); + set_text = raqm_set_text(rq, text, size); PyMem_Free(text); - if (!set_text) { - PyErr_SetString(PyExc_ValueError, "raqm_set_text() failed"); + } else { + char *buffer; + PyBytes_AsStringAndSize(string, &buffer, &size); + if (!buffer || !size) { + /* return 0 and clean up, no glyphs==no size, + and raqm fails with empty strings */ goto failed; } - if (lang) { - if (!raqm_set_language(rq, lang, start, size)) { - PyErr_SetString(PyExc_ValueError, "raqm_set_language() failed"); - goto failed; - } - } - } else { - PyErr_SetString(PyExc_TypeError, "expected string"); + set_text = raqm_set_text_utf8(rq, buffer, size); + } + if (!set_text) { + PyErr_SetString(PyExc_ValueError, "raqm_set_text() failed"); + goto failed; + } + if (lang && !raqm_set_language(rq, lang, start, size)) { + PyErr_SetString(PyExc_ValueError, "raqm_set_language() failed"); goto failed; } @@ -405,13 +399,13 @@ text_layout_fallback( GlyphInfo **glyph_info, int mask, int color) { - int error, load_flags; + int error, load_flags, i; + char *buffer = NULL; FT_ULong ch; Py_ssize_t count; FT_GlyphSlot glyph; FT_Bool kerning = FT_HAS_KERNING(self->face); FT_UInt last_index = 0; - int i; if (features != Py_None || dir != NULL || lang != NULL) { PyErr_SetString( @@ -419,14 +413,11 @@ text_layout_fallback( "setting text direction, language or font features is not supported " "without libraqm"); } - if (!PyUnicode_Check(string)) { - PyErr_SetString(PyExc_TypeError, "expected string"); - return 0; - } - count = 0; - while (font_getchar(string, count, &ch)) { - count++; + if (PyUnicode_Check(string)) { + count = PyUnicode_GET_LENGTH(string); + } else { + PyBytes_AsStringAndSize(string, &buffer, &count); } if (count == 0) { return 0; @@ -445,7 +436,12 @@ text_layout_fallback( if (color) { load_flags |= FT_LOAD_COLOR; } - for (i = 0; font_getchar(string, i, &ch); i++) { + for (i = 0; i < count; i++) { + if (buffer) { + ch = buffer[i]; + } else { + ch = PyUnicode_READ_CHAR(string, i); + } (*glyph_info)[i].index = FT_Get_Char_Index(self->face, ch); error = FT_Load_Glyph(self->face, (*glyph_info)[i].index, load_flags); if (error) { From ed5e8f91c57a402ba67ee23530084b8e99c0c41e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 15 Jun 2024 19:11:11 +1000 Subject: [PATCH 055/662] Use pkg-config to help find libwebp and raqm --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py index abdd87ea2..0abfaaddc 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,9 @@ IMAGEQUANT_ROOT = None JPEG2K_ROOT = None JPEG_ROOT = None LCMS_ROOT = None +RAQM_ROOT = None TIFF_ROOT = None +WEBP_ROOT = None ZLIB_ROOT = None FUZZING_BUILD = "LIB_FUZZING_ENGINE" in os.environ @@ -459,6 +461,8 @@ class pil_build_ext(build_ext): "FREETYPE_ROOT": "freetype2", "HARFBUZZ_ROOT": "harfbuzz", "FRIBIDI_ROOT": "fribidi", + "RAQM_ROOT": "raqm", + "WEBP_ROOT": "libwebp", "LCMS_ROOT": "lcms2", "IMAGEQUANT_ROOT": "libimagequant", }.items(): From f62796dadc35ed21ab5b06be1e655f283046c7cb Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 15 Jun 2024 19:35:46 +1000 Subject: [PATCH 056/662] Rearranged code --- src/PIL/ImageFont.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 235a76325..cc00cdfb6 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -848,13 +848,15 @@ def truetype( # when XDG_DATA_HOME is unset or empty. This user-level directory # takes precedence over system-level directories. data_home = os.path.expanduser("~/.local/share") - dirs.append(os.path.join(data_home, "fonts")) + xdg_dirs = [data_home] data_dirs = os.environ.get("XDG_DATA_DIRS") if not data_dirs: # Similarly, defaults are defined for the system-level directories data_dirs = "/usr/local/share:/usr/share" - dirs += [os.path.join(ddir, "fonts") for ddir in data_dirs.split(":")] + xdg_dirs += data_dirs.split(":") + + dirs += [os.path.join(xdg_dir, "fonts") for xdg_dir in xdg_dirs] elif sys.platform == "darwin": dirs += [ "/Library/Fonts", From e4887610e9ac48699d386b399dbcbf104a470e0f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 15 Jun 2024 22:40:46 +0000 Subject: [PATCH 057/662] Update dependency cibuildwheel to v2.19.1 --- .ci/requirements-cibw.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-cibw.txt b/.ci/requirements-cibw.txt index bf1d1315b..0d0f81fbf 100644 --- a/.ci/requirements-cibw.txt +++ b/.ci/requirements-cibw.txt @@ -1 +1 @@ -cibuildwheel==2.19.0 +cibuildwheel==2.19.1 From 8d14a452df0a6ab1264294b0b28b35032db4f791 Mon Sep 17 00:00:00 2001 From: mamg22 <45301823+mamg22@users.noreply.github.com> Date: Sat, 15 Jun 2024 19:50:10 -0400 Subject: [PATCH 058/662] Update test environment variable for ImageFont Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- Tests/test_imagefont.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 3cba726d6..4e6ec86d9 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -564,7 +564,7 @@ def test_find_font( # catching syntax like errors monkeypatch.setattr(sys, "platform", platform) if platform == "linux": - monkeypatch.setenv("XDG_DATA_HOME", "/home/__pillow__/.local/share") + monkeypatch.setenv("XDG_DATA_HOME", os.path.expanduser("~/.local/share")) monkeypatch.setenv("XDG_DATA_DIRS", "/usr/share/:/usr/local/share/") def fake_walker(path: str) -> list[tuple[str, list[str], list[str]]]: From b2c4539cd99da978d523dcaf2d8577b6ee5a7934 Mon Sep 17 00:00:00 2001 From: mamg22 <45301823+mamg22@users.noreply.github.com> Date: Sat, 15 Jun 2024 19:51:59 -0400 Subject: [PATCH 059/662] Remove releate note for truetype() changes The proposed changes don't match match with previous release notes' meaning of "API Changes". --- docs/releasenotes/10.4.0.rst | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docs/releasenotes/10.4.0.rst b/docs/releasenotes/10.4.0.rst index 1678b460c..44727efd4 100644 --- a/docs/releasenotes/10.4.0.rst +++ b/docs/releasenotes/10.4.0.rst @@ -42,14 +42,6 @@ The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecat API Changes =========== -ImageFont.truetype -^^^^^^^^^^^^^^^^^^ - -:py:func:`~PIL.ImageFont.truetype` now searches for fonts in the directory indicated -by the ``XDG_DATA_HOME`` environment variable in addition to those specified in -``XDG_DATA_DIRS``. Additionally, the default for ``XDG_DATA_DIRS`` has been updated -to match the freedesktop spec. - TODO ^^^^ From 6b5b2f6e58ed77aad8b2950319a5c0178b00285a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 18 Jun 2024 22:44:17 +1000 Subject: [PATCH 060/662] Added type hints to Image --- src/PIL/FitsImagePlugin.py | 6 +- src/PIL/GifImagePlugin.py | 2 + src/PIL/Image.py | 173 +++++++++++++++++++++-------------- src/PIL/Jpeg2KImagePlugin.py | 4 +- src/PIL/PalmImagePlugin.py | 9 +- src/PIL/_imaging.pyi | 6 ++ 6 files changed, 124 insertions(+), 76 deletions(-) diff --git a/src/PIL/FitsImagePlugin.py b/src/PIL/FitsImagePlugin.py index a169b6083..4846054b1 100644 --- a/src/PIL/FitsImagePlugin.py +++ b/src/PIL/FitsImagePlugin.py @@ -115,7 +115,11 @@ class FitsImageFile(ImageFile.ImageFile): elif number_of_bits in (-32, -64): self._mode = "F" - args = (self.mode, 0, -1) if decoder_name == "raw" else (number_of_bits,) + args: tuple[str | int, ...] + if decoder_name == "raw": + args = (self.mode, 0, -1) + else: + args = (number_of_bits,) return decoder_name, offset, args diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index a305e8de6..541d97f8c 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -458,6 +458,8 @@ class GifImageFile(ImageFile.ImageFile): frame_im = self.im.convert("RGBA") else: frame_im = self.im.convert("RGB") + + assert self.dispose_extent is not None frame_im = self._crop(frame_im, self.dispose_extent) self.im = self._prev_im diff --git a/src/PIL/Image.py b/src/PIL/Image.py index bdd869ccc..472581127 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -410,7 +410,9 @@ def init() -> bool: # Codec factories (used by tobytes/frombytes and ImageFile.load) -def _getdecoder(mode, decoder_name, args, extra=()): +def _getdecoder( + mode: str, decoder_name: str, args: Any, extra: tuple[Any, ...] = () +) -> core.ImagingDecoder | ImageFile.PyDecoder: # tweak arguments if args is None: args = () @@ -433,7 +435,9 @@ def _getdecoder(mode, decoder_name, args, extra=()): return decoder(mode, *args + extra) -def _getencoder(mode, encoder_name, args, extra=()): +def _getencoder( + mode: str, encoder_name: str, args: Any, extra: tuple[Any, ...] = () +) -> core.ImagingEncoder | ImageFile.PyEncoder: # tweak arguments if args is None: args = () @@ -550,10 +554,10 @@ class Image: return self._size @property - def mode(self): + def mode(self) -> str: return self._mode - def _new(self, im) -> Image: + def _new(self, im: core.ImagingCore) -> Image: new = Image() new.im = im new._mode = im.mode @@ -687,7 +691,7 @@ class Image: ) ) - def _repr_image(self, image_format, **kwargs): + def _repr_image(self, image_format: str, **kwargs: Any) -> bytes | None: """Helper function for iPython display hook. :param image_format: Image format. @@ -700,14 +704,14 @@ class Image: return None return b.getvalue() - def _repr_png_(self): + def _repr_png_(self) -> bytes | None: """iPython display hook support for PNG format. :returns: PNG version of the image as bytes """ return self._repr_image("PNG", compress_level=1) - def _repr_jpeg_(self): + def _repr_jpeg_(self) -> bytes | None: """iPython display hook support for JPEG format. :returns: JPEG version of the image as bytes @@ -754,7 +758,7 @@ class Image: self.putpalette(palette) self.frombytes(data) - def tobytes(self, encoder_name: str = "raw", *args) -> bytes: + def tobytes(self, encoder_name: str = "raw", *args: Any) -> bytes: """ Return image as a bytes object. @@ -776,12 +780,13 @@ class Image: :returns: A :py:class:`bytes` object. """ - # may pass tuple instead of argument list - if len(args) == 1 and isinstance(args[0], tuple): - args = args[0] + encoder_args: Any = args + if len(encoder_args) == 1 and isinstance(encoder_args[0], tuple): + # may pass tuple instead of argument list + encoder_args = encoder_args[0] - if encoder_name == "raw" and args == (): - args = self.mode + if encoder_name == "raw" and encoder_args == (): + encoder_args = self.mode self.load() @@ -789,7 +794,7 @@ class Image: return b"" # unpack data - e = _getencoder(self.mode, encoder_name, args) + e = _getencoder(self.mode, encoder_name, encoder_args) e.setimage(self.im) bufsize = max(65536, self.size[0] * 4) # see RawEncode.c @@ -832,7 +837,9 @@ class Image: ] ) - def frombytes(self, data: bytes, decoder_name: str = "raw", *args) -> None: + def frombytes( + self, data: bytes | bytearray, decoder_name: str = "raw", *args: Any + ) -> None: """ Loads this image with pixel data from a bytes object. @@ -843,16 +850,17 @@ class Image: if self.width == 0 or self.height == 0: return - # may pass tuple instead of argument list - if len(args) == 1 and isinstance(args[0], tuple): - args = args[0] + decoder_args: Any = args + if len(decoder_args) == 1 and isinstance(decoder_args[0], tuple): + # may pass tuple instead of argument list + decoder_args = decoder_args[0] # default format - if decoder_name == "raw" and args == (): - args = self.mode + if decoder_name == "raw" and decoder_args == (): + decoder_args = self.mode # unpack data - d = _getdecoder(self.mode, decoder_name, args) + d = _getdecoder(self.mode, decoder_name, decoder_args) d.setimage(self.im) s = d.decode(data) @@ -996,9 +1004,11 @@ class Image: if has_transparency and self.im.bands == 3: transparency = new_im.info["transparency"] - def convert_transparency(m, v): - v = m[0] * v[0] + m[1] * v[1] + m[2] * v[2] + m[3] * 0.5 - return max(0, min(255, int(v))) + def convert_transparency( + m: tuple[float, ...], v: tuple[int, int, int] + ) -> int: + value = m[0] * v[0] + m[1] * v[1] + m[2] * v[2] + m[3] * 0.5 + return max(0, min(255, int(value))) if mode == "L": transparency = convert_transparency(matrix, transparency) @@ -1250,7 +1260,7 @@ class Image: __copy__ = copy - def crop(self, box: tuple[int, int, int, int] | None = None) -> Image: + def crop(self, box: tuple[float, float, float, float] | None = None) -> Image: """ Returns a rectangular region from this image. The box is a 4-tuple defining the left, upper, right, and lower pixel @@ -1276,7 +1286,9 @@ class Image: self.load() return self._new(self._crop(self.im, box)) - def _crop(self, im, box): + def _crop( + self, im: core.ImagingCore, box: tuple[float, float, float, float] + ) -> core.ImagingCore: """ Returns a rectangular region from the core image object im. @@ -1448,7 +1460,7 @@ class Image: return self.im.getextrema() def _getxmp(self, xmp_tags): - def get_name(tag): + def get_name(tag: str) -> str: return re.sub("^{[^}]+}", "", tag) def get_value(element): @@ -1549,7 +1561,11 @@ class Image: fp = io.BytesIO(data) with open(fp) as im: - if thumbnail_offset is None: + from . import TiffImagePlugin + + if thumbnail_offset is None and isinstance( + im, TiffImagePlugin.TiffImageFile + ): im._frame_pos = [ifd_offset] im._seek(0) im.load() @@ -1803,7 +1819,9 @@ class Image: else: self.im.paste(im, box) - def alpha_composite(self, im, dest=(0, 0), source=(0, 0)): + def alpha_composite( + self, im: Image, dest: Sequence[int] = (0, 0), source: Sequence[int] = (0, 0) + ) -> None: """'In-place' analog of Image.alpha_composite. Composites an image onto this image. @@ -1818,32 +1836,35 @@ class Image: """ if not isinstance(source, (list, tuple)): - msg = "Source must be a tuple" + msg = "Source must be a list or tuple" raise ValueError(msg) if not isinstance(dest, (list, tuple)): - msg = "Destination must be a tuple" + msg = "Destination must be a list or tuple" raise ValueError(msg) - if len(source) not in (2, 4): - msg = "Source must be a 2 or 4-tuple" + + if len(source) == 4: + overlay_crop_box = tuple(source) + elif len(source) == 2: + overlay_crop_box = tuple(source) + im.size + else: + msg = "Source must be a sequence of length 2 or 4" raise ValueError(msg) + if not len(dest) == 2: - msg = "Destination must be a 2-tuple" + msg = "Destination must be a sequence of length 2" raise ValueError(msg) if min(source) < 0: msg = "Source must be non-negative" raise ValueError(msg) - if len(source) == 2: - source = source + im.size - - # over image, crop if it's not the whole thing. - if source == (0, 0) + im.size: + # over image, crop if it's not the whole image. + if overlay_crop_box == (0, 0) + im.size: overlay = im else: - overlay = im.crop(source) + overlay = im.crop(overlay_crop_box) # target for the paste - box = dest + (dest[0] + overlay.width, dest[1] + overlay.height) + box = tuple(dest) + (dest[0] + overlay.width, dest[1] + overlay.height) # destination image. don't copy if we're using the whole image. if box == (0, 0) + self.size: @@ -1854,7 +1875,11 @@ class Image: result = alpha_composite(background, overlay) self.paste(result, box) - def point(self, lut, mode: str | None = None) -> Image: + def point( + self, + lut: Sequence[float] | Callable[[int], float] | ImagePointHandler, + mode: str | None = None, + ) -> Image: """ Maps this image through a lookup table or function. @@ -1891,7 +1916,9 @@ class Image: scale, offset = _getscaleoffset(lut) return self._new(self.im.point_transform(scale, offset)) # for other modes, convert the function to a table - lut = [lut(i) for i in range(256)] * self.im.bands + flatLut = [lut(i) for i in range(256)] * self.im.bands + else: + flatLut = lut if self.mode == "F": # FIXME: _imaging returns a confusing error message for this case @@ -1899,8 +1926,8 @@ class Image: raise ValueError(msg) if mode != "F": - lut = [round(i) for i in lut] - return self._new(self.im.point(lut, mode)) + flatLut = [round(i) for i in flatLut] + return self._new(self.im.point(flatLut, mode)) def putalpha(self, alpha): """ @@ -2973,29 +3000,29 @@ def _wedge() -> Image: return Image()._new(core.wedge("L")) -def _check_size(size): +def _check_size(size: Any) -> None: """ Common check to enforce type and sanity check on size tuples :param size: Should be a 2 tuple of (width, height) - :returns: True, or raises a ValueError + :returns: None, or raises a ValueError """ if not isinstance(size, (list, tuple)): - msg = "Size must be a tuple" + msg = "Size must be a list or tuple" raise ValueError(msg) if len(size) != 2: - msg = "Size must be a tuple of length 2" + msg = "Size must be a sequence of length 2" raise ValueError(msg) if size[0] < 0 or size[1] < 0: msg = "Width and height must be >= 0" raise ValueError(msg) - return True - def new( - mode: str, size: tuple[int, int], color: float | tuple[float, ...] | str | None = 0 + mode: str, + size: tuple[int, int] | list[int], + color: float | tuple[float, ...] | str | None = 0, ) -> Image: """ Creates a new image with the given mode and size. @@ -3044,7 +3071,13 @@ def new( return im._new(core.fill(mode, size, color)) -def frombytes(mode, size, data, decoder_name: str = "raw", *args) -> Image: +def frombytes( + mode: str, + size: tuple[int, int], + data: bytes | bytearray, + decoder_name: str = "raw", + *args: Any, +) -> Image: """ Creates a copy of an image memory from pixel data in a buffer. @@ -3072,18 +3105,21 @@ def frombytes(mode, size, data, decoder_name: str = "raw", *args) -> Image: im = new(mode, size) if im.width != 0 and im.height != 0: - # may pass tuple instead of argument list - if len(args) == 1 and isinstance(args[0], tuple): - args = args[0] + decoder_args: Any = args + if len(decoder_args) == 1 and isinstance(decoder_args[0], tuple): + # may pass tuple instead of argument list + decoder_args = decoder_args[0] - if decoder_name == "raw" and args == (): - args = mode + if decoder_name == "raw" and decoder_args == (): + decoder_args = mode - im.frombytes(data, decoder_name, args) + im.frombytes(data, decoder_name, decoder_args) return im -def frombuffer(mode: str, size, data, decoder_name: str = "raw", *args) -> Image: +def frombuffer( + mode: str, size: tuple[int, int], data, decoder_name: str = "raw", *args: Any +) -> Image: """ Creates an image memory referencing pixel data in a byte buffer. @@ -3540,7 +3576,7 @@ def merge(mode: str, bands: Sequence[Image]) -> Image: def register_open( - id, + id: str, factory: Callable[[IO[bytes], str | bytes], ImageFile.ImageFile], accept: Callable[[bytes], bool | str] | None = None, ) -> None: @@ -3674,7 +3710,7 @@ def _show(image: Image, **options: Any) -> None: def effect_mandelbrot( - size: tuple[int, int], extent: tuple[int, int, int, int], quality: int + size: tuple[int, int], extent: tuple[float, float, float, float], quality: int ) -> Image: """ Generate a Mandelbrot set covering the given extent. @@ -3721,19 +3757,18 @@ def radial_gradient(mode: str) -> Image: # Resources -def _apply_env_variables(env=None) -> None: - if env is None: - env = os.environ +def _apply_env_variables(env: dict[str, str] | None = None) -> None: + env_dict = env if env is not None else os.environ for var_name, setter in [ ("PILLOW_ALIGNMENT", core.set_alignment), ("PILLOW_BLOCK_SIZE", core.set_block_size), ("PILLOW_BLOCKS_MAX", core.set_blocks_max), ]: - if var_name not in env: + if var_name not in env_dict: continue - var = env[var_name].lower() + var = env_dict[var_name].lower() units = 1 for postfix, mul in [("k", 1024), ("m", 1024 * 1024)]: @@ -3742,13 +3777,13 @@ def _apply_env_variables(env=None) -> None: var = var[: -len(postfix)] try: - var = int(var) * units + var_int = int(var) * units except ValueError: warnings.warn(f"{var_name} is not int") continue try: - setter(var) + setter(var_int) except ValueError as e: warnings.warn(f"{var_name}: {e}") diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py index 60f3bff0a..39eb1c203 100644 --- a/src/PIL/Jpeg2KImagePlugin.py +++ b/src/PIL/Jpeg2KImagePlugin.py @@ -122,7 +122,7 @@ def _parse_codestream(fp): elif csiz == 4: mode = "RGBA" else: - mode = None + mode = "" return size, mode @@ -237,7 +237,7 @@ class Jpeg2KImageFile(ImageFile.ImageFile): msg = "not a JPEG 2000 file" raise SyntaxError(msg) - if self.size is None or self.mode is None: + if self.size is None or not self.mode: msg = "unable to determine size/mode" raise SyntaxError(msg) diff --git a/src/PIL/PalmImagePlugin.py b/src/PIL/PalmImagePlugin.py index fc83918b5..1735070f8 100644 --- a/src/PIL/PalmImagePlugin.py +++ b/src/PIL/PalmImagePlugin.py @@ -129,15 +129,16 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: # and invert it because # Palm does grayscale from white (0) to black (1) bpp = im.encoderinfo["bpp"] - im = im.point( - lambda x, shift=8 - bpp, maxval=(1 << bpp) - 1: maxval - (x >> shift) - ) + maxval = (1 << bpp) - 1 + shift = 8 - bpp + im = im.point(lambda x: maxval - (x >> shift)) elif im.info.get("bpp") in (1, 2, 4): # here we assume that even though the inherent mode is 8-bit grayscale, # only the lower bpp bits are significant. # We invert them to match the Palm. bpp = im.info["bpp"] - im = im.point(lambda x, maxval=(1 << bpp) - 1: maxval - (x & maxval)) + maxval = (1 << bpp) - 1 + im = im.point(lambda x: maxval - (x & maxval)) else: msg = f"cannot write mode {im.mode} as Palm" raise OSError(msg) diff --git a/src/PIL/_imaging.pyi b/src/PIL/_imaging.pyi index 1fe954417..3467eeb45 100644 --- a/src/PIL/_imaging.pyi +++ b/src/PIL/_imaging.pyi @@ -12,5 +12,11 @@ class ImagingDraw: class PixelAccess: def __getattr__(self, name: str) -> Any: ... +class ImagingDecoder: + def __getattr__(self, name: str) -> Any: ... + +class ImagingEncoder: + def __getattr__(self, name: str) -> Any: ... + def font(image, glyphdata: bytes) -> ImagingFont: ... def __getattr__(name: str) -> Any: ... From 291ee352047c845e2e6e5062c2c219923689da8d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 18 Jun 2024 23:03:03 +1000 Subject: [PATCH 061/662] Added type hints --- Tests/test_file_jpeg.py | 2 +- Tests/test_file_jpeg2k.py | 2 +- Tests/test_image.py | 2 +- Tests/test_image_putdata.py | 8 ++++---- Tests/test_numpy.py | 25 +++++++++++++++++-------- Tests/test_shell_injection.py | 7 ++++--- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index 8e4d694c1..1459a87eb 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -701,7 +701,7 @@ class TestFileJpeg: def test_save_cjpeg(self, tmp_path: Path) -> None: with Image.open(TEST_FILE) as img: tempfile = str(tmp_path / "temp.jpg") - JpegImagePlugin._save_cjpeg(img, 0, tempfile) + JpegImagePlugin._save_cjpeg(img, BytesIO(), tempfile) # Default save quality is 75%, so a tiny bit of difference is alright assert_image_similar_tofile(img, tempfile, 17) diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py index 5a208739f..ed7ea4fcf 100644 --- a/Tests/test_file_jpeg2k.py +++ b/Tests/test_file_jpeg2k.py @@ -460,7 +460,7 @@ def test_plt_marker() -> None: out.seek(length - 2, os.SEEK_CUR) -def test_9bit(): +def test_9bit() -> None: with Image.open("Tests/images/9bit.j2k") as im: assert im.mode == "I;16" assert im.size == (128, 128) diff --git a/Tests/test_image.py b/Tests/test_image.py index d6a739c79..0d7d03480 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -152,7 +152,7 @@ class TestImage: def test_stringio(self) -> None: with pytest.raises(ValueError): - with Image.open(io.StringIO()): + with Image.open(io.StringIO()): # type: ignore[arg-type] pass def test_pathlib(self, tmp_path: Path) -> None: diff --git a/Tests/test_image_putdata.py b/Tests/test_image_putdata.py index dad26ef14..5e57e4c4c 100644 --- a/Tests/test_image_putdata.py +++ b/Tests/test_image_putdata.py @@ -113,13 +113,13 @@ def test_array_F() -> None: def test_not_flattened() -> None: im = Image.new("L", (1, 1)) with pytest.raises(TypeError): - im.putdata([[0]]) + im.putdata([[0]]) # type: ignore[list-item] with pytest.raises(TypeError): - im.putdata([[0]], 2) + im.putdata([[0]], 2) # type: ignore[list-item] with pytest.raises(TypeError): im = Image.new("I", (1, 1)) - im.putdata([[0]]) + im.putdata([[0]]) # type: ignore[list-item] with pytest.raises(TypeError): im = Image.new("F", (1, 1)) - im.putdata([[0]]) + im.putdata([[0]]) # type: ignore[list-item] diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py index 9f4e6534e..36cdb3682 100644 --- a/Tests/test_numpy.py +++ b/Tests/test_numpy.py @@ -1,6 +1,7 @@ from __future__ import annotations import warnings +from typing import TYPE_CHECKING, Any import pytest @@ -8,13 +9,19 @@ from PIL import Image from .helper import assert_deep_equal, assert_image, hopper, skip_unless_feature -numpy = pytest.importorskip("numpy", reason="NumPy not installed") +if TYPE_CHECKING: + import numpy + import numpy.typing +else: + numpy = pytest.importorskip("numpy", reason="NumPy not installed") TEST_IMAGE_SIZE = (10, 10) def test_numpy_to_image() -> None: - def to_image(dtype, bands: int = 1, boolean: int = 0) -> Image.Image: + def to_image( + dtype: numpy.typing.DTypeLike, bands: int = 1, boolean: int = 0 + ) -> Image.Image: if bands == 1: if boolean: data = [0, 255] * 50 @@ -99,14 +106,16 @@ def test_1d_array() -> None: assert_image(Image.fromarray(a), "L", (1, 5)) -def _test_img_equals_nparray(img: Image.Image, np) -> None: - assert len(np.shape) >= 2 - np_size = np.shape[1], np.shape[0] +def _test_img_equals_nparray( + img: Image.Image, np_img: numpy.typing.NDArray[Any] +) -> None: + assert len(np_img.shape) >= 2 + np_size = np_img.shape[1], np_img.shape[0] assert img.size == np_size px = img.load() for x in range(0, img.size[0], int(img.size[0] / 10)): for y in range(0, img.size[1], int(img.size[1] / 10)): - assert_deep_equal(px[x, y], np[y, x]) + assert_deep_equal(px[x, y], np_img[y, x]) def test_16bit() -> None: @@ -157,7 +166,7 @@ def test_save_tiff_uint16() -> None: ("HSV", numpy.uint8), ), ) -def test_to_array(mode: str, dtype) -> None: +def test_to_array(mode: str, dtype: numpy.typing.DTypeLike) -> None: img = hopper(mode) # Resize to non-square @@ -207,7 +216,7 @@ def test_putdata() -> None: numpy.float64, ), ) -def test_roundtrip_eye(dtype) -> None: +def test_roundtrip_eye(dtype: numpy.typing.DTypeLike) -> None: arr = numpy.eye(10, dtype=dtype) numpy.testing.assert_array_equal(arr, numpy.array(Image.fromarray(arr))) diff --git a/Tests/test_shell_injection.py b/Tests/test_shell_injection.py index 2a072fd44..dd4fc46c3 100644 --- a/Tests/test_shell_injection.py +++ b/Tests/test_shell_injection.py @@ -1,8 +1,9 @@ from __future__ import annotations import shutil +from io import BytesIO from pathlib import Path -from typing import Callable +from typing import IO, Callable import pytest @@ -22,11 +23,11 @@ class TestShellInjection: self, tmp_path: Path, src_img: Image.Image, - save_func: Callable[[Image.Image, int, str], None], + save_func: Callable[[Image.Image, IO[bytes], str | bytes], None], ) -> None: for filename in test_filenames: dest_file = str(tmp_path / filename) - save_func(src_img, 0, dest_file) + save_func(src_img, BytesIO(), dest_file) # If file can't be opened, shell injection probably occurred with Image.open(dest_file) as im: im.load() From 9f79e5d7680a0eba9b625ad24595fc2ece6e523c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 19 Jun 2024 08:43:23 +1000 Subject: [PATCH 062/662] Added type hints to ImageDraw shape methods --- Tests/test_imagedraw.py | 20 +++- src/PIL/ImageDraw.py | 248 +++++++++++++++++++++++++++------------- src/PIL/_imaging.pyi | 5 + 3 files changed, 187 insertions(+), 86 deletions(-) diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py index d9593c60f..8b55df992 100644 --- a/Tests/test_imagedraw.py +++ b/Tests/test_imagedraw.py @@ -448,6 +448,7 @@ def test_shape1() -> None: x3, y3 = 95, 5 # Act + assert ImageDraw.Outline is not None s = ImageDraw.Outline() s.move(x0, y0) s.curve(x1, y1, x2, y2, x3, y3) @@ -469,6 +470,7 @@ def test_shape2() -> None: x3, y3 = 5, 95 # Act + assert ImageDraw.Outline is not None s = ImageDraw.Outline() s.move(x0, y0) s.curve(x1, y1, x2, y2, x3, y3) @@ -487,6 +489,7 @@ def test_transform() -> None: draw = ImageDraw.Draw(im) # Act + assert ImageDraw.Outline is not None s = ImageDraw.Outline() s.line(0, 0) s.transform((0, 0, 0, 0, 0, 0)) @@ -913,7 +916,12 @@ def test_rounded_rectangle_translucent( def test_floodfill(bbox: Coords) -> None: red = ImageColor.getrgb("red") - for mode, value in [("L", 1), ("RGBA", (255, 0, 0, 0)), ("RGB", red)]: + mode_values: list[tuple[str, int | tuple[int, ...]]] = [ + ("L", 1), + ("RGBA", (255, 0, 0, 0)), + ("RGB", red), + ] + for mode, value in mode_values: # Arrange im = Image.new(mode, (W, H)) draw = ImageDraw.Draw(im) @@ -1429,6 +1437,7 @@ def test_same_color_outline(bbox: Coords) -> None: x2, y2 = 95, 50 x3, y3 = 95, 5 + assert ImageDraw.Outline is not None s = ImageDraw.Outline() s.move(x0, y0) s.curve(x1, y1, x2, y2, x3, y3) @@ -1467,7 +1476,7 @@ def test_same_color_outline(bbox: Coords) -> None: (4, "square", {}), (8, "regular_octagon", {}), (4, "square_rotate_45", {"rotation": 45}), - (3, "triangle_width", {"width": 5, "outline": "yellow"}), + (3, "triangle_width", {"outline": "yellow", "width": 5}), ], ) def test_draw_regular_polygon( @@ -1477,7 +1486,10 @@ def test_draw_regular_polygon( filename = f"Tests/images/imagedraw_{polygon_name}.png" draw = ImageDraw.Draw(im) bounding_circle = ((W // 2, H // 2), 25) - draw.regular_polygon(bounding_circle, n_sides, fill="red", **args) + rotation = int(args.get("rotation", 0)) + outline = args.get("outline") + width = int(args.get("width", 1)) + draw.regular_polygon(bounding_circle, n_sides, rotation, "red", outline, width) assert_image_equal_tofile(im, filename) @@ -1630,6 +1642,6 @@ def test_incorrectly_ordered_coordinates(xy: tuple[int, int, int, int]) -> None: draw.rounded_rectangle(xy) -def test_getdraw(): +def test_getdraw() -> None: with pytest.warns(DeprecationWarning): ImageDraw.getdraw(None, []) diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py index 41a3eb0cb..91f898838 100644 --- a/src/PIL/ImageDraw.py +++ b/src/PIL/ImageDraw.py @@ -35,15 +35,24 @@ import math import numbers import struct from types import ModuleType -from typing import TYPE_CHECKING, AnyStr, Sequence, cast +from typing import TYPE_CHECKING, AnyStr, Callable, List, Sequence, Tuple, Union, cast from . import Image, ImageColor from ._deprecate import deprecate from ._typing import Coords +# experimental access to the outline API +Outline: Callable[[], Image.core._Outline] | None +try: + Outline = Image.core.outline +except AttributeError: + Outline = None + if TYPE_CHECKING: from . import ImageDraw2, ImageFont +_Ink = Union[float, Tuple[int, ...], str] + """ A simple 2D drawing interface for PIL images.

@@ -134,34 +143,47 @@ class ImageDraw: else: return self.getfont() - def _getink(self, ink, fill=None) -> tuple[int | None, int | None]: + def _getink( + self, ink: _Ink | None, fill: _Ink | None = None + ) -> tuple[int | None, int | None]: + result_ink = None + result_fill = None if ink is None and fill is None: if self.fill: - fill = self.ink + result_fill = self.ink else: - ink = self.ink + result_ink = self.ink else: if ink is not None: if isinstance(ink, str): ink = ImageColor.getcolor(ink, self.mode) if self.palette and not isinstance(ink, numbers.Number): ink = self.palette.getcolor(ink, self._image) - ink = self.draw.draw_ink(ink) + result_ink = self.draw.draw_ink(ink) if fill is not None: if isinstance(fill, str): fill = ImageColor.getcolor(fill, self.mode) if self.palette and not isinstance(fill, numbers.Number): fill = self.palette.getcolor(fill, self._image) - fill = self.draw.draw_ink(fill) - return ink, fill + result_fill = self.draw.draw_ink(fill) + return result_ink, result_fill - def arc(self, xy: Coords, start, end, fill=None, width=1) -> None: + def arc( + self, + xy: Coords, + start: float, + end: float, + fill: _Ink | None = None, + width: int = 1, + ) -> None: """Draw an arc.""" ink, fill = self._getink(fill) if ink is not None: self.draw.draw_arc(xy, start, end, ink, width) - def bitmap(self, xy: Sequence[int], bitmap, fill=None) -> None: + def bitmap( + self, xy: Sequence[int], bitmap: Image.Image, fill: _Ink | None = None + ) -> None: """Draw a bitmap.""" bitmap.load() ink, fill = self._getink(fill) @@ -170,30 +192,55 @@ class ImageDraw: if ink is not None: self.draw.draw_bitmap(xy, bitmap.im, ink) - def chord(self, xy: Coords, start, end, fill=None, outline=None, width=1) -> None: + def chord( + self, + xy: Coords, + start: float, + end: float, + fill: _Ink | None = None, + outline: _Ink | None = None, + width: int = 1, + ) -> None: """Draw a chord.""" - ink, fill = self._getink(outline, fill) - if fill is not None: - self.draw.draw_chord(xy, start, end, fill, 1) - if ink is not None and ink != fill and width != 0: + ink, fill_ink = self._getink(outline, fill) + if fill_ink is not None: + self.draw.draw_chord(xy, start, end, fill_ink, 1) + if ink is not None and ink != fill_ink and width != 0: self.draw.draw_chord(xy, start, end, ink, 0, width) - def ellipse(self, xy: Coords, fill=None, outline=None, width=1) -> None: + def ellipse( + self, + xy: Coords, + fill: _Ink | None = None, + outline: _Ink | None = None, + width: int = 1, + ) -> None: """Draw an ellipse.""" - ink, fill = self._getink(outline, fill) - if fill is not None: - self.draw.draw_ellipse(xy, fill, 1) - if ink is not None and ink != fill and width != 0: + ink, fill_ink = self._getink(outline, fill) + if fill_ink is not None: + self.draw.draw_ellipse(xy, fill_ink, 1) + if ink is not None and ink != fill_ink and width != 0: self.draw.draw_ellipse(xy, ink, 0, width) def circle( - self, xy: Sequence[float], radius: float, fill=None, outline=None, width=1 + self, + xy: Sequence[float], + radius: float, + fill: _Ink | None = None, + outline: _Ink | None = None, + width: int = 1, ) -> None: """Draw a circle given center coordinates and a radius.""" ellipse_xy = (xy[0] - radius, xy[1] - radius, xy[0] + radius, xy[1] + radius) self.ellipse(ellipse_xy, fill, outline, width) - def line(self, xy: Coords, fill=None, width=0, joint=None) -> None: + def line( + self, + xy: Coords, + fill: _Ink | None = None, + width: int = 0, + joint: str | None = None, + ) -> None: """Draw a line, or a connected sequence of line segments.""" ink = self._getink(fill)[0] if ink is not None: @@ -223,7 +270,7 @@ class ImageDraw: def coord_at_angle( coord: Sequence[float], angle: float - ) -> tuple[float, float]: + ) -> tuple[float, ...]: x, y = coord angle -= 90 distance = width / 2 - 1 @@ -264,37 +311,54 @@ class ImageDraw: ] self.line(gap_coords, fill, width=3) - def shape(self, shape, fill=None, outline=None) -> None: + def shape( + self, + shape: Image.core._Outline, + fill: _Ink | None = None, + outline: _Ink | None = None, + ) -> None: """(Experimental) Draw a shape.""" shape.close() - ink, fill = self._getink(outline, fill) - if fill is not None: - self.draw.draw_outline(shape, fill, 1) - if ink is not None and ink != fill: + ink, fill_ink = self._getink(outline, fill) + if fill_ink is not None: + self.draw.draw_outline(shape, fill_ink, 1) + if ink is not None and ink != fill_ink: self.draw.draw_outline(shape, ink, 0) def pieslice( - self, xy: Coords, start, end, fill=None, outline=None, width=1 + self, + xy: Coords, + start: float, + end: float, + fill: _Ink | None = None, + outline: _Ink | None = None, + width: int = 1, ) -> None: """Draw a pieslice.""" - ink, fill = self._getink(outline, fill) - if fill is not None: - self.draw.draw_pieslice(xy, start, end, fill, 1) - if ink is not None and ink != fill and width != 0: + ink, fill_ink = self._getink(outline, fill) + if fill_ink is not None: + self.draw.draw_pieslice(xy, start, end, fill_ink, 1) + if ink is not None and ink != fill_ink and width != 0: self.draw.draw_pieslice(xy, start, end, ink, 0, width) - def point(self, xy: Coords, fill=None) -> None: + def point(self, xy: Coords, fill: _Ink | None = None) -> None: """Draw one or more individual pixels.""" ink, fill = self._getink(fill) if ink is not None: self.draw.draw_points(xy, ink) - def polygon(self, xy: Coords, fill=None, outline=None, width=1) -> None: + def polygon( + self, + xy: Coords, + fill: _Ink | None = None, + outline: _Ink | None = None, + width: int = 1, + ) -> None: """Draw a polygon.""" - ink, fill = self._getink(outline, fill) - if fill is not None: - self.draw.draw_polygon(xy, fill, 1) - if ink is not None and ink != fill and width != 0: + ink, fill_ink = self._getink(outline, fill) + if fill_ink is not None: + self.draw.draw_polygon(xy, fill_ink, 1) + if ink is not None and ink != fill_ink and width != 0: if width == 1: self.draw.draw_polygon(xy, ink, 0, width) elif self.im is not None: @@ -320,22 +384,41 @@ class ImageDraw: self.im.paste(im.im, (0, 0) + im.size, mask.im) def regular_polygon( - self, bounding_circle, n_sides, rotation=0, fill=None, outline=None, width=1 + self, + bounding_circle: Sequence[Sequence[float] | float], + n_sides: int, + rotation: float = 0, + fill: _Ink | None = None, + outline: _Ink | None = None, + width: int = 1, ) -> None: """Draw a regular polygon.""" xy = _compute_regular_polygon_vertices(bounding_circle, n_sides, rotation) self.polygon(xy, fill, outline, width) - def rectangle(self, xy: Coords, fill=None, outline=None, width=1) -> None: + def rectangle( + self, + xy: Coords, + fill: _Ink | None = None, + outline: _Ink | None = None, + width: int = 1, + ) -> None: """Draw a rectangle.""" - ink, fill = self._getink(outline, fill) - if fill is not None: - self.draw.draw_rectangle(xy, fill, 1) - if ink is not None and ink != fill and width != 0: + ink, fill_ink = self._getink(outline, fill) + if fill_ink is not None: + self.draw.draw_rectangle(xy, fill_ink, 1) + if ink is not None and ink != fill_ink and width != 0: self.draw.draw_rectangle(xy, ink, 0, width) def rounded_rectangle( - self, xy: Coords, radius=0, fill=None, outline=None, width=1, *, corners=None + self, + xy: Coords, + radius: float = 0, + fill: _Ink | None = None, + outline: _Ink | None = None, + width: int = 1, + *, + corners: tuple[bool, bool, bool, bool] | None = None, ) -> None: """Draw a rounded rectangle.""" if isinstance(xy[0], (list, tuple)): @@ -377,10 +460,10 @@ class ImageDraw: # that is a rectangle return self.rectangle(xy, fill, outline, width) - r = d // 2 - ink, fill = self._getink(outline, fill) + r = int(d // 2) + ink, fill_ink = self._getink(outline, fill) - def draw_corners(pieslice) -> None: + def draw_corners(pieslice: bool) -> None: parts: tuple[tuple[tuple[float, float, float, float], int, int], ...] if full_x: # Draw top and bottom halves @@ -410,32 +493,32 @@ class ImageDraw: ) for part in parts: if pieslice: - self.draw.draw_pieslice(*(part + (fill, 1))) + self.draw.draw_pieslice(*(part + (fill_ink, 1))) else: self.draw.draw_arc(*(part + (ink, width))) - if fill is not None: + if fill_ink is not None: draw_corners(True) if full_x: - self.draw.draw_rectangle((x0, y0 + r + 1, x1, y1 - r - 1), fill, 1) + self.draw.draw_rectangle((x0, y0 + r + 1, x1, y1 - r - 1), fill_ink, 1) else: - self.draw.draw_rectangle((x0 + r + 1, y0, x1 - r - 1, y1), fill, 1) + self.draw.draw_rectangle((x0 + r + 1, y0, x1 - r - 1, y1), fill_ink, 1) if not full_x and not full_y: left = [x0, y0, x0 + r, y1] if corners[0]: left[1] += r + 1 if corners[3]: left[3] -= r + 1 - self.draw.draw_rectangle(left, fill, 1) + self.draw.draw_rectangle(left, fill_ink, 1) right = [x1 - r, y0, x1, y1] if corners[1]: right[1] += r + 1 if corners[2]: right[3] -= r + 1 - self.draw.draw_rectangle(right, fill, 1) - if ink is not None and ink != fill and width != 0: + self.draw.draw_rectangle(right, fill_ink, 1) + if ink is not None and ink != fill_ink and width != 0: draw_corners(False) if not full_x: @@ -530,10 +613,11 @@ class ImageDraw: embedded_color, ) - def getink(fill): - ink, fill = self._getink(fill) + def getink(fill: _Ink | None) -> int: + ink, fill_ink = self._getink(fill) if ink is None: - return fill + assert fill_ink is not None + return fill_ink return ink def draw_text(ink, stroke_width=0, stroke_offset=None) -> None: @@ -897,13 +981,6 @@ def Draw(im: Image.Image, mode: str | None = None) -> ImageDraw: return ImageDraw(im, mode) -# experimental access to the outline API -try: - Outline = Image.core.outline -except AttributeError: - Outline = None - - def getdraw( im: Image.Image | None = None, hints: list[str] | None = None ) -> tuple[ImageDraw2.Draw | None, ModuleType]: @@ -983,12 +1060,12 @@ def floodfill( def _compute_regular_polygon_vertices( - bounding_circle, n_sides, rotation + bounding_circle: Sequence[Sequence[float] | float], n_sides: int, rotation: float ) -> list[tuple[float, float]]: """ Generate a list of vertices for a 2D regular polygon. - :param bounding_circle: The bounding circle is a tuple defined + :param bounding_circle: The bounding circle is a sequence defined by a point and radius. The polygon is inscribed in this circle. (e.g. ``bounding_circle=(x, y, r)`` or ``((x, y), r)``) :param n_sides: Number of sides @@ -1026,7 +1103,7 @@ def _compute_regular_polygon_vertices( # 1. Error Handling # 1.1 Check `n_sides` has an appropriate value if not isinstance(n_sides, int): - msg = "n_sides should be an int" + msg = "n_sides should be an int" # type: ignore[unreachable] raise TypeError(msg) if n_sides < 3: msg = "n_sides should be an int > 2" @@ -1038,9 +1115,24 @@ def _compute_regular_polygon_vertices( raise TypeError(msg) if len(bounding_circle) == 3: - *centroid, polygon_radius = bounding_circle - elif len(bounding_circle) == 2: - centroid, polygon_radius = bounding_circle + if not all(isinstance(i, (int, float)) for i in bounding_circle): + msg = "bounding_circle should only contain numeric data" + raise ValueError(msg) + + *centroid, polygon_radius = cast(List[float], list(bounding_circle)) + elif len(bounding_circle) == 2 and isinstance(bounding_circle[0], (list, tuple)): + if not all( + isinstance(i, (int, float)) for i in bounding_circle[0] + ) or not isinstance(bounding_circle[1], (int, float)): + msg = "bounding_circle should only contain numeric data" + raise ValueError(msg) + + if len(bounding_circle[0]) != 2: + msg = "bounding_circle centre should contain 2D coordinates (e.g. (x, y))" + raise ValueError(msg) + + centroid = cast(List[float], list(bounding_circle[0])) + polygon_radius = cast(float, bounding_circle[1]) else: msg = ( "bounding_circle should contain 2D coordinates " @@ -1048,25 +1140,17 @@ def _compute_regular_polygon_vertices( ) raise ValueError(msg) - if not all(isinstance(i, (int, float)) for i in (*centroid, polygon_radius)): - msg = "bounding_circle should only contain numeric data" - raise ValueError(msg) - - if not len(centroid) == 2: - msg = "bounding_circle centre should contain 2D coordinates (e.g. (x, y))" - raise ValueError(msg) - if polygon_radius <= 0: msg = "bounding_circle radius should be > 0" raise ValueError(msg) # 1.3 Check `rotation` has an appropriate value if not isinstance(rotation, (int, float)): - msg = "rotation should be an int or float" + msg = "rotation should be an int or float" # type: ignore[unreachable] raise ValueError(msg) # 2. Define Helper Functions - def _apply_rotation(point: list[float], degrees: float) -> tuple[int, int]: + def _apply_rotation(point: list[float], degrees: float) -> tuple[float, float]: return ( round( point[0] * math.cos(math.radians(360 - degrees)) @@ -1082,7 +1166,7 @@ def _compute_regular_polygon_vertices( ), ) - def _compute_polygon_vertex(angle: float) -> tuple[int, int]: + def _compute_polygon_vertex(angle: float) -> tuple[float, float]: start_point = [polygon_radius, 0] return _apply_rotation(start_point, angle) diff --git a/src/PIL/_imaging.pyi b/src/PIL/_imaging.pyi index dda06b5a1..2bfe421e6 100644 --- a/src/PIL/_imaging.pyi +++ b/src/PIL/_imaging.pyi @@ -18,5 +18,10 @@ class ImagingDecoder: class ImagingEncoder: def __getattr__(self, name: str) -> Any: ... +class _Outline: + def close(self) -> None: ... + def __getattr__(self, name: str) -> Any: ... + def font(image: ImagingCore, glyphdata: bytes) -> ImagingFont: ... +def outline() -> _Outline: ... def __getattr__(name: str) -> Any: ... From b64847e07fd32f8865f45600f663655116d46840 Mon Sep 17 00:00:00 2001 From: Nulano Date: Wed, 19 Jun 2024 21:48:48 +0200 Subject: [PATCH 063/662] Do not use a protocol for PixelAccess object --- docs/reference/PixelAccess.rst | 22 +++++++++++++++++++--- src/PIL/Image.py | 29 ++--------------------------- src/PIL/_imaging.pyi | 5 ++++- 3 files changed, 25 insertions(+), 31 deletions(-) diff --git a/docs/reference/PixelAccess.rst b/docs/reference/PixelAccess.rst index 026f488d8..1ac3d034b 100644 --- a/docs/reference/PixelAccess.rst +++ b/docs/reference/PixelAccess.rst @@ -44,7 +44,23 @@ Access using negative indexes is also possible. :: ----------------------------- .. class:: PixelAccess - :canonical: PIL.Image.PixelAccess + :canonical: PIL.Image.core.PixelAccess - .. automethod:: PIL.Image.PixelAccess.__getitem__ - .. automethod:: PIL.Image.PixelAccess.__setitem__ + .. method:: __getitem__(self, xy: tuple[int, int]) -> float | tuple[int, ...] + + Returns the pixel at x,y. The pixel is returned as a single + value for single band images or a tuple for multi-band images. + + :param xy: The pixel coordinate, given as (x, y). + :returns: a pixel value for single band images, a tuple of + pixel values for multiband images. + + .. method:: __setitem__(self, xy: tuple[int, int], color: float | tuple[int, ...]) -> None + + Modifies the pixel at x,y. The color is given as a single + numerical value for single band images, and a tuple for + multi-band images. + + :param xy: The pixel coordinate, given as (x, y). + :param color: The pixel value according to its mode, + e.g. tuple (r, g, b) for RGB mode. diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 5619915ea..26849707e 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -227,7 +227,7 @@ if hasattr(core, "DEFAULT_STRATEGY"): # Registries if TYPE_CHECKING: - from . import ImageFile + from . import ImageFile, PyAccess ID: list[str] = [] OPEN: dict[ str, @@ -512,31 +512,6 @@ def _getscaleoffset(expr): # Implementation wrapper -class PixelAccess(Protocol): - def __getitem__(self, xy: tuple[int, int]) -> float | tuple[int, ...]: - """ - Returns the pixel at x,y. The pixel is returned as a single - value for single band images or a tuple for multi-band images. - - :param xy: The pixel coordinate, given as (x, y). - :returns: a pixel value for single band images, a tuple of - pixel values for multiband images. - """ - raise NotImplementedError() - - def __setitem__(self, xy: tuple[int, int], color: float | tuple[int, ...]) -> None: - """ - Modifies the pixel at x,y. The color is given as a single - numerical value for single band images, and a tuple for - multi-band images. - - :param xy: The pixel coordinate, given as (x, y). - :param color: The pixel value according to its mode, - e.g. tuple (r, g, b) for RGB mode. - """ - raise NotImplementedError() - - class SupportsGetData(Protocol): def getdata( self, @@ -897,7 +872,7 @@ class Image: msg = "cannot decode image data" raise ValueError(msg) - def load(self) -> PixelAccess | None: + def load(self) -> core.PixelAccess | PyAccess.PyAccess | None: """ Allocates storage for the image and loads the pixel data. In normal cases, you don't need to call this method, since the diff --git a/src/PIL/_imaging.pyi b/src/PIL/_imaging.pyi index 1fe954417..1a0184069 100644 --- a/src/PIL/_imaging.pyi +++ b/src/PIL/_imaging.pyi @@ -10,7 +10,10 @@ class ImagingDraw: def __getattr__(self, name: str) -> Any: ... class PixelAccess: - def __getattr__(self, name: str) -> Any: ... + def __getitem__(self, xy: tuple[int, int]) -> float | tuple[int, ...]: ... + def __setitem__( + self, xy: tuple[int, int], color: float | tuple[int, ...] + ) -> None: ... def font(image, glyphdata: bytes) -> ImagingFont: ... def __getattr__(name: str) -> Any: ... From 324e548e525f2e7a3e31bb9dde10086fc202e8b5 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 21 Jun 2024 20:41:22 +1000 Subject: [PATCH 064/662] Added type hints to ImageFilter --- Tests/test_color_lut.py | 4 +- Tests/test_image_filter.py | 2 +- Tests/test_numpy.py | 18 +++----- docs/reference/internal_modules.rst | 4 ++ src/PIL/ImageFilter.py | 72 ++++++++++++++++++++--------- src/PIL/_typing.py | 10 +++- 6 files changed, 71 insertions(+), 39 deletions(-) diff --git a/Tests/test_color_lut.py b/Tests/test_color_lut.py index c8886a779..00c8995b0 100644 --- a/Tests/test_color_lut.py +++ b/Tests/test_color_lut.py @@ -354,10 +354,10 @@ class TestColorLut3DCoreAPI: class TestColorLut3DFilter: def test_wrong_args(self) -> None: with pytest.raises(ValueError, match="should be either an integer"): - ImageFilter.Color3DLUT("small", [1]) + ImageFilter.Color3DLUT("small", [1]) # type: ignore[arg-type] with pytest.raises(ValueError, match="should be either an integer"): - ImageFilter.Color3DLUT((11, 11), [1]) + ImageFilter.Color3DLUT((11, 11), [1]) # type: ignore[arg-type] with pytest.raises(ValueError, match=r"in \[2, 65\] range"): ImageFilter.Color3DLUT((11, 11, 1), [1]) diff --git a/Tests/test_image_filter.py b/Tests/test_image_filter.py index 1f0644471..412ab44c3 100644 --- a/Tests/test_image_filter.py +++ b/Tests/test_image_filter.py @@ -137,7 +137,7 @@ def test_builtinfilter_p() -> None: builtin_filter = ImageFilter.BuiltinFilter() with pytest.raises(ValueError): - builtin_filter.filter(hopper("P")) + builtin_filter.filter(hopper("P").im) def test_kernel_not_enough_coefficients() -> None: diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py index 36cdb3682..32d2cf985 100644 --- a/Tests/test_numpy.py +++ b/Tests/test_numpy.py @@ -1,17 +1,17 @@ from __future__ import annotations import warnings -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING import pytest -from PIL import Image +from PIL import Image, _typing from .helper import assert_deep_equal, assert_image, hopper, skip_unless_feature if TYPE_CHECKING: import numpy - import numpy.typing + import numpy.typing as npt else: numpy = pytest.importorskip("numpy", reason="NumPy not installed") @@ -19,9 +19,7 @@ TEST_IMAGE_SIZE = (10, 10) def test_numpy_to_image() -> None: - def to_image( - dtype: numpy.typing.DTypeLike, bands: int = 1, boolean: int = 0 - ) -> Image.Image: + def to_image(dtype: npt.DTypeLike, bands: int = 1, boolean: int = 0) -> Image.Image: if bands == 1: if boolean: data = [0, 255] * 50 @@ -106,9 +104,7 @@ def test_1d_array() -> None: assert_image(Image.fromarray(a), "L", (1, 5)) -def _test_img_equals_nparray( - img: Image.Image, np_img: numpy.typing.NDArray[Any] -) -> None: +def _test_img_equals_nparray(img: Image.Image, np_img: _typing.NumpyArray) -> None: assert len(np_img.shape) >= 2 np_size = np_img.shape[1], np_img.shape[0] assert img.size == np_size @@ -166,7 +162,7 @@ def test_save_tiff_uint16() -> None: ("HSV", numpy.uint8), ), ) -def test_to_array(mode: str, dtype: numpy.typing.DTypeLike) -> None: +def test_to_array(mode: str, dtype: npt.DTypeLike) -> None: img = hopper(mode) # Resize to non-square @@ -216,7 +212,7 @@ def test_putdata() -> None: numpy.float64, ), ) -def test_roundtrip_eye(dtype: numpy.typing.DTypeLike) -> None: +def test_roundtrip_eye(dtype: npt.DTypeLike) -> None: arr = numpy.eye(10, dtype=dtype) numpy.testing.assert_array_equal(arr, numpy.array(Image.fromarray(arr))) diff --git a/docs/reference/internal_modules.rst b/docs/reference/internal_modules.rst index 899e4966f..e4cb17c4d 100644 --- a/docs/reference/internal_modules.rst +++ b/docs/reference/internal_modules.rst @@ -33,6 +33,10 @@ Internal Modules Provides a convenient way to import type hints that are not available on some Python versions. +.. py:class:: NumpyArray + + Typing alias. + .. py:class:: StrOrBytesPath Typing alias. diff --git a/src/PIL/ImageFilter.py b/src/PIL/ImageFilter.py index 02288e135..e18b4a446 100644 --- a/src/PIL/ImageFilter.py +++ b/src/PIL/ImageFilter.py @@ -19,12 +19,16 @@ from __future__ import annotations import abc import functools from types import ModuleType -from typing import Any, Sequence +from typing import TYPE_CHECKING, Any, Callable, Sequence, cast + +if TYPE_CHECKING: + from . import _imaging + from ._typing import NumpyArray class Filter: @abc.abstractmethod - def filter(self, image): + def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore: pass @@ -33,7 +37,9 @@ class MultibandFilter(Filter): class BuiltinFilter(MultibandFilter): - def filter(self, image): + filterargs: tuple[Any, ...] + + def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore: if image.mode == "P": msg = "cannot filter palette images" raise ValueError(msg) @@ -91,7 +97,7 @@ class RankFilter(Filter): self.size = size self.rank = rank - def filter(self, image): + def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore: if image.mode == "P": msg = "cannot filter palette images" raise ValueError(msg) @@ -158,7 +164,7 @@ class ModeFilter(Filter): def __init__(self, size: int = 3) -> None: self.size = size - def filter(self, image): + def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore: return image.modefilter(self.size) @@ -176,9 +182,9 @@ class GaussianBlur(MultibandFilter): def __init__(self, radius: float | Sequence[float] = 2) -> None: self.radius = radius - def filter(self, image): + def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore: xy = self.radius - if not isinstance(xy, (tuple, list)): + if isinstance(xy, (int, float)): xy = (xy, xy) if xy == (0, 0): return image.copy() @@ -208,9 +214,9 @@ class BoxBlur(MultibandFilter): raise ValueError(msg) self.radius = radius - def filter(self, image): + def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore: xy = self.radius - if not isinstance(xy, (tuple, list)): + if isinstance(xy, (int, float)): xy = (xy, xy) if xy == (0, 0): return image.copy() @@ -241,7 +247,7 @@ class UnsharpMask(MultibandFilter): self.percent = percent self.threshold = threshold - def filter(self, image): + def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore: return image.unsharp_mask(self.radius, self.percent, self.threshold) @@ -387,8 +393,13 @@ class Color3DLUT(MultibandFilter): name = "Color 3D LUT" def __init__( - self, size, table, channels: int = 3, target_mode: str | None = None, **kwargs - ): + self, + size: int | tuple[int, int, int], + table: Sequence[float] | Sequence[Sequence[int]] | NumpyArray, + channels: int = 3, + target_mode: str | None = None, + **kwargs: bool, + ) -> None: if channels not in (3, 4): msg = "Only 3 or 4 output channels are supported" raise ValueError(msg) @@ -410,15 +421,16 @@ class Color3DLUT(MultibandFilter): pass if numpy and isinstance(table, numpy.ndarray): + numpy_table: NumpyArray = table if copy_table: - table = table.copy() + numpy_table = numpy_table.copy() - if table.shape in [ + if numpy_table.shape in [ (items * channels,), (items, channels), (size[2], size[1], size[0], channels), ]: - table = table.reshape(items * channels) + table = numpy_table.reshape(items * channels) else: wrong_size = True @@ -428,7 +440,8 @@ class Color3DLUT(MultibandFilter): # Convert to a flat list if table and isinstance(table[0], (list, tuple)): - table, raw_table = [], table + raw_table = cast(Sequence[Sequence[int]], table) + flat_table: list[int] = [] for pixel in raw_table: if len(pixel) != channels: msg = ( @@ -436,7 +449,8 @@ class Color3DLUT(MultibandFilter): f"have a length of {channels}." ) raise ValueError(msg) - table.extend(pixel) + flat_table.extend(pixel) + table = flat_table if wrong_size or len(table) != items * channels: msg = ( @@ -449,7 +463,7 @@ class Color3DLUT(MultibandFilter): self.table = table @staticmethod - def _check_size(size: Any) -> list[int]: + def _check_size(size: Any) -> tuple[int, int, int]: try: _, _, _ = size except ValueError as e: @@ -457,7 +471,7 @@ class Color3DLUT(MultibandFilter): raise ValueError(msg) from e except TypeError: size = (size, size, size) - size = [int(x) for x in size] + size = tuple(int(x) for x in size) for size_1d in size: if not 2 <= size_1d <= 65: msg = "Size should be in [2, 65] range." @@ -465,7 +479,13 @@ class Color3DLUT(MultibandFilter): return size @classmethod - def generate(cls, size, callback, channels=3, target_mode=None): + def generate( + cls, + size: int | tuple[int, int, int], + callback: Callable[[float, float, float], tuple[float, ...]], + channels: int = 3, + target_mode: str | None = None, + ) -> Color3DLUT: """Generates new LUT using provided callback. :param size: Size of the table. Passed to the constructor. @@ -482,7 +502,7 @@ class Color3DLUT(MultibandFilter): msg = "Only 3 or 4 output channels are supported" raise ValueError(msg) - table = [0] * (size_1d * size_2d * size_3d * channels) + table: list[float] = [0] * (size_1d * size_2d * size_3d * channels) idx_out = 0 for b in range(size_3d): for g in range(size_2d): @@ -500,7 +520,13 @@ class Color3DLUT(MultibandFilter): _copy_table=False, ) - def transform(self, callback, with_normals=False, channels=None, target_mode=None): + def transform( + self, + callback: Callable[..., tuple[float, ...]], + with_normals: bool = False, + channels: int | None = None, + target_mode: str | None = None, + ) -> Color3DLUT: """Transforms the table values using provided callback and returns a new LUT with altered values. @@ -564,7 +590,7 @@ class Color3DLUT(MultibandFilter): r.append(f"target_mode={self.mode}") return "<{}>".format(" ".join(r)) - def filter(self, image): + def filter(self, image: _imaging.ImagingCore) -> _imaging.ImagingCore: from . import Image return image.color_lut_3d( diff --git a/src/PIL/_typing.py b/src/PIL/_typing.py index 7075e8672..09ece18fa 100644 --- a/src/PIL/_typing.py +++ b/src/PIL/_typing.py @@ -2,7 +2,14 @@ from __future__ import annotations import os import sys -from typing import Protocol, Sequence, TypeVar, Union +from typing import Any, Protocol, Sequence, TypeVar, Union + +try: + import numpy.typing as npt + + NumpyArray = npt.NDArray[Any] +except ImportError: + pass if sys.version_info >= (3, 10): from typing import TypeGuard @@ -10,7 +17,6 @@ else: try: from typing_extensions import TypeGuard except ImportError: - from typing import Any class TypeGuard: # type: ignore[no-redef] def __class_getitem__(cls, item: Any) -> type[bool]: From c155677c4febece9a280208be11f2dd844fe22ad Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 22 Jun 2024 00:39:37 +1000 Subject: [PATCH 065/662] Removed support for Qt 5 --- Tests/test_imageqt.py | 19 +++++++------------ src/PIL/ImageQt.py | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Tests/test_imageqt.py b/Tests/test_imageqt.py index 88ad1f9ee..22cd674ce 100644 --- a/Tests/test_imageqt.py +++ b/Tests/test_imageqt.py @@ -41,18 +41,13 @@ def test_rgb() -> None: checkrgb(0, 0, 255) -def test_image() -> None: - modes = ["1", "RGB", "RGBA", "L", "P"] - qt_format = ImageQt.QImage.Format if ImageQt.qt_version == "6" else ImageQt.QImage - if hasattr(qt_format, "Format_Grayscale16"): # Qt 5.13+ - modes.append("I;16") - - for mode in modes: - im = hopper(mode) - roundtripped_im = ImageQt.fromqimage(ImageQt.ImageQt(im)) - if mode not in ("RGB", "RGBA"): - im = im.convert("RGB") - assert_image_similar(roundtripped_im, im, 1) +@pytest.mark.parametrize("mode", ("1", "RGB", "RGBA", "L", "P", "I;16")) +def test_image(mode: str) -> None: + im = hopper(mode) + roundtripped_im = ImageQt.fromqimage(ImageQt.ImageQt(im)) + if mode not in ("RGB", "RGBA"): + im = im.convert("RGB") + assert_image_similar(roundtripped_im, im, 1) def test_closed_file() -> None: diff --git a/src/PIL/ImageQt.py b/src/PIL/ImageQt.py index 293ba4941..7819ae9c1 100644 --- a/src/PIL/ImageQt.py +++ b/src/PIL/ImageQt.py @@ -152,7 +152,7 @@ def _toqclass_helper(im): elif im.mode == "RGBA": data = im.tobytes("raw", "BGRA") format = qt_format.Format_ARGB32 - elif im.mode == "I;16" and hasattr(qt_format, "Format_Grayscale16"): # Qt 5.13+ + elif im.mode == "I;16": im = im.point(lambda i: i * 256) format = qt_format.Format_Grayscale16 From cc83cc8ec866ac0308fc8fc16ff16893540f77e2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 22 Jun 2024 10:09:11 +1000 Subject: [PATCH 066/662] Updated type hints --- Tests/helper.py | 4 ++-- Tests/test_file_jpeg.py | 4 +++- Tests/test_file_png.py | 16 +++++++--------- Tests/test_file_ppm.py | 12 ++++-------- Tests/test_file_tiff.py | 2 +- Tests/test_font_leaks.py | 2 +- Tests/test_image.py | 8 ++++---- Tests/test_image_draft.py | 4 +++- Tests/test_image_paste.py | 5 +++++ Tests/test_image_point.py | 2 +- Tests/test_image_putdata.py | 8 ++++---- Tests/test_image_resample.py | 2 +- Tests/test_imagecms.py | 11 ++++++----- Tests/test_imagedraw.py | 2 +- Tests/test_imagedraw2.py | 5 +++-- Tests/test_imagefile.py | 2 +- Tests/test_imagefont.py | 6 +++--- Tests/test_imagefontpil.py | 7 ++++++- Tests/test_imagepalette.py | 2 +- Tests/test_psdraw.py | 12 ++++-------- src/PIL/Image.py | 30 +++++++++++++++++++----------- src/PIL/ImageDraw.py | 4 +++- src/PIL/ImageFont.py | 12 ++++++++---- src/PIL/ImageQt.py | 2 +- src/PIL/ImageTransform.py | 2 +- src/PIL/JpegImagePlugin.py | 2 +- src/PIL/TiffTags.py | 6 ++++-- 27 files changed, 98 insertions(+), 76 deletions(-) diff --git a/Tests/helper.py b/Tests/helper.py index fe337c09f..605a214d4 100644 --- a/Tests/helper.py +++ b/Tests/helper.py @@ -18,7 +18,7 @@ from typing import Any, Callable, Sequence import pytest from packaging.version import parse as parse_version -from PIL import Image, ImageMath, features +from PIL import Image, ImageFile, ImageMath, features logger = logging.getLogger(__name__) @@ -240,7 +240,7 @@ class PillowLeakTestCase: # helpers -def fromstring(data: bytes) -> Image.Image: +def fromstring(data: bytes) -> ImageFile.ImageFile: return Image.open(BytesIO(data)) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index 02d0b29d8..dbd917517 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -1033,8 +1033,10 @@ class TestFileJpeg: def test_repr_jpeg(self) -> None: im = hopper() + b = im._repr_jpeg_() + assert b is not None - with Image.open(BytesIO(im._repr_jpeg_())) as repr_jpeg: + with Image.open(BytesIO(b)) as repr_jpeg: assert repr_jpeg.format == "JPEG" assert_image_similar(im, repr_jpeg, 17) diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py index 46714a0f0..0f0976802 100644 --- a/Tests/test_file_png.py +++ b/Tests/test_file_png.py @@ -535,8 +535,10 @@ class TestFilePng: def test_repr_png(self) -> None: im = hopper() + b = im._repr_png_() + assert b is not None - with Image.open(BytesIO(im._repr_png_())) as repr_png: + with Image.open(BytesIO(b)) as repr_png: assert repr_png.format == "PNG" assert_image_equal(im, repr_png) @@ -768,14 +770,10 @@ class TestFilePng: def test_save_stdout(self, buffer: bool) -> None: old_stdout = sys.stdout - if buffer: + class MyStdOut: + buffer = BytesIO() - class MyStdOut: - buffer = BytesIO() - - mystdout = MyStdOut() - else: - mystdout = BytesIO() + mystdout: MyStdOut | BytesIO = MyStdOut() if buffer else BytesIO() sys.stdout = mystdout @@ -785,7 +783,7 @@ class TestFilePng: # Reset stdout sys.stdout = old_stdout - if buffer: + if isinstance(mystdout, MyStdOut): mystdout = mystdout.buffer with Image.open(mystdout) as reloaded: assert_image_equal_tofile(reloaded, TEST_PNG_FILE) diff --git a/Tests/test_file_ppm.py b/Tests/test_file_ppm.py index 1bfd0434e..0a61830a4 100644 --- a/Tests/test_file_ppm.py +++ b/Tests/test_file_ppm.py @@ -368,14 +368,10 @@ def test_mimetypes(tmp_path: Path) -> None: def test_save_stdout(buffer: bool) -> None: old_stdout = sys.stdout - if buffer: + class MyStdOut: + buffer = BytesIO() - class MyStdOut: - buffer = BytesIO() - - mystdout = MyStdOut() - else: - mystdout = BytesIO() + mystdout: MyStdOut | BytesIO = MyStdOut() if buffer else BytesIO() sys.stdout = mystdout @@ -385,7 +381,7 @@ def test_save_stdout(buffer: bool) -> None: # Reset stdout sys.stdout = old_stdout - if buffer: + if isinstance(mystdout, MyStdOut): mystdout = mystdout.buffer with Image.open(mystdout) as reloaded: assert_image_equal_tofile(reloaded, TEST_FILE) diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 17dab25e9..08ff334ac 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -120,7 +120,7 @@ class TestFileTiff: def test_set_legacy_api(self) -> None: ifd = TiffImagePlugin.ImageFileDirectory_v2() with pytest.raises(Exception) as e: - ifd.legacy_api = None + ifd.legacy_api = False assert str(e.value) == "Not allowing setting of legacy api" def test_xyres_tiff(self) -> None: diff --git a/Tests/test_font_leaks.py b/Tests/test_font_leaks.py index 3fb92a62e..ab8a7f9ec 100644 --- a/Tests/test_font_leaks.py +++ b/Tests/test_font_leaks.py @@ -34,7 +34,7 @@ class TestDefaultFontLeak(TestTTypeFontLeak): def test_leak(self) -> None: if features.check_module("freetype2"): - ImageFont.core = _util.DeferredError(ImportError) + ImageFont.core = _util.DeferredError(ImportError("Disabled for testing")) try: default_font = ImageFont.load_default() finally: diff --git a/Tests/test_image.py b/Tests/test_image.py index 35a7a49a8..a8f61d677 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -393,13 +393,13 @@ class TestImage: # errors with pytest.raises(ValueError): - source.alpha_composite(over, "invalid source") + source.alpha_composite(over, "invalid destination") # type: ignore[arg-type] with pytest.raises(ValueError): - source.alpha_composite(over, (0, 0), "invalid destination") + source.alpha_composite(over, (0, 0), "invalid source") # type: ignore[arg-type] with pytest.raises(ValueError): - source.alpha_composite(over, 0) + source.alpha_composite(over, 0) # type: ignore[arg-type] with pytest.raises(ValueError): - source.alpha_composite(over, (0, 0), 0) + source.alpha_composite(over, (0, 0), 0) # type: ignore[arg-type] with pytest.raises(ValueError): source.alpha_composite(over, (0, 0), (0, -1)) diff --git a/Tests/test_image_draft.py b/Tests/test_image_draft.py index 1ce1a7cd8..c9d8c93f3 100644 --- a/Tests/test_image_draft.py +++ b/Tests/test_image_draft.py @@ -16,7 +16,9 @@ def draft_roundtrip( im = Image.new(in_mode, in_size) data = tostring(im, "JPEG") im = fromstring(data) - mode, box = im.draft(req_mode, req_size) + result = im.draft(req_mode, req_size) + assert result is not None + box = result[1] scale, _ = im.decoderconfig assert box[:2] == (0, 0) assert (im.width - scale) < box[2] <= im.width diff --git a/Tests/test_image_paste.py b/Tests/test_image_paste.py index d8f6b65e0..01cb880cb 100644 --- a/Tests/test_image_paste.py +++ b/Tests/test_image_paste.py @@ -338,3 +338,8 @@ class TestImagingPaste: im.copy().paste(im2) im.copy().paste(im2, (0, 0)) + + def test_incorrect_abbreviated_form(self) -> None: + im = Image.new("L", (1, 1)) + with pytest.raises(ValueError): + im.paste(im, im, im) diff --git a/Tests/test_image_point.py b/Tests/test_image_point.py index 05f209351..a5d5a15db 100644 --- a/Tests/test_image_point.py +++ b/Tests/test_image_point.py @@ -61,4 +61,4 @@ def test_f_lut() -> None: def test_f_mode() -> None: im = hopper("F") with pytest.raises(ValueError): - im.point(None) + im.point([]) diff --git a/Tests/test_image_putdata.py b/Tests/test_image_putdata.py index 5e57e4c4c..dad26ef14 100644 --- a/Tests/test_image_putdata.py +++ b/Tests/test_image_putdata.py @@ -113,13 +113,13 @@ def test_array_F() -> None: def test_not_flattened() -> None: im = Image.new("L", (1, 1)) with pytest.raises(TypeError): - im.putdata([[0]]) # type: ignore[list-item] + im.putdata([[0]]) with pytest.raises(TypeError): - im.putdata([[0]], 2) # type: ignore[list-item] + im.putdata([[0]], 2) with pytest.raises(TypeError): im = Image.new("I", (1, 1)) - im.putdata([[0]]) # type: ignore[list-item] + im.putdata([[0]]) with pytest.raises(TypeError): im = Image.new("F", (1, 1)) - im.putdata([[0]]) # type: ignore[list-item] + im.putdata([[0]]) diff --git a/Tests/test_image_resample.py b/Tests/test_image_resample.py index 9b3bdf330..d6055b577 100644 --- a/Tests/test_image_resample.py +++ b/Tests/test_image_resample.py @@ -445,7 +445,7 @@ class TestCoreResampleBox: im.resize((32, 32), resample, (20, 20, 100, 20)) with pytest.raises(TypeError, match="must be sequence of length 4"): - im.resize((32, 32), resample, (im.width, im.height)) + im.resize((32, 32), resample, (im.width, im.height)) # type: ignore[arg-type] with pytest.raises(ValueError, match="can't be negative"): im.resize((32, 32), resample, (-20, 20, 100, 100)) diff --git a/Tests/test_imagecms.py b/Tests/test_imagecms.py index 55f72c3b9..8a25460d3 100644 --- a/Tests/test_imagecms.py +++ b/Tests/test_imagecms.py @@ -103,7 +103,7 @@ def test_sanity() -> None: def test_flags() -> None: - assert ImageCms.Flags.NONE == 0 + assert ImageCms.Flags.NONE.value == 0 assert ImageCms.Flags.GRIDPOINTS(0) == ImageCms.Flags.NONE assert ImageCms.Flags.GRIDPOINTS(256) == ImageCms.Flags.NONE @@ -569,9 +569,9 @@ def assert_aux_channel_preserved( for delta in nine_grid_deltas: channel_data.paste( channel_pattern, - tuple( - paste_offset[c] + delta[c] * channel_pattern.size[c] - for c in range(2) + ( + paste_offset[0] + delta[0] * channel_pattern.size[0], + paste_offset[1] + delta[1] * channel_pattern.size[1], ), ) chans.append(channel_data) @@ -642,7 +642,8 @@ def test_auxiliary_channels_isolated() -> None: # convert with and without AUX data, test colors are equal src_colorSpace = cast(Literal["LAB", "XYZ", "sRGB"], src_format[1]) source_profile = ImageCms.createProfile(src_colorSpace) - destination_profile = ImageCms.createProfile(dst_format[1]) + dst_colorSpace = cast(Literal["LAB", "XYZ", "sRGB"], dst_format[1]) + destination_profile = ImageCms.createProfile(dst_colorSpace) source_image = src_format[3] test_transform = ImageCms.buildTransform( source_profile, diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py index 8b55df992..a24aa16ca 100644 --- a/Tests/test_imagedraw.py +++ b/Tests/test_imagedraw.py @@ -1581,7 +1581,7 @@ def test_compute_regular_polygon_vertices_input_error_handling( error_message: str, ) -> None: with pytest.raises(expected_error) as e: - ImageDraw._compute_regular_polygon_vertices(bounding_circle, n_sides, rotation) + ImageDraw._compute_regular_polygon_vertices(bounding_circle, n_sides, rotation) # type: ignore[arg-type] assert str(e.value) == error_message diff --git a/Tests/test_imagedraw2.py b/Tests/test_imagedraw2.py index 3171eb9ae..35fe0cf40 100644 --- a/Tests/test_imagedraw2.py +++ b/Tests/test_imagedraw2.py @@ -51,9 +51,10 @@ def test_sanity() -> None: pen = ImageDraw2.Pen("blue", width=7) draw.line(list(range(10)), pen) - draw, handler = ImageDraw.getdraw(im) + draw2, handler = ImageDraw.getdraw(im) + assert draw2 is not None pen = ImageDraw2.Pen("blue", width=7) - draw.line(list(range(10)), pen) + draw2.line(list(range(10)), pen) @pytest.mark.parametrize("bbox", BBOX) diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index c9dba2943..00cdec952 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -381,7 +381,7 @@ class TestPyEncoder(CodecsTest): def test_encode(self) -> None: encoder = ImageFile.PyEncoder(None) with pytest.raises(NotImplementedError): - encoder.encode(None) + encoder.encode(0) bytes_consumed, errcode = encoder.encode_to_pyfd() assert bytes_consumed == 0 diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 73cad513e..9f5c3984b 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -209,7 +209,7 @@ def test_getlength( assert length == length_raqm -def test_float_size() -> None: +def test_float_size(layout_engine: ImageFont.Layout) -> None: lengths = [] for size in (48, 48.5, 49): f = ImageFont.truetype( @@ -494,8 +494,8 @@ def test_default_font() -> None: assert_image_equal_tofile(im, "Tests/images/default_font_freetype.png") -@pytest.mark.parametrize("mode", (None, "1", "RGBA")) -def test_getbbox(font: ImageFont.FreeTypeFont, mode: str | None) -> None: +@pytest.mark.parametrize("mode", ("", "1", "RGBA")) +def test_getbbox(font: ImageFont.FreeTypeFont, mode: str) -> None: assert (0, 4, 12, 16) == font.getbbox("A", mode) diff --git a/Tests/test_imagefontpil.py b/Tests/test_imagefontpil.py index 3b1c14b4e..c4a39d1fa 100644 --- a/Tests/test_imagefontpil.py +++ b/Tests/test_imagefontpil.py @@ -14,7 +14,7 @@ original_core = ImageFont.core def setup_module() -> None: if features.check_module("freetype2"): - ImageFont.core = _util.DeferredError(ImportError) + ImageFont.core = _util.DeferredError(ImportError("Disabled for testing")) def teardown_module() -> None: @@ -76,3 +76,8 @@ def test_oom() -> None: font = ImageFont.ImageFont() font._load_pilfont_data(fp, Image.new("L", (1, 1))) font.getmask("A" * 1_000_000) + + +def test_freetypefont_without_freetype() -> None: + with pytest.raises(ImportError): + ImageFont.truetype("Tests/fonts/FreeMono.ttf") diff --git a/Tests/test_imagepalette.py b/Tests/test_imagepalette.py index 8e2db15aa..17f68710a 100644 --- a/Tests/test_imagepalette.py +++ b/Tests/test_imagepalette.py @@ -45,7 +45,7 @@ def test_getcolor() -> None: # Test unknown color specifier with pytest.raises(ValueError): - palette.getcolor("unknown") + palette.getcolor("unknown") # type: ignore[arg-type] def test_getcolor_rgba_color_rgb_palette() -> None: diff --git a/Tests/test_psdraw.py b/Tests/test_psdraw.py index 64dfb2c95..c3afa9089 100644 --- a/Tests/test_psdraw.py +++ b/Tests/test_psdraw.py @@ -54,14 +54,10 @@ def test_stdout(buffer: bool) -> None: # Temporarily redirect stdout old_stdout = sys.stdout - if buffer: + class MyStdOut: + buffer = BytesIO() - class MyStdOut: - buffer = BytesIO() - - mystdout = MyStdOut() - else: - mystdout = BytesIO() + mystdout: MyStdOut | BytesIO = MyStdOut() if buffer else BytesIO() sys.stdout = mystdout @@ -71,6 +67,6 @@ def test_stdout(buffer: bool) -> None: # Reset stdout sys.stdout = old_stdout - if buffer: + if isinstance(mystdout, MyStdOut): mystdout = mystdout.buffer assert mystdout.getvalue() != b"" diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 57da58522..6e2f38650 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1168,7 +1168,7 @@ class Image: def quantize( self, colors: int = 256, - method: Quantize | None = None, + method: int | None = None, kmeans: int = 0, palette=None, dither: Dither = Dither.FLOYDSTEINBERG, @@ -1309,7 +1309,7 @@ class Image: return im.crop((x0, y0, x1, y1)) def draft( - self, mode: str | None, size: tuple[int, int] + self, mode: str | None, size: tuple[int, int] | None ) -> tuple[str, tuple[int, int, float, float]] | None: """ Configures the image file loader so it returns a version of the @@ -1744,7 +1744,7 @@ class Image: def paste( self, im: Image | str | float | tuple[float, ...], - box: tuple[int, int, int, int] | tuple[int, int] | None = None, + box: Image | tuple[int, int, int, int] | tuple[int, int] | None = None, mask: Image | None = None, ) -> None: """ @@ -1786,10 +1786,14 @@ class Image: :param mask: An optional mask image. """ - if isImageType(box) and mask is None: + if isImageType(box): + if mask is not None: + msg = "If using second argument as mask, third argument must be None" + raise ValueError(msg) # abbreviated paste(im, mask) syntax mask = box box = None + assert not isinstance(box, Image) if box is None: box = (0, 0) @@ -1995,7 +1999,10 @@ class Image: self.im.putband(alpha.im, band) def putdata( - self, data: Sequence[float], scale: float = 1.0, offset: float = 0.0 + self, + data: Sequence[float] | Sequence[Sequence[int]], + scale: float = 1.0, + offset: float = 0.0, ) -> None: """ Copies pixel data from a flattened sequence object into the image. The @@ -2656,7 +2663,7 @@ class Image: self, size: tuple[float, float], resample: Resampling = Resampling.BICUBIC, - reducing_gap: float = 2.0, + reducing_gap: float | None = 2.0, ) -> None: """ Make this image into a thumbnail. This method modifies the @@ -2717,11 +2724,12 @@ class Image: return x, y box = None + final_size: tuple[int, int] if reducing_gap is not None: preserved_size = preserve_aspect_ratio() if preserved_size is None: return - size = preserved_size + final_size = preserved_size res = self.draft( None, (int(size[0] * reducing_gap), int(size[1] * reducing_gap)) @@ -2735,13 +2743,13 @@ class Image: preserved_size = preserve_aspect_ratio() if preserved_size is None: return - size = preserved_size + final_size = preserved_size - if self.size != size: - im = self.resize(size, resample, box=box, reducing_gap=reducing_gap) + if self.size != final_size: + im = self.resize(final_size, resample, box=box, reducing_gap=reducing_gap) self.im = im.im - self._size = size + self._size = final_size self._mode = self.im.mode self.readonly = 0 diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py index 91f898838..a471a7ffd 100644 --- a/src/PIL/ImageDraw.py +++ b/src/PIL/ImageDraw.py @@ -62,7 +62,9 @@ directly. class ImageDraw: - font = None + font: ( + ImageFont.ImageFont | ImageFont.FreeTypeFont | ImageFont.TransposedFont | None + ) = None def __init__(self, im: Image.Image, mode: str | None = None) -> None: """ diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index fa5608e6c..61e7a7abe 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -33,11 +33,12 @@ import sys import warnings from enum import IntEnum from io import BytesIO +from types import ModuleType from typing import IO, TYPE_CHECKING, Any, BinaryIO from . import Image from ._typing import StrOrBytesPath -from ._util import is_path +from ._util import DeferredError, is_path if TYPE_CHECKING: from . import ImageFile @@ -53,11 +54,10 @@ class Layout(IntEnum): MAX_STRING_LENGTH = 1_000_000 +core: ModuleType | DeferredError try: from . import _imagingft as core except ImportError as ex: - from ._util import DeferredError - core = DeferredError.new(ex) @@ -199,6 +199,7 @@ class FreeTypeFont: """FreeType font wrapper (requires _imagingft service)""" font: Font + font_bytes: bytes def __init__( self, @@ -210,6 +211,9 @@ class FreeTypeFont: ) -> None: # FIXME: use service provider instead + if isinstance(core, DeferredError): + raise core.ex + if size <= 0: msg = "font size must be greater than 0" raise ValueError(msg) @@ -903,7 +907,7 @@ def load_default(size: float | None = None) -> FreeTypeFont | ImageFont: :return: A font object. """ f: FreeTypeFont | ImageFont - if core.__class__.__name__ == "module" or size is not None: + if isinstance(core, ModuleType) or size is not None: f = truetype( BytesIO( base64.b64decode( diff --git a/src/PIL/ImageQt.py b/src/PIL/ImageQt.py index 293ba4941..a0c16b765 100644 --- a/src/PIL/ImageQt.py +++ b/src/PIL/ImageQt.py @@ -196,7 +196,7 @@ if qt_is_installed: self.setColorTable(im_data["colortable"]) -def toqimage(im): +def toqimage(im) -> ImageQt: return ImageQt(im) diff --git a/src/PIL/ImageTransform.py b/src/PIL/ImageTransform.py index 80a6116b7..ffd791674 100644 --- a/src/PIL/ImageTransform.py +++ b/src/PIL/ImageTransform.py @@ -24,7 +24,7 @@ class Transform(Image.ImageTransformHandler): method: Image.Transform - def __init__(self, data: Sequence[int]) -> None: + def __init__(self, data: Sequence[Any]) -> None: self.data = data def getdata(self) -> tuple[Image.Transform, Sequence[int]]: diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 7a32f1cde..9d6811cb7 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -428,7 +428,7 @@ class JpegImageFile(ImageFile.ImageFile): return s def draft( - self, mode: str | None, size: tuple[int, int] + self, mode: str | None, size: tuple[int, int] | None ) -> tuple[str, tuple[int, int, float, float]] | None: if len(self.tile) != 1: return None diff --git a/src/PIL/TiffTags.py b/src/PIL/TiffTags.py index 89fad7033..e318c8739 100644 --- a/src/PIL/TiffTags.py +++ b/src/PIL/TiffTags.py @@ -89,7 +89,7 @@ DOUBLE = 12 IFD = 13 LONG8 = 16 -TAGS_V2 = { +_tags_v2 = { 254: ("NewSubfileType", LONG, 1), 255: ("SubfileType", SHORT, 1), 256: ("ImageWidth", LONG, 1), @@ -425,9 +425,11 @@ TAGS = { 50784: "Alias Layer Metadata", } +TAGS_V2: dict[int, TagInfo] = {} + def _populate(): - for k, v in TAGS_V2.items(): + for k, v in _tags_v2.items(): # Populate legacy structure. TAGS[k] = v[0] if len(v) == 4: From a2c0a90c44db86c78ccd2cb7ed1a08829e5389bb Mon Sep 17 00:00:00 2001 From: Yay295 Date: Mon, 17 Jun 2024 01:23:36 -0500 Subject: [PATCH 067/662] check required EPS header comments at end of file, not always --- src/PIL/EpsImagePlugin.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index 380b1cf0e..c7f9625c9 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -230,6 +230,11 @@ class EpsImageFile(ImageFile.ImageFile): trailer_reached = False def check_required_header_comments() -> None: + """ + The EPS spec requires that some headers exist. + This should be checked after all headers have been read, + or at the end of the file if that comes first. + """ if "PS-Adobe" not in self.info: msg = 'EPS header missing "%!PS-Adobe" comment' raise SyntaxError(msg) @@ -270,6 +275,8 @@ class EpsImageFile(ImageFile.ImageFile): if byte == b"": # if we didn't read a byte we must be at the end of the file if bytes_read == 0: + if reading_header_comments: + check_required_header_comments() break elif byte in b"\r\n": # if we read a line ending character, ignore it and parse what @@ -365,8 +372,6 @@ class EpsImageFile(ImageFile.ImageFile): trailer_reached = True bytes_read = 0 - check_required_header_comments() - if not self._size: msg = "cannot determine EPS bounding box" raise OSError(msg) From 00c9448cb0610dd957789de402c331ae3000dc5a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 23 Jun 2024 21:37:41 +1000 Subject: [PATCH 068/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index d7231ebea..ec3073446 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,21 @@ Changelog (Pillow) 10.4.0 (unreleased) ------------------- +- Support unpacking more rawmodes to RGBA palettes #7966 + [radarhere] + +- Removed support for Qt 5 #8159 + [radarhere] + +- Improve ``ImageFont.freetype`` support for XDG directories on Linux #8135 + [mamg22, radarhere] + +- Improved consistency of XMP handling #8069 + [radarhere] + +- Use pkg-config to help find libwebp and raqm #8142 + [radarhere] + - Accept 't' suffix for libtiff version #8126, #8129 [radarhere] From 42381aa1e65735f67f4abbae170d97082f212de5 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 24 Jun 2024 06:59:00 +1000 Subject: [PATCH 069/662] Added type hints --- Tests/test_file_bufrstub.py | 7 +++++-- Tests/test_file_gribstub.py | 7 +++++-- Tests/test_file_hdf5stub.py | 7 +++++-- Tests/test_file_png.py | 2 +- Tests/test_file_ppm.py | 2 +- Tests/test_file_psd.py | 2 +- Tests/test_file_tiff_metadata.py | 10 +++++++--- Tests/test_file_webp.py | 5 ++++- Tests/test_image.py | 16 ++++++++++++---- Tests/test_image_array.py | 7 +++++-- Tests/test_imagefile.py | 4 +++- Tests/test_imagefont.py | 2 +- Tests/test_imagewin_pointers.py | 11 ++++++----- Tests/test_psdraw.py | 2 +- 14 files changed, 57 insertions(+), 27 deletions(-) diff --git a/Tests/test_file_bufrstub.py b/Tests/test_file_bufrstub.py index 939e82e77..77ee5b0ea 100644 --- a/Tests/test_file_bufrstub.py +++ b/Tests/test_file_bufrstub.py @@ -64,6 +64,9 @@ def test_handler(tmp_path: Path) -> None: im.fp.close() return Image.new("RGB", (1, 1)) + def is_loaded(self) -> bool: + return self.loaded + def save(self, im: Image.Image, fp: IO[bytes], filename: str) -> None: self.saved = True @@ -71,10 +74,10 @@ def test_handler(tmp_path: Path) -> None: BufrStubImagePlugin.register_handler(handler) with Image.open(TEST_FILE) as im: assert handler.opened - assert not handler.loaded + assert not handler.is_loaded() im.load() - assert handler.loaded + assert handler.is_loaded() temp_file = str(tmp_path / "temp.bufr") im.save(temp_file) diff --git a/Tests/test_file_gribstub.py b/Tests/test_file_gribstub.py index 86a9064fc..aba473d24 100644 --- a/Tests/test_file_gribstub.py +++ b/Tests/test_file_gribstub.py @@ -64,6 +64,9 @@ def test_handler(tmp_path: Path) -> None: im.fp.close() return Image.new("RGB", (1, 1)) + def is_loaded(self) -> bool: + return self.loaded + def save(self, im: Image.Image, fp: IO[bytes], filename: str) -> None: self.saved = True @@ -71,10 +74,10 @@ def test_handler(tmp_path: Path) -> None: GribStubImagePlugin.register_handler(handler) with Image.open(TEST_FILE) as im: assert handler.opened - assert not handler.loaded + assert not handler.is_loaded() im.load() - assert handler.loaded + assert handler.is_loaded() temp_file = str(tmp_path / "temp.grib") im.save(temp_file) diff --git a/Tests/test_file_hdf5stub.py b/Tests/test_file_hdf5stub.py index ee1544c51..8275bd0d8 100644 --- a/Tests/test_file_hdf5stub.py +++ b/Tests/test_file_hdf5stub.py @@ -66,6 +66,9 @@ def test_handler(tmp_path: Path) -> None: im.fp.close() return Image.new("RGB", (1, 1)) + def is_loaded(self) -> bool: + return self.loaded + def save(self, im: Image.Image, fp: IO[bytes], filename: str) -> None: self.saved = True @@ -73,10 +76,10 @@ def test_handler(tmp_path: Path) -> None: Hdf5StubImagePlugin.register_handler(handler) with Image.open(TEST_FILE) as im: assert handler.opened - assert not handler.loaded + assert not handler.is_loaded() im.load() - assert handler.loaded + assert handler.is_loaded() temp_file = str(tmp_path / "temp.h5") im.save(temp_file) diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py index 0f0976802..a8b50a6d4 100644 --- a/Tests/test_file_png.py +++ b/Tests/test_file_png.py @@ -775,7 +775,7 @@ class TestFilePng: mystdout: MyStdOut | BytesIO = MyStdOut() if buffer else BytesIO() - sys.stdout = mystdout + sys.stdout = mystdout # type: ignore[assignment] with Image.open(TEST_PNG_FILE) as im: im.save(sys.stdout, "PNG") diff --git a/Tests/test_file_ppm.py b/Tests/test_file_ppm.py index 0a61830a4..d6451ec18 100644 --- a/Tests/test_file_ppm.py +++ b/Tests/test_file_ppm.py @@ -373,7 +373,7 @@ def test_save_stdout(buffer: bool) -> None: mystdout: MyStdOut | BytesIO = MyStdOut() if buffer else BytesIO() - sys.stdout = mystdout + sys.stdout = mystdout # type: ignore[assignment] with Image.open(TEST_FILE) as im: im.save(sys.stdout, "PPM") diff --git a/Tests/test_file_psd.py b/Tests/test_file_psd.py index 484a1be8f..ddae8f235 100644 --- a/Tests/test_file_psd.py +++ b/Tests/test_file_psd.py @@ -162,7 +162,7 @@ def test_combined_larger_than_size() -> None: ("Tests/images/timeout-dedc7a4ebd856d79b4359bbcc79e8ef231ce38f6.psd", OSError), ], ) -def test_crashes(test_file: str, raises) -> None: +def test_crashes(test_file: str, raises: type[Exception]) -> None: with open(test_file, "rb") as f: with pytest.raises(raises): with Image.open(f): diff --git a/Tests/test_file_tiff_metadata.py b/Tests/test_file_tiff_metadata.py index 8b816aa4f..1e0310001 100644 --- a/Tests/test_file_tiff_metadata.py +++ b/Tests/test_file_tiff_metadata.py @@ -11,7 +11,11 @@ from PIL.TiffImagePlugin import IFDRational from .helper import assert_deep_equal, hopper -TAG_IDS = {info.name: info.value for info in TiffTags.TAGS_V2.values()} +TAG_IDS: dict[str, int] = { + info.name: info.value + for info in TiffTags.TAGS_V2.values() + if info.value is not None +} def test_rt_metadata(tmp_path: Path) -> None: @@ -411,8 +415,8 @@ def test_empty_values() -> None: info = TiffImagePlugin.ImageFileDirectory_v2(head) info.load(data) # Should not raise ValueError. - info = dict(info) - assert 33432 in info + info_dict = dict(info) + assert 33432 in info_dict def test_photoshop_info(tmp_path: Path) -> None: diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index 1caf032f6..cbc905de4 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -5,6 +5,7 @@ import re import sys import warnings from pathlib import Path +from typing import Any import pytest @@ -70,7 +71,9 @@ class TestFileWebp: # dwebp -ppm ../../Tests/images/hopper.webp -o hopper_webp_bits.ppm assert_image_similar_tofile(image, "Tests/images/hopper_webp_bits.ppm", 1.0) - def _roundtrip(self, tmp_path: Path, mode, epsilon, args={}) -> None: + def _roundtrip( + self, tmp_path: Path, mode: str, epsilon: float, args: dict[str, Any] = {} + ) -> None: temp_file = str(tmp_path / "temp.webp") hopper(mode).save(temp_file, **args) diff --git a/Tests/test_image.py b/Tests/test_image.py index a8f61d677..5b1ba6289 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -8,7 +8,7 @@ import sys import tempfile import warnings from pathlib import Path -from typing import IO +from typing import IO, Any import pytest @@ -175,11 +175,19 @@ class TestImage: def test_fp_name(self, tmp_path: Path) -> None: temp_file = str(tmp_path / "temp.jpg") - class FP: + class FP(io.BytesIO): name: str - def write(self, b: bytes) -> None: - pass + if sys.version_info >= (3, 12): + from collections.abc import Buffer + + def write(self, data: Buffer) -> int: + return len(data) + + else: + + def write(self, data: Any) -> int: + return len(data) fp = FP() fp.name = temp_file diff --git a/Tests/test_image_array.py b/Tests/test_image_array.py index d7e6c562c..bb6064882 100644 --- a/Tests/test_image_array.py +++ b/Tests/test_image_array.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Any +from typing import TYPE_CHECKING, Any import pytest from packaging.version import parse as parse_version @@ -13,13 +13,16 @@ numpy = pytest.importorskip("numpy", reason="NumPy not installed") im = hopper().resize((128, 100)) +if TYPE_CHECKING: + import numpy.typing as npt + def test_toarray() -> None: def test(mode: str) -> tuple[tuple[int, ...], str, int]: ai = numpy.array(im.convert(mode)) return ai.shape, ai.dtype.str, ai.nbytes - def test_with_dtype(dtype) -> None: + def test_with_dtype(dtype: npt.DTypeLike) -> None: ai = numpy.array(im, dtype=dtype) assert ai.dtype == dtype diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index 00cdec952..a269b846a 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -351,7 +351,9 @@ class TestPyEncoder(CodecsTest): ImageFile._save( im, fp, [("MOCK", (xoff, yoff, -10, yoff + ysize), 0, "RGB")] ) - assert MockPyEncoder.last.cleanup_called + last: MockPyEncoder | None = MockPyEncoder.last + assert last + assert last.cleanup_called with pytest.raises(ValueError): ImageFile._save( diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index c3906de24..e50198087 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -548,7 +548,7 @@ def test_find_font( def loadable_font( filepath: str, size: int, index: int, encoding: str, *args: Any - ): + ) -> ImageFont.FreeTypeFont: _freeTypeFont = getattr(ImageFont, "_FreeTypeFont") if filepath == path_to_fake: return _freeTypeFont(FONT_PATH, size, index, encoding, *args) diff --git a/Tests/test_imagewin_pointers.py b/Tests/test_imagewin_pointers.py index e6c312a0c..c23a5c690 100644 --- a/Tests/test_imagewin_pointers.py +++ b/Tests/test_imagewin_pointers.py @@ -45,21 +45,22 @@ if is_win32(): memcpy = ctypes.cdll.msvcrt.memcpy memcpy.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_size_t] - CreateCompatibleDC = ctypes.windll.gdi32.CreateCompatibleDC + windll = getattr(ctypes, "windll") + CreateCompatibleDC = windll.gdi32.CreateCompatibleDC CreateCompatibleDC.argtypes = [ctypes.wintypes.HDC] CreateCompatibleDC.restype = ctypes.wintypes.HDC - DeleteDC = ctypes.windll.gdi32.DeleteDC + DeleteDC = windll.gdi32.DeleteDC DeleteDC.argtypes = [ctypes.wintypes.HDC] - SelectObject = ctypes.windll.gdi32.SelectObject + SelectObject = windll.gdi32.SelectObject SelectObject.argtypes = [ctypes.wintypes.HDC, ctypes.wintypes.HGDIOBJ] SelectObject.restype = ctypes.wintypes.HGDIOBJ - DeleteObject = ctypes.windll.gdi32.DeleteObject + DeleteObject = windll.gdi32.DeleteObject DeleteObject.argtypes = [ctypes.wintypes.HGDIOBJ] - CreateDIBSection = ctypes.windll.gdi32.CreateDIBSection + CreateDIBSection = windll.gdi32.CreateDIBSection CreateDIBSection.argtypes = [ ctypes.wintypes.HDC, ctypes.c_void_p, diff --git a/Tests/test_psdraw.py b/Tests/test_psdraw.py index c3afa9089..130ffa863 100644 --- a/Tests/test_psdraw.py +++ b/Tests/test_psdraw.py @@ -59,7 +59,7 @@ def test_stdout(buffer: bool) -> None: mystdout: MyStdOut | BytesIO = MyStdOut() if buffer else BytesIO() - sys.stdout = mystdout + sys.stdout = mystdout # type: ignore[assignment] ps = PSDraw.PSDraw() _create_document(ps) From e5c4d56a9e62ab5834350ef1e39da542ea1559d5 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 24 Jun 2024 15:08:36 +1000 Subject: [PATCH 070/662] Clarify error message when size is missing --- Tests/test_imagedraw2.py | 8 ++++++++ src/PIL/ImageDraw2.py | 12 ++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Tests/test_imagedraw2.py b/Tests/test_imagedraw2.py index 35fe0cf40..c80aa739c 100644 --- a/Tests/test_imagedraw2.py +++ b/Tests/test_imagedraw2.py @@ -57,6 +57,14 @@ def test_sanity() -> None: draw2.line(list(range(10)), pen) +def test_mode() -> None: + draw = ImageDraw2.Draw("L", (1, 1)) + assert draw.image.mode == "L" + + with pytest.raises(ValueError): + ImageDraw2.Draw("L") + + @pytest.mark.parametrize("bbox", BBOX) def test_ellipse(bbox: Coords) -> None: # Arrange diff --git a/src/PIL/ImageDraw2.py b/src/PIL/ImageDraw2.py index b42f5d9ea..600e140e1 100644 --- a/src/PIL/ImageDraw2.py +++ b/src/PIL/ImageDraw2.py @@ -56,8 +56,16 @@ class Draw: (Experimental) WCK-style drawing interface """ - def __init__(self, image, size=None, color=None): - if not hasattr(image, "im"): + def __init__( + self, + image: Image.Image | str, + size: tuple[int, int] | list[int] | None = None, + color: float | tuple[float, ...] | str | None = None, + ) -> None: + if isinstance(image, str): + if size is None: + msg = "If image argument is mode string, size must be a list or tuple" + raise ValueError(msg) image = Image.new(image, size, color) self.draw = ImageDraw.Draw(image) self.image = image From f2302ab716e9ee4e45bca3dee2c83ce5f56283b8 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 24 Jun 2024 21:04:33 +1000 Subject: [PATCH 071/662] Added type hints --- Tests/test_file_spider.py | 1 + Tests/test_imagefile.py | 4 +-- Tests/test_imageops_usm.py | 2 +- Tests/test_imagepalette.py | 8 +++--- src/PIL/BlpImagePlugin.py | 2 ++ src/PIL/ImageDraw2.py | 7 +++++- src/PIL/ImageFile.py | 25 ++++++++++--------- src/PIL/ImagePalette.py | 48 ++++++++++++++++++++++-------------- src/PIL/ImageWin.py | 13 ++++++---- src/PIL/SpiderImagePlugin.py | 22 +++++++++-------- 10 files changed, 79 insertions(+), 53 deletions(-) diff --git a/Tests/test_file_spider.py b/Tests/test_file_spider.py index 9b82a962a..66c88e9d8 100644 --- a/Tests/test_file_spider.py +++ b/Tests/test_file_spider.py @@ -105,6 +105,7 @@ def test_load_image_series() -> None: img_list = SpiderImagePlugin.loadImageSeries(file_list) # Assert + assert img_list is not None assert len(img_list) == 1 assert isinstance(img_list[0], Image.Image) assert img_list[0].size == (128, 128) diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index a269b846a..68b28ef07 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -209,7 +209,7 @@ class MockPyDecoder(ImageFile.PyDecoder): super().__init__(mode, *args) - def decode(self, buffer): + def decode(self, buffer: bytes) -> tuple[int, int]: # eof return -1, 0 @@ -222,7 +222,7 @@ class MockPyEncoder(ImageFile.PyEncoder): super().__init__(mode, *args) - def encode(self, buffer): + def encode(self, bufsize: int) -> tuple[int, int, bytes]: return 1, 1, b"" def cleanup(self) -> None: diff --git a/Tests/test_imageops_usm.py b/Tests/test_imageops_usm.py index dbdd5b317..c8e2c0467 100644 --- a/Tests/test_imageops_usm.py +++ b/Tests/test_imageops_usm.py @@ -101,7 +101,7 @@ def test_blur_accuracy(test_images: dict[str, ImageFile.ImageFile]) -> None: assert i.im.getpixel((x, y))[c] >= 250 # Fuzzy match. - def gp(x, y): + def gp(x: int, y: int) -> tuple[int, ...]: return i.im.getpixel((x, y)) assert 236 <= gp(7, 4)[0] <= 239 diff --git a/Tests/test_imagepalette.py b/Tests/test_imagepalette.py index 17f68710a..6cf0079dd 100644 --- a/Tests/test_imagepalette.py +++ b/Tests/test_imagepalette.py @@ -88,13 +88,13 @@ def test_file(tmp_path: Path) -> None: palette.save(f) - p = ImagePalette.load(f) + lut = ImagePalette.load(f) # load returns raw palette information - assert len(p[0]) == 768 - assert p[1] == "RGB" + assert len(lut[0]) == 768 + assert lut[1] == "RGB" - p = ImagePalette.raw(p[1], p[0]) + p = ImagePalette.raw(lut[1], lut[0]) assert isinstance(p, ImagePalette.ImagePalette) assert p.palette == palette.tobytes() diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py index 59246c6e2..b9cefafdd 100644 --- a/src/PIL/BlpImagePlugin.py +++ b/src/PIL/BlpImagePlugin.py @@ -430,6 +430,7 @@ class BLPEncoder(ImageFile.PyEncoder): def _write_palette(self) -> bytes: data = b"" + assert self.im is not None palette = self.im.getpalette("RGBA", "RGBA") for i in range(len(palette) // 4): r, g, b, a = palette[i * 4 : (i + 1) * 4] @@ -444,6 +445,7 @@ class BLPEncoder(ImageFile.PyEncoder): offset = 20 + 16 * 4 * 2 + len(palette_data) data = struct.pack("<16I", offset, *((0,) * 15)) + assert self.im is not None w, h = self.im.size data += struct.pack("<16I", w * h, *((0,) * 15)) diff --git a/src/PIL/ImageDraw2.py b/src/PIL/ImageDraw2.py index 600e140e1..e89a78be4 100644 --- a/src/PIL/ImageDraw2.py +++ b/src/PIL/ImageDraw2.py @@ -24,7 +24,10 @@ """ from __future__ import annotations +from typing import BinaryIO + from . import Image, ImageColor, ImageDraw, ImageFont, ImagePath +from ._typing import StrOrBytesPath class Pen: @@ -45,7 +48,9 @@ class Brush: class Font: """Stores a TrueType font and color""" - def __init__(self, color, file, size=12): + def __init__( + self, color: str, file: StrOrBytesPath | BinaryIO, size: float = 12 + ) -> None: # FIXME: add support for bitmap fonts self.color = ImageColor.getrgb(color) self.font = ImageFont.truetype(file, size) diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 5d67409ea..69e7ee548 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -65,7 +65,7 @@ Dict of known error codes returned from :meth:`.PyDecoder.decode`, # Helpers -def _get_oserror(error, *, encoder): +def _get_oserror(error: int, *, encoder: bool) -> OSError: try: msg = Image.core.getcodecstatus(error) except AttributeError: @@ -76,7 +76,7 @@ def _get_oserror(error, *, encoder): return OSError(msg) -def raise_oserror(error): +def raise_oserror(error: int) -> OSError: deprecate( "raise_oserror", 12, @@ -154,11 +154,12 @@ class ImageFile(Image.Image): self.fp.close() raise - def get_format_mimetype(self): + def get_format_mimetype(self) -> str | None: if self.custom_mimetype: return self.custom_mimetype if self.format is not None: return Image.MIME.get(self.format.upper()) + return None def __setstate__(self, state): self.tile = [] @@ -365,7 +366,7 @@ class StubImageFile(ImageFile): certain format, but relies on external code to load the file. """ - def _open(self): + def _open(self) -> None: msg = "StubImageFile subclass must implement _open" raise NotImplementedError(msg) @@ -381,7 +382,7 @@ class StubImageFile(ImageFile): self.__dict__ = image.__dict__ return image.load() - def _load(self): + def _load(self) -> StubHandler | None: """(Hook) Find actual image loader.""" msg = "StubImageFile subclass must implement _load" raise NotImplementedError(msg) @@ -621,7 +622,7 @@ class PyCodecState: self.xoff = 0 self.yoff = 0 - def extents(self): + def extents(self) -> tuple[int, int, int, int]: return self.xoff, self.yoff, self.xoff + self.xsize, self.yoff + self.ysize @@ -661,7 +662,7 @@ class PyCodec: """ self.fd = fd - def setimage(self, im, extents=None): + def setimage(self, im, extents: tuple[int, int, int, int] | None = None) -> None: """ Called from ImageFile to set the core output image for the codec @@ -710,10 +711,10 @@ class PyDecoder(PyCodec): _pulls_fd = False @property - def pulls_fd(self): + def pulls_fd(self) -> bool: return self._pulls_fd - def decode(self, buffer): + def decode(self, buffer: bytes) -> tuple[int, int]: """ Override to perform the decoding process. @@ -738,6 +739,7 @@ class PyDecoder(PyCodec): if not rawmode: rawmode = self.mode d = Image._getdecoder(self.mode, "raw", rawmode) + assert self.im is not None d.setimage(self.im, self.state.extents()) s = d.decode(data) @@ -760,7 +762,7 @@ class PyEncoder(PyCodec): _pushes_fd = False @property - def pushes_fd(self): + def pushes_fd(self) -> bool: return self._pushes_fd def encode(self, bufsize: int) -> tuple[int, int, bytes]: @@ -775,7 +777,7 @@ class PyEncoder(PyCodec): msg = "unavailable in base encoder" raise NotImplementedError(msg) - def encode_to_pyfd(self): + def encode_to_pyfd(self) -> tuple[int, int]: """ If ``pushes_fd`` is ``True``, then this method will be used, and ``encode()`` will only be called once. @@ -787,6 +789,7 @@ class PyEncoder(PyCodec): return 0, -8 # bad configuration bytes_consumed, errcode, data = self.encode(0) if data: + assert self.fd is not None self.fd.write(data) return bytes_consumed, errcode diff --git a/src/PIL/ImagePalette.py b/src/PIL/ImagePalette.py index 6473c4577..ed38285dc 100644 --- a/src/PIL/ImagePalette.py +++ b/src/PIL/ImagePalette.py @@ -38,23 +38,27 @@ class ImagePalette: Defaults to an empty palette. """ - def __init__(self, mode: str = "RGB", palette: Sequence[int] | None = None) -> None: + def __init__( + self, + mode: str = "RGB", + palette: Sequence[int] | bytes | bytearray | None = None, + ) -> None: self.mode = mode - self.rawmode = None # if set, palette contains raw data + self.rawmode: str | None = None # if set, palette contains raw data self.palette = palette or bytearray() self.dirty: int | None = None @property - def palette(self): + def palette(self) -> Sequence[int] | bytes | bytearray: return self._palette @palette.setter - def palette(self, palette): - self._colors = None + def palette(self, palette: Sequence[int] | bytes | bytearray) -> None: + self._colors: dict[tuple[int, ...], int] | None = None self._palette = palette @property - def colors(self) -> dict[tuple[int, int, int] | tuple[int, int, int, int], int]: + def colors(self) -> dict[tuple[int, ...], int]: if self._colors is None: mode_len = len(self.mode) self._colors = {} @@ -66,9 +70,7 @@ class ImagePalette: return self._colors @colors.setter - def colors( - self, colors: dict[tuple[int, int, int] | tuple[int, int, int, int], int] - ) -> None: + def colors(self, colors: dict[tuple[int, ...], int]) -> None: self._colors = colors def copy(self) -> ImagePalette: @@ -82,7 +84,7 @@ class ImagePalette: return new - def getdata(self) -> tuple[str, bytes]: + def getdata(self) -> tuple[str, Sequence[int] | bytes | bytearray]: """ Get palette contents in format suitable for the low-level ``im.putpalette`` primitive. @@ -137,7 +139,7 @@ class ImagePalette: def getcolor( self, - color: tuple[int, int, int] | tuple[int, int, int, int], + color: tuple[int, ...], image: Image.Image | None = None, ) -> int: """Given an rgb tuple, allocate palette entry. @@ -162,12 +164,13 @@ class ImagePalette: except KeyError as e: # allocate new color slot index = self._new_color_index(image, e) + assert isinstance(self._palette, bytearray) self.colors[color] = index if index * 3 < len(self.palette): self._palette = ( - self.palette[: index * 3] + self._palette[: index * 3] + bytes(color) - + self.palette[index * 3 + 3 :] + + self._palette[index * 3 + 3 :] ) else: self._palette += bytes(color) @@ -204,7 +207,7 @@ class ImagePalette: # Internal -def raw(rawmode, data) -> ImagePalette: +def raw(rawmode, data: Sequence[int] | bytes | bytearray) -> ImagePalette: palette = ImagePalette() palette.rawmode = rawmode palette.palette = data @@ -216,9 +219,9 @@ def raw(rawmode, data) -> ImagePalette: # Factories -def make_linear_lut(black, white): +def make_linear_lut(black: int, white: float) -> list[int]: if black == 0: - return [white * i // 255 for i in range(256)] + return [int(white * i // 255) for i in range(256)] msg = "unavailable when black is non-zero" raise NotImplementedError(msg) # FIXME @@ -251,15 +254,22 @@ def wedge(mode: str = "RGB") -> ImagePalette: return ImagePalette(mode, [i // len(mode) for i in palette]) -def load(filename): +def load(filename: str) -> tuple[bytes, str]: # FIXME: supports GIMP gradients only with open(filename, "rb") as fp: - for paletteHandler in [ + paletteHandlers: list[ + type[ + GimpPaletteFile.GimpPaletteFile + | GimpGradientFile.GimpGradientFile + | PaletteFile.PaletteFile + ] + ] = [ GimpPaletteFile.GimpPaletteFile, GimpGradientFile.GimpGradientFile, PaletteFile.PaletteFile, - ]: + ] + for paletteHandler in paletteHandlers: try: fp.seek(0) lut = paletteHandler(fp).getpalette() diff --git a/src/PIL/ImageWin.py b/src/PIL/ImageWin.py index 6c29e2590..978c5a9d1 100644 --- a/src/PIL/ImageWin.py +++ b/src/PIL/ImageWin.py @@ -69,19 +69,22 @@ class Dib: defines the size of the image. """ - def __init__(self, image, size=None): - if hasattr(image, "mode") and hasattr(image, "size"): + def __init__( + self, image: Image.Image | str, size: tuple[int, int] | list[int] | None = None + ) -> None: + if isinstance(image, str): + mode = image + image = "" + else: mode = image.mode size = image.size - else: - mode = image - image = None if mode not in ["1", "L", "P", "RGB"]: mode = Image.getmodebase(mode) self.image = Image.core.display(mode, size) self.mode = mode self.size = size if image: + assert not isinstance(image, str) self.paste(image) def expose(self, handle): diff --git a/src/PIL/SpiderImagePlugin.py b/src/PIL/SpiderImagePlugin.py index a6cc00019..f5a09c3ef 100644 --- a/src/PIL/SpiderImagePlugin.py +++ b/src/PIL/SpiderImagePlugin.py @@ -37,12 +37,12 @@ from __future__ import annotations import os import struct import sys -from typing import IO, TYPE_CHECKING +from typing import IO, TYPE_CHECKING, Any, Tuple, cast from . import Image, ImageFile -def isInt(f): +def isInt(f: Any) -> int: try: i = int(f) if f - i == 0: @@ -62,7 +62,7 @@ iforms = [1, 3, -11, -12, -21, -22] # otherwise returns 0 -def isSpiderHeader(t): +def isSpiderHeader(t: tuple[float, ...]) -> int: h = (99,) + t # add 1 value so can use spider header index start=1 # header values 1,2,5,12,13,22,23 should be integers for i in [1, 2, 5, 12, 13, 22, 23]: @@ -82,7 +82,7 @@ def isSpiderHeader(t): return labbyt -def isSpiderImage(filename): +def isSpiderImage(filename: str) -> int: with open(filename, "rb") as fp: f = fp.read(92) # read 23 * 4 bytes t = struct.unpack(">23f", f) # try big-endian first @@ -184,13 +184,15 @@ class SpiderImageFile(ImageFile.ImageFile): self._open() # returns a byte image after rescaling to 0..255 - def convert2byte(self, depth=255): - (minimum, maximum) = self.getextrema() - m = 1 + def convert2byte(self, depth: int = 255) -> Image.Image: + extrema = self.getextrema() + assert isinstance(extrema[0], float) + minimum, maximum = cast(Tuple[float, float], extrema) + m: float = 1 if maximum != minimum: m = depth / (maximum - minimum) b = -m * minimum - return self.point(lambda i, m=m, b=b: i * m + b).convert("L") + return self.point(lambda i: i * m + b).convert("L") if TYPE_CHECKING: from . import ImageTk @@ -207,10 +209,10 @@ class SpiderImageFile(ImageFile.ImageFile): # given a list of filenames, return a list of images -def loadImageSeries(filelist=None): +def loadImageSeries(filelist: list[str] | None = None) -> list[SpiderImageFile] | None: """create a list of :py:class:`~PIL.Image.Image` objects for use in a montage""" if filelist is None or len(filelist) < 1: - return + return None imglist = [] for img in filelist: From 065aeaea472b38896d43363095cccc05220b3c9c Mon Sep 17 00:00:00 2001 From: Yay295 Date: Mon, 24 Jun 2024 07:28:47 -0500 Subject: [PATCH 072/662] improve check_required_header_comments() description Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- src/PIL/EpsImagePlugin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index c7f9625c9..f31b1c1a2 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -231,9 +231,9 @@ class EpsImageFile(ImageFile.ImageFile): def check_required_header_comments() -> None: """ - The EPS spec requires that some headers exist. - This should be checked after all headers have been read, - or at the end of the file if that comes first. + The EPS specification requires that some headers exist. + This should be checked when the header comments formally end, + when image data starts, or when the file ends, whichever comes first. """ if "PS-Adobe" not in self.info: msg = 'EPS header missing "%!PS-Adobe" comment' From a941f096aa06df7d71dc451151076925dc8dc9f9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 25 Jun 2024 18:49:40 +1000 Subject: [PATCH 073/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index ec3073446..9c731fe94 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 10.4.0 (unreleased) ------------------- +- Clarify ImageDraw2 error message when size is missing #8165 + [radarhere] + - Support unpacking more rawmodes to RGBA palettes #7966 [radarhere] From ded404507bf8e8ae33ee194e9e1dc275e25edc82 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 22 Jun 2024 17:02:19 +1000 Subject: [PATCH 074/662] Removed ignores --- src/PIL/ImageGrab.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/PIL/ImageGrab.py b/src/PIL/ImageGrab.py index 96a28bb35..aa53abd20 100644 --- a/src/PIL/ImageGrab.py +++ b/src/PIL/ImageGrab.py @@ -22,7 +22,6 @@ import shutil import subprocess import sys import tempfile -from typing import Union, cast from . import Image @@ -70,15 +69,15 @@ def grab( left, top, right, bottom = bbox im = im.crop((left - x0, top - y0, right - x0, bottom - y0)) return im - xdisplay = cast(Union[str, None], xdisplay) # type: ignore[redundant-cast, unused-ignore] + display_name: str | None = xdisplay try: if not Image.core.HAVE_XCB: msg = "Pillow was built without XCB support" raise OSError(msg) - size, data = Image.core.grabscreen_x11(xdisplay) + size, data = Image.core.grabscreen_x11(display_name) except OSError: if ( - xdisplay is None + display_name is None and sys.platform not in ("darwin", "win32") and shutil.which("gnome-screenshot") ): From d0d53d4bac853acaad51af7d6aa9582cad59945a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 22 Jun 2024 17:02:28 +1000 Subject: [PATCH 075/662] Added type hints to tests --- Tests/test_imagegrab.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tests/test_imagegrab.py b/Tests/test_imagegrab.py index e23adeb70..5dfa51697 100644 --- a/Tests/test_imagegrab.py +++ b/Tests/test_imagegrab.py @@ -89,6 +89,7 @@ $bmp = New-Object Drawing.Bitmap 200, 200 p.communicate() im = ImageGrab.grabclipboard() + assert isinstance(im, list) assert len(im) == 1 assert os.path.samefile(im[0], "Tests/images/hopper.gif") @@ -105,6 +106,7 @@ $ms = new-object System.IO.MemoryStream(, $bytes) p.communicate() im = ImageGrab.grabclipboard() + assert isinstance(im, Image.Image) assert_image_equal_tofile(im, "Tests/images/hopper.png") @pytest.mark.skipif( @@ -120,6 +122,7 @@ $ms = new-object System.IO.MemoryStream(, $bytes) with open(image_path, "rb") as fp: subprocess.call(["wl-copy"], stdin=fp) im = ImageGrab.grabclipboard() + assert isinstance(im, Image.Image) assert_image_equal_tofile(im, image_path) @pytest.mark.skipif( From ab183958188e38b6501410b4f34a561fbea0ba56 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Tue, 25 Jun 2024 07:13:17 +1000 Subject: [PATCH 076/662] Added comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ondrej Baranovič --- src/PIL/ImageGrab.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PIL/ImageGrab.py b/src/PIL/ImageGrab.py index aa53abd20..e27ca7e50 100644 --- a/src/PIL/ImageGrab.py +++ b/src/PIL/ImageGrab.py @@ -69,6 +69,7 @@ def grab( left, top, right, bottom = bbox im = im.crop((left - x0, top - y0, right - x0, bottom - y0)) return im + # Cast to Optional[str] needed for Windows and macOS. display_name: str | None = xdisplay try: if not Image.core.HAVE_XCB: From 44b82e4513529fd20479169eba22366815f7821c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 25 Jun 2024 21:40:30 +1000 Subject: [PATCH 077/662] Use more specific error --- Tests/test_file_jpeg2k.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py index ed7ea4fcf..c6f1e0f52 100644 --- a/Tests/test_file_jpeg2k.py +++ b/Tests/test_file_jpeg2k.py @@ -337,7 +337,7 @@ def test_issue_6194() -> None: def test_unbound_local() -> None: # prepatch, a malformed jp2 file could cause an UnboundLocalError exception. - with pytest.raises(OSError): + with pytest.raises(UnidentifiedImageError): with Image.open("Tests/images/unbound_variable.jp2"): pass From e7c1da3cc8a26b821e0a4ec2d4651d62271f00c5 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 25 Jun 2024 21:42:25 +1000 Subject: [PATCH 078/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 9c731fe94..6375f5c63 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,12 @@ Changelog (Pillow) 10.4.0 (unreleased) ------------------- +- Read IM and TIFF images as RGB, rather than RGBX #7997 + [radarhere] + +- Only preserve TIFF IPTC_NAA_CHUNK tag if type is BYTE or UNDEFINED #7948 + [radarhere] + - Clarify ImageDraw2 error message when size is missing #8165 [radarhere] From 99666dac291da395dc03743fb540277c9da0b7b5 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 25 Jun 2024 22:00:51 +1000 Subject: [PATCH 079/662] Simplified casts --- src/PIL/Image.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index c2eac31c7..e9cf7cebc 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1113,7 +1113,7 @@ class Image: if trns is not None: try: new_im.info["transparency"] = new_im.palette.getcolor( - cast(Tuple[int, int, int], trns), # trns was converted to RGB + cast(Tuple[int, ...], trns), # trns was converted to RGB new_im, ) except Exception: @@ -1163,12 +1163,9 @@ class Image: # crash fail if we leave a bytes transparency in an rgb/l mode. del new_im.info["transparency"] if trns is not None: - if new_im.mode == "P": + if new_im.mode == "P" and new_im.palette: try: - new_im.info["transparency"] = new_im.palette.getcolor( - cast(Tuple[int, int, int], trns), # trns was converted to RGB - new_im, - ) + new_im.info["transparency"] = new_im.palette.getcolor(trns, new_im) except ValueError as e: del new_im.info["transparency"] if str(e) != "cannot allocate more than 256 colors": From 6f28a0c009affcfb8f67c4bde921aa7d6684a7ac Mon Sep 17 00:00:00 2001 From: Yay295 Date: Thu, 11 Apr 2024 00:40:11 -0500 Subject: [PATCH 080/662] Fix TGA rawmode BGR;15 --- src/PIL/TgaImagePlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py index f16f075df..ebf9a1b80 100644 --- a/src/PIL/TgaImagePlugin.py +++ b/src/PIL/TgaImagePlugin.py @@ -36,7 +36,7 @@ MODES = { (3, 1): "1", (3, 8): "L", (3, 16): "LA", - (2, 16): "BGR;5", + (2, 16): "BGR;15", (2, 24): "BGR", (2, 32): "BGRA", } From 872ff125fcc9182fcc4cbcbf3d1bc5632a21860b Mon Sep 17 00:00:00 2001 From: Yay295 Date: Thu, 11 Apr 2024 00:53:06 -0500 Subject: [PATCH 081/662] "BGR;15" -> "BGRA;15" --- src/PIL/TgaImagePlugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py index ebf9a1b80..6a6bceaca 100644 --- a/src/PIL/TgaImagePlugin.py +++ b/src/PIL/TgaImagePlugin.py @@ -36,7 +36,7 @@ MODES = { (3, 1): "1", (3, 8): "L", (3, 16): "LA", - (2, 16): "BGR;15", + (2, 16): "BGRA;15", (2, 24): "BGR", (2, 32): "BGRA", } @@ -118,7 +118,7 @@ class TgaImageFile(ImageFile.ImageFile): start, size, mapdepth = i16(s, 3), i16(s, 5), s[7] if mapdepth == 16: self.palette = ImagePalette.raw( - "BGR;15", b"\0" * 2 * start + self.fp.read(2 * size) + "BGRA;15", b"\0" * 2 * start + self.fp.read(2 * size) ) elif mapdepth == 24: self.palette = ImagePalette.raw( From e5c6d883d44aab0ba27ec8faf384f9a3e3b5aa01 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Thu, 11 Apr 2024 07:56:29 -0500 Subject: [PATCH 082/662] set palette mode for BGRA;15 Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- src/PIL/TgaImagePlugin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py index 6a6bceaca..9bc483fc5 100644 --- a/src/PIL/TgaImagePlugin.py +++ b/src/PIL/TgaImagePlugin.py @@ -120,6 +120,7 @@ class TgaImageFile(ImageFile.ImageFile): self.palette = ImagePalette.raw( "BGRA;15", b"\0" * 2 * start + self.fp.read(2 * size) ) + self.palette.mode = "RGBA" elif mapdepth == 24: self.palette = ImagePalette.raw( "BGR", b"\0" * 3 * start + self.fp.read(3 * size) From 38402554869bdb2af6ac81bcb90070e939a41c38 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 25 Jun 2024 20:50:17 +1000 Subject: [PATCH 083/662] Invert alpha bit for map depth 16 --- Tests/images/p_16.png | Bin 378 -> 414 bytes Tests/test_file_tga.py | 5 +++-- src/PIL/TgaImagePlugin.py | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Tests/images/p_16.png b/Tests/images/p_16.png index e3588641277b804c0100707146a46a506f33d0d6..458f7138e8026159cb9e52a18088db59358e4c44 100644 GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU`+LNaSW-L^Y)S>UxNY}4gE|G$2o{oCumKWmr&|6dn*{vnHidV>Yy5l#g^ ohC-$eVTU;kk4A;CheS1lgtNdOv)R!Vz;I{qboFyt=akR{0D$9pJpcdz literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1SEZ8zRh7^V083!aSW-L^Y-FF&I1Yp3 None: def test_palette_depth_16(tmp_path: Path) -> None: with Image.open("Tests/images/p_16.tga") as im: - assert_image_equal_tofile(im.convert("RGB"), "Tests/images/p_16.png") + assert im.palette.mode == "RGBA" + assert_image_equal_tofile(im.convert("RGBA"), "Tests/images/p_16.png") out = str(tmp_path / "temp.png") im.save(out) with Image.open(out) as reloaded: - assert_image_equal_tofile(reloaded.convert("RGB"), "Tests/images/p_16.png") + assert_image_equal_tofile(reloaded.convert("RGBA"), "Tests/images/p_16.png") def test_id_field() -> None: diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py index 9bc483fc5..d158fe492 100644 --- a/src/PIL/TgaImagePlugin.py +++ b/src/PIL/TgaImagePlugin.py @@ -117,9 +117,11 @@ class TgaImageFile(ImageFile.ImageFile): # read palette start, size, mapdepth = i16(s, 3), i16(s, 5), s[7] if mapdepth == 16: - self.palette = ImagePalette.raw( - "BGRA;15", b"\0" * 2 * start + self.fp.read(2 * size) - ) + colormap = self.fp.read(2 * size) + palette_data = bytearray(b"\0" * 2 * start) + for a, b in zip(colormap[::2], colormap[1::2]): + palette_data += bytearray((a, b ^ 128)) + self.palette = ImagePalette.raw("BGRA;15", bytes(palette_data)) self.palette.mode = "RGBA" elif mapdepth == 24: self.palette = ImagePalette.raw( From 4cadf5c99f690b82cf281b601f96bf5711e52c58 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Tue, 25 Jun 2024 09:17:40 -0500 Subject: [PATCH 084/662] use bytes/bytearray int constructor instead of string multiplication --- src/PIL/TgaImagePlugin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py index d158fe492..c41b31d68 100644 --- a/src/PIL/TgaImagePlugin.py +++ b/src/PIL/TgaImagePlugin.py @@ -118,18 +118,18 @@ class TgaImageFile(ImageFile.ImageFile): start, size, mapdepth = i16(s, 3), i16(s, 5), s[7] if mapdepth == 16: colormap = self.fp.read(2 * size) - palette_data = bytearray(b"\0" * 2 * start) + palette_data = bytearray(2 * start) for a, b in zip(colormap[::2], colormap[1::2]): palette_data += bytearray((a, b ^ 128)) self.palette = ImagePalette.raw("BGRA;15", bytes(palette_data)) self.palette.mode = "RGBA" elif mapdepth == 24: self.palette = ImagePalette.raw( - "BGR", b"\0" * 3 * start + self.fp.read(3 * size) + "BGR", bytes(3 * start) + self.fp.read(3 * size) ) elif mapdepth == 32: self.palette = ImagePalette.raw( - "BGRA", b"\0" * 4 * start + self.fp.read(4 * size) + "BGRA", bytes(4 * start) + self.fp.read(4 * size) ) else: msg = "unknown TGA map depth" From 58d5a73fac7b4084fe4ba66a1a2c4ed097d0d557 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Mon, 17 Jun 2024 09:29:14 -0500 Subject: [PATCH 085/662] raise SyntaxError when parsing codestream rather than returning an empty string Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- src/PIL/Jpeg2KImagePlugin.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py index 39eb1c203..e50cd7799 100644 --- a/src/PIL/Jpeg2KImagePlugin.py +++ b/src/PIL/Jpeg2KImagePlugin.py @@ -97,7 +97,7 @@ class BoxReader: return tbox -def _parse_codestream(fp): +def _parse_codestream(fp) -> tuple[tuple[int, int], str]: """Parse the JPEG 2000 codestream to extract the size and component count from the SIZ marker segment, returning a PIL (size, mode) tuple.""" @@ -122,7 +122,8 @@ def _parse_codestream(fp): elif csiz == 4: mode = "RGBA" else: - mode = "" + msg = "unable to determine J2K image mode" + raise SyntaxError(msg) return size, mode @@ -237,10 +238,6 @@ class Jpeg2KImageFile(ImageFile.ImageFile): msg = "not a JPEG 2000 file" raise SyntaxError(msg) - if self.size is None or not self.mode: - msg = "unable to determine size/mode" - raise SyntaxError(msg) - self._reduce = 0 self.layers = 0 From 88b21e725432d418e56bdf0721f8581d14a24e40 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 25 Jun 2024 21:38:47 +1000 Subject: [PATCH 086/662] Added test --- Tests/images/unknown_mode.j2k | Bin 0 -> 318 bytes Tests/test_file_jpeg2k.py | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 Tests/images/unknown_mode.j2k diff --git a/Tests/images/unknown_mode.j2k b/Tests/images/unknown_mode.j2k new file mode 100644 index 0000000000000000000000000000000000000000..38719fe2561bb1341b69ed96e63f23bfb2c45d58 GIT binary patch literal 318 zcmezG|38pHlK})cpcu>n5-d;*;j{8HGX4)@-~sX&8JJjD7#RP@FmO3EbaYGrqW>uj zstktDsYS(^`FRRPdM0`X|0ghTfsHc&YM*@mj{y%C z&*TFPKN$`%2pnLLWnpJ#2J#pWFjxuje6;1!2CHWT>M%yAuLr4Lz#z||z{q}pp+?Dp z!AgXIp@Yf&e?50US3Ot@6HtpOiWZ>pKx8N2z|717u|m*+fun)v&wOrsUWg`Upe8ef jCVQaa3P6|eFfc!4VPpo{^^*x=R||JSd_8wE None: assert im.getpixel((5, 5)) == 31 +def test_unknown_j2k_mode() -> None: + with pytest.raises(UnidentifiedImageError): + with Image.open("Tests/images/unknown_mode.j2k"): + pass + + def test_unbound_local() -> None: # prepatch, a malformed jp2 file could cause an UnboundLocalError exception. with pytest.raises(OSError): From d2d03a1da24503f547fce334ff02b6f7183d2bc6 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 26 Jun 2024 06:35:15 +1000 Subject: [PATCH 087/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 6375f5c63..20bc34152 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,27 @@ Changelog (Pillow) 10.4.0 (unreleased) ------------------- +- Do not use first frame duration for other frames when saving APNG images #8104 + [radarhere] + +- Consider I;16 pixel size when using a 1 mode mask #8112 + [radarhere] + +- When saving multiple PNG frames, convert to mode rather than raw mode #8087 + [radarhere] + +- Added byte support to FreeTypeFont #8141 + [radarhere] + +- Allow float center for rotate operations #8114 + [radarhere] + +- Do not read layers immediately when opening PSD images #8039 + [radarhere] + +- Restore original thread state #8065 + [radarhere] + - Read IM and TIFF images as RGB, rather than RGBX #7997 [radarhere] From 50d18bf547727d397b192555b2fa5b9a50e5aa63 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 26 Jun 2024 07:38:53 +1000 Subject: [PATCH 088/662] Truncated image to reduce file size --- Tests/images/ultrahdr.jpg | Bin 520842 -> 48197 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Tests/images/ultrahdr.jpg b/Tests/images/ultrahdr.jpg index 1c5cc4adfe07ff4bbf80e79a784caf287c3b867f..34f615b61aac021eff116bec24ae1facefb83d0a 100644 GIT binary patch delta 9 QcmeBrDu46`(+1Z)02#Oh{{R30 delta 475939 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�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 z%0D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 #bbzLjl!^@>VKyP+O_S; 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%0DvG;*BG+6k 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 From 6ee41897e277a6e05f3673255b21333d7279d9fa Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 26 Jun 2024 07:19:44 +1000 Subject: [PATCH 089/662] Added dedicated unpacker for inverted alpha --- src/PIL/TgaImagePlugin.py | 14 +++++--------- src/libImaging/Unpack.c | 18 +++++++++++++++++- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py index c41b31d68..39104aece 100644 --- a/src/PIL/TgaImagePlugin.py +++ b/src/PIL/TgaImagePlugin.py @@ -36,7 +36,7 @@ MODES = { (3, 1): "1", (3, 8): "L", (3, 16): "LA", - (2, 16): "BGRA;15", + (2, 16): "BGRA;15Z", (2, 24): "BGR", (2, 32): "BGRA", } @@ -87,9 +87,7 @@ class TgaImageFile(ImageFile.ImageFile): elif imagetype in (1, 9): self._mode = "P" if colormaptype else "L" elif imagetype in (2, 10): - self._mode = "RGB" - if depth == 32: - self._mode = "RGBA" + self._mode = "RGB" if depth == 24 else "RGBA" else: msg = "unknown TGA mode" raise SyntaxError(msg) @@ -117,11 +115,9 @@ class TgaImageFile(ImageFile.ImageFile): # read palette start, size, mapdepth = i16(s, 3), i16(s, 5), s[7] if mapdepth == 16: - colormap = self.fp.read(2 * size) - palette_data = bytearray(2 * start) - for a, b in zip(colormap[::2], colormap[1::2]): - palette_data += bytearray((a, b ^ 128)) - self.palette = ImagePalette.raw("BGRA;15", bytes(palette_data)) + self.palette = ImagePalette.raw( + "BGRA;15Z", bytes(2 * start) + self.fp.read(2 * size) + ) self.palette.mode = "RGBA" elif mapdepth == 24: self.palette = ImagePalette.raw( diff --git a/src/libImaging/Unpack.c b/src/libImaging/Unpack.c index 063bcbbcc..eaa4374e3 100644 --- a/src/libImaging/Unpack.c +++ b/src/libImaging/Unpack.c @@ -718,6 +718,21 @@ ImagingUnpackBGRA15(UINT8 *out, const UINT8 *in, int pixels) { } } +void +ImagingUnpackBGRA15Z(UINT8 *out, const UINT8 *in, int pixels) { + int i, pixel; + /* RGB, rearranged channels, 5/5/5/1 bits per pixel, inverted alpha */ + for (i = 0; i < pixels; i++) { + pixel = in[0] + (in[1] << 8); + out[B] = (pixel & 31) * 255 / 31; + out[G] = ((pixel >> 5) & 31) * 255 / 31; + out[R] = ((pixel >> 10) & 31) * 255 / 31; + out[A] = ~((pixel >> 15) * 255); + out += 4; + in += 2; + } +} + void ImagingUnpackRGB16(UINT8 *out, const UINT8 *in, int pixels) { int i, pixel; @@ -1538,7 +1553,7 @@ static struct { /* flags: "I" inverted data; "R" reversed bit order; "B" big endian byte order (default is little endian); "L" line - interleave, "S" signed, "F" floating point */ + interleave, "S" signed, "F" floating point, "Z" inverted alpha */ /* exception: rawmodes "I" and "F" are always native endian byte order */ @@ -1646,6 +1661,7 @@ static struct { {"RGBA", "RGBA;L", 32, unpackRGBAL}, {"RGBA", "RGBA;15", 16, ImagingUnpackRGBA15}, {"RGBA", "BGRA;15", 16, ImagingUnpackBGRA15}, + {"RGBA", "BGRA;15Z", 16, ImagingUnpackBGRA15Z}, {"RGBA", "RGBA;4B", 16, ImagingUnpackRGBA4B}, {"RGBA", "RGBA;16L", 64, unpackRGBA16L}, {"RGBA", "RGBA;16B", 64, unpackRGBA16B}, From a90a9d5ea5fce7257cb22f904b6f013ec53d7eb3 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 26 Jun 2024 19:14:58 +1000 Subject: [PATCH 090/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 20bc34152..cfb987beb 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,12 @@ Changelog (Pillow) 10.4.0 (unreleased) ------------------- +- Do not detect Ultra HDR images as MPO #8056 + [radarhere] + +- Raise SyntaxError specific to JP2 #8146 + [Yay295, radarhere] + - Do not use first frame duration for other frames when saving APNG images #8104 [radarhere] From fd3f6c1a929e52332ac43fdbd328d767b9301839 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 26 Jun 2024 19:31:40 +1000 Subject: [PATCH 091/662] Remove zero-byte end padding when parsing any XMP data --- Tests/test_image.py | 22 ++++++++++++++++++++++ src/PIL/Image.py | 2 +- src/PIL/JpegImagePlugin.py | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Tests/test_image.py b/Tests/test_image.py index 5b1ba6289..c5cf5b383 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -8,6 +8,7 @@ import sys import tempfile import warnings from pathlib import Path +from types import ModuleType from typing import IO, Any import pytest @@ -35,6 +36,12 @@ from .helper import ( skip_unless_feature, ) +ElementTree: ModuleType | None +try: + from defusedxml import ElementTree +except ImportError: + ElementTree = None + # Deprecation helper def helper_image_new(mode: str, size: tuple[int, int]) -> Image.Image: @@ -921,6 +928,21 @@ class TestImage: with Image.open("Tests/images/hopper.gif") as im: assert im.getxmp() == {} + def test_getxmp_padded(self) -> None: + im = Image.new("RGB", (1, 1)) + im.info["xmp"] = ( + b'\n' + b'\n\x00\x00' + ) + if ElementTree is None: + with pytest.warns( + UserWarning, + match="XMP data cannot be read without defusedxml dependency", + ): + assert im.getxmp() == {} + else: + assert im.getxmp() == {"xmpmeta": None} + @pytest.mark.parametrize("size", ((1, 0), (0, 1), (0, 0))) def test_zero_tobytes(self, size: tuple[int, int]) -> None: im = Image.new("RGB", size) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index e9fb55d6b..cbeefa189 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1511,7 +1511,7 @@ class Image: return {} if "xmp" not in self.info: return {} - root = ElementTree.fromstring(self.info["xmp"]) + root = ElementTree.fromstring(self.info["xmp"].rstrip(b"\x00")) return {get_name(root.tag): get_value(root)} def getexif(self) -> Exif: diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index b7d0d24f2..ada529153 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -96,7 +96,7 @@ def APP(self, marker): self.info["exif"] = s self._exif_offset = self.fp.tell() - n + 6 elif marker == 0xFFE1 and s[:29] == b"http://ns.adobe.com/xap/1.0/\x00": - self.info["xmp"] = s.split(b"\x00")[1] + self.info["xmp"] = s.split(b"\x00", 1)[1] elif marker == 0xFFE2 and s[:5] == b"FPXR\0": # extract FlashPix information (incomplete) self.info["flashpix"] = s # FIXME: value will change From 6863c87c0151c9330c4ef1db1bb9058b8d34f703 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 26 Jun 2024 18:06:47 +1000 Subject: [PATCH 092/662] Added test for non-colormap 16-bit image --- Tests/images/rgba16.tga | Bin 0 -> 48 bytes Tests/test_file_tga.py | 8 ++++++++ 2 files changed, 8 insertions(+) create mode 100644 Tests/images/rgba16.tga diff --git a/Tests/images/rgba16.tga b/Tests/images/rgba16.tga new file mode 100644 index 0000000000000000000000000000000000000000..3918647a23cf31628e0beb8a14084ef7383582a1 GIT binary patch literal 48 qcmZQzU}As)CI&_Z0S@_)SIsbykf2c4FwbC5e?Q#_H%}i|Jq7@4vIgk@ literal 0 HcmV?d00001 diff --git a/Tests/test_file_tga.py b/Tests/test_file_tga.py index 15c7bbdb8..a03a6a6e1 100644 --- a/Tests/test_file_tga.py +++ b/Tests/test_file_tga.py @@ -81,6 +81,14 @@ def test_palette_depth_16(tmp_path: Path) -> None: assert_image_equal_tofile(reloaded.convert("RGBA"), "Tests/images/p_16.png") +def test_rgba_16() -> None: + with Image.open("Tests/images/rgba16.tga") as im: + assert im.mode == "RGBA" + + assert im.getpixel((0, 0)) == (172, 0, 255, 255) + assert im.getpixel((1, 0)) == (0, 255, 82, 0) + + def test_id_field() -> None: # tga file with id field test_file = "Tests/images/tga_id_field.tga" From 304cf484aaba5285cfdf854c31cfe51505de3f9a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 27 Jun 2024 13:29:22 +1000 Subject: [PATCH 093/662] Do not presume "xmp" info simply because "XML:com.adobe.xmp" info exists --- Tests/test_imageops.py | 10 ++++++++++ src/PIL/ImageOps.py | 23 ++++++++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py index 27a6090c5..64ef929c4 100644 --- a/Tests/test_imageops.py +++ b/Tests/test_imageops.py @@ -432,6 +432,16 @@ def test_exif_transpose() -> None: assert 0x0112 not in transposed_im.getexif() +def test_exif_transpose_xml_without_xmp() -> None: + with Image.open("Tests/images/xmp_tags_orientation.png") as im: + assert im.getexif()[0x0112] == 3 + assert "XML:com.adobe.xmp" in im.info + + del im.info["xmp"] + transposed_im = ImageOps.exif_transpose(im) + assert 0x0112 not in transposed_im.getexif() + + def test_exif_transpose_in_place() -> None: with Image.open("Tests/images/orientation_rectangle.jpg") as im: assert im.size == (2, 1) diff --git a/src/PIL/ImageOps.py b/src/PIL/ImageOps.py index 6d2814345..a84c08345 100644 --- a/src/PIL/ImageOps.py +++ b/src/PIL/ImageOps.py @@ -709,17 +709,18 @@ def exif_transpose(image: Image.Image, *, in_place: bool = False) -> Image.Image exif_image.info["exif"] = exif.tobytes() elif "Raw profile type exif" in exif_image.info: exif_image.info["Raw profile type exif"] = exif.tobytes().hex() - elif "XML:com.adobe.xmp" in exif_image.info: - for pattern in ( - r'tiff:Orientation="([0-9])"', - r"([0-9])", - ): - exif_image.info["XML:com.adobe.xmp"] = re.sub( - pattern, "", exif_image.info["XML:com.adobe.xmp"] - ) - exif_image.info["xmp"] = re.sub( - pattern.encode(), b"", exif_image.info["xmp"] - ) + for key in ("XML:com.adobe.xmp", "xmp"): + if key in exif_image.info: + for pattern in ( + r'tiff:Orientation="([0-9])"', + r"([0-9])", + ): + value = exif_image.info[key] + exif_image.info[key] = ( + re.sub(pattern, "", value) + if isinstance(value, str) + else re.sub(pattern.encode(), b"", value) + ) if not in_place: return transposed_image elif not in_place: From 7b636a8e6c40b1d0802cbfc4394b5cae1233642a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 27 Jun 2024 20:28:36 +1000 Subject: [PATCH 094/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index cfb987beb..3de9ef65b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 10.4.0 (unreleased) ------------------- +- Remove zero-byte end padding when parsing any XMP data #8171 + [radarhere] + - Do not detect Ultra HDR images as MPO #8056 [radarhere] From d18192cecfa239f2ce66991777199e32eedaef82 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 28 Jun 2024 04:20:09 +0000 Subject: [PATCH 095/662] Update dependency mypy to v1.10.1 --- .ci/requirements-mypy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-mypy.txt b/.ci/requirements-mypy.txt index a0dcb92d2..6dd432488 100644 --- a/.ci/requirements-mypy.txt +++ b/.ci/requirements-mypy.txt @@ -1 +1 @@ -mypy==1.10.0 +mypy==1.10.1 From 88cd6d41eff702ac83300807b097f6044b665025 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Fri, 28 Jun 2024 17:28:42 +1000 Subject: [PATCH 096/662] Rearranged comments Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- src/PIL/JpegImagePlugin.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index a9a89e58b..59259b719 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -487,18 +487,13 @@ class JpegImageFile(ImageFile.ImageFile): dpi *= 2.54 self.info["dpi"] = dpi, dpi except ( - struct.error, - KeyError, - SyntaxError, - TypeError, - ValueError, - ZeroDivisionError, + struct.error, # truncated EXIF + KeyError, # dpi not included + SyntaxError, # invalid/unreadable EXIF + TypeError, # dpi is an invalid float + ValueError, # dpi is an invalid float + ZeroDivisionError, # invalid dpi rational value ): - # struct.error for truncated EXIF - # KeyError for dpi not included - # SyntaxError for invalid/unreadable EXIF - # ValueError or TypeError for dpi being an invalid float - # ZeroDivisionError for invalid dpi rational value self.info["dpi"] = 72, 72 def _getmp(self): From b48d17565652d9537bacb910101ad1ef9f56811a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 28 Jun 2024 21:13:41 +1000 Subject: [PATCH 097/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 3de9ef65b..a6f2bc12c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,21 @@ Changelog (Pillow) 10.4.0 (unreleased) ------------------- +- Deprecate non-image ImageCms modes #8031 + [radarhere] + +- Fixed processing multiple JPEG EXIF markers #8127 + [radarhere] + +- Do not preserve EXIFIFD tag by default when saving TIFF images #8110 + [radarhere] + +- Added ImageFont.load_default_imagefont() #8086 + [radarhere] + +- Added Image.WARN_POSSIBLE_FORMATS #8063 + [radarhere] + - Remove zero-byte end padding when parsing any XMP data #8171 [radarhere] From c9ec76aa0db65b52c96dd3973a755367a9c41755 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 28 Jun 2024 21:27:44 +1000 Subject: [PATCH 098/662] Raise FileNotFoundError if show_file() path does not exist --- Tests/test_imageshow.py | 22 ++++++++++++++++++++++ docs/releasenotes/10.4.0.rst | 34 ++++++++-------------------------- src/PIL/ImageShow.py | 16 ++++++++++++++++ 3 files changed, 46 insertions(+), 26 deletions(-) diff --git a/Tests/test_imageshow.py b/Tests/test_imageshow.py index 4e9291fbb..0bff43896 100644 --- a/Tests/test_imageshow.py +++ b/Tests/test_imageshow.py @@ -1,5 +1,6 @@ from __future__ import annotations +import os from typing import Any import pytest @@ -65,6 +66,27 @@ def test_show_without_viewers() -> None: ImageShow._viewers = viewers +@pytest.mark.parametrize( + "viewer", + ( + ImageShow.Viewer(), + ImageShow.WindowsViewer(), + ImageShow.MacViewer(), + ImageShow.XDGViewer(), + ImageShow.DisplayViewer(), + ImageShow.GmDisplayViewer(), + ImageShow.EogViewer(), + ImageShow.XVViewer(), + ImageShow.IPythonViewer(), + ), +) +def test_show_file(viewer: ImageShow.Viewer) -> None: + assert not os.path.exists("missing.png") + + with pytest.raises(FileNotFoundError): + viewer.show_file("missing.png") + + def test_viewer() -> None: viewer = ImageShow.Viewer() diff --git a/docs/releasenotes/10.4.0.rst b/docs/releasenotes/10.4.0.rst index 96300c008..8d3706be6 100644 --- a/docs/releasenotes/10.4.0.rst +++ b/docs/releasenotes/10.4.0.rst @@ -4,21 +4,16 @@ Security ======== -TODO -^^^^ +ImageShow.WindowsViewer.show_file +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -TODO +If an attacker has control over the ``path`` passed to +``ImageShow.WindowsViewer.show_file()``, they may be able to +execute arbitrary shell commands. -:cve:`YYYY-XXXXX`: TODO -^^^^^^^^^^^^^^^^^^^^^^^ - -TODO - -Backwards Incompatible Changes -============================== - -TODO -^^^^ +To prevent this, a :py:exc:`FileNotFoundError` will be raised if the ``path`` +does not exist as a file. To provide a consistent experience, the error has +been added to all :py:class:`~PIL.ImageShow` viewers. Deprecations ============ @@ -46,14 +41,6 @@ ImageDraw.getdraw hints parameter The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecated. -API Changes -=========== - -TODO -^^^^ - -TODO - API Additions ============= @@ -64,11 +51,6 @@ Added :py:meth:`~PIL.ImageDraw.ImageDraw.circle`. It provides the same functiona :py:meth:`~PIL.ImageDraw.ImageDraw.ellipse`, but instead of taking a bounding box, it takes a center point and radius. -TODO -^^^^ - -TODO - Other Changes ============= diff --git a/src/PIL/ImageShow.py b/src/PIL/ImageShow.py index f60b1e11e..037d6f492 100644 --- a/src/PIL/ImageShow.py +++ b/src/PIL/ImageShow.py @@ -118,6 +118,8 @@ class Viewer: """ Display given file. """ + if not os.path.exists(path): + raise FileNotFoundError os.system(self.get_command(path, **options)) # nosec return 1 @@ -142,6 +144,8 @@ class WindowsViewer(Viewer): """ Display given file. """ + if not os.path.exists(path): + raise FileNotFoundError subprocess.Popen( self.get_command(path, **options), shell=True, @@ -171,6 +175,8 @@ class MacViewer(Viewer): """ Display given file. """ + if not os.path.exists(path): + raise FileNotFoundError subprocess.call(["open", "-a", "Preview.app", path]) executable = sys.executable or shutil.which("python3") if executable: @@ -215,6 +221,8 @@ class XDGViewer(UnixViewer): """ Display given file. """ + if not os.path.exists(path): + raise FileNotFoundError subprocess.Popen(["xdg-open", path]) return 1 @@ -237,6 +245,8 @@ class DisplayViewer(UnixViewer): """ Display given file. """ + if not os.path.exists(path): + raise FileNotFoundError args = ["display"] title = options.get("title") if title: @@ -259,6 +269,8 @@ class GmDisplayViewer(UnixViewer): """ Display given file. """ + if not os.path.exists(path): + raise FileNotFoundError subprocess.Popen(["gm", "display", path]) return 1 @@ -275,6 +287,8 @@ class EogViewer(UnixViewer): """ Display given file. """ + if not os.path.exists(path): + raise FileNotFoundError subprocess.Popen(["eog", "-n", path]) return 1 @@ -299,6 +313,8 @@ class XVViewer(UnixViewer): """ Display given file. """ + if not os.path.exists(path): + raise FileNotFoundError args = ["xv"] title = options.get("title") if title: From b55d74bcfe4b4e69a64d09c785552af8dc9f013d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 29 Jun 2024 07:47:26 +1000 Subject: [PATCH 099/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index a6f2bc12c..641aa8803 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,12 @@ Changelog (Pillow) 10.4.0 (unreleased) ------------------- +- Raise FileNotFoundError if show_file() path does not exist #8178 + [radarhere] + +- Improved reading 16-bit TGA images with colour #7965 + [Yay295, radarhere] + - Deprecate non-image ImageCms modes #8031 [radarhere] From 9b4fae77178e827ab17118fbc89c739ffd6a0fab Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 1 Jul 2024 15:42:12 +1000 Subject: [PATCH 100/662] 10.4.0 version bump --- CHANGES.rst | 2 +- src/PIL/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 641aa8803..d071f3214 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,7 +2,7 @@ Changelog (Pillow) ================== -10.4.0 (unreleased) +10.4.0 (2024-07-01) ------------------- - Raise FileNotFoundError if show_file() path does not exist #8178 diff --git a/src/PIL/_version.py b/src/PIL/_version.py index 12d7412ea..cebfd868c 100644 --- a/src/PIL/_version.py +++ b/src/PIL/_version.py @@ -1,4 +1,4 @@ # Master version for Pillow from __future__ import annotations -__version__ = "10.4.0.dev0" +__version__ = "10.4.0" From 2a660bbe9f58c4a6523208a21caaa4ec88275d17 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:10:33 +0300 Subject: [PATCH 101/662] Remove PSFile class, deprecated in Pillow 9.5.0 --- Tests/test_file_eps.py | 40 ------------------------- docs/deprecations.rst | 21 ++++++------- docs/releasenotes/11.0.0.rst | 58 ++++++++++++++++++++++++++++++++++++ docs/releasenotes/9.5.0.rst | 2 +- docs/releasenotes/index.rst | 1 + src/PIL/EpsImagePlugin.py | 38 ----------------------- 6 files changed, 71 insertions(+), 89 deletions(-) create mode 100644 docs/releasenotes/11.0.0.rst diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py index 1c21aa8ca..3181fc204 100644 --- a/Tests/test_file_eps.py +++ b/Tests/test_file_eps.py @@ -329,46 +329,6 @@ def test_read_binary_preview() -> None: pass -def test_readline_psfile(tmp_path: Path) -> None: - # check all the freaking line endings possible from the spec - # test_string = u'something\r\nelse\n\rbaz\rbif\n' - line_endings = ["\r\n", "\n", "\n\r", "\r"] - strings = ["something", "else", "baz", "bif"] - - def _test_readline(t: EpsImagePlugin.PSFile, ending: str) -> None: - ending = f"Failure with line ending: {''.join(str(ord(s)) for s in ending)}" - assert t.readline().strip("\r\n") == "something", ending - assert t.readline().strip("\r\n") == "else", ending - assert t.readline().strip("\r\n") == "baz", ending - assert t.readline().strip("\r\n") == "bif", ending - - def _test_readline_io_psfile(test_string: str, ending: str) -> None: - f = io.BytesIO(test_string.encode("latin-1")) - with pytest.warns(DeprecationWarning): - t = EpsImagePlugin.PSFile(f) - _test_readline(t, ending) - - def _test_readline_file_psfile(test_string: str, ending: str) -> None: - f = str(tmp_path / "temp.txt") - with open(f, "wb") as w: - w.write(test_string.encode("latin-1")) - - with open(f, "rb") as r: - with pytest.warns(DeprecationWarning): - t = EpsImagePlugin.PSFile(r) - _test_readline(t, ending) - - for ending in line_endings: - s = ending.join(strings) - _test_readline_io_psfile(s, ending) - _test_readline_file_psfile(s, ending) - - -def test_psfile_deprecation() -> None: - with pytest.warns(DeprecationWarning): - EpsImagePlugin.PSFile(None) - - @pytest.mark.parametrize("prefix", (b"", simple_binary_header)) @pytest.mark.parametrize( "line_ending", diff --git a/docs/deprecations.rst b/docs/deprecations.rst index 0f996a94b..b7c15ff63 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -12,16 +12,6 @@ Deprecated features Below are features which are considered deprecated. Where appropriate, a :py:exc:`DeprecationWarning` is issued. -PSFile -~~~~~~ - -.. deprecated:: 9.5.0 - -The :py:class:`~PIL.EpsImagePlugin.PSFile` class has been deprecated and will -be removed in Pillow 11 (2024-10-15). This class was only made as a helper to -be used internally, so there is no replacement. If you need this functionality -though, it is a very short class that can easily be recreated in your own code. - PyAccess and Image.USE_CFFI_ACCESS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -137,6 +127,17 @@ Removed features Deprecated features are only removed in major releases after an appropriate period of deprecation has passed. +PSFile +~~~~~~ + +.. deprecated:: 9.5.0 +.. versionremoved:: 11.0.0 + +The :py:class:`!PSFile` class was removed in Pillow 11 (2024-10-15). +This class was only made as a helper to be used internally, +so there is no replacement. If you need this functionality though, +it is a very short class that can easily be recreated in your own code. + Tk/Tcl 8.4 ~~~~~~~~~~ diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst new file mode 100644 index 000000000..e04ae9fd6 --- /dev/null +++ b/docs/releasenotes/11.0.0.rst @@ -0,0 +1,58 @@ +11.0.0 +------ + +Security +======== + +TODO +^^^^ + +TODO + +:cve:`YYYY-XXXXX`: TODO +^^^^^^^^^^^^^^^^^^^^^^^ + +TODO + +Backwards Incompatible Changes +============================== + +PSFile +^^^^^^ + +The :py:class:`!PSFile` class was removed in Pillow 11 (2024-10-15). +This class was only made as a helper to be used internally, +so there is no replacement. If you need this functionality though, +it is a very short class that can easily be recreated in your own code. + +Deprecations +============ + +TODO +^^^^ + +TODO + +API Changes +=========== + +TODO +^^^^ + +TODO + +API Additions +============= + +TODO +^^^^ + +TODO + +Other Changes +============= + +TODO +^^^^ + +TODO diff --git a/docs/releasenotes/9.5.0.rst b/docs/releasenotes/9.5.0.rst index 08e9ec2a4..501479bb6 100644 --- a/docs/releasenotes/9.5.0.rst +++ b/docs/releasenotes/9.5.0.rst @@ -32,7 +32,7 @@ Deprecations PSFile ^^^^^^ -The :py:class:`~PIL.EpsImagePlugin.PSFile` class has been deprecated and will +The :py:class:`!PSFile` class has been deprecated and will be removed in Pillow 11 (2024-10-15). This class was only made as a helper to be used internally, so there is no replacement. If you need this functionality though, it is a very short class that can easily be recreated in your own code. diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst index 6ee5fb6c8..641cda4ef 100644 --- a/docs/releasenotes/index.rst +++ b/docs/releasenotes/index.rst @@ -14,6 +14,7 @@ expected to be backported to earlier versions. .. toctree:: :maxdepth: 2 + 11.0.0 10.4.0 10.3.0 10.2.0 diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index f31b1c1a2..71e869045 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -31,7 +31,6 @@ from typing import IO from . import Image, ImageFile from ._binary import i32le as i32 -from ._deprecate import deprecate # -------------------------------------------------------------------- @@ -159,43 +158,6 @@ def Ghostscript(tile, size, fp, scale=1, transparency=False): return im -class PSFile: - """ - Wrapper for bytesio object that treats either CR or LF as end of line. - This class is no longer used internally, but kept for backwards compatibility. - """ - - def __init__(self, fp): - deprecate( - "PSFile", - 11, - action="If you need the functionality of this class " - "you will need to implement it yourself.", - ) - self.fp = fp - self.char = None - - def seek(self, offset, whence=io.SEEK_SET): - self.char = None - self.fp.seek(offset, whence) - - def readline(self) -> str: - s = [self.char or b""] - self.char = None - - c = self.fp.read(1) - while (c not in b"\r\n") and len(c): - s.append(c) - c = self.fp.read(1) - - self.char = self.fp.read(1) - # line endings can be 1 or 2 of \r \n, in either order - if self.char in b"\r\n": - self.char = None - - return b"".join(s).decode("latin-1") - - def _accept(prefix: bytes) -> bool: return prefix[:4] == b"%!PS" or (len(prefix) >= 4 and i32(prefix) == 0xC6D3D0C5) From a3a6198286119a5c4b1e7bbeb48b6363315be252 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 1 Jul 2024 19:53:27 +1000 Subject: [PATCH 102/662] 11.0.0.dev0 version bump --- src/PIL/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/_version.py b/src/PIL/_version.py index cebfd868c..c4a72ad7e 100644 --- a/src/PIL/_version.py +++ b/src/PIL/_version.py @@ -1,4 +1,4 @@ # Master version for Pillow from __future__ import annotations -__version__ = "10.4.0" +__version__ = "11.0.0.dev0" From eb5bf181920d0bb74166aa8cc6df0b657baa9e2f Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Mon, 1 Jul 2024 13:25:43 +0300 Subject: [PATCH 103/662] Bump deprecation tests to Pillow 12 --- Tests/test_deprecate.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Tests/test_deprecate.py b/Tests/test_deprecate.py index 584d8f91d..82ff14181 100644 --- a/Tests/test_deprecate.py +++ b/Tests/test_deprecate.py @@ -9,9 +9,9 @@ from PIL import _deprecate "version, expected", [ ( - 11, - "Old thing is deprecated and will be removed in Pillow 11 " - r"\(2024-10-15\)\. Use new thing instead\.", + 12, + "Old thing is deprecated and will be removed in Pillow 12 " + r"\(2025-10-15\)\. Use new thing instead\.", ), ( None, @@ -54,18 +54,18 @@ def test_old_version(deprecated: str, plural: bool, expected: str) -> None: def test_plural() -> None: expected = ( - r"Old things are deprecated and will be removed in Pillow 11 \(2024-10-15\)\. " + r"Old things are deprecated and will be removed in Pillow 12 \(2025-10-15\)\. " r"Use new thing instead\." ) with pytest.warns(DeprecationWarning, match=expected): - _deprecate.deprecate("Old things", 11, "new thing", plural=True) + _deprecate.deprecate("Old things", 12, "new thing", plural=True) def test_replacement_and_action() -> None: expected = "Use only one of 'replacement' and 'action'" with pytest.raises(ValueError, match=expected): _deprecate.deprecate( - "Old thing", 11, replacement="new thing", action="Upgrade to new thing" + "Old thing", 12, replacement="new thing", action="Upgrade to new thing" ) @@ -78,16 +78,16 @@ def test_replacement_and_action() -> None: ) def test_action(action: str) -> None: expected = ( - r"Old thing is deprecated and will be removed in Pillow 11 \(2024-10-15\)\. " + r"Old thing is deprecated and will be removed in Pillow 12 \(2025-10-15\)\. " r"Upgrade to new thing\." ) with pytest.warns(DeprecationWarning, match=expected): - _deprecate.deprecate("Old thing", 11, action=action) + _deprecate.deprecate("Old thing", 12, action=action) def test_no_replacement_or_action() -> None: expected = ( - r"Old thing is deprecated and will be removed in Pillow 11 \(2024-10-15\)" + r"Old thing is deprecated and will be removed in Pillow 12 \(2025-10-15\)" ) with pytest.warns(DeprecationWarning, match=expected): - _deprecate.deprecate("Old thing", 11) + _deprecate.deprecate("Old thing", 12) From 43cc1e36595422047b98659e7346ee1c8b08bd6f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 29 Jun 2024 15:02:50 +1000 Subject: [PATCH 104/662] Removed PyAccess and Image.USE_CFFI_ACCESS --- .ci/install.sh | 2 - .coveragerc | 1 - .github/workflows/macos-install.sh | 3 - .github/workflows/test-cygwin.yml | 1 - .github/workflows/test-mingw.yml | 1 - Tests/bench_cffi_access.py | 54 ---- Tests/test_image_access.py | 168 +------------ codecov.yml | 1 - docs/deprecations.rst | 24 +- docs/reference/PyAccess.rst | 47 ---- docs/reference/index.rst | 1 - docs/releasenotes/11.0.0.rst | 9 + src/PIL/GifImagePlugin.py | 1 - src/PIL/IcoImagePlugin.py | 1 - src/PIL/Image.py | 31 +-- src/PIL/ImageOps.py | 1 - src/PIL/PngImagePlugin.py | 4 - src/PIL/PyAccess.py | 381 ----------------------------- tox.ini | 2 - 19 files changed, 33 insertions(+), 700 deletions(-) delete mode 100644 Tests/bench_cffi_access.py delete mode 100644 docs/reference/PyAccess.rst delete mode 100644 src/PIL/PyAccess.py diff --git a/.ci/install.sh b/.ci/install.sh index 30b64349d..c6e166171 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -28,8 +28,6 @@ fi python3 -m pip install --upgrade pip python3 -m pip install --upgrade wheel -# TODO Update condition when cffi supports 3.13 -if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then PYTHONOPTIMIZE=0 python3 -m pip install cffi ; fi python3 -m pip install coverage python3 -m pip install defusedxml python3 -m pip install olefile diff --git a/.coveragerc b/.coveragerc index 018cc1cbf..a94a25678 100644 --- a/.coveragerc +++ b/.coveragerc @@ -19,6 +19,5 @@ exclude_also = [run] omit = Tests/32bit_segfault_check.py - Tests/bench_cffi_access.py Tests/check_*.py Tests/createfontdatachunk.py diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh index f8f191d38..ae346e8b6 100755 --- a/.github/workflows/macos-install.sh +++ b/.github/workflows/macos-install.sh @@ -18,9 +18,6 @@ else fi export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig" -# TODO Update condition when cffi supports 3.13 -if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then PYTHONOPTIMIZE=0 python3 -m pip install cffi ; fi - python3 -m pip install coverage python3 -m pip install defusedxml python3 -m pip install olefile diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml index 1269ef8cb..97422d569 100644 --- a/.github/workflows/test-cygwin.yml +++ b/.github/workflows/test-cygwin.yml @@ -72,7 +72,6 @@ jobs: make netpbm perl - python3${{ matrix.python-minor-version }}-cffi python3${{ matrix.python-minor-version }}-cython python3${{ matrix.python-minor-version }}-devel python3${{ matrix.python-minor-version }}-numpy diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml index a773ca453..e5e1ec32e 100644 --- a/.github/workflows/test-mingw.yml +++ b/.github/workflows/test-mingw.yml @@ -64,7 +64,6 @@ jobs: mingw-w64-x86_64-libtiff \ mingw-w64-x86_64-libwebp \ mingw-w64-x86_64-openjpeg2 \ - mingw-w64-x86_64-python3-cffi \ mingw-w64-x86_64-python3-numpy \ mingw-w64-x86_64-python3-olefile \ mingw-w64-x86_64-python3-setuptools \ diff --git a/Tests/bench_cffi_access.py b/Tests/bench_cffi_access.py deleted file mode 100644 index c7d105836..000000000 --- a/Tests/bench_cffi_access.py +++ /dev/null @@ -1,54 +0,0 @@ -from __future__ import annotations - -import time - -from PIL import PyAccess - -from .helper import hopper - -# Not running this test by default. No DOS against CI. - - -def iterate_get(size, access) -> None: - (w, h) = size - for x in range(w): - for y in range(h): - access[(x, y)] - - -def iterate_set(size, access) -> None: - (w, h) = size - for x in range(w): - for y in range(h): - access[(x, y)] = (x % 256, y % 256, 0) - - -def timer(func, label, *args) -> None: - iterations = 5000 - starttime = time.time() - for x in range(iterations): - func(*args) - if time.time() - starttime > 10: - break - endtime = time.time() - print( - f"{label}: completed {x + 1} iterations in {endtime - starttime:.4f}s, " - f"{(endtime - starttime) / (x + 1.0):.6f}s per iteration" - ) - - -def test_direct() -> None: - im = hopper() - im.load() - # im = Image.new("RGB", (2000, 2000), (1, 3, 2)) - caccess = im.im.pixel_access(False) - access = PyAccess.new(im, False) - - assert access is not None - assert caccess[(0, 0)] == access[(0, 0)] - - print(f"Size: {im.width}x{im.height}") - timer(iterate_get, "PyAccess - get", im.size, access) - timer(iterate_set, "PyAccess - set", im.size, access) - timer(iterate_get, "C-api - get", im.size, caccess) - timer(iterate_set, "C-api - set", im.size, caccess) diff --git a/Tests/test_image_access.py b/Tests/test_image_access.py index 8abb1f69f..52ffef5e8 100644 --- a/Tests/test_image_access.py +++ b/Tests/test_image_access.py @@ -12,19 +12,6 @@ from PIL import Image from .helper import assert_image_equal, hopper, is_win32 -# CFFI imports pycparser which doesn't support PYTHONOPTIMIZE=2 -# https://github.com/eliben/pycparser/pull/198#issuecomment-317001670 -cffi: ModuleType | None -if os.environ.get("PYTHONOPTIMIZE") == "2": - cffi = None -else: - try: - import cffi - - from PIL import PyAccess - except ImportError: - cffi = None - numpy: ModuleType | None try: import numpy @@ -32,21 +19,7 @@ except ImportError: numpy = None -class AccessTest: - # Initial value - _init_cffi_access = Image.USE_CFFI_ACCESS - _need_cffi_access = False - - @classmethod - def setup_class(cls) -> None: - Image.USE_CFFI_ACCESS = cls._need_cffi_access - - @classmethod - def teardown_class(cls) -> None: - Image.USE_CFFI_ACCESS = cls._init_cffi_access - - -class TestImagePutPixel(AccessTest): +class TestImagePutPixel: def test_sanity(self) -> None: im1 = hopper() im2 = Image.new(im1.mode, im1.size, 0) @@ -131,7 +104,7 @@ class TestImagePutPixel(AccessTest): assert pix[numpy.int32(1), numpy.int32(2)] == (18, 20, 59) -class TestImageGetPixel(AccessTest): +class TestImageGetPixel: @staticmethod def color(mode: str) -> int | tuple[int, ...]: bands = Image.getmodebands(mode) @@ -144,9 +117,6 @@ class TestImageGetPixel(AccessTest): return tuple(range(1, bands + 1)) def check(self, mode: str, expected_color_int: int | None = None) -> None: - if self._need_cffi_access and mode.startswith("BGR;"): - pytest.skip("Support not added to deprecated module for BGR;* modes") - expected_color = ( self.color(mode) if expected_color_int is None else expected_color_int ) @@ -171,15 +141,14 @@ class TestImageGetPixel(AccessTest): # Check 0x0 image with None initial color im = Image.new(mode, (0, 0), None) assert im.load() is not None - error = ValueError if self._need_cffi_access else IndexError - with pytest.raises(error): + with pytest.raises(IndexError): im.putpixel((0, 0), expected_color) - with pytest.raises(error): + with pytest.raises(IndexError): im.getpixel((0, 0)) # Check negative index - with pytest.raises(error): + with pytest.raises(IndexError): im.putpixel((-1, -1), expected_color) - with pytest.raises(error): + with pytest.raises(IndexError): im.getpixel((-1, -1)) # Check initial color @@ -199,10 +168,10 @@ class TestImageGetPixel(AccessTest): # Check 0x0 image with initial color im = Image.new(mode, (0, 0), expected_color) - with pytest.raises(error): + with pytest.raises(IndexError): im.getpixel((0, 0)) # Check negative index - with pytest.raises(error): + with pytest.raises(IndexError): im.getpixel((-1, -1)) @pytest.mark.parametrize("mode", Image.MODES) @@ -235,126 +204,7 @@ class TestImageGetPixel(AccessTest): assert im.convert("RGBA").getpixel((0, 0)) == (255, 0, 0, alpha) -@pytest.mark.filterwarnings("ignore::DeprecationWarning") -@pytest.mark.skipif(cffi is None, reason="No CFFI") -class TestCffiPutPixel(TestImagePutPixel): - _need_cffi_access = True - - -@pytest.mark.filterwarnings("ignore::DeprecationWarning") -@pytest.mark.skipif(cffi is None, reason="No CFFI") -class TestCffiGetPixel(TestImageGetPixel): - _need_cffi_access = True - - -@pytest.mark.skipif(cffi is None, reason="No CFFI") -class TestCffi(AccessTest): - _need_cffi_access = True - - def _test_get_access(self, im: Image.Image) -> None: - """Do we get the same thing as the old pixel access - - Using private interfaces, forcing a capi access and - a pyaccess for the same image""" - caccess = im.im.pixel_access(False) - with pytest.warns(DeprecationWarning): - access = PyAccess.new(im, False) - assert access is not None - - w, h = im.size - for x in range(0, w, 10): - for y in range(0, h, 10): - assert access[(x, y)] == caccess[(x, y)] - - # Access an out-of-range pixel - with pytest.raises(ValueError): - access[(access.xsize + 1, access.ysize + 1)] - - def test_get_vs_c(self) -> None: - with pytest.warns(DeprecationWarning): - rgb = hopper("RGB") - rgb.load() - self._test_get_access(rgb) - for mode in ("RGBA", "L", "LA", "1", "P", "F"): - self._test_get_access(hopper(mode)) - - for mode in ("I;16", "I;16L", "I;16B", "I;16N", "I"): - im = Image.new(mode, (10, 10), 40000) - self._test_get_access(im) - - def _test_set_access(self, im: Image.Image, color: tuple[int, ...] | float) -> None: - """Are we writing the correct bits into the image? - - Using private interfaces, forcing a capi access and - a pyaccess for the same image""" - caccess = im.im.pixel_access(False) - with pytest.warns(DeprecationWarning): - access = PyAccess.new(im, False) - assert access is not None - - w, h = im.size - for x in range(0, w, 10): - for y in range(0, h, 10): - access[(x, y)] = color - assert color == caccess[(x, y)] - - # Attempt to set the value on a read-only image - with pytest.warns(DeprecationWarning): - access = PyAccess.new(im, True) - assert access is not None - - with pytest.raises(ValueError): - access[(0, 0)] = color - - def test_set_vs_c(self) -> None: - rgb = hopper("RGB") - with pytest.warns(DeprecationWarning): - rgb.load() - self._test_set_access(rgb, (255, 128, 0)) - self._test_set_access(hopper("RGBA"), (255, 192, 128, 0)) - self._test_set_access(hopper("L"), 128) - self._test_set_access(hopper("LA"), (128, 128)) - self._test_set_access(hopper("1"), 255) - self._test_set_access(hopper("P"), 128) - self._test_set_access(hopper("PA"), (128, 128)) - self._test_set_access(hopper("F"), 1024.0) - - for mode in ("I;16", "I;16L", "I;16B", "I;16N", "I"): - im = Image.new(mode, (10, 10), 40000) - self._test_set_access(im, 45000) - - @pytest.mark.filterwarnings("ignore::DeprecationWarning") - def test_not_implemented(self) -> None: - assert PyAccess.new(hopper("BGR;15")) is None - - # Ref https://github.com/python-pillow/Pillow/pull/2009 - def test_reference_counting(self) -> None: - size = 10 - - for _ in range(10): - # Do not save references to the image, only to the access object - with pytest.warns(DeprecationWarning): - px = Image.new("L", (size, 1), 0).load() - for i in range(size): - # Pixels can contain garbage if image is released - assert px[i, 0] == 0 - - @pytest.mark.parametrize("mode", ("P", "PA")) - def test_p_putpixel_rgb_rgba(self, mode: str) -> None: - for color in ((255, 0, 0), (255, 0, 0, 127 if mode == "PA" else 255)): - im = Image.new(mode, (1, 1)) - with pytest.warns(DeprecationWarning): - access = PyAccess.new(im, False) - assert access is not None - - access.putpixel((0, 0), color) - - if len(color) == 3: - color += (255,) - assert im.convert("RGBA").getpixel((0, 0)) == color - - -class TestImagePutPixelError(AccessTest): +class TestImagePutPixelError: IMAGE_MODES1 = ["LA", "RGB", "RGBA", "BGR;15"] IMAGE_MODES2 = ["L", "I", "I;16"] INVALID_TYPES = ["foo", 1.0, None] diff --git a/codecov.yml b/codecov.yml index 1ea7974eb..8646576bb 100644 --- a/codecov.yml +++ b/codecov.yml @@ -17,6 +17,5 @@ coverage: # Matches 'omit:' in .coveragerc ignore: - "Tests/32bit_segfault_check.py" - - "Tests/bench_cffi_access.py" - "Tests/check_*.py" - "Tests/createfontdatachunk.py" diff --git a/docs/deprecations.rst b/docs/deprecations.rst index b7c15ff63..792fd1c70 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -12,18 +12,6 @@ Deprecated features Below are features which are considered deprecated. Where appropriate, a :py:exc:`DeprecationWarning` is issued. -PyAccess and Image.USE_CFFI_ACCESS -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -.. deprecated:: 10.0.0 - -Since Pillow's C API is now faster than PyAccess on PyPy, -:py:mod:`~PIL.PyAccess` has been deprecated and will be removed in Pillow -11.0.0 (2024-10-15). Pillow's C API will now be used by default on PyPy instead. - -``Image.USE_CFFI_ACCESS``, for switching from the C API to PyAccess, is -similarly deprecated. - ImageFile.raise_oserror ~~~~~~~~~~~~~~~~~~~~~~~ @@ -138,6 +126,18 @@ This class was only made as a helper to be used internally, so there is no replacement. If you need this functionality though, it is a very short class that can easily be recreated in your own code. +PyAccess and Image.USE_CFFI_ACCESS +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. deprecated:: 10.0.0 +.. versionremoved:: 11.0.0 + +Since Pillow's C API is now faster than PyAccess on PyPy, ``PyAccess`` has been +removed. Pillow's C API will now be used on PyPy instead. + +``Image.USE_CFFI_ACCESS``, for switching from the C API to PyAccess, was +similarly removed. + Tk/Tcl 8.4 ~~~~~~~~~~ diff --git a/docs/reference/PyAccess.rst b/docs/reference/PyAccess.rst deleted file mode 100644 index 04b2a47ee..000000000 --- a/docs/reference/PyAccess.rst +++ /dev/null @@ -1,47 +0,0 @@ -.. py:module:: PIL.PyAccess -.. py:currentmodule:: PIL.PyAccess - -:py:mod:`~PIL.PyAccess` Module -============================== - -The :py:mod:`~PIL.PyAccess` module provides a CFFI/Python implementation of the :ref:`PixelAccess`. This implementation is far faster on PyPy than the PixelAccess version. - -.. note:: Accessing individual pixels is fairly slow. If you are - looping over all of the pixels in an image, there is likely - a faster way using other parts of the Pillow API. - - :mod:`~PIL.Image`, :mod:`~PIL.ImageChops` and :mod:`~PIL.ImageOps` - have methods for many standard operations. If you wish to perform - a custom mapping, check out :py:meth:`~PIL.Image.Image.point`. - -Example -------- - -The following script loads an image, accesses one pixel from it, then changes it. :: - - from PIL import Image - - with Image.open("hopper.jpg") as im: - px = im.load() - print(px[4, 4]) - px[4, 4] = (0, 0, 0) - print(px[4, 4]) - -Results in the following:: - - (23, 24, 68) - (0, 0, 0) - -Access using negative indexes is also possible. :: - - px[-1, -1] = (0, 0, 0) - print(px[-1, -1]) - - - -:py:class:`PyAccess` Class --------------------------- - -.. autoclass:: PIL.PyAccess.PyAccess() - :members: - :special-members: __getitem__, __setitem__ diff --git a/docs/reference/index.rst b/docs/reference/index.rst index 82c75e373..effcd3c46 100644 --- a/docs/reference/index.rst +++ b/docs/reference/index.rst @@ -32,7 +32,6 @@ Reference JpegPresets PSDraw PixelAccess - PyAccess features ../PIL plugins diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index e04ae9fd6..bde791b1e 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -25,6 +25,15 @@ This class was only made as a helper to be used internally, so there is no replacement. If you need this functionality though, it is a very short class that can easily be recreated in your own code. +PyAccess and Image.USE_CFFI_ACCESS +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Since Pillow's C API is now faster than PyAccess on PyPy, ``PyAccess`` has been +removed. Pillow's C API will now be used on PyPy instead. + +``Image.USE_CFFI_ACCESS``, for switching from the C API to PyAccess, was +similarly removed. + Deprecations ============ diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index 284128c77..8018e25dc 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -331,7 +331,6 @@ class GifImageFile(ImageFile.ImageFile): LOADING_STRATEGY != LoadingStrategy.RGB_AFTER_DIFFERENT_PALETTE_ONLY or palette ): - self.pyaccess = None if "transparency" in self.info: self.im.putpalettealpha(self.info["transparency"], 0) self.im = self.im.convert("RGBA", Image.Dither.FLOYDSTEINBERG) diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py index 227fcf35c..086c87b1a 100644 --- a/src/PIL/IcoImagePlugin.py +++ b/src/PIL/IcoImagePlugin.py @@ -329,7 +329,6 @@ class IcoImageFile(ImageFile.ImageFile): # if tile is PNG, it won't really be loaded yet im.load() self.im = im.im - self.pyaccess = None self._mode = im.mode if im.palette: self.palette = im.palette diff --git a/src/PIL/Image.py b/src/PIL/Image.py index d41c06523..dbdb3b132 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -125,14 +125,6 @@ except ImportError as v: raise -USE_CFFI_ACCESS = False -cffi: ModuleType | None -try: - import cffi -except ImportError: - cffi = None - - def isImageType(t: Any) -> TypeGuard[Image]: """ Checks if an object is an image object. @@ -229,7 +221,7 @@ if hasattr(core, "DEFAULT_STRATEGY"): # Registries if TYPE_CHECKING: - from . import ImageFile, PyAccess + from . import ImageFile ID: list[str] = [] OPEN: dict[ str, @@ -549,7 +541,6 @@ class Image: self.palette = None self.info = {} self.readonly = 0 - self.pyaccess = None self._exif = None @property @@ -631,7 +622,6 @@ class Image: def _copy(self) -> None: self.load() self.im = self.im.copy() - self.pyaccess = None self.readonly = 0 def _ensure_mutable(self) -> None: @@ -882,7 +872,7 @@ class Image: msg = "cannot decode image data" raise ValueError(msg) - def load(self) -> core.PixelAccess | PyAccess.PyAccess | None: + def load(self) -> core.PixelAccess | None: """ Allocates storage for the image and loads the pixel data. In normal cases, you don't need to call this method, since the @@ -895,7 +885,7 @@ class Image: operations. See :ref:`file-handling` for more information. :returns: An image access object. - :rtype: :py:class:`.PixelAccess` or :py:class:`.PyAccess` + :rtype: :py:class:`.PixelAccess` """ if self.im is not None and self.palette and self.palette.dirty: # realize palette @@ -915,14 +905,6 @@ class Image: ) if self.im is not None: - if cffi and USE_CFFI_ACCESS: - if self.pyaccess: - return self.pyaccess - from . import PyAccess - - self.pyaccess = PyAccess.new(self, self.readonly) - if self.pyaccess: - return self.pyaccess return self.im.pixel_access(self.readonly) return None @@ -1685,8 +1667,6 @@ class Image: """ self.load() - if self.pyaccess: - return self.pyaccess.getpixel(xy) return self.im.getpixel(tuple(xy)) def getprojection(self) -> tuple[list[int], list[int]]: @@ -1983,7 +1963,6 @@ class Image: msg = "alpha channel could not be added" raise ValueError(msg) from e # sanity check self.im = im - self.pyaccess = None self._mode = self.im.mode except KeyError as e: msg = "illegal image mode" @@ -2101,9 +2080,6 @@ class Image: self._copy() self.load() - if self.pyaccess: - return self.pyaccess.putpixel(xy, value) - if ( self.mode in ("P", "PA") and isinstance(value, (list, tuple)) @@ -2768,7 +2744,6 @@ class Image: self._mode = self.im.mode self.readonly = 0 - self.pyaccess = None # FIXME: the different transform methods need further explanation # instead of bloating the method docs, add a separate chapter. diff --git a/src/PIL/ImageOps.py b/src/PIL/ImageOps.py index a84c08345..55335872d 100644 --- a/src/PIL/ImageOps.py +++ b/src/PIL/ImageOps.py @@ -698,7 +698,6 @@ def exif_transpose(image: Image.Image, *, in_place: bool = False) -> Image.Image transposed_image = image.transpose(method) if in_place: image.im = transposed_image.im - image.pyaccess = None image._size = transposed_image._size exif_image = image if in_place else transposed_image diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index d2834929b..34ea77c5e 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -851,8 +851,6 @@ class PngImageFile(ImageFile.ImageFile): self.png.rewind() self.__prepare_idat = self.__rewind_idat self.im = None - if self.pyaccess: - self.pyaccess = None self.info = self.png.im_info self.tile = self.png.im_tile self.fp = self._fp @@ -1039,8 +1037,6 @@ class PngImageFile(ImageFile.ImageFile): mask = updated.convert("RGBA") self._prev_im.paste(updated, self.dispose_extent, mask) self.im = self._prev_im - if self.pyaccess: - self.pyaccess = None def _getexif(self) -> dict[str, Any] | None: if "exif" not in self.info: diff --git a/src/PIL/PyAccess.py b/src/PIL/PyAccess.py deleted file mode 100644 index 3be1ccace..000000000 --- a/src/PIL/PyAccess.py +++ /dev/null @@ -1,381 +0,0 @@ -# -# The Python Imaging Library -# Pillow fork -# -# Python implementation of the PixelAccess Object -# -# Copyright (c) 1997-2009 by Secret Labs AB. All rights reserved. -# Copyright (c) 1995-2009 by Fredrik Lundh. -# Copyright (c) 2013 Eric Soroos -# -# See the README file for information on usage and redistribution -# - -# Notes: -# -# * Implements the pixel access object following Access.c -# * Taking only the tuple form, which is used from python. -# * Fill.c uses the integer form, but it's still going to use the old -# Access.c implementation. -# -from __future__ import annotations - -import logging -import sys -from typing import TYPE_CHECKING - -from ._deprecate import deprecate - -FFI: type -try: - from cffi import FFI - - defs = """ - struct Pixel_RGBA { - unsigned char r,g,b,a; - }; - struct Pixel_I16 { - unsigned char l,r; - }; - """ - ffi = FFI() - ffi.cdef(defs) -except ImportError as ex: - # Allow error import for doc purposes, but error out when accessing - # anything in core. - from ._util import DeferredError - - FFI = ffi = DeferredError.new(ex) - -logger = logging.getLogger(__name__) - -if TYPE_CHECKING: - from . import Image - - -class PyAccess: - def __init__(self, img: Image.Image, readonly: bool = False) -> None: - deprecate("PyAccess", 11) - vals = dict(img.im.unsafe_ptrs) - self.readonly = readonly - self.image8 = ffi.cast("unsigned char **", vals["image8"]) - self.image32 = ffi.cast("int **", vals["image32"]) - self.image = ffi.cast("unsigned char **", vals["image"]) - self.xsize, self.ysize = img.im.size - self._img = img - - # Keep pointer to im object to prevent dereferencing. - self._im = img.im - if self._im.mode in ("P", "PA"): - self._palette = img.palette - - # Debugging is polluting test traces, only useful here - # when hacking on PyAccess - # logger.debug("%s", vals) - self._post_init() - - def _post_init(self) -> None: - pass - - def __setitem__( - self, - xy: tuple[int, int] | list[int], - color: float | tuple[int, ...] | list[int], - ) -> None: - """ - Modifies the pixel at x,y. The color is given as a single - numerical value for single band images, and a tuple for - multi-band images. In addition to this, RGB and RGBA tuples - are accepted for P and PA images. - - :param xy: The pixel coordinate, given as (x, y). See - :ref:`coordinate-system`. - :param color: The pixel value. - """ - if self.readonly: - msg = "Attempt to putpixel a read only image" - raise ValueError(msg) - (x, y) = xy - if x < 0: - x = self.xsize + x - if y < 0: - y = self.ysize + y - (x, y) = self.check_xy((x, y)) - - if ( - self._im.mode in ("P", "PA") - and isinstance(color, (list, tuple)) - and len(color) in [3, 4] - ): - # RGB or RGBA value for a P or PA image - if self._im.mode == "PA": - alpha = color[3] if len(color) == 4 else 255 - color = color[:3] - palette_index = self._palette.getcolor(color, self._img) - color = (palette_index, alpha) if self._im.mode == "PA" else palette_index - - return self.set_pixel(x, y, color) - - def __getitem__(self, xy: tuple[int, int] | list[int]) -> float | tuple[int, ...]: - """ - Returns the pixel at x,y. The pixel is returned as a single - value for single band images or a tuple for multiple band - images - - :param xy: The pixel coordinate, given as (x, y). See - :ref:`coordinate-system`. - :returns: a pixel value for single band images, a tuple of - pixel values for multiband images. - """ - (x, y) = xy - if x < 0: - x = self.xsize + x - if y < 0: - y = self.ysize + y - (x, y) = self.check_xy((x, y)) - return self.get_pixel(x, y) - - putpixel = __setitem__ - getpixel = __getitem__ - - def check_xy(self, xy: tuple[int, int]) -> tuple[int, int]: - (x, y) = xy - if not (0 <= x < self.xsize and 0 <= y < self.ysize): - msg = "pixel location out of range" - raise ValueError(msg) - return xy - - def get_pixel(self, x: int, y: int) -> float | tuple[int, ...]: - raise NotImplementedError() - - def set_pixel( - self, x: int, y: int, color: float | tuple[int, ...] | list[int] - ) -> None: - raise NotImplementedError() - - -class _PyAccess32_2(PyAccess): - """PA, LA, stored in first and last bytes of a 32 bit word""" - - def _post_init(self, *args, **kwargs): - self.pixels = ffi.cast("struct Pixel_RGBA **", self.image32) - - def get_pixel(self, x: int, y: int) -> tuple[int, int]: - pixel = self.pixels[y][x] - return pixel.r, pixel.a - - def set_pixel(self, x, y, color): - pixel = self.pixels[y][x] - # tuple - pixel.r = min(color[0], 255) - pixel.a = min(color[1], 255) - - -class _PyAccess32_3(PyAccess): - """RGB and friends, stored in the first three bytes of a 32 bit word""" - - def _post_init(self, *args, **kwargs): - self.pixels = ffi.cast("struct Pixel_RGBA **", self.image32) - - def get_pixel(self, x: int, y: int) -> tuple[int, int, int]: - pixel = self.pixels[y][x] - return pixel.r, pixel.g, pixel.b - - def set_pixel(self, x, y, color): - pixel = self.pixels[y][x] - # tuple - pixel.r = min(color[0], 255) - pixel.g = min(color[1], 255) - pixel.b = min(color[2], 255) - pixel.a = 255 - - -class _PyAccess32_4(PyAccess): - """RGBA etc, all 4 bytes of a 32 bit word""" - - def _post_init(self, *args, **kwargs): - self.pixels = ffi.cast("struct Pixel_RGBA **", self.image32) - - def get_pixel(self, x: int, y: int) -> tuple[int, int, int, int]: - pixel = self.pixels[y][x] - return pixel.r, pixel.g, pixel.b, pixel.a - - def set_pixel(self, x, y, color): - pixel = self.pixels[y][x] - # tuple - pixel.r = min(color[0], 255) - pixel.g = min(color[1], 255) - pixel.b = min(color[2], 255) - pixel.a = min(color[3], 255) - - -class _PyAccess8(PyAccess): - """1, L, P, 8 bit images stored as uint8""" - - def _post_init(self, *args, **kwargs): - self.pixels = self.image8 - - def get_pixel(self, x: int, y: int) -> int: - return self.pixels[y][x] - - def set_pixel(self, x, y, color): - try: - # integer - self.pixels[y][x] = min(color, 255) - except TypeError: - # tuple - self.pixels[y][x] = min(color[0], 255) - - -class _PyAccessI16_N(PyAccess): - """I;16 access, native bitendian without conversion""" - - def _post_init(self, *args, **kwargs): - self.pixels = ffi.cast("unsigned short **", self.image) - - def get_pixel(self, x: int, y: int) -> int: - return self.pixels[y][x] - - def set_pixel(self, x, y, color): - try: - # integer - self.pixels[y][x] = min(color, 65535) - except TypeError: - # tuple - self.pixels[y][x] = min(color[0], 65535) - - -class _PyAccessI16_L(PyAccess): - """I;16L access, with conversion""" - - def _post_init(self, *args, **kwargs): - self.pixels = ffi.cast("struct Pixel_I16 **", self.image) - - def get_pixel(self, x: int, y: int) -> int: - pixel = self.pixels[y][x] - return pixel.l + pixel.r * 256 - - def set_pixel(self, x, y, color): - pixel = self.pixels[y][x] - try: - color = min(color, 65535) - except TypeError: - color = min(color[0], 65535) - - pixel.l = color & 0xFF - pixel.r = color >> 8 - - -class _PyAccessI16_B(PyAccess): - """I;16B access, with conversion""" - - def _post_init(self, *args, **kwargs): - self.pixels = ffi.cast("struct Pixel_I16 **", self.image) - - def get_pixel(self, x: int, y: int) -> int: - pixel = self.pixels[y][x] - return pixel.l * 256 + pixel.r - - def set_pixel(self, x, y, color): - pixel = self.pixels[y][x] - try: - color = min(color, 65535) - except Exception: - color = min(color[0], 65535) - - pixel.l = color >> 8 - pixel.r = color & 0xFF - - -class _PyAccessI32_N(PyAccess): - """Signed Int32 access, native endian""" - - def _post_init(self, *args, **kwargs): - self.pixels = self.image32 - - def get_pixel(self, x: int, y: int) -> int: - return self.pixels[y][x] - - def set_pixel(self, x, y, color): - self.pixels[y][x] = color - - -class _PyAccessI32_Swap(PyAccess): - """I;32L/B access, with byteswapping conversion""" - - def _post_init(self, *args, **kwargs): - self.pixels = self.image32 - - def reverse(self, i): - orig = ffi.new("int *", i) - chars = ffi.cast("unsigned char *", orig) - chars[0], chars[1], chars[2], chars[3] = chars[3], chars[2], chars[1], chars[0] - return ffi.cast("int *", chars)[0] - - def get_pixel(self, x: int, y: int) -> int: - return self.reverse(self.pixels[y][x]) - - def set_pixel(self, x, y, color): - self.pixels[y][x] = self.reverse(color) - - -class _PyAccessF(PyAccess): - """32 bit float access""" - - def _post_init(self, *args, **kwargs): - self.pixels = ffi.cast("float **", self.image32) - - def get_pixel(self, x: int, y: int) -> float: - return self.pixels[y][x] - - def set_pixel(self, x, y, color): - try: - # not a tuple - self.pixels[y][x] = color - except TypeError: - # tuple - self.pixels[y][x] = color[0] - - -mode_map = { - "1": _PyAccess8, - "L": _PyAccess8, - "P": _PyAccess8, - "I;16N": _PyAccessI16_N, - "LA": _PyAccess32_2, - "La": _PyAccess32_2, - "PA": _PyAccess32_2, - "RGB": _PyAccess32_3, - "LAB": _PyAccess32_3, - "HSV": _PyAccess32_3, - "YCbCr": _PyAccess32_3, - "RGBA": _PyAccess32_4, - "RGBa": _PyAccess32_4, - "RGBX": _PyAccess32_4, - "CMYK": _PyAccess32_4, - "F": _PyAccessF, - "I": _PyAccessI32_N, -} - -if sys.byteorder == "little": - mode_map["I;16"] = _PyAccessI16_N - mode_map["I;16L"] = _PyAccessI16_N - mode_map["I;16B"] = _PyAccessI16_B - - mode_map["I;32L"] = _PyAccessI32_N - mode_map["I;32B"] = _PyAccessI32_Swap -else: - mode_map["I;16"] = _PyAccessI16_L - mode_map["I;16L"] = _PyAccessI16_L - mode_map["I;16B"] = _PyAccessI16_N - - mode_map["I;32L"] = _PyAccessI32_Swap - mode_map["I;32B"] = _PyAccessI32_N - - -def new(img: Image.Image, readonly: bool = False) -> PyAccess | None: - access_type = mode_map.get(img.mode, None) - if not access_type: - logger.debug("PyAccess Not Implemented: %s", img.mode) - return None - return access_type(img, readonly) diff --git a/tox.ini b/tox.ini index 85a2020d6..d225a3106 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,6 @@ env_list = [testenv] deps = - cffi numpy extras = tests @@ -39,7 +38,6 @@ deps = ipython numpy packaging - types-cffi types-defusedxml types-olefile extras = From 5e163c0fed44b11ca85b3f74f0d998fa6cd510a7 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 1 Jul 2024 20:21:21 +1000 Subject: [PATCH 105/662] Updated deprecation timeline --- src/PIL/_deprecate.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/PIL/_deprecate.py b/src/PIL/_deprecate.py index 33a0e07b3..83952b397 100644 --- a/src/PIL/_deprecate.py +++ b/src/PIL/_deprecate.py @@ -45,8 +45,6 @@ def deprecate( elif when <= int(__version__.split(".")[0]): msg = f"{deprecated} {is_} deprecated and should be removed." raise RuntimeError(msg) - elif when == 11: - removed = "Pillow 11 (2024-10-15)" elif when == 12: removed = "Pillow 12 (2025-10-15)" else: From 9bc1365ea0de8b87f706dd5e0c4fd18f169432ce Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 1 Jul 2024 21:41:08 +1000 Subject: [PATCH 106/662] Removed reference --- docs/releasenotes/10.0.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/releasenotes/10.0.0.rst b/docs/releasenotes/10.0.0.rst index adada6e01..2ea973c5c 100644 --- a/docs/releasenotes/10.0.0.rst +++ b/docs/releasenotes/10.0.0.rst @@ -158,7 +158,7 @@ PyAccess and Image.USE_CFFI_ACCESS ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Since Pillow's C API is now faster than PyAccess on PyPy, -:py:mod:`~PIL.PyAccess` has been deprecated and will be removed in Pillow +:py:mod:`!PyAccess` has been deprecated and will be removed in Pillow 11.0.0 (2024-10-15). Pillow's C API will now be used by default on PyPy instead. ``Image.USE_CFFI_ACCESS``, for switching from the C API to PyAccess, is From d3f343bb9b658ff97cbac826f9d1d4763a352e85 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 1 Jul 2024 19:36:15 +1000 Subject: [PATCH 107/662] Skip truncated mask if LOAD_TRUNCATED_IMAGES is enabled --- Tests/test_file_ico.py | 28 +++++++++++++++++++++++- src/PIL/IcoImagePlugin.py | 45 +++++++++++++++++++++++++-------------- 2 files changed, 56 insertions(+), 17 deletions(-) diff --git a/Tests/test_file_ico.py b/Tests/test_file_ico.py index fa8c11d5a..37770498a 100644 --- a/Tests/test_file_ico.py +++ b/Tests/test_file_ico.py @@ -6,7 +6,7 @@ from pathlib import Path import pytest -from PIL import IcoImagePlugin, Image, ImageDraw +from PIL import IcoImagePlugin, Image, ImageDraw, ImageFile from .helper import assert_image_equal, assert_image_equal_tofile, hopper @@ -241,3 +241,29 @@ def test_draw_reloaded(tmp_path: Path) -> None: with Image.open(outfile) as im: assert_image_equal_tofile(im, "Tests/images/hopper_draw.ico") + + +def test_truncated_mask() -> None: + # 1 bpp + with open("Tests/images/hopper_mask.ico", "rb") as fp: + data = fp.read() + + ImageFile.LOAD_TRUNCATED_IMAGES = True + data = data[:-3] + + try: + with Image.open(io.BytesIO(data)) as im: + with Image.open("Tests/images/hopper_mask.png") as expected: + assert im.mode == "1" + + # 32 bpp + output = io.BytesIO() + expected = hopper("RGBA") + expected.save(output, "ico", bitmap_format="bmp") + + data = output.getvalue()[:-1] + + with Image.open(io.BytesIO(data)) as im: + assert im.mode == "RGB" + finally: + ImageFile.LOAD_TRUNCATED_IMAGES = False diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py index 086c87b1a..f331caad7 100644 --- a/src/PIL/IcoImagePlugin.py +++ b/src/PIL/IcoImagePlugin.py @@ -235,13 +235,19 @@ class IcoFile: alpha_bytes = self.buf.read(im.size[0] * im.size[1] * 4)[3::4] # convert to an 8bpp grayscale image - mask = Image.frombuffer( - "L", # 8bpp - im.size, # (w, h) - alpha_bytes, # source chars - "raw", # raw decoder - ("L", 0, -1), # 8bpp inverted, unpadded, reversed - ) + try: + mask = Image.frombuffer( + "L", # 8bpp + im.size, # (w, h) + alpha_bytes, # source chars + "raw", # raw decoder + ("L", 0, -1), # 8bpp inverted, unpadded, reversed + ) + except ValueError: + if ImageFile.LOAD_TRUNCATED_IMAGES: + mask = None + else: + raise else: # get AND image from end of bitmap w = im.size[0] @@ -259,19 +265,26 @@ class IcoFile: mask_data = self.buf.read(total_bytes) # convert raw data to image - mask = Image.frombuffer( - "1", # 1 bpp - im.size, # (w, h) - mask_data, # source chars - "raw", # raw decoder - ("1;I", int(w / 8), -1), # 1bpp inverted, padded, reversed - ) + try: + mask = Image.frombuffer( + "1", # 1 bpp + im.size, # (w, h) + mask_data, # source chars + "raw", # raw decoder + ("1;I", int(w / 8), -1), # 1bpp inverted, padded, reversed + ) + except ValueError: + if ImageFile.LOAD_TRUNCATED_IMAGES: + mask = None + else: + raise # now we have two images, im is XOR image and mask is AND image # apply mask image as alpha channel - im = im.convert("RGBA") - im.putalpha(mask) + if mask: + im = im.convert("RGBA") + im.putalpha(mask) return im From 381c604b07a23fa173160281a6e295fd5a22fd0e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 12 Jun 2024 23:35:24 +1000 Subject: [PATCH 108/662] Removed Debian 11 --- .github/workflows/test-docker.yml | 1 - docs/installation/platform-support.rst | 2 -- 2 files changed, 3 deletions(-) diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index 6afed74db..d18ab9729 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -44,7 +44,6 @@ jobs: amazon-2023-amd64, arch, centos-stream-9-amd64, - debian-11-bullseye-amd64, debian-12-bookworm-x86, debian-12-bookworm-amd64, fedora-39-amd64, diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index ed25d33a6..cde00c76d 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -27,8 +27,6 @@ These platforms are built and tested for every change. +----------------------------------+----------------------------+---------------------+ | CentOS Stream 9 | 3.9 | x86-64 | +----------------------------------+----------------------------+---------------------+ -| Debian 11 Bullseye | 3.9 | x86-64 | -+----------------------------------+----------------------------+---------------------+ | Debian 12 Bookworm | 3.11 | x86, x86-64 | +----------------------------------+----------------------------+---------------------+ | Fedora 39 | 3.12 | x86-64 | From 31e64a0da8f263c5d4a9d9f047cb06a7b30c14c4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 1 Jul 2024 14:23:36 +1000 Subject: [PATCH 109/662] Updated CVE URL --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index f12b30e65..41f9c0e38 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -338,7 +338,7 @@ linkcheck_allowed_redirects = { # https://www.sphinx-doc.org/en/master/usage/extensions/extlinks.html _repo = "https://github.com/python-pillow/Pillow/" extlinks = { - "cve": ("https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-%s", "CVE-%s"), + "cve": ("https://www.cve.org/CVERecord?id=CVE-%s", "CVE-%s"), "cwe": ("https://cwe.mitre.org/data/definitions/%s.html", "CWE-%s"), "issue": (_repo + "issues/%s", "#%s"), "pr": (_repo + "pull/%s", "#%s"), From d6d0a4d98106790b2e9df66073ffff7c2bf18f6d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 17:32:51 +0000 Subject: [PATCH 110/662] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.4.7 → v0.5.0](https://github.com/astral-sh/ruff-pre-commit/compare/v0.4.7...v0.5.0) - [github.com/PyCQA/bandit: 1.7.8 → 1.7.9](https://github.com/PyCQA/bandit/compare/1.7.8...1.7.9) - [github.com/pre-commit/mirrors-clang-format: v18.1.5 → v18.1.8](https://github.com/pre-commit/mirrors-clang-format/compare/v18.1.5...v18.1.8) - [github.com/python-jsonschema/check-jsonschema: 0.28.4 → 0.28.6](https://github.com/python-jsonschema/check-jsonschema/compare/0.28.4...0.28.6) - [github.com/tox-dev/pyproject-fmt: 1.8.0 → 2.1.3](https://github.com/tox-dev/pyproject-fmt/compare/1.8.0...2.1.3) --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6a76e8c00..659409de4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.4.7 + rev: v0.5.0 hooks: - id: ruff args: [--exit-non-zero-on-fix] @@ -11,7 +11,7 @@ repos: - id: black - repo: https://github.com/PyCQA/bandit - rev: 1.7.8 + rev: 1.7.9 hooks: - id: bandit args: [--severity-level=high] @@ -24,7 +24,7 @@ repos: exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.gd$|\.opt$) - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v18.1.5 + rev: v18.1.8 hooks: - id: clang-format types: [c] @@ -50,7 +50,7 @@ repos: exclude: ^.github/.*TEMPLATE|^Tests/(fonts|images)/ - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.4 + rev: 0.28.6 hooks: - id: check-github-workflows - id: check-readthedocs @@ -62,7 +62,7 @@ repos: - id: sphinx-lint - repo: https://github.com/tox-dev/pyproject-fmt - rev: 1.8.0 + rev: 2.1.3 hooks: - id: pyproject-fmt From b4ee9673729df7a996fc04fe9d3487f99bf32ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Robert?= Date: Mon, 1 Jul 2024 19:16:13 +0200 Subject: [PATCH 111/662] BUG: fix an incompatibility with numpy 1.20 --- src/PIL/_typing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PIL/_typing.py b/src/PIL/_typing.py index 09ece18fa..435c67f04 100644 --- a/src/PIL/_typing.py +++ b/src/PIL/_typing.py @@ -7,8 +7,8 @@ from typing import Any, Protocol, Sequence, TypeVar, Union try: import numpy.typing as npt - NumpyArray = npt.NDArray[Any] -except ImportError: + NumpyArray = npt.NDArray[Any] # requires numpy>=1.21 +except (ImportError, AttributeError): pass if sys.version_info >= (3, 10): From c359bd290b4ad045eb0ff3e5a2e22c6a93fb0bd5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 17:33:15 +0000 Subject: [PATCH 112/662] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- pyproject.toml | 105 ++++++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 49 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 20e87ad32..6f47f360b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,8 +14,10 @@ readme = "README.md" keywords = [ "Imaging", ] -license = {text = "HPND"} -authors = [{name = "Jeffrey A. Clark", email = "aclark@aclark.net"}] +license = { text = "HPND" } +authors = [ + { name = "Jeffrey A. Clark", email = "aclark@aclark.net" }, +] requires-python = ">=3.8" classifiers = [ "Development Status :: 6 - Mature", @@ -38,8 +40,7 @@ classifiers = [ dynamic = [ "version", ] -[project.optional-dependencies] -docs = [ +optional-dependencies.docs = [ "furo", "olefile", "sphinx>=7.3", @@ -47,13 +48,13 @@ docs = [ "sphinx-inline-tabs", "sphinxext-opengraph", ] -fpx = [ +optional-dependencies.fpx = [ "olefile", ] -mic = [ +optional-dependencies.mic = [ "olefile", ] -tests = [ +optional-dependencies.tests = [ "check-manifest", "coverage", "defusedxml", @@ -65,28 +66,29 @@ tests = [ "pytest-cov", "pytest-timeout", ] -typing = [ - 'typing-extensions; python_version < "3.10"', +optional-dependencies.typing = [ + "typing-extensions; python_version<'3.10'", ] -xmp = [ +optional-dependencies.xmp = [ "defusedxml", ] -[project.urls] -Changelog = "https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst" -Documentation = "https://pillow.readthedocs.io" -Funding = "https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=pypi" -Homepage = "https://python-pillow.org" -Mastodon = "https://fosstodon.org/@pillow" -"Release notes" = "https://pillow.readthedocs.io/en/stable/releasenotes/index.html" -Source = "https://github.com/python-pillow/Pillow" +urls.Changelog = "https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst" +urls.Documentation = "https://pillow.readthedocs.io" +urls.Funding = "https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=pypi" +urls.Homepage = "https://python-pillow.org" +urls.Mastodon = "https://fosstodon.org/@pillow" +urls."Release notes" = "https://pillow.readthedocs.io/en/stable/releasenotes/index.html" +urls.Source = "https://github.com/python-pillow/Pillow" [tool.setuptools] -packages = ["PIL"] +packages = [ + "PIL", +] include-package-data = true -package-dir = {"" = "src"} +package-dir = { "" = "src" } [tool.setuptools.dynamic] -version = {attr = "PIL.__version__"} +version = { attr = "PIL.__version__" } [tool.cibuildwheel] before-all = ".github/workflows/wheels-dependencies.sh" @@ -98,42 +100,47 @@ test-extras = "tests" [tool.ruff] fix = true -[tool.ruff.lint] -select = [ - "C4", # flake8-comprehensions - "E", # pycodestyle errors - "EM", # flake8-errmsg - "F", # pyflakes errors - "I", # isort - "ISC", # flake8-implicit-str-concat - "LOG", # flake8-logging - "PGH", # pygrep-hooks - "PYI", # flake8-pyi +lint.select = [ + "C4", # flake8-comprehensions + "E", # pycodestyle errors + "EM", # flake8-errmsg + "F", # pyflakes errors + "I", # isort + "ISC", # flake8-implicit-str-concat + "LOG", # flake8-logging + "PGH", # pygrep-hooks + "PYI", # flake8-pyi "RUF100", # unused noqa (yesqa) - "UP", # pyupgrade - "W", # pycodestyle warnings - "YTT", # flake8-2020 + "UP", # pyupgrade + "W", # pycodestyle warnings + "YTT", # flake8-2020 ] -ignore = [ - "E203", # Whitespace before ':' - "E221", # Multiple spaces before operator - "E226", # Missing whitespace around arithmetic operator - "E241", # Multiple spaces after ',' +lint.ignore = [ + "E203", # Whitespace before ':' + "E221", # Multiple spaces before operator + "E226", # Missing whitespace around arithmetic operator + "E241", # Multiple spaces after ',' "PYI026", # flake8-pyi: typing.TypeAlias added in Python 3.10 "PYI034", # flake8-pyi: typing.Self added in Python 3.11 ] - -[tool.ruff.lint.per-file-ignores] -"Tests/oss-fuzz/fuzz_font.py" = ["I002"] -"Tests/oss-fuzz/fuzz_pillow.py" = ["I002"] - -[tool.ruff.lint.isort] -known-first-party = ["PIL"] -required-imports = ["from __future__ import annotations"] +lint.per-file-ignores."Tests/oss-fuzz/fuzz_font.py" = [ + "I002", +] +lint.per-file-ignores."Tests/oss-fuzz/fuzz_pillow.py" = [ + "I002", +] +lint.isort.known-first-party = [ + "PIL", +] +lint.isort.required-imports = [ + "from __future__ import annotations", +] [tool.pytest.ini_options] addopts = "-ra --color=yes" -testpaths = ["Tests"] +testpaths = [ + "Tests", +] [tool.mypy] python_version = "3.8" From 8b8fc18998bb416631acc81f54e95e8c8fc50f61 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 2 Jul 2024 19:05:59 +1000 Subject: [PATCH 113/662] Do not import numpy.typing unless TYPE_CHECKING --- src/PIL/_typing.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/PIL/_typing.py b/src/PIL/_typing.py index 435c67f04..db1e80e2f 100644 --- a/src/PIL/_typing.py +++ b/src/PIL/_typing.py @@ -2,14 +2,15 @@ from __future__ import annotations import os import sys -from typing import Any, Protocol, Sequence, TypeVar, Union +from typing import TYPE_CHECKING, Any, Protocol, Sequence, TypeVar, Union -try: - import numpy.typing as npt +if TYPE_CHECKING: + try: + import numpy.typing as npt - NumpyArray = npt.NDArray[Any] # requires numpy>=1.21 -except (ImportError, AttributeError): - pass + NumpyArray = npt.NDArray[Any] # requires numpy>=1.21 + except (ImportError, AttributeError): + pass if sys.version_info >= (3, 10): from typing import TypeGuard From 267c0b37b1c6d24e5e189349f51dc2cfbecf151d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 2 Jul 2024 20:10:47 +1000 Subject: [PATCH 114/662] Added type hints --- Tests/test_color_lut.py | 2 ++ Tests/test_file_pcx.py | 8 ++++++++ Tests/test_image.py | 1 + Tests/test_image_access.py | 9 +++++++-- Tests/test_image_convert.py | 2 ++ Tests/test_image_load.py | 5 +++-- Tests/test_image_paste.py | 3 +++ Tests/test_image_quantize.py | 4 ++++ Tests/test_image_resample.py | 14 +++++++++++++- Tests/test_imageops.py | 9 +++++++-- Tests/test_imagetk.py | 5 +++++ Tests/test_mode_i16.py | 2 ++ Tests/test_numpy.py | 2 ++ src/PIL/FpxImagePlugin.py | 8 ++++---- src/PIL/Image.py | 26 +++++++++++++++++--------- src/PIL/ImageOps.py | 4 +++- src/PIL/ImageTk.py | 32 +++++++++++++++++++++++--------- src/PIL/MicImagePlugin.py | 2 +- 18 files changed, 107 insertions(+), 31 deletions(-) diff --git a/Tests/test_color_lut.py b/Tests/test_color_lut.py index 00c8995b0..0d9c0b419 100644 --- a/Tests/test_color_lut.py +++ b/Tests/test_color_lut.py @@ -321,6 +321,7 @@ class TestColorLut3DCoreAPI: -1, 2, 2, 2, 2, 2, ])).load() # fmt: on + assert transformed is not None assert transformed[0, 0] == (0, 0, 255) assert transformed[50, 50] == (0, 0, 255) assert transformed[255, 0] == (0, 255, 255) @@ -341,6 +342,7 @@ class TestColorLut3DCoreAPI: -3, 5, 5, 5, 5, 5, ])).load() # fmt: on + assert transformed is not None assert transformed[0, 0] == (0, 0, 255) assert transformed[50, 50] == (0, 0, 255) assert transformed[255, 0] == (0, 255, 255) diff --git a/Tests/test_file_pcx.py b/Tests/test_file_pcx.py index ab9f9663e..b3f38c3e5 100644 --- a/Tests/test_file_pcx.py +++ b/Tests/test_file_pcx.py @@ -76,6 +76,7 @@ def test_pil184() -> None: def test_1px_width(tmp_path: Path) -> None: im = Image.new("L", (1, 256)) px = im.load() + assert px is not None for y in range(256): px[0, y] = y _roundtrip(tmp_path, im) @@ -84,6 +85,7 @@ def test_1px_width(tmp_path: Path) -> None: def test_large_count(tmp_path: Path) -> None: im = Image.new("L", (256, 1)) px = im.load() + assert px is not None for x in range(256): px[x, 0] = x // 67 * 67 _roundtrip(tmp_path, im) @@ -101,6 +103,7 @@ def _test_buffer_overflow(tmp_path: Path, im: Image.Image, size: int = 1024) -> def test_break_in_count_overflow(tmp_path: Path) -> None: im = Image.new("L", (256, 5)) px = im.load() + assert px is not None for y in range(4): for x in range(256): px[x, y] = x % 128 @@ -110,6 +113,7 @@ def test_break_in_count_overflow(tmp_path: Path) -> None: def test_break_one_in_loop(tmp_path: Path) -> None: im = Image.new("L", (256, 5)) px = im.load() + assert px is not None for y in range(5): for x in range(256): px[x, y] = x % 128 @@ -119,6 +123,7 @@ def test_break_one_in_loop(tmp_path: Path) -> None: def test_break_many_in_loop(tmp_path: Path) -> None: im = Image.new("L", (256, 5)) px = im.load() + assert px is not None for y in range(4): for x in range(256): px[x, y] = x % 128 @@ -130,6 +135,7 @@ def test_break_many_in_loop(tmp_path: Path) -> None: def test_break_one_at_end(tmp_path: Path) -> None: im = Image.new("L", (256, 5)) px = im.load() + assert px is not None for y in range(5): for x in range(256): px[x, y] = x % 128 @@ -140,6 +146,7 @@ def test_break_one_at_end(tmp_path: Path) -> None: def test_break_many_at_end(tmp_path: Path) -> None: im = Image.new("L", (256, 5)) px = im.load() + assert px is not None for y in range(5): for x in range(256): px[x, y] = x % 128 @@ -152,6 +159,7 @@ def test_break_many_at_end(tmp_path: Path) -> None: def test_break_padding(tmp_path: Path) -> None: im = Image.new("L", (257, 5)) px = im.load() + assert px is not None for y in range(5): for x in range(257): px[x, y] = x % 128 diff --git a/Tests/test_image.py b/Tests/test_image.py index 93f9b9833..07161fcfa 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -575,6 +575,7 @@ class TestImage: for mode in ("I", "F", "L"): im = Image.new(mode, (100, 100), (5,)) px = im.load() + assert px is not None assert px[0, 0] == 5 def test_linear_gradient_wrong_mode(self) -> None: diff --git a/Tests/test_image_access.py b/Tests/test_image_access.py index 52ffef5e8..c860771dc 100644 --- a/Tests/test_image_access.py +++ b/Tests/test_image_access.py @@ -47,6 +47,8 @@ class TestImagePutPixel: pix1 = im1.load() pix2 = im2.load() + assert pix1 is not None + assert pix2 is not None with pytest.raises(TypeError): pix1[0, "0"] with pytest.raises(TypeError): @@ -89,6 +91,8 @@ class TestImagePutPixel: pix1 = im1.load() pix2 = im2.load() + assert pix1 is not None + assert pix2 is not None for y in range(-1, -im1.size[1] - 1, -1): for x in range(-1, -im1.size[0] - 1, -1): pix2[x, y] = pix1[x, y] @@ -98,10 +102,11 @@ class TestImagePutPixel: @pytest.mark.skipif(numpy is None, reason="NumPy not installed") def test_numpy(self) -> None: im = hopper() - pix = im.load() + px = im.load() + assert px is not None assert numpy is not None - assert pix[numpy.int32(1), numpy.int32(2)] == (18, 20, 59) + assert px[numpy.int32(1), numpy.int32(2)] == (18, 20, 59) class TestImageGetPixel: diff --git a/Tests/test_image_convert.py b/Tests/test_image_convert.py index 2fb45854a..5b63ceec3 100644 --- a/Tests/test_image_convert.py +++ b/Tests/test_image_convert.py @@ -222,8 +222,10 @@ def test_l_macro_rounding(convert_mode: str) -> None: converted_im = im.convert(convert_mode) px = converted_im.load() + assert px is not None converted_color = px[0, 0] if convert_mode == "LA": + assert converted_color is not None converted_color = converted_color[0] assert converted_color == 1 diff --git a/Tests/test_image_load.py b/Tests/test_image_load.py index 0605821e0..4f1d63b8f 100644 --- a/Tests/test_image_load.py +++ b/Tests/test_image_load.py @@ -12,9 +12,10 @@ from .helper import hopper def test_sanity() -> None: im = hopper() - pix = im.load() + px = im.load() - assert pix[0, 0] == (20, 20, 70) + assert px is not None + assert px[0, 0] == (20, 20, 70) def test_close() -> None: diff --git a/Tests/test_image_paste.py b/Tests/test_image_paste.py index 01cb880cb..2cff6c893 100644 --- a/Tests/test_image_paste.py +++ b/Tests/test_image_paste.py @@ -14,6 +14,7 @@ class TestImagingPaste: self, im: Image.Image, expected: list[tuple[int, int, int, int]] ) -> None: px = im.load() + assert px is not None actual = [ px[0, 0], px[self.size // 2, 0], @@ -48,6 +49,7 @@ class TestImagingPaste: def mask_1(self) -> Image.Image: mask = Image.new("1", (self.size, self.size)) px = mask.load() + assert px is not None for y in range(mask.height): for x in range(mask.width): px[y, x] = (x + y) % 2 @@ -61,6 +63,7 @@ class TestImagingPaste: def gradient_L(self) -> Image.Image: gradient = Image.new("L", (self.size, self.size)) px = gradient.load() + assert px is not None for y in range(gradient.height): for x in range(gradient.width): px[y, x] = (x + y) % 255 diff --git a/Tests/test_image_quantize.py b/Tests/test_image_quantize.py index 2d461d985..9f8aa601c 100644 --- a/Tests/test_image_quantize.py +++ b/Tests/test_image_quantize.py @@ -80,6 +80,7 @@ def test_quantize_no_dither2() -> None: assert tuple(quantized.palette.palette) == data px = quantized.load() + assert px is not None for x in range(9): assert px[x, 0] == (0 if x < 5 else 1) @@ -118,10 +119,12 @@ def test_colors() -> None: def test_transparent_colors_equal() -> None: im = Image.new("RGBA", (1, 2), (0, 0, 0, 0)) px = im.load() + assert px is not None px[0, 1] = (255, 255, 255, 0) converted = im.quantize() converted_px = converted.load() + assert converted_px is not None assert converted_px[0, 0] == converted_px[0, 1] @@ -139,6 +142,7 @@ def test_palette(method: Image.Quantize, color: tuple[int, ...]) -> None: converted = im.quantize(method=method) converted_px = converted.load() + assert converted_px is not None assert converted_px[0, 0] == converted.palette.colors[color] diff --git a/Tests/test_image_resample.py b/Tests/test_image_resample.py index d6055b577..58de812ef 100644 --- a/Tests/test_image_resample.py +++ b/Tests/test_image_resample.py @@ -74,6 +74,7 @@ class TestImagingCoreResampleAccuracy: data = data.replace(" ", "") sample = Image.new("L", size) s_px = sample.load() + assert s_px is not None w, h = size[0] // 2, size[1] // 2 for y in range(h): for x in range(w): @@ -87,6 +88,8 @@ class TestImagingCoreResampleAccuracy: def check_case(self, case: Image.Image, sample: Image.Image) -> None: s_px = sample.load() c_px = case.load() + assert s_px is not None + assert c_px is not None for y in range(case.size[1]): for x in range(case.size[0]): if c_px[x, y] != s_px[x, y]: @@ -98,6 +101,7 @@ class TestImagingCoreResampleAccuracy: def serialize_image(self, image: Image.Image) -> str: s_px = image.load() + assert s_px is not None return "\n".join( " ".join(f"{s_px[x, y]:02x}" for x in range(image.size[0])) for y in range(image.size[1]) @@ -235,11 +239,14 @@ class TestCoreResampleConsistency: self, mode: str, fill: tuple[int, int, int] | float ) -> tuple[Image.Image, tuple[int, ...]]: im = Image.new(mode, (512, 9), fill) - return im.resize((9, 512), Image.Resampling.LANCZOS), im.load()[0, 0] + px = im.load() + assert px is not None + return im.resize((9, 512), Image.Resampling.LANCZOS), px[0, 0] def run_case(self, case: tuple[Image.Image, int | tuple[int, ...]]) -> None: channel, color = case px = channel.load() + assert px is not None for x in range(channel.size[0]): for y in range(channel.size[1]): if px[x, y] != color: @@ -271,6 +278,7 @@ class TestCoreResampleAlphaCorrect: def make_levels_case(self, mode: str) -> Image.Image: i = Image.new(mode, (256, 16)) px = i.load() + assert px is not None for y in range(i.size[1]): for x in range(i.size[0]): pix = [x] * len(mode) @@ -280,6 +288,7 @@ class TestCoreResampleAlphaCorrect: def run_levels_case(self, i: Image.Image) -> None: px = i.load() + assert px is not None for y in range(i.size[1]): used_colors = {px[x, y][0] for x in range(i.size[0])} assert 256 == len(used_colors), ( @@ -310,6 +319,7 @@ class TestCoreResampleAlphaCorrect: ) -> Image.Image: i = Image.new(mode, (64, 64), dirty_pixel) px = i.load() + assert px is not None xdiv4 = i.size[0] // 4 ydiv4 = i.size[1] // 4 for y in range(ydiv4 * 2): @@ -319,6 +329,7 @@ class TestCoreResampleAlphaCorrect: def run_dirty_case(self, i: Image.Image, clean_pixel: tuple[int, ...]) -> None: px = i.load() + assert px is not None for y in range(i.size[1]): for x in range(i.size[0]): if px[x, y][-1] != 0 and px[x, y][:-1] != clean_pixel: @@ -406,6 +417,7 @@ class TestCoreResampleCoefficients: draw.rectangle((0, 0, i.size[0] // 2 - 1, 0), test_color) px = i.resize((5, i.size[1]), Image.Resampling.BICUBIC).load() + assert px is not None if px[2, 0] != test_color // 2: assert test_color // 2 == px[2, 0] diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py index 64ef929c4..3598df830 100644 --- a/Tests/test_imageops.py +++ b/Tests/test_imageops.py @@ -165,10 +165,14 @@ def test_pad() -> None: def test_pad_round() -> None: im = Image.new("1", (1, 1), 1) new_im = ImageOps.pad(im, (4, 1)) - assert new_im.load()[2, 0] == 1 + px = new_im.load() + assert px is not None + assert px[2, 0] == 1 new_im = ImageOps.pad(im, (1, 4)) - assert new_im.load()[0, 2] == 1 + px = new_im.load() + assert px is not None + assert px[0, 2] == 1 @pytest.mark.parametrize("mode", ("P", "PA")) @@ -223,6 +227,7 @@ def test_expand_palette(border: int | tuple[int, int, int, int]) -> None: else: left, top, right, bottom = border px = im_expanded.convert("RGB").load() + assert px is not None for x in range(im_expanded.width): for b in range(top): assert px[x, b] == (255, 0, 0) diff --git a/Tests/test_imagetk.py b/Tests/test_imagetk.py index b607b8c43..e5869892e 100644 --- a/Tests/test_imagetk.py +++ b/Tests/test_imagetk.py @@ -70,6 +70,11 @@ def test_photoimage(mode: str) -> None: reloaded = ImageTk.getimage(im_tk) assert_image_equal(reloaded, im.convert("RGBA")) + with pytest.raises(ValueError): + ImageTk.PhotoImage() + with pytest.raises(ValueError): + ImageTk.PhotoImage(mode) + def test_photoimage_apply_transparency() -> None: with Image.open("Tests/images/pil123p.png") as im: diff --git a/Tests/test_mode_i16.py b/Tests/test_mode_i16.py index 1b01f95ce..e26f5d283 100644 --- a/Tests/test_mode_i16.py +++ b/Tests/test_mode_i16.py @@ -16,6 +16,8 @@ def verify(im1: Image.Image) -> None: assert im1.size == im2.size pix1 = im1.load() pix2 = im2.load() + assert pix1 is not None + assert pix2 is not None for y in range(im1.size[1]): for x in range(im1.size[0]): xy = x, y diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py index 32d2cf985..a082e5a4d 100644 --- a/Tests/test_numpy.py +++ b/Tests/test_numpy.py @@ -109,6 +109,7 @@ def _test_img_equals_nparray(img: Image.Image, np_img: _typing.NumpyArray) -> No np_size = np_img.shape[1], np_img.shape[0] assert img.size == np_size px = img.load() + assert px is not None for x in range(0, img.size[0], int(img.size[0] / 10)): for y in range(0, img.size[1], int(img.size[1] / 10)): assert_deep_equal(px[x, y], np_img[y, x]) @@ -141,6 +142,7 @@ def test_save_tiff_uint16() -> None: img = Image.fromarray(a) img_px = img.load() + assert img_px is not None assert img_px[0, 0] == pixel_value diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py index c1927bd26..93eef48d2 100644 --- a/src/PIL/FpxImagePlugin.py +++ b/src/PIL/FpxImagePlugin.py @@ -53,7 +53,7 @@ class FpxImageFile(ImageFile.ImageFile): format = "FPX" format_description = "FlashPix" - def _open(self): + def _open(self) -> None: # # read the OLE directory and see if this is a likely # to be a FlashPix file @@ -64,7 +64,8 @@ class FpxImageFile(ImageFile.ImageFile): msg = "not an FPX file; invalid OLE file" raise SyntaxError(msg) from e - if self.ole.root.clsid != "56616700-C154-11CE-8553-00AA00A1F95B": + root = self.ole.root + if not root or root.clsid != "56616700-C154-11CE-8553-00AA00A1F95B": msg = "not an FPX file; bad root CLSID" raise SyntaxError(msg) @@ -99,8 +100,7 @@ class FpxImageFile(ImageFile.ImageFile): s = prop[0x2000002 | id] - bands = i32(s, 4) - if bands > 4: + if not isinstance(s, bytes) or (bands := i32(s, 4)) > 4: msg = "Invalid number of bands" raise OSError(msg) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index dbdb3b132..005b4cc9e 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -221,7 +221,7 @@ if hasattr(core, "DEFAULT_STRATEGY"): # Registries if TYPE_CHECKING: - from . import ImageFile + from . import ImageFile, ImagePalette ID: list[str] = [] OPEN: dict[ str, @@ -1167,7 +1167,7 @@ class Image: colors: int = 256, method: int | None = None, kmeans: int = 0, - palette=None, + palette: Image | None = None, dither: Dither = Dither.FLOYDSTEINBERG, ) -> Image: """ @@ -1239,8 +1239,8 @@ class Image: from . import ImagePalette mode = im.im.getpalettemode() - palette = im.im.getpalette(mode, mode)[: colors * len(mode)] - im.palette = ImagePalette.ImagePalette(mode, palette) + palette_data = im.im.getpalette(mode, mode)[: colors * len(mode)] + im.palette = ImagePalette.ImagePalette(mode, palette_data) return im @@ -1395,7 +1395,9 @@ class Image: self.load() return self.im.getbbox(alpha_only) - def getcolors(self, maxcolors: int = 256): + def getcolors( + self, maxcolors: int = 256 + ) -> list[tuple[int, int]] | list[tuple[int, float]] | None: """ Returns a list of colors used in this image. @@ -1456,7 +1458,7 @@ class Image: return tuple(self.im.getband(i).getextrema() for i in range(self.im.bands)) return self.im.getextrema() - def getxmp(self): + def getxmp(self) -> dict[str, Any]: """ Returns a dictionary containing the XMP tags. Requires defusedxml to be installed. @@ -2017,7 +2019,11 @@ class Image: self.im.putdata(data, scale, offset) - def putpalette(self, data, rawmode="RGB") -> None: + def putpalette( + self, + data: ImagePalette.ImagePalette | bytes | Sequence[int], + rawmode: str = "RGB", + ) -> None: """ Attaches a palette to this image. The image must be a "P", "PA", "L" or "LA" image. @@ -2093,7 +2099,9 @@ class Image: value = (palette_index, alpha) if self.mode == "PA" else palette_index return self.im.putpixel(xy, value) - def remap_palette(self, dest_map, source_palette=None): + def remap_palette( + self, dest_map: list[int], source_palette: bytes | bytearray | None = None + ) -> Image: """ Rewrites the image to reorder the palette. @@ -3532,7 +3540,7 @@ def composite(image1: Image, image2: Image, mask: Image) -> Image: return image -def eval(image, *args): +def eval(image: Image, *args: Callable[[int], float]) -> Image: """ Applies the function (which should take one argument) to each pixel in the given image. If the image has more than one band, the same diff --git a/src/PIL/ImageOps.py b/src/PIL/ImageOps.py index 55335872d..d47b86a75 100644 --- a/src/PIL/ImageOps.py +++ b/src/PIL/ImageOps.py @@ -361,7 +361,9 @@ def pad( else: out = Image.new(image.mode, size, color) if resized.palette: - out.putpalette(resized.getpalette()) + palette = resized.getpalette() + if palette is not None: + out.putpalette(palette) if resized.width != size[0]: x = round((size[0] - resized.width) * max(0, min(centering[0], 1))) out.paste(resized, (x, 0)) diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index 90defdbbc..6aa70ced3 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -28,8 +28,9 @@ from __future__ import annotations import tkinter from io import BytesIO +from typing import Any -from . import Image +from . import Image, ImageFile # -------------------------------------------------------------------- # Check for Tkinter interface hooks @@ -49,14 +50,15 @@ def _pilbitmap_check() -> int: return _pilbitmap_ok -def _get_image_from_kw(kw): +def _get_image_from_kw(kw: dict[str, Any]) -> ImageFile.ImageFile | None: source = None if "file" in kw: source = kw.pop("file") elif "data" in kw: source = BytesIO(kw.pop("data")) - if source: - return Image.open(source) + if not source: + return None + return Image.open(source) def _pyimagingtkcall(command, photo, id): @@ -96,12 +98,27 @@ class PhotoImage: image file). """ - def __init__(self, image=None, size=None, **kw): + def __init__( + self, + image: Image.Image | str | None = None, + size: tuple[int, int] | None = None, + **kw: Any, + ) -> None: # Tk compatibility: file or data if image is None: image = _get_image_from_kw(kw) - if hasattr(image, "mode") and hasattr(image, "size"): + if image is None: + msg = "Image is required" + raise ValueError(msg) + elif isinstance(image, str): + mode = image + image = None + + if size is None: + msg = "If first argument is mode, size is required" + raise ValueError(msg) + else: # got an image instead of a mode mode = image.mode if mode == "P": @@ -114,9 +131,6 @@ class PhotoImage: mode = "RGB" # default size = image.size kw["width"], kw["height"] = size - else: - mode = image - image = None if mode not in ["1", "L", "RGB", "RGBA"]: mode = Image.getmodebase(mode) diff --git a/src/PIL/MicImagePlugin.py b/src/PIL/MicImagePlugin.py index 07239887f..5f23a34b9 100644 --- a/src/PIL/MicImagePlugin.py +++ b/src/PIL/MicImagePlugin.py @@ -70,7 +70,7 @@ class MicImageFile(TiffImagePlugin.TiffImageFile): self.__fp = self.fp self.seek(0) - def seek(self, frame): + def seek(self, frame: int) -> None: if not self._seek_check(frame): return try: From 0a19410ee21a4de066b0ff5c1869c8870c609afd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:15:04 +0000 Subject: [PATCH 115/662] Update dependency cibuildwheel to v2.19.2 --- .ci/requirements-cibw.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-cibw.txt b/.ci/requirements-cibw.txt index 0d0f81fbf..a2bf2a7b0 100644 --- a/.ci/requirements-cibw.txt +++ b/.ci/requirements-cibw.txt @@ -1 +1 @@ -cibuildwheel==2.19.1 +cibuildwheel==2.19.2 From e50df021e88ea4ab70d01781f2614b3a54b76d67 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:17:29 +0300 Subject: [PATCH 116/662] Add support for Python 3.13 --- docs/installation/newer-versions.csv | 17 +++++++++-------- docs/releasenotes/11.0.0.rst | 10 +++++++--- pyproject.toml | 4 ++++ tox.ini | 2 +- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/docs/installation/newer-versions.csv b/docs/installation/newer-versions.csv index e21caf520..7f4730df4 100644 --- a/docs/installation/newer-versions.csv +++ b/docs/installation/newer-versions.csv @@ -1,8 +1,9 @@ -Python,3.12,3.11,3.10,3.9,3.8,3.7,3.6,3.5 -Pillow >= 10.1,Yes,Yes,Yes,Yes,Yes,,, -Pillow 10.0,,Yes,Yes,Yes,Yes,,, -Pillow 9.3 - 9.5,,Yes,Yes,Yes,Yes,Yes,, -Pillow 9.0 - 9.2,,,Yes,Yes,Yes,Yes,, -Pillow 8.3.2 - 8.4,,,Yes,Yes,Yes,Yes,Yes, -Pillow 8.0 - 8.3.1,,,,Yes,Yes,Yes,Yes, -Pillow 7.0 - 7.2,,,,,Yes,Yes,Yes,Yes +Python,3.13,3.12,3.11,3.10,3.9,3.8,3.7,3.6,3.5 +Pillow >= 11,Yes,Yes,Yes,Yes,Yes,Yes,,, +Pillow >= 10.1,,Yes,Yes,Yes,Yes,Yes,,, +Pillow 10.0,,,Yes,Yes,Yes,Yes,,, +Pillow 9.3 - 9.5,,,Yes,Yes,Yes,Yes,Yes,, +Pillow 9.0 - 9.2,,,,Yes,Yes,Yes,Yes,, +Pillow 8.3.2 - 8.4,,,,Yes,Yes,Yes,Yes,Yes, +Pillow 8.0 - 8.3.1,,,,,Yes,Yes,Yes,Yes, +Pillow 7.0 - 7.2,,,,,,Yes,Yes,Yes,Yes diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index bde791b1e..0b18fe01a 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -61,7 +61,11 @@ TODO Other Changes ============= -TODO -^^^^ +Python 3.13 +^^^^^^^^^^^ -TODO +Pillow 10.4.0 had wheels built against Python 3.13 beta, available as a preview to help +others prepare for 3.13, and to ensure Pillow could be used immediately at the release +of 3.13.0 final (2024-10-01, :pep:`719`). + +Pillow 11.0.0 now officially supports Python 3.13. diff --git a/pyproject.toml b/pyproject.toml index 6f47f360b..a1cc7554f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,6 +28,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Topic :: Multimedia :: Graphics", @@ -136,6 +137,9 @@ lint.isort.required-imports = [ "from __future__ import annotations", ] +[tool.pyproject-fmt] +max_supported_python = "3.13" + [tool.pytest.ini_options] addopts = "-ra --color=yes" testpaths = [ diff --git a/tox.ini b/tox.ini index d225a3106..912d7167c 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ requires = tox>=4.2 env_list = lint - py{py3, 312, 311, 310, 39, 38} + py{py3, 313, 312, 311, 310, 39, 38} [testenv] deps = From 4eec24a3805bd8dfe671505452985e0da08cdf8a Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 2 Jul 2024 21:52:43 +0300 Subject: [PATCH 117/662] Increment Python version check on Windows Co-Authored-By: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0abfaaddc..b26852b0b 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ WEBP_ROOT = None ZLIB_ROOT = None FUZZING_BUILD = "LIB_FUZZING_ENGINE" in os.environ -if sys.platform == "win32" and sys.version_info >= (3, 13): +if sys.platform == "win32" and sys.version_info >= (3, 14): import atexit atexit.register( From 40d3b2ce0c1527d374095df36589a90d72eed5ef Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 2 Jul 2024 21:53:23 +0300 Subject: [PATCH 118/662] Fix version range Co-Authored-By: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- docs/installation/newer-versions.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/newer-versions.csv b/docs/installation/newer-versions.csv index 7f4730df4..028a2018f 100644 --- a/docs/installation/newer-versions.csv +++ b/docs/installation/newer-versions.csv @@ -1,6 +1,6 @@ Python,3.13,3.12,3.11,3.10,3.9,3.8,3.7,3.6,3.5 Pillow >= 11,Yes,Yes,Yes,Yes,Yes,Yes,,, -Pillow >= 10.1,,Yes,Yes,Yes,Yes,Yes,,, +Pillow 10.1 - 10.4,,Yes,Yes,Yes,Yes,Yes,,, Pillow 10.0,,,Yes,Yes,Yes,Yes,,, Pillow 9.3 - 9.5,,,Yes,Yes,Yes,Yes,Yes,, Pillow 9.0 - 9.2,,,,Yes,Yes,Yes,Yes,, From 534d82119b60a8d16ecdf2c08d4198ae9e974de5 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Mon, 1 Jul 2024 18:53:48 +0300 Subject: [PATCH 119/662] Test NumPy on Python 3.13 Co-Authored-By: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- .ci/install.sh | 3 +-- .github/workflows/macos-install.sh | 4 +--- .github/workflows/wheels-test.sh | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.ci/install.sh b/.ci/install.sh index c6e166171..fc5ff0064 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -37,8 +37,7 @@ python3 -m pip install -U pytest-timeout python3 -m pip install pyroma if [[ $(uname) != CYGWIN* ]]; then - # TODO Update condition when NumPy supports 3.13 - if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then python3 -m pip install numpy ; fi + python3 -m pip install numpy # PyQt6 doesn't support PyPy3 if [[ $GHA_PYTHON_VERSION == 3.* ]]; then diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh index ae346e8b6..d35cfcd31 100755 --- a/.github/workflows/macos-install.sh +++ b/.github/workflows/macos-install.sh @@ -25,9 +25,7 @@ python3 -m pip install -U pytest python3 -m pip install -U pytest-cov python3 -m pip install -U pytest-timeout python3 -m pip install pyroma - -# TODO Update condition when NumPy supports 3.13 -if ! [[ "$GHA_PYTHON_VERSION" == "3.13" ]]; then python3 -m pip install numpy ; fi +python3 -m pip install numpy # extra test images pushd depends && ./install_extra_test_images.sh && popd diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh index a3376ac92..3fbf3be69 100755 --- a/.github/workflows/wheels-test.sh +++ b/.github/workflows/wheels-test.sh @@ -12,7 +12,7 @@ elif [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then else yum install -y fribidi fi -if [ "${AUDITWHEEL_POLICY::9}" != "musllinux" ] && !([[ "$OSTYPE" == "darwin"* ]] && [[ $(python3 --version) == *"3.13."* ]]); then +if [ "${AUDITWHEEL_POLICY::9}" != "musllinux" ]; then python3 -m pip install numpy fi From 51bd7d2ea8b8dbebabb200ca3c449c38b76e1d7f Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 3 Jul 2024 00:44:45 -0600 Subject: [PATCH 120/662] Drop support for Python 3.8 (#8183) Co-authored-by: Andrew Murray Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- .appveyor.yml | 6 +++--- .ci/install.sh | 1 - .github/workflows/test-cygwin.yml | 2 +- .github/workflows/test-docker.yml | 1 - .github/workflows/test-windows.yml | 2 +- .github/workflows/test.yml | 5 ----- .github/workflows/wheels.yml | 4 ---- Tests/helper.py | 3 ++- Tests/test_file_eps.py | 7 ++++--- Tests/test_file_gif.py | 2 +- Tests/test_file_pdf.py | 3 ++- Tests/test_file_tiff.py | 2 +- Tests/test_image_resample.py | 2 +- Tests/test_image_resize.py | 2 +- Tests/test_imagedraw.py | 2 +- Tests/test_imageops_usm.py | 2 +- Tests/test_imagepath.py | 2 +- docs/installation/basic-installation.rst | 4 ++-- docs/installation/newer-versions.csv | 2 +- docs/installation/platform-support.rst | 12 +++++------- docs/releasenotes/11.0.0.rst | 6 ++++++ pyproject.toml | 5 ++--- src/PIL/GifImagePlugin.py | 4 ++-- src/PIL/Image.py | 8 +++----- src/PIL/ImageDraw.py | 9 +++++---- src/PIL/ImageFilter.py | 3 ++- src/PIL/ImageOps.py | 3 ++- src/PIL/ImagePalette.py | 3 ++- src/PIL/ImageTransform.py | 3 ++- src/PIL/IptcImagePlugin.py | 2 +- src/PIL/Jpeg2KImagePlugin.py | 4 ++-- src/PIL/PdfParser.py | 4 ++-- src/PIL/SpiderImagePlugin.py | 4 ++-- src/PIL/_typing.py | 3 ++- tox.ini | 2 +- winbuild/README.md | 2 +- winbuild/build.rst | 2 +- 37 files changed, 66 insertions(+), 67 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6ce5200b6..e12987a5f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,9 +21,9 @@ environment: - PYTHON: C:/Python312 ARCHITECTURE: x86 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - - PYTHON: C:/Python38-x64 + - PYTHON: C:/Python39-x64 ARCHITECTURE: AMD64 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 install: @@ -38,7 +38,7 @@ install: - path c:\nasm-2.16.03;C:\Program Files\gs\gs10.03.1\bin;%PATH% - cd c:\pillow\winbuild\ - ps: | - c:\python38\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\ + c:\python39\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\ c:\pillow\winbuild\build\build_dep_all.cmd $host.SetShouldExit(0) - path C:\pillow\winbuild\build\bin;%PATH% diff --git a/.ci/install.sh b/.ci/install.sh index fc5ff0064..1eb098be9 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -48,7 +48,6 @@ if [[ $(uname) != CYGWIN* ]]; then # Pyroma uses non-isolated build and fails with old setuptools if [[ $GHA_PYTHON_VERSION == pypy3.9 - || $GHA_PYTHON_VERSION == 3.8 || $GHA_PYTHON_VERSION == 3.9 ]]; then # To match pyproject.toml diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml index 97422d569..8e2827099 100644 --- a/.github/workflows/test-cygwin.yml +++ b/.github/workflows/test-cygwin.yml @@ -35,7 +35,7 @@ jobs: strategy: fail-fast: false matrix: - python-minor-version: [8, 9] + python-minor-version: [9] timeout-minutes: 40 diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index d18ab9729..21e1275e7 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -49,7 +49,6 @@ jobs: fedora-39-amd64, fedora-40-amd64, gentoo, - ubuntu-20.04-focal-amd64, ubuntu-22.04-jammy-amd64, ubuntu-24.04-noble-amd64, ] diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index ee265774b..5b34d6703 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -35,7 +35,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["pypy3.10", "pypy3.9", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["pypy3.10", "pypy3.9", "3.9", "3.10", "3.11", "3.12", "3.13"] timeout-minutes: 30 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aa5646caf..0972459b0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,6 @@ jobs: "3.11", "3.10", "3.9", - "3.8", ] include: - python-version: "3.11" @@ -59,13 +58,9 @@ jobs: # M1 only available for 3.10+ - os: "macos-13" python-version: "3.9" - - os: "macos-13" - python-version: "3.8" exclude: - os: "macos-14" python-version: "3.9" - - os: "macos-14" - python-version: "3.8" runs-on: ${{ matrix.os }} name: ${{ matrix.os }} Python ${{ matrix.python-version }} diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 3d6099c1c..4eb907bcd 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -41,7 +41,6 @@ jobs: python-version: - pp39 - pp310 - - cp38 - cp39 - cp310 - cp311 @@ -136,8 +135,6 @@ jobs: CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }} CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }} CIBW_PRERELEASE_PYTHONS: True - CIBW_SKIP: pp38-* - CIBW_TEST_SKIP: cp38-macosx_arm64 MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }} - uses: actions/upload-artifact@v4 @@ -208,7 +205,6 @@ jobs: CIBW_BEFORE_ALL: "{package}\\winbuild\\build\\build_dep_all.cmd" CIBW_CACHE_PATH: "C:\\cibw" CIBW_PRERELEASE_PYTHONS: True - CIBW_SKIP: pp38-* CIBW_TEST_SKIP: "*-win_arm64" CIBW_TEST_COMMAND: 'docker run --rm -v {project}:C:\pillow diff --git a/Tests/helper.py b/Tests/helper.py index 605a214d4..7abc495b6 100644 --- a/Tests/helper.py +++ b/Tests/helper.py @@ -11,9 +11,10 @@ import subprocess import sys import sysconfig import tempfile +from collections.abc import Sequence from functools import lru_cache from io import BytesIO -from typing import Any, Callable, Sequence +from typing import Any, Callable import pytest from packaging.version import parse as parse_version diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py index 3181fc204..b54238132 100644 --- a/Tests/test_file_eps.py +++ b/Tests/test_file_eps.py @@ -385,9 +385,10 @@ def test_timeout(test_file: str) -> None: def test_bounding_box_in_trailer() -> None: # Check bounding boxes are parsed in the same way # when specified in the header and the trailer - with Image.open("Tests/images/zero_bb_trailer.eps") as trailer_image, Image.open( - FILE1 - ) as header_image: + with ( + Image.open("Tests/images/zero_bb_trailer.eps") as trailer_image, + Image.open(FILE1) as header_image, + ): assert trailer_image.size == header_image.size diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py index e19c88a47..79a2ec0ab 100644 --- a/Tests/test_file_gif.py +++ b/Tests/test_file_gif.py @@ -1,9 +1,9 @@ from __future__ import annotations import warnings +from collections.abc import Generator from io import BytesIO from pathlib import Path -from typing import Generator import pytest diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py index d39a86565..02f07a565 100644 --- a/Tests/test_file_pdf.py +++ b/Tests/test_file_pdf.py @@ -5,8 +5,9 @@ import os import os.path import tempfile import time +from collections.abc import Generator from pathlib import Path -from typing import Any, Generator +from typing import Any import pytest diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index c06d110a7..93a9f9e6a 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -2,10 +2,10 @@ from __future__ import annotations import os import warnings +from collections.abc import Generator from io import BytesIO from pathlib import Path from types import ModuleType -from typing import Generator import pytest diff --git a/Tests/test_image_resample.py b/Tests/test_image_resample.py index 58de812ef..92ba1553c 100644 --- a/Tests/test_image_resample.py +++ b/Tests/test_image_resample.py @@ -1,7 +1,7 @@ from __future__ import annotations +from collections.abc import Generator from contextlib import contextmanager -from typing import Generator import pytest diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py index 64098f80f..3ef05a25f 100644 --- a/Tests/test_image_resize.py +++ b/Tests/test_image_resize.py @@ -4,9 +4,9 @@ Tests for resize functionality. from __future__ import annotations +from collections.abc import Generator from itertools import permutations from pathlib import Path -from typing import Generator import pytest diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py index 1466ab1ba..1ff3fea2a 100644 --- a/Tests/test_imagedraw.py +++ b/Tests/test_imagedraw.py @@ -2,7 +2,7 @@ from __future__ import annotations import contextlib import os.path -from typing import Sequence +from collections.abc import Sequence import pytest diff --git a/Tests/test_imageops_usm.py b/Tests/test_imageops_usm.py index c8e2c0467..920012d86 100644 --- a/Tests/test_imageops_usm.py +++ b/Tests/test_imageops_usm.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Generator +from collections.abc import Generator import pytest diff --git a/Tests/test_imagepath.py b/Tests/test_imagepath.py index 9487560af..cda2584e7 100644 --- a/Tests/test_imagepath.py +++ b/Tests/test_imagepath.py @@ -3,7 +3,7 @@ from __future__ import annotations import array import math import struct -from typing import Sequence +from collections.abc import Sequence import pytest diff --git a/docs/installation/basic-installation.rst b/docs/installation/basic-installation.rst index 01981aa4f..989f72ddd 100644 --- a/docs/installation/basic-installation.rst +++ b/docs/installation/basic-installation.rst @@ -68,8 +68,8 @@ and :pypi:`olefile` for Pillow to read FPX and MIC images:: .. tab:: Windows We provide Pillow binaries for Windows compiled for the matrix of supported - Pythons in the wheel format. These include x86, x86-64 and arm64 versions - (with the exception of Python 3.8 on arm64). These binaries include support + Pythons in the wheel format. These include x86, x86-64 and arm64 versions. + These binaries include support for all optional libraries except libimagequant and libxcb. Raqm support requires FriBiDi to be installed separately:: diff --git a/docs/installation/newer-versions.csv b/docs/installation/newer-versions.csv index 028a2018f..19816af58 100644 --- a/docs/installation/newer-versions.csv +++ b/docs/installation/newer-versions.csv @@ -1,5 +1,5 @@ Python,3.13,3.12,3.11,3.10,3.9,3.8,3.7,3.6,3.5 -Pillow >= 11,Yes,Yes,Yes,Yes,Yes,Yes,,, +Pillow >= 11,Yes,Yes,Yes,Yes,Yes,,,, Pillow 10.1 - 10.4,,Yes,Yes,Yes,Yes,Yes,,, Pillow 10.0,,,Yes,Yes,Yes,Yes,,, Pillow 9.3 - 9.5,,,Yes,Yes,Yes,Yes,Yes,, diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index cde00c76d..1d449a036 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -35,14 +35,12 @@ These platforms are built and tested for every change. +----------------------------------+----------------------------+---------------------+ | Gentoo | 3.9 | x86-64 | +----------------------------------+----------------------------+---------------------+ -| macOS 13 Ventura | 3.8, 3.9 | x86-64 | +| macOS 13 Ventura | 3.9 | x86-64 | +----------------------------------+----------------------------+---------------------+ | macOS 14 Sonoma | 3.10, 3.11, 3.12, 3.13, | arm64 | | | PyPy3 | | +----------------------------------+----------------------------+---------------------+ -| Ubuntu Linux 20.04 LTS (Focal) | 3.8 | x86-64 | -+----------------------------------+----------------------------+---------------------+ -| Ubuntu Linux 22.04 LTS (Jammy) | 3.8, 3.9, 3.10, 3.11, | x86-64 | +| Ubuntu Linux 22.04 LTS (Jammy) | 3.9, 3.10, 3.11, | x86-64 | | | 3.12, 3.13, PyPy3 | | | +----------------------------+---------------------+ | | 3.10 | arm64v8 | @@ -50,16 +48,16 @@ These platforms are built and tested for every change. | Ubuntu Linux 24.04 LTS (Noble) | 3.12 | x86-64, ppc64le, | | | | s390x | +----------------------------------+----------------------------+---------------------+ -| Windows Server 2016 | 3.8 | x86-64 | +| Windows Server 2016 | 3.9 | x86-64 | +----------------------------------+----------------------------+---------------------+ -| Windows Server 2022 | 3.8, 3.9, 3.10, 3.11, | x86-64 | +| Windows Server 2022 | 3.9, 3.10, 3.11, | x86-64 | | | 3.12, 3.13, PyPy3 | | | +----------------------------+---------------------+ | | 3.12 | x86 | | +----------------------------+---------------------+ | | 3.9 (MinGW) | x86-64 | | +----------------------------+---------------------+ -| | 3.8, 3.9 (Cygwin) | x86-64 | +| | 3.9 (Cygwin) | x86-64 | +----------------------------------+----------------------------+---------------------+ diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index 0b18fe01a..964423ae0 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -17,6 +17,12 @@ TODO Backwards Incompatible Changes ============================== +Python 3.8 +^^^^^^^^^^ + +Pillow has dropped support for Python 3.8, +which reached end-of-life in October 2024. + PSFile ^^^^^^ diff --git a/pyproject.toml b/pyproject.toml index a1cc7554f..700d5e7fe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,12 +18,11 @@ license = { text = "HPND" } authors = [ { name = "Jeffrey A. Clark", email = "aclark@aclark.net" }, ] -requires-python = ">=3.8" +requires-python = ">=3.9" classifiers = [ "Development Status :: 6 - Mature", "License :: OSI Approved :: Historical Permission Notice and Disclaimer (HPND)", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", @@ -147,7 +146,7 @@ testpaths = [ ] [tool.mypy] -python_version = "3.8" +python_version = "3.9" pretty = true disallow_any_generics = true enable_error_code = "ignore-without-code" diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index 8018e25dc..bf74f9356 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -32,7 +32,7 @@ import subprocess import sys from enum import IntEnum from functools import cached_property -from typing import IO, TYPE_CHECKING, Any, List, Literal, NamedTuple, Union +from typing import IO, TYPE_CHECKING, Any, Literal, NamedTuple, Union from . import ( Image, @@ -504,7 +504,7 @@ def _normalize_mode(im: Image.Image) -> Image.Image: return im.convert("L") -_Palette = Union[bytes, bytearray, List[int], ImagePalette.ImagePalette] +_Palette = Union[bytes, bytearray, list[int], ImagePalette.ImagePalette] def _normalize_palette( diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 005b4cc9e..b4ef62510 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -38,7 +38,7 @@ import struct import sys import tempfile import warnings -from collections.abc import Callable, MutableMapping +from collections.abc import Callable, MutableMapping, Sequence from enum import IntEnum from types import ModuleType from typing import ( @@ -47,8 +47,6 @@ from typing import ( Any, Literal, Protocol, - Sequence, - Tuple, cast, ) @@ -1097,7 +1095,7 @@ class Image: if trns is not None: try: new_im.info["transparency"] = new_im.palette.getcolor( - cast(Tuple[int, ...], trns), # trns was converted to RGB + cast(tuple[int, ...], trns), # trns was converted to RGB new_im, ) except Exception: @@ -3075,7 +3073,7 @@ def new( and isinstance(color, (list, tuple)) and all(isinstance(i, int) for i in color) ): - color_ints: tuple[int, ...] = cast(Tuple[int, ...], tuple(color)) + color_ints: tuple[int, ...] = cast(tuple[int, ...], tuple(color)) if len(color_ints) == 3 or len(color_ints) == 4: # RGB or RGBA value for a P image from . import ImagePalette diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py index 244d3d5f0..2b3620e71 100644 --- a/src/PIL/ImageDraw.py +++ b/src/PIL/ImageDraw.py @@ -34,8 +34,9 @@ from __future__ import annotations import math import numbers import struct +from collections.abc import Sequence from types import ModuleType -from typing import TYPE_CHECKING, AnyStr, Callable, List, Sequence, Tuple, Union, cast +from typing import TYPE_CHECKING, AnyStr, Callable, Union, cast from . import Image, ImageColor from ._deprecate import deprecate @@ -51,7 +52,7 @@ except AttributeError: if TYPE_CHECKING: from . import ImageDraw2, ImageFont -_Ink = Union[float, Tuple[int, ...], str] +_Ink = Union[float, tuple[int, ...], str] """ A simple 2D drawing interface for PIL images. @@ -1124,7 +1125,7 @@ def _compute_regular_polygon_vertices( msg = "bounding_circle should only contain numeric data" raise ValueError(msg) - *centroid, polygon_radius = cast(List[float], list(bounding_circle)) + *centroid, polygon_radius = cast(list[float], list(bounding_circle)) elif len(bounding_circle) == 2 and isinstance(bounding_circle[0], (list, tuple)): if not all( isinstance(i, (int, float)) for i in bounding_circle[0] @@ -1136,7 +1137,7 @@ def _compute_regular_polygon_vertices( msg = "bounding_circle centre should contain 2D coordinates (e.g. (x, y))" raise ValueError(msg) - centroid = cast(List[float], list(bounding_circle[0])) + centroid = cast(list[float], list(bounding_circle[0])) polygon_radius = cast(float, bounding_circle[1]) else: msg = ( diff --git a/src/PIL/ImageFilter.py b/src/PIL/ImageFilter.py index e18b4a446..8b0974b2c 100644 --- a/src/PIL/ImageFilter.py +++ b/src/PIL/ImageFilter.py @@ -18,8 +18,9 @@ from __future__ import annotations import abc import functools +from collections.abc import Sequence from types import ModuleType -from typing import TYPE_CHECKING, Any, Callable, Sequence, cast +from typing import TYPE_CHECKING, Any, Callable, cast if TYPE_CHECKING: from . import _imaging diff --git a/src/PIL/ImageOps.py b/src/PIL/ImageOps.py index d47b86a75..44aad0c3c 100644 --- a/src/PIL/ImageOps.py +++ b/src/PIL/ImageOps.py @@ -21,7 +21,8 @@ from __future__ import annotations import functools import operator import re -from typing import Protocol, Sequence, cast +from collections.abc import Sequence +from typing import Protocol, cast from . import ExifTags, Image, ImagePalette diff --git a/src/PIL/ImagePalette.py b/src/PIL/ImagePalette.py index ed38285dc..8ccecbd07 100644 --- a/src/PIL/ImagePalette.py +++ b/src/PIL/ImagePalette.py @@ -18,7 +18,8 @@ from __future__ import annotations import array -from typing import IO, TYPE_CHECKING, Sequence +from collections.abc import Sequence +from typing import IO, TYPE_CHECKING from . import GimpGradientFile, GimpPaletteFile, ImageColor, PaletteFile diff --git a/src/PIL/ImageTransform.py b/src/PIL/ImageTransform.py index ffd791674..a3d8f441a 100644 --- a/src/PIL/ImageTransform.py +++ b/src/PIL/ImageTransform.py @@ -14,7 +14,8 @@ # from __future__ import annotations -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any from . import Image diff --git a/src/PIL/IptcImagePlugin.py b/src/PIL/IptcImagePlugin.py index 73df83bfb..f9d5b75f0 100644 --- a/src/PIL/IptcImagePlugin.py +++ b/src/PIL/IptcImagePlugin.py @@ -16,8 +16,8 @@ # from __future__ import annotations +from collections.abc import Sequence from io import BytesIO -from typing import Sequence from . import Image, ImageFile from ._binary import i16be as i16 diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py index e50cd7799..c8a57567a 100644 --- a/src/PIL/Jpeg2KImagePlugin.py +++ b/src/PIL/Jpeg2KImagePlugin.py @@ -18,7 +18,7 @@ from __future__ import annotations import io import os import struct -from typing import IO, Tuple, cast +from typing import IO, cast from . import Image, ImageFile, ImagePalette, _binary @@ -82,7 +82,7 @@ class BoxReader: self.remaining_in_box = -1 # Read the length and type of the next box - lbox, tbox = cast(Tuple[int, bytes], self.read_fields(">I4s")) + lbox, tbox = cast(tuple[int, bytes], self.read_fields(">I4s")) if lbox == 1: lbox = cast(int, self.read_fields(">Q")[0]) hlen = 16 diff --git a/src/PIL/PdfParser.py b/src/PIL/PdfParser.py index 9e2231347..622dc7de9 100644 --- a/src/PIL/PdfParser.py +++ b/src/PIL/PdfParser.py @@ -8,7 +8,7 @@ import os import re import time import zlib -from typing import TYPE_CHECKING, Any, List, NamedTuple, Union +from typing import TYPE_CHECKING, Any, NamedTuple, Union # see 7.9.2.2 Text String Type on page 86 and D.3 PDFDocEncoding Character Set @@ -240,7 +240,7 @@ class PdfName: return bytes(result) -class PdfArray(List[Any]): +class PdfArray(list[Any]): def __bytes__(self) -> bytes: return b"[ " + b" ".join(pdf_repr(x) for x in self) + b" ]" diff --git a/src/PIL/SpiderImagePlugin.py b/src/PIL/SpiderImagePlugin.py index f5a09c3ef..a07101e54 100644 --- a/src/PIL/SpiderImagePlugin.py +++ b/src/PIL/SpiderImagePlugin.py @@ -37,7 +37,7 @@ from __future__ import annotations import os import struct import sys -from typing import IO, TYPE_CHECKING, Any, Tuple, cast +from typing import IO, TYPE_CHECKING, Any, cast from . import Image, ImageFile @@ -187,7 +187,7 @@ class SpiderImageFile(ImageFile.ImageFile): def convert2byte(self, depth: int = 255) -> Image.Image: extrema = self.getextrema() assert isinstance(extrema[0], float) - minimum, maximum = cast(Tuple[float, float], extrema) + minimum, maximum = cast(tuple[float, float], extrema) m: float = 1 if maximum != minimum: m = depth / (maximum - minimum) diff --git a/src/PIL/_typing.py b/src/PIL/_typing.py index db1e80e2f..b6bb8d89a 100644 --- a/src/PIL/_typing.py +++ b/src/PIL/_typing.py @@ -2,7 +2,8 @@ from __future__ import annotations import os import sys -from typing import TYPE_CHECKING, Any, Protocol, Sequence, TypeVar, Union +from collections.abc import Sequence +from typing import TYPE_CHECKING, Any, Protocol, TypeVar, Union if TYPE_CHECKING: try: diff --git a/tox.ini b/tox.ini index 912d7167c..189415237 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ requires = tox>=4.2 env_list = lint - py{py3, 313, 312, 311, 310, 39, 38} + py{py3, 313, 312, 311, 310, 39} [testenv] deps = diff --git a/winbuild/README.md b/winbuild/README.md index 7e81abcb0..c8048bcc9 100644 --- a/winbuild/README.md +++ b/winbuild/README.md @@ -16,7 +16,7 @@ For more extensive info, see the [Windows build instructions](build.rst). The following is a simplified version of the script used on AppVeyor: ``` -set PYTHON=C:\Python38\bin +set PYTHON=C:\Python39\bin cd /D C:\Pillow\winbuild %PYTHON%\python.exe build_prepare.py -v --depends=C:\pillow-depends build\build_dep_all.cmd diff --git a/winbuild/build.rst b/winbuild/build.rst index d0be2943e..96b8803b4 100644 --- a/winbuild/build.rst +++ b/winbuild/build.rst @@ -114,7 +114,7 @@ Example The following is a simplified version of the script used on AppVeyor:: - set PYTHON=C:\Python38\bin + set PYTHON=C:\Python39\bin cd /D C:\Pillow\winbuild %PYTHON%\python.exe build_prepare.py -v --depends C:\pillow-depends build\build_dep_all.cmd From a34ac045c3cf191a55e52797263beb352c8edb2c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 3 Jul 2024 21:05:48 +1000 Subject: [PATCH 121/662] Conditionally define type hint to avoid requiring core --- src/PIL/ImageCms.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PIL/ImageCms.py b/src/PIL/ImageCms.py index ec10230f1..ce5b6101b 100644 --- a/src/PIL/ImageCms.py +++ b/src/PIL/ImageCms.py @@ -31,6 +31,10 @@ from ._typing import SupportsRead try: from . import _imagingcms as core + + _CmsProfileCompatible = Union[ + str, SupportsRead[bytes], core.CmsProfile, "ImageCmsProfile" + ] except ImportError as ex: # Allow error import for doc purposes, but error out when accessing # anything in core. @@ -391,10 +395,6 @@ def get_display_profile(handle: SupportsInt | None = None) -> ImageCmsProfile | # pyCMS compatible layer # --------------------------------------------------------------------. -_CmsProfileCompatible = Union[ - str, SupportsRead[bytes], core.CmsProfile, ImageCmsProfile -] - class PyCMSError(Exception): """(pyCMS) Exception class. From 776dd63f33741f02c3f9cae50fdeaf1a82d7c7d2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 4 Jul 2024 11:20:00 +1000 Subject: [PATCH 122/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index d071f3214..856458aa9 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,21 @@ Changelog (Pillow) ================== +11.0.0 (unreleased) +------------------- + +- Drop support for Python 3.8 #8183 + [hugovk, radarhere] + +- Add support for Python 3.13 #8181 + [hugovk, radarhere] + +- Fix incompatibility with NumPy 1.20 #8187 + [neutrinoceros, radarhere] + +- Remove PSFile, PyAccess and USE_CFFI_ACCESS #8182 + [hugovk, radarhere] + 10.4.0 (2024-07-01) ------------------- From 936012e861ae1458ca01b7bb3bf2f5cade7405e2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 4 Jul 2024 15:13:03 +1000 Subject: [PATCH 123/662] Allow size argument to resize() to be a list --- Tests/test_image_resize.py | 6 +++--- src/PIL/Image.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py index 3ef05a25f..c9e304512 100644 --- a/Tests/test_image_resize.py +++ b/Tests/test_image_resize.py @@ -285,14 +285,14 @@ class TestReducingGapResize: class TestImageResize: def test_resize(self) -> None: - def resize(mode: str, size: tuple[int, int]) -> None: + def resize(mode: str, size: tuple[int, int] | list[int]) -> None: out = hopper(mode).resize(size) assert out.mode == mode - assert out.size == size + assert out.size == tuple(size) for mode in "1", "P", "L", "RGB", "I", "F": resize(mode, (112, 103)) - resize(mode, (188, 214)) + resize(mode, [188, 214]) # Test unknown resampling filter with hopper() as im: diff --git a/src/PIL/Image.py b/src/PIL/Image.py index b4ef62510..3c7a3735c 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -2203,7 +2203,7 @@ class Image: def resize( self, - size: tuple[int, int], + size: tuple[int, int] | list[int], resample: int | None = None, box: tuple[float, float, float, float] | None = None, reducing_gap: float | None = None, @@ -2276,6 +2276,7 @@ class Image: if box is None: box = (0, 0) + self.size + size = tuple(size) if self.size == size and box == (0, 0) + self.size: return self.copy() From 6990fc4a0996753c5faa6cc272b753cac23cffdf Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 4 Jul 2024 15:25:35 +1000 Subject: [PATCH 124/662] Allow size argument to resize() to be a NumPy array --- Tests/test_numpy.py | 9 +++++++++ src/PIL/Image.py | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py index a082e5a4d..312e32e0c 100644 --- a/Tests/test_numpy.py +++ b/Tests/test_numpy.py @@ -198,6 +198,15 @@ def test_putdata() -> None: assert len(im.getdata()) == len(arr) +def test_resize() -> None: + im = hopper() + size = (64, 64) + + im_resized = im.resize(numpy.array(size)) + + assert im_resized.size == size + + @pytest.mark.parametrize( "dtype", ( diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 3c7a3735c..8e595eedf 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -63,7 +63,6 @@ from . import ( ) from ._binary import i32le, o32be, o32le from ._deprecate import deprecate -from ._typing import StrOrBytesPath, TypeGuard from ._util import DeferredError, is_path ElementTree: ModuleType | None @@ -220,6 +219,7 @@ if hasattr(core, "DEFAULT_STRATEGY"): if TYPE_CHECKING: from . import ImageFile, ImagePalette + from ._typing import NumpyArray, StrOrBytesPath, TypeGuard ID: list[str] = [] OPEN: dict[ str, @@ -2203,7 +2203,7 @@ class Image: def resize( self, - size: tuple[int, int] | list[int], + size: tuple[int, int] | list[int] | NumpyArray, resample: int | None = None, box: tuple[float, float, float, float] | None = None, reducing_gap: float | None = None, @@ -2211,7 +2211,7 @@ class Image: """ Returns a resized copy of this image. - :param size: The requested size in pixels, as a 2-tuple: + :param size: The requested size in pixels, as a tuple or array: (width, height). :param resample: An optional resampling filter. This can be one of :py:data:`Resampling.NEAREST`, :py:data:`Resampling.BOX`, From d4f1d252efa5e2ca54b2d43eaa92880cdf4ad8dc Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Thu, 4 Jul 2024 15:45:58 +0300 Subject: [PATCH 125/662] Test 3.13 free-threaded build on CI --- .ci/install.sh | 6 ++++-- .github/workflows/test.yml | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.ci/install.sh b/.ci/install.sh index 1eb098be9..0dc738ed8 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -37,12 +37,14 @@ python3 -m pip install -U pytest-timeout python3 -m pip install pyroma if [[ $(uname) != CYGWIN* ]]; then - python3 -m pip install numpy + # TODO Update condition when NumPy supports free-threading + if ! [[ "$GHA_PYTHON_VERSION" == "3.13-dev" ]]; then python3 -m pip install numpy ; fi # PyQt6 doesn't support PyPy3 if [[ $GHA_PYTHON_VERSION == 3.* ]]; then sudo apt-get -qq install libegl1 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxkbcommon-x11-0 - python3 -m pip install pyqt6 + # TODO Update condition when pyqt6 supports free-threading + if ! [[ "$GHA_PYTHON_VERSION" == "3.13-dev" ]]; then python3 -m pip install pyqt6 ; fi fi # Pyroma uses non-isolated build and fails with old setuptools diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0972459b0..75165909c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,6 +55,8 @@ jobs: REVERSE: "--reverse" - python-version: "3.10" PYTHONOPTIMIZE: 2 + # Free-threaded + - { os: "ubuntu-latest", python-version: "3.13-dev", disable-gil: true } # M1 only available for 3.10+ - os: "macos-13" python-version: "3.9" @@ -70,6 +72,7 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 + if: "!endsWith(matrix.python-version, '-dev')" with: python-version: ${{ matrix.python-version }} allow-prereleases: true @@ -78,6 +81,13 @@ jobs: ".ci/*.sh" "pyproject.toml" + - name: Set up Python ${{ matrix.python-version }} (free-threaded) + uses: deadsnakes/action@v3.1.0 + if: endsWith(matrix.python-version, '-dev') + with: + python-version: ${{ matrix.python-version }} + nogil: ${{ matrix.disable-gil }} + - name: Build system information run: python3 .github/workflows/system-info.py From e76c31b67db5e1cdfe28b593862bbe2d83a81e23 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Thu, 4 Jul 2024 15:46:46 +0300 Subject: [PATCH 126/662] Refactor to single line for readability --- .github/workflows/test.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 75165909c..d858dcfff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,19 +50,14 @@ jobs: "3.9", ] include: - - python-version: "3.11" - PYTHONOPTIMIZE: 1 - REVERSE: "--reverse" - - python-version: "3.10" - PYTHONOPTIMIZE: 2 + - { python-version: "3.11", PYTHONOPTIMIZE: 1, REVERSE: "--reverse" } + - { python-version: "3.10", PYTHONOPTIMIZE: 2 } # Free-threaded - { os: "ubuntu-latest", python-version: "3.13-dev", disable-gil: true } # M1 only available for 3.10+ - - os: "macos-13" - python-version: "3.9" + - { os: "macos-13", python-version: "3.9" } exclude: - - os: "macos-14" - python-version: "3.9" + - { os: "macos-14", python-version: "3.9" } runs-on: ${{ matrix.os }} name: ${{ matrix.os }} Python ${{ matrix.python-version }} From 701539d017356d8624fba6a6efc97b8e2ebf75e2 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 5 Jul 2024 00:38:50 +0300 Subject: [PATCH 127/662] Add PYTHON_GIL=0 env var to keep GIL disabled --- .github/workflows/test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d858dcfff..fc8be6ced 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -83,6 +83,11 @@ jobs: python-version: ${{ matrix.python-version }} nogil: ${{ matrix.disable-gil }} + - name: Set PYTHON_GIL + if: "${{ matrix.disable-gil }}" + run: | + echo "PYTHON_GIL=0" >> $GITHUB_ENV + - name: Build system information run: python3 .github/workflows/system-info.py From 2d2889e6178ab619bae30952f4d477ac66352dea Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 5 Jul 2024 00:49:27 +0300 Subject: [PATCH 128/662] Install nightly NumPy for free-threaded --- .ci/install.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.ci/install.sh b/.ci/install.sh index 0dc738ed8..e1274f41c 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -38,7 +38,11 @@ python3 -m pip install pyroma if [[ $(uname) != CYGWIN* ]]; then # TODO Update condition when NumPy supports free-threading - if ! [[ "$GHA_PYTHON_VERSION" == "3.13-dev" ]]; then python3 -m pip install numpy ; fi + if [[ "$GHA_PYTHON_VERSION" == "3.13-dev" ]]; then + python3 -m pip install numpy --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple + else + python3 -m pip install numpy + fi # PyQt6 doesn't support PyPy3 if [[ $GHA_PYTHON_VERSION == 3.* ]]; then From 7e1a6be76789a59760c5f3d87bdab7e736918b88 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Fri, 5 Jul 2024 20:05:59 +1000 Subject: [PATCH 129/662] Updated macOS tested Pillow versions (#8202) Co-authored-by: Andrew Murray --- docs/installation/platform-support.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index 1d449a036..f2ef9cacb 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -75,7 +75,7 @@ These platforms have been reported to work at the versions mentioned. | Operating system | | Tested Python | | Latest tested | | Tested | | | | versions | | Pillow version | | processors | +==================================+============================+==================+==============+ -| macOS 14 Sonoma | 3.8, 3.9, 3.10, 3.11, 3.12 | 10.3.0 |arm | +| macOS 14 Sonoma | 3.8, 3.9, 3.10, 3.11, 3.12 | 10.4.0 |arm | +----------------------------------+----------------------------+------------------+--------------+ | macOS 13 Ventura | 3.8, 3.9, 3.10, 3.11 | 10.0.1 |arm | | +----------------------------+------------------+ | From bcecaf6addc5bd7102987ec01939b35f73ce2da4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 6 Jul 2024 02:08:37 +1000 Subject: [PATCH 130/662] Group aarch64 jobs --- .github/workflows/wheels.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 4eb907bcd..f8dff3a3e 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -41,11 +41,8 @@ jobs: python-version: - pp39 - pp310 - - cp39 - - cp310 - - cp311 - - cp312 - - cp313 + - cp3{9,10,11} + - cp3{12,13} spec: - manylinux2014 - manylinux_2_28 From dcd833280538d8cd00b3c2a4617b534efdfa4ff0 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 5 Jul 2024 19:36:58 +0300 Subject: [PATCH 131/662] Include 'free-threading' in job name --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fc8be6ced..702841814 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -60,7 +60,7 @@ jobs: - { os: "macos-14", python-version: "3.9" } runs-on: ${{ matrix.os }} - name: ${{ matrix.os }} Python ${{ matrix.python-version }} + name: ${{ matrix.os }} Python ${{ matrix.python-version }} ${{ matrix.disable-gil && 'free-threaded' || '' }} steps: - uses: actions/checkout@v4 From f3c3e527973bd5a579f15b3d7ed6ee8f51dfd3e4 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Sat, 6 Jul 2024 03:55:23 +1000 Subject: [PATCH 132/662] Added type hints (#8204) Co-authored-by: Andrew Murray --- Tests/test_imageshow.py | 7 +++-- src/PIL/EpsImagePlugin.py | 6 ++-- src/PIL/FliImagePlugin.py | 11 ++++---- src/PIL/FpxImagePlugin.py | 2 +- src/PIL/GbrImagePlugin.py | 2 +- src/PIL/IcnsImagePlugin.py | 54 ++++++++++++++++++++++-------------- src/PIL/IcoImagePlugin.py | 11 ++++---- src/PIL/Image.py | 4 +-- src/PIL/ImageShow.py | 9 ++---- src/PIL/IptcImagePlugin.py | 3 +- src/PIL/Jpeg2KImagePlugin.py | 2 +- src/PIL/TiffImagePlugin.py | 2 +- src/PIL/WalImageFile.py | 2 +- src/PIL/WebPImagePlugin.py | 2 +- 14 files changed, 67 insertions(+), 50 deletions(-) diff --git a/Tests/test_imageshow.py b/Tests/test_imageshow.py index 0bff43896..a4f7e5cc5 100644 --- a/Tests/test_imageshow.py +++ b/Tests/test_imageshow.py @@ -16,8 +16,11 @@ def test_sanity() -> None: def test_register() -> None: - # Test registering a viewer that is not a class - ImageShow.register("not a class") + # Test registering a viewer that is an instance + class TestViewer(ImageShow.Viewer): + pass + + ImageShow.register(TestViewer()) # Restore original state ImageShow._viewers.pop() diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index 71e869045..59bb8594d 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -338,7 +338,7 @@ class EpsImageFile(ImageFile.ImageFile): msg = "cannot determine EPS bounding box" raise OSError(msg) - def _find_offset(self, fp): + def _find_offset(self, fp: IO[bytes]) -> tuple[int, int]: s = fp.read(4) if s == b"%!PS": @@ -361,7 +361,9 @@ class EpsImageFile(ImageFile.ImageFile): return length, offset - def load(self, scale=1, transparency=False): + def load( + self, scale: int = 1, transparency: bool = False + ) -> Image.core.PixelAccess | None: # Load EPS via Ghostscript if self.tile: self.im = Ghostscript(self.tile, self.size, self.fp, scale, transparency) diff --git a/src/PIL/FliImagePlugin.py b/src/PIL/FliImagePlugin.py index dceb83927..52d1fce31 100644 --- a/src/PIL/FliImagePlugin.py +++ b/src/PIL/FliImagePlugin.py @@ -45,7 +45,7 @@ class FliImageFile(ImageFile.ImageFile): format_description = "Autodesk FLI/FLC Animation" _close_exclusive_fp_after_loading = False - def _open(self): + def _open(self) -> None: # HEAD s = self.fp.read(128) if not (_accept(s) and s[20:22] == b"\x00\x00"): @@ -83,7 +83,7 @@ class FliImageFile(ImageFile.ImageFile): if i16(s, 4) == 0xF1FA: # look for palette chunk number_of_subchunks = i16(s, 6) - chunk_size = None + chunk_size: int | None = None for _ in range(number_of_subchunks): if chunk_size is not None: self.fp.seek(chunk_size - 6, os.SEEK_CUR) @@ -96,8 +96,9 @@ class FliImageFile(ImageFile.ImageFile): if not chunk_size: break - palette = [o8(r) + o8(g) + o8(b) for (r, g, b) in palette] - self.palette = ImagePalette.raw("RGB", b"".join(palette)) + self.palette = ImagePalette.raw( + "RGB", b"".join(o8(r) + o8(g) + o8(b) for (r, g, b) in palette) + ) # set things up to decode first frame self.__frame = -1 @@ -105,7 +106,7 @@ class FliImageFile(ImageFile.ImageFile): self.__rewind = self.fp.tell() self.seek(0) - def _palette(self, palette, shift): + def _palette(self, palette: list[tuple[int, int, int]], shift: int) -> None: # load palette i = 0 diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py index 93eef48d2..386e37233 100644 --- a/src/PIL/FpxImagePlugin.py +++ b/src/PIL/FpxImagePlugin.py @@ -231,7 +231,7 @@ class FpxImageFile(ImageFile.ImageFile): self._fp = self.fp self.fp = None - def load(self): + def load(self) -> Image.core.PixelAccess | None: if not self.fp: self.fp = self.ole.openstream(self.stream[:2] + ["Subimage 0000 Data"]) diff --git a/src/PIL/GbrImagePlugin.py b/src/PIL/GbrImagePlugin.py index 93e89b1e6..3c8feea5f 100644 --- a/src/PIL/GbrImagePlugin.py +++ b/src/PIL/GbrImagePlugin.py @@ -88,7 +88,7 @@ class GbrImageFile(ImageFile.ImageFile): # Data is an uncompressed block of w * h * bytes/pixel self._data_size = width * height * color_depth - def load(self): + def load(self) -> Image.core.PixelAccess | None: if not self.im: self.im = Image.core.new(self.mode, self.size) self.frombytes(self.fp.read(self._data_size)) diff --git a/src/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py index 2a89d498c..8729f7643 100644 --- a/src/PIL/IcnsImagePlugin.py +++ b/src/PIL/IcnsImagePlugin.py @@ -34,11 +34,13 @@ MAGIC = b"icns" HEADERSIZE = 8 -def nextheader(fobj): +def nextheader(fobj: IO[bytes]) -> tuple[bytes, int]: return struct.unpack(">4sI", fobj.read(HEADERSIZE)) -def read_32t(fobj, start_length, size): +def read_32t( + fobj: IO[bytes], start_length: tuple[int, int], size: tuple[int, int, int] +) -> dict[str, Image.Image]: # The 128x128 icon seems to have an extra header for some reason. (start, length) = start_length fobj.seek(start) @@ -49,7 +51,9 @@ def read_32t(fobj, start_length, size): return read_32(fobj, (start + 4, length - 4), size) -def read_32(fobj, start_length, size): +def read_32( + fobj: IO[bytes], start_length: tuple[int, int], size: tuple[int, int, int] +) -> dict[str, Image.Image]: """ Read a 32bit RGB icon resource. Seems to be either uncompressed or an RLE packbits-like scheme. @@ -72,14 +76,14 @@ def read_32(fobj, start_length, size): byte = fobj.read(1) if not byte: break - byte = byte[0] - if byte & 0x80: - blocksize = byte - 125 + byte_int = byte[0] + if byte_int & 0x80: + blocksize = byte_int - 125 byte = fobj.read(1) for i in range(blocksize): data.append(byte) else: - blocksize = byte + 1 + blocksize = byte_int + 1 data.append(fobj.read(blocksize)) bytesleft -= blocksize if bytesleft <= 0: @@ -92,7 +96,9 @@ def read_32(fobj, start_length, size): return {"RGB": im} -def read_mk(fobj, start_length, size): +def read_mk( + fobj: IO[bytes], start_length: tuple[int, int], size: tuple[int, int, int] +) -> dict[str, Image.Image]: # Alpha masks seem to be uncompressed start = start_length[0] fobj.seek(start) @@ -102,10 +108,14 @@ def read_mk(fobj, start_length, size): return {"A": band} -def read_png_or_jpeg2000(fobj, start_length, size): +def read_png_or_jpeg2000( + fobj: IO[bytes], start_length: tuple[int, int], size: tuple[int, int, int] +) -> dict[str, Image.Image]: (start, length) = start_length fobj.seek(start) sig = fobj.read(12) + + im: Image.Image if sig[:8] == b"\x89PNG\x0d\x0a\x1a\x0a": fobj.seek(start) im = PngImagePlugin.PngImageFile(fobj) @@ -164,12 +174,12 @@ class IcnsFile: ], } - def __init__(self, fobj): + def __init__(self, fobj: IO[bytes]) -> None: """ fobj is a file-like object as an icns resource """ # signature : (start, length) - self.dct = dct = {} + self.dct = {} self.fobj = fobj sig, filesize = nextheader(fobj) if not _accept(sig): @@ -183,11 +193,11 @@ class IcnsFile: raise SyntaxError(msg) i += HEADERSIZE blocksize -= HEADERSIZE - dct[sig] = (i, blocksize) + self.dct[sig] = (i, blocksize) fobj.seek(blocksize, io.SEEK_CUR) i += blocksize - def itersizes(self): + def itersizes(self) -> list[tuple[int, int, int]]: sizes = [] for size, fmts in self.SIZES.items(): for fmt, reader in fmts: @@ -196,14 +206,14 @@ class IcnsFile: break return sizes - def bestsize(self): + def bestsize(self) -> tuple[int, int, int]: sizes = self.itersizes() if not sizes: msg = "No 32bit icon resources found" raise SyntaxError(msg) return max(sizes) - def dataforsize(self, size): + def dataforsize(self, size: tuple[int, int, int]) -> dict[str, Image.Image]: """ Get an icon resource as {channel: array}. Note that the arrays are bottom-up like windows bitmaps and will likely @@ -216,18 +226,20 @@ class IcnsFile: dct.update(reader(self.fobj, desc, size)) return dct - def getimage(self, size=None): + def getimage( + self, size: tuple[int, int] | tuple[int, int, int] | None = None + ) -> Image.Image: if size is None: size = self.bestsize() - if len(size) == 2: + elif len(size) == 2: size = (size[0], size[1], 1) channels = self.dataforsize(size) - im = channels.get("RGBA", None) + im = channels.get("RGBA") if im: return im - im = channels.get("RGB").copy() + im = channels["RGB"].copy() try: im.putalpha(channels["A"]) except KeyError: @@ -268,7 +280,7 @@ class IcnsImageFile(ImageFile.ImageFile): return self._size @size.setter - def size(self, value): + def size(self, value) -> None: info_size = value if info_size not in self.info["sizes"] and len(info_size) == 2: info_size = (info_size[0], info_size[1], 1) @@ -287,7 +299,7 @@ class IcnsImageFile(ImageFile.ImageFile): raise ValueError(msg) self._size = value - def load(self): + def load(self) -> Image.core.PixelAccess | None: if len(self.size) == 3: self.best_size = self.size self.size = ( diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py index 086c87b1a..650f5e4f1 100644 --- a/src/PIL/IcoImagePlugin.py +++ b/src/PIL/IcoImagePlugin.py @@ -120,7 +120,7 @@ def _accept(prefix: bytes) -> bool: class IcoFile: - def __init__(self, buf): + def __init__(self, buf) -> None: """ Parse image from file-like object containing ico file data """ @@ -177,19 +177,19 @@ class IcoFile: # ICO images are usually squares self.entry = sorted(self.entry, key=lambda x: x["square"], reverse=True) - def sizes(self): + def sizes(self) -> set[tuple[int, int]]: """ Get a list of all available icon sizes and color depths. """ return {(h["width"], h["height"]) for h in self.entry} - def getentryindex(self, size, bpp=False): + def getentryindex(self, size: tuple[int, int], bpp: int | bool = False) -> int: for i, h in enumerate(self.entry): if size == h["dim"] and (bpp is False or bpp == h["color_depth"]): return i return 0 - def getimage(self, size, bpp=False): + def getimage(self, size: tuple[int, int], bpp: int | bool = False) -> Image.Image: """ Get an image from the icon """ @@ -321,7 +321,7 @@ class IcoImageFile(ImageFile.ImageFile): raise ValueError(msg) self._size = value - def load(self): + def load(self) -> Image.core.PixelAccess | None: if self.im is not None and self.im.size == self.size: # Already loaded return Image.Image.load(self) @@ -341,6 +341,7 @@ class IcoImageFile(ImageFile.ImageFile): self.info["sizes"] = set(sizes) self.size = im.size + return None def load_seek(self, pos: int) -> None: # Flag the ImageFile.Parser so that it diff --git a/src/PIL/Image.py b/src/PIL/Image.py index b4ef62510..c9bb008b0 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1395,7 +1395,7 @@ class Image: def getcolors( self, maxcolors: int = 256 - ) -> list[tuple[int, int]] | list[tuple[int, float]] | None: + ) -> list[tuple[int, tuple[int, ...]]] | list[tuple[int, float]] | None: """ Returns a list of colors used in this image. @@ -1412,7 +1412,7 @@ class Image: self.load() if self.mode in ("1", "L", "P"): h = self.im.histogram() - out = [(h[i], i) for i in range(256) if h[i]] + out: list[tuple[int, float]] = [(h[i], i) for i in range(256) if h[i]] if len(out) > maxcolors: return None return out diff --git a/src/PIL/ImageShow.py b/src/PIL/ImageShow.py index 037d6f492..d62893d9c 100644 --- a/src/PIL/ImageShow.py +++ b/src/PIL/ImageShow.py @@ -26,7 +26,7 @@ from . import Image _viewers = [] -def register(viewer, order: int = 1) -> None: +def register(viewer: type[Viewer] | Viewer, order: int = 1) -> None: """ The :py:func:`register` function is used to register additional viewers:: @@ -40,11 +40,8 @@ def register(viewer, order: int = 1) -> None: Zero or a negative integer to prepend this viewer to the list, a positive integer to append it. """ - try: - if issubclass(viewer, Viewer): - viewer = viewer() - except TypeError: - pass # raised if viewer wasn't a class + if isinstance(viewer, type) and issubclass(viewer, Viewer): + viewer = viewer() if order > 0: _viewers.append(viewer) else: diff --git a/src/PIL/IptcImagePlugin.py b/src/PIL/IptcImagePlugin.py index f9d5b75f0..a04616fbd 100644 --- a/src/PIL/IptcImagePlugin.py +++ b/src/PIL/IptcImagePlugin.py @@ -148,7 +148,7 @@ class IptcImageFile(ImageFile.ImageFile): if tag == (8, 10): self.tile = [("iptc", (0, 0) + self.size, offset, compression)] - def load(self): + def load(self) -> Image.core.PixelAccess | None: if len(self.tile) != 1 or self.tile[0][0] != "iptc": return ImageFile.ImageFile.load(self) @@ -176,6 +176,7 @@ class IptcImageFile(ImageFile.ImageFile): with Image.open(o) as _im: _im.load() self.im = _im.im + return None Image.register_open(IptcImageFile.format, IptcImageFile) diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py index c8a57567a..992b9ccaf 100644 --- a/src/PIL/Jpeg2KImagePlugin.py +++ b/src/PIL/Jpeg2KImagePlugin.py @@ -299,7 +299,7 @@ class Jpeg2KImageFile(ImageFile.ImageFile): def reduce(self, value): self._reduce = value - def load(self): + def load(self) -> Image.core.PixelAccess | None: if self.tile and self._reduce: power = 1 << self._reduce adjust = power >> 1 diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index ac5b63c1b..b89144803 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1232,7 +1232,7 @@ class TiffImageFile(ImageFile.ImageFile): val = val[math.ceil((10 + n + size) / 2) * 2 :] return blocks - def load(self): + def load(self) -> Image.core.PixelAccess | None: if self.tile and self.use_load_libtiff: return self._load_libtiff() return super().load() diff --git a/src/PIL/WalImageFile.py b/src/PIL/WalImageFile.py index fbd7be6ed..895d5616a 100644 --- a/src/PIL/WalImageFile.py +++ b/src/PIL/WalImageFile.py @@ -50,7 +50,7 @@ class WalImageFile(ImageFile.ImageFile): if next_name: self.info["next_name"] = next_name - def load(self): + def load(self) -> Image.core.PixelAccess | None: if not self.im: self.im = Image.core.new(self.mode, self.size) self.frombytes(self.fp.read(self.size[0] * self.size[1])) diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index 59be5bf9d..530b88c8b 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -144,7 +144,7 @@ class WebPImageFile(ImageFile.ImageFile): while self.__physical_frame < frame: self._get_next() # Advance to the requested frame - def load(self): + def load(self) -> Image.core.PixelAccess | None: if _webp.HAVE_WEBPANIM: if self.__loaded != self.__logical_frame: self._seek(self.__logical_frame) From 4aa24f88d9a066318b75f0ad4bf69240d595ffb6 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Sat, 6 Jul 2024 03:56:24 +1000 Subject: [PATCH 133/662] Added type hints to tests (#8203) Co-authored-by: Andrew Murray --- Tests/helper.py | 4 +-- Tests/test_file_libtiff.py | 6 +++- Tests/test_file_webp_animated.py | 5 +++- Tests/test_image.py | 9 ++++-- Tests/test_image_access.py | 24 ++++++++++------ Tests/test_image_convert.py | 2 +- Tests/test_image_getcolors.py | 4 +++ Tests/test_image_putdata.py | 2 +- Tests/test_image_quantize.py | 12 ++++++-- Tests/test_image_resample.py | 20 +++++++++----- Tests/test_image_transform.py | 5 ++-- Tests/test_imagechops.py | 26 ++++++++++-------- Tests/test_imagecms.py | 4 ++- Tests/test_imagedraw.py | 31 +++++++++++++++++---- Tests/test_imagefile.py | 2 +- Tests/test_imagemorph.py | 14 ++++++---- Tests/test_imageops.py | 47 +++++++++++++++++++++++--------- Tests/test_imagetk.py | 2 ++ Tests/test_tiff_ifdrational.py | 6 +++- 19 files changed, 156 insertions(+), 69 deletions(-) diff --git a/Tests/helper.py b/Tests/helper.py index 7abc495b6..d6a93a803 100644 --- a/Tests/helper.py +++ b/Tests/helper.py @@ -60,9 +60,7 @@ def convert_to_comparable( return new_a, new_b -def assert_deep_equal( - a: Sequence[Any], b: Sequence[Any], msg: str | None = None -) -> None: +def assert_deep_equal(a: Any, b: Any, msg: str | None = None) -> None: try: assert len(a) == len(b), msg or f"got length {len(a)}, expected {len(b)}" except Exception: diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py index f491f9875..8707311dc 100644 --- a/Tests/test_file_libtiff.py +++ b/Tests/test_file_libtiff.py @@ -1048,7 +1048,11 @@ class TestFileLibTiff(LibTiffTestCase): ], ) def test_wrong_bits_per_sample( - self, file_name: str, mode: str, size: tuple[int, int], tile + self, + file_name: str, + mode: str, + size: tuple[int, int], + tile: list[tuple[str, tuple[int, int, int, int], int, tuple[Any, ...]]], ) -> None: with Image.open("Tests/images/" + file_name) as im: assert im.mode == mode diff --git a/Tests/test_file_webp_animated.py b/Tests/test_file_webp_animated.py index 882dccb32..e0d7999e3 100644 --- a/Tests/test_file_webp_animated.py +++ b/Tests/test_file_webp_animated.py @@ -1,5 +1,6 @@ from __future__ import annotations +from collections.abc import Generator from pathlib import Path import pytest @@ -96,7 +97,9 @@ def test_write_animation_RGB(tmp_path: Path) -> None: check(temp_file1) # Tests appending using a generator - def im_generator(ims): + def im_generator( + ims: list[Image.Image], + ) -> Generator[Image.Image, None, None]: yield from ims temp_file2 = str(tmp_path / "temp_generator.webp") diff --git a/Tests/test_image.py b/Tests/test_image.py index 07161fcfa..8e6f63fac 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -372,8 +372,9 @@ class TestImage: img = Image.alpha_composite(dst, src) # Assert - img_colors = sorted(img.getcolors()) - assert img_colors == expected_colors + img_colors = img.getcolors() + assert img_colors is not None + assert sorted(img_colors) == expected_colors def test_alpha_inplace(self) -> None: src = Image.new("RGBA", (128, 128), "blue") @@ -670,7 +671,9 @@ class TestImage: im_remapped = im.remap_palette([1, 0]) assert im_remapped.info["transparency"] == 1 - assert len(im_remapped.getpalette()) == 6 + palette = im_remapped.getpalette() + assert palette is not None + assert len(palette) == 6 # Test unused transparency im.info["transparency"] = 2 diff --git a/Tests/test_image_access.py b/Tests/test_image_access.py index c860771dc..854c79dae 100644 --- a/Tests/test_image_access.py +++ b/Tests/test_image_access.py @@ -27,7 +27,9 @@ class TestImagePutPixel: for y in range(im1.size[1]): for x in range(im1.size[0]): pos = x, y - im2.putpixel(pos, im1.getpixel(pos)) + value = im1.getpixel(pos) + assert value is not None + im2.putpixel(pos, value) assert_image_equal(im1, im2) @@ -37,7 +39,9 @@ class TestImagePutPixel: for y in range(im1.size[1]): for x in range(im1.size[0]): pos = x, y - im2.putpixel(pos, im1.getpixel(pos)) + value = im1.getpixel(pos) + assert value is not None + im2.putpixel(pos, value) assert not im2.readonly assert_image_equal(im1, im2) @@ -50,9 +54,9 @@ class TestImagePutPixel: assert pix1 is not None assert pix2 is not None with pytest.raises(TypeError): - pix1[0, "0"] + pix1[0, "0"] # type: ignore[index] with pytest.raises(TypeError): - pix1["0", 0] + pix1["0", 0] # type: ignore[index] for y in range(im1.size[1]): for x in range(im1.size[0]): @@ -71,7 +75,9 @@ class TestImagePutPixel: for y in range(-1, -im1.size[1] - 1, -1): for x in range(-1, -im1.size[0] - 1, -1): pos = x, y - im2.putpixel(pos, im1.getpixel(pos)) + value = im1.getpixel(pos) + assert value is not None + im2.putpixel(pos, value) assert_image_equal(im1, im2) @@ -81,7 +87,9 @@ class TestImagePutPixel: for y in range(-1, -im1.size[1] - 1, -1): for x in range(-1, -im1.size[0] - 1, -1): pos = x, y - im2.putpixel(pos, im1.getpixel(pos)) + value = im1.getpixel(pos) + assert value is not None + im2.putpixel(pos, value) assert not im2.readonly assert_image_equal(im1, im2) @@ -219,7 +227,7 @@ class TestImagePutPixelError: im = hopper(mode) for v in self.INVALID_TYPES: with pytest.raises(TypeError, match="color must be int or tuple"): - im.putpixel((0, 0), v) + im.putpixel((0, 0), v) # type: ignore[arg-type] @pytest.mark.parametrize( ("mode", "band_numbers", "match"), @@ -253,7 +261,7 @@ class TestImagePutPixelError: with pytest.raises( TypeError, match="color must be int or single-element tuple" ): - im.putpixel((0, 0), v) + im.putpixel((0, 0), v) # type: ignore[arg-type] @pytest.mark.parametrize("mode", IMAGE_MODES1 + IMAGE_MODES2) def test_putpixel_overflow_error(self, mode: str) -> None: diff --git a/Tests/test_image_convert.py b/Tests/test_image_convert.py index 5b63ceec3..ebb7f2822 100644 --- a/Tests/test_image_convert.py +++ b/Tests/test_image_convert.py @@ -225,7 +225,7 @@ def test_l_macro_rounding(convert_mode: str) -> None: assert px is not None converted_color = px[0, 0] if convert_mode == "LA": - assert converted_color is not None + assert isinstance(converted_color, tuple) converted_color = converted_color[0] assert converted_color == 1 diff --git a/Tests/test_image_getcolors.py b/Tests/test_image_getcolors.py index 8f8870f4f..8dbe82b29 100644 --- a/Tests/test_image_getcolors.py +++ b/Tests/test_image_getcolors.py @@ -54,17 +54,21 @@ def test_pack() -> None: assert A is None A = im.getcolors(maxcolors=3) + assert A is not None A.sort() assert A == expected A = im.getcolors(maxcolors=4) + assert A is not None A.sort() assert A == expected A = im.getcolors(maxcolors=8) + assert A is not None A.sort() assert A == expected A = im.getcolors(maxcolors=16) + assert A is not None A.sort() assert A == expected diff --git a/Tests/test_image_putdata.py b/Tests/test_image_putdata.py index dad26ef14..27cb7c59d 100644 --- a/Tests/test_image_putdata.py +++ b/Tests/test_image_putdata.py @@ -31,7 +31,7 @@ def test_sanity() -> None: def test_long_integers() -> None: # see bug-200802-systemerror - def put(value: int) -> tuple[int, int, int, int]: + def put(value: int) -> float | tuple[int, ...] | None: im = Image.new("RGBA", (1, 1)) im.putdata([value]) return im.getpixel((0, 0)) diff --git a/Tests/test_image_quantize.py b/Tests/test_image_quantize.py index 9f8aa601c..903cd8550 100644 --- a/Tests/test_image_quantize.py +++ b/Tests/test_image_quantize.py @@ -31,7 +31,9 @@ def test_libimagequant_quantize() -> None: converted = image.quantize(100, Image.Quantize.LIBIMAGEQUANT) assert converted.mode == "P" assert_image_similar(converted.convert("RGB"), image, 15) - assert len(converted.getcolors()) == 100 + colors = converted.getcolors() + assert colors is not None + assert len(colors) == 100 def test_octree_quantize() -> None: @@ -39,7 +41,9 @@ def test_octree_quantize() -> None: converted = image.quantize(100, Image.Quantize.FASTOCTREE) assert converted.mode == "P" assert_image_similar(converted.convert("RGB"), image, 20) - assert len(converted.getcolors()) == 100 + colors = converted.getcolors() + assert colors is not None + assert len(colors) == 100 def test_rgba_quantize() -> None: @@ -158,4 +162,6 @@ def test_small_palette() -> None: im = im.quantize(palette=p) # Assert - assert len(im.getcolors()) == 2 + quantized_colors = im.getcolors() + assert quantized_colors is not None + assert len(quantized_colors) == 2 diff --git a/Tests/test_image_resample.py b/Tests/test_image_resample.py index 92ba1553c..ce6209c0d 100644 --- a/Tests/test_image_resample.py +++ b/Tests/test_image_resample.py @@ -237,13 +237,13 @@ class TestImagingCoreResampleAccuracy: class TestCoreResampleConsistency: def make_case( self, mode: str, fill: tuple[int, int, int] | float - ) -> tuple[Image.Image, tuple[int, ...]]: + ) -> tuple[Image.Image, float | tuple[int, ...]]: im = Image.new(mode, (512, 9), fill) px = im.load() assert px is not None return im.resize((9, 512), Image.Resampling.LANCZOS), px[0, 0] - def run_case(self, case: tuple[Image.Image, int | tuple[int, ...]]) -> None: + def run_case(self, case: tuple[Image.Image, float | tuple[int, ...]]) -> None: channel, color = case px = channel.load() assert px is not None @@ -256,6 +256,7 @@ class TestCoreResampleConsistency: def test_8u(self) -> None: im, color = self.make_case("RGB", (0, 64, 255)) r, g, b = im.split() + assert isinstance(color, tuple) self.run_case((r, color[0])) self.run_case((g, color[1])) self.run_case((b, color[2])) @@ -290,7 +291,11 @@ class TestCoreResampleAlphaCorrect: px = i.load() assert px is not None for y in range(i.size[1]): - used_colors = {px[x, y][0] for x in range(i.size[0])} + used_colors = set() + for x in range(i.size[0]): + value = px[x, y] + assert isinstance(value, tuple) + used_colors.add(value[0]) assert 256 == len(used_colors), ( "All colors should be present in resized image. " f"Only {len(used_colors)} on line {y}." @@ -332,12 +337,13 @@ class TestCoreResampleAlphaCorrect: assert px is not None for y in range(i.size[1]): for x in range(i.size[0]): - if px[x, y][-1] != 0 and px[x, y][:-1] != clean_pixel: + value = px[x, y] + assert isinstance(value, tuple) + if value[-1] != 0 and value[:-1] != clean_pixel: message = ( - f"pixel at ({x}, {y}) is different:\n" - f"{px[x, y]}\n{clean_pixel}" + f"pixel at ({x}, {y}) is different:\n{value}\n{clean_pixel}" ) - assert px[x, y][:3] == clean_pixel, message + assert value[:3] == clean_pixel, message def test_dirty_pixels_rgba(self) -> None: case = self.make_dirty_case("RGBA", (255, 255, 0, 128), (0, 0, 255, 0)) diff --git a/Tests/test_image_transform.py b/Tests/test_image_transform.py index 638d12247..7e83396de 100644 --- a/Tests/test_image_transform.py +++ b/Tests/test_image_transform.py @@ -192,8 +192,9 @@ class TestImageTransform: im = op(im, (40, 10)) - colors = sorted(im.getcolors()) - assert colors == sorted( + colors = im.getcolors() + assert colors is not None + assert sorted(colors) == sorted( ( (20 * 10, opaque), (20 * 10, transparent), diff --git a/Tests/test_imagechops.py b/Tests/test_imagechops.py index 7e2290c15..4fc28cdb9 100644 --- a/Tests/test_imagechops.py +++ b/Tests/test_imagechops.py @@ -391,23 +391,25 @@ def test_overlay() -> None: def test_logical() -> None: def table( op: Callable[[Image.Image, Image.Image], Image.Image], a: int, b: int - ) -> tuple[int, int, int, int]: + ) -> list[float]: out = [] for x in (a, b): imx = Image.new("1", (1, 1), x) for y in (a, b): imy = Image.new("1", (1, 1), y) - out.append(op(imx, imy).getpixel((0, 0))) - return tuple(out) + value = op(imx, imy).getpixel((0, 0)) + assert not isinstance(value, tuple) and value is not None + out.append(value) + return out - assert table(ImageChops.logical_and, 0, 1) == (0, 0, 0, 255) - assert table(ImageChops.logical_or, 0, 1) == (0, 255, 255, 255) - assert table(ImageChops.logical_xor, 0, 1) == (0, 255, 255, 0) + assert table(ImageChops.logical_and, 0, 1) == [0, 0, 0, 255] + assert table(ImageChops.logical_or, 0, 1) == [0, 255, 255, 255] + assert table(ImageChops.logical_xor, 0, 1) == [0, 255, 255, 0] - assert table(ImageChops.logical_and, 0, 128) == (0, 0, 0, 255) - assert table(ImageChops.logical_or, 0, 128) == (0, 255, 255, 255) - assert table(ImageChops.logical_xor, 0, 128) == (0, 255, 255, 0) + assert table(ImageChops.logical_and, 0, 128) == [0, 0, 0, 255] + assert table(ImageChops.logical_or, 0, 128) == [0, 255, 255, 255] + assert table(ImageChops.logical_xor, 0, 128) == [0, 255, 255, 0] - assert table(ImageChops.logical_and, 0, 255) == (0, 0, 0, 255) - assert table(ImageChops.logical_or, 0, 255) == (0, 255, 255, 255) - assert table(ImageChops.logical_xor, 0, 255) == (0, 255, 255, 0) + assert table(ImageChops.logical_and, 0, 255) == [0, 0, 0, 255] + assert table(ImageChops.logical_or, 0, 255) == [0, 255, 255, 255] + assert table(ImageChops.logical_xor, 0, 255) == [0, 255, 255, 0] diff --git a/Tests/test_imagecms.py b/Tests/test_imagecms.py index c51f1155d..5ee5fcedf 100644 --- a/Tests/test_imagecms.py +++ b/Tests/test_imagecms.py @@ -691,7 +691,9 @@ def test_rgb_lab(mode: str) -> None: im = Image.new("LAB", (1, 1), (255, 0, 0)) converted_im = im.convert(mode) - assert converted_im.getpixel((0, 0))[:3] == (0, 255, 255) + value = converted_im.getpixel((0, 0)) + assert isinstance(value, tuple) + assert value[:3] == (0, 255, 255) def test_deprecation() -> None: diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py index 1ff3fea2a..e397978cb 100644 --- a/Tests/test_imagedraw.py +++ b/Tests/test_imagedraw.py @@ -1,8 +1,8 @@ from __future__ import annotations -import contextlib import os.path from collections.abc import Sequence +from typing import Callable import pytest @@ -1422,25 +1422,44 @@ def test_default_font_size() -> None: im = Image.new("RGB", (220, 25)) draw = ImageDraw.Draw(im) - with contextlib.nullcontext() if freetype_support else pytest.raises(ImportError): + + def check(func: Callable[[], None]) -> None: + if freetype_support: + func() + else: + with pytest.raises(ImportError): + func() + + def draw_text() -> None: draw.text((0, 0), text, font_size=16) assert_image_equal_tofile(im, "Tests/images/imagedraw_default_font_size.png") - with contextlib.nullcontext() if freetype_support else pytest.raises(ImportError): + check(draw_text) + + def draw_textlength() -> None: assert draw.textlength(text, font_size=16) == 216 - with contextlib.nullcontext() if freetype_support else pytest.raises(ImportError): + check(draw_textlength) + + def draw_textbbox() -> None: assert draw.textbbox((0, 0), text, font_size=16) == (0, 3, 216, 19) + check(draw_textbbox) + im = Image.new("RGB", (220, 25)) draw = ImageDraw.Draw(im) - with contextlib.nullcontext() if freetype_support else pytest.raises(ImportError): + + def draw_multiline_text() -> None: draw.multiline_text((0, 0), text, font_size=16) assert_image_equal_tofile(im, "Tests/images/imagedraw_default_font_size.png") - with contextlib.nullcontext() if freetype_support else pytest.raises(ImportError): + check(draw_multiline_text) + + def draw_multiline_textbbox() -> None: assert draw.multiline_textbbox((0, 0), text, font_size=16) == (0, 3, 216, 19) + check(draw_multiline_textbbox) + @pytest.mark.parametrize("bbox", BBOX) def test_same_color_outline(bbox: Coords) -> None: diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index 68b28ef07..bb686bb3b 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -305,7 +305,7 @@ class TestPyDecoder(CodecsTest): def test_decode(self) -> None: decoder = ImageFile.PyDecoder(None) with pytest.raises(NotImplementedError): - decoder.decode(None) + decoder.decode(b"") class TestPyEncoder(CodecsTest): diff --git a/Tests/test_imagemorph.py b/Tests/test_imagemorph.py index 32615cf0e..4363f456e 100644 --- a/Tests/test_imagemorph.py +++ b/Tests/test_imagemorph.py @@ -41,11 +41,15 @@ A = string_to_img( def img_to_string(im: Image.Image) -> str: """Turn a (small) binary image into a string representation""" chars = ".1" - width, height = im.size - return "\n".join( - "".join(chars[im.getpixel((c, r)) > 0] for c in range(width)) - for r in range(height) - ) + result = [] + for r in range(im.height): + line = "" + for c in range(im.width): + value = im.getpixel((c, r)) + assert not isinstance(value, tuple) and value is not None + line += chars[value > 0] + result.append(line) + return "\n".join(result) def img_string_normalize(im: str) -> str: diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py index 3598df830..e33e6d4c8 100644 --- a/Tests/test_imageops.py +++ b/Tests/test_imageops.py @@ -259,20 +259,26 @@ def test_colorize_2color() -> None: left = (0, 1) middle = (127, 1) right = (255, 1) + value = im_test.getpixel(left) + assert isinstance(value, tuple) assert_tuple_approx_equal( - im_test.getpixel(left), + value, (255, 0, 0), threshold=1, msg="black test pixel incorrect", ) + value = im_test.getpixel(middle) + assert isinstance(value, tuple) assert_tuple_approx_equal( - im_test.getpixel(middle), + value, (127, 63, 0), threshold=1, msg="mid test pixel incorrect", ) + value = im_test.getpixel(right) + assert isinstance(value, tuple) assert_tuple_approx_equal( - im_test.getpixel(right), + value, (0, 127, 0), threshold=1, msg="white test pixel incorrect", @@ -295,20 +301,26 @@ def test_colorize_2color_offset() -> None: left = (25, 1) middle = (75, 1) right = (125, 1) + value = im_test.getpixel(left) + assert isinstance(value, tuple) assert_tuple_approx_equal( - im_test.getpixel(left), + value, (255, 0, 0), threshold=1, msg="black test pixel incorrect", ) + value = im_test.getpixel(middle) + assert isinstance(value, tuple) assert_tuple_approx_equal( - im_test.getpixel(middle), + value, (127, 63, 0), threshold=1, msg="mid test pixel incorrect", ) + value = im_test.getpixel(right) + assert isinstance(value, tuple) assert_tuple_approx_equal( - im_test.getpixel(right), + value, (0, 127, 0), threshold=1, msg="white test pixel incorrect", @@ -339,29 +351,37 @@ def test_colorize_3color_offset() -> None: middle = (100, 1) right_middle = (150, 1) right = (225, 1) + value = im_test.getpixel(left) + assert isinstance(value, tuple) assert_tuple_approx_equal( - im_test.getpixel(left), + value, (255, 0, 0), threshold=1, msg="black test pixel incorrect", ) + value = im_test.getpixel(left_middle) + assert isinstance(value, tuple) assert_tuple_approx_equal( - im_test.getpixel(left_middle), + value, (127, 0, 127), threshold=1, msg="low-mid test pixel incorrect", ) + value = im_test.getpixel(middle) + assert isinstance(value, tuple) + assert_tuple_approx_equal(value, (0, 0, 255), threshold=1, msg="mid incorrect") + value = im_test.getpixel(right_middle) + assert isinstance(value, tuple) assert_tuple_approx_equal( - im_test.getpixel(middle), (0, 0, 255), threshold=1, msg="mid incorrect" - ) - assert_tuple_approx_equal( - im_test.getpixel(right_middle), + value, (0, 63, 127), threshold=1, msg="high-mid test pixel incorrect", ) + value = im_test.getpixel(right) + assert isinstance(value, tuple) assert_tuple_approx_equal( - im_test.getpixel(right), + value, (0, 127, 0), threshold=1, msg="white test pixel incorrect", @@ -444,6 +464,7 @@ def test_exif_transpose_xml_without_xmp() -> None: del im.info["xmp"] transposed_im = ImageOps.exif_transpose(im) + assert transposed_im is not None assert 0x0112 not in transposed_im.getexif() diff --git a/Tests/test_imagetk.py b/Tests/test_imagetk.py index e5869892e..f84c6c03a 100644 --- a/Tests/test_imagetk.py +++ b/Tests/test_imagetk.py @@ -45,10 +45,12 @@ def test_kw() -> None: # Test "file" im = ImageTk._get_image_from_kw(kw) + assert im is not None assert_image_equal(im, im1) # Test "data" im = ImageTk._get_image_from_kw(kw) + assert im is not None assert_image_equal(im, im2) # Test no relevant entry diff --git a/Tests/test_tiff_ifdrational.py b/Tests/test_tiff_ifdrational.py index ae80b98b8..9d06a9332 100644 --- a/Tests/test_tiff_ifdrational.py +++ b/Tests/test_tiff_ifdrational.py @@ -11,7 +11,11 @@ from PIL.TiffImagePlugin import IFDRational from .helper import hopper, skip_unless_feature -def _test_equal(num, denom, target) -> None: +def _test_equal( + num: float | Fraction | IFDRational, + denom: int, + target: float | Fraction | IFDRational, +) -> None: t = IFDRational(num, denom) assert target == t From 69cca2a10364a6128415815d3fc14df7314db596 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 6 Jul 2024 15:08:35 +1000 Subject: [PATCH 134/662] Added type hints --- src/PIL/PdfParser.py | 274 +++++++++++++++++++++++++++---------------- 1 file changed, 172 insertions(+), 102 deletions(-) diff --git a/src/PIL/PdfParser.py b/src/PIL/PdfParser.py index 622dc7de9..7cb2d241b 100644 --- a/src/PIL/PdfParser.py +++ b/src/PIL/PdfParser.py @@ -8,7 +8,7 @@ import os import re import time import zlib -from typing import TYPE_CHECKING, Any, NamedTuple, Union +from typing import IO, TYPE_CHECKING, Any, NamedTuple, Union # see 7.9.2.2 Text String Type on page 86 and D.3 PDFDocEncoding Character Set @@ -62,7 +62,7 @@ PDFDocEncoding = { } -def decode_text(b): +def decode_text(b: bytes) -> str: if b[: len(codecs.BOM_UTF16_BE)] == codecs.BOM_UTF16_BE: return b[len(codecs.BOM_UTF16_BE) :].decode("utf_16_be") else: @@ -99,7 +99,7 @@ class IndirectReference(IndirectReferenceTuple): assert isinstance(other, IndirectReference) return other.object_id == self.object_id and other.generation == self.generation - def __ne__(self, other): + def __ne__(self, other: object) -> bool: return not (self == other) def __hash__(self) -> int: @@ -112,13 +112,17 @@ class IndirectObjectDef(IndirectReference): class XrefTable: - def __init__(self): - self.existing_entries = {} # object ID => (offset, generation) - self.new_entries = {} # object ID => (offset, generation) + def __init__(self) -> None: + self.existing_entries: dict[int, tuple[int, int]] = ( + {} + ) # object ID => (offset, generation) + self.new_entries: dict[int, tuple[int, int]] = ( + {} + ) # object ID => (offset, generation) self.deleted_entries = {0: 65536} # object ID => generation self.reading_finished = False - def __setitem__(self, key, value): + def __setitem__(self, key: int, value: tuple[int, int]) -> None: if self.reading_finished: self.new_entries[key] = value else: @@ -126,13 +130,13 @@ class XrefTable: if key in self.deleted_entries: del self.deleted_entries[key] - def __getitem__(self, key): + def __getitem__(self, key: int) -> tuple[int, int]: try: return self.new_entries[key] except KeyError: return self.existing_entries[key] - def __delitem__(self, key): + def __delitem__(self, key: int) -> None: if key in self.new_entries: generation = self.new_entries[key][1] + 1 del self.new_entries[key] @@ -146,7 +150,7 @@ class XrefTable: msg = f"object ID {key} cannot be deleted because it doesn't exist" raise IndexError(msg) - def __contains__(self, key): + def __contains__(self, key: int) -> bool: return key in self.existing_entries or key in self.new_entries def __len__(self) -> int: @@ -156,19 +160,19 @@ class XrefTable: | set(self.deleted_entries.keys()) ) - def keys(self): + def keys(self) -> set[int]: return ( set(self.existing_entries.keys()) - set(self.deleted_entries.keys()) ) | set(self.new_entries.keys()) - def write(self, f): + def write(self, f: IO[bytes]) -> int: keys = sorted(set(self.new_entries.keys()) | set(self.deleted_entries.keys())) deleted_keys = sorted(set(self.deleted_entries.keys())) startxref = f.tell() f.write(b"xref\n") while keys: # find a contiguous sequence of object IDs - prev = None + prev: int | None = None for index, key in enumerate(keys): if prev is None or prev + 1 == key: prev = key @@ -178,7 +182,7 @@ class XrefTable: break else: contiguous_keys = keys - keys = None + keys = [] f.write(b"%d %d\n" % (contiguous_keys[0], len(contiguous_keys))) for object_id in contiguous_keys: if object_id in self.new_entries: @@ -202,7 +206,9 @@ class XrefTable: class PdfName: - def __init__(self, name): + name: bytes + + def __init__(self, name: PdfName | bytes | str) -> None: if isinstance(name, PdfName): self.name = name.name elif isinstance(name, bytes): @@ -213,7 +219,7 @@ class PdfName: def name_as_str(self) -> str: return self.name.decode("us-ascii") - def __eq__(self, other): + def __eq__(self, other: object) -> bool: return ( isinstance(other, PdfName) and other.name == self.name ) or other == self.name @@ -225,7 +231,7 @@ class PdfName: return f"{self.__class__.__name__}({repr(self.name)})" @classmethod - def from_pdf_stream(cls, data): + def from_pdf_stream(cls, data: bytes) -> PdfName: return cls(PdfParser.interpret_name(data)) allowed_chars = set(range(33, 127)) - {ord(c) for c in "#%/()<>[]{}"} @@ -252,13 +258,13 @@ else: class PdfDict(_DictBase): - def __setattr__(self, key, value): + def __setattr__(self, key: str, value: Any) -> None: if key == "data": collections.UserDict.__setattr__(self, key, value) else: self[key.encode("us-ascii")] = value - def __getattr__(self, key): + def __getattr__(self, key: str) -> str | time.struct_time: try: value = self[key.encode("us-ascii")] except KeyError as e: @@ -300,7 +306,7 @@ class PdfDict(_DictBase): class PdfBinary: - def __init__(self, data): + def __init__(self, data: list[int] | bytes) -> None: self.data = data def __bytes__(self) -> bytes: @@ -308,27 +314,27 @@ class PdfBinary: class PdfStream: - def __init__(self, dictionary, buf): + def __init__(self, dictionary: PdfDict, buf: bytes) -> None: self.dictionary = dictionary self.buf = buf - def decode(self): + def decode(self) -> bytes: try: - filter = self.dictionary.Filter - except AttributeError: + filter = self.dictionary[b"Filter"] + except KeyError: return self.buf if filter == b"FlateDecode": try: - expected_length = self.dictionary.DL - except AttributeError: - expected_length = self.dictionary.Length + expected_length = self.dictionary[b"DL"] + except KeyError: + expected_length = self.dictionary[b"Length"] return zlib.decompress(self.buf, bufsize=int(expected_length)) else: - msg = f"stream filter {repr(self.dictionary.Filter)} unknown/unsupported" + msg = f"stream filter {repr(filter)} unknown/unsupported" raise NotImplementedError(msg) -def pdf_repr(x): +def pdf_repr(x: Any) -> bytes: if x is True: return b"true" elif x is False: @@ -363,12 +369,19 @@ class PdfParser: Supports PDF up to 1.4 """ - def __init__(self, filename=None, f=None, buf=None, start_offset=0, mode="rb"): + def __init__( + self, + filename: str | None = None, + f: IO[bytes] | None = None, + buf: bytes | bytearray | None = None, + start_offset: int = 0, + mode: str = "rb", + ) -> None: if buf and f: msg = "specify buf or f or filename, but not both buf and f" raise RuntimeError(msg) self.filename = filename - self.buf = buf + self.buf: bytes | bytearray | mmap.mmap | None = buf self.f = f self.start_offset = start_offset self.should_close_buf = False @@ -377,12 +390,16 @@ class PdfParser: self.f = f = open(filename, mode) self.should_close_file = True if f is not None: - self.buf = buf = self.get_buf_from_file(f) + self.buf = self.get_buf_from_file(f) self.should_close_buf = True if not filename and hasattr(f, "name"): self.filename = f.name - self.cached_objects = {} - if buf: + self.cached_objects: dict[IndirectReference, Any] = {} + self.root_ref: IndirectReference | None + self.info_ref: IndirectReference | None + self.pages_ref: IndirectReference | None + self.last_xref_section_offset: int | None + if self.buf: self.read_pdf_info() else: self.file_size_total = self.file_size_this = 0 @@ -390,12 +407,12 @@ class PdfParser: self.root_ref = None self.info = PdfDict() self.info_ref = None - self.page_tree_root = {} - self.pages = [] - self.orig_pages = [] + self.page_tree_root = PdfDict() + self.pages: list[IndirectReference] = [] + self.orig_pages: list[IndirectReference] = [] self.pages_ref = None self.last_xref_section_offset = None - self.trailer_dict = {} + self.trailer_dict: dict[bytes, Any] = {} self.xref_table = XrefTable() self.xref_table.reading_finished = True if f: @@ -412,10 +429,8 @@ class PdfParser: self.seek_end() def close_buf(self) -> None: - try: + if isinstance(self.buf, mmap.mmap): self.buf.close() - except AttributeError: - pass self.buf = None def close(self) -> None: @@ -426,15 +441,19 @@ class PdfParser: self.f = None def seek_end(self) -> None: + assert self.f is not None self.f.seek(0, os.SEEK_END) def write_header(self) -> None: + assert self.f is not None self.f.write(b"%PDF-1.4\n") - def write_comment(self, s): + def write_comment(self, s: str) -> None: + assert self.f is not None self.f.write(f"% {s}\n".encode()) def write_catalog(self) -> IndirectReference: + assert self.f is not None self.del_root() self.root_ref = self.next_object_id(self.f.tell()) self.pages_ref = self.next_object_id(0) @@ -477,7 +496,10 @@ class PdfParser: pages_tree_node_ref = pages_tree_node.get(b"Parent", None) self.orig_pages = [] - def write_xref_and_trailer(self, new_root_ref=None): + def write_xref_and_trailer( + self, new_root_ref: IndirectReference | None = None + ) -> None: + assert self.f is not None if new_root_ref: self.del_root() self.root_ref = new_root_ref @@ -485,7 +507,10 @@ class PdfParser: self.info_ref = self.write_obj(None, self.info) start_xref = self.xref_table.write(self.f) num_entries = len(self.xref_table) - trailer_dict = {b"Root": self.root_ref, b"Size": num_entries} + trailer_dict: dict[str | bytes, Any] = { + b"Root": self.root_ref, + b"Size": num_entries, + } if self.last_xref_section_offset is not None: trailer_dict[b"Prev"] = self.last_xref_section_offset if self.info: @@ -497,16 +522,20 @@ class PdfParser: + b"\nstartxref\n%d\n%%%%EOF" % start_xref ) - def write_page(self, ref, *objs, **dict_obj): - if isinstance(ref, int): - ref = self.pages[ref] + def write_page( + self, ref: int | IndirectReference | None, *objs: Any, **dict_obj: Any + ) -> IndirectReference: + obj_ref = self.pages[ref] if isinstance(ref, int) else ref if "Type" not in dict_obj: dict_obj["Type"] = PdfName(b"Page") if "Parent" not in dict_obj: dict_obj["Parent"] = self.pages_ref - return self.write_obj(ref, *objs, **dict_obj) + return self.write_obj(obj_ref, *objs, **dict_obj) - def write_obj(self, ref, *objs, **dict_obj): + def write_obj( + self, ref: IndirectReference | None, *objs: Any, **dict_obj: Any + ) -> IndirectReference: + assert self.f is not None f = self.f if ref is None: ref = self.next_object_id(f.tell()) @@ -534,7 +563,7 @@ class PdfParser: del self.xref_table[self.root[b"Pages"].object_id] @staticmethod - def get_buf_from_file(f): + def get_buf_from_file(f: IO[bytes]) -> bytes | mmap.mmap: if hasattr(f, "getbuffer"): return f.getbuffer() elif hasattr(f, "getvalue"): @@ -546,10 +575,15 @@ class PdfParser: return b"" def read_pdf_info(self) -> None: + assert self.buf is not None self.file_size_total = len(self.buf) self.file_size_this = self.file_size_total - self.start_offset self.read_trailer() + check_format_condition( + self.trailer_dict.get(b"Root") is not None, "Root is missing" + ) self.root_ref = self.trailer_dict[b"Root"] + assert self.root_ref is not None self.info_ref = self.trailer_dict.get(b"Info", None) self.root = PdfDict(self.read_indirect(self.root_ref)) if self.info_ref is None: @@ -560,12 +594,15 @@ class PdfParser: check_format_condition( self.root[b"Type"] == b"Catalog", "/Type in Root is not /Catalog" ) - check_format_condition(b"Pages" in self.root, "/Pages missing in Root") + check_format_condition( + self.root.get(b"Pages") is not None, "/Pages missing in Root" + ) check_format_condition( isinstance(self.root[b"Pages"], IndirectReference), "/Pages in Root is not an indirect reference", ) self.pages_ref = self.root[b"Pages"] + assert self.pages_ref is not None self.page_tree_root = self.read_indirect(self.pages_ref) self.pages = self.linearize_page_tree(self.page_tree_root) # save the original list of page references @@ -573,7 +610,7 @@ class PdfParser: # and we need to rewrite the pages and their list self.orig_pages = self.pages[:] - def next_object_id(self, offset=None): + def next_object_id(self, offset: int | None = None) -> IndirectReference: try: # TODO: support reuse of deleted objects reference = IndirectReference(max(self.xref_table.keys()) + 1, 0) @@ -623,12 +660,13 @@ class PdfParser: re.DOTALL, ) - def read_trailer(self): + def read_trailer(self) -> None: + assert self.buf is not None search_start_offset = len(self.buf) - 16384 if search_start_offset < self.start_offset: search_start_offset = self.start_offset m = self.re_trailer_end.search(self.buf, search_start_offset) - check_format_condition(m, "trailer end not found") + check_format_condition(m is not None, "trailer end not found") # make sure we found the LAST trailer last_match = m while m: @@ -636,6 +674,7 @@ class PdfParser: m = self.re_trailer_end.search(self.buf, m.start() + 16) if not m: m = last_match + assert m is not None trailer_data = m.group(1) self.last_xref_section_offset = int(m.group(2)) self.trailer_dict = self.interpret_trailer(trailer_data) @@ -644,12 +683,14 @@ class PdfParser: if b"Prev" in self.trailer_dict: self.read_prev_trailer(self.trailer_dict[b"Prev"]) - def read_prev_trailer(self, xref_section_offset): + def read_prev_trailer(self, xref_section_offset: int) -> None: + assert self.buf is not None trailer_offset = self.read_xref_table(xref_section_offset=xref_section_offset) m = self.re_trailer_prev.search( self.buf[trailer_offset : trailer_offset + 16384] ) - check_format_condition(m, "previous trailer not found") + check_format_condition(m is not None, "previous trailer not found") + assert m is not None trailer_data = m.group(1) check_format_condition( int(m.group(2)) == xref_section_offset, @@ -670,7 +711,7 @@ class PdfParser: re_dict_end = re.compile(whitespace_optional + rb">>" + whitespace_optional) @classmethod - def interpret_trailer(cls, trailer_data): + def interpret_trailer(cls, trailer_data: bytes) -> dict[bytes, Any]: trailer = {} offset = 0 while True: @@ -678,14 +719,18 @@ class PdfParser: if not m: m = cls.re_dict_end.match(trailer_data, offset) check_format_condition( - m and m.end() == len(trailer_data), + m is not None and m.end() == len(trailer_data), "name not found in trailer, remaining data: " + repr(trailer_data[offset:]), ) break key = cls.interpret_name(m.group(1)) - value, offset = cls.get_value(trailer_data, m.end()) + assert isinstance(key, bytes) + value, value_offset = cls.get_value(trailer_data, m.end()) trailer[key] = value + if value_offset is None: + break + offset = value_offset check_format_condition( b"Size" in trailer and isinstance(trailer[b"Size"], int), "/Size not in trailer or not an integer", @@ -699,7 +744,7 @@ class PdfParser: re_hashes_in_name = re.compile(rb"([^#]*)(#([0-9a-fA-F]{2}))?") @classmethod - def interpret_name(cls, raw, as_text=False): + def interpret_name(cls, raw: bytes, as_text: bool = False) -> str | bytes: name = b"" for m in cls.re_hashes_in_name.finditer(raw): if m.group(3): @@ -761,7 +806,13 @@ class PdfParser: ) @classmethod - def get_value(cls, data, offset, expect_indirect=None, max_nesting=-1): + def get_value( + cls, + data: bytes | bytearray | mmap.mmap, + offset: int, + expect_indirect: IndirectReference | None = None, + max_nesting: int = -1, + ) -> tuple[Any, int | None]: if max_nesting == 0: return None, None m = cls.re_comment.match(data, offset) @@ -783,11 +834,16 @@ class PdfParser: == IndirectReference(int(m.group(1)), int(m.group(2))), "indirect object definition different than expected", ) - object, offset = cls.get_value(data, m.end(), max_nesting=max_nesting - 1) - if offset is None: + object, object_offset = cls.get_value( + data, m.end(), max_nesting=max_nesting - 1 + ) + if object_offset is None: return object, None - m = cls.re_indirect_def_end.match(data, offset) - check_format_condition(m, "indirect object definition end not found") + m = cls.re_indirect_def_end.match(data, object_offset) + check_format_condition( + m is not None, "indirect object definition end not found" + ) + assert m is not None return object, m.end() check_format_condition( not expect_indirect, "indirect object definition not found" @@ -806,46 +862,53 @@ class PdfParser: m = cls.re_dict_start.match(data, offset) if m: offset = m.end() - result = {} + result: dict[Any, Any] = {} m = cls.re_dict_end.match(data, offset) + current_offset: int | None = offset while not m: - key, offset = cls.get_value(data, offset, max_nesting=max_nesting - 1) - if offset is None: + assert current_offset is not None + key, current_offset = cls.get_value( + data, current_offset, max_nesting=max_nesting - 1 + ) + if current_offset is None: return result, None - value, offset = cls.get_value(data, offset, max_nesting=max_nesting - 1) + value, current_offset = cls.get_value( + data, current_offset, max_nesting=max_nesting - 1 + ) result[key] = value - if offset is None: + if current_offset is None: return result, None - m = cls.re_dict_end.match(data, offset) - offset = m.end() - m = cls.re_stream_start.match(data, offset) + m = cls.re_dict_end.match(data, current_offset) + current_offset = m.end() + m = cls.re_stream_start.match(data, current_offset) if m: - try: - stream_len_str = result.get(b"Length") - stream_len = int(stream_len_str) - except (TypeError, ValueError) as e: - msg = f"bad or missing Length in stream dict ({stream_len_str})" - raise PdfFormatError(msg) from e + stream_len = result.get(b"Length") + if stream_len is None or not isinstance(stream_len, int): + msg = f"bad or missing Length in stream dict ({stream_len})" + raise PdfFormatError(msg) stream_data = data[m.end() : m.end() + stream_len] m = cls.re_stream_end.match(data, m.end() + stream_len) - check_format_condition(m, "stream end not found") - offset = m.end() - result = PdfStream(PdfDict(result), stream_data) - else: - result = PdfDict(result) - return result, offset + check_format_condition(m is not None, "stream end not found") + assert m is not None + current_offset = m.end() + return PdfStream(PdfDict(result), stream_data), current_offset + return PdfDict(result), current_offset m = cls.re_array_start.match(data, offset) if m: offset = m.end() - result = [] + results = [] m = cls.re_array_end.match(data, offset) + current_offset = offset while not m: - value, offset = cls.get_value(data, offset, max_nesting=max_nesting - 1) - result.append(value) - if offset is None: - return result, None - m = cls.re_array_end.match(data, offset) - return result, m.end() + assert current_offset is not None + value, current_offset = cls.get_value( + data, current_offset, max_nesting=max_nesting - 1 + ) + results.append(value) + if current_offset is None: + return results, None + m = cls.re_array_end.match(data, current_offset) + return results, m.end() m = cls.re_null.match(data, offset) if m: return None, m.end() @@ -905,7 +968,9 @@ class PdfParser: } @classmethod - def get_literal_string(cls, data, offset): + def get_literal_string( + cls, data: bytes | bytearray | mmap.mmap, offset: int + ) -> tuple[bytes, int]: nesting_depth = 0 result = bytearray() for m in cls.re_lit_str_token.finditer(data, offset): @@ -941,12 +1006,14 @@ class PdfParser: ) re_xref_entry = re.compile(rb"([0-9]{10}) ([0-9]{5}) ([fn])( \r| \n|\r\n)") - def read_xref_table(self, xref_section_offset): + def read_xref_table(self, xref_section_offset: int) -> int: + assert self.buf is not None subsection_found = False m = self.re_xref_section_start.match( self.buf, xref_section_offset + self.start_offset ) - check_format_condition(m, "xref section start not found") + check_format_condition(m is not None, "xref section start not found") + assert m is not None offset = m.end() while True: m = self.re_xref_subsection_start.match(self.buf, offset) @@ -961,7 +1028,8 @@ class PdfParser: num_objects = int(m.group(2)) for i in range(first_object, first_object + num_objects): m = self.re_xref_entry.match(self.buf, offset) - check_format_condition(m, "xref entry not found") + check_format_condition(m is not None, "xref entry not found") + assert m is not None offset = m.end() is_free = m.group(3) == b"f" if not is_free: @@ -971,13 +1039,14 @@ class PdfParser: self.xref_table[i] = new_entry return offset - def read_indirect(self, ref, max_nesting=-1): + def read_indirect(self, ref: IndirectReference, max_nesting: int = -1) -> Any: offset, generation = self.xref_table[ref[0]] check_format_condition( generation == ref[1], f"expected to find generation {ref[1]} for object ID {ref[0]} in xref " f"table, instead found generation {generation} at offset {offset}", ) + assert self.buf is not None value = self.get_value( self.buf, offset + self.start_offset, @@ -987,14 +1056,15 @@ class PdfParser: self.cached_objects[ref] = value return value - def linearize_page_tree(self, node=None): - if node is None: - node = self.page_tree_root + def linearize_page_tree( + self, node: PdfDict | None = None + ) -> list[IndirectReference]: + page_node = node if node is not None else self.page_tree_root check_format_condition( - node[b"Type"] == b"Pages", "/Type of page tree node is not /Pages" + page_node[b"Type"] == b"Pages", "/Type of page tree node is not /Pages" ) pages = [] - for kid in node[b"Kids"]: + for kid in page_node[b"Kids"]: kid_object = self.read_indirect(kid) if kid_object[b"Type"] == b"Page": pages.append(kid) From 486dac7efcc3fd937a00f4180ef32f4a75686f15 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 6 Jul 2024 19:17:23 +1000 Subject: [PATCH 135/662] Added type hints --- Tests/test_file_gif.py | 2 +- Tests/test_file_libtiff.py | 21 ++++++++++++++++----- Tests/test_file_pdf.py | 2 +- Tests/test_file_tiff.py | 22 +++++++++++++--------- Tests/test_image.py | 2 +- Tests/test_imagegrab.py | 7 ++++--- pyproject.toml | 8 ++++++++ src/PIL/Image.py | 4 ++-- tox.ini | 4 +++- 9 files changed, 49 insertions(+), 23 deletions(-) diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py index 79a2ec0ab..85b017d29 100644 --- a/Tests/test_file_gif.py +++ b/Tests/test_file_gif.py @@ -353,7 +353,7 @@ def test_palette_434(tmp_path: Path) -> None: def roundtrip(im: Image.Image, **kwargs: bool) -> Image.Image: out = str(tmp_path / "temp.gif") - im.copy().save(out, **kwargs) + im.copy().save(out, "GIF", **kwargs) reloaded = Image.open(out) return reloaded diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py index 8707311dc..d5dbeeb6f 100644 --- a/Tests/test_file_libtiff.py +++ b/Tests/test_file_libtiff.py @@ -92,11 +92,22 @@ class TestFileLibTiff(LibTiffTestCase): def test_g4_non_disk_file_object(self, tmp_path: Path) -> None: """Testing loading from non-disk non-BytesIO file object""" test_file = "Tests/images/hopper_g4_500.tif" - s = io.BytesIO() with open(test_file, "rb") as f: - s.write(f.read()) - s.seek(0) - r = io.BufferedReader(s) + data = f.read() + + class NonBytesIO(io.RawIOBase): + def read(self, size: int = -1) -> bytes: + nonlocal data + if size == -1: + size = len(data) + result = data[:size] + data = data[size:] + return result + + def readable(self) -> bool: + return True + + r = io.BufferedReader(NonBytesIO()) with Image.open(r) as im: assert im.size == (500, 500) self._assert_noerr(tmp_path, im) @@ -1139,7 +1150,7 @@ class TestFileLibTiff(LibTiffTestCase): arguments: dict[str, str | int] = {"compression": "tiff_adobe_deflate"} if argument: arguments["strip_size"] = 2**18 - im.save(out, **arguments) + im.save(out, "TIFF", **arguments) with Image.open(out) as im: assert isinstance(im, TiffImagePlugin.TiffImageFile) diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py index 02f07a565..3729ca58b 100644 --- a/Tests/test_file_pdf.py +++ b/Tests/test_file_pdf.py @@ -118,7 +118,7 @@ def test_dpi(params: dict[str, int | tuple[int, int]], tmp_path: Path) -> None: im = hopper() outfile = str(tmp_path / "temp.pdf") - im.save(outfile, **params) + im.save(outfile, "PDF", **params) with open(outfile, "rb") as fp: contents = fp.read() diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 93a9f9e6a..8cad25272 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -78,6 +78,7 @@ class TestFileTiff: def test_seek_after_close(self) -> None: im = Image.open("Tests/images/multipage.tiff") + assert isinstance(im, TiffImagePlugin.TiffImageFile) im.close() with pytest.raises(ValueError): @@ -424,13 +425,13 @@ class TestFileTiff: def test_load_float(self) -> None: ifd = TiffImagePlugin.ImageFileDirectory_v2() data = b"abcdabcd" - ret = ifd.load_float(data, False) + ret = getattr(ifd, "load_float")(data, False) assert ret == (1.6777999408082104e22, 1.6777999408082104e22) def test_load_double(self) -> None: ifd = TiffImagePlugin.ImageFileDirectory_v2() data = b"abcdefghabcdefgh" - ret = ifd.load_double(data, False) + ret = getattr(ifd, "load_double")(data, False) assert ret == (8.540883223036124e194, 8.540883223036124e194) def test_ifd_tag_type(self) -> None: @@ -599,7 +600,7 @@ class TestFileTiff: def test_with_underscores(self, tmp_path: Path) -> None: kwargs = {"resolution_unit": "inch", "x_resolution": 72, "y_resolution": 36} filename = str(tmp_path / "temp.tif") - hopper("RGB").save(filename, **kwargs) + hopper("RGB").save(filename, "TIFF", **kwargs) with Image.open(filename) as im: # legacy interface assert im.tag[X_RESOLUTION][0][0] == 72 @@ -624,14 +625,17 @@ class TestFileTiff: def test_iptc(self, tmp_path: Path) -> None: # Do not preserve IPTC_NAA_CHUNK by default if type is LONG outfile = str(tmp_path / "temp.tif") - im = hopper() - ifd = TiffImagePlugin.ImageFileDirectory_v2() - ifd[33723] = 1 - ifd.tagtype[33723] = 4 - im.tag_v2 = ifd - im.save(outfile) + with Image.open("Tests/images/hopper.tif") as im: + im.load() + assert isinstance(im, TiffImagePlugin.TiffImageFile) + ifd = TiffImagePlugin.ImageFileDirectory_v2() + ifd[33723] = 1 + ifd.tagtype[33723] = 4 + im.tag_v2 = ifd + im.save(outfile) with Image.open(outfile) as im: + assert isinstance(im, TiffImagePlugin.TiffImageFile) assert 33723 not in im.tag_v2 def test_rowsperstrip(self, tmp_path: Path) -> None: diff --git a/Tests/test_image.py b/Tests/test_image.py index 8e6f63fac..4fdc41791 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -704,7 +704,7 @@ class TestImage: else: assert new_image.palette is None - _make_new(im, im_p, ImagePalette.ImagePalette(list(range(256)) * 3)) + _make_new(im, im_p, ImagePalette.ImagePalette("RGB")) _make_new(im_p, im, None) _make_new(im, blank_p, ImagePalette.ImagePalette()) _make_new(im, blank_pa, ImagePalette.ImagePalette()) diff --git a/Tests/test_imagegrab.py b/Tests/test_imagegrab.py index 5dfa51697..5cd510751 100644 --- a/Tests/test_imagegrab.py +++ b/Tests/test_imagegrab.py @@ -60,6 +60,8 @@ class TestImageGrab: def test_grabclipboard(self) -> None: if sys.platform == "darwin": subprocess.call(["screencapture", "-cx"]) + + ImageGrab.grabclipboard() elif sys.platform == "win32": p = subprocess.Popen(["powershell", "-command", "-"], stdin=subprocess.PIPE) p.stdin.write( @@ -69,6 +71,8 @@ $bmp = New-Object Drawing.Bitmap 200, 200 [Windows.Forms.Clipboard]::SetImage($bmp)""" ) p.communicate() + + ImageGrab.grabclipboard() else: if not shutil.which("wl-paste") and not shutil.which("xclip"): with pytest.raises( @@ -77,9 +81,6 @@ $bmp = New-Object Drawing.Bitmap 200, 200 r" ImageGrab.grabclipboard\(\) on Linux", ): ImageGrab.grabclipboard() - return - - ImageGrab.grabclipboard() @pytest.mark.skipif(sys.platform != "win32", reason="Windows only") def test_grabclipboard_file(self) -> None: diff --git a/pyproject.toml b/pyproject.toml index 700d5e7fe..cd7248669 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -155,3 +155,11 @@ follow_imports = "silent" warn_redundant_casts = true warn_unreachable = true warn_unused_ignores = true +exclude = [ + '^Tests/oss-fuzz/fuzz_font.py$', + '^Tests/oss-fuzz/fuzz_pillow.py$', + '^Tests/test_qt_image_qapplication.py$', + '^Tests/test_font_pcf_charsets.py$', + '^Tests/test_font_pcf.py$', + '^Tests/test_file_tar.py$', +] diff --git a/src/PIL/Image.py b/src/PIL/Image.py index dbb72ed6a..565abe71d 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1886,7 +1886,7 @@ class Image: def point( self, - lut: Sequence[float] | Callable[[int], float] | ImagePointHandler, + lut: Sequence[float] | NumpyArray | Callable[[int], float] | ImagePointHandler, mode: str | None = None, ) -> Image: """ @@ -1996,7 +1996,7 @@ class Image: def putdata( self, - data: Sequence[float] | Sequence[Sequence[int]], + data: Sequence[float] | Sequence[Sequence[int]] | NumpyArray, scale: float = 1.0, offset: float = 0.0, ) -> None: diff --git a/tox.ini b/tox.ini index 189415237..c1bc3b17d 100644 --- a/tox.ini +++ b/tox.ini @@ -38,9 +38,11 @@ deps = ipython numpy packaging + pytest types-defusedxml types-olefile + types-setuptools extras = typing commands = - mypy src {posargs} + mypy src Tests {posargs} From 6883018725bbaa5f616c1ec190393efcaef7a2ce Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 6 Jul 2024 22:06:47 +1000 Subject: [PATCH 136/662] Added type hint --- Tests/test_file_pdf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Tests/test_file_pdf.py b/Tests/test_file_pdf.py index 3729ca58b..1d5001b1a 100644 --- a/Tests/test_file_pdf.py +++ b/Tests/test_file_pdf.py @@ -229,6 +229,7 @@ def test_pdf_append_fails_on_nonexistent_file() -> None: def check_pdf_pages_consistency(pdf: PdfParser.PdfParser) -> None: + assert pdf.pages_ref is not None pages_info = pdf.read_indirect(pdf.pages_ref) assert b"Parent" not in pages_info assert b"Kids" in pages_info From 41eb218a6829ddc58a282d6952d9c0b5af25688d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 7 Jul 2024 22:04:50 +1000 Subject: [PATCH 137/662] Check GIL, rather than Python version --- .ci/install.sh | 4 ++-- .github/workflows/test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/install.sh b/.ci/install.sh index e1274f41c..8e65f64c4 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -38,7 +38,7 @@ python3 -m pip install pyroma if [[ $(uname) != CYGWIN* ]]; then # TODO Update condition when NumPy supports free-threading - if [[ "$GHA_PYTHON_VERSION" == "3.13-dev" ]]; then + if [[ "$PYTHON_GIL" == "0" ]]; then python3 -m pip install numpy --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple else python3 -m pip install numpy @@ -48,7 +48,7 @@ if [[ $(uname) != CYGWIN* ]]; then if [[ $GHA_PYTHON_VERSION == 3.* ]]; then sudo apt-get -qq install libegl1 libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxkbcommon-x11-0 # TODO Update condition when pyqt6 supports free-threading - if ! [[ "$GHA_PYTHON_VERSION" == "3.13-dev" ]]; then python3 -m pip install pyqt6 ; fi + if ! [[ "$PYTHON_GIL" == "0" ]]; then python3 -m pip install pyqt6 ; fi fi # Pyroma uses non-isolated build and fails with old setuptools diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 702841814..6e63333b0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -67,7 +67,7 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 - if: "!endsWith(matrix.python-version, '-dev')" + if: "${{ !matrix.disable-gil }}" with: python-version: ${{ matrix.python-version }} allow-prereleases: true @@ -78,7 +78,7 @@ jobs: - name: Set up Python ${{ matrix.python-version }} (free-threaded) uses: deadsnakes/action@v3.1.0 - if: endsWith(matrix.python-version, '-dev') + if: "${{ matrix.disable-gil }}" with: python-version: ${{ matrix.python-version }} nogil: ${{ matrix.disable-gil }} From 8a05e32336bfbece4aed16a63d009efa55a1b4bb Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 8 Jul 2024 20:09:45 +1000 Subject: [PATCH 138/662] Added type hints --- Tests/test_file_mpo.py | 16 +++++++++---- Tests/test_imagefile.py | 5 +++- Tests/test_imagetk.py | 3 +++ src/PIL/BlpImagePlugin.py | 1 + src/PIL/BmpImagePlugin.py | 44 +++++++++++++++++++++++++----------- src/PIL/ImageFile.py | 18 +++++++-------- src/PIL/ImageTk.py | 24 ++++++++++++++------ src/PIL/Jpeg2KImagePlugin.py | 40 +++++++++++++++++++++++++++----- src/PIL/JpegImagePlugin.py | 18 ++++++++------- src/PIL/MpoImagePlugin.py | 17 ++++++++++---- src/PIL/PngImagePlugin.py | 42 +++++++++++++++++++++++----------- src/PIL/PsdImagePlugin.py | 2 +- src/PIL/WebPImagePlugin.py | 2 +- src/PIL/WmfImagePlugin.py | 2 +- src/PIL/_imagingtk.pyi | 3 +++ 15 files changed, 168 insertions(+), 69 deletions(-) create mode 100644 src/PIL/_imagingtk.pyi diff --git a/Tests/test_file_mpo.py b/Tests/test_file_mpo.py index 39b9c60b7..5402fcb44 100644 --- a/Tests/test_file_mpo.py +++ b/Tests/test_file_mpo.py @@ -2,11 +2,11 @@ from __future__ import annotations import warnings from io import BytesIO -from typing import Any, cast +from typing import Any import pytest -from PIL import Image, MpoImagePlugin +from PIL import Image, ImageFile, MpoImagePlugin from .helper import ( assert_image_equal, @@ -20,11 +20,11 @@ test_files = ["Tests/images/sugarshack.mpo", "Tests/images/frozenpond.mpo"] pytestmark = skip_unless_feature("jpg") -def roundtrip(im: Image.Image, **options: Any) -> MpoImagePlugin.MpoImageFile: +def roundtrip(im: Image.Image, **options: Any) -> ImageFile.ImageFile: out = BytesIO() im.save(out, "MPO", **options) out.seek(0) - return cast(MpoImagePlugin.MpoImageFile, Image.open(out)) + return Image.open(out) @pytest.mark.parametrize("test_file", test_files) @@ -226,6 +226,12 @@ def test_eoferror() -> None: im.seek(n_frames - 1) +def test_adopt_jpeg() -> None: + with Image.open("Tests/images/hopper.jpg") as im: + with pytest.raises(ValueError): + MpoImagePlugin.MpoImageFile.adopt(im) + + def test_ultra_hdr() -> None: with Image.open("Tests/images/ultrahdr.jpg") as im: assert im.format == "JPEG" @@ -275,6 +281,8 @@ def test_save_all() -> None: im_reloaded = roundtrip(im, save_all=True, append_images=[im2]) assert_image_equal(im, im_reloaded) + assert isinstance(im_reloaded, MpoImagePlugin.MpoImageFile) + assert im_reloaded.mpinfo is not None assert im_reloaded.mpinfo[45056] == b"0100" im_reloaded.seek(1) diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index bb686bb3b..b996860ce 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -90,6 +90,7 @@ class TestImageFile: data = f.read() with ImageFile.Parser() as p: p.feed(data) + assert p.image is not None assert (48, 48) == p.image.size @skip_unless_feature("webp") @@ -103,6 +104,7 @@ class TestImageFile: assert not p.image p.feed(f.read()) + assert p.image is not None assert (128, 128) == p.image.size @skip_unless_feature("zlib") @@ -393,8 +395,9 @@ class TestPyEncoder(CodecsTest): with pytest.raises(NotImplementedError): encoder.encode_to_pyfd() + fh = BytesIO() with pytest.raises(NotImplementedError): - encoder.encode_to_file(None, None) + encoder.encode_to_file(fh, 0) def test_zero_height(self) -> None: with pytest.raises(UnidentifiedImageError): diff --git a/Tests/test_imagetk.py b/Tests/test_imagetk.py index f84c6c03a..4484dca10 100644 --- a/Tests/test_imagetk.py +++ b/Tests/test_imagetk.py @@ -109,3 +109,6 @@ def test_bitmapimage() -> None: # reloaded = ImageTk.getimage(im_tk) # assert_image_equal(reloaded, im) + + with pytest.raises(ValueError): + ImageTk.BitmapImage() diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py index b9cefafdd..6d71049a9 100644 --- a/src/PIL/BlpImagePlugin.py +++ b/src/PIL/BlpImagePlugin.py @@ -313,6 +313,7 @@ class _BLPBaseDecoder(ImageFile.PyDecoder): self._blp_lengths = struct.unpack("<16I", self._safe_read(16 * 4)) def _safe_read(self, length: int) -> bytes: + assert self.fd is not None return ImageFile._safe_read(self.fd, length) def _read_palette(self) -> list[tuple[int, int, int, int]]: diff --git a/src/PIL/BmpImagePlugin.py b/src/PIL/BmpImagePlugin.py index ef2045337..48bdd9830 100644 --- a/src/PIL/BmpImagePlugin.py +++ b/src/PIL/BmpImagePlugin.py @@ -25,7 +25,7 @@ from __future__ import annotations import os -from typing import IO +from typing import IO, Any from . import Image, ImageFile, ImagePalette from ._binary import i16le as i16 @@ -72,16 +72,20 @@ class BmpImageFile(ImageFile.ImageFile): for k, v in COMPRESSIONS.items(): vars()[k] = v - def _bitmap(self, header=0, offset=0): + def _bitmap(self, header: int = 0, offset: int = 0) -> None: """Read relevant info about the BMP""" read, seek = self.fp.read, self.fp.seek if header: seek(header) # read bmp header size @offset 14 (this is part of the header size) - file_info = {"header_size": i32(read(4)), "direction": -1} + file_info: dict[str, bool | int | tuple[int, ...]] = { + "header_size": i32(read(4)), + "direction": -1, + } # -------------------- If requested, read header at a specific position # read the rest of the bmp header, without its size + assert isinstance(file_info["header_size"], int) header_data = ImageFile._safe_read(self.fp, file_info["header_size"] - 4) # ------------------------------- Windows Bitmap v2, IBM OS/2 Bitmap v1 @@ -92,7 +96,7 @@ class BmpImageFile(ImageFile.ImageFile): file_info["height"] = i16(header_data, 2) file_info["planes"] = i16(header_data, 4) file_info["bits"] = i16(header_data, 6) - file_info["compression"] = self.RAW + file_info["compression"] = self.COMPRESSIONS["RAW"] file_info["palette_padding"] = 3 # --------------------------------------------- Windows Bitmap v3 to v5 @@ -122,8 +126,9 @@ class BmpImageFile(ImageFile.ImageFile): ) file_info["colors"] = i32(header_data, 28) file_info["palette_padding"] = 4 + assert isinstance(file_info["pixels_per_meter"], tuple) self.info["dpi"] = tuple(x / 39.3701 for x in file_info["pixels_per_meter"]) - if file_info["compression"] == self.BITFIELDS: + if file_info["compression"] == self.COMPRESSIONS["BITFIELDS"]: masks = ["r_mask", "g_mask", "b_mask"] if len(header_data) >= 48: if len(header_data) >= 52: @@ -144,6 +149,10 @@ class BmpImageFile(ImageFile.ImageFile): file_info["a_mask"] = 0x0 for mask in masks: file_info[mask] = i32(read(4)) + assert isinstance(file_info["r_mask"], int) + assert isinstance(file_info["g_mask"], int) + assert isinstance(file_info["b_mask"], int) + assert isinstance(file_info["a_mask"], int) file_info["rgb_mask"] = ( file_info["r_mask"], file_info["g_mask"], @@ -164,24 +173,26 @@ class BmpImageFile(ImageFile.ImageFile): self._size = file_info["width"], file_info["height"] # ------- If color count was not found in the header, compute from bits + assert isinstance(file_info["bits"], int) file_info["colors"] = ( file_info["colors"] if file_info.get("colors", 0) else (1 << file_info["bits"]) ) + assert isinstance(file_info["colors"], int) if offset == 14 + file_info["header_size"] and file_info["bits"] <= 8: offset += 4 * file_info["colors"] # ---------------------- Check bit depth for unusual unsupported values - self._mode, raw_mode = BIT2MODE.get(file_info["bits"], (None, None)) - if self.mode is None: + self._mode, raw_mode = BIT2MODE.get(file_info["bits"], ("", "")) + if not self.mode: msg = f"Unsupported BMP pixel depth ({file_info['bits']})" raise OSError(msg) # ---------------- Process BMP with Bitfields compression (not palette) decoder_name = "raw" - if file_info["compression"] == self.BITFIELDS: - SUPPORTED = { + if file_info["compression"] == self.COMPRESSIONS["BITFIELDS"]: + SUPPORTED: dict[int, list[tuple[int, ...]]] = { 32: [ (0xFF0000, 0xFF00, 0xFF, 0x0), (0xFF000000, 0xFF0000, 0xFF00, 0x0), @@ -213,12 +224,14 @@ class BmpImageFile(ImageFile.ImageFile): file_info["bits"] == 32 and file_info["rgba_mask"] in SUPPORTED[file_info["bits"]] ): + assert isinstance(file_info["rgba_mask"], tuple) raw_mode = MASK_MODES[(file_info["bits"], file_info["rgba_mask"])] self._mode = "RGBA" if "A" in raw_mode else self.mode elif ( file_info["bits"] in (24, 16) and file_info["rgb_mask"] in SUPPORTED[file_info["bits"]] ): + assert isinstance(file_info["rgb_mask"], tuple) raw_mode = MASK_MODES[(file_info["bits"], file_info["rgb_mask"])] else: msg = "Unsupported BMP bitfields layout" @@ -226,10 +239,13 @@ class BmpImageFile(ImageFile.ImageFile): else: msg = "Unsupported BMP bitfields layout" raise OSError(msg) - elif file_info["compression"] == self.RAW: + elif file_info["compression"] == self.COMPRESSIONS["RAW"]: if file_info["bits"] == 32 and header == 22: # 32-bit .cur offset raw_mode, self._mode = "BGRA", "RGBA" - elif file_info["compression"] in (self.RLE8, self.RLE4): + elif file_info["compression"] in ( + self.COMPRESSIONS["RLE8"], + self.COMPRESSIONS["RLE4"], + ): decoder_name = "bmp_rle" else: msg = f"Unsupported BMP compression ({file_info['compression']})" @@ -242,6 +258,7 @@ class BmpImageFile(ImageFile.ImageFile): msg = f"Unsupported BMP Palette size ({file_info['colors']})" raise OSError(msg) else: + assert isinstance(file_info["palette_padding"], int) padding = file_info["palette_padding"] palette = read(padding * file_info["colors"]) grayscale = True @@ -269,10 +286,11 @@ class BmpImageFile(ImageFile.ImageFile): # ---------------------------- Finally set the tile data for the plugin self.info["compression"] = file_info["compression"] - args = [raw_mode] + args: list[Any] = [raw_mode] if decoder_name == "bmp_rle": - args.append(file_info["compression"] == self.RLE4) + args.append(file_info["compression"] == self.COMPRESSIONS["RLE4"]) else: + assert isinstance(file_info["width"], int) args.append(((file_info["width"] * file_info["bits"] + 31) >> 3) & (~3)) args.append(file_info["direction"]) self.tile = [ diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 69e7ee548..99d7e73f1 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -485,7 +485,7 @@ class Parser: self.image = im - def __enter__(self): + def __enter__(self) -> Parser: return self def __exit__(self, *args: object) -> None: @@ -580,7 +580,7 @@ def _encode_tile(im, fp, tile: list[_Tile], bufsize, fh, exc=None): encoder.cleanup() -def _safe_read(fp, size): +def _safe_read(fp: IO[bytes], size: int) -> bytes: """ Reads large blocks in a safe way. Unlike fp.read(n), this function doesn't trust the user. If the requested size is larger than @@ -601,18 +601,18 @@ def _safe_read(fp, size): msg = "Truncated File Read" raise OSError(msg) return data - data = [] + blocks: list[bytes] = [] remaining_size = size while remaining_size > 0: block = fp.read(min(remaining_size, SAFEBLOCK)) if not block: break - data.append(block) + blocks.append(block) remaining_size -= len(block) - if sum(len(d) for d in data) < size: + if sum(len(block) for block in blocks) < size: msg = "Truncated File Read" raise OSError(msg) - return b"".join(data) + return b"".join(blocks) class PyCodecState: @@ -636,7 +636,7 @@ class PyCodec: self.mode = mode self.init(args) - def init(self, args): + def init(self, args) -> None: """ Override to perform codec specific initialization @@ -653,7 +653,7 @@ class PyCodec: """ pass - def setfd(self, fd): + def setfd(self, fd) -> None: """ Called from ImageFile to set the Python file-like object @@ -793,7 +793,7 @@ class PyEncoder(PyCodec): self.fd.write(data) return bytes_consumed, errcode - def encode_to_file(self, fh, bufsize): + def encode_to_file(self, fh: IO[bytes], bufsize: int) -> int: """ :param fh: File handle. :param bufsize: Buffer size. diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index 6aa70ced3..6b13e57a0 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -28,7 +28,7 @@ from __future__ import annotations import tkinter from io import BytesIO -from typing import Any +from typing import TYPE_CHECKING, Any, cast from . import Image, ImageFile @@ -61,7 +61,9 @@ def _get_image_from_kw(kw: dict[str, Any]) -> ImageFile.ImageFile | None: return Image.open(source) -def _pyimagingtkcall(command, photo, id): +def _pyimagingtkcall( + command: str, photo: PhotoImage | tkinter.PhotoImage, id: int +) -> None: tk = photo.tk try: tk.call(command, photo, id) @@ -215,11 +217,14 @@ class BitmapImage: :param image: A PIL image. """ - def __init__(self, image=None, **kw): + def __init__(self, image: Image.Image | None = None, **kw: Any) -> None: # Tk compatibility: file or data if image is None: image = _get_image_from_kw(kw) + if image is None: + msg = "Image is required" + raise ValueError(msg) self.__mode = image.mode self.__size = image.size @@ -278,18 +283,23 @@ def getimage(photo: PhotoImage) -> Image.Image: return im -def _show(image, title): +def _show(image: Image.Image, title: str | None) -> None: """Helper for the Image.show method.""" class UI(tkinter.Label): - def __init__(self, master, im): + def __init__(self, master: tkinter.Toplevel, im: Image.Image) -> None: + self.image: BitmapImage | PhotoImage if im.mode == "1": self.image = BitmapImage(im, foreground="white", master=master) else: self.image = PhotoImage(im, master=master) - super().__init__(master, image=self.image, bg="black", bd=0) + if TYPE_CHECKING: + image = cast(tkinter._Image, self.image) + else: + image = self.image + super().__init__(master, image=image, bg="black", bd=0) - if not tkinter._default_root: + if not getattr(tkinter, "_default_root"): msg = "tkinter not initialized" raise OSError(msg) top = tkinter.Toplevel() diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py index 992b9ccaf..eeec41686 100644 --- a/src/PIL/Jpeg2KImagePlugin.py +++ b/src/PIL/Jpeg2KImagePlugin.py @@ -29,7 +29,7 @@ class BoxReader: and to easily step into and read sub-boxes. """ - def __init__(self, fp, length=-1): + def __init__(self, fp: IO[bytes], length: int = -1) -> None: self.fp = fp self.has_length = length >= 0 self.length = length @@ -97,7 +97,7 @@ class BoxReader: return tbox -def _parse_codestream(fp) -> tuple[tuple[int, int], str]: +def _parse_codestream(fp: IO[bytes]) -> tuple[tuple[int, int], str]: """Parse the JPEG 2000 codestream to extract the size and component count from the SIZ marker segment, returning a PIL (size, mode) tuple.""" @@ -137,7 +137,15 @@ def _res_to_dpi(num: int, denom: int, exp: int) -> float | None: return (254 * num * (10**exp)) / (10000 * denom) -def _parse_jp2_header(fp): +def _parse_jp2_header( + fp: IO[bytes], +) -> tuple[ + tuple[int, int], + str, + str | None, + tuple[float, float] | None, + ImagePalette.ImagePalette | None, +]: """Parse the JP2 header box to extract size, component count, color space information, and optionally DPI information, returning a (size, mode, mimetype, dpi) tuple.""" @@ -155,6 +163,7 @@ def _parse_jp2_header(fp): elif tbox == b"ftyp": if reader.read_fields(">4s")[0] == b"jpx ": mimetype = "image/jpx" + assert header is not None size = None mode = None @@ -168,6 +177,9 @@ def _parse_jp2_header(fp): if tbox == b"ihdr": height, width, nc, bpc = header.read_fields(">IIHB") + assert isinstance(height, int) + assert isinstance(width, int) + assert isinstance(bpc, int) size = (width, height) if nc == 1 and (bpc & 0x7F) > 8: mode = "I;16" @@ -185,11 +197,21 @@ def _parse_jp2_header(fp): mode = "CMYK" elif tbox == b"pclr" and mode in ("L", "LA"): ne, npc = header.read_fields(">HB") - bitdepths = header.read_fields(">" + ("B" * npc)) - if max(bitdepths) <= 8: + assert isinstance(ne, int) + assert isinstance(npc, int) + max_bitdepth = 0 + for bitdepth in header.read_fields(">" + ("B" * npc)): + assert isinstance(bitdepth, int) + if bitdepth > max_bitdepth: + max_bitdepth = bitdepth + if max_bitdepth <= 8: palette = ImagePalette.ImagePalette() for i in range(ne): - palette.getcolor(header.read_fields(">" + ("B" * npc))) + color: list[int] = [] + for value in header.read_fields(">" + ("B" * npc)): + assert isinstance(value, int) + color.append(value) + palette.getcolor(tuple(color)) mode = "P" if mode == "L" else "PA" elif tbox == b"res ": res = header.read_boxes() @@ -197,6 +219,12 @@ def _parse_jp2_header(fp): tres = res.next_box_type() if tres == b"resc": vrcn, vrcd, hrcn, hrcd, vrce, hrce = res.read_fields(">HHHHBB") + assert isinstance(vrcn, int) + assert isinstance(vrcd, int) + assert isinstance(hrcn, int) + assert isinstance(hrcd, int) + assert isinstance(vrce, int) + assert isinstance(hrce, int) hres = _res_to_dpi(hrcn, hrcd, hrce) vres = _res_to_dpi(vrcn, vrcd, vrce) if hres is not None and vres is not None: diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index b15bf06d2..4916727be 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -60,7 +60,7 @@ def Skip(self: JpegImageFile, marker: int) -> None: ImageFile._safe_read(self.fp, n) -def APP(self, marker): +def APP(self: JpegImageFile, marker: int) -> None: # # Application marker. Store these in the APP dictionary. # Also look for well-known application markers. @@ -133,13 +133,14 @@ def APP(self, marker): offset += 4 data = s[offset : offset + size] if code == 0x03ED: # ResolutionInfo - data = { + photoshop[code] = { "XResolution": i32(data, 0) / 65536, "DisplayedUnitsX": i16(data, 4), "YResolution": i32(data, 8) / 65536, "DisplayedUnitsY": i16(data, 12), } - photoshop[code] = data + else: + photoshop[code] = data offset += size offset += offset & 1 # align except struct.error: @@ -338,6 +339,7 @@ class JpegImageFile(ImageFile.ImageFile): # Create attributes self.bits = self.layers = 0 + self._exif_offset = 0 # JPEG specifics (internal) self.layer = [] @@ -498,17 +500,17 @@ class JpegImageFile(ImageFile.ImageFile): ): self.info["dpi"] = 72, 72 - def _getmp(self): + def _getmp(self) -> dict[int, Any] | None: return _getmp(self) -def _getexif(self) -> dict[str, Any] | None: +def _getexif(self: JpegImageFile) -> dict[str, Any] | None: if "exif" not in self.info: return None return self.getexif()._get_merged_dict() -def _getmp(self): +def _getmp(self: JpegImageFile) -> dict[int, Any] | None: # Extract MP information. This method was inspired by the "highly # experimental" _getexif version that's been in use for years now, # itself based on the ImageFileDirectory class in the TIFF plugin. @@ -616,7 +618,7 @@ samplings = { # fmt: on -def get_sampling(im): +def get_sampling(im: Image.Image) -> int: # There's no subsampling when images have only 1 layer # (grayscale images) or when they are CMYK (4 layers), # so set subsampling to the default value. @@ -624,7 +626,7 @@ def get_sampling(im): # NOTE: currently Pillow can't encode JPEG to YCCK format. # If YCCK support is added in the future, subsampling code will have # to be updated (here and in JpegEncode.c) to deal with 4 layers. - if not hasattr(im, "layers") or im.layers in (1, 4): + if not isinstance(im, JpegImageFile) or im.layers in (1, 4): return -1 sampling = im.layer[0][1:3] + im.layer[1][1:3] + im.layer[2][1:3] return samplings.get(sampling, -1) diff --git a/src/PIL/MpoImagePlugin.py b/src/PIL/MpoImagePlugin.py index f21570661..5ed9f56a1 100644 --- a/src/PIL/MpoImagePlugin.py +++ b/src/PIL/MpoImagePlugin.py @@ -22,7 +22,7 @@ from __future__ import annotations import itertools import os import struct -from typing import IO +from typing import IO, Any, cast from . import ( Image, @@ -101,8 +101,11 @@ class MpoImageFile(JpegImagePlugin.JpegImageFile): JpegImagePlugin.JpegImageFile._open(self) self._after_jpeg_open() - def _after_jpeg_open(self, mpheader=None): + def _after_jpeg_open(self, mpheader: dict[int, Any] | None = None) -> None: self.mpinfo = mpheader if mpheader is not None else self._getmp() + if self.mpinfo is None: + msg = "Image appears to be a malformed MPO file" + raise ValueError(msg) self.n_frames = self.mpinfo[0xB001] self.__mpoffsets = [ mpent["DataOffset"] + self.info["mpoffset"] for mpent in self.mpinfo[0xB002] @@ -149,7 +152,10 @@ class MpoImageFile(JpegImagePlugin.JpegImageFile): return self.__frame @staticmethod - def adopt(jpeg_instance, mpheader=None): + def adopt( + jpeg_instance: JpegImagePlugin.JpegImageFile, + mpheader: dict[int, Any] | None = None, + ) -> MpoImageFile: """ Transform the instance of JpegImageFile into an instance of MpoImageFile. @@ -161,8 +167,9 @@ class MpoImageFile(JpegImagePlugin.JpegImageFile): double call to _open. """ jpeg_instance.__class__ = MpoImageFile - jpeg_instance._after_jpeg_open(mpheader) - return jpeg_instance + mpo_instance = cast(MpoImageFile, jpeg_instance) + mpo_instance._after_jpeg_open(mpheader) + return mpo_instance # --------------------------------------------------------------------- diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 34ea77c5e..fa117d19a 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -230,6 +230,7 @@ class ChunkStream: cids = [] + assert self.fp is not None while True: try: cid, pos, length = self.read() @@ -407,6 +408,7 @@ class PngStream(ChunkStream): def chunk_iCCP(self, pos: int, length: int) -> bytes: # ICC profile + assert self.fp is not None s = ImageFile._safe_read(self.fp, length) # according to PNG spec, the iCCP chunk contains: # Profile name 1-79 bytes (character string) @@ -434,6 +436,7 @@ class PngStream(ChunkStream): def chunk_IHDR(self, pos: int, length: int) -> bytes: # image header + assert self.fp is not None s = ImageFile._safe_read(self.fp, length) if length < 13: if ImageFile.LOAD_TRUNCATED_IMAGES: @@ -471,6 +474,7 @@ class PngStream(ChunkStream): def chunk_PLTE(self, pos: int, length: int) -> bytes: # palette + assert self.fp is not None s = ImageFile._safe_read(self.fp, length) if self.im_mode == "P": self.im_palette = "RGB", s @@ -478,6 +482,7 @@ class PngStream(ChunkStream): def chunk_tRNS(self, pos: int, length: int) -> bytes: # transparency + assert self.fp is not None s = ImageFile._safe_read(self.fp, length) if self.im_mode == "P": if _simple_palette.match(s): @@ -498,6 +503,7 @@ class PngStream(ChunkStream): def chunk_gAMA(self, pos: int, length: int) -> bytes: # gamma setting + assert self.fp is not None s = ImageFile._safe_read(self.fp, length) self.im_info["gamma"] = i32(s) / 100000.0 return s @@ -506,6 +512,7 @@ class PngStream(ChunkStream): # chromaticity, 8 unsigned ints, actual value is scaled by 100,000 # WP x,y, Red x,y, Green x,y Blue x,y + assert self.fp is not None s = ImageFile._safe_read(self.fp, length) raw_vals = struct.unpack(">%dI" % (len(s) // 4), s) self.im_info["chromaticity"] = tuple(elt / 100000.0 for elt in raw_vals) @@ -518,6 +525,7 @@ class PngStream(ChunkStream): # 2 saturation # 3 absolute colorimetric + assert self.fp is not None s = ImageFile._safe_read(self.fp, length) if length < 1: if ImageFile.LOAD_TRUNCATED_IMAGES: @@ -529,6 +537,7 @@ class PngStream(ChunkStream): def chunk_pHYs(self, pos: int, length: int) -> bytes: # pixels per unit + assert self.fp is not None s = ImageFile._safe_read(self.fp, length) if length < 9: if ImageFile.LOAD_TRUNCATED_IMAGES: @@ -546,6 +555,7 @@ class PngStream(ChunkStream): def chunk_tEXt(self, pos: int, length: int) -> bytes: # text + assert self.fp is not None s = ImageFile._safe_read(self.fp, length) try: k, v = s.split(b"\0", 1) @@ -554,17 +564,18 @@ class PngStream(ChunkStream): k = s v = b"" if k: - k = k.decode("latin-1", "strict") + k_str = k.decode("latin-1", "strict") v_str = v.decode("latin-1", "replace") - self.im_info[k] = v if k == "exif" else v_str - self.im_text[k] = v_str + self.im_info[k_str] = v if k == b"exif" else v_str + self.im_text[k_str] = v_str self.check_text_memory(len(v_str)) return s def chunk_zTXt(self, pos: int, length: int) -> bytes: # compressed text + assert self.fp is not None s = ImageFile._safe_read(self.fp, length) try: k, v = s.split(b"\0", 1) @@ -589,16 +600,17 @@ class PngStream(ChunkStream): v = b"" if k: - k = k.decode("latin-1", "strict") - v = v.decode("latin-1", "replace") + k_str = k.decode("latin-1", "strict") + v_str = v.decode("latin-1", "replace") - self.im_info[k] = self.im_text[k] = v - self.check_text_memory(len(v)) + self.im_info[k_str] = self.im_text[k_str] = v_str + self.check_text_memory(len(v_str)) return s def chunk_iTXt(self, pos: int, length: int) -> bytes: # international text + assert self.fp is not None r = s = ImageFile._safe_read(self.fp, length) try: k, r = r.split(b"\0", 1) @@ -627,25 +639,27 @@ class PngStream(ChunkStream): if k == b"XML:com.adobe.xmp": self.im_info["xmp"] = v try: - k = k.decode("latin-1", "strict") - lang = lang.decode("utf-8", "strict") - tk = tk.decode("utf-8", "strict") - v = v.decode("utf-8", "strict") + k_str = k.decode("latin-1", "strict") + lang_str = lang.decode("utf-8", "strict") + tk_str = tk.decode("utf-8", "strict") + v_str = v.decode("utf-8", "strict") except UnicodeError: return s - self.im_info[k] = self.im_text[k] = iTXt(v, lang, tk) - self.check_text_memory(len(v)) + self.im_info[k_str] = self.im_text[k_str] = iTXt(v_str, lang_str, tk_str) + self.check_text_memory(len(v_str)) return s def chunk_eXIf(self, pos: int, length: int) -> bytes: + assert self.fp is not None s = ImageFile._safe_read(self.fp, length) self.im_info["exif"] = b"Exif\x00\x00" + s return s # APNG chunks def chunk_acTL(self, pos: int, length: int) -> bytes: + assert self.fp is not None s = ImageFile._safe_read(self.fp, length) if length < 8: if ImageFile.LOAD_TRUNCATED_IMAGES: @@ -666,6 +680,7 @@ class PngStream(ChunkStream): return s def chunk_fcTL(self, pos: int, length: int) -> bytes: + assert self.fp is not None s = ImageFile._safe_read(self.fp, length) if length < 26: if ImageFile.LOAD_TRUNCATED_IMAGES: @@ -695,6 +710,7 @@ class PngStream(ChunkStream): return s def chunk_fdAT(self, pos: int, length: int) -> bytes: + assert self.fp is not None if length < 4: if ImageFile.LOAD_TRUNCATED_IMAGES: s = ImageFile._safe_read(self.fp, length) diff --git a/src/PIL/PsdImagePlugin.py b/src/PIL/PsdImagePlugin.py index edf698bf0..31dfd4d12 100644 --- a/src/PIL/PsdImagePlugin.py +++ b/src/PIL/PsdImagePlugin.py @@ -185,7 +185,7 @@ def _layerinfo(fp, ct_bytes): # read layerinfo block layers = [] - def read(size): + def read(size: int) -> bytes: return ImageFile._safe_read(fp, size) ct = si16(read(2)) diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index 530b88c8b..011de9c6a 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -115,7 +115,7 @@ class WebPImageFile(ImageFile.ImageFile): self.__loaded = -1 self.__timestamp = 0 - def _get_next(self): + def _get_next(self) -> tuple[bytes, int, int]: # Get next frame ret = self._decoder.get_next() self.__physical_frame += 1 diff --git a/src/PIL/WmfImagePlugin.py b/src/PIL/WmfImagePlugin.py index 3d5cddcc8..68f8a74f5 100644 --- a/src/PIL/WmfImagePlugin.py +++ b/src/PIL/WmfImagePlugin.py @@ -152,7 +152,7 @@ class WmfStubImageFile(ImageFile.StubImageFile): def _load(self) -> ImageFile.StubHandler | None: return _handler - def load(self, dpi=None): + def load(self, dpi: int | None = None) -> Image.core.PixelAccess | None: if dpi is not None and self._inch is not None: self.info["dpi"] = dpi x0, y0, x1, y1 = self.info["wmf_bbox"] diff --git a/src/PIL/_imagingtk.pyi b/src/PIL/_imagingtk.pyi new file mode 100644 index 000000000..e27843e53 --- /dev/null +++ b/src/PIL/_imagingtk.pyi @@ -0,0 +1,3 @@ +from typing import Any + +def __getattr__(name: str) -> Any: ... From 69f967301d11a5b37495542ba64633b085c9b357 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 2 Jul 2024 17:48:46 +0300 Subject: [PATCH 139/662] Call PyUnstable_Module_SetGIL() to indicate support of running with GIL disabled --- src/_imaging.c | 4 ++++ src/_imagingcms.c | 4 ++++ src/_imagingft.c | 4 ++++ src/_imagingmath.c | 4 ++++ src/_imagingmorph.c | 4 ++++ src/_imagingtk.c | 5 +++++ src/_webp.c | 4 ++++ 7 files changed, 29 insertions(+) diff --git a/src/_imaging.c b/src/_imaging.c index ddc8d2885..03e10e547 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -4448,5 +4448,9 @@ PyInit__imaging(void) { return NULL; } +#ifdef Py_GIL_DISABLED + PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED); +#endif + return m; } diff --git a/src/_imagingcms.c b/src/_imagingcms.c index 590e1b983..628662b30 100644 --- a/src/_imagingcms.c +++ b/src/_imagingcms.c @@ -1538,5 +1538,9 @@ PyInit__imagingcms(void) { PyDateTime_IMPORT; +#ifdef Py_GIL_DISABLED + PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED); +#endif + return m; } diff --git a/src/_imagingft.c b/src/_imagingft.c index ba36cc72c..1bef876e1 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -1576,5 +1576,9 @@ PyInit__imagingft(void) { return NULL; } +#ifdef Py_GIL_DISABLED + PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED); +#endif + return m; } diff --git a/src/_imagingmath.c b/src/_imagingmath.c index 067c165b2..a2ddc91b9 100644 --- a/src/_imagingmath.c +++ b/src/_imagingmath.c @@ -290,5 +290,9 @@ PyInit__imagingmath(void) { return NULL; } +#ifdef Py_GIL_DISABLED + PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED); +#endif + return m; } diff --git a/src/_imagingmorph.c b/src/_imagingmorph.c index 8815c2b7e..a95ce75bf 100644 --- a/src/_imagingmorph.c +++ b/src/_imagingmorph.c @@ -269,5 +269,9 @@ PyInit__imagingmorph(void) { m = PyModule_Create(&module_def); +#ifdef Py_GIL_DISABLED + PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED); +#endif + return m; } diff --git a/src/_imagingtk.c b/src/_imagingtk.c index efa7fc1b6..c70d044bb 100644 --- a/src/_imagingtk.c +++ b/src/_imagingtk.c @@ -62,5 +62,10 @@ PyInit__imagingtk(void) { Py_DECREF(m); return NULL; } + +#ifdef Py_GIL_DISABLED + PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED); +#endif + return m; } diff --git a/src/_webp.c b/src/_webp.c index 0a70e3357..dfa24da41 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -1005,5 +1005,9 @@ PyInit__webp(void) { return NULL; } +#ifdef Py_GIL_DISABLED + PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED); +#endif + return m; } From 377bdc0db1415dcbd664b1b9c467d995500809d2 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 2 Jul 2024 18:27:09 +0300 Subject: [PATCH 140/662] encode: Replace PyList_GetItem with PyList_GetItemRef --- src/encode.c | 5 +- src/thirdparty/pythoncapi_compat.h | 1360 ++++++++++++++++++++++++++++ 2 files changed, 1363 insertions(+), 2 deletions(-) create mode 100644 src/thirdparty/pythoncapi_compat.h diff --git a/src/encode.c b/src/encode.c index 442b5d04f..72ad3fa07 100644 --- a/src/encode.c +++ b/src/encode.c @@ -25,6 +25,7 @@ #define PY_SSIZE_T_CLEAN #include "Python.h" +#include "thirdparty/pythoncapi_compat.h" #include "libImaging/Imaging.h" #include "libImaging/Gif.h" @@ -671,7 +672,7 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { tags_size = PyList_Size(tags); TRACE(("tags size: %d\n", (int)tags_size)); for (pos = 0; pos < tags_size; pos++) { - item = PyList_GetItem(tags, pos); + item = PyList_GetItemRef(tags, pos); if (!PyTuple_Check(item) || PyTuple_Size(item) != 2) { PyErr_SetString(PyExc_ValueError, "Invalid tags list"); return NULL; @@ -703,7 +704,7 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { num_core_tags = sizeof(core_tags) / sizeof(int); for (pos = 0; pos < tags_size; pos++) { - item = PyList_GetItem(tags, pos); + item = PyList_GetItemRef(tags, pos); // We already checked that tags is a 2-tuple list. key = PyTuple_GetItem(item, 0); key_int = (int)PyLong_AsLong(key); diff --git a/src/thirdparty/pythoncapi_compat.h b/src/thirdparty/pythoncapi_compat.h new file mode 100644 index 000000000..51e8c0de7 --- /dev/null +++ b/src/thirdparty/pythoncapi_compat.h @@ -0,0 +1,1360 @@ +// Header file providing new C API functions to old Python versions. +// +// File distributed under the Zero Clause BSD (0BSD) license. +// Copyright Contributors to the pythoncapi_compat project. +// +// Homepage: +// https://github.com/python/pythoncapi_compat +// +// Latest version: +// https://raw.githubusercontent.com/python/pythoncapi_compat/master/pythoncapi_compat.h +// +// SPDX-License-Identifier: 0BSD + +#ifndef PYTHONCAPI_COMPAT +#define PYTHONCAPI_COMPAT + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +// Python 3.11.0b4 added PyFrame_Back() to Python.h +#if PY_VERSION_HEX < 0x030b00B4 && !defined(PYPY_VERSION) +# include "frameobject.h" // PyFrameObject, PyFrame_GetBack() +#endif + + +#ifndef _Py_CAST +# define _Py_CAST(type, expr) ((type)(expr)) +#endif + +// Static inline functions should use _Py_NULL rather than using directly NULL +// to prevent C++ compiler warnings. On C23 and newer and on C++11 and newer, +// _Py_NULL is defined as nullptr. +#if (defined (__STDC_VERSION__) && __STDC_VERSION__ > 201710L) \ + || (defined(__cplusplus) && __cplusplus >= 201103) +# define _Py_NULL nullptr +#else +# define _Py_NULL NULL +#endif + +// Cast argument to PyObject* type. +#ifndef _PyObject_CAST +# define _PyObject_CAST(op) _Py_CAST(PyObject*, op) +#endif + + +// bpo-42262 added Py_NewRef() to Python 3.10.0a3 +#if PY_VERSION_HEX < 0x030A00A3 && !defined(Py_NewRef) +static inline PyObject* _Py_NewRef(PyObject *obj) +{ + Py_INCREF(obj); + return obj; +} +#define Py_NewRef(obj) _Py_NewRef(_PyObject_CAST(obj)) +#endif + + +// bpo-42262 added Py_XNewRef() to Python 3.10.0a3 +#if PY_VERSION_HEX < 0x030A00A3 && !defined(Py_XNewRef) +static inline PyObject* _Py_XNewRef(PyObject *obj) +{ + Py_XINCREF(obj); + return obj; +} +#define Py_XNewRef(obj) _Py_XNewRef(_PyObject_CAST(obj)) +#endif + + +// bpo-39573 added Py_SET_REFCNT() to Python 3.9.0a4 +#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_REFCNT) +static inline void _Py_SET_REFCNT(PyObject *ob, Py_ssize_t refcnt) +{ + ob->ob_refcnt = refcnt; +} +#define Py_SET_REFCNT(ob, refcnt) _Py_SET_REFCNT(_PyObject_CAST(ob), refcnt) +#endif + + +// Py_SETREF() and Py_XSETREF() were added to Python 3.5.2. +// It is excluded from the limited C API. +#if (PY_VERSION_HEX < 0x03050200 && !defined(Py_SETREF)) && !defined(Py_LIMITED_API) +#define Py_SETREF(dst, src) \ + do { \ + PyObject **_tmp_dst_ptr = _Py_CAST(PyObject**, &(dst)); \ + PyObject *_tmp_dst = (*_tmp_dst_ptr); \ + *_tmp_dst_ptr = _PyObject_CAST(src); \ + Py_DECREF(_tmp_dst); \ + } while (0) + +#define Py_XSETREF(dst, src) \ + do { \ + PyObject **_tmp_dst_ptr = _Py_CAST(PyObject**, &(dst)); \ + PyObject *_tmp_dst = (*_tmp_dst_ptr); \ + *_tmp_dst_ptr = _PyObject_CAST(src); \ + Py_XDECREF(_tmp_dst); \ + } while (0) +#endif + + +// bpo-43753 added Py_Is(), Py_IsNone(), Py_IsTrue() and Py_IsFalse() +// to Python 3.10.0b1. +#if PY_VERSION_HEX < 0x030A00B1 && !defined(Py_Is) +# define Py_Is(x, y) ((x) == (y)) +#endif +#if PY_VERSION_HEX < 0x030A00B1 && !defined(Py_IsNone) +# define Py_IsNone(x) Py_Is(x, Py_None) +#endif +#if (PY_VERSION_HEX < 0x030A00B1 || defined(PYPY_VERSION)) && !defined(Py_IsTrue) +# define Py_IsTrue(x) Py_Is(x, Py_True) +#endif +#if (PY_VERSION_HEX < 0x030A00B1 || defined(PYPY_VERSION)) && !defined(Py_IsFalse) +# define Py_IsFalse(x) Py_Is(x, Py_False) +#endif + + +// bpo-39573 added Py_SET_TYPE() to Python 3.9.0a4 +#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_TYPE) +static inline void _Py_SET_TYPE(PyObject *ob, PyTypeObject *type) +{ + ob->ob_type = type; +} +#define Py_SET_TYPE(ob, type) _Py_SET_TYPE(_PyObject_CAST(ob), type) +#endif + + +// bpo-39573 added Py_SET_SIZE() to Python 3.9.0a4 +#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_SIZE) +static inline void _Py_SET_SIZE(PyVarObject *ob, Py_ssize_t size) +{ + ob->ob_size = size; +} +#define Py_SET_SIZE(ob, size) _Py_SET_SIZE((PyVarObject*)(ob), size) +#endif + + +// bpo-40421 added PyFrame_GetCode() to Python 3.9.0b1 +#if PY_VERSION_HEX < 0x030900B1 || defined(PYPY_VERSION) +static inline PyCodeObject* PyFrame_GetCode(PyFrameObject *frame) +{ + assert(frame != _Py_NULL); + assert(frame->f_code != _Py_NULL); + return _Py_CAST(PyCodeObject*, Py_NewRef(frame->f_code)); +} +#endif + +static inline PyCodeObject* _PyFrame_GetCodeBorrow(PyFrameObject *frame) +{ + PyCodeObject *code = PyFrame_GetCode(frame); + Py_DECREF(code); + return code; +} + + +// bpo-40421 added PyFrame_GetBack() to Python 3.9.0b1 +#if PY_VERSION_HEX < 0x030900B1 && !defined(PYPY_VERSION) +static inline PyFrameObject* PyFrame_GetBack(PyFrameObject *frame) +{ + assert(frame != _Py_NULL); + return _Py_CAST(PyFrameObject*, Py_XNewRef(frame->f_back)); +} +#endif + +#if !defined(PYPY_VERSION) +static inline PyFrameObject* _PyFrame_GetBackBorrow(PyFrameObject *frame) +{ + PyFrameObject *back = PyFrame_GetBack(frame); + Py_XDECREF(back); + return back; +} +#endif + + +// bpo-40421 added PyFrame_GetLocals() to Python 3.11.0a7 +#if PY_VERSION_HEX < 0x030B00A7 && !defined(PYPY_VERSION) +static inline PyObject* PyFrame_GetLocals(PyFrameObject *frame) +{ +#if PY_VERSION_HEX >= 0x030400B1 + if (PyFrame_FastToLocalsWithError(frame) < 0) { + return NULL; + } +#else + PyFrame_FastToLocals(frame); +#endif + return Py_NewRef(frame->f_locals); +} +#endif + + +// bpo-40421 added PyFrame_GetGlobals() to Python 3.11.0a7 +#if PY_VERSION_HEX < 0x030B00A7 && !defined(PYPY_VERSION) +static inline PyObject* PyFrame_GetGlobals(PyFrameObject *frame) +{ + return Py_NewRef(frame->f_globals); +} +#endif + + +// bpo-40421 added PyFrame_GetBuiltins() to Python 3.11.0a7 +#if PY_VERSION_HEX < 0x030B00A7 && !defined(PYPY_VERSION) +static inline PyObject* PyFrame_GetBuiltins(PyFrameObject *frame) +{ + return Py_NewRef(frame->f_builtins); +} +#endif + + +// bpo-40421 added PyFrame_GetLasti() to Python 3.11.0b1 +#if PY_VERSION_HEX < 0x030B00B1 && !defined(PYPY_VERSION) +static inline int PyFrame_GetLasti(PyFrameObject *frame) +{ +#if PY_VERSION_HEX >= 0x030A00A7 + // bpo-27129: Since Python 3.10.0a7, f_lasti is an instruction offset, + // not a bytes offset anymore. Python uses 16-bit "wordcode" (2 bytes) + // instructions. + if (frame->f_lasti < 0) { + return -1; + } + return frame->f_lasti * 2; +#else + return frame->f_lasti; +#endif +} +#endif + + +// gh-91248 added PyFrame_GetVar() to Python 3.12.0a2 +#if PY_VERSION_HEX < 0x030C00A2 && !defined(PYPY_VERSION) +static inline PyObject* PyFrame_GetVar(PyFrameObject *frame, PyObject *name) +{ + PyObject *locals, *value; + + locals = PyFrame_GetLocals(frame); + if (locals == NULL) { + return NULL; + } +#if PY_VERSION_HEX >= 0x03000000 + value = PyDict_GetItemWithError(locals, name); +#else + value = _PyDict_GetItemWithError(locals, name); +#endif + Py_DECREF(locals); + + if (value == NULL) { + if (PyErr_Occurred()) { + return NULL; + } +#if PY_VERSION_HEX >= 0x03000000 + PyErr_Format(PyExc_NameError, "variable %R does not exist", name); +#else + PyErr_SetString(PyExc_NameError, "variable does not exist"); +#endif + return NULL; + } + return Py_NewRef(value); +} +#endif + + +// gh-91248 added PyFrame_GetVarString() to Python 3.12.0a2 +#if PY_VERSION_HEX < 0x030C00A2 && !defined(PYPY_VERSION) +static inline PyObject* +PyFrame_GetVarString(PyFrameObject *frame, const char *name) +{ + PyObject *name_obj, *value; +#if PY_VERSION_HEX >= 0x03000000 + name_obj = PyUnicode_FromString(name); +#else + name_obj = PyString_FromString(name); +#endif + if (name_obj == NULL) { + return NULL; + } + value = PyFrame_GetVar(frame, name_obj); + Py_DECREF(name_obj); + return value; +} +#endif + + +// bpo-39947 added PyThreadState_GetInterpreter() to Python 3.9.0a5 +#if PY_VERSION_HEX < 0x030900A5 || defined(PYPY_VERSION) +static inline PyInterpreterState * +PyThreadState_GetInterpreter(PyThreadState *tstate) +{ + assert(tstate != _Py_NULL); + return tstate->interp; +} +#endif + + +// bpo-40429 added PyThreadState_GetFrame() to Python 3.9.0b1 +#if PY_VERSION_HEX < 0x030900B1 && !defined(PYPY_VERSION) +static inline PyFrameObject* PyThreadState_GetFrame(PyThreadState *tstate) +{ + assert(tstate != _Py_NULL); + return _Py_CAST(PyFrameObject *, Py_XNewRef(tstate->frame)); +} +#endif + +#if !defined(PYPY_VERSION) +static inline PyFrameObject* +_PyThreadState_GetFrameBorrow(PyThreadState *tstate) +{ + PyFrameObject *frame = PyThreadState_GetFrame(tstate); + Py_XDECREF(frame); + return frame; +} +#endif + + +// bpo-39947 added PyInterpreterState_Get() to Python 3.9.0a5 +#if PY_VERSION_HEX < 0x030900A5 || defined(PYPY_VERSION) +static inline PyInterpreterState* PyInterpreterState_Get(void) +{ + PyThreadState *tstate; + PyInterpreterState *interp; + + tstate = PyThreadState_GET(); + if (tstate == _Py_NULL) { + Py_FatalError("GIL released (tstate is NULL)"); + } + interp = tstate->interp; + if (interp == _Py_NULL) { + Py_FatalError("no current interpreter"); + } + return interp; +} +#endif + + +// bpo-39947 added PyInterpreterState_Get() to Python 3.9.0a6 +#if 0x030700A1 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x030900A6 && !defined(PYPY_VERSION) +static inline uint64_t PyThreadState_GetID(PyThreadState *tstate) +{ + assert(tstate != _Py_NULL); + return tstate->id; +} +#endif + +// bpo-43760 added PyThreadState_EnterTracing() to Python 3.11.0a2 +#if PY_VERSION_HEX < 0x030B00A2 && !defined(PYPY_VERSION) +static inline void PyThreadState_EnterTracing(PyThreadState *tstate) +{ + tstate->tracing++; +#if PY_VERSION_HEX >= 0x030A00A1 + tstate->cframe->use_tracing = 0; +#else + tstate->use_tracing = 0; +#endif +} +#endif + +// bpo-43760 added PyThreadState_LeaveTracing() to Python 3.11.0a2 +#if PY_VERSION_HEX < 0x030B00A2 && !defined(PYPY_VERSION) +static inline void PyThreadState_LeaveTracing(PyThreadState *tstate) +{ + int use_tracing = (tstate->c_tracefunc != _Py_NULL + || tstate->c_profilefunc != _Py_NULL); + tstate->tracing--; +#if PY_VERSION_HEX >= 0x030A00A1 + tstate->cframe->use_tracing = use_tracing; +#else + tstate->use_tracing = use_tracing; +#endif +} +#endif + + +// bpo-37194 added PyObject_CallNoArgs() to Python 3.9.0a1 +// PyObject_CallNoArgs() added to PyPy 3.9.16-v7.3.11 +#if !defined(PyObject_CallNoArgs) && PY_VERSION_HEX < 0x030900A1 +static inline PyObject* PyObject_CallNoArgs(PyObject *func) +{ + return PyObject_CallFunctionObjArgs(func, NULL); +} +#endif + + +// bpo-39245 made PyObject_CallOneArg() public (previously called +// _PyObject_CallOneArg) in Python 3.9.0a4 +// PyObject_CallOneArg() added to PyPy 3.9.16-v7.3.11 +#if !defined(PyObject_CallOneArg) && PY_VERSION_HEX < 0x030900A4 +static inline PyObject* PyObject_CallOneArg(PyObject *func, PyObject *arg) +{ + return PyObject_CallFunctionObjArgs(func, arg, NULL); +} +#endif + + +// bpo-1635741 added PyModule_AddObjectRef() to Python 3.10.0a3 +#if PY_VERSION_HEX < 0x030A00A3 +static inline int +PyModule_AddObjectRef(PyObject *module, const char *name, PyObject *value) +{ + int res; + + if (!value && !PyErr_Occurred()) { + // PyModule_AddObject() raises TypeError in this case + PyErr_SetString(PyExc_SystemError, + "PyModule_AddObjectRef() must be called " + "with an exception raised if value is NULL"); + return -1; + } + + Py_XINCREF(value); + res = PyModule_AddObject(module, name, value); + if (res < 0) { + Py_XDECREF(value); + } + return res; +} +#endif + + +// bpo-40024 added PyModule_AddType() to Python 3.9.0a5 +#if PY_VERSION_HEX < 0x030900A5 +static inline int PyModule_AddType(PyObject *module, PyTypeObject *type) +{ + const char *name, *dot; + + if (PyType_Ready(type) < 0) { + return -1; + } + + // inline _PyType_Name() + name = type->tp_name; + assert(name != _Py_NULL); + dot = strrchr(name, '.'); + if (dot != _Py_NULL) { + name = dot + 1; + } + + return PyModule_AddObjectRef(module, name, _PyObject_CAST(type)); +} +#endif + + +// bpo-40241 added PyObject_GC_IsTracked() to Python 3.9.0a6. +// bpo-4688 added _PyObject_GC_IS_TRACKED() to Python 2.7.0a2. +#if PY_VERSION_HEX < 0x030900A6 && !defined(PYPY_VERSION) +static inline int PyObject_GC_IsTracked(PyObject* obj) +{ + return (PyObject_IS_GC(obj) && _PyObject_GC_IS_TRACKED(obj)); +} +#endif + +// bpo-40241 added PyObject_GC_IsFinalized() to Python 3.9.0a6. +// bpo-18112 added _PyGCHead_FINALIZED() to Python 3.4.0 final. +#if PY_VERSION_HEX < 0x030900A6 && PY_VERSION_HEX >= 0x030400F0 && !defined(PYPY_VERSION) +static inline int PyObject_GC_IsFinalized(PyObject *obj) +{ + PyGC_Head *gc = _Py_CAST(PyGC_Head*, obj) - 1; + return (PyObject_IS_GC(obj) && _PyGCHead_FINALIZED(gc)); +} +#endif + + +// bpo-39573 added Py_IS_TYPE() to Python 3.9.0a4 +#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_IS_TYPE) +static inline int _Py_IS_TYPE(PyObject *ob, PyTypeObject *type) { + return Py_TYPE(ob) == type; +} +#define Py_IS_TYPE(ob, type) _Py_IS_TYPE(_PyObject_CAST(ob), type) +#endif + + +// bpo-46906 added PyFloat_Pack2() and PyFloat_Unpack2() to Python 3.11a7. +// bpo-11734 added _PyFloat_Pack2() and _PyFloat_Unpack2() to Python 3.6.0b1. +// Python 3.11a2 moved _PyFloat_Pack2() and _PyFloat_Unpack2() to the internal +// C API: Python 3.11a2-3.11a6 versions are not supported. +#if 0x030600B1 <= PY_VERSION_HEX && PY_VERSION_HEX <= 0x030B00A1 && !defined(PYPY_VERSION) +static inline int PyFloat_Pack2(double x, char *p, int le) +{ return _PyFloat_Pack2(x, (unsigned char*)p, le); } + +static inline double PyFloat_Unpack2(const char *p, int le) +{ return _PyFloat_Unpack2((const unsigned char *)p, le); } +#endif + + +// bpo-46906 added PyFloat_Pack4(), PyFloat_Pack8(), PyFloat_Unpack4() and +// PyFloat_Unpack8() to Python 3.11a7. +// Python 3.11a2 moved _PyFloat_Pack4(), _PyFloat_Pack8(), _PyFloat_Unpack4() +// and _PyFloat_Unpack8() to the internal C API: Python 3.11a2-3.11a6 versions +// are not supported. +#if PY_VERSION_HEX <= 0x030B00A1 && !defined(PYPY_VERSION) +static inline int PyFloat_Pack4(double x, char *p, int le) +{ return _PyFloat_Pack4(x, (unsigned char*)p, le); } + +static inline int PyFloat_Pack8(double x, char *p, int le) +{ return _PyFloat_Pack8(x, (unsigned char*)p, le); } + +static inline double PyFloat_Unpack4(const char *p, int le) +{ return _PyFloat_Unpack4((const unsigned char *)p, le); } + +static inline double PyFloat_Unpack8(const char *p, int le) +{ return _PyFloat_Unpack8((const unsigned char *)p, le); } +#endif + + +// gh-92154 added PyCode_GetCode() to Python 3.11.0b1 +#if PY_VERSION_HEX < 0x030B00B1 && !defined(PYPY_VERSION) +static inline PyObject* PyCode_GetCode(PyCodeObject *code) +{ + return Py_NewRef(code->co_code); +} +#endif + + +// gh-95008 added PyCode_GetVarnames() to Python 3.11.0rc1 +#if PY_VERSION_HEX < 0x030B00C1 && !defined(PYPY_VERSION) +static inline PyObject* PyCode_GetVarnames(PyCodeObject *code) +{ + return Py_NewRef(code->co_varnames); +} +#endif + +// gh-95008 added PyCode_GetFreevars() to Python 3.11.0rc1 +#if PY_VERSION_HEX < 0x030B00C1 && !defined(PYPY_VERSION) +static inline PyObject* PyCode_GetFreevars(PyCodeObject *code) +{ + return Py_NewRef(code->co_freevars); +} +#endif + +// gh-95008 added PyCode_GetCellvars() to Python 3.11.0rc1 +#if PY_VERSION_HEX < 0x030B00C1 && !defined(PYPY_VERSION) +static inline PyObject* PyCode_GetCellvars(PyCodeObject *code) +{ + return Py_NewRef(code->co_cellvars); +} +#endif + + +// Py_UNUSED() was added to Python 3.4.0b2. +#if PY_VERSION_HEX < 0x030400B2 && !defined(Py_UNUSED) +# if defined(__GNUC__) || defined(__clang__) +# define Py_UNUSED(name) _unused_ ## name __attribute__((unused)) +# else +# define Py_UNUSED(name) _unused_ ## name +# endif +#endif + + +// gh-105922 added PyImport_AddModuleRef() to Python 3.13.0a1 +#if PY_VERSION_HEX < 0x030D00A0 +static inline PyObject* PyImport_AddModuleRef(const char *name) +{ + return Py_XNewRef(PyImport_AddModule(name)); +} +#endif + + +// gh-105927 added PyWeakref_GetRef() to Python 3.13.0a1 +#if PY_VERSION_HEX < 0x030D0000 +static inline int PyWeakref_GetRef(PyObject *ref, PyObject **pobj) +{ + PyObject *obj; + if (ref != NULL && !PyWeakref_Check(ref)) { + *pobj = NULL; + PyErr_SetString(PyExc_TypeError, "expected a weakref"); + return -1; + } + obj = PyWeakref_GetObject(ref); + if (obj == NULL) { + // SystemError if ref is NULL + *pobj = NULL; + return -1; + } + if (obj == Py_None) { + *pobj = NULL; + return 0; + } + *pobj = Py_NewRef(obj); + return (*pobj != NULL); +} +#endif + + +// bpo-36974 added PY_VECTORCALL_ARGUMENTS_OFFSET to Python 3.8b1 +#ifndef PY_VECTORCALL_ARGUMENTS_OFFSET +# define PY_VECTORCALL_ARGUMENTS_OFFSET (_Py_CAST(size_t, 1) << (8 * sizeof(size_t) - 1)) +#endif + +// bpo-36974 added PyVectorcall_NARGS() to Python 3.8b1 +#if PY_VERSION_HEX < 0x030800B1 +static inline Py_ssize_t PyVectorcall_NARGS(size_t n) +{ + return n & ~PY_VECTORCALL_ARGUMENTS_OFFSET; +} +#endif + + +// gh-105922 added PyObject_Vectorcall() to Python 3.9.0a4 +#if PY_VERSION_HEX < 0x030900A4 +static inline PyObject* +PyObject_Vectorcall(PyObject *callable, PyObject *const *args, + size_t nargsf, PyObject *kwnames) +{ +#if PY_VERSION_HEX >= 0x030800B1 && !defined(PYPY_VERSION) + // bpo-36974 added _PyObject_Vectorcall() to Python 3.8.0b1 + return _PyObject_Vectorcall(callable, args, nargsf, kwnames); +#else + PyObject *posargs = NULL, *kwargs = NULL; + PyObject *res; + Py_ssize_t nposargs, nkwargs, i; + + if (nargsf != 0 && args == NULL) { + PyErr_BadInternalCall(); + goto error; + } + if (kwnames != NULL && !PyTuple_Check(kwnames)) { + PyErr_BadInternalCall(); + goto error; + } + + nposargs = (Py_ssize_t)PyVectorcall_NARGS(nargsf); + if (kwnames) { + nkwargs = PyTuple_GET_SIZE(kwnames); + } + else { + nkwargs = 0; + } + + posargs = PyTuple_New(nposargs); + if (posargs == NULL) { + goto error; + } + if (nposargs) { + for (i=0; i < nposargs; i++) { + PyTuple_SET_ITEM(posargs, i, Py_NewRef(*args)); + args++; + } + } + + if (nkwargs) { + kwargs = PyDict_New(); + if (kwargs == NULL) { + goto error; + } + + for (i = 0; i < nkwargs; i++) { + PyObject *key = PyTuple_GET_ITEM(kwnames, i); + PyObject *value = *args; + args++; + if (PyDict_SetItem(kwargs, key, value) < 0) { + goto error; + } + } + } + else { + kwargs = NULL; + } + + res = PyObject_Call(callable, posargs, kwargs); + Py_DECREF(posargs); + Py_XDECREF(kwargs); + return res; + +error: + Py_DECREF(posargs); + Py_XDECREF(kwargs); + return NULL; +#endif +} +#endif + + +// gh-106521 added PyObject_GetOptionalAttr() and +// PyObject_GetOptionalAttrString() to Python 3.13.0a1 +#if PY_VERSION_HEX < 0x030D00A1 +static inline int +PyObject_GetOptionalAttr(PyObject *obj, PyObject *attr_name, PyObject **result) +{ + // bpo-32571 added _PyObject_LookupAttr() to Python 3.7.0b1 +#if PY_VERSION_HEX >= 0x030700B1 && !defined(PYPY_VERSION) + return _PyObject_LookupAttr(obj, attr_name, result); +#else + *result = PyObject_GetAttr(obj, attr_name); + if (*result != NULL) { + return 1; + } + if (!PyErr_Occurred()) { + return 0; + } + if (PyErr_ExceptionMatches(PyExc_AttributeError)) { + PyErr_Clear(); + return 0; + } + return -1; +#endif +} + +static inline int +PyObject_GetOptionalAttrString(PyObject *obj, const char *attr_name, PyObject **result) +{ + PyObject *name_obj; + int rc; +#if PY_VERSION_HEX >= 0x03000000 + name_obj = PyUnicode_FromString(attr_name); +#else + name_obj = PyString_FromString(attr_name); +#endif + if (name_obj == NULL) { + *result = NULL; + return -1; + } + rc = PyObject_GetOptionalAttr(obj, name_obj, result); + Py_DECREF(name_obj); + return rc; +} +#endif + + +// gh-106307 added PyObject_GetOptionalAttr() and +// PyMapping_GetOptionalItemString() to Python 3.13.0a1 +#if PY_VERSION_HEX < 0x030D00A1 +static inline int +PyMapping_GetOptionalItem(PyObject *obj, PyObject *key, PyObject **result) +{ + *result = PyObject_GetItem(obj, key); + if (*result) { + return 1; + } + if (!PyErr_ExceptionMatches(PyExc_KeyError)) { + return -1; + } + PyErr_Clear(); + return 0; +} + +static inline int +PyMapping_GetOptionalItemString(PyObject *obj, const char *key, PyObject **result) +{ + PyObject *key_obj; + int rc; +#if PY_VERSION_HEX >= 0x03000000 + key_obj = PyUnicode_FromString(key); +#else + key_obj = PyString_FromString(key); +#endif + if (key_obj == NULL) { + *result = NULL; + return -1; + } + rc = PyMapping_GetOptionalItem(obj, key_obj, result); + Py_DECREF(key_obj); + return rc; +} +#endif + +// gh-108511 added PyMapping_HasKeyWithError() and +// PyMapping_HasKeyStringWithError() to Python 3.13.0a1 +#if PY_VERSION_HEX < 0x030D00A1 +static inline int +PyMapping_HasKeyWithError(PyObject *obj, PyObject *key) +{ + PyObject *res; + int rc = PyMapping_GetOptionalItem(obj, key, &res); + Py_XDECREF(res); + return rc; +} + +static inline int +PyMapping_HasKeyStringWithError(PyObject *obj, const char *key) +{ + PyObject *res; + int rc = PyMapping_GetOptionalItemString(obj, key, &res); + Py_XDECREF(res); + return rc; +} +#endif + + +// gh-108511 added PyObject_HasAttrWithError() and +// PyObject_HasAttrStringWithError() to Python 3.13.0a1 +#if PY_VERSION_HEX < 0x030D00A1 +static inline int +PyObject_HasAttrWithError(PyObject *obj, PyObject *attr) +{ + PyObject *res; + int rc = PyObject_GetOptionalAttr(obj, attr, &res); + Py_XDECREF(res); + return rc; +} + +static inline int +PyObject_HasAttrStringWithError(PyObject *obj, const char *attr) +{ + PyObject *res; + int rc = PyObject_GetOptionalAttrString(obj, attr, &res); + Py_XDECREF(res); + return rc; +} +#endif + + +// gh-106004 added PyDict_GetItemRef() and PyDict_GetItemStringRef() +// to Python 3.13.0a1 +#if PY_VERSION_HEX < 0x030D00A1 +static inline int +PyDict_GetItemRef(PyObject *mp, PyObject *key, PyObject **result) +{ +#if PY_VERSION_HEX >= 0x03000000 + PyObject *item = PyDict_GetItemWithError(mp, key); +#else + PyObject *item = _PyDict_GetItemWithError(mp, key); +#endif + if (item != NULL) { + *result = Py_NewRef(item); + return 1; // found + } + if (!PyErr_Occurred()) { + *result = NULL; + return 0; // not found + } + *result = NULL; + return -1; +} + +static inline int +PyDict_GetItemStringRef(PyObject *mp, const char *key, PyObject **result) +{ + int res; +#if PY_VERSION_HEX >= 0x03000000 + PyObject *key_obj = PyUnicode_FromString(key); +#else + PyObject *key_obj = PyString_FromString(key); +#endif + if (key_obj == NULL) { + *result = NULL; + return -1; + } + res = PyDict_GetItemRef(mp, key_obj, result); + Py_DECREF(key_obj); + return res; +} +#endif + + +// gh-106307 added PyModule_Add() to Python 3.13.0a1 +#if PY_VERSION_HEX < 0x030D00A1 +static inline int +PyModule_Add(PyObject *mod, const char *name, PyObject *value) +{ + int res = PyModule_AddObjectRef(mod, name, value); + Py_XDECREF(value); + return res; +} +#endif + + +// gh-108014 added Py_IsFinalizing() to Python 3.13.0a1 +// bpo-1856 added _Py_Finalizing to Python 3.2.1b1. +// _Py_IsFinalizing() was added to PyPy 7.3.0. +#if (0x030201B1 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x030D00A1) \ + && (!defined(PYPY_VERSION_NUM) || PYPY_VERSION_NUM >= 0x7030000) +static inline int Py_IsFinalizing(void) +{ +#if PY_VERSION_HEX >= 0x030700A1 + // _Py_IsFinalizing() was added to Python 3.7.0a1. + return _Py_IsFinalizing(); +#else + return (_Py_Finalizing != NULL); +#endif +} +#endif + + +// gh-108323 added PyDict_ContainsString() to Python 3.13.0a1 +#if PY_VERSION_HEX < 0x030D00A1 +static inline int PyDict_ContainsString(PyObject *op, const char *key) +{ + PyObject *key_obj = PyUnicode_FromString(key); + if (key_obj == NULL) { + return -1; + } + int res = PyDict_Contains(op, key_obj); + Py_DECREF(key_obj); + return res; +} +#endif + + +// gh-108445 added PyLong_AsInt() to Python 3.13.0a1 +#if PY_VERSION_HEX < 0x030D00A1 +static inline int PyLong_AsInt(PyObject *obj) +{ +#ifdef PYPY_VERSION + long value = PyLong_AsLong(obj); + if (value == -1 && PyErr_Occurred()) { + return -1; + } + if (value < (long)INT_MIN || (long)INT_MAX < value) { + PyErr_SetString(PyExc_OverflowError, + "Python int too large to convert to C int"); + return -1; + } + return (int)value; +#else + return _PyLong_AsInt(obj); +#endif +} +#endif + + +// gh-107073 added PyObject_VisitManagedDict() to Python 3.13.0a1 +#if PY_VERSION_HEX < 0x030D00A1 +static inline int +PyObject_VisitManagedDict(PyObject *obj, visitproc visit, void *arg) +{ + PyObject **dict = _PyObject_GetDictPtr(obj); + if (*dict == NULL) { + return -1; + } + Py_VISIT(*dict); + return 0; +} + +static inline void +PyObject_ClearManagedDict(PyObject *obj) +{ + PyObject **dict = _PyObject_GetDictPtr(obj); + if (*dict == NULL) { + return; + } + Py_CLEAR(*dict); +} +#endif + +// gh-108867 added PyThreadState_GetUnchecked() to Python 3.13.0a1 +// Python 3.5.2 added _PyThreadState_UncheckedGet(). +#if PY_VERSION_HEX >= 0x03050200 && PY_VERSION_HEX < 0x030D00A1 +static inline PyThreadState* +PyThreadState_GetUnchecked(void) +{ + return _PyThreadState_UncheckedGet(); +} +#endif + +// gh-110289 added PyUnicode_EqualToUTF8() and PyUnicode_EqualToUTF8AndSize() +// to Python 3.13.0a1 +#if PY_VERSION_HEX < 0x030D00A1 +static inline int +PyUnicode_EqualToUTF8AndSize(PyObject *unicode, const char *str, Py_ssize_t str_len) +{ + Py_ssize_t len; + const void *utf8; + PyObject *exc_type, *exc_value, *exc_tb; + int res; + + // API cannot report errors so save/restore the exception + PyErr_Fetch(&exc_type, &exc_value, &exc_tb); + + // Python 3.3.0a1 added PyUnicode_AsUTF8AndSize() +#if PY_VERSION_HEX >= 0x030300A1 + if (PyUnicode_IS_ASCII(unicode)) { + utf8 = PyUnicode_DATA(unicode); + len = PyUnicode_GET_LENGTH(unicode); + } + else { + utf8 = PyUnicode_AsUTF8AndSize(unicode, &len); + if (utf8 == NULL) { + // Memory allocation failure. The API cannot report error, + // so ignore the exception and return 0. + res = 0; + goto done; + } + } + + if (len != str_len) { + res = 0; + goto done; + } + res = (memcmp(utf8, str, (size_t)len) == 0); +#else + PyObject *bytes = PyUnicode_AsUTF8String(unicode); + if (bytes == NULL) { + // Memory allocation failure. The API cannot report error, + // so ignore the exception and return 0. + res = 0; + goto done; + } + +#if PY_VERSION_HEX >= 0x03000000 + len = PyBytes_GET_SIZE(bytes); + utf8 = PyBytes_AS_STRING(bytes); +#else + len = PyString_GET_SIZE(bytes); + utf8 = PyString_AS_STRING(bytes); +#endif + if (len != str_len) { + Py_DECREF(bytes); + res = 0; + goto done; + } + + res = (memcmp(utf8, str, (size_t)len) == 0); + Py_DECREF(bytes); +#endif + +done: + PyErr_Restore(exc_type, exc_value, exc_tb); + return res; +} + +static inline int +PyUnicode_EqualToUTF8(PyObject *unicode, const char *str) +{ + return PyUnicode_EqualToUTF8AndSize(unicode, str, (Py_ssize_t)strlen(str)); +} +#endif + + +// gh-111138 added PyList_Extend() and PyList_Clear() to Python 3.13.0a2 +#if PY_VERSION_HEX < 0x030D00A2 +static inline int +PyList_Extend(PyObject *list, PyObject *iterable) +{ + return PyList_SetSlice(list, PY_SSIZE_T_MAX, PY_SSIZE_T_MAX, iterable); +} + +static inline int +PyList_Clear(PyObject *list) +{ + return PyList_SetSlice(list, 0, PY_SSIZE_T_MAX, NULL); +} +#endif + +// gh-111262 added PyDict_Pop() and PyDict_PopString() to Python 3.13.0a2 +#if PY_VERSION_HEX < 0x030D00A2 +static inline int +PyDict_Pop(PyObject *dict, PyObject *key, PyObject **result) +{ + PyObject *value; + + if (!PyDict_Check(dict)) { + PyErr_BadInternalCall(); + if (result) { + *result = NULL; + } + return -1; + } + + // bpo-16991 added _PyDict_Pop() to Python 3.5.0b2. + // Python 3.6.0b3 changed _PyDict_Pop() first argument type to PyObject*. + // Python 3.13.0a1 removed _PyDict_Pop(). +#if defined(PYPY_VERSION) || PY_VERSION_HEX < 0x030500b2 || PY_VERSION_HEX >= 0x030D0000 + value = PyObject_CallMethod(dict, "pop", "O", key); +#elif PY_VERSION_HEX < 0x030600b3 + value = _PyDict_Pop(_Py_CAST(PyDictObject*, dict), key, NULL); +#else + value = _PyDict_Pop(dict, key, NULL); +#endif + if (value == NULL) { + if (result) { + *result = NULL; + } + if (PyErr_Occurred() && !PyErr_ExceptionMatches(PyExc_KeyError)) { + return -1; + } + PyErr_Clear(); + return 0; + } + if (result) { + *result = value; + } + else { + Py_DECREF(value); + } + return 1; +} + +static inline int +PyDict_PopString(PyObject *dict, const char *key, PyObject **result) +{ + PyObject *key_obj = PyUnicode_FromString(key); + if (key_obj == NULL) { + if (result != NULL) { + *result = NULL; + } + return -1; + } + + int res = PyDict_Pop(dict, key_obj, result); + Py_DECREF(key_obj); + return res; +} +#endif + + +#if PY_VERSION_HEX < 0x030200A4 +// Python 3.2.0a4 added Py_hash_t type +typedef Py_ssize_t Py_hash_t; +#endif + + +// gh-111545 added Py_HashPointer() to Python 3.13.0a3 +#if PY_VERSION_HEX < 0x030D00A3 +static inline Py_hash_t Py_HashPointer(const void *ptr) +{ +#if PY_VERSION_HEX >= 0x030900A4 && !defined(PYPY_VERSION) + return _Py_HashPointer(ptr); +#else + return _Py_HashPointer(_Py_CAST(void*, ptr)); +#endif +} +#endif + + +// Python 3.13a4 added a PyTime API. +// Use the private API added to Python 3.5. +#if PY_VERSION_HEX < 0x030D00A4 && PY_VERSION_HEX >= 0x03050000 +typedef _PyTime_t PyTime_t; +#define PyTime_MIN _PyTime_MIN +#define PyTime_MAX _PyTime_MAX + +static inline double PyTime_AsSecondsDouble(PyTime_t t) +{ return _PyTime_AsSecondsDouble(t); } + +static inline int PyTime_Monotonic(PyTime_t *result) +{ return _PyTime_GetMonotonicClockWithInfo(result, NULL); } + +static inline int PyTime_Time(PyTime_t *result) +{ return _PyTime_GetSystemClockWithInfo(result, NULL); } + +static inline int PyTime_PerfCounter(PyTime_t *result) +{ +#if PY_VERSION_HEX >= 0x03070000 && !defined(PYPY_VERSION) + return _PyTime_GetPerfCounterWithInfo(result, NULL); +#elif PY_VERSION_HEX >= 0x03070000 + // Call time.perf_counter_ns() and convert Python int object to PyTime_t. + // Cache time.perf_counter_ns() function for best performance. + static PyObject *func = NULL; + if (func == NULL) { + PyObject *mod = PyImport_ImportModule("time"); + if (mod == NULL) { + return -1; + } + + func = PyObject_GetAttrString(mod, "perf_counter_ns"); + Py_DECREF(mod); + if (func == NULL) { + return -1; + } + } + + PyObject *res = PyObject_CallNoArgs(func); + if (res == NULL) { + return -1; + } + long long value = PyLong_AsLongLong(res); + Py_DECREF(res); + + if (value == -1 && PyErr_Occurred()) { + return -1; + } + + Py_BUILD_ASSERT(sizeof(value) >= sizeof(PyTime_t)); + *result = (PyTime_t)value; + return 0; +#else + // Call time.perf_counter() and convert C double to PyTime_t. + // Cache time.perf_counter() function for best performance. + static PyObject *func = NULL; + if (func == NULL) { + PyObject *mod = PyImport_ImportModule("time"); + if (mod == NULL) { + return -1; + } + + func = PyObject_GetAttrString(mod, "perf_counter"); + Py_DECREF(mod); + if (func == NULL) { + return -1; + } + } + + PyObject *res = PyObject_CallNoArgs(func); + if (res == NULL) { + return -1; + } + double d = PyFloat_AsDouble(res); + Py_DECREF(res); + + if (d == -1.0 && PyErr_Occurred()) { + return -1; + } + + // Avoid floor() to avoid having to link to libm + *result = (PyTime_t)(d * 1e9); + return 0; +#endif +} + +#endif + +// gh-111389 added hash constants to Python 3.13.0a5. These constants were +// added first as private macros to Python 3.4.0b1 and PyPy 7.3.9. +#if (!defined(PyHASH_BITS) \ + && ((!defined(PYPY_VERSION) && PY_VERSION_HEX >= 0x030400B1) \ + || (defined(PYPY_VERSION) && PY_VERSION_HEX >= 0x03070000 \ + && PYPY_VERSION_NUM >= 0x07090000))) +# define PyHASH_BITS _PyHASH_BITS +# define PyHASH_MODULUS _PyHASH_MODULUS +# define PyHASH_INF _PyHASH_INF +# define PyHASH_IMAG _PyHASH_IMAG +#endif + + +// gh-111545 added Py_GetConstant() and Py_GetConstantBorrowed() +// to Python 3.13.0a6 +#if PY_VERSION_HEX < 0x030D00A6 && !defined(Py_CONSTANT_NONE) + +#define Py_CONSTANT_NONE 0 +#define Py_CONSTANT_FALSE 1 +#define Py_CONSTANT_TRUE 2 +#define Py_CONSTANT_ELLIPSIS 3 +#define Py_CONSTANT_NOT_IMPLEMENTED 4 +#define Py_CONSTANT_ZERO 5 +#define Py_CONSTANT_ONE 6 +#define Py_CONSTANT_EMPTY_STR 7 +#define Py_CONSTANT_EMPTY_BYTES 8 +#define Py_CONSTANT_EMPTY_TUPLE 9 + +static inline PyObject* Py_GetConstant(unsigned int constant_id) +{ + static PyObject* constants[Py_CONSTANT_EMPTY_TUPLE + 1] = {NULL}; + + if (constants[Py_CONSTANT_NONE] == NULL) { + constants[Py_CONSTANT_NONE] = Py_None; + constants[Py_CONSTANT_FALSE] = Py_False; + constants[Py_CONSTANT_TRUE] = Py_True; + constants[Py_CONSTANT_ELLIPSIS] = Py_Ellipsis; + constants[Py_CONSTANT_NOT_IMPLEMENTED] = Py_NotImplemented; + + constants[Py_CONSTANT_ZERO] = PyLong_FromLong(0); + if (constants[Py_CONSTANT_ZERO] == NULL) { + goto fatal_error; + } + + constants[Py_CONSTANT_ONE] = PyLong_FromLong(1); + if (constants[Py_CONSTANT_ONE] == NULL) { + goto fatal_error; + } + + constants[Py_CONSTANT_EMPTY_STR] = PyUnicode_FromStringAndSize("", 0); + if (constants[Py_CONSTANT_EMPTY_STR] == NULL) { + goto fatal_error; + } + + constants[Py_CONSTANT_EMPTY_BYTES] = PyBytes_FromStringAndSize("", 0); + if (constants[Py_CONSTANT_EMPTY_BYTES] == NULL) { + goto fatal_error; + } + + constants[Py_CONSTANT_EMPTY_TUPLE] = PyTuple_New(0); + if (constants[Py_CONSTANT_EMPTY_TUPLE] == NULL) { + goto fatal_error; + } + // goto dance to avoid compiler warnings about Py_FatalError() + goto init_done; + +fatal_error: + // This case should never happen + Py_FatalError("Py_GetConstant() failed to get constants"); + } + +init_done: + if (constant_id <= Py_CONSTANT_EMPTY_TUPLE) { + return Py_NewRef(constants[constant_id]); + } + else { + PyErr_BadInternalCall(); + return NULL; + } +} + +static inline PyObject* Py_GetConstantBorrowed(unsigned int constant_id) +{ + PyObject *obj = Py_GetConstant(constant_id); + Py_XDECREF(obj); + return obj; +} +#endif + + +// gh-114329 added PyList_GetItemRef() to Python 3.13.0a4 +#if PY_VERSION_HEX < 0x030D00A4 +static inline PyObject * +PyList_GetItemRef(PyObject *op, Py_ssize_t index) +{ + PyObject *item = PyList_GetItem(op, index); + Py_XINCREF(item); + return item; +} +#endif + + +// gh-114329 added PyList_GetItemRef() to Python 3.13.0a4 +#if PY_VERSION_HEX < 0x030D00A4 +static inline int +PyDict_SetDefaultRef(PyObject *d, PyObject *key, PyObject *default_value, + PyObject **result) +{ + PyObject *value; + if (PyDict_GetItemRef(d, key, &value) < 0) { + // get error + if (result) { + *result = NULL; + } + return -1; + } + if (value != NULL) { + // present + if (result) { + *result = value; + } + else { + Py_DECREF(value); + } + return 1; + } + + // missing: set the item + if (PyDict_SetItem(d, key, default_value) < 0) { + // set error + if (result) { + *result = NULL; + } + return -1; + } + if (result) { + *result = Py_NewRef(default_value); + } + return 0; +} +#endif + + +// gh-116560 added PyLong_GetSign() to Python 3.14.0a0 +#if PY_VERSION_HEX < 0x030E00A0 +static inline int PyLong_GetSign(PyObject *obj, int *sign) +{ + if (!PyLong_Check(obj)) { + PyErr_Format(PyExc_TypeError, "expect int, got %s", Py_TYPE(obj)->tp_name); + return -1; + } + + *sign = _PyLong_Sign(obj); + return 0; +} +#endif + + +#ifdef __cplusplus +} +#endif +#endif // PYTHONCAPI_COMPAT From 7c64ae0c73666924fa1e298f1be55abbf6973586 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 2 Jul 2024 18:46:52 +0300 Subject: [PATCH 141/662] encode: Replace PyDict_GetItem with PyDict_GetItemRef --- src/encode.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/encode.c b/src/encode.c index 72ad3fa07..620774f67 100644 --- a/src/encode.c +++ b/src/encode.c @@ -722,7 +722,10 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { } if (!is_core_tag) { - PyObject *tag_type = PyDict_GetItem(types, key); + PyObject *tag_type; + if (PyDict_GetItemRef(types, key, &tag_type) == 0) { + PyErr_SetString(PyExc_KeyError, "unknown tag type"); + } if (tag_type) { int type_int = PyLong_AsLong(tag_type); if (type_int >= TIFF_BYTE && type_int <= TIFF_DOUBLE) { From 87596bd747f1cfadd2f7ec6beb5bca67e6aeba0a Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 2 Jul 2024 18:51:15 +0300 Subject: [PATCH 142/662] imagingft: Replace PyDict_GetItem with PyDict_GetItemRef --- src/_imagingft.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/_imagingft.c b/src/_imagingft.c index 1bef876e1..468f16884 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -20,6 +20,7 @@ #define PY_SSIZE_T_CLEAN #include "Python.h" +#include "thirdparty/pythoncapi_compat.h" #include "libImaging/Imaging.h" #include @@ -1219,7 +1220,7 @@ font_getvarnames(FontObject *self) { } for (j = 0; j < num_namedstyles; j++) { - if (PyList_GetItem(list_names, j) != NULL) { + if (PyList_GetItemRef(list_names, j) != NULL) { continue; } From 40e7f511b33204a23faa0f26140dd7b74c13be97 Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Fri, 5 Jul 2024 16:30:48 +0200 Subject: [PATCH 143/662] Don't use PyList_GetItemRef immediately after PyList_New --- src/_imagingft.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/_imagingft.c b/src/_imagingft.c index 468f16884..ddcf28f97 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -1205,6 +1205,16 @@ font_getvarnames(FontObject *self) { num_namedstyles = master->num_namedstyles; list_names = PyList_New(num_namedstyles); + + int *list_names_filled = PyMem_Malloc(num_namedstyles * sizeof(int)); + if (list_names_filled == NULL) { + return PyErr_NoMemory(); + } + + for (int i = 0; i < num_namedstyles; i++) { + list_names_filled[i] = 0; + } + if (list_names == NULL) { FT_Done_MM_Var(library, master); return NULL; @@ -1220,13 +1230,14 @@ font_getvarnames(FontObject *self) { } for (j = 0; j < num_namedstyles; j++) { - if (PyList_GetItemRef(list_names, j) != NULL) { + if (list_names_filled[j]) { continue; } if (master->namedstyle[j].strid == name.name_id) { list_name = Py_BuildValue("y#", name.string, name.string_len); PyList_SetItem(list_names, j, list_name); + list_names_filled[j] = 1; break; } } From c416f0ea1db1dfe5b3a96a0d24af0f0318883317 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 10 Jul 2024 06:11:11 +1000 Subject: [PATCH 144/662] Build wheels with free threading --- .github/workflows/wheels-test.sh | 6 ++++++ .github/workflows/wheels.yml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh index 3fbf3be69..023a33824 100755 --- a/.github/workflows/wheels-test.sh +++ b/.github/workflows/wheels-test.sh @@ -12,8 +12,14 @@ elif [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then else yum install -y fribidi fi + if [ "${AUDITWHEEL_POLICY::9}" != "musllinux" ]; then + # TODO Update condition when NumPy supports free-threading + if [ $(python3 -c "import sysconfig;print(sysconfig.get_config_var('Py_GIL_DISABLED'))") == "1" ]; then + python3 -m pip install numpy --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple + else python3 -m pip install numpy + fi fi if [ ! -d "test-images-main" ]; then diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index f8dff3a3e..e32f14529 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -129,6 +129,7 @@ jobs: env: CIBW_ARCHS: ${{ matrix.cibw_arch }} CIBW_BUILD: ${{ matrix.build }} + CIBW_FREE_THREADED_SUPPORT: True CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }} CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }} CIBW_PRERELEASE_PYTHONS: True @@ -201,6 +202,7 @@ jobs: CIBW_ARCHS: ${{ matrix.cibw_arch }} CIBW_BEFORE_ALL: "{package}\\winbuild\\build\\build_dep_all.cmd" CIBW_CACHE_PATH: "C:\\cibw" + CIBW_FREE_THREADED_SUPPORT: True CIBW_PRERELEASE_PYTHONS: True CIBW_TEST_SKIP: "*-win_arm64" CIBW_TEST_COMMAND: 'docker run --rm From 5bae9343171d653dcf5dff0669c3665fd97dea3e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 12 Jul 2024 21:16:56 +1000 Subject: [PATCH 145/662] Added type hints --- Tests/test_file_png.py | 2 +- Tests/test_imagefile.py | 6 +++--- src/PIL/ImageFile.py | 34 +++++++++++++++--------------- src/PIL/ImageSequence.py | 2 +- src/PIL/JpegImagePlugin.py | 4 ++-- src/PIL/PdfImagePlugin.py | 20 +++++++++--------- src/PIL/PngImagePlugin.py | 36 ++++++++++++++++--------------- src/PIL/TiffImagePlugin.py | 43 +++++++++++++++++++------------------- src/PIL/WalImageFile.py | 5 ++++- 9 files changed, 79 insertions(+), 73 deletions(-) diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py index dfe8f9e99..e2913e944 100644 --- a/Tests/test_file_png.py +++ b/Tests/test_file_png.py @@ -41,7 +41,7 @@ MAGIC = PngImagePlugin._MAGIC def chunk(cid: bytes, *data: bytes) -> bytes: test_file = BytesIO() - PngImagePlugin.putchunk(*(test_file, cid) + data) + PngImagePlugin.putchunk(test_file, cid, *data) return test_file.getvalue() diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index b996860ce..44a6e6a42 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -127,7 +127,7 @@ class TestImageFile: def test_raise_typeerror(self) -> None: with pytest.raises(TypeError): parser = ImageFile.Parser() - parser.feed(1) + parser.feed(1) # type: ignore[arg-type] def test_negative_stride(self) -> None: with open("Tests/images/raw_negative_stride.bin", "rb") as f: @@ -305,7 +305,7 @@ class TestPyDecoder(CodecsTest): im.load() def test_decode(self) -> None: - decoder = ImageFile.PyDecoder(None) + decoder = ImageFile.PyDecoder("") with pytest.raises(NotImplementedError): decoder.decode(b"") @@ -383,7 +383,7 @@ class TestPyEncoder(CodecsTest): ) def test_encode(self) -> None: - encoder = ImageFile.PyEncoder(None) + encoder = ImageFile.PyEncoder("") with pytest.raises(NotImplementedError): encoder.encode(0) diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 99d7e73f1..6b2953451 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -86,7 +86,7 @@ def raise_oserror(error: int) -> OSError: raise _get_oserror(error, encoder=False) -def _tilesort(t): +def _tilesort(t) -> int: # sort on offset return t[2] @@ -161,7 +161,7 @@ class ImageFile(Image.Image): return Image.MIME.get(self.format.upper()) return None - def __setstate__(self, state): + def __setstate__(self, state) -> None: self.tile = [] super().__setstate__(state) @@ -333,14 +333,14 @@ class ImageFile(Image.Image): # def load_read(self, read_bytes: int) -> bytes: # pass - def _seek_check(self, frame): + def _seek_check(self, frame: int) -> bool: if ( frame < self._min_frame # Only check upper limit on frames if additional seek operations # are not required to do so or ( not (hasattr(self, "_n_frames") and self._n_frames is None) - and frame >= self.n_frames + self._min_frame + and frame >= getattr(self, "n_frames") + self._min_frame ) ): msg = "attempt to seek outside sequence" @@ -370,7 +370,7 @@ class StubImageFile(ImageFile): msg = "StubImageFile subclass must implement _open" raise NotImplementedError(msg) - def load(self): + def load(self) -> Image.core.PixelAccess | None: loader = self._load() if loader is None: msg = f"cannot find loader for this {self.format} file" @@ -378,7 +378,7 @@ class StubImageFile(ImageFile): image = loader.load(self) assert image is not None # become the other object (!) - self.__class__ = image.__class__ + self.__class__ = image.__class__ # type: ignore[assignment] self.__dict__ = image.__dict__ return image.load() @@ -396,8 +396,8 @@ class Parser: incremental = None image: Image.Image | None = None - data = None - decoder = None + data: bytes | None = None + decoder: Image.core.ImagingDecoder | PyDecoder | None = None offset = 0 finished = 0 @@ -409,7 +409,7 @@ class Parser: """ assert self.data is None, "cannot reuse parsers" - def feed(self, data): + def feed(self, data: bytes) -> None: """ (Consumer) Feed data to the parser. @@ -491,7 +491,7 @@ class Parser: def __exit__(self, *args: object) -> None: self.close() - def close(self): + def close(self) -> Image.Image: """ (Consumer) Close the stream. @@ -525,7 +525,7 @@ class Parser: # -------------------------------------------------------------------- -def _save(im, fp, tile, bufsize=0) -> None: +def _save(im, fp, tile, bufsize: int = 0) -> None: """Helper to save image based on tile list :param im: Image object. @@ -553,7 +553,7 @@ def _save(im, fp, tile, bufsize=0) -> None: fp.flush() -def _encode_tile(im, fp, tile: list[_Tile], bufsize, fh, exc=None): +def _encode_tile(im, fp, tile: list[_Tile], bufsize: int, fh, exc=None) -> None: for encoder_name, extents, offset, args in tile: if offset > 0: fp.seek(offset) @@ -629,18 +629,18 @@ class PyCodecState: class PyCodec: fd: IO[bytes] | None - def __init__(self, mode, *args): - self.im = None + def __init__(self, mode: str, *args: Any) -> None: + self.im: Image.core.ImagingCore | None = None self.state = PyCodecState() self.fd = None self.mode = mode self.init(args) - def init(self, args) -> None: + def init(self, args: tuple[Any, ...]) -> None: """ Override to perform codec specific initialization - :param args: Array of args items from the tile entry + :param args: Tuple of arg items from the tile entry :returns: None """ self.args = args @@ -662,7 +662,7 @@ class PyCodec: """ self.fd = fd - def setimage(self, im, extents: tuple[int, int, int, int] | None = None) -> None: + def setimage(self, im, extents=None): """ Called from ImageFile to set the core output image for the codec diff --git a/src/PIL/ImageSequence.py b/src/PIL/ImageSequence.py index 2c1850276..a6fc340d5 100644 --- a/src/PIL/ImageSequence.py +++ b/src/PIL/ImageSequence.py @@ -33,7 +33,7 @@ class Iterator: :param im: An image object. """ - def __init__(self, im: Image.Image): + def __init__(self, im: Image.Image) -> None: if not hasattr(im, "seek"): msg = "im must have seek method" raise AttributeError(msg) diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 4916727be..54f756014 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -827,11 +827,11 @@ def _save_cjpeg(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: ## # Factory for making JPEG and MPO instances -def jpeg_factory(fp=None, filename=None): +def jpeg_factory(fp: IO[bytes] | None = None, filename: str | bytes | None = None): im = JpegImageFile(fp, filename) try: mpheader = im._getmp() - if mpheader[45057] > 1: + if mpheader is not None and mpheader[45057] > 1: for segment, content in im.applist: if segment == "APP1" and b' hdrgm:Version="' in content: # Ultra HDR images are not yet supported diff --git a/src/PIL/PdfImagePlugin.py b/src/PIL/PdfImagePlugin.py index f0da1e047..e0f732199 100644 --- a/src/PIL/PdfImagePlugin.py +++ b/src/PIL/PdfImagePlugin.py @@ -174,12 +174,15 @@ def _write_image(im, filename, existing_pdf, image_refs): return image_ref, procset -def _save(im, fp, filename, save_all=False): +def _save( + im: Image.Image, fp: IO[bytes], filename: str | bytes, save_all: bool = False +) -> None: is_appending = im.encoderinfo.get("append", False) + filename_str = filename.decode() if isinstance(filename, bytes) else filename if is_appending: - existing_pdf = PdfParser.PdfParser(f=fp, filename=filename, mode="r+b") + existing_pdf = PdfParser.PdfParser(f=fp, filename=filename_str, mode="r+b") else: - existing_pdf = PdfParser.PdfParser(f=fp, filename=filename, mode="w+b") + existing_pdf = PdfParser.PdfParser(f=fp, filename=filename_str, mode="w+b") dpi = im.encoderinfo.get("dpi") if dpi: @@ -228,12 +231,7 @@ def _save(im, fp, filename, save_all=False): for im in ims: im_number_of_pages = 1 if save_all: - try: - im_number_of_pages = im.n_frames - except AttributeError: - # Image format does not have n_frames. - # It is a single frame image - pass + im_number_of_pages = getattr(im, "n_frames", 1) number_of_pages += im_number_of_pages for i in range(im_number_of_pages): image_refs.append(existing_pdf.next_object_id(0)) @@ -250,7 +248,9 @@ def _save(im, fp, filename, save_all=False): page_number = 0 for im_sequence in ims: - im_pages = ImageSequence.Iterator(im_sequence) if save_all else [im_sequence] + im_pages: ImageSequence.Iterator | list[Image.Image] = ( + ImageSequence.Iterator(im_sequence) if save_all else [im_sequence] + ) for im in im_pages: image_ref, procset = _write_image(im, filename, existing_pdf, image_refs) diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index fa117d19a..6990b6d05 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -144,7 +144,7 @@ def _safe_zlib_decompress(s): return plaintext -def _crc32(data, seed=0): +def _crc32(data: bytes, seed: int = 0) -> int: return zlib.crc32(data, seed) & 0xFFFFFFFF @@ -191,7 +191,7 @@ class ChunkStream: assert self.queue is not None self.queue.append((cid, pos, length)) - def call(self, cid, pos, length): + def call(self, cid: bytes, pos: int, length: int) -> bytes: """Call the appropriate chunk handler""" logger.debug("STREAM %r %s %s", cid, pos, length) @@ -1091,21 +1091,21 @@ _OUTMODES = { } -def putchunk(fp, cid, *data): +def putchunk(fp: IO[bytes], cid: bytes, *data: bytes) -> None: """Write a PNG chunk (including CRC field)""" - data = b"".join(data) + byte_data = b"".join(data) - fp.write(o32(len(data)) + cid) - fp.write(data) - crc = _crc32(data, _crc32(cid)) + fp.write(o32(len(byte_data)) + cid) + fp.write(byte_data) + crc = _crc32(byte_data, _crc32(cid)) fp.write(o32(crc)) class _idat: # wrap output from the encoder in IDAT chunks - def __init__(self, fp, chunk): + def __init__(self, fp, chunk) -> None: self.fp = fp self.chunk = chunk @@ -1116,7 +1116,7 @@ class _idat: class _fdat: # wrap encoder output in fdAT chunks - def __init__(self, fp, chunk, seq_num): + def __init__(self, fp: IO[bytes], chunk, seq_num: int) -> None: self.fp = fp self.chunk = chunk self.seq_num = seq_num @@ -1259,7 +1259,9 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: _save(im, fp, filename, save_all=True) -def _save(im, fp, filename, chunk=putchunk, save_all=False): +def _save( + im: Image.Image, fp, filename: str | bytes, chunk=putchunk, save_all: bool = False +) -> None: # save an image to disk (called by the save method) if save_all: @@ -1461,7 +1463,7 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False): # PNG chunk converter -def getchunks(im, **params): +def getchunks(im: Image.Image, **params: Any) -> list[tuple[bytes, bytes, bytes]]: """Return a list of PNG chunks representing this image.""" class collector: @@ -1470,19 +1472,19 @@ def getchunks(im, **params): def write(self, data: bytes) -> None: pass - def append(self, chunk: bytes) -> None: + def append(self, chunk: tuple[bytes, bytes, bytes]) -> None: self.data.append(chunk) - def append(fp, cid, *data): - data = b"".join(data) - crc = o32(_crc32(data, _crc32(cid))) - fp.append((cid, data, crc)) + def append(fp: collector, cid: bytes, *data: bytes) -> None: + byte_data = b"".join(data) + crc = o32(_crc32(byte_data, _crc32(cid))) + fp.append((cid, byte_data, crc)) fp = collector() try: im.encoderinfo = params - _save(im, fp, None, append) + _save(im, fp, "", append) finally: del im.encoderinfo diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index b89144803..253f64852 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -334,12 +334,13 @@ class IFDRational(Rational): __slots__ = ("_numerator", "_denominator", "_val") - def __init__(self, value, denominator=1): + def __init__(self, value, denominator: int = 1) -> None: """ :param value: either an integer numerator, a float/rational/other number, or an IFDRational :param denominator: Optional integer denominator """ + self._val: Fraction | float if isinstance(value, IFDRational): self._numerator = value.numerator self._denominator = value.denominator @@ -636,13 +637,13 @@ class ImageFileDirectory_v2(_IFDv2Base): val = (val,) return val - def __contains__(self, tag): + def __contains__(self, tag: object) -> bool: return tag in self._tags_v2 or tag in self._tagdata - def __setitem__(self, tag, value): + def __setitem__(self, tag, value) -> None: self._setitem(tag, value, self.legacy_api) - def _setitem(self, tag, value, legacy_api): + def _setitem(self, tag, value, legacy_api) -> None: basetypes = (Number, bytes, str) info = TiffTags.lookup(tag, self.group) @@ -758,7 +759,7 @@ class ImageFileDirectory_v2(_IFDv2Base): return data @_register_writer(1) # Basic type, except for the legacy API. - def write_byte(self, data): + def write_byte(self, data) -> bytes: if isinstance(data, IFDRational): data = int(data) if isinstance(data, int): @@ -772,7 +773,7 @@ class ImageFileDirectory_v2(_IFDv2Base): return data.decode("latin-1", "replace") @_register_writer(2) - def write_string(self, value): + def write_string(self, value) -> bytes: # remerge of https://github.com/python-pillow/Pillow/pull/1416 if isinstance(value, int): value = str(value) @@ -790,7 +791,7 @@ class ImageFileDirectory_v2(_IFDv2Base): return tuple(combine(num, denom) for num, denom in zip(vals[::2], vals[1::2])) @_register_writer(5) - def write_rational(self, *values): + def write_rational(self, *values) -> bytes: return b"".join( self._pack("2L", *_limit_rational(frac, 2**32 - 1)) for frac in values ) @@ -800,7 +801,7 @@ class ImageFileDirectory_v2(_IFDv2Base): return data @_register_writer(7) - def write_undefined(self, value): + def write_undefined(self, value) -> bytes: if isinstance(value, IFDRational): value = int(value) if isinstance(value, int): @@ -817,13 +818,13 @@ class ImageFileDirectory_v2(_IFDv2Base): return tuple(combine(num, denom) for num, denom in zip(vals[::2], vals[1::2])) @_register_writer(10) - def write_signed_rational(self, *values): + def write_signed_rational(self, *values) -> bytes: return b"".join( self._pack("2l", *_limit_signed_rational(frac, 2**31 - 1, -(2**31))) for frac in values ) - def _ensure_read(self, fp, size): + def _ensure_read(self, fp: IO[bytes], size: int) -> bytes: ret = fp.read(size) if len(ret) != size: msg = ( @@ -977,7 +978,7 @@ class ImageFileDirectory_v2(_IFDv2Base): return result - def save(self, fp): + def save(self, fp: IO[bytes]) -> int: if fp.tell() == 0: # skip TIFF header on subsequent pages # tiff header -- PIL always starts the first IFD at offset 8 fp.write(self._prefix + self._pack("HL", 42, 8)) @@ -1017,7 +1018,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2): .. deprecated:: 3.0.0 """ - def __init__(self, *args, **kwargs): + def __init__(self, *args, **kwargs) -> None: super().__init__(*args, **kwargs) self._legacy_api = True @@ -1029,7 +1030,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2): """Dictionary of tag types""" @classmethod - def from_v2(cls, original): + def from_v2(cls, original) -> ImageFileDirectory_v1: """Returns an :py:class:`~PIL.TiffImagePlugin.ImageFileDirectory_v1` instance with the same data as is contained in the original @@ -1063,7 +1064,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2): ifd._tags_v2 = dict(self._tags_v2) return ifd - def __contains__(self, tag): + def __contains__(self, tag: object) -> bool: return tag in self._tags_v1 or tag in self._tagdata def __len__(self) -> int: @@ -1072,7 +1073,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2): def __iter__(self): return iter(set(self._tagdata) | set(self._tags_v1)) - def __setitem__(self, tag, value): + def __setitem__(self, tag, value) -> None: for legacy_api in (False, True): self._setitem(tag, value, legacy_api) @@ -1122,7 +1123,7 @@ class TiffImageFile(ImageFile.ImageFile): self.tag_v2 = ImageFileDirectory_v2(ifh) # legacy IFD entries will be filled in later - self.ifd = None + self.ifd: ImageFileDirectory_v1 | None = None # setup frame pointers self.__first = self.__next = self.tag_v2.next @@ -1343,7 +1344,7 @@ class TiffImageFile(ImageFile.ImageFile): return Image.Image.load(self) - def _setup(self): + def _setup(self) -> None: """Setup this image object based on current tags""" if 0xBC01 in self.tag_v2: @@ -1537,13 +1538,13 @@ class TiffImageFile(ImageFile.ImageFile): # adjust stride width accordingly stride /= bps_count - a = (tile_rawmode, int(stride), 1) + args = (tile_rawmode, int(stride), 1) self.tile.append( ( self._compression, (x, y, min(x + w, xsize), min(y + h, ysize)), offset, - a, + args, ) ) x = x + w @@ -1938,7 +1939,7 @@ class AppendingTiffWriter: 521, # JPEGACTables } - def __init__(self, fn, new=False): + def __init__(self, fn, new: bool = False) -> None: if hasattr(fn, "read"): self.f = fn self.close_fp = False @@ -2015,7 +2016,7 @@ class AppendingTiffWriter: def tell(self) -> int: return self.f.tell() - self.offsetOfNewPage - def seek(self, offset, whence=io.SEEK_SET): + def seek(self, offset: int, whence=io.SEEK_SET) -> int: if whence == os.SEEK_SET: offset += self.offsetOfNewPage diff --git a/src/PIL/WalImageFile.py b/src/PIL/WalImageFile.py index 895d5616a..ec5c74900 100644 --- a/src/PIL/WalImageFile.py +++ b/src/PIL/WalImageFile.py @@ -24,8 +24,11 @@ and has been tested with a few sample files found using google. """ from __future__ import annotations +from typing import IO + from . import Image, ImageFile from ._binary import i32le as i32 +from ._typing import StrOrBytesPath class WalImageFile(ImageFile.ImageFile): @@ -58,7 +61,7 @@ class WalImageFile(ImageFile.ImageFile): return Image.Image.load(self) -def open(filename): +def open(filename: StrOrBytesPath | IO[bytes]) -> WalImageFile: """ Load texture from a Quake2 WAL texture file. From 42bfcaa2d4371b7a1312848c0f5f6cfefcaaa9cb Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 13 Jul 2024 12:46:15 +1000 Subject: [PATCH 146/662] When IFD is missing, connect get_ifd() dictionary to Exif --- Tests/test_image.py | 8 ++++++++ src/PIL/Image.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Tests/test_image.py b/Tests/test_image.py index 4fdc41791..77be58261 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -769,6 +769,14 @@ class TestImage: exif.load(b"Exif\x00\x00") assert not dict(exif) + def test_empty_get_ifd(self) -> None: + exif = Image.Exif() + ifd = exif.get_ifd(0x8769) + assert ifd == {} + + ifd[36864] = b"0220" + assert exif.get_ifd(0x8769) == {36864: b"0220"} + @mark_if_feature_version( pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing" ) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 565abe71d..9a3e4efa4 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -4073,7 +4073,7 @@ class Exif(_ExifBase): else: # Interop self._ifds[tag] = self._get_ifd_dict(tag_data, tag) - ifd = self._ifds.get(tag, {}) + ifd = self._ifds.setdefault(tag, {}) if tag == ExifTags.IFD.Exif and self._hidden_data: ifd = { k: v From 8e730e17ae5608616e57194a25629c48ad033cfa Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 13 Jul 2024 13:00:58 +1000 Subject: [PATCH 147/662] Allow saving I;16 images as PPM --- Tests/test_file_ppm.py | 2 ++ src/PIL/PpmImagePlugin.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Tests/test_file_ppm.py b/Tests/test_file_ppm.py index d6451ec18..fa5027448 100644 --- a/Tests/test_file_ppm.py +++ b/Tests/test_file_ppm.py @@ -95,7 +95,9 @@ def test_16bit_pgm_write(tmp_path: Path) -> None: with Image.open("Tests/images/16_bit_binary.pgm") as im: filename = str(tmp_path / "temp.pgm") im.save(filename, "PPM") + assert_image_equal_tofile(im, filename) + im.convert("I;16").save(filename, "PPM") assert_image_equal_tofile(im, filename) diff --git a/src/PIL/PpmImagePlugin.py b/src/PIL/PpmImagePlugin.py index 16c9ccbba..211577e16 100644 --- a/src/PIL/PpmImagePlugin.py +++ b/src/PIL/PpmImagePlugin.py @@ -333,7 +333,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: rawmode, head = "1;I", b"P4" elif im.mode == "L": rawmode, head = "L", b"P5" - elif im.mode == "I": + elif im.mode in ("I", "I;16"): rawmode, head = "I;16B", b"P5" elif im.mode in ("RGB", "RGBA"): rawmode, head = "RGB", b"P6" From f5313db9ce5f800de29cb40af12c0722ecbe7173 Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Sat, 13 Jul 2024 11:00:57 +0200 Subject: [PATCH 148/662] Add necessary PyMem_Free and fix PyDict_GetItemRef call --- src/_imagingft.c | 2 +- src/encode.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/_imagingft.c b/src/_imagingft.c index ddcf28f97..eb04945f0 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -1243,8 +1243,8 @@ font_getvarnames(FontObject *self) { } } + PyMem_Free(list_names_filled); FT_Done_MM_Var(library, master); - return list_names; } diff --git a/src/encode.c b/src/encode.c index 620774f67..82aed7783 100644 --- a/src/encode.c +++ b/src/encode.c @@ -723,8 +723,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { if (!is_core_tag) { PyObject *tag_type; - if (PyDict_GetItemRef(types, key, &tag_type) == 0) { - PyErr_SetString(PyExc_KeyError, "unknown tag type"); + if (PyDict_GetItemRef(types, key, &tag_type) < 0) { + return NULL; // Exception has been already set } if (tag_type) { int type_int = PyLong_AsLong(tag_type); From 9c576d63c3e79964d12ebe07f43144db735cdd35 Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Sat, 13 Jul 2024 12:24:02 +0200 Subject: [PATCH 149/662] Fix refcounts after porting to GetItemRef & better error checking --- src/_imaging.c | 5 +++++ src/_imagingft.c | 35 ++++++++++++++++++++++++++++------- src/encode.c | 16 ++++++++++++++-- src/path.c | 12 +++++++++--- 4 files changed, 56 insertions(+), 12 deletions(-) diff --git a/src/_imaging.c b/src/_imaging.c index 03e10e547..ac6310a44 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -2251,6 +2251,11 @@ _getcolors(ImagingObject *self, PyObject *args) { ImagingColorItem *v = &items[i]; PyObject *item = Py_BuildValue( "iN", v->count, getpixel(self->image, self->access, v->x, v->y)); + if (item == NULL) { + Py_DECREF(out); + free(items); + return NULL; + } PyList_SetItem(out, i, item); } } diff --git a/src/_imagingft.c b/src/_imagingft.c index eb04945f0..6c2885c61 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -1205,9 +1205,15 @@ font_getvarnames(FontObject *self) { num_namedstyles = master->num_namedstyles; list_names = PyList_New(num_namedstyles); + if (list_names == NULL) { + FT_Done_MM_Var(library, master); + return NULL; + } int *list_names_filled = PyMem_Malloc(num_namedstyles * sizeof(int)); if (list_names_filled == NULL) { + Py_DECREF(list_names); + FT_Done_MM_Var(library, master); return PyErr_NoMemory(); } @@ -1215,15 +1221,11 @@ font_getvarnames(FontObject *self) { list_names_filled[i] = 0; } - if (list_names == NULL) { - FT_Done_MM_Var(library, master); - return NULL; - } - name_count = FT_Get_Sfnt_Name_Count(self->face); for (i = 0; i < name_count; i++) { error = FT_Get_Sfnt_Name(self->face, i, &name); if (error) { + PyMem_Free(list_names_filled); Py_DECREF(list_names); FT_Done_MM_Var(library, master); return geterror(error); @@ -1236,6 +1238,12 @@ font_getvarnames(FontObject *self) { if (master->namedstyle[j].strid == name.name_id) { list_name = Py_BuildValue("y#", name.string, name.string_len); + if (list_name == NULL) { + PyMem_Free(list_names_filled); + Py_DECREF(list_names); + FT_Done_MM_Var(library, master); + return NULL; + } PyList_SetItem(list_names, j, list_name); list_names_filled[j] = 1; break; @@ -1301,9 +1309,15 @@ font_getvaraxes(FontObject *self) { if (name.name_id == axis.strid) { axis_name = Py_BuildValue("y#", name.string, name.string_len); + if (axis_name == NULL) { + Py_DECREF(list_axis); + Py_DECREF(list_axes); + FT_Done_MM_Var(library, master); + return NULL; + } PyDict_SetItemString( list_axis, "name", axis_name ? axis_name : Py_None); - Py_XDECREF(axis_name); + Py_DECREF(axis_name); break; } } @@ -1357,7 +1371,12 @@ font_setvaraxes(FontObject *self, PyObject *args) { return PyErr_NoMemory(); } for (i = 0; i < num_coords; i++) { - item = PyList_GET_ITEM(axes, i); + item = PyList_GetItemRef(axes, i); + if (item == NULL) { + free(coords); + return NULL; + } + if (PyFloat_Check(item)) { coord = PyFloat_AS_DOUBLE(item); } else if (PyLong_Check(item)) { @@ -1365,10 +1384,12 @@ font_setvaraxes(FontObject *self, PyObject *args) { } else if (PyNumber_Check(item)) { coord = PyFloat_AsDouble(item); } else { + Py_DECREF(item); free(coords); PyErr_SetString(PyExc_TypeError, "list must contain numbers"); return NULL; } + Py_DECREF(item); coords[i] = coord * 65536; } diff --git a/src/encode.c b/src/encode.c index 82aed7783..2c95b7ebc 100644 --- a/src/encode.c +++ b/src/encode.c @@ -673,10 +673,16 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { TRACE(("tags size: %d\n", (int)tags_size)); for (pos = 0; pos < tags_size; pos++) { item = PyList_GetItemRef(tags, pos); + if (item == NULL) { + return NULL; + } + if (!PyTuple_Check(item) || PyTuple_Size(item) != 2) { + Py_DECREF(item); PyErr_SetString(PyExc_ValueError, "Invalid tags list"); return NULL; } + Py_DECREF(item); } pos = 0; } @@ -705,10 +711,16 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { num_core_tags = sizeof(core_tags) / sizeof(int); for (pos = 0; pos < tags_size; pos++) { item = PyList_GetItemRef(tags, pos); + if (item == NULL) { + return NULL; + } + // We already checked that tags is a 2-tuple list. - key = PyTuple_GetItem(item, 0); + key = PyTuple_GET_ITEM(item, 0); key_int = (int)PyLong_AsLong(key); - value = PyTuple_GetItem(item, 1); + value = PyTuple_GET_ITEM(item, 1); + Py_DECREF(item); + status = 0; is_core_tag = 0; is_var_length = 0; diff --git a/src/path.c b/src/path.c index 6bc90abed..f8a99eb5b 100644 --- a/src/path.c +++ b/src/path.c @@ -179,14 +179,21 @@ PyPath_Flatten(PyObject *data, double **pxy) { } \ free(xy); \ return -1; \ + } \ + if (decref) { \ + Py_DECREF(op); \ } /* Copy table to path array */ if (PyList_Check(data)) { for (i = 0; i < n; i++) { double x, y; - PyObject *op = PyList_GET_ITEM(data, i); - assign_item_to_array(op, 0); + PyObject *op = PyList_GetItemRef(data, i); + if (op == NULL) { + free(xy); + return -1; + } + assign_item_to_array(op, 1); } } else if (PyTuple_Check(data)) { for (i = 0; i < n; i++) { @@ -209,7 +216,6 @@ PyPath_Flatten(PyObject *data, double **pxy) { } } assign_item_to_array(op, 1); - Py_DECREF(op); } } From 8854e4677e0d5d07bfa3d8725e85b681f81a704a Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Sat, 13 Jul 2024 12:34:17 +0200 Subject: [PATCH 150/662] Add include --- src/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/path.c b/src/path.c index f8a99eb5b..bd6ad2259 100644 --- a/src/path.c +++ b/src/path.c @@ -26,6 +26,7 @@ */ #include "Python.h" +#include "thirdparty/pythoncapi_compat.h" #include "libImaging/Imaging.h" #include From 01529d8b0979597902d26fcf4c0dc4f3da2a667e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 15 Jul 2024 19:23:36 +1000 Subject: [PATCH 151/662] Added type hints --- Tests/test_imagewin.py | 3 ++ src/PIL/EpsImagePlugin.py | 2 +- src/PIL/IcoImagePlugin.py | 84 ++++++++++++++++++++------------------ src/PIL/Image.py | 14 +++---- src/PIL/ImageFile.py | 6 ++- src/PIL/ImageQt.py | 11 +++-- src/PIL/ImageWin.py | 28 ++++++++----- src/PIL/IptcImagePlugin.py | 16 ++++---- src/PIL/JpegImagePlugin.py | 10 +++-- src/PIL/PngImagePlugin.py | 56 ++++++++++++++++--------- 10 files changed, 138 insertions(+), 92 deletions(-) diff --git a/Tests/test_imagewin.py b/Tests/test_imagewin.py index b43c31b52..a836bb90b 100644 --- a/Tests/test_imagewin.py +++ b/Tests/test_imagewin.py @@ -57,6 +57,9 @@ class TestImageWinDib: # Assert assert dib.size == (128, 128) + with pytest.raises(ValueError): + ImageWin.Dib(mode) + def test_dib_paste(self) -> None: # Arrange im = hopper() diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index 59bb8594d..7a73d1f69 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -65,7 +65,7 @@ def has_ghostscript() -> bool: return gs_binary is not False -def Ghostscript(tile, size, fp, scale=1, transparency=False): +def Ghostscript(tile, size, fp, scale=1, transparency: bool = False) -> Image.Image: """Render an image using Ghostscript""" global gs_binary if not has_ghostscript(): diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py index 650f5e4f1..8be1bd316 100644 --- a/src/PIL/IcoImagePlugin.py +++ b/src/PIL/IcoImagePlugin.py @@ -25,7 +25,7 @@ from __future__ import annotations import warnings from io import BytesIO from math import ceil, log -from typing import IO +from typing import IO, NamedTuple from . import BmpImagePlugin, Image, ImageFile, PngImagePlugin from ._binary import i16le as i16 @@ -119,8 +119,22 @@ def _accept(prefix: bytes) -> bool: return prefix[:4] == _MAGIC +class IconHeader(NamedTuple): + width: int + height: int + nb_color: int + reserved: int + planes: int + bpp: int + size: int + offset: int + dim: tuple[int, int] + square: int + color_depth: int + + class IcoFile: - def __init__(self, buf) -> None: + def __init__(self, buf: IO[bytes]) -> None: """ Parse image from file-like object containing ico file data """ @@ -141,51 +155,44 @@ class IcoFile: for i in range(self.nb_items): s = buf.read(16) - icon_header = { - "width": s[0], - "height": s[1], - "nb_color": s[2], # No. of colors in image (0 if >=8bpp) - "reserved": s[3], - "planes": i16(s, 4), - "bpp": i16(s, 6), - "size": i32(s, 8), - "offset": i32(s, 12), - } - # See Wikipedia - for j in ("width", "height"): - if not icon_header[j]: - icon_header[j] = 256 + width = s[0] or 256 + height = s[1] or 256 - # See Wikipedia notes about color depth. - # We need this just to differ images with equal sizes - icon_header["color_depth"] = ( - icon_header["bpp"] - or ( - icon_header["nb_color"] != 0 - and ceil(log(icon_header["nb_color"], 2)) - ) - or 256 + # No. of colors in image (0 if >=8bpp) + nb_color = s[2] + bpp = i16(s, 6) + icon_header = IconHeader( + width=width, + height=height, + nb_color=nb_color, + reserved=s[3], + planes=i16(s, 4), + bpp=i16(s, 6), + size=i32(s, 8), + offset=i32(s, 12), + dim=(width, height), + square=width * height, + # See Wikipedia notes about color depth. + # We need this just to differ images with equal sizes + color_depth=bpp or (nb_color != 0 and ceil(log(nb_color, 2))) or 256, ) - icon_header["dim"] = (icon_header["width"], icon_header["height"]) - icon_header["square"] = icon_header["width"] * icon_header["height"] - self.entry.append(icon_header) - self.entry = sorted(self.entry, key=lambda x: x["color_depth"]) + self.entry = sorted(self.entry, key=lambda x: x.color_depth) # ICO images are usually squares - self.entry = sorted(self.entry, key=lambda x: x["square"], reverse=True) + self.entry = sorted(self.entry, key=lambda x: x.square, reverse=True) def sizes(self) -> set[tuple[int, int]]: """ - Get a list of all available icon sizes and color depths. + Get a set of all available icon sizes and color depths. """ - return {(h["width"], h["height"]) for h in self.entry} + return {(h.width, h.height) for h in self.entry} def getentryindex(self, size: tuple[int, int], bpp: int | bool = False) -> int: for i, h in enumerate(self.entry): - if size == h["dim"] and (bpp is False or bpp == h["color_depth"]): + if size == h.dim and (bpp is False or bpp == h.color_depth): return i return 0 @@ -202,9 +209,9 @@ class IcoFile: header = self.entry[idx] - self.buf.seek(header["offset"]) + self.buf.seek(header.offset) data = self.buf.read(8) - self.buf.seek(header["offset"]) + self.buf.seek(header.offset) im: Image.Image if data[:8] == PngImagePlugin._MAGIC: @@ -222,8 +229,7 @@ class IcoFile: im.tile[0] = d, (0, 0) + im.size, o, a # figure out where AND mask image starts - bpp = header["bpp"] - if 32 == bpp: + if 32 == header.bpp: # 32-bit color depth icon image allows semitransparent areas # PIL's DIB format ignores transparency bits, recover them. # The DIB is packed in BGRX byte order where X is the alpha @@ -253,7 +259,7 @@ class IcoFile: # padded row size * height / bits per char total_bytes = int((w * im.size[1]) / 8) - and_mask_offset = header["offset"] + header["size"] - total_bytes + and_mask_offset = header.offset + header.size - total_bytes self.buf.seek(and_mask_offset) mask_data = self.buf.read(total_bytes) @@ -307,7 +313,7 @@ class IcoImageFile(ImageFile.ImageFile): def _open(self) -> None: self.ico = IcoFile(self.fp) self.info["sizes"] = self.ico.sizes() - self.size = self.ico.entry[0]["dim"] + self.size = self.ico.entry[0].dim self.load() @property diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 565abe71d..9d901e028 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -3286,7 +3286,7 @@ def fromarray(obj: SupportsArrayInterface, mode: str | None = None) -> Image: return frombuffer(mode, size, obj, "raw", rawmode, 0, 1) -def fromqimage(im): +def fromqimage(im) -> ImageFile.ImageFile: """Creates an image instance from a QImage image""" from . import ImageQt @@ -3296,7 +3296,7 @@ def fromqimage(im): return ImageQt.fromqimage(im) -def fromqpixmap(im): +def fromqpixmap(im) -> ImageFile.ImageFile: """Creates an image instance from a QPixmap image""" from . import ImageQt @@ -3867,7 +3867,7 @@ class Exif(_ExifBase): # returns a dict with any single item tuples/lists as individual values return {k: self._fixup(v) for k, v in src_dict.items()} - def _get_ifd_dict(self, offset, group=None): + def _get_ifd_dict(self, offset: int, group=None): try: # an offset pointer to the location of the nested embedded IFD. # It should be a long, but may be corrupted. @@ -3881,7 +3881,7 @@ class Exif(_ExifBase): info.load(self.fp) return self._fixup_dict(info) - def _get_head(self): + def _get_head(self) -> bytes: version = b"\x2B" if self.bigtiff else b"\x2A" if self.endian == "<": head = b"II" + version + b"\x00" + o32le(8) @@ -4102,16 +4102,16 @@ class Exif(_ExifBase): keys.update(self._info) return len(keys) - def __getitem__(self, tag): + def __getitem__(self, tag: int): if self._info is not None and tag not in self._data and tag in self._info: self._data[tag] = self._fixup(self._info[tag]) del self._info[tag] return self._data[tag] - def __contains__(self, tag) -> bool: + def __contains__(self, tag: object) -> bool: return tag in self._data or (self._info is not None and tag in self._info) - def __setitem__(self, tag, value) -> None: + def __setitem__(self, tag: int, value) -> None: if self._info is not None and tag in self._info: del self._info[tag] self._data[tag] = value diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 6b2953451..e4a7dba44 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -553,7 +553,9 @@ def _save(im, fp, tile, bufsize: int = 0) -> None: fp.flush() -def _encode_tile(im, fp, tile: list[_Tile], bufsize: int, fh, exc=None) -> None: +def _encode_tile( + im, fp: IO[bytes], tile: list[_Tile], bufsize: int, fh, exc=None +) -> None: for encoder_name, extents, offset, args in tile: if offset > 0: fp.seek(offset) @@ -653,7 +655,7 @@ class PyCodec: """ pass - def setfd(self, fd) -> None: + def setfd(self, fd: IO[bytes]) -> None: """ Called from ImageFile to set the Python file-like object diff --git a/src/PIL/ImageQt.py b/src/PIL/ImageQt.py index 35a37760c..346fe49d3 100644 --- a/src/PIL/ImageQt.py +++ b/src/PIL/ImageQt.py @@ -19,11 +19,14 @@ from __future__ import annotations import sys from io import BytesIO -from typing import Callable +from typing import TYPE_CHECKING, Callable from . import Image from ._util import is_path +if TYPE_CHECKING: + from . import ImageFile + qt_version: str | None qt_versions = [ ["6", "PyQt6"], @@ -90,11 +93,11 @@ def fromqimage(im): return Image.open(b) -def fromqpixmap(im): +def fromqpixmap(im) -> ImageFile.ImageFile: return fromqimage(im) -def align8to32(bytes, width, mode): +def align8to32(bytes: bytes, width: int, mode: str) -> bytes: """ converts each scanline of data from 8 bit to 32 bit aligned """ @@ -172,7 +175,7 @@ def _toqclass_helper(im): if qt_is_installed: class ImageQt(QImage): - def __init__(self, im): + def __init__(self, im) -> None: """ An PIL image wrapper for Qt. This is a subclass of PyQt's QImage class. diff --git a/src/PIL/ImageWin.py b/src/PIL/ImageWin.py index 978c5a9d1..4f9956087 100644 --- a/src/PIL/ImageWin.py +++ b/src/PIL/ImageWin.py @@ -70,11 +70,14 @@ class Dib: """ def __init__( - self, image: Image.Image | str, size: tuple[int, int] | list[int] | None = None + self, image: Image.Image | str, size: tuple[int, int] | None = None ) -> None: if isinstance(image, str): mode = image image = "" + if size is None: + msg = "If first argument is mode, size is required" + raise ValueError(msg) else: mode = image.mode size = image.size @@ -105,7 +108,12 @@ class Dib: result = self.image.expose(handle) return result - def draw(self, handle, dst, src=None): + def draw( + self, + handle, + dst: tuple[int, int, int, int], + src: tuple[int, int, int, int] | None = None, + ): """ Same as expose, but allows you to specify where to draw the image, and what part of it to draw. @@ -115,7 +123,7 @@ class Dib: the destination have different sizes, the image is resized as necessary. """ - if not src: + if src is None: src = (0, 0) + self.size if isinstance(handle, HWND): dc = self.image.getdc(handle) @@ -202,22 +210,22 @@ class Window: title, self.__dispatcher, width or 0, height or 0 ) - def __dispatcher(self, action, *args): + def __dispatcher(self, action: str, *args): return getattr(self, f"ui_handle_{action}")(*args) - def ui_handle_clear(self, dc, x0, y0, x1, y1): + def ui_handle_clear(self, dc, x0, y0, x1, y1) -> None: pass - def ui_handle_damage(self, x0, y0, x1, y1): + def ui_handle_damage(self, x0, y0, x1, y1) -> None: pass def ui_handle_destroy(self) -> None: pass - def ui_handle_repair(self, dc, x0, y0, x1, y1): + def ui_handle_repair(self, dc, x0, y0, x1, y1) -> None: pass - def ui_handle_resize(self, width, height): + def ui_handle_resize(self, width, height) -> None: pass def mainloop(self) -> None: @@ -227,12 +235,12 @@ class Window: class ImageWindow(Window): """Create an image window which displays the given image.""" - def __init__(self, image, title="PIL"): + def __init__(self, image, title: str = "PIL") -> None: if not isinstance(image, Dib): image = Dib(image) self.image = image width, height = image.size super().__init__(title, width=width, height=height) - def ui_handle_repair(self, dc, x0, y0, x1, y1): + def ui_handle_repair(self, dc, x0, y0, x1, y1) -> None: self.image.draw(dc, (x0, y0, x1, y1)) diff --git a/src/PIL/IptcImagePlugin.py b/src/PIL/IptcImagePlugin.py index a04616fbd..16a18ddfa 100644 --- a/src/PIL/IptcImagePlugin.py +++ b/src/PIL/IptcImagePlugin.py @@ -18,6 +18,7 @@ from __future__ import annotations from collections.abc import Sequence from io import BytesIO +from typing import cast from . import Image, ImageFile from ._binary import i16be as i16 @@ -184,7 +185,7 @@ Image.register_open(IptcImageFile.format, IptcImageFile) Image.register_extension(IptcImageFile.format, ".iim") -def getiptcinfo(im): +def getiptcinfo(im: ImageFile.ImageFile): """ Get IPTC information from TIFF, JPEG, or IPTC file. @@ -221,16 +222,17 @@ def getiptcinfo(im): class FakeImage: pass - im = FakeImage() - im.__class__ = IptcImageFile + fake_im = FakeImage() + fake_im.__class__ = IptcImageFile # type: ignore[assignment] + iptc_im = cast(IptcImageFile, fake_im) # parse the IPTC information chunk - im.info = {} - im.fp = BytesIO(data) + iptc_im.info = {} + iptc_im.fp = BytesIO(data) try: - im._open() + iptc_im._open() except (IndexError, KeyError): pass # expected failure - return im.info + return iptc_im.info diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 54f756014..af24faa5d 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -685,7 +685,11 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: raise ValueError(msg) subsampling = get_sampling(im) - def validate_qtables(qtables): + def validate_qtables( + qtables: ( + str | tuple[list[int], ...] | list[list[int]] | dict[int, list[int]] | None + ) + ) -> list[list[int]] | None: if qtables is None: return qtables if isinstance(qtables, str): @@ -715,12 +719,12 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if len(table) != 64: msg = "Invalid quantization table" raise TypeError(msg) - table = array.array("H", table) + table_array = array.array("H", table) except TypeError as e: msg = "Invalid quantization table" raise ValueError(msg) from e else: - qtables[idx] = list(table) + qtables[idx] = list(table_array) return qtables if qtables == "keep": diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 6990b6d05..247f908ed 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -39,7 +39,7 @@ import struct import warnings import zlib from enum import IntEnum -from typing import IO, TYPE_CHECKING, Any, NoReturn +from typing import IO, TYPE_CHECKING, Any, NamedTuple, NoReturn from . import Image, ImageChops, ImageFile, ImagePalette, ImageSequence from ._binary import i16be as i16 @@ -1126,7 +1126,21 @@ class _fdat: self.seq_num += 1 -def _write_multiple_frames(im, fp, chunk, mode, rawmode, default_image, append_images): +class _Frame(NamedTuple): + im: Image.Image + bbox: tuple[int, int, int, int] | None + encoderinfo: dict[str, Any] + + +def _write_multiple_frames( + im: Image.Image, + fp: IO[bytes], + chunk, + mode: str, + rawmode: str, + default_image: Image.Image | None, + append_images: list[Image.Image], +) -> Image.Image | None: duration = im.encoderinfo.get("duration") loop = im.encoderinfo.get("loop", im.info.get("loop", 0)) disposal = im.encoderinfo.get("disposal", im.info.get("disposal", Disposal.OP_NONE)) @@ -1137,7 +1151,7 @@ def _write_multiple_frames(im, fp, chunk, mode, rawmode, default_image, append_i else: chain = itertools.chain([im], append_images) - im_frames = [] + im_frames: list[_Frame] = [] frame_count = 0 for im_seq in chain: for im_frame in ImageSequence.Iterator(im_seq): @@ -1158,24 +1172,24 @@ def _write_multiple_frames(im, fp, chunk, mode, rawmode, default_image, append_i if im_frames: previous = im_frames[-1] - prev_disposal = previous["encoderinfo"].get("disposal") - prev_blend = previous["encoderinfo"].get("blend") + prev_disposal = previous.encoderinfo.get("disposal") + prev_blend = previous.encoderinfo.get("blend") if prev_disposal == Disposal.OP_PREVIOUS and len(im_frames) < 2: prev_disposal = Disposal.OP_BACKGROUND if prev_disposal == Disposal.OP_BACKGROUND: - base_im = previous["im"].copy() + base_im = previous.im.copy() dispose = Image.core.fill("RGBA", im.size, (0, 0, 0, 0)) - bbox = previous["bbox"] + bbox = previous.bbox if bbox: dispose = dispose.crop(bbox) else: bbox = (0, 0) + im.size base_im.paste(dispose, bbox) elif prev_disposal == Disposal.OP_PREVIOUS: - base_im = im_frames[-2]["im"] + base_im = im_frames[-2].im else: - base_im = previous["im"] + base_im = previous.im delta = ImageChops.subtract_modulo( im_frame.convert("RGBA"), base_im.convert("RGBA") ) @@ -1186,14 +1200,14 @@ def _write_multiple_frames(im, fp, chunk, mode, rawmode, default_image, append_i and prev_blend == encoderinfo.get("blend") and "duration" in encoderinfo ): - previous["encoderinfo"]["duration"] += encoderinfo["duration"] + previous.encoderinfo["duration"] += encoderinfo["duration"] continue else: bbox = None - im_frames.append({"im": im_frame, "bbox": bbox, "encoderinfo": encoderinfo}) + im_frames.append(_Frame(im_frame, bbox, encoderinfo)) if len(im_frames) == 1 and not default_image: - return im_frames[0]["im"] + return im_frames[0].im # animation control chunk( @@ -1211,14 +1225,14 @@ def _write_multiple_frames(im, fp, chunk, mode, rawmode, default_image, append_i seq_num = 0 for frame, frame_data in enumerate(im_frames): - im_frame = frame_data["im"] - if not frame_data["bbox"]: + im_frame = frame_data.im + if not frame_data.bbox: bbox = (0, 0) + im_frame.size else: - bbox = frame_data["bbox"] + bbox = frame_data.bbox im_frame = im_frame.crop(bbox) size = im_frame.size - encoderinfo = frame_data["encoderinfo"] + encoderinfo = frame_data.encoderinfo frame_duration = int(round(encoderinfo.get("duration", 0))) frame_disposal = encoderinfo.get("disposal", disposal) frame_blend = encoderinfo.get("blend", blend) @@ -1253,6 +1267,7 @@ def _write_multiple_frames(im, fp, chunk, mode, rawmode, default_image, append_i [("zip", (0, 0) + im_frame.size, 0, rawmode)], ) seq_num = fdat_chunks.seq_num + return None def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: @@ -1437,12 +1452,15 @@ def _save( exif = exif[6:] chunk(fp, b"eXIf", exif) + single_im: Image.Image | None = im if save_all: - im = _write_multiple_frames( + single_im = _write_multiple_frames( im, fp, chunk, mode, rawmode, default_image, append_images ) - if im: - ImageFile._save(im, _idat(fp, chunk), [("zip", (0, 0) + im.size, 0, rawmode)]) + if single_im: + ImageFile._save( + single_im, _idat(fp, chunk), [("zip", (0, 0) + single_im.size, 0, rawmode)] + ) if info: for info_chunk in info.chunks: From 76e5e12f9855e59eaf393c40e68f4e737f1175fd Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 15 Jul 2024 20:48:39 +1000 Subject: [PATCH 152/662] Simplified code --- src/_imagingft.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/_imagingft.c b/src/_imagingft.c index 6c2885c61..c6d20fe45 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -1315,8 +1315,7 @@ font_getvaraxes(FontObject *self) { FT_Done_MM_Var(library, master); return NULL; } - PyDict_SetItemString( - list_axis, "name", axis_name ? axis_name : Py_None); + PyDict_SetItemString(list_axis, "name", axis_name); Py_DECREF(axis_name); break; } From 3eeef83517b12d4e7af826b3aa0f6ebc82faf1fa Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Tue, 16 Jul 2024 16:40:17 +1000 Subject: [PATCH 153/662] Updated condition Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- src/PIL/IcoImagePlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py index 8be1bd316..c891024f5 100644 --- a/src/PIL/IcoImagePlugin.py +++ b/src/PIL/IcoImagePlugin.py @@ -229,7 +229,7 @@ class IcoFile: im.tile[0] = d, (0, 0) + im.size, o, a # figure out where AND mask image starts - if 32 == header.bpp: + if header.bpp == 32: # 32-bit color depth icon image allows semitransparent areas # PIL's DIB format ignores transparency bits, recover them. # The DIB is packed in BGRX byte order where X is the alpha From e89be771452731e1387f2a9c2fcb47a6d8e3350d Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Tue, 16 Jul 2024 10:21:24 +0200 Subject: [PATCH 154/662] Upload wheels to scientific-python-nightly-wheels index --- .github/workflows/wheels.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index e32f14529..3013f0c37 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,6 +1,14 @@ name: Wheels on: + schedule: + # ┌───────────── minute (0 - 59) + # │ ┌───────────── hour (0 - 23) + # │ │ ┌───────────── day of the month (1 - 31) + # │ │ │ ┌───────────── month (1 - 12 or JAN-DEC) + # │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT) + # │ │ │ │ │ + - cron: "42 1 * * 0,3" push: paths: - ".ci/requirements-cibw.txt" @@ -140,6 +148,13 @@ jobs: name: dist-${{ matrix.os }}-${{ matrix.cibw_arch }}${{ matrix.manylinux && format('-{0}', matrix.manylinux) }} path: ./wheelhouse/*.whl + - name: Upload wheels to scientific-python-nightly-wheels + if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' + uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0 + with: + artifacts_path: ./wheelhouse + anaconda_nightly_upload_token: ${{ secrets.PILLOW_NIGHTLY_UPLOAD_TOKEN }} + windows: name: Windows ${{ matrix.cibw_arch }} runs-on: windows-latest @@ -226,6 +241,13 @@ jobs: name: fribidi-windows-${{ matrix.cibw_arch }} path: winbuild\build\bin\fribidi* + - name: Upload wheels to scientific-python-nightly-wheels + if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' + uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0 + with: + artifacts_path: ./wheelhouse + anaconda_nightly_upload_token: ${{ secrets.PILLOW_NIGHTLY_UPLOAD_TOKEN }} + sdist: runs-on: ubuntu-latest steps: From 784a87449063cb2ee2c65988574e83399b018f60 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 16 Jul 2024 18:38:50 +1000 Subject: [PATCH 155/662] Trim whitespace --- .github/workflows/wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 3013f0c37..191eaffeb 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -149,7 +149,7 @@ jobs: path: ./wheelhouse/*.whl - name: Upload wheels to scientific-python-nightly-wheels - if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' + if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0 with: artifacts_path: ./wheelhouse @@ -242,7 +242,7 @@ jobs: path: winbuild\build\bin\fribidi* - name: Upload wheels to scientific-python-nightly-wheels - if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' + if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0 with: artifacts_path: ./wheelhouse From 68c3542d096e314921d25539bb65e24e3760a1f3 Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Tue, 16 Jul 2024 10:42:18 +0200 Subject: [PATCH 156/662] Rename secret --- .github/workflows/wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 191eaffeb..4501802cb 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -153,7 +153,7 @@ jobs: uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0 with: artifacts_path: ./wheelhouse - anaconda_nightly_upload_token: ${{ secrets.PILLOW_NIGHTLY_UPLOAD_TOKEN }} + anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} windows: name: Windows ${{ matrix.cibw_arch }} @@ -246,7 +246,7 @@ jobs: uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0 with: artifacts_path: ./wheelhouse - anaconda_nightly_upload_token: ${{ secrets.PILLOW_NIGHTLY_UPLOAD_TOKEN }} + anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} sdist: runs-on: ubuntu-latest From d83c7b38c42952dbd3fcab1807732363d6e64607 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Tue, 16 Jul 2024 20:18:25 +1000 Subject: [PATCH 157/662] Skip other jobs on schedule (#1) Co-authored-by: Andrew Murray --- .github/workflows/wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 4501802cb..fa1825e45 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -41,6 +41,7 @@ env: jobs: build-1-QEMU-emulated-wheels: + if: github.event_name != 'schedule' name: aarch64 ${{ matrix.python-version }} ${{ matrix.spec }} runs-on: ubuntu-latest strategy: @@ -249,6 +250,7 @@ jobs: anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} sdist: + if: github.event_name != 'schedule' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 87b23d0207fb5f703e6c143e3ca8ed7d174930ff Mon Sep 17 00:00:00 2001 From: Yay295 Date: Sun, 19 May 2024 01:54:21 -0500 Subject: [PATCH 158/662] change AlignAfterOpenBracket in .clang-format to BlockIndent to match the Python code --- .clang-format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.clang-format b/.clang-format index 3199e330b..143dde82c 100644 --- a/.clang-format +++ b/.clang-format @@ -3,7 +3,7 @@ BasedOnStyle: Google AlwaysBreakAfterReturnType: All AllowShortIfStatementsOnASingleLine: false -AlignAfterOpenBracket: AlwaysBreak +AlignAfterOpenBracket: BlockIndent BinPackArguments: false BinPackParameters: false BreakBeforeBraces: Attach From 2973b041c76482da213fd93e151c542577178fe3 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 12:58:00 +0000 Subject: [PATCH 159/662] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/Tk/_tkmini.h | 9 +- src/Tk/tkImaging.c | 24 +++-- src/_imaging.c | 175 ++++++++++++++++++++------------- src/_imagingcms.c | 79 ++++++++++----- src/_imagingft.c | 91 +++++++++++------ src/_imagingmath.c | 3 +- src/_imagingmorph.c | 3 +- src/_webp.c | 45 ++++++--- src/decode.c | 6 +- src/display.c | 50 ++++++---- src/encode.c | 108 ++++++++++++-------- src/libImaging/Access.c | 3 +- src/libImaging/BcnDecode.c | 39 +++++--- src/libImaging/BoxBlur.c | 18 ++-- src/libImaging/Chops.c | 9 +- src/libImaging/ColorLUT.c | 30 ++++-- src/libImaging/Convert.c | 34 +++---- src/libImaging/ConvertYCbCr.c | 36 ++++--- src/libImaging/Dib.c | 12 ++- src/libImaging/Draw.c | 134 ++++++++++++++----------- src/libImaging/Fill.c | 4 +- src/libImaging/Filter.c | 6 +- src/libImaging/Geometry.c | 34 ++++--- src/libImaging/GetBBox.c | 24 ++--- src/libImaging/GifEncode.c | 9 +- src/libImaging/HexDecode.c | 3 +- src/libImaging/Imaging.h | 60 +++++++---- src/libImaging/Jpeg2KDecode.c | 57 +++++------ src/libImaging/Jpeg2KEncode.c | 14 +-- src/libImaging/JpegDecode.c | 8 +- src/libImaging/JpegEncode.c | 18 ++-- src/libImaging/PackDecode.c | 6 +- src/libImaging/Paste.c | 54 +++++----- src/libImaging/PcxDecode.c | 6 +- src/libImaging/PcxEncode.c | 3 +- src/libImaging/Point.c | 4 +- src/libImaging/Quant.c | 105 +++++++++++++------- src/libImaging/QuantHash.c | 6 +- src/libImaging/QuantHash.h | 12 +-- src/libImaging/QuantOctree.c | 40 +++++--- src/libImaging/QuantPngQuant.c | 3 +- src/libImaging/QuantPngQuant.h | 3 +- src/libImaging/RankFilter.c | 3 +- src/libImaging/RawDecode.c | 3 +- src/libImaging/RawEncode.c | 3 +- src/libImaging/Reduce.c | 105 +++++++++++++------- src/libImaging/Resample.c | 36 ++++--- src/libImaging/SgiRleDecode.c | 9 +- src/libImaging/Storage.c | 8 +- src/libImaging/SunRleDecode.c | 3 +- src/libImaging/TgaRleDecode.c | 3 +- src/libImaging/TgaRleEncode.c | 6 +- src/libImaging/TiffDecode.c | 112 ++++++++++++++------- src/libImaging/TiffDecode.h | 3 +- src/libImaging/Unpack.c | 24 +++-- src/libImaging/UnpackYCC.c | 15 ++- src/libImaging/UnsharpMask.c | 3 +- src/libImaging/XbmEncode.c | 3 +- src/libImaging/ZipDecode.c | 9 +- src/libImaging/ZipEncode.c | 9 +- src/map.c | 3 +- src/path.c | 9 +- 62 files changed, 1088 insertions(+), 668 deletions(-) diff --git a/src/Tk/_tkmini.h b/src/Tk/_tkmini.h index 68247bc47..a260fa0d1 100644 --- a/src/Tk/_tkmini.h +++ b/src/Tk/_tkmini.h @@ -80,7 +80,8 @@ typedef struct Tcl_Command_ *Tcl_Command; typedef void *ClientData; typedef int(Tcl_CmdProc)( - ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[]); + ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[] +); typedef void(Tcl_CmdDeleteProc)(ClientData clientData); /* Typedefs derived from function signatures in Tcl header */ @@ -90,7 +91,8 @@ typedef Tcl_Command (*Tcl_CreateCommand_t)( const char *cmdName, Tcl_CmdProc *proc, ClientData clientData, - Tcl_CmdDeleteProc *deleteProc); + Tcl_CmdDeleteProc *deleteProc +); /* Tcl_AppendResult */ typedef void (*Tcl_AppendResult_t)(Tcl_Interp *interp, ...); @@ -127,7 +129,8 @@ typedef int (*Tk_PhotoPutBlock_t)( int y, int width, int height, - int compRule); + int compRule +); /* Tk_FindPhoto */ typedef Tk_PhotoHandle (*Tk_FindPhoto_t)(Tcl_Interp *interp, const char *imageName); /* Tk_PhotoGetImage */ diff --git a/src/Tk/tkImaging.c b/src/Tk/tkImaging.c index ef1c00a94..727ee6bed 100644 --- a/src/Tk/tkImaging.c +++ b/src/Tk/tkImaging.c @@ -73,14 +73,16 @@ ImagingFind(const char *name) { static int PyImagingPhotoPut( - ClientData clientdata, Tcl_Interp *interp, int argc, const char **argv) { + ClientData clientdata, Tcl_Interp *interp, int argc, const char **argv +) { Imaging im; Tk_PhotoHandle photo; Tk_PhotoImageBlock block; if (argc != 3) { TCL_APPEND_RESULT( - interp, "usage: ", argv[0], " destPhoto srcImage", (char *)NULL); + interp, "usage: ", argv[0], " destPhoto srcImage", (char *)NULL + ); return TCL_ERROR; } @@ -128,14 +130,16 @@ PyImagingPhotoPut( block.pixelPtr = (unsigned char *)im->block; TK_PHOTO_PUT_BLOCK( - interp, photo, &block, 0, 0, block.width, block.height, TK_PHOTO_COMPOSITE_SET); + interp, photo, &block, 0, 0, block.width, block.height, TK_PHOTO_COMPOSITE_SET + ); return TCL_OK; } static int PyImagingPhotoGet( - ClientData clientdata, Tcl_Interp *interp, int argc, const char **argv) { + ClientData clientdata, Tcl_Interp *interp, int argc, const char **argv +) { Imaging im; Tk_PhotoHandle photo; Tk_PhotoImageBlock block; @@ -143,7 +147,8 @@ PyImagingPhotoGet( if (argc != 3) { TCL_APPEND_RESULT( - interp, "usage: ", argv[0], " srcPhoto destImage", (char *)NULL); + interp, "usage: ", argv[0], " srcPhoto destImage", (char *)NULL + ); return TCL_ERROR; } @@ -183,13 +188,15 @@ TkImaging_Init(Tcl_Interp *interp) { "PyImagingPhoto", PyImagingPhotoPut, (ClientData)0, - (Tcl_CmdDeleteProc *)NULL); + (Tcl_CmdDeleteProc *)NULL + ); TCL_CREATE_COMMAND( interp, "PyImagingPhotoGet", PyImagingPhotoGet, (ClientData)0, - (Tcl_CmdDeleteProc *)NULL); + (Tcl_CmdDeleteProc *)NULL + ); } /* @@ -394,7 +401,8 @@ _func_loader(void *lib) { } return ( (TK_PHOTO_PUT_BLOCK = (Tk_PhotoPutBlock_t)_dfunc(lib, "Tk_PhotoPutBlock")) == - NULL); + NULL + ); } int diff --git a/src/_imaging.c b/src/_imaging.c index ac6310a44..5c2f7b4b6 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -290,7 +290,8 @@ ImagingError_ModeError(void) { void * ImagingError_ValueError(const char *message) { PyErr_SetString( - PyExc_ValueError, (message) ? (char *)message : "unrecognized argument value"); + PyExc_ValueError, (message) ? (char *)message : "unrecognized argument value" + ); return NULL; } @@ -467,7 +468,8 @@ getpixel(Imaging im, ImagingAccess access, int x, int y) { return Py_BuildValue("BBB", pixel.b[0], pixel.b[1], pixel.b[2]); case 4: return Py_BuildValue( - "BBBB", pixel.b[0], pixel.b[1], pixel.b[2], pixel.b[3]); + "BBBB", pixel.b[0], pixel.b[1], pixel.b[2], pixel.b[3] + ); } break; case IMAGING_TYPE_INT32: @@ -518,7 +520,8 @@ getink(PyObject *color, Imaging im, char *ink) { rIsInt = 1; } else if (im->bands == 1) { PyErr_SetString( - PyExc_TypeError, "color must be int or single-element tuple"); + PyExc_TypeError, "color must be int or single-element tuple" + ); return NULL; } else if (tupleSize == -1) { PyErr_SetString(PyExc_TypeError, "color must be int or tuple"); @@ -534,8 +537,8 @@ getink(PyObject *color, Imaging im, char *ink) { if (rIsInt != 1) { if (tupleSize != 1) { PyErr_SetString( - PyExc_TypeError, - "color must be int or single-element tuple"); + PyExc_TypeError, "color must be int or single-element tuple" + ); return NULL; } else if (!PyArg_ParseTuple(color, "L", &r)) { return NULL; @@ -556,7 +559,8 @@ getink(PyObject *color, Imaging im, char *ink) { if (tupleSize != 1 && tupleSize != 2) { PyErr_SetString( PyExc_TypeError, - "color must be int, or tuple of one or two elements"); + "color must be int, or tuple of one or two elements" + ); return NULL; } else if (!PyArg_ParseTuple(color, "L|i", &r, &a)) { return NULL; @@ -567,7 +571,8 @@ getink(PyObject *color, Imaging im, char *ink) { PyErr_SetString( PyExc_TypeError, "color must be int, or tuple of one, three or four " - "elements"); + "elements" + ); return NULL; } else if (!PyArg_ParseTuple(color, "Lii|i", &r, &g, &b, &a)) { return NULL; @@ -608,7 +613,8 @@ getink(PyObject *color, Imaging im, char *ink) { } else if (tupleSize != 3) { PyErr_SetString( PyExc_TypeError, - "color must be int, or tuple of one or three elements"); + "color must be int, or tuple of one or three elements" + ); return NULL; } else if (!PyArg_ParseTuple(color, "iiL", &b, &g, &r)) { return NULL; @@ -733,7 +739,8 @@ _alpha_composite(ImagingObject *self, PyObject *args) { ImagingObject *imagep2; if (!PyArg_ParseTuple( - args, "O!O!", &Imaging_Type, &imagep1, &Imaging_Type, &imagep2)) { + args, "O!O!", &Imaging_Type, &imagep1, &Imaging_Type, &imagep2 + )) { return NULL; } @@ -748,7 +755,8 @@ _blend(ImagingObject *self, PyObject *args) { alpha = 0.5; if (!PyArg_ParseTuple( - args, "O!O!|d", &Imaging_Type, &imagep1, &Imaging_Type, &imagep2, &alpha)) { + args, "O!O!|d", &Imaging_Type, &imagep1, &Imaging_Type, &imagep2, &alpha + )) { return NULL; } @@ -827,7 +835,8 @@ _prepare_lut_table(PyObject *table, Py_ssize_t table_size) { break; case TYPE_FLOAT32: memcpy( - &item, ((char *)table_data) + i * sizeof(FLOAT32), sizeof(FLOAT32)); + &item, ((char *)table_data) + i * sizeof(FLOAT32), sizeof(FLOAT32) + ); break; case TYPE_DOUBLE: memcpy(&dtmp, ((char *)table_data) + i * sizeof(dtmp), sizeof(dtmp)); @@ -878,7 +887,8 @@ _color_lut_3d(ImagingObject *self, PyObject *args) { &size1D, &size2D, &size3D, - &table)) { + &table + )) { return NULL; } @@ -896,7 +906,8 @@ _color_lut_3d(ImagingObject *self, PyObject *args) { if (2 > size1D || size1D > 65 || 2 > size2D || size2D > 65 || 2 > size3D || size3D > 65) { PyErr_SetString( - PyExc_ValueError, "Table size in any dimension should be from 2 to 65"); + PyExc_ValueError, "Table size in any dimension should be from 2 to 65" + ); return NULL; } @@ -913,13 +924,8 @@ _color_lut_3d(ImagingObject *self, PyObject *args) { } if (!ImagingColorLUT3D_linear( - imOut, - self->image, - table_channels, - size1D, - size2D, - size3D, - prepared_table)) { + imOut, self->image, table_channels, size1D, size2D, size3D, prepared_table + )) { free(prepared_table); ImagingDelete(imOut); return NULL; @@ -943,7 +949,8 @@ _convert(ImagingObject *self, PyObject *args) { if (!PyImaging_Check(paletteimage)) { PyObject_Print((PyObject *)paletteimage, stderr, 0); PyErr_SetString( - PyExc_ValueError, "palette argument must be image with mode 'P'"); + PyExc_ValueError, "palette argument must be image with mode 'P'" + ); return NULL; } if (paletteimage->image->palette == NULL) { @@ -953,7 +960,8 @@ _convert(ImagingObject *self, PyObject *args) { } return PyImagingNew(ImagingConvert( - self->image, mode, paletteimage ? paletteimage->image->palette : NULL, dither)); + self->image, mode, paletteimage ? paletteimage->image->palette : NULL, dither + )); } static PyObject * @@ -961,7 +969,8 @@ _convert2(ImagingObject *self, PyObject *args) { ImagingObject *imagep1; ImagingObject *imagep2; if (!PyArg_ParseTuple( - args, "O!O!", &Imaging_Type, &imagep1, &Imaging_Type, &imagep2)) { + args, "O!O!", &Imaging_Type, &imagep1, &Imaging_Type, &imagep2 + )) { return NULL; } @@ -994,7 +1003,8 @@ _convert_matrix(ImagingObject *self, PyObject *args) { m + 8, m + 9, m + 10, - m + 11)) { + m + 11 + )) { return NULL; } } @@ -1055,7 +1065,8 @@ _filter(ImagingObject *self, PyObject *args) { float divisor, offset; PyObject *kernel = NULL; if (!PyArg_ParseTuple( - args, "(ii)ffO", &xsize, &ysize, &divisor, &offset, &kernel)) { + args, "(ii)ffO", &xsize, &ysize, &divisor, &offset, &kernel + )) { return NULL; } @@ -1138,7 +1149,8 @@ _getpalette(ImagingObject *self, PyObject *args) { } pack( - (UINT8 *)PyBytes_AsString(palette), self->image->palette->palette, palettesize); + (UINT8 *)PyBytes_AsString(palette), self->image->palette->palette, palettesize + ); return palette; } @@ -1232,7 +1244,8 @@ union hist_extrema { static union hist_extrema * parse_histogram_extremap( - ImagingObject *self, PyObject *extremap, union hist_extrema *ep) { + ImagingObject *self, PyObject *extremap, union hist_extrema *ep +) { int i0, i1; double f0, f1; @@ -1392,7 +1405,8 @@ _paste(ImagingObject *self, PyObject *args) { int x0, y0, x1, y1; ImagingObject *maskp = NULL; if (!PyArg_ParseTuple( - args, "O(iiii)|O!", &source, &x0, &y0, &x1, &y1, &Imaging_Type, &maskp)) { + args, "O(iiii)|O!", &source, &x0, &y0, &x1, &y1, &Imaging_Type, &maskp + )) { return NULL; } @@ -1404,14 +1418,16 @@ _paste(ImagingObject *self, PyObject *args) { x0, y0, x1, - y1); + y1 + ); } else { if (!getink(source, self->image, ink)) { return NULL; } status = ImagingFill2( - self->image, ink, (maskp) ? maskp->image : NULL, x0, y0, x1, y1); + self->image, ink, (maskp) ? maskp->image : NULL, x0, y0, x1, y1 + ); } if (status < 0) { @@ -1729,7 +1745,8 @@ _putpalette(ImagingObject *self, PyObject *args) { UINT8 *palette; Py_ssize_t palettesize; if (!PyArg_ParseTuple( - args, "ssy#", &palette_mode, &rawmode, &palette, &palettesize)) { + args, "ssy#", &palette_mode, &rawmode, &palette, &palettesize + )) { return NULL; } @@ -1887,7 +1904,8 @@ _resize(ImagingObject *self, PyObject *args) { &box[0], &box[1], &box[2], - &box[3])) { + &box[3] + )) { return NULL; } @@ -1923,7 +1941,8 @@ _resize(ImagingObject *self, PyObject *args) { imOut = ImagingNewDirty(imIn->mode, xsize, ysize); imOut = ImagingTransform( - imOut, imIn, IMAGING_TRANSFORM_AFFINE, 0, 0, xsize, ysize, a, filter, 1); + imOut, imIn, IMAGING_TRANSFORM_AFFINE, 0, 0, xsize, ysize, a, filter, 1 + ); } else { imOut = ImagingResample(imIn, xsize, ysize, filter, box); } @@ -1944,14 +1963,8 @@ _reduce(ImagingObject *self, PyObject *args) { box[3] = imIn->ysize; if (!PyArg_ParseTuple( - args, - "(ii)|(iiii)", - &xscale, - &yscale, - &box[0], - &box[1], - &box[2], - &box[3])) { + args, "(ii)|(iiii)", &xscale, &yscale, &box[0], &box[1], &box[2], &box[3] + )) { return NULL; } @@ -2053,7 +2066,8 @@ _transform(ImagingObject *self, PyObject *args) { &method, &data, &filter, - &fill)) { + &fill + )) { return NULL; } @@ -2077,7 +2091,8 @@ _transform(ImagingObject *self, PyObject *args) { } imOut = ImagingTransform( - self->image, imagep->image, method, x0, y0, x1, y1, a, filter, fill); + self->image, imagep->image, method, x0, y0, x1, y1, a, filter, fill + ); free(a); @@ -2250,7 +2265,8 @@ _getcolors(ImagingObject *self, PyObject *args) { for (i = 0; i < colors; i++) { ImagingColorItem *v = &items[i]; PyObject *item = Py_BuildValue( - "iN", v->count, getpixel(self->image, self->access, v->x, v->y)); + "iN", v->count, getpixel(self->image, self->access, v->x, v->y) + ); if (item == NULL) { Py_DECREF(out); free(items); @@ -2316,14 +2332,16 @@ _getprojection(ImagingObject *self) { } ImagingGetProjection( - self->image, (unsigned char *)xprofile, (unsigned char *)yprofile); + self->image, (unsigned char *)xprofile, (unsigned char *)yprofile + ); result = Py_BuildValue( "y#y#", xprofile, (Py_ssize_t)self->image->xsize, yprofile, - (Py_ssize_t)self->image->ysize); + (Py_ssize_t)self->image->ysize + ); free(xprofile); free(yprofile); @@ -2397,7 +2415,8 @@ _merge(PyObject *self, PyObject *args) { &Imaging_Type, &band2, &Imaging_Type, - &band3)) { + &band3 + )) { return NULL; } @@ -2643,7 +2662,8 @@ _font_new(PyObject *self_, PyObject *args) { unsigned char *glyphdata; Py_ssize_t glyphdata_length; if (!PyArg_ParseTuple( - args, "O!y#", &Imaging_Type, &imagep, &glyphdata, &glyphdata_length)) { + args, "O!y#", &Imaging_Type, &imagep, &glyphdata, &glyphdata_length + )) { return NULL; } @@ -2801,7 +2821,8 @@ _font_getmask(ImagingFontObject *self, PyObject *args) { if (i == 0 || text[i] != text[i - 1]) { ImagingDelete(bitmap); bitmap = ImagingCrop( - self->bitmap, glyph->sx0, glyph->sy0, glyph->sx1, glyph->sy1); + self->bitmap, glyph->sx0, glyph->sy0, glyph->sx1, glyph->sy1 + ); if (!bitmap) { goto failed; } @@ -2813,7 +2834,8 @@ _font_getmask(ImagingFontObject *self, PyObject *args) { glyph->dx0 + x, glyph->dy0 + b, glyph->dx1 + x, - glyph->dy1 + b); + glyph->dy1 + b + ); if (status < 0) { goto failed; } @@ -2952,7 +2974,8 @@ _draw_arc(ImagingDrawObject *self, PyObject *args) { end, &ink, width, - self->blend); + self->blend + ); free(xy); @@ -2982,13 +3005,15 @@ _draw_bitmap(ImagingDrawObject *self, PyObject *args) { } if (n != 1) { PyErr_SetString( - PyExc_TypeError, "coordinate list must contain exactly 1 coordinate"); + PyExc_TypeError, "coordinate list must contain exactly 1 coordinate" + ); free(xy); return NULL; } n = ImagingDrawBitmap( - self->image->image, (int)xy[0], (int)xy[1], bitmap->image, &ink, self->blend); + self->image->image, (int)xy[0], (int)xy[1], bitmap->image, &ink, self->blend + ); free(xy); @@ -3044,7 +3069,8 @@ _draw_chord(ImagingDrawObject *self, PyObject *args) { &ink, fill, width, - self->blend); + self->blend + ); free(xy); @@ -3098,7 +3124,8 @@ _draw_ellipse(ImagingDrawObject *self, PyObject *args) { &ink, fill, width, - self->blend); + self->blend + ); free(xy); @@ -3138,14 +3165,16 @@ _draw_lines(ImagingDrawObject *self, PyObject *args) { (int)p[2], (int)p[3], &ink, - self->blend) < 0) { + self->blend + ) < 0) { free(xy); return NULL; } } if (p) { /* draw last point */ ImagingDrawPoint( - self->image->image, (int)p[2], (int)p[3], &ink, self->blend); + self->image->image, (int)p[2], (int)p[3], &ink, self->blend + ); } } else { for (i = 0; i < n - 1; i++) { @@ -3158,7 +3187,8 @@ _draw_lines(ImagingDrawObject *self, PyObject *args) { (int)p[3], &ink, width, - self->blend) < 0) { + self->blend + ) < 0) { free(xy); return NULL; } @@ -3190,7 +3220,8 @@ _draw_points(ImagingDrawObject *self, PyObject *args) { for (i = 0; i < n; i++) { double *p = &xy[i + i]; if (ImagingDrawPoint( - self->image->image, (int)p[0], (int)p[1], &ink, self->blend) < 0) { + self->image->image, (int)p[0], (int)p[1], &ink, self->blend + ) < 0) { free(xy); return NULL; } @@ -3279,7 +3310,8 @@ _draw_pieslice(ImagingDrawObject *self, PyObject *args) { &ink, fill, width, - self->blend); + self->blend + ); free(xy); @@ -3311,7 +3343,8 @@ _draw_polygon(ImagingDrawObject *self, PyObject *args) { } if (n < 2) { PyErr_SetString( - PyExc_TypeError, "coordinate list must contain at least 2 coordinates"); + PyExc_TypeError, "coordinate list must contain at least 2 coordinates" + ); free(xy); return NULL; } @@ -3384,7 +3417,8 @@ _draw_rectangle(ImagingDrawObject *self, PyObject *args) { &ink, fill, width, - self->blend); + self->blend + ); free(xy); @@ -3524,7 +3558,8 @@ _effect_mandelbrot(ImagingObject *self, PyObject *args) { &extent[1], &extent[2], &extent[3], - &quality)) { + &quality + )) { return NULL; } @@ -3752,7 +3787,8 @@ _getattr_unsafe_ptrs(ImagingObject *self, void *closure) { "image32", self->image->image32, "image", - self->image->image); + self->image->image + ); } static struct PyGetSetDef getsetters[] = { @@ -3762,7 +3798,8 @@ static struct PyGetSetDef getsetters[] = { {"id", (getter)_getattr_id}, {"ptr", (getter)_getattr_ptr}, {"unsafe_ptrs", (getter)_getattr_unsafe_ptrs}, - {NULL}}; + {NULL} +}; /* basic sequence semantics */ @@ -4071,9 +4108,8 @@ _set_blocks_max(PyObject *self, PyObject *args) { if (blocks_max < 0) { PyErr_SetString(PyExc_ValueError, "blocks_max should be greater than 0"); return NULL; - } else if ( - (unsigned long)blocks_max > - SIZE_MAX / sizeof(ImagingDefaultArena.blocks_pool[0])) { + } else if ((unsigned long)blocks_max > + SIZE_MAX / sizeof(ImagingDefaultArena.blocks_pool[0])) { PyErr_SetString(PyExc_ValueError, "blocks_max is too large"); return NULL; } @@ -4428,7 +4464,8 @@ setup_module(PyObject *m) { PyObject *pillow_version = PyUnicode_FromString(version); PyDict_SetItemString( - d, "PILLOW_VERSION", pillow_version ? pillow_version : Py_None); + d, "PILLOW_VERSION", pillow_version ? pillow_version : Py_None + ); Py_XDECREF(pillow_version); return 0; diff --git a/src/_imagingcms.c b/src/_imagingcms.c index 628662b30..bafe787a7 100644 --- a/src/_imagingcms.c +++ b/src/_imagingcms.c @@ -331,7 +331,8 @@ pyCMScopyAux(cmsHTRANSFORM hTransform, Imaging imDst, const Imaging imSrc) { memcpy( pDstExtras + x * dstChunkSize, pSrcExtras + x * srcChunkSize, - channelSize); + channelSize + ); } } } @@ -373,7 +374,8 @@ _buildTransform( char *sInMode, char *sOutMode, int iRenderingIntent, - cmsUInt32Number cmsFLAGS) { + cmsUInt32Number cmsFLAGS +) { cmsHTRANSFORM hTransform; Py_BEGIN_ALLOW_THREADS @@ -385,7 +387,8 @@ _buildTransform( hOutputProfile, findLCMStype(sOutMode), iRenderingIntent, - cmsFLAGS); + cmsFLAGS + ); Py_END_ALLOW_THREADS; @@ -405,7 +408,8 @@ _buildProofTransform( char *sOutMode, int iRenderingIntent, int iProofIntent, - cmsUInt32Number cmsFLAGS) { + cmsUInt32Number cmsFLAGS +) { cmsHTRANSFORM hTransform; Py_BEGIN_ALLOW_THREADS @@ -419,7 +423,8 @@ _buildProofTransform( hProofProfile, iRenderingIntent, iProofIntent, - cmsFLAGS); + cmsFLAGS + ); Py_END_ALLOW_THREADS; @@ -454,7 +459,8 @@ buildTransform(PyObject *self, PyObject *args) { &sInMode, &sOutMode, &iRenderingIntent, - &cmsFLAGS)) { + &cmsFLAGS + )) { return NULL; } @@ -464,7 +470,8 @@ buildTransform(PyObject *self, PyObject *args) { sInMode, sOutMode, iRenderingIntent, - cmsFLAGS); + cmsFLAGS + ); if (!transform) { return NULL; @@ -499,7 +506,8 @@ buildProofTransform(PyObject *self, PyObject *args) { &sOutMode, &iRenderingIntent, &iProofIntent, - &cmsFLAGS)) { + &cmsFLAGS + )) { return NULL; } @@ -511,7 +519,8 @@ buildProofTransform(PyObject *self, PyObject *args) { sOutMode, iRenderingIntent, iProofIntent, - cmsFLAGS); + cmsFLAGS + ); if (!transform) { return NULL; @@ -563,7 +572,8 @@ createProfile(PyObject *self, PyObject *args) { PyErr_SetString( PyExc_ValueError, "ERROR: Could not calculate white point from color temperature " - "provided, must be float in degrees Kelvin"); + "provided, must be float in degrees Kelvin" + ); return NULL; } hProfile = cmsCreateLab2Profile(&whitePoint); @@ -624,7 +634,8 @@ cms_get_display_profile_win32(PyObject *self, PyObject *args) { HANDLE handle = 0; int is_dc = 0; if (!PyArg_ParseTuple( - args, "|" F_HANDLE "i:get_display_profile", &handle, &is_dc)) { + args, "|" F_HANDLE "i:get_display_profile", &handle, &is_dc + )) { return NULL; } @@ -729,7 +740,8 @@ _xyz_py(cmsCIEXYZ *XYZ) { cmsCIExyY xyY; cmsXYZ2xyY(&xyY, XYZ); return Py_BuildValue( - "((d,d,d),(d,d,d))", XYZ->X, XYZ->Y, XYZ->Z, xyY.x, xyY.y, xyY.Y); + "((d,d,d),(d,d,d))", XYZ->X, XYZ->Y, XYZ->Z, xyY.x, xyY.y, xyY.Y + ); } static PyObject * @@ -758,7 +770,8 @@ _xyz3_py(cmsCIEXYZ *XYZ) { xyY[1].Y, xyY[2].x, xyY[2].y, - xyY[2].Y); + xyY[2].Y + ); } static PyObject * @@ -809,7 +822,8 @@ _profile_read_ciexyy_triple(CmsProfileObject *self, cmsTagSignature info) { triple->Green.Y, triple->Blue.x, triple->Blue.y, - triple->Blue.Y); + triple->Blue.Y + ); } static PyObject * @@ -873,7 +887,8 @@ _calculate_rgb_primaries(CmsProfileObject *self, cmsCIEXYZTRIPLE *result) { hXYZ, TYPE_XYZ_DBL, INTENT_RELATIVE_COLORIMETRIC, - cmsFLAGS_NOCACHE | cmsFLAGS_NOOPTIMIZE); + cmsFLAGS_NOCACHE | cmsFLAGS_NOOPTIMIZE + ); cmsCloseProfile(hXYZ); if (hTransform == NULL) { return 0; @@ -889,7 +904,8 @@ _check_intent( int clut, cmsHPROFILE hProfile, cmsUInt32Number Intent, - cmsUInt32Number UsedDirection) { + cmsUInt32Number UsedDirection +) { if (clut) { return cmsIsCLUT(hProfile, Intent, UsedDirection); } else { @@ -934,7 +950,8 @@ _is_intent_supported(CmsProfileObject *self, int clut) { _check_intent(clut, self->profile, intent, LCMS_USED_AS_OUTPUT) ? Py_True : Py_False, _check_intent(clut, self->profile, intent, LCMS_USED_AS_PROOF) ? Py_True - : Py_False); + : Py_False + ); if (id == NULL || entry == NULL) { Py_XDECREF(id); Py_XDECREF(entry); @@ -968,7 +985,8 @@ static PyMethodDef pyCMSdll_methods[] = { {"get_display_profile_win32", cms_get_display_profile_win32, METH_VARARGS}, #endif - {NULL, NULL}}; + {NULL, NULL} +}; static struct PyMethodDef cms_profile_methods[] = { {"is_intent_supported", (PyCFunction)cms_profile_is_intent_supported, METH_VARARGS}, @@ -1028,7 +1046,8 @@ cms_profile_getattr_creation_date(CmsProfileObject *self, void *closure) { } return PyDateTime_FromDateAndTime( - 1900 + ct.tm_year, ct.tm_mon, ct.tm_mday, ct.tm_hour, ct.tm_min, ct.tm_sec, 0); + 1900 + ct.tm_year, ct.tm_mon, ct.tm_mday, ct.tm_hour, ct.tm_min, ct.tm_sec, 0 + ); } static PyObject * @@ -1106,13 +1125,15 @@ cms_profile_getattr_colorimetric_intent(CmsProfileObject *self, void *closure) { static PyObject * cms_profile_getattr_perceptual_rendering_intent_gamut( - CmsProfileObject *self, void *closure) { + CmsProfileObject *self, void *closure +) { return _profile_read_signature(self, cmsSigPerceptualRenderingIntentGamutTag); } static PyObject * cms_profile_getattr_saturation_rendering_intent_gamut( - CmsProfileObject *self, void *closure) { + CmsProfileObject *self, void *closure +) { return _profile_read_signature(self, cmsSigSaturationRenderingIntentGamutTag); } @@ -1145,7 +1166,8 @@ cms_profile_getattr_blue_colorant(CmsProfileObject *self, void *closure) { static PyObject * cms_profile_getattr_media_white_point_temperature( - CmsProfileObject *self, void *closure) { + CmsProfileObject *self, void *closure +) { cmsCIEXYZ *XYZ; cmsCIExyY xyY; cmsFloat64Number tempK; @@ -1329,7 +1351,8 @@ cms_profile_getattr_icc_measurement_condition(CmsProfileObject *self, void *clos "flare", mc->Flare, "illuminant_type", - _illu_map(mc->IlluminantType)); + _illu_map(mc->IlluminantType) + ); } static PyObject * @@ -1359,7 +1382,8 @@ cms_profile_getattr_icc_viewing_condition(CmsProfileObject *self, void *closure) vc->SurroundXYZ.Y, vc->SurroundXYZ.Z, "illuminant_type", - _illu_map(vc->IlluminantType)); + _illu_map(vc->IlluminantType) + ); } static struct PyGetSetDef cms_profile_getsetters[] = { @@ -1407,11 +1431,12 @@ static struct PyGetSetDef cms_profile_getsetters[] = { {"colorant_table_out", (getter)cms_profile_getattr_colorant_table_out}, {"intent_supported", (getter)cms_profile_getattr_is_intent_supported}, {"clut", (getter)cms_profile_getattr_is_clut}, - {"icc_measurement_condition", - (getter)cms_profile_getattr_icc_measurement_condition}, + {"icc_measurement_condition", (getter)cms_profile_getattr_icc_measurement_condition + }, {"icc_viewing_condition", (getter)cms_profile_getattr_icc_viewing_condition}, - {NULL}}; + {NULL} +}; static PyTypeObject CmsProfile_Type = { PyVarObject_HEAD_INIT(NULL, 0) "PIL.ImageCms.core.CmsProfile", /*tp_name*/ diff --git a/src/_imagingft.c b/src/_imagingft.c index c6d20fe45..da03e3ba9 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -126,7 +126,8 @@ getfont(PyObject *self_, PyObject *args, PyObject *kw) { unsigned char *font_bytes; Py_ssize_t font_bytes_size = 0; static char *kwlist[] = { - "filename", "size", "index", "encoding", "font_bytes", "layout_engine", NULL}; + "filename", "size", "index", "encoding", "font_bytes", "layout_engine", NULL + }; if (!library) { PyErr_SetString(PyExc_OSError, "failed to initialize FreeType library"); @@ -148,7 +149,8 @@ getfont(PyObject *self_, PyObject *args, PyObject *kw) { &encoding, &font_bytes, &font_bytes_size, - &layout_engine)) { + &layout_engine + )) { PyConfig_Clear(&config); return NULL; } @@ -166,7 +168,8 @@ getfont(PyObject *self_, PyObject *args, PyObject *kw) { &encoding, &font_bytes, &font_bytes_size, - &layout_engine)) { + &layout_engine + )) { return NULL; } #endif @@ -199,7 +202,8 @@ getfont(PyObject *self_, PyObject *args, PyObject *kw) { (FT_Byte *)self->font_bytes, font_bytes_size, index, - &self->face); + &self->face + ); } } @@ -243,7 +247,8 @@ text_layout_raqm( const char *dir, PyObject *features, const char *lang, - GlyphInfo **glyph_info) { + GlyphInfo **glyph_info +) { size_t i = 0, count = 0, start = 0; raqm_t *rq; raqm_glyph_t *glyphs = NULL; @@ -297,13 +302,14 @@ text_layout_raqm( #if !defined(RAQM_VERSION_ATLEAST) /* RAQM_VERSION_ATLEAST was added in Raqm 0.7.0 */ PyErr_SetString( - PyExc_ValueError, - "libraqm 0.7 or greater required for 'ttb' direction"); + PyExc_ValueError, "libraqm 0.7 or greater required for 'ttb' direction" + ); goto failed; #endif } else { PyErr_SetString( - PyExc_ValueError, "direction must be either 'rtl', 'ltr' or 'ttb'"); + PyExc_ValueError, "direction must be either 'rtl', 'ltr' or 'ttb'" + ); goto failed; } } @@ -399,7 +405,8 @@ text_layout_fallback( const char *lang, GlyphInfo **glyph_info, int mask, - int color) { + int color +) { int error, load_flags, i; char *buffer = NULL; FT_ULong ch; @@ -412,7 +419,8 @@ text_layout_fallback( PyErr_SetString( PyExc_KeyError, "setting text direction, language or font features is not supported " - "without libraqm"); + "without libraqm" + ); } if (PyUnicode_Check(string)) { @@ -459,7 +467,8 @@ text_layout_fallback( last_index, (*glyph_info)[i].index, ft_kerning_default, - &delta) == 0) { + &delta + ) == 0) { (*glyph_info)[i - 1].x_advance += PIXEL(delta.x); (*glyph_info)[i - 1].y_advance += PIXEL(delta.y); } @@ -483,7 +492,8 @@ text_layout( const char *lang, GlyphInfo **glyph_info, int mask, - int color) { + int color +) { size_t count; #ifdef HAVE_RAQM if (have_raqm && self->layout_engine == LAYOUT_RAQM) { @@ -492,7 +502,8 @@ text_layout( #endif { count = text_layout_fallback( - string, self, dir, features, lang, glyph_info, mask, color); + string, self, dir, features, lang, glyph_info, mask, color + ); } return count; } @@ -514,7 +525,8 @@ font_getlength(FontObject *self, PyObject *args) { /* calculate size and bearing for a given string */ if (!PyArg_ParseTuple( - args, "O|zzOz:getlength", &string, &mode, &dir, &features, &lang)) { + args, "O|zzOz:getlength", &string, &mode, &dir, &features, &lang + )) { return NULL; } @@ -556,7 +568,8 @@ bounding_box_and_anchors( int *width, int *height, int *x_offset, - int *y_offset) { + int *y_offset +) { int position; /* pen position along primary axis, in 26.6 precision */ int advanced; /* pen position along primary axis, in pixels */ int px, py; /* position of current glyph, in pixels */ @@ -661,7 +674,8 @@ bounding_box_and_anchors( case 'm': // middle (ascender + descender) / 2 y_anchor = PIXEL( (face->size->metrics.ascender + face->size->metrics.descender) / - 2); + 2 + ); break; case 's': // horizontal baseline y_anchor = 0; @@ -741,7 +755,8 @@ font_getsize(FontObject *self, PyObject *args) { /* calculate size and bearing for a given string */ if (!PyArg_ParseTuple( - args, "O|zzOzz:getsize", &string, &mode, &dir, &features, &lang, &anchor)) { + args, "O|zzOzz:getsize", &string, &mode, &dir, &features, &lang, &anchor + )) { return NULL; } @@ -773,7 +788,8 @@ font_getsize(FontObject *self, PyObject *args) { &width, &height, &x_offset, - &y_offset); + &y_offset + ); if (glyph_info) { PyMem_Free(glyph_info); glyph_info = NULL; @@ -842,7 +858,8 @@ font_render(FontObject *self, PyObject *args) { &anchor, &foreground_ink_long, &x_start, - &y_start)) { + &y_start + )) { return NULL; } @@ -889,7 +906,8 @@ font_render(FontObject *self, PyObject *args) { &width, &height, &x_offset, - &y_offset); + &y_offset + ); if (error) { PyMem_Del(glyph_info); return NULL; @@ -929,7 +947,8 @@ font_render(FontObject *self, PyObject *args) { (FT_Fixed)stroke_width * 64, FT_STROKER_LINECAP_ROUND, FT_STROKER_LINEJOIN_ROUND, - 0); + 0 + ); } /* @@ -1104,8 +1123,8 @@ font_render(FontObject *self, PyObject *args) { BLEND(src_alpha, target[k * 4 + 2], src_blue, tmp); target[k * 4 + 3] = CLIP8( src_alpha + - MULDIV255( - target[k * 4 + 3], (255 - src_alpha), tmp)); + MULDIV255(target[k * 4 + 3], (255 - src_alpha), tmp) + ); } else { /* paste unpremultiplied RGBA values */ target[k * 4 + 0] = src_red; @@ -1123,15 +1142,20 @@ font_render(FontObject *self, PyObject *args) { if (src_alpha > 0) { if (target[k * 4 + 3] > 0) { target[k * 4 + 0] = BLEND( - src_alpha, target[k * 4 + 0], ink[0], tmp); + src_alpha, target[k * 4 + 0], ink[0], tmp + ); target[k * 4 + 1] = BLEND( - src_alpha, target[k * 4 + 1], ink[1], tmp); + src_alpha, target[k * 4 + 1], ink[1], tmp + ); target[k * 4 + 2] = BLEND( - src_alpha, target[k * 4 + 2], ink[2], tmp); + src_alpha, target[k * 4 + 2], ink[2], tmp + ); target[k * 4 + 3] = CLIP8( src_alpha + MULDIV255( - target[k * 4 + 3], (255 - src_alpha), tmp)); + target[k * 4 + 3], (255 - src_alpha), tmp + ) + ); } else { target[k * 4 + 0] = ink[0]; target[k * 4 + 1] = ink[1]; @@ -1149,7 +1173,9 @@ font_render(FontObject *self, PyObject *args) { ? CLIP8( src_alpha + MULDIV255( - target[k], (255 - src_alpha), tmp)) + target[k], (255 - src_alpha), tmp + ) + ) : src_alpha; } } @@ -1425,7 +1451,8 @@ static PyMethodDef font_methods[] = { {"setvarname", (PyCFunction)font_setvarname, METH_VARARGS}, {"setvaraxes", (PyCFunction)font_setvaraxes, METH_VARARGS}, #endif - {NULL, NULL}}; + {NULL, NULL} +}; static PyObject * font_getattr_family(FontObject *self, void *closure) { @@ -1482,7 +1509,8 @@ static struct PyGetSetDef font_getsetters[] = { {"x_ppem", (getter)font_getattr_x_ppem}, {"y_ppem", (getter)font_getattr_y_ppem}, {"glyphs", (getter)font_getattr_glyphs}, - {NULL}}; + {NULL} +}; static PyTypeObject Font_Type = { PyVarObject_HEAD_INIT(NULL, 0) "Font", /*tp_name*/ @@ -1518,7 +1546,8 @@ static PyTypeObject Font_Type = { }; static PyMethodDef _functions[] = { - {"getfont", (PyCFunction)getfont, METH_VARARGS | METH_KEYWORDS}, {NULL, NULL}}; + {"getfont", (PyCFunction)getfont, METH_VARARGS | METH_KEYWORDS}, {NULL, NULL} +}; static int setup_module(PyObject *m) { diff --git a/src/_imagingmath.c b/src/_imagingmath.c index a2ddc91b9..550a10903 100644 --- a/src/_imagingmath.c +++ b/src/_imagingmath.c @@ -209,7 +209,8 @@ _binop(PyObject *self, PyObject *args) { } static PyMethodDef _functions[] = { - {"unop", _unop, 1}, {"binop", _binop, 1}, {NULL, NULL}}; + {"unop", _unop, 1}, {"binop", _binop, 1}, {NULL, NULL} +}; static void install(PyObject *d, char *name, void *value) { diff --git a/src/_imagingmorph.c b/src/_imagingmorph.c index a95ce75bf..614dfbe7f 100644 --- a/src/_imagingmorph.c +++ b/src/_imagingmorph.c @@ -253,7 +253,8 @@ static PyMethodDef functions[] = { {"apply", (PyCFunction)apply, METH_VARARGS, NULL}, {"get_on_pixels", (PyCFunction)get_on_pixels, METH_VARARGS, NULL}, {"match", (PyCFunction)match, METH_VARARGS, NULL}, - {NULL, NULL, 0, NULL}}; + {NULL, NULL, 0, NULL} +}; PyMODINIT_FUNC PyInit__imagingmorph(void) { diff --git a/src/_webp.c b/src/_webp.c index dfa24da41..e686ec820 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -42,7 +42,8 @@ static const char *const kErrorMessages[-WEBP_MUX_NOT_ENOUGH_DATA + 1] = { "WEBP_MUX_INVALID_ARGUMENT", "WEBP_MUX_BAD_DATA", "WEBP_MUX_MEMORY_ERROR", - "WEBP_MUX_NOT_ENOUGH_DATA"}; + "WEBP_MUX_NOT_ENOUGH_DATA" +}; PyObject * HandleMuxError(WebPMuxError err, char *chunk) { @@ -61,7 +62,8 @@ HandleMuxError(WebPMuxError err, char *chunk) { sprintf(message, "could not assemble chunks: %s", kErrorMessages[-err]); } else { message_len = sprintf( - message, "could not set %.4s chunk: %s", chunk, kErrorMessages[-err]); + message, "could not set %.4s chunk: %s", chunk, kErrorMessages[-err] + ); } if (message_len < 0) { PyErr_SetString(PyExc_RuntimeError, "failed to construct error message"); @@ -138,7 +140,8 @@ _anim_encoder_new(PyObject *self, PyObject *args) { &kmin, &kmax, &allow_mixed, - &verbose)) { + &verbose + )) { return NULL; } @@ -214,7 +217,8 @@ _anim_encoder_add(PyObject *self, PyObject *args) { &lossless, &quality_factor, &alpha_quality_factor, - &method)) { + &method + )) { return NULL; } @@ -283,7 +287,8 @@ _anim_encoder_assemble(PyObject *self, PyObject *args) { &exif_bytes, &exif_size, &xmp_bytes, - &xmp_size)) { + &xmp_size + )) { return NULL; } @@ -421,7 +426,8 @@ _anim_decoder_get_info(PyObject *self) { info->loop_count, info->bgcolor, info->frame_count, - decp->mode); + decp->mode + ); } PyObject * @@ -466,7 +472,8 @@ _anim_decoder_get_next(PyObject *self) { } bytes = PyBytes_FromStringAndSize( - (char *)buf, decp->info.canvas_width * 4 * decp->info.canvas_height); + (char *)buf, decp->info.canvas_width * 4 * decp->info.canvas_height + ); ret = Py_BuildValue("Si", bytes, timestamp); @@ -621,7 +628,8 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) { &exif_bytes, &exif_size, &xmp_bytes, - &xmp_size)) { + &xmp_size + )) { return NULL; } @@ -828,12 +836,14 @@ WebPDecode_wrapper(PyObject *self, PyObject *args) { if (WEBP_MUX_OK == WebPMuxGetChunk(mux, "ICCP", &icc_profile_data)) { icc_profile = PyBytes_FromStringAndSize( - (const char *)icc_profile_data.bytes, icc_profile_data.size); + (const char *)icc_profile_data.bytes, icc_profile_data.size + ); } if (WEBP_MUX_OK == WebPMuxGetChunk(mux, "EXIF", &exif_data)) { exif = PyBytes_FromStringAndSize( - (const char *)exif_data.bytes, exif_data.size); + (const char *)exif_data.bytes, exif_data.size + ); } WebPDataClear(&image.bitstream); @@ -848,12 +858,14 @@ WebPDecode_wrapper(PyObject *self, PyObject *args) { if (config.output.colorspace < MODE_YUV) { bytes = PyBytes_FromStringAndSize( - (char *)config.output.u.RGBA.rgba, config.output.u.RGBA.size); + (char *)config.output.u.RGBA.rgba, config.output.u.RGBA.size + ); } else { // Skipping YUV for now. Need Test Images. // UNDONE -- unclear if we'll ever get here if we set mode_rgb* bytes = PyBytes_FromStringAndSize( - (char *)config.output.u.YUVA.y, config.output.u.YUVA.y_size); + (char *)config.output.u.YUVA.y, config.output.u.YUVA.y_size + ); } pymode = PyUnicode_FromString(mode); @@ -864,7 +876,8 @@ WebPDecode_wrapper(PyObject *self, PyObject *args) { config.output.height, pymode, NULL == icc_profile ? Py_None : icc_profile, - NULL == exif ? Py_None : exif); + NULL == exif ? Py_None : exif + ); end: WebPFreeDecBuffer(&config.output); @@ -898,7 +911,8 @@ WebPDecoderVersion_str(void) { "%d.%d.%d", version_number >> 16, (version_number >> 8) % 0x100, - version_number % 0x100); + version_number % 0x100 + ); return version; } @@ -932,7 +946,8 @@ static PyMethodDef webpMethods[] = { WebPDecoderBuggyAlpha_wrapper, METH_NOARGS, "WebPDecoderBuggyAlpha"}, - {NULL, NULL}}; + {NULL, NULL} +}; void addMuxFlagToModule(PyObject *m) { diff --git a/src/decode.c b/src/decode.c index ea2f3af80..51d0aced2 100644 --- a/src/decode.c +++ b/src/decode.c @@ -46,7 +46,8 @@ typedef struct { PyObject_HEAD int (*decode)( - Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes); + Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes + ); int (*cleanup)(ImagingCodecState state); struct ImagingCodecStateInstance state; Imaging im; @@ -889,7 +890,8 @@ PyImaging_Jpeg2KDecoderNew(PyObject *self, PyObject *args) { PY_LONG_LONG length = -1; if (!PyArg_ParseTuple( - args, "ss|iiiL", &mode, &format, &reduce, &layers, &fd, &length)) { + args, "ss|iiiL", &mode, &format, &reduce, &layers, &fd, &length + )) { return NULL; } diff --git a/src/display.c b/src/display.c index 990f4b0a5..b4e2e3899 100644 --- a/src/display.c +++ b/src/display.c @@ -105,7 +105,8 @@ _draw(ImagingDisplayObject *display, PyObject *args) { src + 0, src + 1, src + 2, - src + 3)) { + src + 3 + )) { return NULL; } @@ -221,7 +222,8 @@ _tobytes(ImagingDisplayObject *display, PyObject *args) { } return PyBytes_FromStringAndSize( - display->dib->bits, display->dib->ysize * display->dib->linesize); + display->dib->bits, display->dib->ysize * display->dib->linesize + ); } static struct PyMethodDef methods[] = { @@ -247,7 +249,8 @@ _getattr_size(ImagingDisplayObject *self, void *closure) { } static struct PyGetSetDef getsetters[] = { - {"mode", (getter)_getattr_mode}, {"size", (getter)_getattr_size}, {NULL}}; + {"mode", (getter)_getattr_mode}, {"size", (getter)_getattr_size}, {NULL} +}; static PyTypeObject ImagingDisplayType = { PyVarObject_HEAD_INIT(NULL, 0) "ImagingDisplay", /*tp_name*/ @@ -341,9 +344,8 @@ PyImaging_GrabScreenWin32(PyObject *self, PyObject *args) { // added in Windows 10 (1607) // loaded dynamically to avoid link errors user32 = LoadLibraryA("User32.dll"); - SetThreadDpiAwarenessContext_function = - (Func_SetThreadDpiAwarenessContext)GetProcAddress( - user32, "SetThreadDpiAwarenessContext"); + SetThreadDpiAwarenessContext_function = (Func_SetThreadDpiAwarenessContext + )GetProcAddress(user32, "SetThreadDpiAwarenessContext"); if (SetThreadDpiAwarenessContext_function != NULL) { // DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE = ((DPI_CONTEXT_HANDLE)-3) dpiAwareness = SetThreadDpiAwarenessContext_function((HANDLE)-3); @@ -403,7 +405,8 @@ PyImaging_GrabScreenWin32(PyObject *self, PyObject *args) { height, PyBytes_AS_STRING(buffer), (BITMAPINFO *)&core, - DIB_RGB_COLORS)) { + DIB_RGB_COLORS + )) { goto error; } @@ -547,7 +550,8 @@ windowCallback(HWND wnd, UINT message, WPARAM wParam, LPARAM lParam) { ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, - ps.rcPaint.bottom); + ps.rcPaint.bottom + ); if (result) { Py_DECREF(result); } else { @@ -562,7 +566,8 @@ windowCallback(HWND wnd, UINT message, WPARAM wParam, LPARAM lParam) { 0, 0, rect.right - rect.left, - rect.bottom - rect.top); + rect.bottom - rect.top + ); if (result) { Py_DECREF(result); } else { @@ -577,7 +582,8 @@ windowCallback(HWND wnd, UINT message, WPARAM wParam, LPARAM lParam) { 0, 0, rect.right - rect.left, - rect.bottom - rect.top); + rect.bottom - rect.top + ); if (result) { Py_DECREF(result); } else { @@ -591,7 +597,8 @@ windowCallback(HWND wnd, UINT message, WPARAM wParam, LPARAM lParam) { case WM_SIZE: /* resize window */ result = PyObject_CallFunction( - callback, "sii", "resize", LOWORD(lParam), HIWORD(lParam)); + callback, "sii", "resize", LOWORD(lParam), HIWORD(lParam) + ); if (result) { InvalidateRect(wnd, NULL, 1); Py_DECREF(result); @@ -670,7 +677,8 @@ PyImaging_CreateWindowWin32(PyObject *self, PyObject *args) { HWND_DESKTOP, NULL, NULL, - NULL); + NULL + ); if (!wnd) { PyErr_SetString(PyExc_OSError, "failed to create window"); @@ -732,7 +740,8 @@ PyImaging_DrawWmf(PyObject *self, PyObject *args) { &x0, &x1, &y0, - &y1)) { + &y1 + )) { return NULL; } @@ -844,7 +853,8 @@ PyImaging_GrabScreenX11(PyObject *self, PyObject *args) { PyErr_Format( PyExc_OSError, "X connection failed: error %i", - xcb_connection_has_error(connection)); + xcb_connection_has_error(connection) + ); xcb_disconnect(connection); return NULL; } @@ -878,8 +888,10 @@ PyImaging_GrabScreenX11(PyObject *self, PyObject *args) { 0, width, height, - 0x00ffffff), - &error); + 0x00ffffff + ), + &error + ); if (reply == NULL) { PyErr_Format( PyExc_OSError, @@ -887,7 +899,8 @@ PyImaging_GrabScreenX11(PyObject *self, PyObject *args) { error->error_code, error->major_code, error->minor_code, - error->resource_id); + error->resource_id + ); free(error); xcb_disconnect(connection); return NULL; @@ -897,7 +910,8 @@ PyImaging_GrabScreenX11(PyObject *self, PyObject *args) { if (reply->depth == 24) { buffer = PyBytes_FromStringAndSize( - (char *)xcb_get_image_data(reply), xcb_get_image_data_length(reply)); + (char *)xcb_get_image_data(reply), xcb_get_image_data_length(reply) + ); } else { PyErr_Format(PyExc_OSError, "unsupported bit depth: %i", reply->depth); } diff --git a/src/encode.c b/src/encode.c index 2c95b7ebc..f711865d5 100644 --- a/src/encode.c +++ b/src/encode.c @@ -39,7 +39,8 @@ typedef struct { PyObject_HEAD int (*encode)( - Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes); + Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes + ); int (*cleanup)(ImagingCodecState state); struct ImagingCodecStateInstance state; Imaging im; @@ -135,7 +136,8 @@ _encode(ImagingEncoderObject *encoder, PyObject *args) { } status = encoder->encode( - encoder->im, &encoder->state, (UINT8 *)PyBytes_AsString(buf), bufsize); + encoder->im, &encoder->state, (UINT8 *)PyBytes_AsString(buf), bufsize + ); /* adjust string length to avoid slicing in encoder */ if (_PyBytes_Resize(&buf, (status > 0) ? status : 0) < 0) { @@ -572,7 +574,8 @@ PyImaging_ZipEncoderNew(PyObject *self, PyObject *args) { &compress_level, &compress_type, &dictionary, - &dictionary_size)) { + &dictionary_size + )) { return NULL; } @@ -653,15 +656,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { PyObject *item; if (!PyArg_ParseTuple( - args, - "sssnsOO", - &mode, - &rawmode, - &compname, - &fp, - &filename, - &tags, - &types)) { + args, "sssnsOO", &mode, &rawmode, &compname, &fp, &filename, &tags, &types + )) { return NULL; } @@ -785,7 +781,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { is_var_length = 1; } if (ImagingLibTiffMergeFieldInfo( - &encoder->state, type, key_int, is_var_length)) { + &encoder->state, type, key_int, is_var_length + )) { continue; } } @@ -795,7 +792,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { &encoder->state, (ttag_t)key_int, PyBytes_Size(value), - PyBytes_AsString(value)); + PyBytes_AsString(value) + ); } else if (is_var_length) { Py_ssize_t len, i; TRACE(("Setting from Tuple: %d \n", key_int)); @@ -805,7 +803,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { int stride = 256; if (len != 768) { PyErr_SetString( - PyExc_ValueError, "Requiring 768 items for Colormap"); + PyExc_ValueError, "Requiring 768 items for Colormap" + ); return NULL; } UINT16 *av; @@ -820,7 +819,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { (ttag_t)key_int, av, av + stride, - av + stride * 2); + av + stride * 2 + ); free(av); } } else if (key_int == TIFFTAG_YCBCRSUBSAMPLING) { @@ -828,7 +828,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { &encoder->state, (ttag_t)key_int, (UINT16)PyLong_AsLong(PyTuple_GetItem(value, 0)), - (UINT16)PyLong_AsLong(PyTuple_GetItem(value, 1))); + (UINT16)PyLong_AsLong(PyTuple_GetItem(value, 1)) + ); } else if (type == TIFF_SHORT) { UINT16 *av; /* malloc check ok, calloc checks for overflow */ @@ -838,7 +839,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { av[i] = (UINT16)PyLong_AsLong(PyTuple_GetItem(value, i)); } status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, len, av); + &encoder->state, (ttag_t)key_int, len, av + ); free(av); } } else if (type == TIFF_LONG) { @@ -850,7 +852,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { av[i] = (UINT32)PyLong_AsLong(PyTuple_GetItem(value, i)); } status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, len, av); + &encoder->state, (ttag_t)key_int, len, av + ); free(av); } } else if (type == TIFF_SBYTE) { @@ -862,7 +865,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { av[i] = (INT8)PyLong_AsLong(PyTuple_GetItem(value, i)); } status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, len, av); + &encoder->state, (ttag_t)key_int, len, av + ); free(av); } } else if (type == TIFF_SSHORT) { @@ -874,7 +878,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { av[i] = (INT16)PyLong_AsLong(PyTuple_GetItem(value, i)); } status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, len, av); + &encoder->state, (ttag_t)key_int, len, av + ); free(av); } } else if (type == TIFF_SLONG) { @@ -886,7 +891,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { av[i] = (INT32)PyLong_AsLong(PyTuple_GetItem(value, i)); } status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, len, av); + &encoder->state, (ttag_t)key_int, len, av + ); free(av); } } else if (type == TIFF_FLOAT) { @@ -898,7 +904,8 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { av[i] = (FLOAT32)PyFloat_AsDouble(PyTuple_GetItem(value, i)); } status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, len, av); + &encoder->state, (ttag_t)key_int, len, av + ); free(av); } } else if (type == TIFF_DOUBLE) { @@ -910,43 +917,54 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { av[i] = PyFloat_AsDouble(PyTuple_GetItem(value, i)); } status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, len, av); + &encoder->state, (ttag_t)key_int, len, av + ); free(av); } } } else { if (type == TIFF_SHORT) { status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, (UINT16)PyLong_AsLong(value)); + &encoder->state, (ttag_t)key_int, (UINT16)PyLong_AsLong(value) + ); } else if (type == TIFF_LONG) { status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, PyLong_AsLongLong(value)); + &encoder->state, (ttag_t)key_int, PyLong_AsLongLong(value) + ); } else if (type == TIFF_SSHORT) { status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, (INT16)PyLong_AsLong(value)); + &encoder->state, (ttag_t)key_int, (INT16)PyLong_AsLong(value) + ); } else if (type == TIFF_SLONG) { status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, (INT32)PyLong_AsLong(value)); + &encoder->state, (ttag_t)key_int, (INT32)PyLong_AsLong(value) + ); } else if (type == TIFF_FLOAT) { status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, (FLOAT32)PyFloat_AsDouble(value)); + &encoder->state, (ttag_t)key_int, (FLOAT32)PyFloat_AsDouble(value) + ); } else if (type == TIFF_DOUBLE) { status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, (FLOAT64)PyFloat_AsDouble(value)); + &encoder->state, (ttag_t)key_int, (FLOAT64)PyFloat_AsDouble(value) + ); } else if (type == TIFF_SBYTE) { status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, (INT8)PyLong_AsLong(value)); + &encoder->state, (ttag_t)key_int, (INT8)PyLong_AsLong(value) + ); } else if (type == TIFF_ASCII) { status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, PyBytes_AsString(value)); + &encoder->state, (ttag_t)key_int, PyBytes_AsString(value) + ); } else if (type == TIFF_RATIONAL) { status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, (FLOAT64)PyFloat_AsDouble(value)); + &encoder->state, (ttag_t)key_int, (FLOAT64)PyFloat_AsDouble(value) + ); } else { TRACE( ("Unhandled type for key %d : %s \n", key_int, - PyBytes_AsString(PyObject_Str(value)))); + PyBytes_AsString(PyObject_Str(value))) + ); } } if (!status) { @@ -1007,7 +1025,8 @@ get_qtables_arrays(PyObject *qtables, int *qtablesLen) { if (num_tables < 1 || num_tables > NUM_QUANT_TBLS) { PyErr_SetString( PyExc_ValueError, - "Not a valid number of quantization tables. Should be between 1 and 4."); + "Not a valid number of quantization tables. Should be between 1 and 4." + ); Py_DECREF(tables); return NULL; } @@ -1096,7 +1115,8 @@ PyImaging_JpegEncoderNew(PyObject *self, PyObject *args) { &extra, &extra_size, &rawExif, - &rawExifLen)) { + &rawExifLen + )) { return NULL; } @@ -1266,7 +1286,8 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) { &fd, &comment, &comment_size, - &plt)) { + &plt + )) { return NULL; } @@ -1323,7 +1344,8 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) { j2k_decode_coord_tuple(offset, &context->offset_x, &context->offset_y); j2k_decode_coord_tuple( - tile_offset, &context->tile_offset_x, &context->tile_offset_y); + tile_offset, &context->tile_offset_x, &context->tile_offset_y + ); j2k_decode_coord_tuple(tile_size, &context->tile_size_x, &context->tile_size_y); /* Error on illegal tile offsets */ @@ -1333,7 +1355,8 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) { PyErr_SetString( PyExc_ValueError, "JPEG 2000 tile offset too small; top left tile must " - "intersect image area"); + "intersect image area" + ); Py_DECREF(encoder); return NULL; } @@ -1341,8 +1364,8 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) { if (context->tile_offset_x > context->offset_x || context->tile_offset_y > context->offset_y) { PyErr_SetString( - PyExc_ValueError, - "JPEG 2000 tile offset too large to cover image area"); + PyExc_ValueError, "JPEG 2000 tile offset too large to cover image area" + ); Py_DECREF(encoder); return NULL; } @@ -1376,7 +1399,8 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) { j2k_decode_coord_tuple(cblk_size, &context->cblk_width, &context->cblk_height); j2k_decode_coord_tuple( - precinct_size, &context->precinct_width, &context->precinct_height); + precinct_size, &context->precinct_width, &context->precinct_height + ); context->irreversible = PyObject_IsTrue(irreversible); context->progression = prog_order; diff --git a/src/libImaging/Access.c b/src/libImaging/Access.c index 3a5e918e8..bf7db281e 100644 --- a/src/libImaging/Access.c +++ b/src/libImaging/Access.c @@ -36,7 +36,8 @@ add_item(const char *mode) { "AccessInit: hash collision: %d for both %s and %s\n", i, mode, - access_table[i].mode); + access_table[i].mode + ); exit(1); } access_table[i].mode = mode; diff --git a/src/libImaging/BcnDecode.c b/src/libImaging/BcnDecode.c index 72f478d8d..9a41febc7 100644 --- a/src/libImaging/BcnDecode.c +++ b/src/libImaging/BcnDecode.c @@ -243,7 +243,8 @@ static const bc7_mode_info bc7_modes[] = { {1, 0, 2, 1, 5, 6, 0, 0, 2, 3}, {1, 0, 2, 0, 7, 8, 0, 0, 2, 2}, {1, 0, 0, 0, 7, 7, 1, 0, 4, 0}, - {2, 6, 0, 0, 5, 5, 1, 0, 2, 0}}; + {2, 6, 0, 0, 5, 5, 1, 0, 2, 0} +}; /* Subset indices: Table.P2, 1 bit per index */ @@ -254,7 +255,8 @@ static const UINT16 bc7_si2[] = { 0x718e, 0x399c, 0xaaaa, 0xf0f0, 0x5a5a, 0x33cc, 0x3c3c, 0x55aa, 0x9696, 0xa55a, 0x73ce, 0x13c8, 0x324c, 0x3bdc, 0x6996, 0xc33c, 0x9966, 0x0660, 0x0272, 0x04e4, 0x4e40, 0x2720, 0xc936, 0x936c, 0x39c6, 0x639c, 0x9336, 0x9cc6, 0x817e, 0xe718, - 0xccf0, 0x0fcc, 0x7744, 0xee22}; + 0xccf0, 0x0fcc, 0x7744, 0xee22 +}; /* Table.P3, 2 bits per index */ static const UINT32 bc7_si3[] = { @@ -267,20 +269,23 @@ static const UINT32 bc7_si3[] = { 0x66660000, 0xa5a0a5a0, 0x50a050a0, 0x69286928, 0x44aaaa44, 0x66666600, 0xaa444444, 0x54a854a8, 0x95809580, 0x96969600, 0xa85454a8, 0x80959580, 0xaa141414, 0x96960000, 0xaaaa1414, 0xa05050a0, 0xa0a5a5a0, 0x96000000, 0x40804080, 0xa9a8a9a8, 0xaaaaaa44, - 0x2a4a5254}; + 0x2a4a5254 +}; /* Anchor indices: Table.A2 */ -static const char bc7_ai0[] = { - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 2, 8, 2, 2, 8, - 8, 15, 2, 8, 2, 2, 8, 8, 2, 2, 15, 15, 6, 8, 2, 8, 15, 15, 2, 8, 2, 2, - 2, 15, 15, 6, 6, 2, 6, 8, 15, 15, 2, 2, 15, 15, 15, 15, 15, 2, 2, 15}; +static const char bc7_ai0[] = {15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 2, 8, 2, 2, 8, 8, 15, 2, 8, + 2, 2, 8, 8, 2, 2, 15, 15, 6, 8, 2, 8, 15, + 15, 2, 8, 2, 2, 2, 15, 15, 6, 6, 2, 6, 8, + 15, 15, 2, 2, 15, 15, 15, 15, 15, 2, 2, 15}; /* Table.A3a */ -static const char bc7_ai1[] = { - 3, 3, 15, 15, 8, 3, 15, 15, 8, 8, 6, 6, 6, 5, 3, 3, 3, 3, 8, 15, 3, 3, - 6, 10, 5, 8, 8, 6, 8, 5, 15, 15, 8, 15, 3, 5, 6, 10, 8, 15, 15, 3, 15, 5, - 15, 15, 15, 15, 3, 15, 5, 5, 5, 8, 5, 10, 5, 10, 8, 13, 15, 12, 3, 3}; +static const char bc7_ai1[] = {3, 3, 15, 15, 8, 3, 15, 15, 8, 8, 6, 6, 6, + 5, 3, 3, 3, 3, 8, 15, 3, 3, 6, 10, 5, 8, + 8, 6, 8, 5, 15, 15, 8, 15, 3, 5, 6, 10, 8, + 15, 15, 3, 15, 5, 15, 15, 15, 15, 3, 15, 5, 5, + 5, 8, 5, 10, 5, 10, 8, 13, 15, 12, 3, 3}; /* Table.A3b */ static const char bc7_ai2[] = {15, 8, 8, 3, 15, 15, 3, 8, 15, 15, 15, 15, 15, @@ -293,7 +298,8 @@ static const char bc7_ai2[] = {15, 8, 8, 3, 15, 15, 3, 8, 15, 15, 15, 15, 1 static const char bc7_weights2[] = {0, 21, 43, 64}; static const char bc7_weights3[] = {0, 9, 18, 27, 37, 46, 55, 64}; static const char bc7_weights4[] = { - 0, 4, 9, 13, 17, 21, 26, 30, 34, 38, 43, 47, 51, 55, 60, 64}; + 0, 4, 9, 13, 17, 21, 26, 30, 34, 38, 43, 47, 51, 55, 60, 64 +}; static const char * bc7_get_weights(int n) { @@ -526,7 +532,8 @@ static const bc6_mode_info bc6_modes[] = { {1, 0, 0, 10, 10, 10, 10}, {1, 1, 0, 11, 9, 9, 9}, {1, 1, 0, 12, 8, 8, 8}, - {1, 1, 0, 16, 4, 4, 4}}; + {1, 1, 0, 16, 4, 4, 4} +}; /* Table.F, encoded as a sequence of bit indices */ static const UINT8 bc6_bit_packings[][75] = { @@ -591,7 +598,8 @@ static const UINT8 bc6_bit_packings[][75] = { 64, 65, 66, 67, 68, 69, 70, 71, 27, 26, 80, 81, 82, 83, 84, 85, 86, 87, 43, 42}, {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 48, 49, 50, 51, 15, 14, 13, 12, 11, 10, - 64, 65, 66, 67, 31, 30, 29, 28, 27, 26, 80, 81, 82, 83, 47, 46, 45, 44, 43, 42}}; + 64, 65, 66, 67, 31, 30, 29, 28, 27, 26, 80, 81, 82, 83, 47, 46, 45, 44, 43, 42} +}; static void bc6_sign_extend(UINT16 *v, int prec) { @@ -830,7 +838,8 @@ decode_bcn( int bytes, int N, int C, - char *pixel_format) { + char *pixel_format +) { int ymax = state->ysize + state->yoff; const UINT8 *ptr = src; switch (N) { diff --git a/src/libImaging/BoxBlur.c b/src/libImaging/BoxBlur.c index 4ea9c7717..51cb7e102 100644 --- a/src/libImaging/BoxBlur.c +++ b/src/libImaging/BoxBlur.c @@ -13,7 +13,8 @@ void static inline ImagingLineBoxBlur32( int edgeA, int edgeB, UINT32 ww, - UINT32 fw) { + UINT32 fw +) { int x; UINT32 acc[4]; UINT32 bulk[4]; @@ -109,7 +110,8 @@ void static inline ImagingLineBoxBlur8( int edgeA, int edgeB, UINT32 ww, - UINT32 fw) { + UINT32 fw +) { int x; UINT32 acc; UINT32 bulk; @@ -198,7 +200,8 @@ ImagingHorizontalBoxBlur(Imaging imOut, Imaging imIn, float floatRadius) { edgeA, edgeB, ww, - fw); + fw + ); if (imIn == imOut) { // Commit. memcpy(imOut->image8[y], lineOut, imIn->xsize); @@ -214,7 +217,8 @@ ImagingHorizontalBoxBlur(Imaging imOut, Imaging imIn, float floatRadius) { edgeA, edgeB, ww, - fw); + fw + ); if (imIn == imOut) { // Commit. memcpy(imOut->image32[y], lineOut, imIn->xsize * 4); @@ -314,11 +318,13 @@ _gaussian_blur_radius(float radius, int passes) { Imaging ImagingGaussianBlur( - Imaging imOut, Imaging imIn, float xradius, float yradius, int passes) { + Imaging imOut, Imaging imIn, float xradius, float yradius, int passes +) { return ImagingBoxBlur( imOut, imIn, _gaussian_blur_radius(xradius, passes), _gaussian_blur_radius(yradius, passes), - passes); + passes + ); } diff --git a/src/libImaging/Chops.c b/src/libImaging/Chops.c index f9c005efe..f326d402f 100644 --- a/src/libImaging/Chops.c +++ b/src/libImaging/Chops.c @@ -142,7 +142,8 @@ ImagingChopSoftLight(Imaging imIn1, Imaging imIn2) { CHOP2( (((255 - in1[x]) * (in1[x] * in2[x])) / 65536) + (in1[x] * (255 - ((255 - in1[x]) * (255 - in2[x]) / 255))) / 255, - NULL); + NULL + ); } Imaging @@ -150,7 +151,8 @@ ImagingChopHardLight(Imaging imIn1, Imaging imIn2) { CHOP2( (in2[x] < 128) ? ((in1[x] * in2[x]) / 127) : 255 - (((255 - in2[x]) * (255 - in1[x])) / 127), - NULL); + NULL + ); } Imaging @@ -158,5 +160,6 @@ ImagingOverlay(Imaging imIn1, Imaging imIn2) { CHOP2( (in1[x] < 128) ? ((in1[x] * in2[x]) / 127) : 255 - (((255 - in1[x]) * (255 - in2[x])) / 127), - NULL); + NULL + ); } diff --git a/src/libImaging/ColorLUT.c b/src/libImaging/ColorLUT.c index aee7cda06..5559de689 100644 --- a/src/libImaging/ColorLUT.c +++ b/src/libImaging/ColorLUT.c @@ -63,7 +63,8 @@ ImagingColorLUT3D_linear( int size1D, int size2D, int size3D, - INT16 *table) { + INT16 *table +) { /* This float to int conversion doesn't have rounding error compensation (+0.5) for two reasons: 1. As we don't hit the highest value, @@ -112,7 +113,8 @@ ImagingColorLUT3D_linear( index2D >> SCALE_BITS, index3D >> SCALE_BITS, size1D, - size1D_2D); + size1D_2D + ); INT16 result[4], left[4], right[4]; INT16 leftleft[4], leftright[4], rightleft[4], rightright[4]; @@ -123,19 +125,22 @@ ImagingColorLUT3D_linear( leftright, &table[idx + size1D * 3], &table[idx + size1D * 3 + 3], - shift1D); + shift1D + ); interpolate3(left, leftleft, leftright, shift2D); interpolate3( rightleft, &table[idx + size1D_2D * 3], &table[idx + size1D_2D * 3 + 3], - shift1D); + shift1D + ); interpolate3( rightright, &table[idx + size1D_2D * 3 + size1D * 3], &table[idx + size1D_2D * 3 + size1D * 3 + 3], - shift1D); + shift1D + ); interpolate3(right, rightleft, rightright, shift2D); interpolate3(result, left, right, shift3D); @@ -144,7 +149,8 @@ ImagingColorLUT3D_linear( clip8(result[0]), clip8(result[1]), clip8(result[2]), - rowIn[x * 4 + 3]); + rowIn[x * 4 + 3] + ); memcpy(rowOut + x * sizeof(v), &v, sizeof(v)); } @@ -155,19 +161,22 @@ ImagingColorLUT3D_linear( leftright, &table[idx + size1D * 4], &table[idx + size1D * 4 + 4], - shift1D); + shift1D + ); interpolate4(left, leftleft, leftright, shift2D); interpolate4( rightleft, &table[idx + size1D_2D * 4], &table[idx + size1D_2D * 4 + 4], - shift1D); + shift1D + ); interpolate4( rightright, &table[idx + size1D_2D * 4 + size1D * 4], &table[idx + size1D_2D * 4 + size1D * 4 + 4], - shift1D); + shift1D + ); interpolate4(right, rightleft, rightright, shift2D); interpolate4(result, left, right, shift3D); @@ -176,7 +185,8 @@ ImagingColorLUT3D_linear( clip8(result[0]), clip8(result[1]), clip8(result[2]), - clip8(result[3])); + clip8(result[3]) + ); memcpy(rowOut + x * sizeof(v), &v, sizeof(v)); } } diff --git a/src/libImaging/Convert.c b/src/libImaging/Convert.c index fcb5f7ad9..c8f234261 100644 --- a/src/libImaging/Convert.c +++ b/src/libImaging/Convert.c @@ -1044,7 +1044,8 @@ static struct { {"I;16L", "F", I16L_F}, {"I;16B", "F", I16B_F}, - {NULL}}; + {NULL} +}; /* FIXME: translate indexed versions to pointer versions below this line */ @@ -1316,7 +1317,8 @@ frompalette(Imaging imOut, Imaging imIn, const char *mode) { (UINT8 *)imOut->image[y], (UINT8 *)imIn->image[y], imIn->xsize, - imIn->palette); + imIn->palette + ); } ImagingSectionLeave(&cookie); @@ -1328,11 +1330,8 @@ frompalette(Imaging imOut, Imaging imIn, const char *mode) { #endif static Imaging topalette( - Imaging imOut, - Imaging imIn, - const char *mode, - ImagingPalette inpalette, - int dither) { + Imaging imOut, Imaging imIn, const char *mode, ImagingPalette inpalette, int dither +) { ImagingSectionCookie cookie; int alpha; int x, y; @@ -1623,7 +1622,8 @@ tobilevel(Imaging imOut, Imaging imIn) { static Imaging convert( - Imaging imOut, Imaging imIn, const char *mode, ImagingPalette palette, int dither) { + Imaging imOut, Imaging imIn, const char *mode, ImagingPalette palette, int dither +) { ImagingSectionCookie cookie; ImagingShuffler convert; int y; @@ -1677,7 +1677,8 @@ convert( #else static char buf[100]; snprintf( - buf, 100, "conversion from %.10s to %.10s not supported", imIn->mode, mode); + buf, 100, "conversion from %.10s to %.10s not supported", imIn->mode, mode + ); return (Imaging)ImagingError_ValueError(buf); #endif } @@ -1727,18 +1728,16 @@ ImagingConvertTransparent(Imaging imIn, const char *mode, int r, int g, int b) { if (strcmp(mode, "RGBa") == 0) { premultiplied = 1; } - } else if ( - strcmp(imIn->mode, "RGB") == 0 && - (strcmp(mode, "LA") == 0 || strcmp(mode, "La") == 0)) { + } else if (strcmp(imIn->mode, "RGB") == 0 && + (strcmp(mode, "LA") == 0 || strcmp(mode, "La") == 0)) { convert = rgb2la; source_transparency = 1; if (strcmp(mode, "La") == 0) { premultiplied = 1; } - } else if ( - (strcmp(imIn->mode, "1") == 0 || strcmp(imIn->mode, "I") == 0 || - strcmp(imIn->mode, "I;16") == 0 || strcmp(imIn->mode, "L") == 0) && - (strcmp(mode, "RGBA") == 0 || strcmp(mode, "LA") == 0)) { + } else if ((strcmp(imIn->mode, "1") == 0 || strcmp(imIn->mode, "I") == 0 || + strcmp(imIn->mode, "I;16") == 0 || strcmp(imIn->mode, "L") == 0) && + (strcmp(mode, "RGBA") == 0 || strcmp(mode, "LA") == 0)) { if (strcmp(imIn->mode, "1") == 0) { convert = bit2rgb; } else if (strcmp(imIn->mode, "I") == 0) { @@ -1756,7 +1755,8 @@ ImagingConvertTransparent(Imaging imIn, const char *mode, int r, int g, int b) { 100, "conversion from %.10s to %.10s not supported in convert_transparent", imIn->mode, - mode); + mode + ); return (Imaging)ImagingError_ValueError(buf); } diff --git a/src/libImaging/ConvertYCbCr.c b/src/libImaging/ConvertYCbCr.c index 142f065e5..285b43327 100644 --- a/src/libImaging/ConvertYCbCr.c +++ b/src/libImaging/ConvertYCbCr.c @@ -47,7 +47,8 @@ static INT16 Y_R[] = { 4019, 4038, 4057, 4076, 4095, 4114, 4133, 4153, 4172, 4191, 4210, 4229, 4248, 4267, 4286, 4306, 4325, 4344, 4363, 4382, 4401, 4420, 4440, 4459, 4478, 4497, 4516, 4535, 4554, 4574, 4593, 4612, 4631, 4650, 4669, 4688, 4707, 4727, 4746, 4765, 4784, 4803, - 4822, 4841, 4861, 4880}; + 4822, 4841, 4861, 4880 +}; static INT16 Y_G[] = { 0, 38, 75, 113, 150, 188, 225, 263, 301, 338, 376, 413, 451, 488, @@ -68,7 +69,8 @@ static INT16 Y_G[] = { 7889, 7927, 7964, 8002, 8040, 8077, 8115, 8152, 8190, 8227, 8265, 8303, 8340, 8378, 8415, 8453, 8490, 8528, 8566, 8603, 8641, 8678, 8716, 8753, 8791, 8828, 8866, 8904, 8941, 8979, 9016, 9054, 9091, 9129, 9167, 9204, 9242, 9279, 9317, 9354, 9392, 9430, - 9467, 9505, 9542, 9580}; + 9467, 9505, 9542, 9580 +}; static INT16 Y_B[] = { 0, 7, 15, 22, 29, 36, 44, 51, 58, 66, 73, 80, 88, 95, @@ -89,7 +91,8 @@ static INT16 Y_B[] = { 1532, 1539, 1547, 1554, 1561, 1569, 1576, 1583, 1591, 1598, 1605, 1612, 1620, 1627, 1634, 1642, 1649, 1656, 1663, 1671, 1678, 1685, 1693, 1700, 1707, 1715, 1722, 1729, 1736, 1744, 1751, 1758, 1766, 1773, 1780, 1788, 1795, 1802, 1809, 1817, 1824, 1831, - 1839, 1846, 1853, 1860}; + 1839, 1846, 1853, 1860 +}; static INT16 Cb_R[] = { 0, -10, -21, -31, -42, -53, -64, -75, -85, -96, -107, -118, @@ -113,7 +116,8 @@ static INT16 Cb_R[] = { -2332, -2342, -2353, -2364, -2375, -2386, -2396, -2407, -2418, -2429, -2440, -2450, -2461, -2472, -2483, -2494, -2504, -2515, -2526, -2537, -2548, -2558, -2569, -2580, -2591, -2602, -2612, -2623, -2634, -2645, -2656, -2666, -2677, -2688, -2699, -2710, - -2720, -2731, -2742, -2753}; + -2720, -2731, -2742, -2753 +}; static INT16 Cb_G[] = { 0, -20, -41, -63, -84, -105, -126, -147, -169, -190, -211, -232, @@ -137,7 +141,8 @@ static INT16 Cb_G[] = { -4578, -4600, -4621, -4642, -4663, -4684, -4706, -4727, -4748, -4769, -4790, -4812, -4833, -4854, -4875, -4896, -4918, -4939, -4960, -4981, -5002, -5024, -5045, -5066, -5087, -5108, -5130, -5151, -5172, -5193, -5214, -5236, -5257, -5278, -5299, -5320, - -5342, -5363, -5384, -5405}; + -5342, -5363, -5384, -5405 +}; static INT16 Cb_B[] = { 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, @@ -158,7 +163,8 @@ static INT16 Cb_B[] = { 6720, 6752, 6784, 6816, 6848, 6880, 6912, 6944, 6976, 7008, 7040, 7072, 7104, 7136, 7168, 7200, 7232, 7264, 7296, 7328, 7360, 7392, 7424, 7456, 7488, 7520, 7552, 7584, 7616, 7648, 7680, 7712, 7744, 7776, 7808, 7840, 7872, 7904, 7936, 7968, 8000, 8032, - 8064, 8096, 8128, 8160}; + 8064, 8096, 8128, 8160 +}; #define Cr_R Cb_B @@ -184,7 +190,8 @@ static INT16 Cr_G[] = { -5787, -5814, -5841, -5867, -5894, -5921, -5948, -5975, -6001, -6028, -6055, -6082, -6109, -6135, -6162, -6189, -6216, -6243, -6269, -6296, -6323, -6350, -6376, -6403, -6430, -6457, -6484, -6510, -6537, -6564, -6591, -6618, -6644, -6671, -6698, -6725, - -6752, -6778, -6805, -6832}; + -6752, -6778, -6805, -6832 +}; static INT16 Cr_B[] = { 0, -4, -9, -15, -20, -25, -30, -35, -41, -46, -51, -56, @@ -208,7 +215,8 @@ static INT16 Cr_B[] = { -1123, -1128, -1133, -1139, -1144, -1149, -1154, -1159, -1165, -1170, -1175, -1180, -1185, -1191, -1196, -1201, -1206, -1211, -1217, -1222, -1227, -1232, -1238, -1243, -1248, -1253, -1258, -1264, -1269, -1274, -1279, -1284, -1290, -1295, -1300, -1305, - -1310, -1316, -1321, -1326}; + -1310, -1316, -1321, -1326 +}; static INT16 R_Cr[] = { -11484, -11394, -11305, -11215, -11125, -11036, -10946, -10856, -10766, -10677, @@ -236,7 +244,8 @@ static INT16 R_Cr[] = { 8255, 8345, 8434, 8524, 8614, 8704, 8793, 8883, 8973, 9063, 9152, 9242, 9332, 9421, 9511, 9601, 9691, 9780, 9870, 9960, 10050, 10139, 10229, 10319, 10408, 10498, 10588, 10678, 10767, 10857, - 10947, 11037, 11126, 11216, 11306, 11395}; + 10947, 11037, 11126, 11216, 11306, 11395 +}; static INT16 G_Cb[] = { 2819, 2797, 2775, 2753, 2731, 2709, 2687, 2665, 2643, 2621, 2599, 2577, @@ -260,7 +269,8 @@ static INT16 G_Cb[] = { -1937, -1959, -1981, -2003, -2025, -2047, -2069, -2091, -2113, -2135, -2157, -2179, -2201, -2224, -2246, -2268, -2290, -2312, -2334, -2356, -2378, -2400, -2422, -2444, -2466, -2488, -2510, -2532, -2554, -2576, -2598, -2620, -2642, -2664, -2686, -2708, - -2730, -2752, -2774, -2796}; + -2730, -2752, -2774, -2796 +}; static INT16 G_Cr[] = { 5850, 5805, 5759, 5713, 5667, 5622, 5576, 5530, 5485, 5439, 5393, 5347, @@ -284,7 +294,8 @@ static INT16 G_Cr[] = { -4021, -4067, -4112, -4158, -4204, -4250, -4295, -4341, -4387, -4432, -4478, -4524, -4569, -4615, -4661, -4707, -4752, -4798, -4844, -4889, -4935, -4981, -5027, -5072, -5118, -5164, -5209, -5255, -5301, -5346, -5392, -5438, -5484, -5529, -5575, -5621, - -5666, -5712, -5758, -5804}; + -5666, -5712, -5758, -5804 +}; static INT16 B_Cb[] = { -14515, -14402, -14288, -14175, -14062, -13948, -13835, -13721, -13608, -13495, @@ -312,7 +323,8 @@ static INT16 B_Cb[] = { 10434, 10547, 10660, 10774, 10887, 11001, 11114, 11227, 11341, 11454, 11568, 11681, 11794, 11908, 12021, 12135, 12248, 12361, 12475, 12588, 12702, 12815, 12929, 13042, 13155, 13269, 13382, 13496, 13609, 13722, - 13836, 13949, 14063, 14176, 14289, 14403}; + 13836, 13949, 14063, 14176, 14289, 14403 +}; void ImagingConvertRGB2YCbCr(UINT8 *out, const UINT8 *in, int pixels) { diff --git a/src/libImaging/Dib.c b/src/libImaging/Dib.c index 269be1058..c69e9e552 100644 --- a/src/libImaging/Dib.c +++ b/src/libImaging/Dib.c @@ -95,7 +95,8 @@ ImagingNewDIB(const char *mode, int xsize, int ysize) { } dib->bitmap = CreateDIBSection( - dib->dc, dib->info, DIB_RGB_COLORS, (void **)&dib->bits, NULL, 0); + dib->dc, dib->info, DIB_RGB_COLORS, (void **)&dib->bits, NULL, 0 + ); if (!dib->bitmap) { free(dib->info); free(dib); @@ -218,7 +219,8 @@ ImagingPasteDIB(ImagingDIB dib, Imaging im, int xy[4]) { dib->bits + dib->linesize * (dib->ysize - (xy[1] + y) - 1) + xy[0] * dib->pixelsize, im->image[y], - im->xsize); + im->xsize + ); } } @@ -251,7 +253,8 @@ ImagingDrawDIB(ImagingDIB dib, void *dc, int dst[4], int src[4]) { dib->bits, dib->info, DIB_RGB_COLORS, - SRCCOPY); + SRCCOPY + ); } else { /* stretchblt (displays) */ if (dib->palette != 0) { @@ -268,7 +271,8 @@ ImagingDrawDIB(ImagingDIB dib, void *dc, int dst[4], int src[4]) { src[1], src[2] - src[0], src[3] - src[1], - SRCCOPY); + SRCCOPY + ); } } diff --git a/src/libImaging/Draw.c b/src/libImaging/Draw.c index 133696dd8..f1c8ffcff 100644 --- a/src/libImaging/Draw.c +++ b/src/libImaging/Draw.c @@ -120,9 +120,8 @@ hline8(Imaging im, int x0, int y0, int x1, int ink) { if (x0 <= x1) { pixelwidth = strncmp(im->mode, "I;16", 4) == 0 ? 2 : 1; memset( - im->image8[y0] + x0 * pixelwidth, - (UINT8)ink, - (x1 - x0 + 1) * pixelwidth); + im->image8[y0] + x0 * pixelwidth, (UINT8)ink, (x1 - x0 + 1) * pixelwidth + ); } } } @@ -408,7 +407,8 @@ x_cmp(const void *x0, const void *x1) { static void draw_horizontal_lines( - Imaging im, int n, Edge *e, int ink, int *x_pos, int y, hline_handler hline) { + Imaging im, int n, Edge *e, int ink, int *x_pos, int y, hline_handler hline +) { int i; for (i = 0; i < n; i++) { if (e[i].ymin == y && e[i].ymin == e[i].ymax) { @@ -440,13 +440,8 @@ draw_horizontal_lines( */ static inline int polygon_generic( - Imaging im, - int n, - Edge *e, - int ink, - int eofill, - hline_handler hline, - int hasAlpha) { + Imaging im, int n, Edge *e, int ink, int eofill, hline_handler hline, int hasAlpha +) { Edge **edge_table; float *xx; int edge_count = 0; @@ -530,25 +525,29 @@ polygon_generic( other_edge->x0; if (ymin == current->ymax) { if (current->dx > 0) { - xx[k] = fmax( - adjacent_line_x, - adjacent_line_x_other_edge) + - 1; + xx[k] = + fmax( + adjacent_line_x, adjacent_line_x_other_edge + ) + + 1; } else { - xx[k] = fmin( - adjacent_line_x, - adjacent_line_x_other_edge) - - 1; + xx[k] = + fmin( + adjacent_line_x, adjacent_line_x_other_edge + ) - + 1; } } else { if (current->dx > 0) { xx[k] = fmin( - adjacent_line_x, adjacent_line_x_other_edge); + adjacent_line_x, adjacent_line_x_other_edge + ); } else { - xx[k] = fmax( - adjacent_line_x, - adjacent_line_x_other_edge) + - 1; + xx[k] = + fmax( + adjacent_line_x, adjacent_line_x_other_edge + ) + + 1; } } break; @@ -699,7 +698,8 @@ ImagingDrawLine(Imaging im, int x0, int y0, int x1, int y1, const void *ink_, in int ImagingDrawWideLine( - Imaging im, int x0, int y0, int x1, int y1, const void *ink_, int width, int op) { + Imaging im, int x0, int y0, int x1, int y1, const void *ink_, int width, int op +) { DRAW *draw; INT32 ink; int dx, dy; @@ -730,7 +730,8 @@ ImagingDrawWideLine( {x0 - dxmin, y0 + dymax}, {x1 - dxmin, y1 + dymax}, {x1 + dxmax, y1 - dymin}, - {x0 + dxmax, y0 - dymin}}; + {x0 + dxmax, y0 - dymin} + }; add_edge(e + 0, vertices[0][0], vertices[0][1], vertices[1][0], vertices[1][1]); add_edge(e + 1, vertices[1][0], vertices[1][1], vertices[2][0], vertices[2][1]); @@ -752,7 +753,8 @@ ImagingDrawRectangle( const void *ink_, int fill, int width, - int op) { + int op +) { int i; int y; int tmp; @@ -800,7 +802,8 @@ ImagingDrawRectangle( int ImagingDrawPolygon( - Imaging im, int count, int *xy, const void *ink_, int fill, int width, int op) { + Imaging im, int count, int *xy, const void *ink_, int fill, int width, int op +) { int i, n, x0, y0, x1, y1; DRAW *draw; INT32 ink; @@ -851,7 +854,8 @@ ImagingDrawPolygon( if (width == 1) { for (i = 0; i < count - 1; i++) { draw->line( - im, xy[i * 2], xy[i * 2 + 1], xy[i * 2 + 2], xy[i * 2 + 3], ink); + im, xy[i * 2], xy[i * 2 + 1], xy[i * 2 + 2], xy[i * 2 + 3], ink + ); } draw->line(im, xy[i * 2], xy[i * 2 + 1], xy[0], xy[1], ink); } else { @@ -864,10 +868,12 @@ ImagingDrawPolygon( xy[i * 2 + 3], ink_, width, - op); + op + ); } ImagingDrawWideLine( - im, xy[i * 2], xy[i * 2 + 1], xy[0], xy[1], ink_, width, op); + im, xy[i * 2], xy[i * 2 + 1], xy[0], xy[1], ink_, width, op + ); } } @@ -877,7 +883,8 @@ ImagingDrawPolygon( int ImagingDrawBitmap(Imaging im, int x0, int y0, Imaging bitmap, const void *ink, int op) { return ImagingFill2( - im, ink, bitmap, x0, y0, x0 + bitmap->xsize, y0 + bitmap->ysize); + im, ink, bitmap, x0, y0, x0 + bitmap->xsize, y0 + bitmap->ysize + ); } /* -------------------------------------------------------------------- */ @@ -1086,7 +1093,8 @@ clip_tree_transpose(clip_node *root) { // segments, i.e. something like correct bracket sequences. int clip_tree_do_clip( - clip_node *root, int32_t x0, int32_t y, int32_t x1, event_list **ret) { + clip_node *root, int32_t x0, int32_t y, int32_t x1, event_list **ret +) { if (root == NULL) { event_list *start = malloc(sizeof(event_list)); if (!start) { @@ -1223,7 +1231,8 @@ typedef struct { } clip_ellipse_state; typedef void (*clip_ellipse_init)( - clip_ellipse_state *, int32_t, int32_t, int32_t, float, float); + clip_ellipse_state *, int32_t, int32_t, int32_t, float, float +); void debug_clip_tree(clip_node *root, int space) { @@ -1335,7 +1344,8 @@ arc_init(clip_ellipse_state *s, int32_t a, int32_t b, int32_t w, float al, float // A chord line. void chord_line_init( - clip_ellipse_state *s, int32_t a, int32_t b, int32_t w, float al, float ar) { + clip_ellipse_state *s, int32_t a, int32_t b, int32_t w, float al, float ar +) { ellipse_init(&s->st, a, b, a + b + 1); s->head = NULL; @@ -1362,7 +1372,8 @@ chord_line_init( // Pie side. void pie_side_init( - clip_ellipse_state *s, int32_t a, int32_t b, int32_t w, float al, float _) { + clip_ellipse_state *s, int32_t a, int32_t b, int32_t w, float al, float _ +) { ellipse_init(&s->st, a, b, a + b + 1); s->head = NULL; @@ -1478,7 +1489,8 @@ clip_ellipse_free(clip_ellipse_state *s) { int8_t clip_ellipse_next( - clip_ellipse_state *s, int32_t *ret_x0, int32_t *ret_y, int32_t *ret_x1) { + clip_ellipse_state *s, int32_t *ret_x0, int32_t *ret_y, int32_t *ret_x1 +) { int32_t x0, y, x1; while (s->head == NULL && ellipse_next(&s->st, &x0, &y, &x1) >= 0) { if (clip_tree_do_clip(s->root, x0, y, x1, &s->head) < 0) { @@ -1512,7 +1524,8 @@ ellipseNew( const void *ink_, int fill, int width, - int op) { + int op +) { DRAW *draw; INT32 ink; DRAWINIT(); @@ -1547,7 +1560,8 @@ clipEllipseNew( const void *ink_, int width, int op, - clip_ellipse_init init) { + clip_ellipse_init init +) { DRAW *draw; INT32 ink; DRAWINIT(); @@ -1580,7 +1594,8 @@ arcNew( float end, const void *ink_, int width, - int op) { + int op +) { return clipEllipseNew(im, x0, y0, x1, y1, start, end, ink_, width, op, arc_init); } @@ -1595,7 +1610,8 @@ chordNew( float end, const void *ink_, int width, - int op) { + int op +) { return clipEllipseNew(im, x0, y0, x1, y1, start, end, ink_, width, op, chord_init); } @@ -1610,9 +1626,11 @@ chordLineNew( float end, const void *ink_, int width, - int op) { + int op +) { return clipEllipseNew( - im, x0, y0, x1, y1, start, end, ink_, width, op, chord_line_init); + im, x0, y0, x1, y1, start, end, ink_, width, op, chord_line_init + ); } static int @@ -1626,7 +1644,8 @@ pieNew( float end, const void *ink_, int width, - int op) { + int op +) { return clipEllipseNew(im, x0, y0, x1, y1, start, end, ink_, width, op, pie_init); } @@ -1640,7 +1659,8 @@ pieSideNew( float start, const void *ink_, int width, - int op) { + int op +) { return clipEllipseNew(im, x0, y0, x1, y1, start, 0, ink_, width, op, pie_side_init); } @@ -1654,7 +1674,8 @@ ImagingDrawEllipse( const void *ink, int fill, int width, - int op) { + int op +) { return ellipseNew(im, x0, y0, x1, y1, ink, fill, width, op); } @@ -1669,7 +1690,8 @@ ImagingDrawArc( float end, const void *ink, int width, - int op) { + int op +) { normalize_angles(&start, &end); if (start + 360 == end) { return ImagingDrawEllipse(im, x0, y0, x1, y1, ink, 0, width, op); @@ -1692,7 +1714,8 @@ ImagingDrawChord( const void *ink, int fill, int width, - int op) { + int op +) { normalize_angles(&start, &end); if (start + 360 == end) { return ImagingDrawEllipse(im, x0, y0, x1, y1, ink, fill, width, op); @@ -1722,7 +1745,8 @@ ImagingDrawPieslice( const void *ink, int fill, int width, - int op) { + int op +) { normalize_angles(&start, &end); if (start + 360 == end) { return ellipseNew(im, x0, y0, x1, y1, ink, fill, width, op); @@ -1850,13 +1874,8 @@ ImagingOutlineLine(ImagingOutline outline, float x1, float y1) { int ImagingOutlineCurve( - ImagingOutline outline, - float x1, - float y1, - float x2, - float y2, - float x3, - float y3) { + ImagingOutline outline, float x1, float y1, float x2, float y2, float x3, float y3 +) { Edge *e; int i; float xo, yo; @@ -1970,7 +1989,8 @@ ImagingOutlineTransform(ImagingOutline outline, double a[6]) { int ImagingDrawOutline( - Imaging im, ImagingOutline outline, const void *ink_, int fill, int op) { + Imaging im, ImagingOutline outline, const void *ink_, int fill, int op +) { DRAW *draw; INT32 ink; diff --git a/src/libImaging/Fill.c b/src/libImaging/Fill.c index 5b6bfb89c..8fb481e7e 100644 --- a/src/libImaging/Fill.c +++ b/src/libImaging/Fill.c @@ -118,8 +118,8 @@ ImagingFillRadialGradient(const char *mode) { for (y = 0; y < 256; y++) { for (x = 0; x < 256; x++) { - d = (int)sqrt( - (double)((x - 128) * (x - 128) + (y - 128) * (y - 128)) * 2.0); + d = (int + )sqrt((double)((x - 128) * (x - 128) + (y - 128) * (y - 128)) * 2.0); if (d >= 255) { d = 255; } diff --git a/src/libImaging/Filter.c b/src/libImaging/Filter.c index 85de77fcb..fbd6b425f 100644 --- a/src/libImaging/Filter.c +++ b/src/libImaging/Filter.c @@ -59,7 +59,8 @@ ImagingExpand(Imaging imIn, int xmargin, int ymargin) { } imOut = ImagingNewDirty( - imIn->mode, imIn->xsize + 2 * xmargin, imIn->ysize + 2 * ymargin); + imIn->mode, imIn->xsize + 2 * xmargin, imIn->ysize + 2 * ymargin + ); if (!imOut) { return NULL; } @@ -369,7 +370,8 @@ ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) { } } memcpy( - out + x * sizeof(UINT32), in0 + x * sizeof(UINT32), sizeof(UINT32) * 2); + out + x * sizeof(UINT32), in0 + x * sizeof(UINT32), sizeof(UINT32) * 2 + ); } } memcpy(imOut->image[y], im->image[y], im->linesize); diff --git a/src/libImaging/Geometry.c b/src/libImaging/Geometry.c index cf3bc9979..2bfeed7b6 100644 --- a/src/libImaging/Geometry.c +++ b/src/libImaging/Geometry.c @@ -781,7 +781,8 @@ ImagingGenericTransform( ImagingTransformMap transform, void *transform_data, int filterid, - int fill) { + int fill +) { /* slow generic transformation. use ImagingTransformAffine or ImagingScaleAffine where possible. */ @@ -836,14 +837,8 @@ ImagingGenericTransform( static Imaging ImagingScaleAffine( - Imaging imOut, - Imaging imIn, - int x0, - int y0, - int x1, - int y1, - double a[6], - int fill) { + Imaging imOut, Imaging imIn, int x0, int y0, int x1, int y1, double a[6], int fill +) { /* scale, nearest neighbour resampling */ ImagingSectionCookie cookie; @@ -936,7 +931,8 @@ static inline int check_fixed(double a[6], int x, int y) { return ( fabs(x * a[0] + y * a[1] + a[2]) < 32768.0 && - fabs(x * a[3] + y * a[4] + a[5]) < 32768.0); + fabs(x * a[3] + y * a[4] + a[5]) < 32768.0 + ); } static inline Imaging @@ -949,7 +945,8 @@ affine_fixed( int y1, double a[6], int filterid, - int fill) { + int fill +) { /* affine transform, nearest neighbour resampling, fixed point arithmetics */ @@ -1026,7 +1023,8 @@ ImagingTransformAffine( int y1, double a[6], int filterid, - int fill) { + int fill +) { /* affine transform, nearest neighbour resampling, floating point arithmetics*/ @@ -1039,7 +1037,8 @@ ImagingTransformAffine( if (filterid || imIn->type == IMAGING_TYPE_SPECIAL) { return ImagingGenericTransform( - imOut, imIn, x0, y0, x1, y1, affine_transform, a, filterid, fill); + imOut, imIn, x0, y0, x1, y1, affine_transform, a, filterid, fill + ); } if (a[1] == 0 && a[3] == 0) { @@ -1134,13 +1133,15 @@ ImagingTransform( int y1, double a[8], int filterid, - int fill) { + int fill +) { ImagingTransformMap transform; switch (method) { case IMAGING_TRANSFORM_AFFINE: return ImagingTransformAffine( - imOut, imIn, x0, y0, x1, y1, a, filterid, fill); + imOut, imIn, x0, y0, x1, y1, a, filterid, fill + ); break; case IMAGING_TRANSFORM_PERSPECTIVE: transform = perspective_transform; @@ -1153,5 +1154,6 @@ ImagingTransform( } return ImagingGenericTransform( - imOut, imIn, x0, y0, x1, y1, transform, a, filterid, fill); + imOut, imIn, x0, y0, x1, y1, transform, a, filterid, fill + ); } diff --git a/src/libImaging/GetBBox.c b/src/libImaging/GetBBox.c index bd2a2778c..c61a27d3b 100644 --- a/src/libImaging/GetBBox.c +++ b/src/libImaging/GetBBox.c @@ -58,11 +58,10 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) { INT32 mask = 0xffffffff; if (im->bands == 3) { ((UINT8 *)&mask)[3] = 0; - } else if ( - alpha_only && - (strcmp(im->mode, "RGBa") == 0 || strcmp(im->mode, "RGBA") == 0 || - strcmp(im->mode, "La") == 0 || strcmp(im->mode, "LA") == 0 || - strcmp(im->mode, "PA") == 0)) { + } else if (alpha_only && + (strcmp(im->mode, "RGBa") == 0 || strcmp(im->mode, "RGBA") == 0 || + strcmp(im->mode, "La") == 0 || strcmp(im->mode, "LA") == 0 || + strcmp(im->mode, "PA") == 0)) { #ifdef WORDS_BIGENDIAN mask = 0x000000ff; #else @@ -246,13 +245,14 @@ getcolors32(Imaging im, int maxcolors, int *size) { code in Python 2.1.3; the exact implementation is borrowed from Python's Unicode property database (written by yours truly) /F */ - static int SIZES[] = { - 4, 3, 8, 3, 16, 3, 32, 5, 64, 3, - 128, 3, 256, 29, 512, 17, 1024, 9, 2048, 5, - 4096, 83, 8192, 27, 16384, 43, 32768, 3, 65536, 45, - 131072, 9, 262144, 39, 524288, 39, 1048576, 9, 2097152, 5, - 4194304, 3, 8388608, 33, 16777216, 27, 33554432, 9, 67108864, 71, - 134217728, 39, 268435456, 9, 536870912, 5, 1073741824, 83, 0}; + static int SIZES[] = {4, 3, 8, 3, 16, 3, 32, 5, + 64, 3, 128, 3, 256, 29, 512, 17, + 1024, 9, 2048, 5, 4096, 83, 8192, 27, + 16384, 43, 32768, 3, 65536, 45, 131072, 9, + 262144, 39, 524288, 39, 1048576, 9, 2097152, 5, + 4194304, 3, 8388608, 33, 16777216, 27, 33554432, 9, + 67108864, 71, 134217728, 39, 268435456, 9, 536870912, 5, + 1073741824, 83, 0}; code_size = code_poly = code_mask = 0; diff --git a/src/libImaging/GifEncode.c b/src/libImaging/GifEncode.c index 45b67616d..203fb9d0a 100644 --- a/src/libImaging/GifEncode.c +++ b/src/libImaging/GifEncode.c @@ -79,7 +79,8 @@ glzwe( UINT8 *out_ptr, UINT32 *in_avail, UINT32 *out_avail, - UINT32 end_of_data) { + UINT32 end_of_data +) { switch (st->entry_state) { case LZW_TRY_IN1: get_first_byte: @@ -312,7 +313,8 @@ ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { state->buffer, (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, - state->xsize); + state->xsize + ); state->x = 0; /* step forward, according to the interlace settings */ @@ -348,7 +350,8 @@ ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { ptr, &in_avail, &out_avail, - state->state == FINISH); + state->state == FINISH + ); out_used = sub_block_limit - ptr - out_avail; *sub_block_ptr += out_used; ptr += out_used; diff --git a/src/libImaging/HexDecode.c b/src/libImaging/HexDecode.c index bd16cdbe1..e26c0e9b3 100644 --- a/src/libImaging/HexDecode.c +++ b/src/libImaging/HexDecode.c @@ -49,7 +49,8 @@ ImagingHexDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt if (++state->x >= state->bytes) { /* Got a full line, unpack it */ state->shuffle( - (UINT8 *)im->image[state->y], state->buffer, state->xsize); + (UINT8 *)im->image[state->y], state->buffer, state->xsize + ); state->x = 0; diff --git a/src/libImaging/Imaging.h b/src/libImaging/Imaging.h index 1f2c03e93..b1c3aed41 100644 --- a/src/libImaging/Imaging.h +++ b/src/libImaging/Imaging.h @@ -295,7 +295,8 @@ extern Imaging ImagingFill(Imaging im, const void *ink); extern int ImagingFill2( - Imaging into, const void *ink, Imaging mask, int x0, int y0, int x1, int y1); + Imaging into, const void *ink, Imaging mask, int x0, int y0, int x1, int y1 +); extern Imaging ImagingFillBand(Imaging im, int band, int color); extern Imaging @@ -310,7 +311,8 @@ extern Imaging ImagingFlipTopBottom(Imaging imOut, Imaging imIn); extern Imaging ImagingGaussianBlur( - Imaging imOut, Imaging imIn, float xradius, float yradius, int passes); + Imaging imOut, Imaging imIn, float xradius, float yradius, int passes +); extern Imaging ImagingGetBand(Imaging im, int band); extern Imaging @@ -373,7 +375,8 @@ ImagingTransform( int y1, double a[8], int filter, - int fill); + int fill +); extern Imaging ImagingUnsharpMask(Imaging imOut, Imaging im, float radius, int percent, int threshold); extern Imaging @@ -386,7 +389,8 @@ ImagingColorLUT3D_linear( int size1D, int size2D, int size3D, - INT16 *table); + INT16 *table +); extern Imaging ImagingCopy2(Imaging imOut, Imaging imIn); @@ -440,7 +444,8 @@ ImagingDrawArc( float end, const void *ink, int width, - int op); + int op +); extern int ImagingDrawBitmap(Imaging im, int x0, int y0, Imaging bitmap, const void *ink, int op); extern int @@ -455,7 +460,8 @@ ImagingDrawChord( const void *ink, int fill, int width, - int op); + int op +); extern int ImagingDrawEllipse( Imaging im, @@ -466,12 +472,14 @@ ImagingDrawEllipse( const void *ink, int fill, int width, - int op); + int op +); extern int ImagingDrawLine(Imaging im, int x0, int y0, int x1, int y1, const void *ink, int op); extern int ImagingDrawWideLine( - Imaging im, int x0, int y0, int x1, int y1, const void *ink, int width, int op); + Imaging im, int x0, int y0, int x1, int y1, const void *ink, int width, int op +); extern int ImagingDrawPieslice( Imaging im, @@ -484,12 +492,14 @@ ImagingDrawPieslice( const void *ink, int fill, int width, - int op); + int op +); extern int ImagingDrawPoint(Imaging im, int x, int y, const void *ink, int op); extern int ImagingDrawPolygon( - Imaging im, int points, int *xy, const void *ink, int fill, int width, int op); + Imaging im, int points, int *xy, const void *ink, int fill, int width, int op +); extern int ImagingDrawRectangle( Imaging im, @@ -500,7 +510,8 @@ ImagingDrawRectangle( const void *ink, int fill, int width, - int op); + int op +); /* Level 2 graphics (WORK IN PROGRESS) */ extern ImagingOutline @@ -510,7 +521,8 @@ ImagingOutlineDelete(ImagingOutline outline); extern int ImagingDrawOutline( - Imaging im, ImagingOutline outline, const void *ink, int fill, int op); + Imaging im, ImagingOutline outline, const void *ink, int fill, int op +); extern int ImagingOutlineMove(ImagingOutline outline, float x, float y); @@ -518,7 +530,8 @@ extern int ImagingOutlineLine(ImagingOutline outline, float x, float y); extern int ImagingOutlineCurve( - ImagingOutline outline, float x1, float y1, float x2, float y2, float x3, float y3); + ImagingOutline outline, float x1, float y1, float x2, float y2, float x3, float y3 +); extern int ImagingOutlineTransform(ImagingOutline outline, double a[6]); @@ -545,7 +558,8 @@ ImagingSavePPM(Imaging im, const char *filename); /* Codecs */ typedef struct ImagingCodecStateInstance *ImagingCodecState; typedef int (*ImagingCodec)( - Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes); + Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes +); extern int ImagingBcnDecode(Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes); @@ -575,7 +589,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes) #ifdef HAVE_OPENJPEG extern int ImagingJpeg2KDecode( - Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes); + Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes +); extern int ImagingJpeg2KDecodeCleanup(ImagingCodecState state); extern int @@ -586,7 +601,8 @@ ImagingJpeg2KEncodeCleanup(ImagingCodecState state); #ifdef HAVE_LIBTIFF extern int ImagingLibTiffDecode( - Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes); + Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes +); extern int ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes); #endif @@ -598,7 +614,8 @@ extern int ImagingMspDecode(Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes); extern int ImagingPackbitsDecode( - Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes); + Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes +); extern int ImagingPcdDecode(Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes); extern int @@ -611,13 +628,16 @@ extern int ImagingRawEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes); extern int ImagingSgiRleDecode( - Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes); + Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes +); extern int ImagingSunRleDecode( - Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes); + Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes +); extern int ImagingTgaRleDecode( - Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes); + Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes +); extern int ImagingTgaRleEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes); extern int diff --git a/src/libImaging/Jpeg2KDecode.c b/src/libImaging/Jpeg2KDecode.c index dd066c10b..5b3d7ffc4 100644 --- a/src/libImaging/Jpeg2KDecode.c +++ b/src/libImaging/Jpeg2KDecode.c @@ -67,7 +67,8 @@ j2k_skip(OPJ_OFF_T p_nb_bytes, void *p_user_data) { /* -------------------------------------------------------------------- */ typedef void (*j2k_unpacker_t)( - opj_image_t *in, const JPEG2KTILEINFO *tileInfo, const UINT8 *data, Imaging im); + opj_image_t *in, const JPEG2KTILEINFO *tileInfo, const UINT8 *data, Imaging im +); struct j2k_decode_unpacker { const char *mode; @@ -89,10 +90,8 @@ j2ku_shift(unsigned x, int n) { static void j2ku_gray_l( - opj_image_t *in, - const JPEG2KTILEINFO *tileinfo, - const UINT8 *tiledata, - Imaging im) { + opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im +) { unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0; unsigned w = tileinfo->x1 - tileinfo->x0; unsigned h = tileinfo->y1 - tileinfo->y0; @@ -145,10 +144,8 @@ j2ku_gray_l( static void j2ku_gray_i( - opj_image_t *in, - const JPEG2KTILEINFO *tileinfo, - const UINT8 *tiledata, - Imaging im) { + opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im +) { unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0; unsigned w = tileinfo->x1 - tileinfo->x0; unsigned h = tileinfo->y1 - tileinfo->y0; @@ -204,10 +201,8 @@ j2ku_gray_i( static void j2ku_gray_rgb( - opj_image_t *in, - const JPEG2KTILEINFO *tileinfo, - const UINT8 *tiledata, - Imaging im) { + opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im +) { unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0; unsigned w = tileinfo->x1 - tileinfo->x0; unsigned h = tileinfo->y1 - tileinfo->y0; @@ -268,10 +263,8 @@ j2ku_gray_rgb( static void j2ku_graya_la( - opj_image_t *in, - const JPEG2KTILEINFO *tileinfo, - const UINT8 *tiledata, - Imaging im) { + opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im +) { unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0; unsigned w = tileinfo->x1 - tileinfo->x0; unsigned h = tileinfo->y1 - tileinfo->y0; @@ -347,10 +340,8 @@ j2ku_graya_la( static void j2ku_srgb_rgb( - opj_image_t *in, - const JPEG2KTILEINFO *tileinfo, - const UINT8 *tiledata, - Imaging im) { + opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im +) { unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0; unsigned w = tileinfo->x1 - tileinfo->x0; unsigned h = tileinfo->y1 - tileinfo->y0; @@ -413,10 +404,8 @@ j2ku_srgb_rgb( static void j2ku_sycc_rgb( - opj_image_t *in, - const JPEG2KTILEINFO *tileinfo, - const UINT8 *tiledata, - Imaging im) { + opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im +) { unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0; unsigned w = tileinfo->x1 - tileinfo->x0; unsigned h = tileinfo->y1 - tileinfo->y0; @@ -482,10 +471,8 @@ j2ku_sycc_rgb( static void j2ku_srgba_rgba( - opj_image_t *in, - const JPEG2KTILEINFO *tileinfo, - const UINT8 *tiledata, - Imaging im) { + opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im +) { unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0; unsigned w = tileinfo->x1 - tileinfo->x0; unsigned h = tileinfo->y1 - tileinfo->y0; @@ -547,10 +534,8 @@ j2ku_srgba_rgba( static void j2ku_sycca_rgba( - opj_image_t *in, - const JPEG2KTILEINFO *tileinfo, - const UINT8 *tiledata, - Imaging im) { + opj_image_t *in, const JPEG2KTILEINFO *tileinfo, const UINT8 *tiledata, Imaging im +) { unsigned x0 = tileinfo->x0 - in->x0, y0 = tileinfo->y0 - in->y0; unsigned w = tileinfo->x1 - tileinfo->x0; unsigned h = tileinfo->y1 - tileinfo->y0; @@ -815,7 +800,8 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) { &tile_info.x1, &tile_info.y1, &tile_info.nb_comps, - &should_continue)) { + &should_continue + )) { state->errcode = IMAGING_CODEC_BROKEN; state->state = J2K_STATE_FAILED; goto quick_exit; @@ -906,7 +892,8 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) { tile_info.tile_index, (OPJ_BYTE *)state->buffer, tile_info.data_size, - stream)) { + stream + )) { state->errcode = IMAGING_CODEC_BROKEN; state->state = J2K_STATE_FAILED; goto quick_exit; diff --git a/src/libImaging/Jpeg2KEncode.c b/src/libImaging/Jpeg2KEncode.c index 7f1aeaddb..cb21a186c 100644 --- a/src/libImaging/Jpeg2KEncode.c +++ b/src/libImaging/Jpeg2KEncode.c @@ -89,7 +89,8 @@ j2k_seek(OPJ_OFF_T p_nb_bytes, void *p_user_data) { /* -------------------------------------------------------------------- */ typedef void (*j2k_pack_tile_t)( - Imaging im, UINT8 *buf, unsigned x0, unsigned y0, unsigned w, unsigned h); + Imaging im, UINT8 *buf, unsigned x0, unsigned y0, unsigned w, unsigned h +); static void j2k_pack_l(Imaging im, UINT8 *buf, unsigned x0, unsigned y0, unsigned w, unsigned h) { @@ -157,7 +158,8 @@ j2k_pack_rgb(Imaging im, UINT8 *buf, unsigned x0, unsigned y0, unsigned w, unsig static void j2k_pack_rgba( - Imaging im, UINT8 *buf, unsigned x0, unsigned y0, unsigned w, unsigned h) { + Imaging im, UINT8 *buf, unsigned x0, unsigned y0, unsigned w, unsigned h +) { UINT8 *pr = buf; UINT8 *pg = pr + w * h; UINT8 *pb = pg + w * h; @@ -205,8 +207,8 @@ j2k_set_cinema_params(Imaging im, int components, opj_cparameters_t *params) { if (params->cp_cinema == OPJ_CINEMA4K_24) { float max_rate = - ((float)(components * im->xsize * im->ysize * 8) / - (CINEMA_24_CS_LENGTH * 8)); + ((float)(components * im->xsize * im->ysize * 8) / (CINEMA_24_CS_LENGTH * 8) + ); params->POC[0].tile = 1; params->POC[0].resno0 = 0; @@ -241,8 +243,8 @@ j2k_set_cinema_params(Imaging im, int components, opj_cparameters_t *params) { params->max_comp_size = COMP_24_CS_MAX_LENGTH; } else { float max_rate = - ((float)(components * im->xsize * im->ysize * 8) / - (CINEMA_48_CS_LENGTH * 8)); + ((float)(components * im->xsize * im->ysize * 8) / (CINEMA_48_CS_LENGTH * 8) + ); for (n = 0; n < params->tcp_numlayers; ++n) { rate = 0; diff --git a/src/libImaging/JpegDecode.c b/src/libImaging/JpegDecode.c index 6f75d8670..30c64f235 100644 --- a/src/libImaging/JpegDecode.c +++ b/src/libImaging/JpegDecode.c @@ -206,9 +206,8 @@ ImagingJpegDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t by context->cinfo.out_color_space = JCS_EXT_RGBX; } #endif - else if ( - strcmp(context->rawmode, "CMYK") == 0 || - strcmp(context->rawmode, "CMYK;I") == 0) { + else if (strcmp(context->rawmode, "CMYK") == 0 || + strcmp(context->rawmode, "CMYK;I") == 0) { context->cinfo.out_color_space = JCS_CMYK; } else if (strcmp(context->rawmode, "YCbCr") == 0) { context->cinfo.out_color_space = JCS_YCbCr; @@ -256,7 +255,8 @@ ImagingJpegDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t by (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, state->buffer, - state->xsize); + state->xsize + ); state->y++; } if (ok != 1) { diff --git a/src/libImaging/JpegEncode.c b/src/libImaging/JpegEncode.c index ba8353c2d..4372d51d5 100644 --- a/src/libImaging/JpegEncode.c +++ b/src/libImaging/JpegEncode.c @@ -175,7 +175,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { i, &context->qtables[i * DCTSIZE2], quality, - FALSE); + FALSE + ); context->cinfo.comp_info[i].quant_tbl_no = i; last_q = i; } @@ -183,7 +184,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { // jpeg_set_defaults created two qtables internally, but we only // wanted one. jpeg_add_quant_table( - &context->cinfo, 1, &context->qtables[0], quality, FALSE); + &context->cinfo, 1, &context->qtables[0], quality, FALSE + ); } for (i = last_q; i < context->cinfo.num_components; i++) { context->cinfo.comp_info[i].quant_tbl_no = last_q; @@ -273,7 +275,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { &context->cinfo, JPEG_APP0 + 1, (unsigned char *)context->rawExif, - context->rawExifLen); + context->rawExifLen + ); } state->state++; @@ -289,7 +292,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { memcpy( context->destination.pub.next_output_byte, context->extra + context->extra_offset, - n); + n + ); context->destination.pub.next_output_byte += n; context->destination.pub.free_in_buffer -= n; context->extra_offset += n; @@ -309,7 +313,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { &context->cinfo, JPEG_COM, (unsigned char *)context->comment, - context->comment_size); + context->comment_size + ); } state->state++; @@ -324,7 +329,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { state->buffer, (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, - state->xsize); + state->xsize + ); ok = jpeg_write_scanlines(&context->cinfo, &state->buffer, 1); if (ok != 1) { break; diff --git a/src/libImaging/PackDecode.c b/src/libImaging/PackDecode.c index 7dd432b91..52f1ac502 100644 --- a/src/libImaging/PackDecode.c +++ b/src/libImaging/PackDecode.c @@ -17,7 +17,8 @@ int ImagingPackbitsDecode( - Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t bytes) { + Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t bytes +) { UINT8 n; UINT8 *ptr; int i; @@ -79,7 +80,8 @@ ImagingPackbitsDecode( (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, state->buffer, - state->xsize); + state->xsize + ); state->x = 0; diff --git a/src/libImaging/Paste.c b/src/libImaging/Paste.c index dc67cb41d..86085942a 100644 --- a/src/libImaging/Paste.c +++ b/src/libImaging/Paste.c @@ -33,7 +33,8 @@ paste( int sy, int xsize, int ysize, - int pixelsize) { + int pixelsize +) { /* paste opaque region */ int y; @@ -59,7 +60,8 @@ paste_mask_1( int sy, int xsize, int ysize, - int pixelsize) { + int pixelsize +) { /* paste with mode "1" mask */ int x, y; @@ -120,7 +122,8 @@ paste_mask_L( int sy, int xsize, int ysize, - int pixelsize) { + int pixelsize +) { /* paste with mode "L" matte */ int x, y; @@ -167,7 +170,8 @@ paste_mask_RGBA( int sy, int xsize, int ysize, - int pixelsize) { + int pixelsize +) { /* paste with mode "RGBA" matte */ int x, y; @@ -214,7 +218,8 @@ paste_mask_RGBa( int sy, int xsize, int ysize, - int pixelsize) { + int pixelsize +) { /* paste with mode "RGBa" matte */ int x, y; @@ -252,7 +257,8 @@ paste_mask_RGBa( int ImagingPaste( - Imaging imOut, Imaging imIn, Imaging imMask, int dx0, int dy0, int dx1, int dy1) { + Imaging imOut, Imaging imIn, Imaging imMask, int dx0, int dy0, int dx1, int dy1 +) { int xsize, ysize; int pixelsize; int sx0, sy0; @@ -315,13 +321,15 @@ ImagingPaste( } else if (strcmp(imMask->mode, "LA") == 0 || strcmp(imMask->mode, "RGBA") == 0) { ImagingSectionEnter(&cookie); paste_mask_RGBA( - imOut, imIn, imMask, dx0, dy0, sx0, sy0, xsize, ysize, pixelsize); + imOut, imIn, imMask, dx0, dy0, sx0, sy0, xsize, ysize, pixelsize + ); ImagingSectionLeave(&cookie); } else if (strcmp(imMask->mode, "RGBa") == 0) { ImagingSectionEnter(&cookie); paste_mask_RGBa( - imOut, imIn, imMask, dx0, dy0, sx0, sy0, xsize, ysize, pixelsize); + imOut, imIn, imMask, dx0, dy0, sx0, sy0, xsize, ysize, pixelsize + ); ImagingSectionLeave(&cookie); } else { @@ -334,13 +342,8 @@ ImagingPaste( static inline void fill( - Imaging imOut, - const void *ink_, - int dx, - int dy, - int xsize, - int ysize, - int pixelsize) { + Imaging imOut, const void *ink_, int dx, int dy, int xsize, int ysize, int pixelsize +) { /* fill opaque region */ int x, y; @@ -378,7 +381,8 @@ fill_mask_1( int sy, int xsize, int ysize, - int pixelsize) { + int pixelsize +) { /* fill with mode "1" mask */ int x, y; @@ -425,7 +429,8 @@ fill_mask_L( int sy, int xsize, int ysize, - int pixelsize) { + int pixelsize +) { /* fill with mode "L" matte */ int x, y, i; @@ -484,7 +489,8 @@ fill_mask_RGBA( int sy, int xsize, int ysize, - int pixelsize) { + int pixelsize +) { /* fill with mode "RGBA" matte */ int x, y, i; @@ -529,7 +535,8 @@ fill_mask_RGBa( int sy, int xsize, int ysize, - int pixelsize) { + int pixelsize +) { /* fill with mode "RGBa" matte */ int x, y, i; @@ -565,13 +572,8 @@ fill_mask_RGBa( int ImagingFill2( - Imaging imOut, - const void *ink, - Imaging imMask, - int dx0, - int dy0, - int dx1, - int dy1) { + Imaging imOut, const void *ink, Imaging imMask, int dx0, int dy0, int dx1, int dy1 +) { ImagingSectionCookie cookie; int xsize, ysize; int pixelsize; diff --git a/src/libImaging/PcxDecode.c b/src/libImaging/PcxDecode.c index c95ffc869..942c8dc22 100644 --- a/src/libImaging/PcxDecode.c +++ b/src/libImaging/PcxDecode.c @@ -68,7 +68,8 @@ ImagingPcxDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt memmove( &state->buffer[i * state->xsize], &state->buffer[i * stride], - state->xsize); + state->xsize + ); } } /* Got a full line, unpack it */ @@ -76,7 +77,8 @@ ImagingPcxDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, state->buffer, - state->xsize); + state->xsize + ); state->x = 0; diff --git a/src/libImaging/PcxEncode.c b/src/libImaging/PcxEncode.c index 549614bfd..625cf7ffa 100644 --- a/src/libImaging/PcxEncode.c +++ b/src/libImaging/PcxEncode.c @@ -71,7 +71,8 @@ ImagingPcxEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { state->buffer, (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, - state->xsize); + state->xsize + ); state->y += 1; diff --git a/src/libImaging/Point.c b/src/libImaging/Point.c index dd06f3940..6a4060b4b 100644 --- a/src/libImaging/Point.c +++ b/src/libImaging/Point.c @@ -197,8 +197,8 @@ ImagingPoint(Imaging imIn, const char *mode, const void *table) { return imOut; mode_mismatch: - return (Imaging)ImagingError_ValueError( - "point operation not supported for this mode"); + return (Imaging + )ImagingError_ValueError("point operation not supported for this mode"); } Imaging diff --git a/src/libImaging/Quant.c b/src/libImaging/Quant.c index cdc614536..197f9f3ee 100644 --- a/src/libImaging/Quant.c +++ b/src/libImaging/Quant.c @@ -103,7 +103,8 @@ static uint32_t pixel_hash(const HashTable *h, const Pixel pixel) { PixelHashData *d = (PixelHashData *)hashtable_get_user_data(h); return PIXEL_HASH( - pixel.c.r >> d->scale, pixel.c.g >> d->scale, pixel.c.b >> d->scale); + pixel.c.r >> d->scale, pixel.c.g >> d->scale, pixel.c.b >> d->scale + ); } static int @@ -111,9 +112,11 @@ pixel_cmp(const HashTable *h, const Pixel pixel1, const Pixel pixel2) { PixelHashData *d = (PixelHashData *)hashtable_get_user_data(h); uint32_t A, B; A = PIXEL_HASH( - pixel1.c.r >> d->scale, pixel1.c.g >> d->scale, pixel1.c.b >> d->scale); + pixel1.c.r >> d->scale, pixel1.c.g >> d->scale, pixel1.c.b >> d->scale + ); B = PIXEL_HASH( - pixel2.c.r >> d->scale, pixel2.c.g >> d->scale, pixel2.c.b >> d->scale); + pixel2.c.r >> d->scale, pixel2.c.g >> d->scale, pixel2.c.b >> d->scale + ); return (A == B) ? 0 : ((A < B) ? -1 : 1); } @@ -129,7 +132,8 @@ new_count_func(const HashTable *h, const Pixel key, uint32_t *val) { static void rehash_collide( - const HashTable *h, Pixel *keyp, uint32_t *valp, Pixel newkey, uint32_t newval) { + const HashTable *h, Pixel *keyp, uint32_t *valp, Pixel newkey, uint32_t newval +) { *valp += newval; } @@ -157,7 +161,8 @@ create_pixel_hash(Pixel *pixelData, uint32_t nPixels) { #endif for (i = 0; i < nPixels; i++) { if (!hashtable_insert_or_update_computed( - hash, pixelData[i], new_count_func, exists_count_func)) { + hash, pixelData[i], new_count_func, exists_count_func + )) { ; } while (hashtable_get_count(hash) > MAX_HASH_ENTRIES) { @@ -335,7 +340,8 @@ splitlists( PixelList *nt[2][3], uint32_t nCount[2], int axis, - uint32_t pixelCount) { + uint32_t pixelCount +) { uint32_t left; PixelList *l, *r, *c, *n; @@ -387,7 +393,8 @@ splitlists( _prevCount[2], _nextCount[0], _nextCount[1], - _nextCount[2]); + _nextCount[2] + ); exit(1); } } @@ -531,12 +538,14 @@ split(BoxNode *node) { if (node->tail[_i]->next[_i]) { printf("tail is not tail\n"); printf( - "node->tail[%d]->next[%d]=%p\n", _i, _i, node->tail[_i]->next[_i]); + "node->tail[%d]->next[%d]=%p\n", _i, _i, node->tail[_i]->next[_i] + ); } if (node->head[_i]->prev[_i]) { printf("head is not head\n"); printf( - "node->head[%d]->prev[%d]=%p\n", _i, _i, node->head[_i]->prev[_i]); + "node->head[%d]->prev[%d]=%p\n", _i, _i, node->head[_i]->prev[_i] + ); } } @@ -573,14 +582,16 @@ split(BoxNode *node) { _prevCount[2], _nextCount[0], _nextCount[1], - _nextCount[2]); + _nextCount[2] + ); } } } #endif node->axis = axis; if (!splitlists( - node->head, node->tail, heads, tails, newCounts, axis, node->pixelCount)) { + node->head, node->tail, heads, tails, newCounts, axis, node->pixelCount + )) { #ifndef NO_OUTPUT printf("list split failed.\n"); #endif @@ -772,7 +783,8 @@ _distance_index_cmp(const void *a, const void *b) { static int resort_distance_tables( - uint32_t *avgDist, uint32_t **avgDistSortKey, Pixel *p, uint32_t nEntries) { + uint32_t *avgDist, uint32_t **avgDistSortKey, Pixel *p, uint32_t nEntries +) { uint32_t i, j, k; uint32_t **skRow; uint32_t *skElt; @@ -801,7 +813,8 @@ resort_distance_tables( static int build_distance_tables( - uint32_t *avgDist, uint32_t **avgDistSortKey, Pixel *p, uint32_t nEntries) { + uint32_t *avgDist, uint32_t **avgDistSortKey, Pixel *p, uint32_t nEntries +) { uint32_t i, j; DistanceWithIndex *dwi; @@ -841,7 +854,8 @@ map_image_pixels( uint32_t nPaletteEntries, uint32_t *avgDist, uint32_t **avgDistSortKey, - uint32_t *pixelArray) { + uint32_t *pixelArray +) { uint32_t *aD, **aDSK; uint32_t idx; uint32_t i, j; @@ -888,7 +902,8 @@ map_image_pixels_from_quantized_pixels( uint32_t **avgDistSortKey, uint32_t *pixelArray, uint32_t *avg[3], - uint32_t *count) { + uint32_t *count +) { uint32_t *aD, **aDSK; uint32_t idx; uint32_t i, j; @@ -946,7 +961,8 @@ map_image_pixels_from_median_box( HashTable *medianBoxHash, uint32_t *avgDist, uint32_t **avgDistSortKey, - uint32_t *pixelArray) { + uint32_t *pixelArray +) { uint32_t *aD, **aDSK; uint32_t idx; uint32_t i, j; @@ -998,7 +1014,8 @@ compute_palette_from_median_cut( uint32_t nPixels, HashTable *medianBoxHash, Pixel **palette, - uint32_t nPaletteEntries) { + uint32_t nPaletteEntries +) { uint32_t i; uint32_t paletteEntry; Pixel *p; @@ -1055,7 +1072,8 @@ compute_palette_from_median_cut( printf( "panic - paletteEntry>=nPaletteEntries (%d>=%d)\n", (int)paletteEntry, - (int)nPaletteEntries); + (int)nPaletteEntries + ); #endif for (i = 0; i < 3; i++) { free(avg[i]); @@ -1092,7 +1110,8 @@ compute_palette_from_median_cut( static int recompute_palette_from_averages( - Pixel *palette, uint32_t nPaletteEntries, uint32_t *avg[3], uint32_t *count) { + Pixel *palette, uint32_t nPaletteEntries, uint32_t *avg[3], uint32_t *count +) { uint32_t i; for (i = 0; i < nPaletteEntries; i++) { @@ -1111,7 +1130,8 @@ compute_palette_from_quantized_pixels( uint32_t nPaletteEntries, uint32_t *avg[3], uint32_t *count, - uint32_t *qp) { + uint32_t *qp +) { uint32_t i; memset(count, 0, sizeof(uint32_t) * nPaletteEntries); @@ -1145,7 +1165,8 @@ k_means( Pixel *paletteData, uint32_t nPaletteEntries, uint32_t *qp, - int threshold) { + int threshold +) { uint32_t *avg[3]; uint32_t *count; uint32_t i; @@ -1194,16 +1215,19 @@ k_means( while (1) { if (!built) { compute_palette_from_quantized_pixels( - pixelData, nPixels, paletteData, nPaletteEntries, avg, count, qp); + pixelData, nPixels, paletteData, nPaletteEntries, avg, count, qp + ); if (!build_distance_tables( - avgDist, avgDistSortKey, paletteData, nPaletteEntries)) { + avgDist, avgDistSortKey, paletteData, nPaletteEntries + )) { goto error_3; } built = 1; } else { recompute_palette_from_averages(paletteData, nPaletteEntries, avg, count); resort_distance_tables( - avgDist, avgDistSortKey, paletteData, nPaletteEntries); + avgDist, avgDistSortKey, paletteData, nPaletteEntries + ); } changes = map_image_pixels_from_quantized_pixels( pixelData, @@ -1214,7 +1238,8 @@ k_means( avgDistSortKey, qp, avg, - count); + count + ); if (changes < 0) { goto error_3; } @@ -1273,7 +1298,8 @@ quantize( Pixel **palette, uint32_t *paletteLength, uint32_t **quantizedPixels, - int kmeans) { + int kmeans +) { PixelList *hl[3]; HashTable *h; BoxNode *root; @@ -1399,7 +1425,8 @@ quantize( } if (!map_image_pixels_from_median_box( - pixelData, nPixels, p, nPaletteEntries, h, avgDist, avgDistSortKey, qp)) { + pixelData, nPixels, p, nPaletteEntries, h, avgDist, avgDistSortKey, qp + )) { goto error_7; } @@ -1445,7 +1472,8 @@ quantize( _SQR(pixelData[i].c.b - p[qp[i]].c.b))), sqrt((double)(_SQR(pixelData[i].c.r - p[bestmatch].c.r) + _SQR(pixelData[i].c.g - p[bestmatch].c.g) + - _SQR(pixelData[i].c.b - p[bestmatch].c.b)))); + _SQR(pixelData[i].c.b - p[bestmatch].c.b))) + ); } } hashtable_free(h2); @@ -1545,7 +1573,8 @@ quantize2( Pixel **palette, uint32_t *paletteLength, uint32_t **quantizedPixels, - int kmeans) { + int kmeans +) { HashTable *h; uint32_t i; uint32_t mean[3]; @@ -1609,7 +1638,8 @@ quantize2( } if (!map_image_pixels( - pixelData, nPixels, p, nQuantPixels, avgDist, avgDistSortKey, qp)) { + pixelData, nPixels, p, nQuantPixels, avgDist, avgDistSortKey, qp + )) { goto error_4; } if (kmeans > 0) { @@ -1752,7 +1782,8 @@ ImagingQuantize(Imaging im, int colors, int mode, int kmeans) { &palette, &paletteLength, &newData, - kmeans); + kmeans + ); break; case 1: /* maximum coverage */ @@ -1763,7 +1794,8 @@ ImagingQuantize(Imaging im, int colors, int mode, int kmeans) { &palette, &paletteLength, &newData, - kmeans); + kmeans + ); break; case 2: result = quantize_octree( @@ -1773,7 +1805,8 @@ ImagingQuantize(Imaging im, int colors, int mode, int kmeans) { &palette, &paletteLength, &newData, - withAlpha); + withAlpha + ); break; case 3: #ifdef HAVE_LIBIMAGEQUANT @@ -1785,7 +1818,8 @@ ImagingQuantize(Imaging im, int colors, int mode, int kmeans) { &palette, &paletteLength, &newData, - withAlpha); + withAlpha + ); #else result = -1; #endif @@ -1836,7 +1870,8 @@ ImagingQuantize(Imaging im, int colors, int mode, int kmeans) { if (result == -1) { return (Imaging)ImagingError_ValueError( "dependency required by this method was not " - "enabled at compile time"); + "enabled at compile time" + ); } return (Imaging)ImagingError_ValueError("quantization error"); diff --git a/src/libImaging/QuantHash.c b/src/libImaging/QuantHash.c index ea75d6037..bf2f29fde 100644 --- a/src/libImaging/QuantHash.c +++ b/src/libImaging/QuantHash.c @@ -132,7 +132,8 @@ _hashtable_resize(HashTable *h) { static int _hashtable_insert_node( - HashTable *h, HashNode *node, int resize, int update, CollisionFunc cf) { + HashTable *h, HashNode *node, int resize, int update, CollisionFunc cf +) { uint32_t hash = h->hashFunc(h, node->key) % h->length; HashNode **n, *nv; int i; @@ -207,7 +208,8 @@ _hashtable_insert(HashTable *h, HashKey_t key, HashVal_t val, int resize, int up int hashtable_insert_or_update_computed( - HashTable *h, HashKey_t key, ComputeFunc newFunc, ComputeFunc existsFunc) { + HashTable *h, HashKey_t key, ComputeFunc newFunc, ComputeFunc existsFunc +) { HashNode **n, *nv; HashNode *t; int i; diff --git a/src/libImaging/QuantHash.h b/src/libImaging/QuantHash.h index fc1a99003..0462cfd49 100644 --- a/src/libImaging/QuantHash.h +++ b/src/libImaging/QuantHash.h @@ -20,13 +20,12 @@ typedef uint32_t HashVal_t; typedef uint32_t (*HashFunc)(const HashTable *, const HashKey_t); typedef int (*HashCmpFunc)(const HashTable *, const HashKey_t, const HashKey_t); -typedef void (*IteratorFunc)( - const HashTable *, const HashKey_t, const HashVal_t, void *); -typedef void (*IteratorUpdateFunc)( - const HashTable *, const HashKey_t, HashVal_t *, void *); +typedef void (*IteratorFunc)(const HashTable *, const HashKey_t, const HashVal_t, void *); +typedef void (*IteratorUpdateFunc)(const HashTable *, const HashKey_t, HashVal_t *, void *); typedef void (*ComputeFunc)(const HashTable *, const HashKey_t, HashVal_t *); typedef void (*CollisionFunc)( - const HashTable *, HashKey_t *, HashVal_t *, HashKey_t, HashVal_t); + const HashTable *, HashKey_t *, HashVal_t *, HashKey_t, HashVal_t +); HashTable * hashtable_new(HashFunc hf, HashCmpFunc cf); @@ -42,7 +41,8 @@ int hashtable_lookup(const HashTable *h, const HashKey_t key, HashVal_t *valp); int hashtable_insert_or_update_computed( - HashTable *h, HashKey_t key, ComputeFunc newFunc, ComputeFunc existsFunc); + HashTable *h, HashKey_t key, ComputeFunc newFunc, ComputeFunc existsFunc +); void * hashtable_set_user_data(HashTable *h, void *data); void * diff --git a/src/libImaging/QuantOctree.c b/src/libImaging/QuantOctree.c index 1331a30ad..7e02ebf65 100644 --- a/src/libImaging/QuantOctree.c +++ b/src/libImaging/QuantOctree.c @@ -107,11 +107,8 @@ free_color_cube(ColorCube cube) { static long color_bucket_offset_pos( - const ColorCube cube, - unsigned int r, - unsigned int g, - unsigned int b, - unsigned int a) { + const ColorCube cube, unsigned int r, unsigned int g, unsigned int b, unsigned int a +) { return r << cube->rOffset | g << cube->gOffset | b << cube->bOffset | a << cube->aOffset; } @@ -191,7 +188,8 @@ create_sorted_color_palette(const ColorCube cube) { buckets, cube->size, sizeof(struct _ColorBucket), - (int (*)(void const *, void const *)) & compare_bucket_count); + (int (*)(void const *, void const *)) & compare_bucket_count + ); return buckets; } @@ -212,7 +210,8 @@ copy_color_cube( unsigned int rBits, unsigned int gBits, unsigned int bBits, - unsigned int aBits) { + unsigned int aBits +) { unsigned int r, g, b, a; long src_pos, dst_pos; unsigned int src_reduce[4] = {0}, dst_reduce[4] = {0}; @@ -262,15 +261,18 @@ copy_color_cube( r >> src_reduce[0], g >> src_reduce[1], b >> src_reduce[2], - a >> src_reduce[3]); + a >> src_reduce[3] + ); dst_pos = color_bucket_offset_pos( result, r >> dst_reduce[0], g >> dst_reduce[1], b >> dst_reduce[2], - a >> dst_reduce[3]); + a >> dst_reduce[3] + ); add_bucket_values( - &cube->buckets[src_pos], &result->buckets[dst_pos]); + &cube->buckets[src_pos], &result->buckets[dst_pos] + ); } } } @@ -328,7 +330,8 @@ combined_palette( ColorBucket bucketsA, unsigned long nBucketsA, ColorBucket bucketsB, - unsigned long nBucketsB) { + unsigned long nBucketsB +) { ColorBucket result; if (nBucketsA > LONG_MAX - nBucketsB || (nBucketsA + nBucketsB) > LONG_MAX / sizeof(struct _ColorBucket)) { @@ -366,7 +369,8 @@ map_image_pixels( const Pixel *pixelData, uint32_t nPixels, const ColorCube lookupCube, - uint32_t *pixelArray) { + uint32_t *pixelArray +) { long i; for (i = 0; i < nPixels; i++) { pixelArray[i] = lookup_color(lookupCube, &pixelData[i]); @@ -384,7 +388,8 @@ quantize_octree( Pixel **palette, uint32_t *paletteLength, uint32_t **quantizedPixels, - int withAlpha) { + int withAlpha +) { ColorCube fineCube = NULL; ColorCube coarseCube = NULL; ColorCube lookupCube = NULL; @@ -461,7 +466,8 @@ quantize_octree( subtract_color_buckets( coarseCube, &paletteBucketsFine[nAlreadySubtracted], - nFineColors - nAlreadySubtracted); + nFineColors - nAlreadySubtracted + ); } /* create our palette buckets with fine and coarse combined */ @@ -470,7 +476,8 @@ quantize_octree( goto error; } paletteBuckets = combined_palette( - paletteBucketsCoarse, nCoarseColors, paletteBucketsFine, nFineColors); + paletteBucketsCoarse, nCoarseColors, paletteBucketsFine, nFineColors + ); free(paletteBucketsFine); paletteBucketsFine = NULL; @@ -491,7 +498,8 @@ quantize_octree( /* expand coarse cube (64) to larger fine cube (4k). the value of each coarse bucket is then present in the according 64 fine buckets. */ lookupCube = copy_color_cube( - coarseLookupCube, cubeBits[0], cubeBits[1], cubeBits[2], cubeBits[3]); + coarseLookupCube, cubeBits[0], cubeBits[1], cubeBits[2], cubeBits[3] + ); if (!lookupCube) { goto error; } diff --git a/src/libImaging/QuantPngQuant.c b/src/libImaging/QuantPngQuant.c index 7a36300e4..a2258c3a2 100644 --- a/src/libImaging/QuantPngQuant.c +++ b/src/libImaging/QuantPngQuant.c @@ -26,7 +26,8 @@ quantize_pngquant( Pixel **palette, uint32_t *paletteLength, uint32_t **quantizedPixels, - int withAlpha) { + int withAlpha +) { int result = 0; liq_image *image = NULL; liq_attr *attr = NULL; diff --git a/src/libImaging/QuantPngQuant.h b/src/libImaging/QuantPngQuant.h index d65e42590..ae96a52f3 100644 --- a/src/libImaging/QuantPngQuant.h +++ b/src/libImaging/QuantPngQuant.h @@ -12,6 +12,7 @@ quantize_pngquant( Pixel **, uint32_t *, uint32_t **, - int); + int +); #endif diff --git a/src/libImaging/RankFilter.c b/src/libImaging/RankFilter.c index 73a6baecb..899b1fd3a 100644 --- a/src/libImaging/RankFilter.c +++ b/src/libImaging/RankFilter.c @@ -102,7 +102,8 @@ MakeRankFunction(UINT8) MakeRankFunction(INT32) MakeRankFunction(FLOAT32) memcpy( \ buf + i * size, \ &IMAGING_PIXEL_##type(im, x, y + i), \ - size * sizeof(type)); \ + size * sizeof(type) \ + ); \ } \ IMAGING_PIXEL_##type(imOut, x, y) = Rank##type(buf, size2, rank); \ } \ diff --git a/src/libImaging/RawDecode.c b/src/libImaging/RawDecode.c index 24abe4804..80ed0d688 100644 --- a/src/libImaging/RawDecode.c +++ b/src/libImaging/RawDecode.c @@ -74,7 +74,8 @@ ImagingRawDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt state->shuffle( (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, ptr, - state->xsize); + state->xsize + ); ptr += state->bytes; bytes -= state->bytes; diff --git a/src/libImaging/RawEncode.c b/src/libImaging/RawEncode.c index 50de8d982..5e60e1106 100644 --- a/src/libImaging/RawEncode.c +++ b/src/libImaging/RawEncode.c @@ -65,7 +65,8 @@ ImagingRawEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { state->shuffle( ptr, (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, - state->xsize); + state->xsize + ); if (state->bytes > state->count) { /* zero-pad the buffer, if necessary */ diff --git a/src/libImaging/Reduce.c b/src/libImaging/Reduce.c index 61566f0c5..022daa000 100644 --- a/src/libImaging/Reduce.c +++ b/src/libImaging/Reduce.c @@ -82,7 +82,8 @@ ImagingReduceNxN(Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale } } v = MAKE_UINT32( - (ss0 * multiplier) >> 24, 0, 0, (ss3 * multiplier) >> 24); + (ss0 * multiplier) >> 24, 0, 0, (ss3 * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else if (imIn->bands == 3) { @@ -124,7 +125,8 @@ ImagingReduceNxN(Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale (ss0 * multiplier) >> 24, (ss1 * multiplier) >> 24, (ss2 * multiplier) >> 24, - 0); + 0 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else { // bands == 4 @@ -171,7 +173,8 @@ ImagingReduceNxN(Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale (ss0 * multiplier) >> 24, (ss1 * multiplier) >> 24, (ss2 * multiplier) >> 24, - (ss3 * multiplier) >> 24); + (ss3 * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -226,7 +229,8 @@ ImagingReduce1xN(Imaging imOut, Imaging imIn, int box[4], int yscale) { ss3 += line[xx * 4 + 3]; } v = MAKE_UINT32( - (ss0 * multiplier) >> 24, 0, 0, (ss3 * multiplier) >> 24); + (ss0 * multiplier) >> 24, 0, 0, (ss3 * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else if (imIn->bands == 3) { @@ -251,7 +255,8 @@ ImagingReduce1xN(Imaging imOut, Imaging imIn, int box[4], int yscale) { (ss0 * multiplier) >> 24, (ss1 * multiplier) >> 24, (ss2 * multiplier) >> 24, - 0); + 0 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else { // bands == 4 @@ -278,7 +283,8 @@ ImagingReduce1xN(Imaging imOut, Imaging imIn, int box[4], int yscale) { (ss0 * multiplier) >> 24, (ss1 * multiplier) >> 24, (ss2 * multiplier) >> 24, - (ss3 * multiplier) >> 24); + (ss3 * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -329,7 +335,8 @@ ImagingReduceNx1(Imaging imOut, Imaging imIn, int box[4], int xscale) { ss3 += line[xx * 4 + 3]; } v = MAKE_UINT32( - (ss0 * multiplier) >> 24, 0, 0, (ss3 * multiplier) >> 24); + (ss0 * multiplier) >> 24, 0, 0, (ss3 * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else if (imIn->bands == 3) { @@ -351,7 +358,8 @@ ImagingReduceNx1(Imaging imOut, Imaging imIn, int box[4], int xscale) { (ss0 * multiplier) >> 24, (ss1 * multiplier) >> 24, (ss2 * multiplier) >> 24, - 0); + 0 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else { // bands == 4 @@ -375,7 +383,8 @@ ImagingReduceNx1(Imaging imOut, Imaging imIn, int box[4], int xscale) { (ss0 * multiplier) >> 24, (ss1 * multiplier) >> 24, (ss2 * multiplier) >> 24, - (ss3 * multiplier) >> 24); + (ss3 * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -425,7 +434,8 @@ ImagingReduce1x2(Imaging imOut, Imaging imIn, int box[4]) { ss1 = line0[xx * 4 + 1] + line1[xx * 4 + 1]; ss2 = line0[xx * 4 + 2] + line1[xx * 4 + 2]; v = MAKE_UINT32( - (ss0 + amend) >> 1, (ss1 + amend) >> 1, (ss2 + amend) >> 1, 0); + (ss0 + amend) >> 1, (ss1 + amend) >> 1, (ss2 + amend) >> 1, 0 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else { // bands == 4 @@ -440,7 +450,8 @@ ImagingReduce1x2(Imaging imOut, Imaging imIn, int box[4]) { (ss0 + amend) >> 1, (ss1 + amend) >> 1, (ss2 + amend) >> 1, - (ss3 + amend) >> 1); + (ss3 + amend) >> 1 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -488,7 +499,8 @@ ImagingReduce2x1(Imaging imOut, Imaging imIn, int box[4]) { ss1 = line0[xx * 4 + 1] + line0[xx * 4 + 5]; ss2 = line0[xx * 4 + 2] + line0[xx * 4 + 6]; v = MAKE_UINT32( - (ss0 + amend) >> 1, (ss1 + amend) >> 1, (ss2 + amend) >> 1, 0); + (ss0 + amend) >> 1, (ss1 + amend) >> 1, (ss2 + amend) >> 1, 0 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else { // bands == 4 @@ -503,7 +515,8 @@ ImagingReduce2x1(Imaging imOut, Imaging imIn, int box[4]) { (ss0 + amend) >> 1, (ss1 + amend) >> 1, (ss2 + amend) >> 1, - (ss3 + amend) >> 1); + (ss3 + amend) >> 1 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -558,7 +571,8 @@ ImagingReduce2x2(Imaging imOut, Imaging imIn, int box[4]) { ss2 = line0[xx * 4 + 2] + line0[xx * 4 + 6] + line1[xx * 4 + 2] + line1[xx * 4 + 6]; v = MAKE_UINT32( - (ss0 + amend) >> 2, (ss1 + amend) >> 2, (ss2 + amend) >> 2, 0); + (ss0 + amend) >> 2, (ss1 + amend) >> 2, (ss2 + amend) >> 2, 0 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else { // bands == 4 @@ -577,7 +591,8 @@ ImagingReduce2x2(Imaging imOut, Imaging imIn, int box[4]) { (ss0 + amend) >> 2, (ss1 + amend) >> 2, (ss2 + amend) >> 2, - (ss3 + amend) >> 2); + (ss3 + amend) >> 2 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -623,7 +638,8 @@ ImagingReduce1x3(Imaging imOut, Imaging imIn, int box[4]) { ((ss0 + amend) * multiplier) >> 24, 0, 0, - ((ss3 + amend) * multiplier) >> 24); + ((ss3 + amend) * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else if (imIn->bands == 3) { @@ -637,7 +653,8 @@ ImagingReduce1x3(Imaging imOut, Imaging imIn, int box[4]) { ((ss0 + amend) * multiplier) >> 24, ((ss1 + amend) * multiplier) >> 24, ((ss2 + amend) * multiplier) >> 24, - 0); + 0 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else { // bands == 4 @@ -652,7 +669,8 @@ ImagingReduce1x3(Imaging imOut, Imaging imIn, int box[4]) { ((ss0 + amend) * multiplier) >> 24, ((ss1 + amend) * multiplier) >> 24, ((ss2 + amend) * multiplier) >> 24, - ((ss3 + amend) * multiplier) >> 24); + ((ss3 + amend) * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -694,7 +712,8 @@ ImagingReduce3x1(Imaging imOut, Imaging imIn, int box[4]) { ((ss0 + amend) * multiplier) >> 24, 0, 0, - ((ss3 + amend) * multiplier) >> 24); + ((ss3 + amend) * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else if (imIn->bands == 3) { @@ -708,7 +727,8 @@ ImagingReduce3x1(Imaging imOut, Imaging imIn, int box[4]) { ((ss0 + amend) * multiplier) >> 24, ((ss1 + amend) * multiplier) >> 24, ((ss2 + amend) * multiplier) >> 24, - 0); + 0 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else { // bands == 4 @@ -723,7 +743,8 @@ ImagingReduce3x1(Imaging imOut, Imaging imIn, int box[4]) { ((ss0 + amend) * multiplier) >> 24, ((ss1 + amend) * multiplier) >> 24, ((ss2 + amend) * multiplier) >> 24, - ((ss3 + amend) * multiplier) >> 24); + ((ss3 + amend) * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -775,7 +796,8 @@ ImagingReduce3x3(Imaging imOut, Imaging imIn, int box[4]) { ((ss0 + amend) * multiplier) >> 24, 0, 0, - ((ss3 + amend) * multiplier) >> 24); + ((ss3 + amend) * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else if (imIn->bands == 3) { @@ -795,7 +817,8 @@ ImagingReduce3x3(Imaging imOut, Imaging imIn, int box[4]) { ((ss0 + amend) * multiplier) >> 24, ((ss1 + amend) * multiplier) >> 24, ((ss2 + amend) * multiplier) >> 24, - 0); + 0 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else { // bands == 4 @@ -818,7 +841,8 @@ ImagingReduce3x3(Imaging imOut, Imaging imIn, int box[4]) { ((ss0 + amend) * multiplier) >> 24, ((ss1 + amend) * multiplier) >> 24, ((ss2 + amend) * multiplier) >> 24, - ((ss3 + amend) * multiplier) >> 24); + ((ss3 + amend) * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -900,7 +924,8 @@ ImagingReduce4x4(Imaging imOut, Imaging imIn, int box[4]) { line3[xx * 4 + 2] + line3[xx * 4 + 6] + line3[xx * 4 + 10] + line3[xx * 4 + 14]; v = MAKE_UINT32( - (ss0 + amend) >> 4, (ss1 + amend) >> 4, (ss2 + amend) >> 4, 0); + (ss0 + amend) >> 4, (ss1 + amend) >> 4, (ss2 + amend) >> 4, 0 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else { // bands == 4 @@ -935,7 +960,8 @@ ImagingReduce4x4(Imaging imOut, Imaging imIn, int box[4]) { (ss0 + amend) >> 4, (ss1 + amend) >> 4, (ss2 + amend) >> 4, - (ss3 + amend) >> 4); + (ss3 + amend) >> 4 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -1007,7 +1033,8 @@ ImagingReduce5x5(Imaging imOut, Imaging imIn, int box[4]) { ((ss0 + amend) * multiplier) >> 24, 0, 0, - ((ss3 + amend) * multiplier) >> 24); + ((ss3 + amend) * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else if (imIn->bands == 3) { @@ -1045,7 +1072,8 @@ ImagingReduce5x5(Imaging imOut, Imaging imIn, int box[4]) { ((ss0 + amend) * multiplier) >> 24, ((ss1 + amend) * multiplier) >> 24, ((ss2 + amend) * multiplier) >> 24, - 0); + 0 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } else { // bands == 4 @@ -1092,7 +1120,8 @@ ImagingReduce5x5(Imaging imOut, Imaging imIn, int box[4]) { ((ss0 + amend) * multiplier) >> 24, ((ss1 + amend) * multiplier) >> 24, ((ss2 + amend) * multiplier) >> 24, - ((ss3 + amend) * multiplier) >> 24); + ((ss3 + amend) * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -1181,7 +1210,8 @@ ImagingReduceCorners(Imaging imOut, Imaging imIn, int box[4], int xscale, int ys (ss0 * multiplier) >> 24, (ss1 * multiplier) >> 24, (ss2 * multiplier) >> 24, - (ss3 * multiplier) >> 24); + (ss3 * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -1207,7 +1237,8 @@ ImagingReduceCorners(Imaging imOut, Imaging imIn, int box[4], int xscale, int ys (ss0 * multiplier) >> 24, (ss1 * multiplier) >> 24, (ss2 * multiplier) >> 24, - (ss3 * multiplier) >> 24); + (ss3 * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -1232,7 +1263,8 @@ ImagingReduceCorners(Imaging imOut, Imaging imIn, int box[4], int xscale, int ys (ss0 * multiplier) >> 24, (ss1 * multiplier) >> 24, (ss2 * multiplier) >> 24, - (ss3 * multiplier) >> 24); + (ss3 * multiplier) >> 24 + ); memcpy(imOut->image[y] + x * sizeof(v), &v, sizeof(v)); } } @@ -1240,7 +1272,8 @@ ImagingReduceCorners(Imaging imOut, Imaging imIn, int box[4], int xscale, int ys void ImagingReduceNxN_32bpc( - Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale) { + Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale +) { /* The most general implementation for any xscale and yscale */ int x, y, xx, yy; @@ -1313,7 +1346,8 @@ ImagingReduceNxN_32bpc( void ImagingReduceCorners_32bpc( - Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale) { + Imaging imOut, Imaging imIn, int box[4], int xscale, int yscale +) { /* Fill the last row and the last column for any xscale and yscale. */ int x, y, xx, yy; @@ -1427,7 +1461,8 @@ ImagingReduce(Imaging imIn, int xscale, int yscale, int box[4]) { } imOut = ImagingNewDirty( - imIn->mode, (box[2] + xscale - 1) / xscale, (box[3] + yscale - 1) / yscale); + imIn->mode, (box[2] + xscale - 1) / xscale, (box[3] + yscale - 1) / yscale + ); if (!imOut) { return NULL; } diff --git a/src/libImaging/Resample.c b/src/libImaging/Resample.c index 59c27b3f4..222d6bca4 100644 --- a/src/libImaging/Resample.c +++ b/src/libImaging/Resample.c @@ -186,7 +186,8 @@ precompute_coeffs( int outSize, struct filter *filterp, int **boundsp, - double **kkp) { + double **kkp +) { double support, scale, filterscale; double center, ww, ss; int xx, x, ksize, xmin, xmax; @@ -284,7 +285,8 @@ normalize_coeffs_8bpc(int outSize, int ksize, double *prekk) { void ImagingResampleHorizontal_8bpc( - Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *prekk) { + Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *prekk +) { ImagingSectionCookie cookie; int ss0, ss1, ss2, ss3; int xx, yy, x, xmin, xmax; @@ -376,7 +378,8 @@ ImagingResampleHorizontal_8bpc( void ImagingResampleVertical_8bpc( - Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *prekk) { + Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *prekk +) { ImagingSectionCookie cookie; int ss0, ss1, ss2, ss3; int xx, yy, y, ymin, ymax; @@ -459,7 +462,8 @@ ImagingResampleVertical_8bpc( void ImagingResampleHorizontal_32bpc( - Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk) { + Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk +) { ImagingSectionCookie cookie; double ss; int xx, yy, x, xmin, xmax; @@ -502,7 +506,8 @@ ImagingResampleHorizontal_32bpc( void ImagingResampleVertical_32bpc( - Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk) { + Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk +) { ImagingSectionCookie cookie; double ss; int xx, yy, y, ymin, ymax; @@ -544,7 +549,8 @@ ImagingResampleVertical_32bpc( } typedef void (*ResampleFunction)( - Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk); + Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk +); Imaging ImagingResampleInner( @@ -554,7 +560,8 @@ ImagingResampleInner( struct filter *filterp, float box[4], ResampleFunction ResampleHorizontal, - ResampleFunction ResampleVertical); + ResampleFunction ResampleVertical +); Imaging ImagingResample(Imaging imIn, int xsize, int ysize, int filter, float box[4]) { @@ -609,7 +616,8 @@ ImagingResample(Imaging imIn, int xsize, int ysize, int filter, float box[4]) { } return ImagingResampleInner( - imIn, xsize, ysize, filterp, box, ResampleHorizontal, ResampleVertical); + imIn, xsize, ysize, filterp, box, ResampleHorizontal, ResampleVertical + ); } Imaging @@ -620,7 +628,8 @@ ImagingResampleInner( struct filter *filterp, float box[4], ResampleFunction ResampleHorizontal, - ResampleFunction ResampleVertical) { + ResampleFunction ResampleVertical +) { Imaging imTemp = NULL; Imaging imOut = NULL; @@ -634,13 +643,15 @@ ImagingResampleInner( need_vertical = ysize != imIn->ysize || box[1] || box[3] != ysize; ksize_horiz = precompute_coeffs( - imIn->xsize, box[0], box[2], xsize, filterp, &bounds_horiz, &kk_horiz); + imIn->xsize, box[0], box[2], xsize, filterp, &bounds_horiz, &kk_horiz + ); if (!ksize_horiz) { return NULL; } ksize_vert = precompute_coeffs( - imIn->ysize, box[1], box[3], ysize, filterp, &bounds_vert, &kk_vert); + imIn->ysize, box[1], box[3], ysize, filterp, &bounds_vert, &kk_vert + ); if (!ksize_vert) { free(bounds_horiz); free(kk_horiz); @@ -662,7 +673,8 @@ ImagingResampleInner( imTemp = ImagingNewDirty(imIn->mode, xsize, ybox_last - ybox_first); if (imTemp) { ResampleHorizontal( - imTemp, imIn, ybox_first, ksize_horiz, bounds_horiz, kk_horiz); + imTemp, imIn, ybox_first, ksize_horiz, bounds_horiz, kk_horiz + ); } free(bounds_horiz); free(kk_horiz); diff --git a/src/libImaging/SgiRleDecode.c b/src/libImaging/SgiRleDecode.c index 89dedb525..a8db11740 100644 --- a/src/libImaging/SgiRleDecode.c +++ b/src/libImaging/SgiRleDecode.c @@ -114,7 +114,8 @@ expandrow(UINT8 *dest, UINT8 *src, int n, int z, int xsize, UINT8 *end_of_buffer static int expandrow2( - UINT8 *dest, const UINT8 *src, int n, int z, int xsize, UINT8 *end_of_buffer) { + UINT8 *dest, const UINT8 *src, int n, int z, int xsize, UINT8 *end_of_buffer +) { UINT8 pixel, count; int x = 0; @@ -252,7 +253,8 @@ ImagingSgiRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t c->rlelength, im->bands, im->xsize, - &ptr[c->bufsize - 1]); + &ptr[c->bufsize - 1] + ); } else { status = expandrow2( &state->buffer[c->channo * 2], @@ -260,7 +262,8 @@ ImagingSgiRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t c->rlelength, im->bands, im->xsize, - &ptr[c->bufsize - 1]); + &ptr[c->bufsize - 1] + ); } if (status == -1) { state->errcode = IMAGING_CODEC_OVERRUN; diff --git a/src/libImaging/Storage.c b/src/libImaging/Storage.c index b27195a35..9dc133b0f 100644 --- a/src/libImaging/Storage.c +++ b/src/libImaging/Storage.c @@ -110,9 +110,8 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) { im->linesize = xsize * 4; im->type = IMAGING_TYPE_INT32; - } else if ( - strcmp(mode, "I;16") == 0 || strcmp(mode, "I;16L") == 0 || - strcmp(mode, "I;16B") == 0 || strcmp(mode, "I;16N") == 0) { + } else if (strcmp(mode, "I;16") == 0 || strcmp(mode, "I;16L") == 0 || + strcmp(mode, "I;16B") == 0 || strcmp(mode, "I;16N") == 0) { /* EXPERIMENTAL */ /* 16-bit raw integer images */ im->bands = 1; @@ -227,7 +226,8 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) { Imaging ImagingNewPrologue(const char *mode, int xsize, int ysize) { return ImagingNewPrologueSubtype( - mode, xsize, ysize, sizeof(struct ImagingMemoryInstance)); + mode, xsize, ysize, sizeof(struct ImagingMemoryInstance) + ); } void diff --git a/src/libImaging/SunRleDecode.c b/src/libImaging/SunRleDecode.c index 9d8e1292a..d3231ad90 100644 --- a/src/libImaging/SunRleDecode.c +++ b/src/libImaging/SunRleDecode.c @@ -107,7 +107,8 @@ ImagingSunRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, state->buffer, - state->xsize); + state->xsize + ); state->x = 0; diff --git a/src/libImaging/TgaRleDecode.c b/src/libImaging/TgaRleDecode.c index 95ae9b622..fbf29452c 100644 --- a/src/libImaging/TgaRleDecode.c +++ b/src/libImaging/TgaRleDecode.c @@ -93,7 +93,8 @@ ImagingTgaRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, state->buffer, - state->xsize); + state->xsize + ); state->x = 0; diff --git a/src/libImaging/TgaRleEncode.c b/src/libImaging/TgaRleEncode.c index aa7e7b96d..dde476614 100644 --- a/src/libImaging/TgaRleEncode.c +++ b/src/libImaging/TgaRleEncode.c @@ -63,7 +63,8 @@ ImagingTgaRleEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) state->buffer, (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, - state->xsize); + state->xsize + ); } row = state->buffer; @@ -146,7 +147,8 @@ ImagingTgaRleEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) } memcpy( - dst, state->buffer + (state->x * bytesPerPixel - state->count), flushCount); + dst, state->buffer + (state->x * bytesPerPixel - state->count), flushCount + ); dst += flushCount; bytes -= flushCount; diff --git a/src/libImaging/TiffDecode.c b/src/libImaging/TiffDecode.c index abffdeabc..18a54f633 100644 --- a/src/libImaging/TiffDecode.c +++ b/src/libImaging/TiffDecode.c @@ -44,7 +44,8 @@ dump_state(const TIFFSTATE *state) { (int)state->size, (uint)state->eof, state->data, - state->ifd)); + state->ifd) + ); } /* @@ -64,7 +65,8 @@ _tiffReadProc(thandle_t hdata, tdata_t buf, tsize_t size) { "_tiffReadProc", "Invalid Read at loc %" PRIu64 ", eof: %" PRIu64, state->loc, - state->eof); + state->eof + ); return 0; } to_read = min(size, min(state->size, (tsize_t)state->eof) - (tsize_t)state->loc); @@ -200,13 +202,15 @@ ImagingLibTiffInit(ImagingCodecState state, int fp, uint32_t offset) { state->state, state->x, state->y, - state->ystep)); + state->ystep) + ); TRACE( ("State: xsize %d, ysize %d, xoff %d, yoff %d \n", state->xsize, state->ysize, state->xoff, - state->yoff)); + state->yoff) + ); TRACE(("State: bits %d, bytes %d \n", state->bits, state->bytes)); TRACE(("State: context %p \n", state->context)); @@ -226,7 +230,8 @@ _pickUnpackers( ImagingCodecState state, TIFF *tiff, uint16_t planarconfig, - ImagingShuffler *unpackers) { + ImagingShuffler *unpackers +) { // if number of bands is 1, there is no difference with contig case if (planarconfig == PLANARCONFIG_SEPARATE && im->bands > 1) { uint16_t bits_per_sample = 8; @@ -356,7 +361,8 @@ _decodeAsRGBA(Imaging im, ImagingCodecState state, TIFF *tiff) { (UINT8 *)im->image[state->y + state->yoff + current_row] + state->xoff * im->pixelsize, state->buffer + current_row * row_byte_size, - state->xsize); + state->xsize + ); } } @@ -374,7 +380,8 @@ _decodeTile( ImagingCodecState state, TIFF *tiff, int planes, - ImagingShuffler *unpackers) { + ImagingShuffler *unpackers +) { INT32 x, y, tile_y, current_tile_length, current_tile_width; UINT32 tile_width, tile_length; tsize_t tile_bytes_size, row_byte_size; @@ -453,7 +460,8 @@ _decodeTile( ("Writing tile data at %dx%d using tile_width: %d; \n", tile_y + y, x, - current_tile_width)); + current_tile_width) + ); // UINT8 * bbb = state->buffer + tile_y * row_byte_size; // TRACE(("chars: %x%x%x%x\n", ((UINT8 *)bbb)[0], ((UINT8 *)bbb)[1], @@ -462,7 +470,8 @@ _decodeTile( shuffler( (UINT8 *)im->image[tile_y + y] + x * im->pixelsize, state->buffer + tile_y * row_byte_size, - current_tile_width); + current_tile_width + ); } } } @@ -477,7 +486,8 @@ _decodeStrip( ImagingCodecState state, TIFF *tiff, int planes, - ImagingShuffler *unpackers) { + ImagingShuffler *unpackers +) { INT32 strip_row = 0; UINT8 *new_data; UINT32 rows_per_strip; @@ -544,9 +554,10 @@ _decodeStrip( tiff, TIFFComputeStrip(tiff, state->y, plane), (tdata_t)state->buffer, - strip_size) == -1) { - TRACE( - ("Decode Error, strip %d\n", TIFFComputeStrip(tiff, state->y, 0))); + strip_size + ) == -1) { + TRACE(("Decode Error, strip %d\n", TIFFComputeStrip(tiff, state->y, 0)) + ); state->errcode = IMAGING_CODEC_BROKEN; return -1; } @@ -567,7 +578,8 @@ _decodeStrip( (UINT8 *)im->image[state->y + state->yoff + strip_row] + state->xoff * im->pixelsize, state->buffer + strip_row * row_byte_size, - state->xsize); + state->xsize + ); } } } @@ -577,7 +589,8 @@ _decodeStrip( int ImagingLibTiffDecode( - Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes) { + Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes +) { TIFFSTATE *clientstate = (TIFFSTATE *)state->context; char *filename = "tempfile.tif"; char *mode = "rC"; @@ -602,13 +615,15 @@ ImagingLibTiffDecode( state->state, state->x, state->y, - state->ystep)); + state->ystep) + ); TRACE( ("State: xsize %d, ysize %d, xoff %d, yoff %d \n", state->xsize, state->ysize, state->xoff, - state->yoff)); + state->yoff) + ); TRACE(("State: bits %d, bytes %d \n", state->bits, state->bytes)); TRACE( ("Buffer: %p: %c%c%c%c\n", @@ -616,26 +631,30 @@ ImagingLibTiffDecode( (char)buffer[0], (char)buffer[1], (char)buffer[2], - (char)buffer[3])); + (char)buffer[3]) + ); TRACE( ("State->Buffer: %c%c%c%c\n", (char)state->buffer[0], (char)state->buffer[1], (char)state->buffer[2], - (char)state->buffer[3])); + (char)state->buffer[3]) + ); TRACE( ("Image: mode %s, type %d, bands: %d, xsize %d, ysize %d \n", im->mode, im->type, im->bands, im->xsize, - im->ysize)); + im->ysize) + ); TRACE( ("Image: image8 %p, image32 %p, image %p, block %p \n", im->image8, im->image32, im->image, - im->block)); + im->block) + ); TRACE(("Image: pixelsize: %d, linesize %d \n", im->pixelsize, im->linesize)); dump_state(clientstate); @@ -665,7 +684,8 @@ ImagingLibTiffDecode( _tiffCloseProc, _tiffSizeProc, _tiffMapProc, - _tiffUnmapProc); + _tiffUnmapProc + ); } if (!tiff) { @@ -694,7 +714,8 @@ ImagingLibTiffDecode( state->xsize, img_width, state->ysize, - img_height)); + img_height) + ); state->errcode = IMAGING_CODEC_BROKEN; goto decode_err; } @@ -739,7 +760,8 @@ ImagingLibTiffDecode( INT32 y; TIFFGetFieldDefaulted( - tiff, TIFFTAG_EXTRASAMPLES, &extrasamples, &sampleinfo); + tiff, TIFFTAG_EXTRASAMPLES, &extrasamples, &sampleinfo + ); if (extrasamples >= 1 && (sampleinfo[0] == EXTRASAMPLE_UNSPECIFIED || sampleinfo[0] == EXTRASAMPLE_ASSOCALPHA)) { @@ -793,13 +815,15 @@ ImagingLibTiffEncodeInit(ImagingCodecState state, char *filename, int fp) { state->state, state->x, state->y, - state->ystep)); + state->ystep) + ); TRACE( ("State: xsize %d, ysize %d, xoff %d, yoff %d \n", state->xsize, state->ysize, state->xoff, - state->yoff)); + state->yoff) + ); TRACE(("State: bits %d, bytes %d \n", state->bits, state->bytes)); TRACE(("State: context %p \n", state->context)); @@ -839,7 +863,8 @@ ImagingLibTiffEncodeInit(ImagingCodecState state, char *filename, int fp) { _tiffCloseProc, _tiffSizeProc, _tiffNullMapProc, - _tiffUnmapProc); /*force no mmap*/ + _tiffUnmapProc + ); /*force no mmap*/ } if (!clientstate->tiff) { @@ -852,7 +877,8 @@ ImagingLibTiffEncodeInit(ImagingCodecState state, char *filename, int fp) { int ImagingLibTiffMergeFieldInfo( - ImagingCodecState state, TIFFDataType field_type, int key, int is_var_length) { + ImagingCodecState state, TIFFDataType field_type, int key, int is_var_length +) { // Refer to libtiff docs (http://www.simplesystems.org/libtiff/addingtags.html) TIFFSTATE *clientstate = (TIFFSTATE *)state->context; uint32_t n; @@ -874,7 +900,8 @@ ImagingLibTiffMergeFieldInfo( FIELD_CUSTOM, 1, passcount, - "CustomField"}}; + "CustomField"} + }; n = sizeof(info) / sizeof(info[0]); @@ -922,13 +949,15 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt state->state, state->x, state->y, - state->ystep)); + state->ystep) + ); TRACE( ("State: xsize %d, ysize %d, xoff %d, yoff %d \n", state->xsize, state->ysize, state->xoff, - state->yoff)); + state->yoff) + ); TRACE(("State: bits %d, bytes %d \n", state->bits, state->bytes)); TRACE( ("Buffer: %p: %c%c%c%c\n", @@ -936,26 +965,30 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt (char)buffer[0], (char)buffer[1], (char)buffer[2], - (char)buffer[3])); + (char)buffer[3]) + ); TRACE( ("State->Buffer: %c%c%c%c\n", (char)state->buffer[0], (char)state->buffer[1], (char)state->buffer[2], - (char)state->buffer[3])); + (char)state->buffer[3]) + ); TRACE( ("Image: mode %s, type %d, bands: %d, xsize %d, ysize %d \n", im->mode, im->type, im->bands, im->xsize, - im->ysize)); + im->ysize) + ); TRACE( ("Image: image8 %p, image32 %p, image %p, block %p \n", im->image8, im->image32, im->image, - im->block)); + im->block) + ); TRACE(("Image: pixelsize: %d, linesize %d \n", im->pixelsize, im->linesize)); dump_state(clientstate); @@ -967,10 +1000,12 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt state->buffer, (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, - state->xsize); + state->xsize + ); if (TIFFWriteScanline( - tiff, (tdata_t)(state->buffer), (uint32_t)state->y, 0) == -1) { + tiff, (tdata_t)(state->buffer), (uint32_t)state->y, 0 + ) == -1) { TRACE(("Encode Error, row %d\n", state->y)); state->errcode = IMAGING_CODEC_BROKEN; TIFFClose(tiff); @@ -1013,7 +1048,8 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt (char)buffer[0], (char)buffer[1], (char)buffer[2], - (char)buffer[3])); + (char)buffer[3]) + ); if (clientstate->loc == clientstate->eof) { TRACE(("Hit EOF, calling an end, freeing data")); state->errcode = IMAGING_CODEC_END; diff --git a/src/libImaging/TiffDecode.h b/src/libImaging/TiffDecode.h index 212b7dee6..22361210d 100644 --- a/src/libImaging/TiffDecode.h +++ b/src/libImaging/TiffDecode.h @@ -41,7 +41,8 @@ extern int ImagingLibTiffEncodeInit(ImagingCodecState state, char *filename, int fp); extern int ImagingLibTiffMergeFieldInfo( - ImagingCodecState state, TIFFDataType field_type, int key, int is_var_length); + ImagingCodecState state, TIFFDataType field_type, int key, int is_var_length +); extern int ImagingLibTiffSetField(ImagingCodecState state, ttag_t tag, ...); diff --git a/src/libImaging/Unpack.c b/src/libImaging/Unpack.c index eaa4374e3..c23d5d889 100644 --- a/src/libImaging/Unpack.c +++ b/src/libImaging/Unpack.c @@ -104,7 +104,8 @@ static UINT8 BITFLIP[] = { 3, 131, 67, 195, 35, 163, 99, 227, 19, 147, 83, 211, 51, 179, 115, 243, 11, 139, 75, 203, 43, 171, 107, 235, 27, 155, 91, 219, 59, 187, 123, 251, 7, 135, 71, 199, 39, 167, 103, 231, 23, 151, 87, 215, 55, 183, 119, 247, - 15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255}; + 15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255 +}; /* Unpack to "1" image */ @@ -882,7 +883,8 @@ unpackRGBa16L(UINT8 *_out, const UINT8 *in, int pixels) { CLIP8(in[1] * 255 / a), CLIP8(in[3] * 255 / a), CLIP8(in[5] * 255 / a), - a); + a + ); } memcpy(_out, &iv, sizeof(iv)); in += 8; @@ -906,7 +908,8 @@ unpackRGBa16B(UINT8 *_out, const UINT8 *in, int pixels) { CLIP8(in[0] * 255 / a), CLIP8(in[2] * 255 / a), CLIP8(in[4] * 255 / a), - a); + a + ); } memcpy(_out, &iv, sizeof(iv)); in += 8; @@ -930,7 +933,8 @@ unpackRGBa(UINT8 *_out, const UINT8 *in, int pixels) { CLIP8(in[0] * 255 / a), CLIP8(in[1] * 255 / a), CLIP8(in[2] * 255 / a), - a); + a + ); } memcpy(_out, &iv, sizeof(iv)); in += 4; @@ -954,7 +958,8 @@ unpackRGBaskip1(UINT8 *_out, const UINT8 *in, int pixels) { CLIP8(in[0] * 255 / a), CLIP8(in[1] * 255 / a), CLIP8(in[2] * 255 / a), - a); + a + ); } in += 5; } @@ -976,7 +981,8 @@ unpackRGBaskip2(UINT8 *_out, const UINT8 *in, int pixels) { CLIP8(in[0] * 255 / a), CLIP8(in[1] * 255 / a), CLIP8(in[2] * 255 / a), - a); + a + ); } in += 6; } @@ -998,7 +1004,8 @@ unpackBGRa(UINT8 *_out, const UINT8 *in, int pixels) { CLIP8(in[2] * 255 / a), CLIP8(in[1] * 255 / a), CLIP8(in[0] * 255 / a), - a); + a + ); } memcpy(_out, &iv, sizeof(iv)); in += 4; @@ -1029,7 +1036,8 @@ unpackRGBAL(UINT8 *_out, const UINT8 *in, int pixels) { in[i], in[i + pixels], in[i + pixels + pixels], - in[i + pixels + pixels + pixels]); + in[i + pixels + pixels + pixels] + ); memcpy(_out, &iv, sizeof(iv)); } } diff --git a/src/libImaging/UnpackYCC.c b/src/libImaging/UnpackYCC.c index 0b177bdd4..35b0c3b69 100644 --- a/src/libImaging/UnpackYCC.c +++ b/src/libImaging/UnpackYCC.c @@ -34,7 +34,8 @@ static INT16 L[] = { 261, 262, 264, 265, 266, 268, 269, 270, 272, 273, 274, 276, 277, 278, 280, 281, 283, 284, 285, 287, 288, 289, 291, 292, 293, 295, 296, 297, 299, 300, 302, 303, 304, 306, 307, 308, 310, 311, 312, 314, 315, 317, 318, 319, 321, 322, 323, 325, - 326, 327, 329, 330, 331, 333, 334, 336, 337, 338, 340, 341, 342, 344, 345, 346}; + 326, 327, 329, 330, 331, 333, 334, 336, 337, 338, 340, 341, 342, 344, 345, 346 +}; static INT16 CB[] = { -345, -343, -341, -338, -336, -334, -332, -329, -327, -325, -323, -321, -318, -316, @@ -55,7 +56,8 @@ static INT16 CB[] = { 120, 122, 124, 126, 129, 131, 133, 135, 138, 140, 142, 144, 146, 149, 151, 153, 155, 157, 160, 162, 164, 166, 169, 171, 173, 175, 177, 180, 182, 184, 186, 189, 191, 193, 195, 197, 200, 202, 204, 206, 208, 211, - 213, 215, 217, 220}; + 213, 215, 217, 220 +}; static INT16 GB[] = { 67, 67, 66, 66, 65, 65, 65, 64, 64, 63, 63, 62, 62, 62, 61, 61, @@ -73,7 +75,8 @@ static INT16 GB[] = { -14, -15, -15, -16, -16, -17, -17, -18, -18, -18, -19, -19, -20, -20, -21, -21, -21, -22, -22, -23, -23, -24, -24, -24, -25, -25, -26, -26, -27, -27, -27, -28, -28, -29, -29, -30, -30, -30, -31, -31, -32, -32, -33, -33, -33, -34, -34, -35, - -35, -36, -36, -36, -37, -37, -38, -38, -39, -39, -39, -40, -40, -41, -41, -42}; + -35, -36, -36, -36, -37, -37, -38, -38, -39, -39, -39, -40, -40, -41, -41, -42 +}; static INT16 CR[] = { -249, -247, -245, -243, -241, -239, -238, -236, -234, -232, -230, -229, -227, -225, @@ -94,7 +97,8 @@ static INT16 CR[] = { 133, 135, 137, 138, 140, 142, 144, 146, 148, 149, 151, 153, 155, 157, 158, 160, 162, 164, 166, 168, 169, 171, 173, 175, 177, 179, 180, 182, 184, 186, 188, 189, 191, 193, 195, 197, 199, 200, 202, 204, 206, 208, - 209, 211, 213, 215}; + 209, 211, 213, 215 +}; static INT16 GR[] = { 127, 126, 125, 124, 123, 122, 121, 121, 120, 119, 118, 117, 116, 115, 114, @@ -114,7 +118,8 @@ static INT16 GR[] = { -67, -68, -69, -69, -70, -71, -72, -73, -74, -75, -76, -77, -78, -79, -80, -81, -82, -82, -83, -84, -85, -86, -87, -88, -89, -90, -91, -92, -93, -94, -94, -95, -96, -97, -98, -99, -100, -101, -102, -103, -104, -105, -106, -107, -107, - -108}; + -108 +}; #define R 0 #define G 1 diff --git a/src/libImaging/UnsharpMask.c b/src/libImaging/UnsharpMask.c index 2853ce903..e714749ef 100644 --- a/src/libImaging/UnsharpMask.c +++ b/src/libImaging/UnsharpMask.c @@ -23,7 +23,8 @@ clip8(int in) { Imaging ImagingUnsharpMask( - Imaging imOut, Imaging imIn, float radius, int percent, int threshold) { + Imaging imOut, Imaging imIn, float radius, int percent, int threshold +) { ImagingSectionCookie cookie; Imaging result; diff --git a/src/libImaging/XbmEncode.c b/src/libImaging/XbmEncode.c index eec4c0d84..65cc3c633 100644 --- a/src/libImaging/XbmEncode.c +++ b/src/libImaging/XbmEncode.c @@ -40,7 +40,8 @@ ImagingXbmEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { state->shuffle( state->buffer, (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, - state->xsize); + state->xsize + ); if (state->y < state->ysize - 1) { /* any line but the last */ diff --git a/src/libImaging/ZipDecode.c b/src/libImaging/ZipDecode.c index 874967834..d964ff2ca 100644 --- a/src/libImaging/ZipDecode.c +++ b/src/libImaging/ZipDecode.c @@ -217,7 +217,8 @@ ImagingZipDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt state->shuffle( (UINT8 *)im->image[state->y] + col * im->pixelsize, state->buffer + context->prefix + i, - 1); + 1 + ); col += COL_INCREMENT[context->pass]; } } else { @@ -229,7 +230,8 @@ ImagingZipDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt UINT8 byte = *(state->buffer + context->prefix + (i / 8)); byte <<= (i % 8); state->shuffle( - (UINT8 *)im->image[state->y] + col * im->pixelsize, &byte, 1); + (UINT8 *)im->image[state->y] + col * im->pixelsize, &byte, 1 + ); col += COL_INCREMENT[context->pass]; } } @@ -253,7 +255,8 @@ ImagingZipDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, state->buffer + context->prefix, - state->xsize); + state->xsize + ); state->y++; } diff --git a/src/libImaging/ZipEncode.c b/src/libImaging/ZipEncode.c index edbce3682..44f2629cc 100644 --- a/src/libImaging/ZipEncode.c +++ b/src/libImaging/ZipEncode.c @@ -98,7 +98,8 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { 15, 9, /* compression strategy (image data are filtered)*/ - compress_type); + compress_type + ); if (err < 0) { state->errcode = IMAGING_CODEC_CONFIG; return -1; @@ -108,7 +109,8 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { err = deflateSetDictionary( &context->z_stream, (unsigned char *)context->dictionary, - context->dictionary_size); + context->dictionary_size + ); if (err < 0) { state->errcode = IMAGING_CODEC_CONFIG; return -1; @@ -163,7 +165,8 @@ ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) { state->buffer + 1, (UINT8 *)im->image[state->y + state->yoff] + state->xoff * im->pixelsize, - state->xsize); + state->xsize + ); state->y++; diff --git a/src/map.c b/src/map.c index c298bd148..c66702981 100644 --- a/src/map.c +++ b/src/map.c @@ -72,7 +72,8 @@ PyImaging_MapBuffer(PyObject *self, PyObject *args) { &offset, &mode, &stride, - &ystep)) { + &ystep + )) { return NULL; } diff --git a/src/path.c b/src/path.c index bd6ad2259..b96e8b78a 100644 --- a/src/path.c +++ b/src/path.c @@ -489,7 +489,8 @@ path_transform(PyPathObject *self, PyObject *args) { double wrap = 0.0; if (!PyArg_ParseTuple( - args, "(dddddd)|d:transform", &a, &b, &c, &d, &e, &f, &wrap)) { + args, "(dddddd)|d:transform", &a, &b, &c, &d, &e, &f, &wrap + )) { return NULL; } @@ -570,7 +571,8 @@ path_subscript(PyPathObject *self, PyObject *item) { PyErr_Format( PyExc_TypeError, "Path indices must be integers, not %.200s", - Py_TYPE(item)->tp_name); + Py_TYPE(item)->tp_name + ); return NULL; } } @@ -586,7 +588,8 @@ static PySequenceMethods path_as_sequence = { }; static PyMappingMethods path_as_mapping = { - (lenfunc)path_len, (binaryfunc)path_subscript, NULL}; + (lenfunc)path_len, (binaryfunc)path_subscript, NULL +}; static PyTypeObject PyPathType = { PyVarObject_HEAD_INIT(NULL, 0) "Path", /*tp_name*/ From ea7b5c5b667b0bc80a70f9ca4ee123e82450c123 Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Tue, 16 Jul 2024 10:13:26 +0200 Subject: [PATCH 160/662] Lock around usages of imaging memory arenas --- src/_imaging.c | 48 +++++++++++++++++++++++++++++++--------- src/libImaging/Imaging.h | 12 ++++++++++ src/libImaging/Storage.c | 20 ++++++++++++----- 3 files changed, 65 insertions(+), 15 deletions(-) diff --git a/src/_imaging.c b/src/_imaging.c index ac6310a44..66709d9bc 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -92,6 +92,7 @@ #define _USE_MATH_DEFINES #include +#include /* Configuration stuff. Feel free to undef things you don't need. */ #define WITH_IMAGECHOPS /* ImageChops support */ @@ -3934,7 +3935,6 @@ static PyObject * _get_stats(PyObject *self, PyObject *args) { PyObject *d; PyObject *v; - ImagingMemoryArena arena = &ImagingDefaultArena; if (!PyArg_ParseTuple(args, ":get_stats")) { return NULL; @@ -3944,6 +3944,10 @@ _get_stats(PyObject *self, PyObject *args) { if (!d) { return NULL; } + + MUTEX_LOCK(&ImagingDefaultArena.mutex); + ImagingMemoryArena arena = &ImagingDefaultArena; + v = PyLong_FromLong(arena->stats_new_count); PyDict_SetItemString(d, "new_count", v ? v : Py_None); Py_XDECREF(v); @@ -3967,22 +3971,25 @@ _get_stats(PyObject *self, PyObject *args) { v = PyLong_FromLong(arena->blocks_cached); PyDict_SetItemString(d, "blocks_cached", v ? v : Py_None); Py_XDECREF(v); + + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); return d; } static PyObject * _reset_stats(PyObject *self, PyObject *args) { - ImagingMemoryArena arena = &ImagingDefaultArena; - if (!PyArg_ParseTuple(args, ":reset_stats")) { return NULL; } + MUTEX_LOCK(&ImagingDefaultArena.mutex); + ImagingMemoryArena arena = &ImagingDefaultArena; arena->stats_new_count = 0; arena->stats_allocated_blocks = 0; arena->stats_reused_blocks = 0; arena->stats_reallocated_blocks = 0; arena->stats_freed_blocks = 0; + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); Py_INCREF(Py_None); return Py_None; @@ -3994,7 +4001,10 @@ _get_alignment(PyObject *self, PyObject *args) { return NULL; } - return PyLong_FromLong(ImagingDefaultArena.alignment); + MUTEX_LOCK(&ImagingDefaultArena.mutex); + int alignment = ImagingDefaultArena.alignment; + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); + return PyLong_FromLong(alignment); } static PyObject * @@ -4003,7 +4013,10 @@ _get_block_size(PyObject *self, PyObject *args) { return NULL; } - return PyLong_FromLong(ImagingDefaultArena.block_size); + MUTEX_LOCK(&ImagingDefaultArena.mutex); + int block_size = ImagingDefaultArena.block_size; + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); + return PyLong_FromLong(block_size); } static PyObject * @@ -4012,7 +4025,10 @@ _get_blocks_max(PyObject *self, PyObject *args) { return NULL; } - return PyLong_FromLong(ImagingDefaultArena.blocks_max); + MUTEX_LOCK(&ImagingDefaultArena.mutex); + int blocks_max = ImagingDefaultArena.blocks_max; + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); + return PyLong_FromLong(blocks_max); } static PyObject * @@ -4032,7 +4048,9 @@ _set_alignment(PyObject *self, PyObject *args) { return NULL; } + MUTEX_LOCK(&ImagingDefaultArena.mutex); ImagingDefaultArena.alignment = alignment; + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); Py_INCREF(Py_None); return Py_None; @@ -4055,7 +4073,9 @@ _set_block_size(PyObject *self, PyObject *args) { return NULL; } + MUTEX_LOCK(&ImagingDefaultArena.mutex); ImagingDefaultArena.block_size = block_size; + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); Py_INCREF(Py_None); return Py_None; @@ -4071,14 +4091,20 @@ _set_blocks_max(PyObject *self, PyObject *args) { if (blocks_max < 0) { PyErr_SetString(PyExc_ValueError, "blocks_max should be greater than 0"); return NULL; - } else if ( - (unsigned long)blocks_max > - SIZE_MAX / sizeof(ImagingDefaultArena.blocks_pool[0])) { + } + + MUTEX_LOCK(&ImagingDefaultArena.mutex); + size_t blocksize = sizeof(ImagingDefaultArena.blocks_pool[0]); + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); + if ((unsigned long)blocks_max > SIZE_MAX / blocksize) { PyErr_SetString(PyExc_ValueError, "blocks_max is too large"); return NULL; } - if (!ImagingMemorySetBlocksMax(&ImagingDefaultArena, blocks_max)) { + MUTEX_LOCK(&ImagingDefaultArena.mutex); + int status = ImagingMemorySetBlocksMax(&ImagingDefaultArena, blocks_max); + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); + if (!status) { return ImagingError_MemoryError(); } @@ -4094,7 +4120,9 @@ _clear_cache(PyObject *self, PyObject *args) { return NULL; } + MUTEX_LOCK(&ImagingDefaultArena.mutex); ImagingMemoryClearCache(&ImagingDefaultArena, i); + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); Py_INCREF(Py_None); return Py_None; diff --git a/src/libImaging/Imaging.h b/src/libImaging/Imaging.h index 1f2c03e93..283111216 100644 --- a/src/libImaging/Imaging.h +++ b/src/libImaging/Imaging.h @@ -161,6 +161,9 @@ typedef struct ImagingMemoryArena { int stats_reallocated_blocks; /* Number of blocks which were actually reallocated after retrieving */ int stats_freed_blocks; /* Number of freed blocks */ +#ifdef Py_GIL_DISABLED + PyMutex mutex; +#endif } *ImagingMemoryArena; /* Objects */ @@ -690,6 +693,15 @@ _imaging_tell_pyFd(PyObject *fd); #include "ImagingUtils.h" extern UINT8 *clip8_lookups; +/* Mutex lock/unlock helpers */ +#ifdef Py_GIL_DISABLED +#define MUTEX_LOCK(m) PyMutex_Lock(m) +#define MUTEX_UNLOCK(m) PyMutex_Unlock(m) +#else +#define MUTEX_LOCK(m) +#define MUTEX_UNLOCK(m) +#endif + #if defined(__cplusplus) } #endif diff --git a/src/libImaging/Storage.c b/src/libImaging/Storage.c index b27195a35..9331ed5d5 100644 --- a/src/libImaging/Storage.c +++ b/src/libImaging/Storage.c @@ -219,7 +219,9 @@ ImagingNewPrologueSubtype(const char *mode, int xsize, int ysize, int size) { break; } + MUTEX_LOCK(&ImagingDefaultArena.mutex); ImagingDefaultArena.stats_new_count += 1; + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); return im; } @@ -267,7 +269,8 @@ struct ImagingMemoryArena ImagingDefaultArena = { 0, 0, 0, - 0 // Stats + 0, // Stats + {0}, }; int @@ -365,7 +368,9 @@ ImagingDestroyArray(Imaging im) { if (im->blocks) { while (im->blocks[y].ptr) { + MUTEX_LOCK(&ImagingDefaultArena.mutex); memory_return_block(&ImagingDefaultArena, im->blocks[y]); + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); y += 1; } free(im->blocks); @@ -373,9 +378,8 @@ ImagingDestroyArray(Imaging im) { } Imaging -ImagingAllocateArray(Imaging im, int dirty, int block_size) { +ImagingAllocateArray(Imaging im, ImagingMemoryArena arena, int dirty, int block_size) { int y, line_in_block, current_block; - ImagingMemoryArena arena = &ImagingDefaultArena; ImagingMemoryBlock block = {NULL, 0}; int aligned_linesize, lines_per_block, blocks_count; char *aligned_ptr = NULL; @@ -498,14 +502,20 @@ ImagingNewInternal(const char *mode, int xsize, int ysize, int dirty) { return NULL; } - if (ImagingAllocateArray(im, dirty, ImagingDefaultArena.block_size)) { + MUTEX_LOCK(&ImagingDefaultArena.mutex); + Imaging tmp = ImagingAllocateArray(im, &ImagingDefaultArena, dirty, ImagingDefaultArena.block_size); + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); + if (tmp) { return im; } ImagingError_Clear(); // Try to allocate the image once more with smallest possible block size - if (ImagingAllocateArray(im, dirty, IMAGING_PAGE_SIZE)) { + MUTEX_LOCK(&ImagingDefaultArena.mutex); + tmp = ImagingAllocateArray(im, &ImagingDefaultArena, dirty, IMAGING_PAGE_SIZE); + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); + if (tmp) { return im; } From 9f110aa702b0faef7f1ecc218fce3984d89b389a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 14:47:12 +0000 Subject: [PATCH 161/662] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/libImaging/Storage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libImaging/Storage.c b/src/libImaging/Storage.c index 9331ed5d5..8b6d46da6 100644 --- a/src/libImaging/Storage.c +++ b/src/libImaging/Storage.c @@ -503,7 +503,8 @@ ImagingNewInternal(const char *mode, int xsize, int ysize, int dirty) { } MUTEX_LOCK(&ImagingDefaultArena.mutex); - Imaging tmp = ImagingAllocateArray(im, &ImagingDefaultArena, dirty, ImagingDefaultArena.block_size); + Imaging tmp = ImagingAllocateArray( + im, &ImagingDefaultArena, dirty, ImagingDefaultArena.block_size); MUTEX_UNLOCK(&ImagingDefaultArena.mutex); if (tmp) { return im; From 5999b9b0ccefe916c364490d7de86a71ea383b96 Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Tue, 16 Jul 2024 16:56:15 +0200 Subject: [PATCH 162/662] Initialize PyMutex only under the free-threaded build --- src/libImaging/Storage.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libImaging/Storage.c b/src/libImaging/Storage.c index 8b6d46da6..3a49113b6 100644 --- a/src/libImaging/Storage.c +++ b/src/libImaging/Storage.c @@ -270,7 +270,9 @@ struct ImagingMemoryArena ImagingDefaultArena = { 0, 0, 0, // Stats +#ifdef Py_GIL_DISABLED {0}, +#endif }; int From 06767fc3257fdd7932c2c04d7bc83cc26a0899a5 Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Tue, 16 Jul 2024 17:00:14 +0200 Subject: [PATCH 163/662] Address feedback; do not lock in a loop --- src/libImaging/Storage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libImaging/Storage.c b/src/libImaging/Storage.c index 3a49113b6..a680fe63c 100644 --- a/src/libImaging/Storage.c +++ b/src/libImaging/Storage.c @@ -369,12 +369,12 @@ ImagingDestroyArray(Imaging im) { int y = 0; if (im->blocks) { + MUTEX_LOCK(&ImagingDefaultArena.mutex); while (im->blocks[y].ptr) { - MUTEX_LOCK(&ImagingDefaultArena.mutex); memory_return_block(&ImagingDefaultArena, im->blocks[y]); - MUTEX_UNLOCK(&ImagingDefaultArena.mutex); y += 1; } + MUTEX_UNLOCK(&ImagingDefaultArena.mutex); free(im->blocks); } } From 98b173928ad434d53c0e9ced859fcf1f14cf8e8f Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Tue, 16 Jul 2024 21:31:29 +0200 Subject: [PATCH 164/662] Address more feedback; don't unlock around sizeof --- src/_imaging.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/_imaging.c b/src/_imaging.c index 66709d9bc..15520040f 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -4093,10 +4093,8 @@ _set_blocks_max(PyObject *self, PyObject *args) { return NULL; } - MUTEX_LOCK(&ImagingDefaultArena.mutex); - size_t blocksize = sizeof(ImagingDefaultArena.blocks_pool[0]); - MUTEX_UNLOCK(&ImagingDefaultArena.mutex); - if ((unsigned long)blocks_max > SIZE_MAX / blocksize) { + if ((unsigned long)blocks_max > SIZE_MAX / + sizeof(ImagingDefaultArena.blocks_pool[0])) { PyErr_SetString(PyExc_ValueError, "blocks_max is too large"); return NULL; } From e144707520f2db6256927028cbaee02f8337b73d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 19:31:59 +0000 Subject: [PATCH 165/662] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/_imaging.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/_imaging.c b/src/_imaging.c index 15520040f..f1071b1ce 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -4093,8 +4093,8 @@ _set_blocks_max(PyObject *self, PyObject *args) { return NULL; } - if ((unsigned long)blocks_max > SIZE_MAX / - sizeof(ImagingDefaultArena.blocks_pool[0])) { + if ((unsigned long)blocks_max > + SIZE_MAX / sizeof(ImagingDefaultArena.blocks_pool[0])) { PyErr_SetString(PyExc_ValueError, "blocks_max is too large"); return NULL; } From 31469407166026ec6d74d2df07196ef2d4e32ab4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 17 Jul 2024 08:26:05 +1000 Subject: [PATCH 166/662] Temporarily disable cifuzz --- .github/workflows/cifuzz.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index eb73fc6a7..033ff98ce 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -24,6 +24,8 @@ concurrency: jobs: Fuzzing: + # Disabled until google/oss-fuzz#11419 upgrades Python to 3.9+ + if: false runs-on: ubuntu-latest steps: - name: Build Fuzzers From a3f93b3f68804d7c459faee165edf021e54f850a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 17 Jul 2024 16:23:29 +1000 Subject: [PATCH 167/662] Changed ContainerIO to subclass IO --- Tests/test_file_container.py | 91 +++++++++++++++++++++++++++++++----- pyproject.toml | 1 - src/PIL/ContainerIO.py | 72 ++++++++++++++++++++++++---- src/PIL/TarIO.py | 10 ---- 4 files changed, 142 insertions(+), 32 deletions(-) diff --git a/Tests/test_file_container.py b/Tests/test_file_container.py index 7f76fb47a..237045acc 100644 --- a/Tests/test_file_container.py +++ b/Tests/test_file_container.py @@ -1,7 +1,5 @@ from __future__ import annotations -from typing import Literal - import pytest from PIL import ContainerIO, Image @@ -23,6 +21,13 @@ def test_isatty() -> None: assert container.isatty() is False +def test_seekable() -> None: + with hopper() as im: + container = ContainerIO.ContainerIO(im, 0, 0) + + assert container.seekable() is True + + @pytest.mark.parametrize( "mode, expected_position", ( @@ -31,7 +36,7 @@ def test_isatty() -> None: (2, 100), ), ) -def test_seek_mode(mode: Literal[0, 1, 2], expected_position: int) -> None: +def test_seek_mode(mode: int, expected_position: int) -> None: # Arrange with open(TEST_FILE, "rb") as fh: container = ContainerIO.ContainerIO(fh, 22, 100) @@ -44,6 +49,14 @@ def test_seek_mode(mode: Literal[0, 1, 2], expected_position: int) -> None: assert container.tell() == expected_position +@pytest.mark.parametrize("bytesmode", (True, False)) +def test_readable(bytesmode: bool) -> None: + with open(TEST_FILE, "rb" if bytesmode else "r") as fh: + container = ContainerIO.ContainerIO(fh, 0, 120) + + assert container.readable() is True + + @pytest.mark.parametrize("bytesmode", (True, False)) def test_read_n0(bytesmode: bool) -> None: # Arrange @@ -51,7 +64,7 @@ def test_read_n0(bytesmode: bool) -> None: container = ContainerIO.ContainerIO(fh, 22, 100) # Act - container.seek(81) + assert container.seek(81) == 81 data = container.read() # Assert @@ -67,7 +80,7 @@ def test_read_n(bytesmode: bool) -> None: container = ContainerIO.ContainerIO(fh, 22, 100) # Act - container.seek(81) + assert container.seek(81) == 81 data = container.read(3) # Assert @@ -83,7 +96,7 @@ def test_read_eof(bytesmode: bool) -> None: container = ContainerIO.ContainerIO(fh, 22, 100) # Act - container.seek(100) + assert container.seek(100) == 100 data = container.read() # Assert @@ -94,21 +107,65 @@ def test_read_eof(bytesmode: bool) -> None: @pytest.mark.parametrize("bytesmode", (True, False)) def test_readline(bytesmode: bool) -> None: - # Arrange with open(TEST_FILE, "rb" if bytesmode else "r") as fh: container = ContainerIO.ContainerIO(fh, 0, 120) - # Act data = container.readline() - - # Assert if bytesmode: data = data.decode() assert data == "This is line 1\n" + data = container.readline(4) + if bytesmode: + data = data.decode() + assert data == "This" + @pytest.mark.parametrize("bytesmode", (True, False)) def test_readlines(bytesmode: bool) -> None: + expected = [ + "This is line 1\n", + "This is line 2\n", + "This is line 3\n", + "This is line 4\n", + "This is line 5\n", + "This is line 6\n", + "This is line 7\n", + "This is line 8\n", + ] + with open(TEST_FILE, "rb" if bytesmode else "r") as fh: + container = ContainerIO.ContainerIO(fh, 0, 120) + + data = container.readlines() + if bytesmode: + data = [line.decode() for line in data] + assert data == expected + + assert container.seek(0) == 0 + + data = container.readlines(2) + if bytesmode: + data = [line.decode() for line in data] + assert data == expected[:2] + + +@pytest.mark.parametrize("bytesmode", (True, False)) +def test_write(bytesmode: bool) -> None: + with open(TEST_FILE, "rb" if bytesmode else "r") as fh: + container = ContainerIO.ContainerIO(fh, 0, 120) + + assert container.writable() is False + + with pytest.raises(NotImplementedError): + container.write(b"" if bytesmode else "") + with pytest.raises(NotImplementedError): + container.writelines([]) + with pytest.raises(NotImplementedError): + container.truncate() + + +@pytest.mark.parametrize("bytesmode", (True, False)) +def test_iter(bytesmode: bool) -> None: # Arrange expected = [ "This is line 1\n", @@ -124,9 +181,21 @@ def test_readlines(bytesmode: bool) -> None: container = ContainerIO.ContainerIO(fh, 0, 120) # Act - data = container.readlines() + data = [] + for line in container: + data.append(line) # Assert if bytesmode: data = [line.decode() for line in data] assert data == expected + + +@pytest.mark.parametrize("bytesmode", (True, False)) +def test_file(bytesmode: bool) -> None: + with open(TEST_FILE, "rb" if bytesmode else "r") as fh: + container = ContainerIO.ContainerIO(fh, 0, 120) + + assert isinstance(container.fileno(), int) + container.flush() + container.close() diff --git a/pyproject.toml b/pyproject.toml index cd7248669..b76f3c24d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -161,5 +161,4 @@ exclude = [ '^Tests/test_qt_image_qapplication.py$', '^Tests/test_font_pcf_charsets.py$', '^Tests/test_font_pcf.py$', - '^Tests/test_file_tar.py$', ] diff --git a/src/PIL/ContainerIO.py b/src/PIL/ContainerIO.py index 0035296a4..ec9e66c71 100644 --- a/src/PIL/ContainerIO.py +++ b/src/PIL/ContainerIO.py @@ -16,10 +16,11 @@ from __future__ import annotations import io -from typing import IO, AnyStr, Generic, Literal +from collections.abc import Iterable +from typing import IO, AnyStr, NoReturn -class ContainerIO(Generic[AnyStr]): +class ContainerIO(IO[AnyStr]): """ A file object that provides read access to a part of an existing file (for example a TAR file). @@ -45,7 +46,10 @@ class ContainerIO(Generic[AnyStr]): def isatty(self) -> bool: return False - def seek(self, offset: int, mode: Literal[0, 1, 2] = io.SEEK_SET) -> None: + def seekable(self) -> bool: + return True + + def seek(self, offset: int, mode: int = io.SEEK_SET) -> int: """ Move file pointer. @@ -53,6 +57,7 @@ class ContainerIO(Generic[AnyStr]): :param mode: Starting position. Use 0 for beginning of region, 1 for current offset, and 2 for end of region. You cannot move the pointer outside the defined region. + :returns: Offset from start of region, in bytes. """ if mode == 1: self.pos = self.pos + offset @@ -63,6 +68,7 @@ class ContainerIO(Generic[AnyStr]): # clamp self.pos = max(0, min(self.pos, self.length)) self.fh.seek(self.offset + self.pos) + return self.pos def tell(self) -> int: """ @@ -72,27 +78,32 @@ class ContainerIO(Generic[AnyStr]): """ return self.pos - def read(self, n: int = 0) -> AnyStr: + def readable(self) -> bool: + return True + + def read(self, n: int = -1) -> AnyStr: """ Read data. - :param n: Number of bytes to read. If omitted or zero, + :param n: Number of bytes to read. If omitted, zero or negative, read until end of region. :returns: An 8-bit string. """ - if n: + if n > 0: n = min(n, self.length - self.pos) else: n = self.length - self.pos - if not n: # EOF + if n <= 0: # EOF return b"" if "b" in self.fh.mode else "" # type: ignore[return-value] self.pos = self.pos + n return self.fh.read(n) - def readline(self) -> AnyStr: + def readline(self, n: int = -1) -> AnyStr: """ Read a line of text. + :param n: Number of bytes to read. If omitted, zero or negative, + read until end of line. :returns: An 8-bit string. """ s: AnyStr = b"" if "b" in self.fh.mode else "" # type: ignore[assignment] @@ -102,14 +113,16 @@ class ContainerIO(Generic[AnyStr]): if not c: break s = s + c - if c == newline_character: + if c == newline_character or len(s) == n: break return s - def readlines(self) -> list[AnyStr]: + def readlines(self, n: int | None = -1) -> list[AnyStr]: """ Read multiple lines of text. + :param n: Number of lines to read. If omitted, zero, negative or None, + read until end of region. :returns: A list of 8-bit strings. """ lines = [] @@ -118,4 +131,43 @@ class ContainerIO(Generic[AnyStr]): if not s: break lines.append(s) + if len(lines) == n: + break return lines + + def writable(self) -> bool: + return False + + def write(self, b: AnyStr) -> NoReturn: + raise NotImplementedError() + + def writelines(self, lines: Iterable[AnyStr]) -> NoReturn: + raise NotImplementedError() + + def truncate(self, size: int | None = None) -> int: + raise NotImplementedError() + + def __enter__(self) -> ContainerIO[AnyStr]: + return self + + def __exit__(self, *args: object) -> None: + self.close() + + def __iter__(self) -> ContainerIO[AnyStr]: + return self + + def __next__(self) -> AnyStr: + line = self.readline() + if not line: + msg = "end of region" + raise StopIteration(msg) + return line + + def fileno(self) -> int: + return self.fh.fileno() + + def flush(self) -> None: + self.fh.flush() + + def close(self) -> None: + self.fh.close() diff --git a/src/PIL/TarIO.py b/src/PIL/TarIO.py index cba26d4b0..779288b1c 100644 --- a/src/PIL/TarIO.py +++ b/src/PIL/TarIO.py @@ -55,13 +55,3 @@ class TarIO(ContainerIO.ContainerIO[bytes]): # Open region super().__init__(self.fh, self.fh.tell(), size) - - # Context manager support - def __enter__(self) -> TarIO: - return self - - def __exit__(self, *args: object) -> None: - self.close() - - def close(self) -> None: - self.fh.close() From 10faa5df390c160570110b48bd4cd03fa4390dc6 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 17 Jul 2024 22:08:53 +1000 Subject: [PATCH 168/662] Deprecate lambda_eval and unsafe_eval options argument --- Tests/test_imagemath_lambda_eval.py | 65 ++++++++++++++++------------ Tests/test_imagemath_unsafe_eval.py | 67 ++++++++++++++++------------- docs/deprecations.rst | 9 ++++ docs/reference/ImageMath.rst | 16 +++---- docs/releasenotes/11.0.0.rst | 8 ++-- src/PIL/ImageMath.py | 24 ++++++++--- 6 files changed, 115 insertions(+), 74 deletions(-) diff --git a/Tests/test_imagemath_lambda_eval.py b/Tests/test_imagemath_lambda_eval.py index 5769c903e..360325780 100644 --- a/Tests/test_imagemath_lambda_eval.py +++ b/Tests/test_imagemath_lambda_eval.py @@ -1,5 +1,9 @@ from __future__ import annotations +from typing import Any + +import pytest + from PIL import Image, ImageMath @@ -19,7 +23,7 @@ I = Image.new("I", (1, 1), 4) # noqa: E741 A2 = A.resize((2, 2)) B2 = B.resize((2, 2)) -images = {"A": A, "B": B, "F": F, "I": I} +images: dict[str, Any] = {"A": A, "B": B, "F": F, "I": I} def test_sanity() -> None: @@ -30,13 +34,13 @@ def test_sanity() -> None: == "I 3" ) assert ( - pixel(ImageMath.lambda_eval(lambda args: args["A"] + args["B"], images)) + pixel(ImageMath.lambda_eval(lambda args: args["A"] + args["B"], **images)) == "I 3" ) assert ( pixel( ImageMath.lambda_eval( - lambda args: args["float"](args["A"]) + args["B"], images + lambda args: args["float"](args["A"]) + args["B"], **images ) ) == "F 3.0" @@ -44,42 +48,47 @@ def test_sanity() -> None: assert ( pixel( ImageMath.lambda_eval( - lambda args: args["int"](args["float"](args["A"]) + args["B"]), images + lambda args: args["int"](args["float"](args["A"]) + args["B"]), **images ) ) == "I 3" ) +def test_options_deprecated() -> None: + with pytest.warns(DeprecationWarning): + assert ImageMath.lambda_eval(lambda args: 1, images) == 1 + + def test_ops() -> None: - assert pixel(ImageMath.lambda_eval(lambda args: args["A"] * -1, images)) == "I -1" + assert pixel(ImageMath.lambda_eval(lambda args: args["A"] * -1, **images)) == "I -1" assert ( - pixel(ImageMath.lambda_eval(lambda args: args["A"] + args["B"], images)) + pixel(ImageMath.lambda_eval(lambda args: args["A"] + args["B"], **images)) == "I 3" ) assert ( - pixel(ImageMath.lambda_eval(lambda args: args["A"] - args["B"], images)) + pixel(ImageMath.lambda_eval(lambda args: args["A"] - args["B"], **images)) == "I -1" ) assert ( - pixel(ImageMath.lambda_eval(lambda args: args["A"] * args["B"], images)) + pixel(ImageMath.lambda_eval(lambda args: args["A"] * args["B"], **images)) == "I 2" ) assert ( - pixel(ImageMath.lambda_eval(lambda args: args["A"] / args["B"], images)) + pixel(ImageMath.lambda_eval(lambda args: args["A"] / args["B"], **images)) == "I 0" ) - assert pixel(ImageMath.lambda_eval(lambda args: args["B"] ** 2, images)) == "I 4" + assert pixel(ImageMath.lambda_eval(lambda args: args["B"] ** 2, **images)) == "I 4" assert ( - pixel(ImageMath.lambda_eval(lambda args: args["B"] ** 33, images)) + pixel(ImageMath.lambda_eval(lambda args: args["B"] ** 33, **images)) == "I 2147483647" ) assert ( pixel( ImageMath.lambda_eval( - lambda args: args["float"](args["A"]) + args["B"], images + lambda args: args["float"](args["A"]) + args["B"], **images ) ) == "F 3.0" @@ -87,7 +96,7 @@ def test_ops() -> None: assert ( pixel( ImageMath.lambda_eval( - lambda args: args["float"](args["A"]) - args["B"], images + lambda args: args["float"](args["A"]) - args["B"], **images ) ) == "F -1.0" @@ -95,7 +104,7 @@ def test_ops() -> None: assert ( pixel( ImageMath.lambda_eval( - lambda args: args["float"](args["A"]) * args["B"], images + lambda args: args["float"](args["A"]) * args["B"], **images ) ) == "F 2.0" @@ -103,31 +112,33 @@ def test_ops() -> None: assert ( pixel( ImageMath.lambda_eval( - lambda args: args["float"](args["A"]) / args["B"], images + lambda args: args["float"](args["A"]) / args["B"], **images ) ) == "F 0.5" ) assert ( - pixel(ImageMath.lambda_eval(lambda args: args["float"](args["B"]) ** 2, images)) + pixel( + ImageMath.lambda_eval(lambda args: args["float"](args["B"]) ** 2, **images) + ) == "F 4.0" ) assert ( pixel( - ImageMath.lambda_eval(lambda args: args["float"](args["B"]) ** 33, images) + ImageMath.lambda_eval(lambda args: args["float"](args["B"]) ** 33, **images) ) == "F 8589934592.0" ) def test_logical() -> None: - assert pixel(ImageMath.lambda_eval(lambda args: not args["A"], images)) == 0 + assert pixel(ImageMath.lambda_eval(lambda args: not args["A"], **images)) == 0 assert ( - pixel(ImageMath.lambda_eval(lambda args: args["A"] and args["B"], images)) + pixel(ImageMath.lambda_eval(lambda args: args["A"] and args["B"], **images)) == "L 2" ) assert ( - pixel(ImageMath.lambda_eval(lambda args: args["A"] or args["B"], images)) + pixel(ImageMath.lambda_eval(lambda args: args["A"] or args["B"], **images)) == "L 1" ) @@ -136,7 +147,7 @@ def test_convert() -> None: assert ( pixel( ImageMath.lambda_eval( - lambda args: args["convert"](args["A"] + args["B"], "L"), images + lambda args: args["convert"](args["A"] + args["B"], "L"), **images ) ) == "L 3" @@ -144,7 +155,7 @@ def test_convert() -> None: assert ( pixel( ImageMath.lambda_eval( - lambda args: args["convert"](args["A"] + args["B"], "1"), images + lambda args: args["convert"](args["A"] + args["B"], "1"), **images ) ) == "1 0" @@ -152,7 +163,7 @@ def test_convert() -> None: assert ( pixel( ImageMath.lambda_eval( - lambda args: args["convert"](args["A"] + args["B"], "RGB"), images + lambda args: args["convert"](args["A"] + args["B"], "RGB"), **images ) ) == "RGB (3, 3, 3)" @@ -163,7 +174,7 @@ def test_compare() -> None: assert ( pixel( ImageMath.lambda_eval( - lambda args: args["min"](args["A"], args["B"]), images + lambda args: args["min"](args["A"], args["B"]), **images ) ) == "I 1" @@ -171,13 +182,13 @@ def test_compare() -> None: assert ( pixel( ImageMath.lambda_eval( - lambda args: args["max"](args["A"], args["B"]), images + lambda args: args["max"](args["A"], args["B"]), **images ) ) == "I 2" ) - assert pixel(ImageMath.lambda_eval(lambda args: args["A"] == 1, images)) == "I 1" - assert pixel(ImageMath.lambda_eval(lambda args: args["A"] == 2, images)) == "I 0" + assert pixel(ImageMath.lambda_eval(lambda args: args["A"] == 1, **images)) == "I 1" + assert pixel(ImageMath.lambda_eval(lambda args: args["A"] == 2, **images)) == "I 0" def test_one_image_larger() -> None: diff --git a/Tests/test_imagemath_unsafe_eval.py b/Tests/test_imagemath_unsafe_eval.py index 7b8a562d7..b7ac84691 100644 --- a/Tests/test_imagemath_unsafe_eval.py +++ b/Tests/test_imagemath_unsafe_eval.py @@ -1,5 +1,7 @@ from __future__ import annotations +from typing import Any + import pytest from PIL import Image, ImageMath @@ -21,16 +23,16 @@ I = Image.new("I", (1, 1), 4) # noqa: E741 A2 = A.resize((2, 2)) B2 = B.resize((2, 2)) -images = {"A": A, "B": B, "F": F, "I": I} +images: dict[str, Any] = {"A": A, "B": B, "F": F, "I": I} def test_sanity() -> None: assert ImageMath.unsafe_eval("1") == 1 assert ImageMath.unsafe_eval("1+A", A=2) == 3 assert pixel(ImageMath.unsafe_eval("A+B", A=A, B=B)) == "I 3" - assert pixel(ImageMath.unsafe_eval("A+B", images)) == "I 3" - assert pixel(ImageMath.unsafe_eval("float(A)+B", images)) == "F 3.0" - assert pixel(ImageMath.unsafe_eval("int(float(A)+B)", images)) == "I 3" + assert pixel(ImageMath.unsafe_eval("A+B", **images)) == "I 3" + assert pixel(ImageMath.unsafe_eval("float(A)+B", **images)) == "F 3.0" + assert pixel(ImageMath.unsafe_eval("int(float(A)+B)", **images)) == "I 3" def test_eval_deprecated() -> None: @@ -38,23 +40,28 @@ def test_eval_deprecated() -> None: assert ImageMath.eval("1") == 1 +def test_options_deprecated() -> None: + with pytest.warns(DeprecationWarning): + assert ImageMath.unsafe_eval("1", images) == 1 + + def test_ops() -> None: - assert pixel(ImageMath.unsafe_eval("-A", images)) == "I -1" - assert pixel(ImageMath.unsafe_eval("+B", images)) == "L 2" + assert pixel(ImageMath.unsafe_eval("-A", **images)) == "I -1" + assert pixel(ImageMath.unsafe_eval("+B", **images)) == "L 2" - assert pixel(ImageMath.unsafe_eval("A+B", images)) == "I 3" - assert pixel(ImageMath.unsafe_eval("A-B", images)) == "I -1" - assert pixel(ImageMath.unsafe_eval("A*B", images)) == "I 2" - assert pixel(ImageMath.unsafe_eval("A/B", images)) == "I 0" - assert pixel(ImageMath.unsafe_eval("B**2", images)) == "I 4" - assert pixel(ImageMath.unsafe_eval("B**33", images)) == "I 2147483647" + assert pixel(ImageMath.unsafe_eval("A+B", **images)) == "I 3" + assert pixel(ImageMath.unsafe_eval("A-B", **images)) == "I -1" + assert pixel(ImageMath.unsafe_eval("A*B", **images)) == "I 2" + assert pixel(ImageMath.unsafe_eval("A/B", **images)) == "I 0" + assert pixel(ImageMath.unsafe_eval("B**2", **images)) == "I 4" + assert pixel(ImageMath.unsafe_eval("B**33", **images)) == "I 2147483647" - assert pixel(ImageMath.unsafe_eval("float(A)+B", images)) == "F 3.0" - assert pixel(ImageMath.unsafe_eval("float(A)-B", images)) == "F -1.0" - assert pixel(ImageMath.unsafe_eval("float(A)*B", images)) == "F 2.0" - assert pixel(ImageMath.unsafe_eval("float(A)/B", images)) == "F 0.5" - assert pixel(ImageMath.unsafe_eval("float(B)**2", images)) == "F 4.0" - assert pixel(ImageMath.unsafe_eval("float(B)**33", images)) == "F 8589934592.0" + assert pixel(ImageMath.unsafe_eval("float(A)+B", **images)) == "F 3.0" + assert pixel(ImageMath.unsafe_eval("float(A)-B", **images)) == "F -1.0" + assert pixel(ImageMath.unsafe_eval("float(A)*B", **images)) == "F 2.0" + assert pixel(ImageMath.unsafe_eval("float(A)/B", **images)) == "F 0.5" + assert pixel(ImageMath.unsafe_eval("float(B)**2", **images)) == "F 4.0" + assert pixel(ImageMath.unsafe_eval("float(B)**33", **images)) == "F 8589934592.0" @pytest.mark.parametrize( @@ -72,33 +79,33 @@ def test_prevent_exec(expression: str) -> None: def test_prevent_double_underscores() -> None: with pytest.raises(ValueError): - ImageMath.unsafe_eval("1", {"__": None}) + ImageMath.unsafe_eval("1", __=None) def test_prevent_builtins() -> None: with pytest.raises(ValueError): - ImageMath.unsafe_eval("(lambda: exec('exit()'))()", {"exec": None}) + ImageMath.unsafe_eval("(lambda: exec('exit()'))()", exec=None) def test_logical() -> None: - assert pixel(ImageMath.unsafe_eval("not A", images)) == 0 - assert pixel(ImageMath.unsafe_eval("A and B", images)) == "L 2" - assert pixel(ImageMath.unsafe_eval("A or B", images)) == "L 1" + assert pixel(ImageMath.unsafe_eval("not A", **images)) == 0 + assert pixel(ImageMath.unsafe_eval("A and B", **images)) == "L 2" + assert pixel(ImageMath.unsafe_eval("A or B", **images)) == "L 1" def test_convert() -> None: - assert pixel(ImageMath.unsafe_eval("convert(A+B, 'L')", images)) == "L 3" - assert pixel(ImageMath.unsafe_eval("convert(A+B, '1')", images)) == "1 0" + assert pixel(ImageMath.unsafe_eval("convert(A+B, 'L')", **images)) == "L 3" + assert pixel(ImageMath.unsafe_eval("convert(A+B, '1')", **images)) == "1 0" assert ( - pixel(ImageMath.unsafe_eval("convert(A+B, 'RGB')", images)) == "RGB (3, 3, 3)" + pixel(ImageMath.unsafe_eval("convert(A+B, 'RGB')", **images)) == "RGB (3, 3, 3)" ) def test_compare() -> None: - assert pixel(ImageMath.unsafe_eval("min(A, B)", images)) == "I 1" - assert pixel(ImageMath.unsafe_eval("max(A, B)", images)) == "I 2" - assert pixel(ImageMath.unsafe_eval("A == 1", images)) == "I 1" - assert pixel(ImageMath.unsafe_eval("A == 2", images)) == "I 0" + assert pixel(ImageMath.unsafe_eval("min(A, B)", **images)) == "I 1" + assert pixel(ImageMath.unsafe_eval("max(A, B)", **images)) == "I 2" + assert pixel(ImageMath.unsafe_eval("A == 1", **images)) == "I 1" + assert pixel(ImageMath.unsafe_eval("A == 2", **images)) == "I 0" def test_one_image_larger() -> None: diff --git a/docs/deprecations.rst b/docs/deprecations.rst index 792fd1c70..2f5800e07 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -109,6 +109,15 @@ ImageDraw.getdraw hints parameter The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecated. +ImageMath.lambda_eval and ImageMath.unsafe_eval options parameter +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 11.0.0 + +The ``options`` parameter in :py:meth:`~PIL.ImageMath.lambda_eval()` and +:py:meth:`~PIL.ImageMath.unsafe_eval()` has been deprecated. One or more keyword +arguments can be used instead. + Removed features ---------------- diff --git a/docs/reference/ImageMath.rst b/docs/reference/ImageMath.rst index 2535db711..a72ca92d0 100644 --- a/docs/reference/ImageMath.rst +++ b/docs/reference/ImageMath.rst @@ -37,10 +37,10 @@ Example: Using the :py:mod:`~PIL.ImageMath` module :param expression: A function that receives a dictionary. :param options: Values to add to the function's dictionary, mapping image - names to Image instances. You can use one or more keyword - arguments instead of a dictionary, as shown in the above - example. Note that the names must be valid Python - identifiers. + names to Image instances. Deprecated. + You can instead use one or more keyword arguments, as + shown in the above example. Note that the names must be + valid Python identifiers. :return: An image, an integer value, a floating point value, or a pixel tuple, depending on the expression. @@ -62,10 +62,10 @@ Example: Using the :py:mod:`~PIL.ImageMath` module syntax. In addition to the standard operators, you can also use the functions described below. :param options: Values to add to the function's dictionary, mapping image - names to Image instances. You can use one or more keyword - arguments instead of a dictionary, as shown in the above - example. Note that the names must be valid Python - identifiers. + names to Image instances. Deprecated. + You can instead use one or more keyword arguments, as + shown in the above example. Note that the names must be + valid Python identifiers. :return: An image, an integer value, a floating point value, or a pixel tuple, depending on the expression. diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index 964423ae0..bb6179de8 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -43,10 +43,12 @@ similarly removed. Deprecations ============ -TODO -^^^^ +ImageMath.lambda_eval and ImageMath.unsafe_eval options parameter +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -TODO +The ``options`` parameter in :py:meth:`~PIL.ImageMath.lambda_eval()` and +:py:meth:`~PIL.ImageMath.unsafe_eval()` has been deprecated. One or more +keyword arguments can be used instead. API Changes =========== diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py index 6664434ea..e79eb3ec9 100644 --- a/src/PIL/ImageMath.py +++ b/src/PIL/ImageMath.py @@ -249,14 +249,20 @@ def lambda_eval( :py:func:`~PIL.Image.merge` function. :param expression: A function that receives a dictionary. - :param options: Values to add to the function's dictionary. You - can either use a dictionary, or one or more keyword - arguments. + :param options: Values to add to the function's dictionary. Deprecated. + You can instead use one or more keyword arguments. :return: The expression result. This is usually an image object, but can also be an integer, a floating point value, or a pixel tuple, depending on the expression. """ + if options: + deprecate( + "ImageMath.lambda_eval options", + 12, + "ImageMath.lambda_eval keyword arguments", + ) + args: dict[str, Any] = ops.copy() args.update(options) args.update(kw) @@ -287,14 +293,20 @@ def unsafe_eval( :py:func:`~PIL.Image.merge` function. :param expression: A string containing a Python-style expression. - :param options: Values to add to the evaluation context. You - can either use a dictionary, or one or more keyword - arguments. + :param options: Values to add to the evaluation context. Deprecated. + You can instead use one or more keyword arguments. :return: The evaluated expression. This is usually an image object, but can also be an integer, a floating point value, or a pixel tuple, depending on the expression. """ + if options: + deprecate( + "ImageMath.unsafe_eval options", + 12, + "ImageMath.unsafe_eval keyword arguments", + ) + # build execution namespace args: dict[str, Any] = ops.copy() for k in list(options.keys()) + list(kw.keys()): From 47fc36a323892040b1945afd22d036a15fb99abd Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 17 Jul 2024 22:28:56 +1000 Subject: [PATCH 169/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 856458aa9..a2e02fe62 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,15 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Changed ContainerIO to subclass IO #8240 + [radarhere] + +- Move away from APIs that use borrowed references under the free-threaded build #8216 + [hugovk, lysnikolaou] + +- Allow size argument to resize() to be a NumPy array #8201 + [radarhere] + - Drop support for Python 3.8 #8183 [hugovk, radarhere] From f39ca5db5a39c2c82e62fbee1ebf95d5b61bdfba Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Wed, 17 Jul 2024 16:21:16 +0200 Subject: [PATCH 170/662] Skip QEMU-emulated wheels on workflow dispatch event --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index fa1825e45..10e37f343 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -41,7 +41,7 @@ env: jobs: build-1-QEMU-emulated-wheels: - if: github.event_name != 'schedule' + if: github.event_name != 'schedule' && github.event_name != 'workflow_dispatch' name: aarch64 ${{ matrix.python-version }} ${{ matrix.spec }} runs-on: ubuntu-latest strategy: From 09c817a2ec7c0dc4988235aa50b8073192b3e9e2 Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Wed, 17 Jul 2024 23:05:48 +0200 Subject: [PATCH 171/662] Move uploading nightly wheels to different job This is needed cause the job does not support running on OS's other than Ubuntu. --- .github/workflows/wheels.yml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 10e37f343..087d2bd56 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -149,13 +149,6 @@ jobs: name: dist-${{ matrix.os }}-${{ matrix.cibw_arch }}${{ matrix.manylinux && format('-{0}', matrix.manylinux) }} path: ./wheelhouse/*.whl - - name: Upload wheels to scientific-python-nightly-wheels - if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' - uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0 - with: - artifacts_path: ./wheelhouse - anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} - windows: name: Windows ${{ matrix.cibw_arch }} runs-on: windows-latest @@ -242,13 +235,6 @@ jobs: name: fribidi-windows-${{ matrix.cibw_arch }} path: winbuild\build\bin\fribidi* - - name: Upload wheels to scientific-python-nightly-wheels - if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' - uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0 - with: - artifacts_path: ./wheelhouse - anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} - sdist: if: github.event_name != 'schedule' runs-on: ubuntu-latest @@ -269,6 +255,23 @@ jobs: name: dist-sdist path: dist/*.tar.gz + scientific-python-nightly-wheels-publish: + if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' + needs: [build-2-native-wheels, windows] + runs-on: ubuntu-latest + name: Upload release to PyPI + steps: + - uses: actions/download-artifact@v4 + with: + pattern: dist-* + path: dist + merge-multiple: true + - name: Upload wheels to scientific-python-nightly-wheels + uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0 + with: + artifacts_path: dist + anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} + pypi-publish: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') needs: [build-1-QEMU-emulated-wheels, build-2-native-wheels, windows, sdist] From 7248cde50b985aba3198b70201fed462a15997d0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 18 Jul 2024 11:00:27 +1000 Subject: [PATCH 172/662] Documented keyword arguments --- docs/reference/ImageMath.rst | 22 ++++++++++++---------- src/PIL/ImageMath.py | 2 ++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/docs/reference/ImageMath.rst b/docs/reference/ImageMath.rst index a72ca92d0..f4e1081e6 100644 --- a/docs/reference/ImageMath.rst +++ b/docs/reference/ImageMath.rst @@ -31,20 +31,21 @@ Example: Using the :py:mod:`~PIL.ImageMath` module b=im2 ) -.. py:function:: lambda_eval(expression, options) +.. py:function:: lambda_eval(expression, options, **kw) Returns the result of an image function. :param expression: A function that receives a dictionary. - :param options: Values to add to the function's dictionary, mapping image - names to Image instances. Deprecated. + :param options: Values to add to the function's dictionary. Note that the names + must be valid Python identifiers. Deprecated. You can instead use one or more keyword arguments, as - shown in the above example. Note that the names must be - valid Python identifiers. + shown in the above example. + :param \**kw: Values to add to the function's dictionary, mapping image names to + Image instances. :return: An image, an integer value, a floating point value, or a pixel tuple, depending on the expression. -.. py:function:: unsafe_eval(expression, options) +.. py:function:: unsafe_eval(expression, options, **kw) Evaluates an image expression. @@ -61,11 +62,12 @@ Example: Using the :py:mod:`~PIL.ImageMath` module :param expression: A string which uses the standard Python expression syntax. In addition to the standard operators, you can also use the functions described below. - :param options: Values to add to the function's dictionary, mapping image - names to Image instances. Deprecated. + :param options: Values to add to the evaluation context. Note that the names must + be valid Python identifiers. Deprecated. You can instead use one or more keyword arguments, as - shown in the above example. Note that the names must be - valid Python identifiers. + shown in the above example. + :param \**kw: Values to add to the evaluation context, mapping image names to Image + instances. :return: An image, an integer value, a floating point value, or a pixel tuple, depending on the expression. diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py index e79eb3ec9..191cc2a5f 100644 --- a/src/PIL/ImageMath.py +++ b/src/PIL/ImageMath.py @@ -251,6 +251,7 @@ def lambda_eval( :param expression: A function that receives a dictionary. :param options: Values to add to the function's dictionary. Deprecated. You can instead use one or more keyword arguments. + :param **kw: Values to add to the function's dictionary. :return: The expression result. This is usually an image object, but can also be an integer, a floating point value, or a pixel tuple, depending on the expression. @@ -295,6 +296,7 @@ def unsafe_eval( :param expression: A string containing a Python-style expression. :param options: Values to add to the evaluation context. Deprecated. You can instead use one or more keyword arguments. + :param **kw: Values to add to the evaluation context. :return: The evaluated expression. This is usually an image object, but can also be an integer, a floating point value, or a pixel tuple, depending on the expression. From a6e93939566619aa1eb10fd5531aa59bb6e39bdc Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Thu, 18 Jul 2024 10:35:09 +0200 Subject: [PATCH 173/662] Update .github/workflows/wheels.yml Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 087d2bd56..ffd1abd95 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -259,7 +259,7 @@ jobs: if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' needs: [build-2-native-wheels, windows] runs-on: ubuntu-latest - name: Upload release to PyPI + name: Upload wheels to scientific-python-nightly-wheels steps: - uses: actions/download-artifact@v4 with: From 73dfe67736565805f4c769cdfc92447f2b098187 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 18 Jul 2024 22:46:02 +1000 Subject: [PATCH 174/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index a2e02fe62..bd8d3af03 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Deprecate ImageMath lambda_eval and unsafe_eval options argument #8242 + [radarhere] + - Changed ContainerIO to subclass IO #8240 [radarhere] From 18d8020cab65a4aaca528f7848adfa06a9de5b85 Mon Sep 17 00:00:00 2001 From: "Jeffrey A. Clark (Alex)" Date: Thu, 18 Jul 2024 15:17:32 -0400 Subject: [PATCH 175/662] Add tutorial images --- docs/handbook/contrasted_hopper.jpg | Bin 0 -> 5572 bytes docs/handbook/cropped_hopper.jpg | Bin 0 -> 2017 bytes docs/handbook/enhanced_hopper.jpg | Bin 0 -> 5721 bytes docs/handbook/flip_left_right_hopper.jpg | Bin 0 -> 4637 bytes docs/handbook/flip_top_bottom_hopper.jpg | Bin 0 -> 4652 bytes docs/handbook/masked_hopper.jpg | Bin 0 -> 4904 bytes docs/handbook/merged_hopper.png | Bin 0 -> 35390 bytes docs/handbook/pasted_hopper.jpg | Bin 0 -> 4645 bytes docs/handbook/rebanded_hopper.jpg | Bin 0 -> 4743 bytes docs/handbook/rolled_hopper.jpg | Bin 0 -> 4651 bytes docs/handbook/rotated_hopper.jpg | Bin 0 -> 4895 bytes docs/handbook/rotated_hopper_180.jpg | Bin 0 -> 4636 bytes docs/handbook/rotated_hopper_270.jpg | Bin 0 -> 4895 bytes docs/handbook/rotated_hopper_90.jpg | Bin 0 -> 4903 bytes docs/handbook/show_hopper.png | Bin 0 -> 56122 bytes docs/handbook/thumbnail_hopper.jpg | Bin 0 -> 1984 bytes docs/handbook/transformed_hopper.jpg | Bin 0 -> 3608 bytes docs/handbook/tutorial.rst | 67 +++++++++++++++++++++++ 18 files changed, 67 insertions(+) create mode 100644 docs/handbook/contrasted_hopper.jpg create mode 100644 docs/handbook/cropped_hopper.jpg create mode 100644 docs/handbook/enhanced_hopper.jpg create mode 100644 docs/handbook/flip_left_right_hopper.jpg create mode 100644 docs/handbook/flip_top_bottom_hopper.jpg create mode 100644 docs/handbook/masked_hopper.jpg create mode 100644 docs/handbook/merged_hopper.png create mode 100644 docs/handbook/pasted_hopper.jpg create mode 100644 docs/handbook/rebanded_hopper.jpg create mode 100644 docs/handbook/rolled_hopper.jpg create mode 100644 docs/handbook/rotated_hopper.jpg create mode 100644 docs/handbook/rotated_hopper_180.jpg create mode 100644 docs/handbook/rotated_hopper_270.jpg create mode 100644 docs/handbook/rotated_hopper_90.jpg create mode 100644 docs/handbook/show_hopper.png create mode 100644 docs/handbook/thumbnail_hopper.jpg create mode 100644 docs/handbook/transformed_hopper.jpg diff --git a/docs/handbook/contrasted_hopper.jpg b/docs/handbook/contrasted_hopper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b2d7cfacbb6b62fbcbbbc14aba4e955027bd201d GIT binary patch literal 5572 zcmbW(cTm$$n*i`{XrTlU1f+x_Rl0N#X(C;kv`7&JL0ae?=>kd<2%ypt15zW1^xiu{ zLKlG~^dbQ%BIW$O@6FxJ{dITG&h9_^%+B+fo!MuvX0MikYr2{`ng9p{0HD7ExLN?z z0dg`jFc~R17!0PMAg6>dP(!GwAT0FPX&KmAIXT!_p-?VfF##@a5gsV?mYkr-Z3$^< zX-)wJC3(raVp7tQ{~Q9MprC+IL71tjnI&&RZ%Y23V zb>pXCZZ8JO$kak|o_p1uj1MRFd8O>UqbMkuZZNa3^6?AY5)_h_k(HBIxTAhwLsLsz zN7uyE%-jO@$kP6qgX422XBQt|KmUNhpy242F|l#4UdN{)(lavOzI&hbq39#Bxa3o5 zS@k+1o5&oh5OZLBmMg6~I{{{PR*E|3r2K~J}Vmd$t*tfr|$TxY2c+b{= zZJoXXR%9x|DW!MSEp}U`1NkHmq11~DuSTyEIfDVr8;%6%-gZ*ug6BhgK0lkqNrUhEcw5z&D9N7U0e7a zaS)Fu<2u9f$lQ3` zQ5vB%5#gZnifam!<3Pdt(=!Q^`URJ(d2rZkS#d*-UZ1fQQ%X6|+wvKQYJ zx3lt)MS;^4zS-{!TB63Ld7X41;odp+Z9084uHt>_91=6&3uSGeBi@EU;{)b;5S*Jt z3k*S}=J?(GgDd#i^FozST!h^X(Vs4w#MkI)IDH_E&Yft(>Rtg9Y;U>#_(a?4!(9Bs z=Td$=*7qP9q^A>3DM*AoOH*Am{aK1ET)K^mM z;_vg>uy+1IVUb(pVO7|kft>GACzo0C?scQdeE3n$H+oMh6v-csxP2KU;Y1SVltlaX z*e}hPRcM{qE`Y?o5O=g|V;k2daO(32{S+-TYipQ2oGfRBACZ($?WP?diK1a6YyLb} zi%rWby8@K%js-U`55vl(#$-YHmd>DN3p1P{O@E<_L~F^Yy)SY_@k=csW87dSYxX-9_WR-egwtTO zMbyFApxdrU*2X9_RaxH9z8Vee$- zP^ro>xxb%vEfQyI@>|as&VzGbZVBT%2jn zGn5pfa3ym%ed~arldvb8+c1x^E&9dI0KTK)?`pLg!b2kyF$zW>a}xdgb!P}m=gD$Q z+J{F6Gb)u1o0hUgm5Y^ixz2n&B{ekQMkO%ru>(u}y&EBXzuBe|jwkh+6-C8y0tvNq zJ;le0nc|JTJx^XMTLapifL~XNRL(koO^Z5i_zJjglb!HKRK_|7L0VRL7rz=e;vK59 zO?66T?k~!FIwJ_s$M~a~t zP5_*mxa|?ub~9Vqwfh=J%M{#j1^mhlKJNsPQ`6MF*&PND&M=2hS4F3~XJ>Se&lB}f z9NQ=6{&hsh+O>Z)`G3qpUv(-hG_1a($w74V21`R6qZBBY@5J^6KYM;QlQ2qBhnAM= zBMiksl5eY>Fz#ll{PYc>(C%~%oLxsPlC{MNXEYX})%*I&=c*sr90U~&b#7)guR;Kg zn~A=C!gCJ}hgMX%peCt7yIF6C)+6Jc68Fx~s#=7Ej(LHXwat|e`^EzDO`EznUS!L3 zI07^~YJGvkT%g36n^osxQ@#l%W%o_~Kw%nz?(3cfH;n(Z_=z@i0e9$f96trV#fmjn z4f}q$bU?4dFqR5S%(Dzc40z&(Wc~r^=#~dn`#<%LQwy=75X2##>ZH z0-WL_n%KEa~G9j%t*q5sf$#XxZ9pHT{B8FmSkOrOe(^Q$1~;c9CwyAhdu8 z6sXgr(NtB5F(-(QoaAx0Ha0fJZ{iW$PGLAPvc;m$#Ki2?@smjNGF{n?uY6jI555y< z^3F+;JXtg+&hI#0P>=~Nb=5+ep5S0ahMSo*Z&amlS3FS4jYpRJl6HhyCiCHQpEf`z7)I&doX zHP%KK?{d<#t(iRQ#2em53oqeHr0X1WZTlwOoUJq2SxjD|iPnZ=>2~k{v7lOTm zcM}zr@^D3fAIn3tvLEfY%zPeotM}0?R$tFp4>-~D8tDAhZ|9YBm}L00AE za9~|JaKcXeIP9yCmsiWljwKRV2(P~aq}~!RXNIqKIo3LT0w_pQqqLQmQ?z(e!ZZA` z{Iac_Gd(|ZAzNJ3z@LmH%&&Jb)n%o%WGj>-JlS-w)vQzWZPMb?j{NV3i`CkYyF35&ZaAx8Fq zFACXs7^8BFCR)0jQ#tSG`E!nRlJkqrVnt4c>Yl)p5*i~P8_uK`3be6bR|*&O`9=u1 zk<_&>$lw2+o%@JU?VK$kOcw@8H1kB;R2r2u>v;eSbN_j*(2Y!b9FJ zYY3#xc2;Fuwmrw6*WZQCXdfCr0rO&HGf|6j zf|x=+ql21n(~!v`z8`JofNTYy-_ocW-q)I#D0RdhH($0LS{Sq^XjFTgW`q`WAv5uA z#2#*GYS3WHuLZ8t^)*VELrY}OvPxz$MUvM+={h1Yzf@*?YeHYS2yVAbt@K5tjJ zTO6d^5&sCgpIplG@x( zh?i-CY^0rBMCAA<`Rbi#CTmTZFjgJ=*8*M&-1Pu z&XhSnOy+7f^Zjlg`Q38dF2^S}t=D<#*}LjS)|1*P(x}RhD{b>%YV)->q%8zS;vEy^j6UvD zo4IHBPj^|RRG3ygKdqi_^J_rETT}N;UT*7X3hll@+xfp6ev<-mY)ju)uFFEj?AiwW zTsDCgT@>88iTtQT+Sbc#xf8~@HR@byZ6(FY9mw|PIQ@F+sbfq0R1O{=df$81 zkb37wjpg|jFw|e{x~zi~(I0yMoBbX9=k8;8_zM2pSH;lh1`X-`(B&4%^G-E+KC922 zdn&AZch&ul;kwKp5iZOmFa0~z^ZVmhxuEz>=W0QvJ(*3JX+|2}uYOX|kg0M-FMRH`w>>w)NY72nqDKrP z8|(dW_3Jj$oBHhmw(nLSX)4bC$_^3LXW$#H{G1eM?5=8CIL;L+#8!Uj?8@sI;~kmp z^2ScJenE}8sf z9o0ZoX&g2o7;s;=e(!r;xk-q&4*b_~(&q=`Yl`-n0{PvDGqc6K{0z@Ln$s9~>8F}0 zeDeI^hk<@K?<+tNF~9BGSwG^f=9i7`>0+`4pVGMLy;$qBr-w; z8A^@g1Y7+G40{Am6Lvs9S)xqjE{o6;FBk)3g*$xZk?0p*#cIB>g772eOfz@cRIY(a zPH5oLLxN^~p!u;MT5cz5%KFu@;BOu4WdsI+KnbyPV zgr$p%>Irc2 zp}^j%qW<_d%E`ZtA6t%(Ux_j@3msh~Bj?`4#iD@DboQg>F z=?+^p zGR+?XzdZWpDT3l01oKlUJB=>~hiXzkHHl-~G(jXZ`QOb%OyqTbI5$V{F=&-rwN|v^ zU)@OjlZpww9rks0cKb}TycV`4i&nsELdp97lz@Msa-_E7ZB7+fpvSv5`+cL%d_H+F zn38!Mx+L<#g(t$08O5>R-ovhC*i>JG;s2wbAa5R|BYsVQg*s1lJ324Nt~GLy8KoKH zG-dHdJsByWzZLYeFPDbR#$d_1erVXUS73)K@*wqRw3+%Bp6{sn`^2#!Y26zP z>%Zd(tiN4E8~De4uBGLs7;7+=Mi^@_fPRI?UEX$X<2aQoHk6{ueM~BAH1EFpUU^&2 zGg9|(y933BY2!WZHp_Y>c30z5K}G`ea&D1YUZ-hfq&4Q6o{ywD#Dh1vlkOTlEH8rc z47D=em3u>LA6Yu%YbD%j?lvrC-Bt5$aHGiID>6CvP(Ko@0tw^)amr?PuxDwN#I*9o z$0H|Q;L?&mSnk0wPxKf${#?K6`)PL1+q2P$i{0knHAu*sqK8L zcs6>nEqcGWSSFtuwzxNv2TQij$=&W0*wPGpX)zw^I(2#Nht#}_xkzBrq#5T=BHGI+ zVHD`$R8X)KQ3B=-PJL?(2RRzIq(B$aC&(bp<$9 zk+n1lebe5n`e~fExvUba%sitErM5SHeYx=WS6ol3Wxmkh%iipBRBnC+keo|}kf%R> z+y#3^zGp9g7W**Va(_G2)}&TLFI01n(Xgp{WC;9?*wX(}fuMmptMuLvZ~4=n=V}8% z+a&k*Es-yE&)aX^(Z{?^RY%0E87{gO7?o@veW>cb^dHEY@^78~|6!PSw#{_`A*SUjZ>koYx*$ z&QCkm#9$V!g`#dI)=~M)uzN~bweLqfAzIsk(9=wOdoEA{ul#M6c^d8D>_J_ZRBR1f zaHH^{UxXS+-oX*hw~oep^_<~*xCG5K6$#@fUVeycYyp7m^4`Uo58^QEl^kCXe?FX6 zSDac+0I7Gm!izM-a9mH+PU(&%kK(PJNB77L0OFO%IaW9nHaUF~5?=`wm}>p#5=Ll`9a{=*3eLF*26yS@3-_Ebt$#co0Zt&a p2cw>hm~(|3tJ9zQBA!(?${&kBXV~W3(JEJS{{c5V#?t@* literal 0 HcmV?d00001 diff --git a/docs/handbook/cropped_hopper.jpg b/docs/handbook/cropped_hopper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..912d0a29cb0d154e7b7062123863630e8a1ef3a8 GIT binary patch literal 2017 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 literal 0 HcmV?d00001 diff --git a/docs/handbook/flip_left_right_hopper.jpg b/docs/handbook/flip_left_right_hopper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e1ef519e5cd8a34c65d681071b46318e3dd7f6a4 GIT binary patch literal 4637 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 literal 0 HcmV?d00001 diff --git a/docs/handbook/flip_top_bottom_hopper.jpg b/docs/handbook/flip_top_bottom_hopper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..03a5020f3904067cb13d2ea918dd382dc4e29cc5 GIT binary patch literal 4652 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 D@-E{; literal 0 HcmV?d00001 diff --git a/docs/handbook/masked_hopper.jpg b/docs/handbook/masked_hopper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f70a5ec4769e9c861fcfd4e1e90f812cd4369782 GIT binary patch literal 4904 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 literal 0 HcmV?d00001 diff --git a/docs/handbook/merged_hopper.png b/docs/handbook/merged_hopper.png new file mode 100644 index 0000000000000000000000000000000000000000..662816cbdad42a04dd522acbbd195c2d789fb87b GIT binary patch literal 35390 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 literal 0 HcmV?d00001 diff --git a/docs/handbook/rolled_hopper.jpg b/docs/handbook/rolled_hopper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b2220f39cbe11fa43e25b698a0dae49a4fadc39f GIT binary patch literal 4651 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 AApigX literal 0 HcmV?d00001 diff --git a/docs/handbook/rotated_hopper.jpg b/docs/handbook/rotated_hopper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e4d22be70ce2bc4887a41799e1343fa0cc513cd9 GIT binary patch literal 4895 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 literal 0 HcmV?d00001 diff --git a/docs/handbook/show_hopper.png b/docs/handbook/show_hopper.png new file mode 100644 index 0000000000000000000000000000000000000000..1f2e6f243858d8a9944c4db0b1c0758111cc45ce GIT binary patch literal 56122 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 literal 0 HcmV?d00001 diff --git a/docs/handbook/transformed_hopper.jpg b/docs/handbook/transformed_hopper.jpg new file mode 100644 index 0000000000000000000000000000000000000000..33afe67e62be8f3e2922c5cfa5c0018774ac0b5c GIT binary patch literal 3608 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 im.show() +.. image:: show_hopper.png + :align: center + .. note:: The standard version of :py:meth:`~PIL.Image.Image.show` is not very @@ -79,6 +82,9 @@ Convert files to JPEG except OSError: print("cannot convert", infile) +.. image:: ../../Tests/images/hopper.jpg + :align: center + A second argument can be supplied to the :py:meth:`~PIL.Image.Image.save` method which explicitly specifies a file format. If you use a non-standard extension, you must always specify the format this way: @@ -103,6 +109,9 @@ Create JPEG thumbnails except OSError: print("cannot create thumbnail for", infile) +.. image:: thumbnail_hopper.jpg + :align: center + It is important to note that the library doesn’t decode or load the raster data unless it really has to. When you open a file, the file header is read to determine the file format and extract things like mode, size, and other @@ -150,6 +159,9 @@ pixels, so the region in the above example is exactly 300x300 pixels. The region could now be processed in a certain manner and pasted back. +.. image:: cropped_hopper.jpg + :align: center + Processing a subrectangle, and pasting it back ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -164,6 +176,9 @@ modes of the original image and the region do not need to match. If they don’t the region is automatically converted before being pasted (see the section on :ref:`color-transforms` below for details). +.. image:: pasted_hopper.jpg + :align: center + Here’s an additional example: Rolling an image @@ -186,6 +201,9 @@ Rolling an image return im +.. image:: rolled_hopper.jpg + :align: center + Or if you would like to merge two images into a wider image: Merging images @@ -203,6 +221,9 @@ Merging images return im +.. image:: merged_hopper.png + :align: center + For more advanced tricks, the paste method can also take a transparency mask as an optional argument. In this mask, the value 255 indicates that the pasted image is opaque in that position (that is, the pasted image should be used as @@ -229,6 +250,9 @@ Note that for a single-band image, :py:meth:`~PIL.Image.Image.split` returns the image itself. To work with individual color bands, you may want to convert the image to “RGB” first. +.. image:: rebanded_hopper.jpg + :align: center + Geometrical transforms ---------------------- @@ -245,6 +269,9 @@ Simple geometry transforms out = im.resize((128, 128)) out = im.rotate(45) # degrees counter-clockwise +.. image:: rotated_hopper_90.jpg + :align: center + To rotate the image in 90 degree steps, you can either use the :py:meth:`~PIL.Image.Image.rotate` method or the :py:meth:`~PIL.Image.Image.transpose` method. The latter can also be used to @@ -256,11 +283,38 @@ Transposing an image :: out = im.transpose(Image.Transpose.FLIP_LEFT_RIGHT) + +.. image:: flip_left_right_hopper.jpg + :align: center + +:: + out = im.transpose(Image.Transpose.FLIP_TOP_BOTTOM) + +.. image:: flip_top_bottom_hopper.jpg + :align: center + +:: + out = im.transpose(Image.Transpose.ROTATE_90) + +.. image:: rotated_hopper_90.jpg + :align: center + +:: + out = im.transpose(Image.Transpose.ROTATE_180) + +.. image:: rotated_hopper_180.jpg + :align: center + +:: + out = im.transpose(Image.Transpose.ROTATE_270) +.. image:: rotated_hopper_270.jpg + :align: center + ``transpose(ROTATE)`` operations can also be performed identically with :py:meth:`~PIL.Image.Image.rotate` operations, provided the ``expand`` flag is true, to provide for the same changes to the image's size. @@ -342,6 +396,9 @@ Applying filters from PIL import ImageFilter out = im.filter(ImageFilter.DETAIL) +.. image:: enhanced_hopper.jpg + :align: center + Point Operations ^^^^^^^^^^^^^^^^ @@ -358,6 +415,9 @@ Applying point transforms # multiply each pixel by 1.2 out = im.point(lambda i: i * 1.2) +.. image:: transformed_hopper.jpg + :align: center + Using the above technique, you can quickly apply any simple expression to an image. You can also combine the :py:meth:`~PIL.Image.Image.point` and :py:meth:`~PIL.Image.Image.paste` methods to selectively modify an image: @@ -388,6 +448,9 @@ Note the syntax used to create the mask:: imout = im.point(lambda i: expression and 255) +.. image:: masked_hopper.jpg + :align: center + Python only evaluates the portion of a logical expression as is necessary to determine the outcome, and returns the last value examined as the result of the expression. So if the expression above is false (0), Python does not look at @@ -412,6 +475,10 @@ Enhancing images enh = ImageEnhance.Contrast(im) enh.enhance(1.3).show("30% more contrast") + +.. image:: contrasted_hopper.jpg + :align: center + Image sequences --------------- From 96a1af9fa859ad36ab9041923dd6dcd420a86f16 Mon Sep 17 00:00:00 2001 From: "Jeffrey A. Clark (Alex)" Date: Thu, 18 Jul 2024 18:33:14 -0400 Subject: [PATCH 176/662] Add tutorial images Animated gif example --- docs/handbook/animated_hopper.gif | Bin 0 -> 58616 bytes docs/handbook/tutorial.rst | 37 ++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 docs/handbook/animated_hopper.gif diff --git a/docs/handbook/animated_hopper.gif b/docs/handbook/animated_hopper.gif new file mode 100644 index 0000000000000000000000000000000000000000..e6eeaffcc4e519810e323704e68d81953fad7e12 GIT binary patch literal 58616 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ƒ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 Date: Fri, 19 Jul 2024 14:32:59 +1000 Subject: [PATCH 177/662] Correct reference --- docs/handbook/tutorial.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/handbook/tutorial.rst b/docs/handbook/tutorial.rst index 2840377e3..6c4e3ad59 100644 --- a/docs/handbook/tutorial.rst +++ b/docs/handbook/tutorial.rst @@ -546,8 +546,8 @@ You can create animated GIFs with Pillow, e.g. The following class lets you use the for-statement to loop over the sequence: -Using the :py:meth:`ImageSequence.Iterator` class -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Using the :py:class:`~PIL.ImageSequence.Iterator` class +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ :: From 1daaef02cd2a6faeb0dfbc0a23360fdfb49a8621 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 19 Jul 2024 18:27:00 +1000 Subject: [PATCH 178/662] Updated code to match image --- docs/handbook/tutorial.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/handbook/tutorial.rst b/docs/handbook/tutorial.rst index 6c4e3ad59..e19da47a5 100644 --- a/docs/handbook/tutorial.rst +++ b/docs/handbook/tutorial.rst @@ -149,13 +149,13 @@ Copying a subrectangle from an image :: - box = (100, 100, 400, 400) + box = (0, 0, 64, 64) region = im.crop(box) The region is defined by a 4-tuple, where coordinates are (left, upper, right, lower). The Python Imaging Library uses a coordinate system with (0, 0) in the upper left corner. Also note that coordinates refer to positions between the -pixels, so the region in the above example is exactly 300x300 pixels. +pixels, so the region in the above example is exactly 64x64 pixels. The region could now be processed in a certain manner and pasted back. From 54055c76c4fe3ffe6293f5ed1ab8ded2c0f7d669 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 19 Jul 2024 18:45:00 +1000 Subject: [PATCH 179/662] Converted images to WebP --- docs/handbook/cropped_hopper.jpg | Bin 2017 -> 0 bytes docs/handbook/cropped_hopper.webp | Bin 0 -> 1656 bytes docs/handbook/enhanced_hopper.jpg | Bin 5721 -> 0 bytes docs/handbook/enhanced_hopper.webp | Bin 0 -> 4684 bytes docs/handbook/flip_left_right_hopper.jpg | Bin 4637 -> 0 bytes docs/handbook/flip_left_right_hopper.webp | Bin 0 -> 3976 bytes docs/handbook/flip_top_bottom_hopper.jpg | Bin 4652 -> 0 bytes docs/handbook/flip_top_bottom_hopper.webp | Bin 0 -> 3966 bytes docs/handbook/masked_hopper.jpg | Bin 4904 -> 0 bytes docs/handbook/masked_hopper.webp | Bin 0 -> 3954 bytes docs/handbook/merged_hopper.png | Bin 35390 -> 0 bytes docs/handbook/merged_hopper.webp | Bin 0 -> 7536 bytes docs/handbook/pasted_hopper.jpg | Bin 4645 -> 0 bytes docs/handbook/pasted_hopper.webp | Bin 0 -> 3922 bytes docs/handbook/rebanded_hopper.jpg | Bin 4743 -> 0 bytes docs/handbook/rebanded_hopper.webp | Bin 0 -> 3866 bytes docs/handbook/rolled_hopper.jpg | Bin 4651 -> 0 bytes docs/handbook/rolled_hopper.webp | Bin 0 -> 3912 bytes docs/handbook/rotated_hopper_180.jpg | Bin 4636 -> 0 bytes docs/handbook/rotated_hopper_180.webp | Bin 0 -> 3946 bytes docs/handbook/rotated_hopper_270.jpg | Bin 4895 -> 0 bytes docs/handbook/rotated_hopper_270.webp | Bin 0 -> 3922 bytes docs/handbook/rotated_hopper_90.jpg | Bin 4903 -> 0 bytes docs/handbook/rotated_hopper_90.webp | Bin 0 -> 3888 bytes docs/handbook/show_hopper.png | Bin 56122 -> 0 bytes docs/handbook/show_hopper.webp | Bin 0 -> 6548 bytes docs/handbook/tutorial.rst | 28 +++++++++++----------- 27 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 docs/handbook/cropped_hopper.jpg create mode 100644 docs/handbook/cropped_hopper.webp delete mode 100644 docs/handbook/enhanced_hopper.jpg create mode 100644 docs/handbook/enhanced_hopper.webp delete mode 100644 docs/handbook/flip_left_right_hopper.jpg create mode 100644 docs/handbook/flip_left_right_hopper.webp delete mode 100644 docs/handbook/flip_top_bottom_hopper.jpg create mode 100644 docs/handbook/flip_top_bottom_hopper.webp delete mode 100644 docs/handbook/masked_hopper.jpg create mode 100644 docs/handbook/masked_hopper.webp delete mode 100644 docs/handbook/merged_hopper.png create mode 100644 docs/handbook/merged_hopper.webp delete mode 100644 docs/handbook/pasted_hopper.jpg create mode 100644 docs/handbook/pasted_hopper.webp delete mode 100644 docs/handbook/rebanded_hopper.jpg create mode 100644 docs/handbook/rebanded_hopper.webp delete mode 100644 docs/handbook/rolled_hopper.jpg create mode 100644 docs/handbook/rolled_hopper.webp delete mode 100644 docs/handbook/rotated_hopper_180.jpg create mode 100644 docs/handbook/rotated_hopper_180.webp delete mode 100644 docs/handbook/rotated_hopper_270.jpg create mode 100644 docs/handbook/rotated_hopper_270.webp delete mode 100644 docs/handbook/rotated_hopper_90.jpg create mode 100644 docs/handbook/rotated_hopper_90.webp delete mode 100644 docs/handbook/show_hopper.png create mode 100644 docs/handbook/show_hopper.webp diff --git a/docs/handbook/cropped_hopper.jpg b/docs/handbook/cropped_hopper.jpg deleted file mode 100644 index 912d0a29cb0d154e7b7062123863630e8a1ef3a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2017 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 C4MrUR literal 0 HcmV?d00001 diff --git a/docs/handbook/enhanced_hopper.jpg b/docs/handbook/enhanced_hopper.jpg deleted file mode 100644 index a87903eba41acc0c4b2873f45b0aec0290c0adc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5721 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 diff --git a/docs/handbook/enhanced_hopper.webp b/docs/handbook/enhanced_hopper.webp new file mode 100644 index 0000000000000000000000000000000000000000..a582ac0c216f10b4371d363683f2605be432b7fb GIT binary patch literal 4684 zcmV-S60_}6Nk&FQ5&!^KMM6+kP&gns5&!^jKmeTqDu4ih06u9bkwv5;p_qLxAV3C$ zu>fPT2WH>x{O9eT>OZmZBN%StGok4ZZr_^!H6Kj7)*g-CT^`dGnR*G~Uy(m$dx8Cz znQTXXWA|V5pWOYye`Egh#2=EM+IoWfFZ|EjC#lZb8$mkNV~C1^mDIzx%K8ADKT-|JZ-y|5fM@>3{p*>3_)n$o+?Z zH2%l`Bm4)oud`pQI?U|VPww=srKAiUh*tZ^P~7wvs|tn9w^NkJ||Q|FHZ zV*Fh^btV!VQTAe30;9}<)_u!1wexkrSGg?gmN|C242}=i)28j!6A-eLV*VtMv*G*h zHEiPQoVR|0=v;IZt;sleY)!}BC<4t0C^8MHXe`k9m3c}^pb^ICHn?ajU=#t?IjW9S zK_P)hIXll&pv4OvNK=_jcCp>6H?BRkoT^vvq3lm?(?tttD^oxq_x`dMVeKaHk7PP7 zzb1!H8P1TgTQ4!P-D;OcTn|NZUFGG#)Ajx#8hPc0s_7JB5p^*xLYt31B-N4udkq8S z?Gq88lEM5X?T3z;t~U&#D!;KK#|&wfB?r^pwiEyW{{C&|NUqqo9a4}vhHf?Pf8&`L z@HhE29+!jjTBcWM$dbncTl$_;2JR1ldjQa=P1_T-^ySu@8%S1P`M)zB`^F{vW@I7S zd86w0UDfBzTY6a|{V{1FWE_}9Y)$B6?&#)I#dWzK6ef$yR3Upp)%%J<3oh;otP11K zr7{gS8(s-|^7m@1fA8xW1KK2r>|@ zL=5G>S|C2Xj1HwXUVa?sXSd<6h-_g17AxRhsJr(@VL7PS(H1Ub+X^x8} z0}(B;_pq5`t8>`=J@DLskC3`%c#`yNVEut7zYU=lL~Zt@tfa0iyZ)Jg`y;LBPX0>`6jbMsdGU3sa} z{JdJsSrc0QLO5WL;D+WBFWFxSk5c$a;#r{Do8E;a*W+oDOt;p`*YQVi{G#NCvYF_) z6N1>WvS81g)`rSnJ|`VA-XFFM5_mioKi}B`cjV9Mn375AW;oiy~ItD8dF-lrW`RZCs$oRcEJr z5hN%->t2z|M8T8dG?tHLgz3;Yv<%e2*o_apFUy1x^jF5n3;omLmCb zD?FThH$~EwC+k{&cLw1+)ZUonAjs~$9AIwZBez}9wBD|3EZ?xt98}C@)1c}ua;JJY z(Lngh?PcG;T|65y#xgmSx&CD-eOln}j^`0z_VdxjmB2tw_z6)PX^?S)XuqLkyIxEmYO#8fNFVd+;Sr za)1PwSiFQ4wtG*(I{dw3_V%%B3jq+eZUQ*PlL2GNNK>#JO7K=Uce0&MQS}dumF2i& zVN?)e4t*R!OVcj@(K^0K?@pSPi&y@x!J3fLs%3s=3qSr_{rPeQ)_-ACEGtMDb@!LT zby5UB$9eaetS?n+&T#a(yf>jdj8~hR#a~0)qerT1GjCLpnRCAC9q~VVp!?&tU0x*N z`eA+;S9+YoDt1X!_Pu=!*~J1p^y~oUqx>+6eiF_DgS~^;mDx$;DPA z*T!r7ZPjo7odyHYpKO>--B`{t6<`(dqP3F#95?E(raqvCwkb51wd?i9Z1*nAMasV3 zKuugZR}?`h)P3lv)K0*JNKD3=IvSPd4+i=ze_sA8$>TLP)|F7>e}RG9J*$9qoP4E@@@|h5LQ@m4>`yMqtizy(fGCXtzDkb>EzOF>6K6TOT(twOs zfliwro(3~Mc$Lf1dDQb}@&oMuF?U%Y$qfjklCTw5e$>*_w{*C9W9a=lzW|>-iZGF* zU4?KVdvc7ZZd_|m1$sx>3DkC_`bN*LAjGmFu4{X4_7K)|$kFSi{L|YYv(@_Z0e$IA zP&zMByv=9}0T#E09#A$Ix4eGLS9!w$aT%|vdEc5G7ToXF0?7RXu zm6lA}QIfB2^B0wACivY~Xc)fQ5y*b}JdUDz^a-#C!ACk>Q7QX`Jkb10N?Uzm1ADR~98B z41v|iA`9eY{BV{>6mO|Y4c<^_eMlgl1YSs-d!xjNLapd#;y?|!Q6q-k$n-+ zreuyLqLzakUfOZm1^oWg{46HBIZr>e{ME^WXiQMCRo#w?CT7v>w<_!V39aq6Rs-9c78HruESQovI zLI(1~>D>Y(_+FDd(TCZ`K4%*i_7DBbGvdy19FU231Yx{4A%t4~SExpiq+9IMY41z`i0)SE;-(WEPW zgejN5T@QqfkSiA|Qx0Y=%TR5A(*&|z4ExRs~kccg}UN`4&1&+Y+W=XPuOa>tEeN7Tw- zwd%l*GN?jg2`05_PUo>=vx>3+)aH`X{K3jBs1za9@^)Z}7YbgO?Lat;fO5jZ`+D$I%>hAe(M^vw7lVJ zks8@Z|GZqMBvSKg9q)SyI5G(v=zBn>x77bZk^umhul@jC&35LdOTPosG&V60OjG~* zNtZ58K09rkbNL(K9~!A`p&7}t?Wfgvs8Vn8qQ0nT5jJL1M8EGGO6{CIP~2o8T*XaMYEGBb^e!#T}?%hVc*@t^?M~)Ax?$U%{DflC7IKQg5Fnc)Z z;8<5T9nOn{X}fH}wkjqRC9zXp3ILvH9k~$x}+{lfjP7nhg25ryw1xyVM ze%3=wUHBL~pfF^~B=UL5yy!tie760RyuZ1WG40Gq+D+uz#C;Z69#YDs0_is9q0sy| z(nS=fCXfoOp{D85)-Nfo>0W8)EDiY@tIqRaJvKM>{IqoUS>){S?R^3sen>9sv+XHX z1kZ`l?}%am3IHhNcR)4!_U~C*h^_tKfq2P-Sdai`!7XR;$sbA`4&m`7`0>N5g);(ZVGsWC4va$;( zj1rccbeZZ2+e%Ctm7NFdm51Q3+G!c}>}h3D z_~zb{e6?CQrMPJ=>L4LjwmtR7iVYjuzyjgw@cBJ>6Q-VX@r5}#UC-!Om9~YPL<4Zn zk9Md1nx4Iq29o%us_q9Cs%f_2vntw`>Kt1Y0BnKUn)B~eU38^9Z-*A3k9+`@bjpVf zMp11fb$iPc8s9dH;JGswV*$V<>vCt8Wh#|+>lGD!YP_7lyD@R!-eQxS8fCR4nMV0I|Cy~`0# zVomKFFTSv6w$JnAQn2y3_`#-r{~6V+{sEU3c(hZqR=fS`&_)bP7n}cAfkYVK4V@+x OQUa_$C79z|Jb(aTVNbaL literal 0 HcmV?d00001 diff --git a/docs/handbook/flip_left_right_hopper.jpg b/docs/handbook/flip_left_right_hopper.jpg deleted file mode 100644 index e1ef519e5cd8a34c65d681071b46318e3dd7f6a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4637 zcmbW(XHXMPn*i`Y=tZQ8O7DW8^iD*ji%68-6p#Qhbfk+4qI9VOLXZ-Ah@pkhRHO+4 z5+I@XVn9j|LJ!CPeQ)k&?$g~pJG)=@nVtR3?#{DkV`p=Ki^lp!`T!~_0D$Ve0nR1? zcK{4@bo6wz4D|H$jEoFSEL^NC%*-s8IXKz4_^${G@L%EM6B3h?6cV{E%Eu?AdhPm6 zc_k$!K}mIOH3cm>MJ0uQ7NKHfWMpAx;bmpzRS@PAR`@^1*;fEN1K=g#C6G!4K+R4C zWT!go00^G%la}gV0r=0Lq6X5?($O<8GBKYg)L#TpQvre0G(cKf8k+O$i1T>>4LdD| zu)HoEr}-0l5nnEaS1APyqPNlCxWPl)Vv5dwuNj$mF7aNzA}%2*bxm4HSw&S%UE|JO zJ$(a1BjbmUEG(_8ZERg!pSnTZJv{vb0-py3hlEB&zlnMKE;cSTEj=UiLsoW9VNo%n zq_nKOqNcX4z5&ySZEFAC(b?7A^P?9xJTi(WjEzssFDx!CudMziu90^B?(UKI4-Sw1 zaZv$)|7M+!|Aze!7yG%3nuZ2QL;sJ9iaO}L1KDY4h2`lubj|6X_;QLUykg+Gol=1Q z#we-?-sX1p8)D)SQ<@hi{X_eg?0*M){r{5v7wo@X695(<)%oE8*#RKHCs$^;bRDX- zcCubQhEMQnIO?rFR)XD`C$$Ja++2Q)aQ zYjITvsvS*xCGi!(Zo|gRI(biJ5Tli`Khl>o&;z>UK{eF9QDtWC;pLq6U`fWSnHfyn z%u(+dzG}UC&!8q~e0cm#;O2;yB+_Z^3^2a+93w6A9^%p0Fn5b`qbZoXhs2RLQjcyb zN&Qt+JUhDvm&tK34spZg;1^Up?wcKzES>?77A@jo{?G+h4JnD>#heA@40Ch~q<~CD z*)@Im?x^`Xl7omoO|}~@O56C%USE7W;mgfU1C*mY(NS~$RX(SOCz!#-er7uuS#B@hqHjQLWGFcO zz&gL@Q4`ObGU%|qK}owLTI6v=0+t4i0F+r?|E6KyNSM=1G%r|l;>)Wn!>jLP) zRIndRh57xuuXf>-VS@Z}rtA*omQ~Ssxcn;$@64JlxV4j9O zV<)2n5}==>eK<_vUAOYNUdxO89-zOBwuBs*B0Hn58VKo(p*VIqwVj^YAQSR9yMjV# zd*B0;W^x*rk@(x{gETuJrZ45;V3I_^jcjuLtEf#garw_KG%SCU4%APs4TVdSSn|MP zfPI}h`*3N(C-5CR^q*#QPN}r)^jkD?Z0Q5I)g;ynycv)Kn{ka7rv0{_Hmi)9XVe&rF4dCiJfJdO=Z zr*^-@z+fuzW&B`G9|7if8@Z3|jV{~wT*3lRpb6VCs3LbAX$pQi9ESA!b+?#N%qvUs zlR$mH^~{uwBVx1#$%lrx0C7e2ps;m^?V_#FY;|}6$)t;j`d-or_3$9u#arYWlQwfy z`{+!kKU-ogNwCww*N|UZauQj}9saim4ks$Am`-&z{Qb~#oL>jD-$>_9N>;N%ub3w{ znJGd(D}X~@jJiNpH%w~dcD+I}WkMpPCUHobo}xakYEc#P*x-}ED+wRobl)Lx4+QI* zs@`s}sqQ|yS3H;NLr*|FS2QGV_g!~ST8l1w(&hUA6!WREP1f(l(?mZ}ScO^Rh9eKu zR@#__ywl6!6UZKTVy~ zysuDfB#55@7)R5lvX-%R%y645mdM4?AiH5XIS5qzV`w*ThSu)vm+D)5p=<+<&HXYC z=&ZHpP1qE!6SU~*?DrDwvM93!M%~jis}5D$7bq`*s~WMa{8gaL|or|4%~{fi+tMh8(p)>Ei)AM3hKQ=~#dyYrPf)ZHa9>!5|}& zPQG`UqwUWc;=UkAunEiCLq8?ZxRGp&oSPN2{;k9N!Jr{dH-P;2o|l{Vd(&F!f(W&4 zJk}K0b<~!MU))IjC^bs>)APJwia`=szN${HLTtD##o1SMBQid*fYXc|vCGyzf&&SD zQh+Fvbwj#2ND4fAF!XZ+(JNVKVZjEIYBs|!O&ytM`{BWP2~X(1wB;tlp-~dDzl&m1 zFAcm5pE0+b8tGS)6En;-#HnP{>-fV2;j9vg3s+6nu@a3f7zLIpU(tx6T+V~V-RemD z`ZjDV2V;2IQ%%?ONTz*+p_bZX6C1A$3wAB^U)EloFSgr-5x_Y2-+`^36ZpGLub~k5 zMY}!-Fmy3PaB#bVu#fh{8%NfLM@dZ)=skGJ+Ghai{7DPcSdLzvW&}#C7b~QASs7K65?DRKA|UAb&DJP%(->=-? zyg$kL%Gw&MMkA8wX4ACW9jXQU0;7&VjP^~vu-Uj4`6sBcK5_=5?-k1Cyume!=tPUe z%5>G{@~b@SF5}II-%v$GRyo~oG+@wQ`txiD!!GL4Y_~n_3p)ZWp^ zr5Ea>N{zT{$djIT$7`cIa%rpkX4P*Veaa^EA$s4H2e~-E(>()#qXd!CP1d?%H@hyX zUwyu~a|Y0}b$!BM73xLYLz-S$q3AWXjl}WJSq8>N#N79U+_&0~w|JBp zqX&;`YCSnZ{Mn%iF|saN6!QIXWEEJ%Cik`QbVwCAyj-nf>NxnFA~vE03VJ6TgG3Wjlmwftm;P4E9aJZulhzg`DvyHGE*^vD?c^F(*iWO6cggATqOwJ^B*o*yGKOYDiwHD9by&&+a1F7@x`}p zaZ0nC0czsD;64XzK)^UL1#3qWDxue0+mTGqo6GrK97mKT9AehyS0?kD7zboDiH^C2 zIkj4W5_v;NomTCoepwt{%1hdGmj-&G8D`{(J6T@J4Cw;Azfc?CJTMWG7#xV*g7a>7 zsN^V_X>@DM-f1%5PcP?VBAGf*$nZx#sE>A*s^-5K3K%V&2k|%shgsIk2FiFGzwQI7 zU;7L<LUR{ovODVGhalI0?a)+OlVvaLV|bgTc^Z)rYPlhPl;N|W$;DTj|dr?2Uo z2*~74rQ8xdxh8+Rfs_>efV*~NW0wY`X%>2&nGb?{8T0ri%=E{16 zAX9Ocz_-IEkqe1(!Nm;(?{~3LG?~u7BjVtr>yE+)s3!|Iq6sx!dTo_bb~Z>%fNXBf zQ90F@4DWEg1E*rA1LqJWZ3#T#!Q1_Jutml%{JP!taffhs#~Fj9yRIo02$sA;zv}sq z-plV5_uue0x^oeriQ6saONo1ENIS?)6l7M)s`g&ROY|8rjnhg1}~H0NciPhU(<5zl<#okx}jGx_eBD zM+9w$jOmpDW9YQrB>z?O5g4MeuHM5rnnHTTYfBh95iWDGFP(rb$Bkp8(l5S%TW}sO1+!ds4vH`N7F934t6@uv^PioUwZ|P6PAtWmqjG9$J_-Rw8`7-at2) zL)Uzv-S_K*j7GhbVE38VZLX+0KYLwTwq@bw{UsNJUX1n8Nj0{{Z&uM@F8tk_|rMI3m%R%4rce_oErY< zyM^@KFwgsf3>le`Be8ac_uDR=UiIFoBGzjjzwFcA`x!SItW~93tXYT%HEXvaPkH)8 s2J6p-u|%D8hM>17+~X$-jW>f)5RXr;-EF#*j692Ah2PDlf@kCZ0nUp03jhEB diff --git a/docs/handbook/flip_left_right_hopper.webp b/docs/handbook/flip_left_right_hopper.webp new file mode 100644 index 0000000000000000000000000000000000000000..59452268dfe48ec4c1646c3202b3b43a0fe02a35 GIT binary patch literal 3976 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 D@-E{; diff --git a/docs/handbook/flip_top_bottom_hopper.webp b/docs/handbook/flip_top_bottom_hopper.webp new file mode 100644 index 0000000000000000000000000000000000000000..28af4bf36591c0fc44ad2bc03bdabddc920ee3b6 GIT binary patch literal 3966 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 YSj>lQ@V5l_3oj|F$BFYaXz>q#0Q=j;w*UYD literal 0 HcmV?d00001 diff --git a/docs/handbook/masked_hopper.jpg b/docs/handbook/masked_hopper.jpg deleted file mode 100644 index f70a5ec4769e9c861fcfd4e1e90f812cd4369782..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4904 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 diff --git a/docs/handbook/masked_hopper.webp b/docs/handbook/masked_hopper.webp new file mode 100644 index 0000000000000000000000000000000000000000..ef892cb94f7985b7ef38584d78d479e2c46c0e98 GIT binary patch literal 3954 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 Me`MlElL5m302v_I#{d8T literal 0 HcmV?d00001 diff --git a/docs/handbook/merged_hopper.png b/docs/handbook/merged_hopper.png deleted file mode 100644 index 662816cbdad42a04dd522acbbd195c2d789fb87b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35390 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 E0m`+u%m4rY literal 0 HcmV?d00001 diff --git a/docs/handbook/pasted_hopper.jpg b/docs/handbook/pasted_hopper.jpg deleted file mode 100644 index 36e3492a40f92e1c37d91722e1a993793fffbdec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4645 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 diff --git a/docs/handbook/rebanded_hopper.webp b/docs/handbook/rebanded_hopper.webp new file mode 100644 index 0000000000000000000000000000000000000000..7a9069c9f3d18b5ec4b705144cf9460cdb870093 GIT binary patch literal 3866 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 AApigX diff --git a/docs/handbook/rolled_hopper.webp b/docs/handbook/rolled_hopper.webp new file mode 100644 index 0000000000000000000000000000000000000000..7fe8024636331b408b5ba490068f5ef0e6d47b7c GIT binary patch literal 3912 zcmV-O54Z4ANk&FM4*&pHMM6+kP&gno4*&oVJpi2nDu4ih06uLll0~EfL*3@7$cc6an#FXj)q9O!?*^{cn1od^DBuWjrt>U#69#C|||>*U+oe&YXX=fl*V zW`8pKwfj%*-rK*e|8?ST#!u<}L%o&$Q+-a%dI5V$_0QM;+rN5$p7S5<=dcIrfBUaq z`|G~x{`=Sq`X~0E{JznD-+%A_Vd!t_pZwn8|IdHC^}_wR_G|sO2PdDOKT*fofQcug z$`9tt*5G3xUN5||dBcJi&9Er2L{8*p?cRD4Ena`v@kpxacs0q(BekAF?L$UyB&1k9 z6WzbGvS7eDTKThDky|h&U^ZBhSVGkUdl5oEun+on%gwy7?!e(~jCUcGvDful2It91 z{U+jJX_=}s(K2)MDJr_^=U{jGTBubT>Cg>BK%CD^6S__OM;4GVtxR#Ai(JFgA(lTA6q*t%mAH}MK?4(3b)Ta|r-5Jj3Q+pN#%d8$f zP^L#sXK{*V%f+gpvxk14I#7%(4Jw$8=K)M-CvsLMcvGL_{+$!`&Nj1hNw6Po2Z#r6 zCHq#(^?{>*gh2-_NA?);?IS<9q!>e4E?*|Km@si)PH%-Djd%raPmz5_orW;xfN*)>U1@(&$YL;1(BVv(PL|?S^AJ$J z3+R*%@S+RsS;eTQC(LIQScyL9`-+rk;{4D-=71K3=`9t#0k;17khBZ6`>vd|WDonk z8sG2z2$6GlEDu$*i+&Qy{du=Qn!PIkIeh3+LHr`Kx+WdQBVMFxTfXKD2g@MH1#s<> zUpM6XhPgQ~7vz{$LymSZlH385N@003I&U@c2l|RcXE!l$BT+ww$uO$nSh&TYqqxTLC%*RUdq5MA z61o``XZKFdmgqE8_GB*G1(9Z@o9dGmaP>dc_`Y^ldwsHu&rd=1^B6B2{veq1r9u8; zVZ51s<=rD&q3xqy&CAO4GoSJrx2=71$!dGpRs3Owv;OsrnTnE06oZ2x0-{nWb$EygOWrM#@8+s!Lg=L<&TaC95N{DnO788Uq^mx`^cy*#>A# z@F*yrv~ty@m-jps&8^|&&S+QuVCB^E+O7D4zE&@tl^lDx%wuorZhPo=lg8%MwTe9_ z^fUMpUEsZ8tjFQgtUp?S6TgWnO?H=ry8jC@lt%o*mcT*z+hj+L5%6xt7tTCdf*y_z zEMHJ*2!w&?)vtI}U<@FPKvTTcMPgr-j3cEl0M6+a{lZ5k^NP8H>74f0FwIA%6~FK6 z{p+qH5bBD)bul%cJI>VY^zM6YZv54exS2ib%-rX|;!r38L~s)56Q(haOCFSX`_vsM z0_k1(Ws+1~xfF5>&>Bzrz0j7QctpwvJdfi8J#Dhlbj~AT@lCf@35LSTxXO&WZHI6B zcOW7aq4Jt({IMhhdT+#f&pSLROd(AZF;KE76&RxrmpbuSx z8XuN`2C$2ho5oS9G@pxYr^EwG6+mImrR!0h025rbv-F_mp1q;c5k|U9j5*rmUR1a{ ztBHwFL9eQde`wIc7uTdzdewuW$@nlq<(fWpAze;7R9w&f(J5P;xI=vZqrY8FFTLpWGVzm! z6{>&Q@1AgX3z9c_HM+lx7I7&bf3G)uk}D=G-M=xh+G#rC~> zcHvVLg&Tnhf;SiW|i*@KMAGE;)1Du_dc);sT>Sd;ngkfDFRH&nrUbHaT`)l z4kBdoG&5j&Jn`eXh7KxHAJ`L?kLrG=nDtq5Upy-ovDL?T{EUQT;FVN<=8Ya+lD0E> z(n;)Q=g-gmdbovNh0v=0H7M~xW?|@ji_SCCmI)&=gy(yYPE*@+EB6(!kuPo2|K?hP z@#l;_KUH6B4v)?y6B(!)%{9tmcw8I(v;%Zq4Cs(B?M~=3K6(+U0I{E6 z(rt%EW7Ht4MELsYi__O~HL3%)y|cG@2H`C)%ik1HyIO9>YdLPXm|UD56il$>_ai|0n7e7|s zwm9B_fMg*hrxPZ-4SaE&vvh{_9WOT z4c;~X@Thyop${>%yD|;vpg0)CML&fc@(Ay0r84K4R;@O8P+|UGOgIaG=8ji@k8@p+ zq0vOlEV)dV@uUx5!}OG{{X{ZRXC#%sVpMFYGry`ceepq|LL7)_j}5vv(gV_LKhcxE z?P9?ygc#M>KjmcpA7@A@WEd~|Dg73#;bAcxZ^U2imNsN^o#YSQEzSRTwT|N6toVtG z;Mi3REwu>OAgK`I5Jzw+uddIb$uXf*f1Tau>ySHVUjG$E>9V8v)}Y#5FNP2fb*V*( z2cSt#UE^I*6e%p#&uHA!r}FA=?V9t?p)a(9^AO~em~I)wpUkdsOW?j==fI}W))(gD zmWn)Gr}VzJ8M;F2As_SR2G*+|Su+=*Ukoc(ggg4EpdYx04xulzU+|7qWys}=L`VO_ zy+B*PZ>(=BV4U{tn6bi=T|~=9#8?>gdBM>97TNj-T6**!Q;_*gr^t5dxfeDKF9X~W z)p6Q??sIuMbtm?=8bm6GV02}lXe>W@W2?B6bbkh6gQ9Vz4igh8^keiDevKU?R(p-m z)Ky3}V{#<*{It5``?hC~(W#h%A%Et2sHE?u(Z{89q*pd91n8}a%hi8~8{&3BsHpPS zI@{b)w+O&LIG)FlTsO0i62v+c@SnuDYe>CKEdsCX)z_yZXr{R`CnV~q(0`>EO6bS3 zN1Hn4bph(+o;JftQ#ddgiLNFhMAQDHJ&uNeY?88OBv@~a=^E^wSb;$Cb4?5njg+?Q zvOsW&@!=q&2?p`x+$XynKIHp}Ne7*0xNE;pILkn~mDqqkqf!N}Oaf6YSQ{@kEV+bF z^YNMwU8k2L`2!&P~5t2%Y$0?c^F86P=zHC8-Os)ha14yHsI zXUG%!Z4!i9&%q7vhC|NH0q(4~kV5~?@jdNFyI|)_1eUOsNqr4kDDztX$swyxO zQTo9JLRXL>==56o-Zq2Ng>FITY`Jv8n{#4Z2_(if)FJD_(JLsi=enNt91l(jw;n$< zfOGQU`v{=9yGfwmHF%_QN)K!g|e0m|=DAHzxkwP--C3Gun2*XRXb z;3feq^~g38Ex4SUcs~+p#|TWh8XZPW0<7aUSTAyx^oadkp(l*9czNz$bhWwqnEvI> z&$Zv05!9kUq|2eH-=v3Yas5w+??H=fYEpg=>PRd1vO$d&@R# zf0M>i_BfZ)LQ!Q)`MZqeabX6@r;0bo7&d&e^inr4cehD6LAP@xMfa z?6IdV#PPd8Y^8dd_;Rs(zd}dMS-~W)AS48F~0r>Ee>-}Ow zeQ&2+{wET$%V?UZB)Z=MA5&4-@~TB4mn#zxz{5NLw-q1+=PVxNJc#hh-34^M2(OZ$ zyoea&{!Fh>E>ELE`VjYh>4JF(KaR+&@t3h`0t~94&L!c>lt}APx&`jG!u%rqg}6H= z%Gbk>AD5)+|)6mk<|4G1J0xnR1Ko=-MR8*9df3lH(_5n&}Di#5$ zn-^J)9I2t6Y|`OLA825j6|L;X1KWZ!54|F2=`LU4;N%h#7P%@aCM$PCUO`bw>(*^; z9bG+r6H_yDiwBlgPLCcxaenIJ>h1H~*Uvv7@Wsnlkx|jFW0F(erlz6ZrDx>je=I00 zDlRFl{8ELjuBol7|JK&t(TV%s)%|O5Xn16FYc1|E3x0nlh?$Z~Ko|TD z*NrS(uyjXx(}aQW6Ph)1_YkPG;DfJGMfWg}u^@SHXk9aP+ZZpz8EG^aSdkvmM=r zB}#VuKqFYM*Stz#7Eq)odz;BFeaa3mW%H=oB7De{?i7LwKelhtQS%dizLfIW>TAujQ1GHO21BKokz^&52Ca1)Yk@7`M>E3IcJh zkXf(`YT^~CBGkj(m))4JNlJ+|uR7Ea6!JGoH`KPd%&)leuuM zt!$QRZ8Fc&`IocDeo*YA7iXR40Ae4OG?Usw;)`x(lYIkbFyxIYvzm5g4cVY-3@164 zD6EFt%k;`j>F(;T?Ki@Rx>PD6LoRGtZ-!JpPUN~&vXmkkM1Ao7H zxpkv(&(ikGYl!S7eZ1J$7zz)(X20)B@Y&Qa4pN^RDvVx*; zx@&q<>JU)xY|Q7j_!ulPoLAkPtCJ}%hznNVV#?oTPkl6Hu;L<~T^h5ee#swB>Rt#c zQ#d`*_UcZGZFE|-%TOA65pI9eJfrwiAC#S&H!8xt71qC}Ek3!qkCZo>dba*PHDM?9 zsDena=`7ja?e=Uo$VM-bm!bkgqt6gA4=g3)-z`87REFaR?r-8(t*vUJo*QsW)mM95 zjd+5Z8(d#HGsdPbuUC(m&rQk)O3$%kvHTGXxaD|IKd@WAoV@zA;S7ih$ zr|r)2%*9E;e6p2VAlM=30Jhh?9bEF^6gIf%viAQABAZfdZ1&CIsC^Dbz@ z6mieQUoczFCW{ojZ0jKJYWGG(Kid?Mvgx_jt=&1}^%3wAAM|k#nQT8+IexrXK1nI4 z{|=YQr@1(pgOu6ti+Zr8=N-_b2#Hrq{WWRdQGfc$Bq= zumKFdm%V;!2&Qs_JDU{sgna$iBpaY%Y@6c7$csUW8RA9s&@layKDUHlxgJHD6(#-oy61sdnW zb?P?K3rsQ`7gc`69AEZ-^r2$Ep!XJSuYw#uuOXH0&%ja0LMY|r>h6=;rkd^QR7VD;QRq0#Z5zs)YZbB8 zGErE_|y2R&cUVjn<^Kebp*J7t@cy|uu?urF?$gxwsud87$7yJRR@50OQ2Zoqe zf^$i&BF}6Z|Mqu@@GwgcPqINJw|E4Oz{6LD(JP zcx9EJt2Rv=Rarz?k_C>FU35pXe@mD)py9;*BXwF~Q}ZrK!!jNq*mW)RipueUr-ap! zm;Sz8=K$J{HF*6ob8bBwchD$WA0_)%d#9UC@pxVEAo<>p4>6rO)4iq%+!y!id(eI^2WpGj~*F6o#CyjXh?>PPTivwJT5c&n z=#FB;)@{7njzZ+D$la2{T{P;mNuk)9e%km*5)K;@TRx1nW{o^6_H zyg6-njSQM;6keV$hyTt_GW~wX-KeE# zEimpUy4Voud$OGV+T-TBYH1_LH_(CZSV^|d&EKSWCYyFcBuFuB;riEy+?d}#84>;_ z)^9Y2S$x8A26T?RQbmUj9~8A?1_9lNWj zpiNmn6^EnZn~Q{*8lPt7JI~onu%BWIH5{p%i+RW7K!?>5vxPP~OsiFEog0~$k)_pT)q4+p%gsA++WrFB9R;dj&R3*6)lEG^EyBPSM z*{DaM(ql}bleW4`KCy15(47hX zlz}u8*rj_c$?HEYhm(^H%cOlcgzHBo9U^9wqx^u5 zYtxRiYFW-1U(nW86Rrt78O346;@BF7gXPMFqdV*mX(>JR0HFsK{o0u(#wsBmzPJ*9 z`IZ|>2a!S}k_Cy=LXG{IE~q6Lw{M?4?s*e2CK}t?JGrO4y+{{Cwg=?>8E%+YOwvKlgltt_5`W6yY>WizxL?p zZ1{60h1wDk=N4#gO#1Bg7;fP(<4r7>?X!x@+$&7$L`2bW6Uv#L*0 z^|@OO5N;Obg-2Hd-oKPuZ`IB25T+qoEGKzN$S-MQ<~T14nYg#3*f`N-kL%4$b^ zUu<+|;GCCEzi+t=A5Z%D%b<_0F6RI%woLc3=t~QVK;?hN%4AM0M}D`&ImLp5ho@ol z=*I86`gY_QGkf99pYy=0Ob(XLG5)#uQ_qaD(qOS+pKJ;HX`9sn0nTxu?y|+5IWpzw zYgfjca_pzH-~M044kOjdStEiH^xEK>4gRS} z`Kdsia%gsTXWrwr>``!YrNp|uYrwVaMNUEIEZ;8NqUqvoFnC5a1bF~ zI1!(wLa~qLqXr+AN~->Ic)adr?z&o2?kQPmb#G6r;YXa4;Cmh~<%if)0Y211ocwU% zM5u&0Rv^%%=82O*v&-d^^y(WHS87TS9;|v2bz|?J7jNjy9FJmxWvrk2*lM^YTPG&k z=()YPxS;TDL9?kvebL7GrEDC;ZpVUjZ*t!Kd1{0i&;@zk#Y02H9GV|AF=R14G*e+w zP{h?17`=H!Y%Mo9ESP)QFEIER+fa2P*;LvB4Y<(@`~603=19_}%wL~8*(yUorR`~6 zUQlqfxcki9TDbuDM3Y?+%2Aq{jhkH6+Imnh z9U}p%!=PG^PpyPME^PRX+rYa}oH!e9zpZm%6ywZ4ShL8BWfv_?@=Tl;x#AP3*1SF1 zHt`j8qvZXRYD)A{YRLD=Jl~0%-TRcWv9VlBWcu=Kk5Zgk-xuoG@9nYS*rq_=sZzNU(8@Q`2W@x3CoaM@)^<$FW!g+k=M=a;(WPecY)>n+~cOD5Yb7Zu#O zoRh3tWIDKRZI}k3;SW=J#wAF@hGEhL@q20OQqG-;4=W z$tZRqLPU)u-S2DM$`>okxlUcJ*x{w3^1)9M{;X8E>e}?}`SJ@l)g!CM)yC0lQeC9+ zuBn0d+8*ynB7^0M`{g{_t+>}!Dd&Kp-YG##?{o97Qwv$Ew=8YmjOg~*%2+<4LEkxG z_orFi%Y=3=pU;}RI*je^;!wOppUK9Sm4cXO8Dw_)9FR_NZ#_B(lG5NspNBBKGbWHE z!CMKNpT%^RTy5!Xhh#Z1f`d;k8A?1+SJe4gHtVuMERov~Tht#`X($*M?7_RiQq8+K zPsQN^udPQfHgVk67tQ)LkQoBoVaG);4?5SuM=x1PHpb)B9F1q?mu?5DqS{wj=i@dr t3uGo|T}E~U4ZXC|!yPahq&|Y3n)=8!&)!=Kv0xJ;&VDND9qfPe-)-Kx9=^BC&#_)>f9}0<|AXO`=f1!n&wsvu z;{9FtjQ)-^|$@Y_I>@cO4XjcAXPC7P|7($^GtH7O+$S=;Xej< zDJdRUS|)8?=FdrmHLa?U3H{LfiiEXQ96qZT>kGyS*%;8lQa^d=AI^1wvB*nZ;fnwQ zk>xMhXtHbQs=p|MM;$?|CujX*bq!L4cR#k@hyG&om2iRThQ~b$0`*21Mey=pOiOS_ z6mcSRY8C#Y`L@{$ZgWRoFa=vBsHdYCfnCp-i0=k z;48d8x{`GhT2uH+xAcHcbuMgH4N^4?n8dpJ?3Em<6VNPnYZ@y;;FR){WNdDbBEDSk z5A)5U*M`}e$&RH19ZcZn9222UcaxJ-r&SVrvJfn*!B&f za08i_jTBkjOOi2^`MG!)Ed0FA<2NcCWOrP;>8|$rO)hBU)kzc5Uwz1Y)UDE zvo01cZUVgPY!cekfrYjsDdt%oM|ccG_t-e(5_OEbc(VZfj^p>fIhw1&6#vCv{J<80 zS+S%;D!~|mJeu)093#_=A7n~IGiI9V;lzSy{r0|HW*G+H8%h76fSi9>gU_;@F%CC> zmteU$0r@ubr;sX(lR8I(xN{Rh_Dem(a-!q`RFlw~rJSQDRYR$thAG5((CdHU`2g%( zJm|A6xE8EK?zEgJFv&{U>J5y$NKA{fU49~P zc>5HPHPjodkh^;i(!(<9;)CGV=P_cWaL!vyAE8WSq#}i77kEagh|MKcx3MYcX{dHG zG6Dx4_bye$Lh?JNW5j7}`hP>NqH!W&VBo=y=}r({Jdon;w7a>h*S*!>`cW+}V%MNH z-9~a;WjEToTVT;gN{6&6=X=AW+~ z!;o+@CLIRH`*MPs#4=jg@l9E>|ZKj*#2Yj=Hgm=M=|_}so(c4 z2zeNwf~=nk+CwTjWs)tgL0epnRUkt)q_%`UpG~$yv** zD`7NZp<+17>`*-@f}%&vtq{MV#kB?%9{Lyw!+V(5E8^RR+4@T~y~}c-L5dAS>elxvVdAkpjS z_4zt3H*tr0gXf|wy%KU4hxHTgC%7a)t|~tire{MaxtUX=cH(V>c3n+0&szkQTmj2P zq1``xfD3hDiB&R1dIJIt%2Qcl$Lc6;``X*H_uiipG1?ORE&cqi@4itS6RD&}Y$PKH z;e?2p(KJ{uM=qIn$$l!iEset<(4gGyy+wg=;CbQfM=`$^V)J%Zef2+kUULn+J<1{Rb{!*eZ8a!bY1CXRl2y zo7B&Du4Y50yVS zhhBpEwW0u~j<|^7B87>}MBKe)R`zAeF}CkKgESl@-+7m(l6vC`JMA<=_6iq;*N&Nm zOWKHD`GWXn#<{^_+T@(~c8G08=hkiya3#q(0?HQtW>GIX54Po(EW6-Ok*mTzvxy~_ zCOaK1<}a?ronlwe!c@}BhVxS6e%s%n${6+6nrswLm4xh>$sl<+g)1MEMy>zP66l|Q z$(A1bfI8np!zWwC0ct`^N7esihZ*p`*<`T$|5cqm@9q_3`^^dDD9W9+ z6#X=1Z_fj14qMp~7c@}*4`S@hZw)wvneNE~Kr=<3E%7txNLQPwf3X8M)*o^q3u6NU z13w}@KPFwPiH88(RsOl=pES=SY5qd zu1q2LddEiLYv-^_gy13m3b1K4pCH9GQY8YR5D;Wed*XGBt13KcODVp+%W=quQ5~AXKTCe#L}B1i3@*c|wkb z2aN=(7-3MPffsb>Va}VTg!}>9W z`FF$UWBP_usOv6Pc-HUvFe5hN7~ZT(Mz4sXcp>*We~-Sg05ey4NqwsmH^9ruQC+g< z^x%K&3aUq7=mBLo2Ck@W>P$}NUH2Mq1d>LX3~Kjm40A%}3P$SuVf}4`DVu`~TippvbmpAZ$OkP<-3>6+W!qC3R4=6vx5^y8; zg}Ap=kO?17#<1auNaw{DYRbTbj`h!4dzU*CqYjzL>9uy%px3ZOiv9rw>MfEv9LYzf zMgl)}oX(@+!54_%s^g!=iDh`|@y<7A_~&Rb%C9w4P@VdVXohS8*jUEuFPzfA z&BLvc)pgzoQQ*vM1kP{oa;Irgn6_ZS$!9Mv)!;ds1w&6bW5*#v! z2GlGuNHBg}fF=7JY}ueN!HS@*RqG>6aKHM!wx}SlC&+n*S#ul|U_OITRGI$VKUKFBV+{B5|8*1|KW$PE3~1sD z@NwvF5nQwR*!jnnxhsIt6-GlaEcMj#b>-NK4D_f+;f36cZSzE%)YUr;+zupp9CZpf zfMx!*A`fQEs)?SoLhBRTSTlqDaF_UKYEw7S{#%8wDmE01be*Yqb`{4-{XEE0KDwC;P$|FmkIdFSPnjVXf$@{oTXEgw1HWJfBg zrcGZ!15lR@aroi41cK%IKMP1xSNLeKs9Q-ztY$2ZMnu$cTlN}{4FUlr+Q$gsC7k_P#Tn~- zi2RlFbc;W8mV7eS;@@m?f^z`HiOB!7l4}Cy( zmSkbOC<{4Bhvt2bw45+PHi!LvS&Q}nqY+BG@c_qyFq^1H&wmB=PyqUY_IFzie)mp2H)!^yT=Jk(rRAR1=$3P`{~?Cgz?AXh;%S3 zb`83~%yzE3qO^=6K}7(Wn3b E0O35#SpWb4 literal 0 HcmV?d00001 diff --git a/docs/handbook/rotated_hopper_270.jpg b/docs/handbook/rotated_hopper_270.jpg deleted file mode 100644 index e4d22be70ce2bc4887a41799e1343fa0cc513cd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4895 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 oaT?m_M8uk0LZ?++fwj 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 literal 0 HcmV?d00001 diff --git a/docs/handbook/rotated_hopper_90.jpg b/docs/handbook/rotated_hopper_90.jpg deleted file mode 100644 index 763785c7a1d5b2d45df93884dc63f9a8217ba686..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4903 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 diff --git a/docs/handbook/rotated_hopper_90.webp b/docs/handbook/rotated_hopper_90.webp new file mode 100644 index 0000000000000000000000000000000000000000..9a5f70b2030835a5feeaf54665ddae2ad49cbb53 GIT binary patch literal 3888 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 literal 0 HcmV?d00001 diff --git a/docs/handbook/show_hopper.png b/docs/handbook/show_hopper.png deleted file mode 100644 index 1f2e6f243858d8a9944c4db0b1c0758111cc45ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56122 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

    ViV@m zMy|x4r;}FhOSn>e$X6W};h$iqZ&67r=TNKRV{_Y%-XiLv!>t{ z-LQDV=<&LB;<)r+*N;7;_+N$c%EfeYkzEX#+T&=Go4bWhD)XuD9<6dSYjh|c$XjA7 zVeP7Ef;2Zv7FQ;tHH%R7NaVayVi$NPfvbUG0}pg}<2Y$WxMI>TO^hXI!10Ru=o(7B zG(lXviP}v1e#1!7gQ4L?>Nuwcu;UPkzn++`0G6ksq?1QU{AXyRcbZ2tA^Wiq5(Q?|t*_@(o{nV-`8hV4HE#LM!WH%WH4cFrCor@8V z%k=CQGbO9By}jow`zs5yY}j^?6182&e35fE6Q6L6uk${Q7Jsx4v=EV+D?8F04ohGc=*&h>g8ku7;Sp@OnJOAk2cIY{%4dS zeupl9>9K8})JuJ)7n6I%!PF4ui=s1u^HZGVjX{fJ>H{nOeH`&8%z8!d%61;%4oq^S zQ#bj7lZyw{oaDIUXdKk{<%TZd_s&R*nxd)lDELw5Z2^rVczD9St$drJ7V3BS58&tqHTS`s%yE z*fTJHbNDsSSy;mrbgs6@$|7n`G01xzo*kR;ORQj}1eoV<@-a4Yq)E*{}5_GzB0HM=# z%^RUO`@pMs&61?AY4adANTbxD?=>dNGn$gJM9+}>SX^l|WQJ9!>CYY0Sk4>l&e2}`lau-u^4Pm66>3rR zE7nP$_!xepi^8A@Cly$COXVYHLd=rz@|v=~hVs814~#S3O_o7;&Ype9uie2b zVq=};q3~>Ndw+%q?vVBadrP;5$EUFT={!FG#Sy2W5RxE#zAs=Yf~S?I`vNq!<-uY3 z8s_wNV3B;Fja}vYHFFH{V={9GzF76==CZees%7`yi+ zI-0AXtUhl%rejodQfHHERrIx{z(fH62LWxAf3*gIh)q4*s+ZtgQuSWF=s5+FA80qd&kCY(jslxOKRq*5V*J2n9!;v?pJ3mKva{*;{QEFlA5EPqR#m-Pg9J0i zXhzDl?n!i~l1WMt!awVwqqxyqVv*%V);KZ5Mmr$SdfgHJsq5^Kl&abZYB7+C8!{Gp zr|+!Uo>Ce5iA&angQlNK!dQD~q?bTwyRYk+PtZ$Ql9-K!OIzjeN@e9;zZt_?;fA}{ z?NL=F$_a*r<aJfc_|Pyoc~#4EpSe9+goZTW)aXBN#60Z5Vo<_5wJwjJPMRub$LFC4yn~~SM(d% z)St4Ja*>O4lbU!*nT_7Rv9v4oGerXoEmu=Lp%+EPYpugK|Hr{5ZhI-Htc? zv=B7AvZ^_8J|<3Mj<5;1ee$J`3kxK?qjA3&fbC9>A zgOj_kw-}wdrLzT07>RGy5IWFr7r4C`-7QJR*$oEb=iubvq!Y&hfk2{emR7=Avhx3; zBPB698#vrW7y|L~^5XE~;c#}dhHwc92|+lyA>7>TNDp>*A1AoEH@lNN{huKJjw6eF zPj|C*f!jJefo|iPTR3~b#pvj66aDY_Qzy*Z_HQO9caGmhb3mOPA-5I?7Y8TgKhfZ} zR{w=|YxzU_y{|v%L~nx$YuI|j91LY`9br!H$kN2Qx%owZr}=-DzlHu`>bk?+WSkw5 zM7X#%)D4CVVB-w`7x|yY|4aOx(%^4O0ZyTRru>KHAI#e=2&=o>> im.show() -.. image:: show_hopper.png +.. image:: show_hopper.webp :align: center .. note:: @@ -159,7 +159,7 @@ pixels, so the region in the above example is exactly 64x64 pixels. The region could now be processed in a certain manner and pasted back. -.. image:: cropped_hopper.jpg +.. image:: cropped_hopper.webp :align: center Processing a subrectangle, and pasting it back @@ -176,7 +176,7 @@ modes of the original image and the region do not need to match. If they don’t the region is automatically converted before being pasted (see the section on :ref:`color-transforms` below for details). -.. image:: pasted_hopper.jpg +.. image:: pasted_hopper.webp :align: center Here’s an additional example: @@ -201,7 +201,7 @@ Rolling an image return im -.. image:: rolled_hopper.jpg +.. image:: rolled_hopper.webp :align: center Or if you would like to merge two images into a wider image: @@ -221,7 +221,7 @@ Merging images return im -.. image:: merged_hopper.png +.. image:: merged_hopper.webp :align: center For more advanced tricks, the paste method can also take a transparency mask as @@ -250,7 +250,7 @@ Note that for a single-band image, :py:meth:`~PIL.Image.Image.split` returns the image itself. To work with individual color bands, you may want to convert the image to “RGB” first. -.. image:: rebanded_hopper.jpg +.. image:: rebanded_hopper.webp :align: center Geometrical transforms @@ -269,7 +269,7 @@ Simple geometry transforms out = im.resize((128, 128)) out = im.rotate(45) # degrees counter-clockwise -.. image:: rotated_hopper_90.jpg +.. image:: rotated_hopper_90.webp :align: center To rotate the image in 90 degree steps, you can either use the @@ -284,35 +284,35 @@ Transposing an image out = im.transpose(Image.Transpose.FLIP_LEFT_RIGHT) -.. image:: flip_left_right_hopper.jpg +.. image:: flip_left_right_hopper.webp :align: center :: out = im.transpose(Image.Transpose.FLIP_TOP_BOTTOM) -.. image:: flip_top_bottom_hopper.jpg +.. image:: flip_top_bottom_hopper.webp :align: center :: out = im.transpose(Image.Transpose.ROTATE_90) -.. image:: rotated_hopper_90.jpg +.. image:: rotated_hopper_90.webp :align: center :: out = im.transpose(Image.Transpose.ROTATE_180) -.. image:: rotated_hopper_180.jpg +.. image:: rotated_hopper_180.webp :align: center :: out = im.transpose(Image.Transpose.ROTATE_270) -.. image:: rotated_hopper_270.jpg +.. image:: rotated_hopper_270.webp :align: center ``transpose(ROTATE)`` operations can also be performed identically with @@ -396,7 +396,7 @@ Applying filters from PIL import ImageFilter out = im.filter(ImageFilter.DETAIL) -.. image:: enhanced_hopper.jpg +.. image:: enhanced_hopper.webp :align: center Point Operations @@ -448,7 +448,7 @@ Note the syntax used to create the mask:: imout = im.point(lambda i: expression and 255) -.. image:: masked_hopper.jpg +.. image:: masked_hopper.webp :align: center Python only evaluates the portion of a logical expression as is necessary to From 4db814042615a45aec0847ee55ef35f0f32521bb Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 19 Jul 2024 18:49:04 +1000 Subject: [PATCH 180/662] Removed unused image --- docs/handbook/rotated_hopper.jpg | Bin 4895 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 docs/handbook/rotated_hopper.jpg diff --git a/docs/handbook/rotated_hopper.jpg b/docs/handbook/rotated_hopper.jpg deleted file mode 100644 index e4d22be70ce2bc4887a41799e1343fa0cc513cd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4895 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 oaT?m_M8uk0LZ?+ Date: Fri, 19 Jul 2024 12:14:51 +0000 Subject: [PATCH 181/662] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/_imaging.c | 2 +- src/libImaging/Storage.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/_imaging.c b/src/_imaging.c index 21c6b0a02..a2606df15 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -4131,7 +4131,7 @@ _set_blocks_max(PyObject *self, PyObject *args) { } if ((unsigned long)blocks_max > - SIZE_MAX / sizeof(ImagingDefaultArena.blocks_pool[0])) { + SIZE_MAX / sizeof(ImagingDefaultArena.blocks_pool[0])) { PyErr_SetString(PyExc_ValueError, "blocks_max is too large"); return NULL; } diff --git a/src/libImaging/Storage.c b/src/libImaging/Storage.c index ae4bf72ff..522e9f375 100644 --- a/src/libImaging/Storage.c +++ b/src/libImaging/Storage.c @@ -506,7 +506,8 @@ ImagingNewInternal(const char *mode, int xsize, int ysize, int dirty) { MUTEX_LOCK(&ImagingDefaultArena.mutex); Imaging tmp = ImagingAllocateArray( - im, &ImagingDefaultArena, dirty, ImagingDefaultArena.block_size); + im, &ImagingDefaultArena, dirty, ImagingDefaultArena.block_size + ); MUTEX_UNLOCK(&ImagingDefaultArena.mutex); if (tmp) { return im; From eff22bc34ef5b509bfc996363204bb8723dd7d89 Mon Sep 17 00:00:00 2001 From: "Jeffrey A. Clark" Date: Fri, 19 Jul 2024 09:00:26 -0400 Subject: [PATCH 182/662] Update docs/handbook/tutorial.rst Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- docs/handbook/tutorial.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/handbook/tutorial.rst b/docs/handbook/tutorial.rst index 402f57f69..ffa8fa019 100644 --- a/docs/handbook/tutorial.rst +++ b/docs/handbook/tutorial.rst @@ -528,7 +528,7 @@ You can create animated GIFs with Pillow, e.g. "rotated_hopper_90.jpg", ] - # Open images and append them to a list + # Open images and create a list images = [Image.open(filename) for filename in image_filenames] # Save the images as an animated GIF From 204ec11f64e2ec6a322a39dc525bd97e31113d12 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Fri, 19 Jul 2024 08:28:59 -0500 Subject: [PATCH 183/662] use local variable instead of casting every line --- src/encode.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/src/encode.c b/src/encode.c index f711865d5..529982dad 100644 --- a/src/encode.c +++ b/src/encode.c @@ -1186,29 +1186,27 @@ PyImaging_JpegEncoderNew(PyObject *self, PyObject *args) { encoder->encode = ImagingJpegEncode; - strncpy(((JPEGENCODERSTATE *)encoder->state.context)->rawmode, rawmode, 8); - - ((JPEGENCODERSTATE *)encoder->state.context)->keep_rgb = keep_rgb; - ((JPEGENCODERSTATE *)encoder->state.context)->quality = quality; - ((JPEGENCODERSTATE *)encoder->state.context)->qtables = qarrays; - ((JPEGENCODERSTATE *)encoder->state.context)->qtablesLen = qtablesLen; - ((JPEGENCODERSTATE *)encoder->state.context)->subsampling = subsampling; - ((JPEGENCODERSTATE *)encoder->state.context)->progressive = progressive; - ((JPEGENCODERSTATE *)encoder->state.context)->smooth = smooth; - ((JPEGENCODERSTATE *)encoder->state.context)->optimize = optimize; - ((JPEGENCODERSTATE *)encoder->state.context)->streamtype = streamtype; - ((JPEGENCODERSTATE *)encoder->state.context)->xdpi = xdpi; - ((JPEGENCODERSTATE *)encoder->state.context)->ydpi = ydpi; - ((JPEGENCODERSTATE *)encoder->state.context)->restart_marker_blocks = - restart_marker_blocks; - ((JPEGENCODERSTATE *)encoder->state.context)->restart_marker_rows = - restart_marker_rows; - ((JPEGENCODERSTATE *)encoder->state.context)->comment = comment; - ((JPEGENCODERSTATE *)encoder->state.context)->comment_size = comment_size; - ((JPEGENCODERSTATE *)encoder->state.context)->extra = extra; - ((JPEGENCODERSTATE *)encoder->state.context)->extra_size = extra_size; - ((JPEGENCODERSTATE *)encoder->state.context)->rawExif = rawExif; - ((JPEGENCODERSTATE *)encoder->state.context)->rawExifLen = rawExifLen; + JPEGENCODERSTATE *jpeg_encoder_state = (JPEGENCODERSTATE *)encoder->state.context; + strncpy(jpeg_encoder_state->rawmode, rawmode, 8); + jpeg_encoder_state->keep_rgb = keep_rgb; + jpeg_encoder_state->quality = quality; + jpeg_encoder_state->qtables = qarrays; + jpeg_encoder_state->qtablesLen = qtablesLen; + jpeg_encoder_state->subsampling = subsampling; + jpeg_encoder_state->progressive = progressive; + jpeg_encoder_state->smooth = smooth; + jpeg_encoder_state->optimize = optimize; + jpeg_encoder_state->streamtype = streamtype; + jpeg_encoder_state->xdpi = xdpi; + jpeg_encoder_state->ydpi = ydpi; + jpeg_encoder_state->restart_marker_blocks = restart_marker_blocks; + jpeg_encoder_state->restart_marker_rows = restart_marker_rows; + jpeg_encoder_state->comment = comment; + jpeg_encoder_state->comment_size = comment_size; + jpeg_encoder_state->extra = extra; + jpeg_encoder_state->extra_size = extra_size; + jpeg_encoder_state->rawExif = rawExif; + jpeg_encoder_state->rawExifLen = rawExifLen; return (PyObject *)encoder; } From f62446032166827cd0e20c711bca07650019d43d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 20 Jul 2024 13:14:18 +1000 Subject: [PATCH 184/662] Added type hints --- Tests/test_file_libtiff.py | 7 +++--- docs/reference/ImageFile.rst | 5 ++++ src/PIL/ImageWin.py | 38 ++++++++++++++-------------- src/PIL/PsdImagePlugin.py | 48 +++++++++++++++++++++--------------- src/PIL/TiffImagePlugin.py | 28 ++++++++++----------- src/PIL/TiffTags.py | 27 ++++++++++++-------- 6 files changed, 86 insertions(+), 67 deletions(-) diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py index d5dbeeb6f..58ac705c9 100644 --- a/Tests/test_file_libtiff.py +++ b/Tests/test_file_libtiff.py @@ -240,10 +240,11 @@ class TestFileLibTiff(LibTiffTestCase): new_ifd = TiffImagePlugin.ImageFileDirectory_v2() for tag, info in core_items.items(): - if info.length == 1: - new_ifd[tag] = values[info.type] - if info.length == 0: + assert info.type is not None + if not info.length: new_ifd[tag] = tuple(values[info.type] for _ in range(3)) + elif info.length == 1: + new_ifd[tag] = values[info.type] else: new_ifd[tag] = tuple(values[info.type] for _ in range(info.length)) diff --git a/docs/reference/ImageFile.rst b/docs/reference/ImageFile.rst index e59c7311a..fdfeb60f9 100644 --- a/docs/reference/ImageFile.rst +++ b/docs/reference/ImageFile.rst @@ -37,6 +37,11 @@ Example: Parse an image Classes ------- +.. autoclass:: PIL.ImageFile._Tile() + :member-order: bysource + :members: + :show-inheritance: + .. autoclass:: PIL.ImageFile.Parser() :members: diff --git a/src/PIL/ImageWin.py b/src/PIL/ImageWin.py index 4f9956087..6fc7cfaf5 100644 --- a/src/PIL/ImageWin.py +++ b/src/PIL/ImageWin.py @@ -90,7 +90,7 @@ class Dib: assert not isinstance(image, str) self.paste(image) - def expose(self, handle): + def expose(self, handle: int | HDC | HWND) -> None: """ Copy the bitmap contents to a device context. @@ -101,19 +101,18 @@ class Dib: if isinstance(handle, HWND): dc = self.image.getdc(handle) try: - result = self.image.expose(dc) + self.image.expose(dc) finally: self.image.releasedc(handle, dc) else: - result = self.image.expose(handle) - return result + self.image.expose(handle) def draw( self, - handle, + handle: int | HDC | HWND, dst: tuple[int, int, int, int], src: tuple[int, int, int, int] | None = None, - ): + ) -> None: """ Same as expose, but allows you to specify where to draw the image, and what part of it to draw. @@ -128,14 +127,13 @@ class Dib: if isinstance(handle, HWND): dc = self.image.getdc(handle) try: - result = self.image.draw(dc, dst, src) + self.image.draw(dc, dst, src) finally: self.image.releasedc(handle, dc) else: - result = self.image.draw(handle, dst, src) - return result + self.image.draw(handle, dst, src) - def query_palette(self, handle): + def query_palette(self, handle: int | HDC | HWND) -> int: """ Installs the palette associated with the image in the given device context. @@ -147,8 +145,8 @@ class Dib: :param handle: Device context (HDC), cast to a Python integer, or an HDC or HWND instance. - :return: A true value if one or more entries were changed (this - indicates that the image should be redrawn). + :return: The number of entries that were changed (if one or more entries, + this indicates that the image should be redrawn). """ if isinstance(handle, HWND): handle = self.image.getdc(handle) @@ -210,22 +208,22 @@ class Window: title, self.__dispatcher, width or 0, height or 0 ) - def __dispatcher(self, action: str, *args): - return getattr(self, f"ui_handle_{action}")(*args) + def __dispatcher(self, action: str, *args: int) -> None: + getattr(self, f"ui_handle_{action}")(*args) - def ui_handle_clear(self, dc, x0, y0, x1, y1) -> None: + def ui_handle_clear(self, dc: int, x0: int, y0: int, x1: int, y1: int) -> None: pass - def ui_handle_damage(self, x0, y0, x1, y1) -> None: + def ui_handle_damage(self, x0: int, y0: int, x1: int, y1: int) -> None: pass def ui_handle_destroy(self) -> None: pass - def ui_handle_repair(self, dc, x0, y0, x1, y1) -> None: + def ui_handle_repair(self, dc: int, x0: int, y0: int, x1: int, y1: int) -> None: pass - def ui_handle_resize(self, width, height) -> None: + def ui_handle_resize(self, width: int, height: int) -> None: pass def mainloop(self) -> None: @@ -235,12 +233,12 @@ class Window: class ImageWindow(Window): """Create an image window which displays the given image.""" - def __init__(self, image, title: str = "PIL") -> None: + def __init__(self, image: Image.Image | Dib, title: str = "PIL") -> None: if not isinstance(image, Dib): image = Dib(image) self.image = image width, height = image.size super().__init__(title, width=width, height=height) - def ui_handle_repair(self, dc, x0, y0, x1, y1) -> None: + def ui_handle_repair(self, dc: int, x0: int, y0: int, x1: int, y1: int) -> None: self.image.draw(dc, (x0, y0, x1, y1)) diff --git a/src/PIL/PsdImagePlugin.py b/src/PIL/PsdImagePlugin.py index 31dfd4d12..cc99cd6d8 100644 --- a/src/PIL/PsdImagePlugin.py +++ b/src/PIL/PsdImagePlugin.py @@ -19,6 +19,7 @@ from __future__ import annotations import io from functools import cached_property +from typing import IO from . import Image, ImageFile, ImagePalette from ._binary import i8 @@ -142,7 +143,9 @@ class PsdImageFile(ImageFile.ImageFile): self._min_frame = 1 @cached_property - def layers(self): + def layers( + self, + ) -> list[tuple[str, str, tuple[int, int, int, int], list[ImageFile._Tile]]]: layers = [] if self._layers_position is not None: self._fp.seek(self._layers_position) @@ -181,7 +184,9 @@ class PsdImageFile(ImageFile.ImageFile): return self.frame -def _layerinfo(fp, ct_bytes): +def _layerinfo( + fp: IO[bytes], ct_bytes: int +) -> list[tuple[str, str, tuple[int, int, int, int], list[ImageFile._Tile]]]: # read layerinfo block layers = [] @@ -203,7 +208,7 @@ def _layerinfo(fp, ct_bytes): x1 = si32(read(4)) # image info - mode = [] + bands = [] ct_types = i16(read(2)) if ct_types > 4: fp.seek(ct_types * 6 + 12, io.SEEK_CUR) @@ -215,23 +220,23 @@ def _layerinfo(fp, ct_bytes): type = i16(read(2)) if type == 65535: - m = "A" + b = "A" else: - m = "RGBA"[type] + b = "RGBA"[type] - mode.append(m) + bands.append(b) read(4) # size # figure out the image mode - mode.sort() - if mode == ["R"]: + bands.sort() + if bands == ["R"]: mode = "L" - elif mode == ["B", "G", "R"]: + elif bands == ["B", "G", "R"]: mode = "RGB" - elif mode == ["A", "B", "G", "R"]: + elif bands == ["A", "B", "G", "R"]: mode = "RGBA" else: - mode = None # unknown + mode = "" # unknown # skip over blend flags and extra information read(12) # filler @@ -258,19 +263,22 @@ def _layerinfo(fp, ct_bytes): layers.append((name, mode, (x0, y0, x1, y1))) # get tiles + layerinfo = [] for i, (name, mode, bbox) in enumerate(layers): tile = [] for m in mode: t = _maketile(fp, m, bbox, 1) if t: tile.extend(t) - layers[i] = name, mode, bbox, tile + layerinfo.append((name, mode, bbox, tile)) - return layers + return layerinfo -def _maketile(file, mode, bbox, channels): - tile = None +def _maketile( + file: IO[bytes], mode: str, bbox: tuple[int, int, int, int], channels: int +) -> list[ImageFile._Tile] | None: + tiles = None read = file.read compression = i16(read(2)) @@ -283,26 +291,26 @@ def _maketile(file, mode, bbox, channels): if compression == 0: # # raw compression - tile = [] + tiles = [] for channel in range(channels): layer = mode[channel] if mode == "CMYK": layer += ";I" - tile.append(("raw", bbox, offset, layer)) + tiles.append(ImageFile._Tile("raw", bbox, offset, layer)) offset = offset + xsize * ysize elif compression == 1: # # packbits compression i = 0 - tile = [] + tiles = [] bytecount = read(channels * ysize * 2) offset = file.tell() for channel in range(channels): layer = mode[channel] if mode == "CMYK": layer += ";I" - tile.append(("packbits", bbox, offset, layer)) + tiles.append(ImageFile._Tile("packbits", bbox, offset, layer)) for y in range(ysize): offset = offset + i16(bytecount, i) i += 2 @@ -312,7 +320,7 @@ def _maketile(file, mode, bbox, channels): if offset & 1: read(1) # padding - return tile + return tiles # -------------------------------------------------------------------- diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 253f64852..1dab0d50b 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -445,7 +445,7 @@ class IFDRational(Rational): __int__ = _delegate("__int__") -def _register_loader(idx, size): +def _register_loader(idx: int, size: int): def decorator(func): from .TiffTags import TYPES @@ -457,7 +457,7 @@ def _register_loader(idx, size): return decorator -def _register_writer(idx): +def _register_writer(idx: int): def decorator(func): _write_dispatch[idx] = func # noqa: F821 return func @@ -465,7 +465,7 @@ def _register_writer(idx): return decorator -def _register_basic(idx_fmt_name): +def _register_basic(idx_fmt_name: tuple[int, str, str]) -> None: from .TiffTags import TYPES idx, fmt, name = idx_fmt_name @@ -640,7 +640,7 @@ class ImageFileDirectory_v2(_IFDv2Base): def __contains__(self, tag: object) -> bool: return tag in self._tags_v2 or tag in self._tagdata - def __setitem__(self, tag, value) -> None: + def __setitem__(self, tag: int, value) -> None: self._setitem(tag, value, self.legacy_api) def _setitem(self, tag, value, legacy_api) -> None: @@ -731,10 +731,10 @@ class ImageFileDirectory_v2(_IFDv2Base): def __iter__(self): return iter(set(self._tagdata) | set(self._tags_v2)) - def _unpack(self, fmt, data): + def _unpack(self, fmt: str, data): return struct.unpack(self._endian + fmt, data) - def _pack(self, fmt, *values): + def _pack(self, fmt: str, *values): return struct.pack(self._endian + fmt, *values) list( @@ -755,7 +755,7 @@ class ImageFileDirectory_v2(_IFDv2Base): ) @_register_loader(1, 1) # Basic type, except for the legacy API. - def load_byte(self, data, legacy_api=True): + def load_byte(self, data, legacy_api: bool = True): return data @_register_writer(1) # Basic type, except for the legacy API. @@ -767,7 +767,7 @@ class ImageFileDirectory_v2(_IFDv2Base): return data @_register_loader(2, 1) - def load_string(self, data, legacy_api=True): + def load_string(self, data: bytes, legacy_api: bool = True) -> str: if data.endswith(b"\0"): data = data[:-1] return data.decode("latin-1", "replace") @@ -797,7 +797,7 @@ class ImageFileDirectory_v2(_IFDv2Base): ) @_register_loader(7, 1) - def load_undefined(self, data, legacy_api=True): + def load_undefined(self, data, legacy_api: bool = True): return data @_register_writer(7) @@ -809,7 +809,7 @@ class ImageFileDirectory_v2(_IFDv2Base): return value @_register_loader(10, 8) - def load_signed_rational(self, data, legacy_api=True): + def load_signed_rational(self, data, legacy_api: bool = True): vals = self._unpack(f"{len(data) // 4}l", data) def combine(a, b): @@ -1030,7 +1030,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2): """Dictionary of tag types""" @classmethod - def from_v2(cls, original) -> ImageFileDirectory_v1: + def from_v2(cls, original: ImageFileDirectory_v2) -> ImageFileDirectory_v1: """Returns an :py:class:`~PIL.TiffImagePlugin.ImageFileDirectory_v1` instance with the same data as is contained in the original @@ -1073,7 +1073,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2): def __iter__(self): return iter(set(self._tagdata) | set(self._tags_v1)) - def __setitem__(self, tag, value) -> None: + def __setitem__(self, tag: int, value) -> None: for legacy_api in (False, True): self._setitem(tag, value, legacy_api) @@ -1212,7 +1212,7 @@ class TiffImageFile(ImageFile.ImageFile): """Return the current frame number""" return self.__frame - def get_photoshop_blocks(self): + def get_photoshop_blocks(self) -> dict[int, dict[str, bytes]]: """ Returns a dictionary of Photoshop "Image Resource Blocks". The keys are the image resource ID. For more information, see @@ -1259,7 +1259,7 @@ class TiffImageFile(ImageFile.ImageFile): if ExifTags.Base.Orientation in self.tag_v2: del self.tag_v2[ExifTags.Base.Orientation] - def _load_libtiff(self): + def _load_libtiff(self) -> Image.core.PixelAccess | None: """Overload method triggered when we detect a compressed tiff Calls out to libtiff""" diff --git a/src/PIL/TiffTags.py b/src/PIL/TiffTags.py index e318c8739..86adaa458 100644 --- a/src/PIL/TiffTags.py +++ b/src/PIL/TiffTags.py @@ -32,17 +32,24 @@ class _TagInfo(NamedTuple): class TagInfo(_TagInfo): __slots__: list[str] = [] - def __new__(cls, value=None, name="unknown", type=None, length=None, enum=None): + def __new__( + cls, + value: int | None = None, + name: str = "unknown", + type: int | None = None, + length: int | None = None, + enum: dict[str, int] | None = None, + ) -> TagInfo: return super().__new__(cls, value, name, type, length, enum or {}) - def cvt_enum(self, value): + def cvt_enum(self, value: str) -> int | str: # Using get will call hash(value), which can be expensive # for some types (e.g. Fraction). Since self.enum is rarely # used, it's usually better to test it first. return self.enum.get(value, value) if self.enum else value -def lookup(tag, group=None): +def lookup(tag: int, group: int | None = None) -> TagInfo: """ :param tag: Integer tag number :param group: Which :py:data:`~PIL.TiffTags.TAGS_V2_GROUPS` to look in @@ -89,7 +96,7 @@ DOUBLE = 12 IFD = 13 LONG8 = 16 -_tags_v2 = { +_tags_v2: dict[int, tuple[str, int, int] | tuple[str, int, int, dict[str, int]]] = { 254: ("NewSubfileType", LONG, 1), 255: ("SubfileType", SHORT, 1), 256: ("ImageWidth", LONG, 1), @@ -233,7 +240,7 @@ _tags_v2 = { 50838: ("ImageJMetaDataByteCounts", LONG, 0), # Can be more than one 50839: ("ImageJMetaData", UNDEFINED, 1), # see Issue #2006 } -TAGS_V2_GROUPS = { +_tags_v2_groups = { # ExifIFD 34665: { 36864: ("ExifVersion", UNDEFINED, 1), @@ -281,7 +288,7 @@ TAGS_V2_GROUPS = { # Legacy Tags structure # these tags aren't included above, but were in the previous versions -TAGS = { +TAGS: dict[int | tuple[int, int], str] = { 347: "JPEGTables", 700: "XMP", # Additional Exif Info @@ -426,9 +433,10 @@ TAGS = { } TAGS_V2: dict[int, TagInfo] = {} +TAGS_V2_GROUPS: dict[int, dict[int, TagInfo]] = {} -def _populate(): +def _populate() -> None: for k, v in _tags_v2.items(): # Populate legacy structure. TAGS[k] = v[0] @@ -438,9 +446,8 @@ def _populate(): TAGS_V2[k] = TagInfo(k, *v) - for tags in TAGS_V2_GROUPS.values(): - for k, v in tags.items(): - tags[k] = TagInfo(k, *v) + for group, tags in _tags_v2_groups.items(): + TAGS_V2_GROUPS[group] = {k: TagInfo(k, *v) for k, v in tags.items()} _populate() From b976a8496df8ad741595decac321f5469a100d77 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 08:07:12 +0000 Subject: [PATCH 185/662] Update dependency mypy to v1.11.0 --- .ci/requirements-mypy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-mypy.txt b/.ci/requirements-mypy.txt index 6dd432488..776bb0dbb 100644 --- a/.ci/requirements-mypy.txt +++ b/.ci/requirements-mypy.txt @@ -1 +1 @@ -mypy==1.10.1 +mypy==1.11.0 From 882a196a8f04f446c9ea6eaaac900fdecf220429 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 20 Jul 2024 18:59:27 +1000 Subject: [PATCH 186/662] Removed unused ignores --- Tests/test_file_png.py | 2 +- Tests/test_file_ppm.py | 2 +- Tests/test_psdraw.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py index e2913e944..4958b2222 100644 --- a/Tests/test_file_png.py +++ b/Tests/test_file_png.py @@ -776,7 +776,7 @@ class TestFilePng: mystdout: MyStdOut | BytesIO = MyStdOut() if buffer else BytesIO() - sys.stdout = mystdout # type: ignore[assignment] + sys.stdout = mystdout with Image.open(TEST_PNG_FILE) as im: im.save(sys.stdout, "PNG") diff --git a/Tests/test_file_ppm.py b/Tests/test_file_ppm.py index d6451ec18..0a61830a4 100644 --- a/Tests/test_file_ppm.py +++ b/Tests/test_file_ppm.py @@ -373,7 +373,7 @@ def test_save_stdout(buffer: bool) -> None: mystdout: MyStdOut | BytesIO = MyStdOut() if buffer else BytesIO() - sys.stdout = mystdout # type: ignore[assignment] + sys.stdout = mystdout with Image.open(TEST_FILE) as im: im.save(sys.stdout, "PPM") diff --git a/Tests/test_psdraw.py b/Tests/test_psdraw.py index 130ffa863..c3afa9089 100644 --- a/Tests/test_psdraw.py +++ b/Tests/test_psdraw.py @@ -59,7 +59,7 @@ def test_stdout(buffer: bool) -> None: mystdout: MyStdOut | BytesIO = MyStdOut() if buffer else BytesIO() - sys.stdout = mystdout # type: ignore[assignment] + sys.stdout = mystdout ps = PSDraw.PSDraw() _create_document(ps) From 38458a204cbbe1a83b458dd8d6be8762bc73ca99 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 20 Jul 2024 19:07:42 +1000 Subject: [PATCH 187/662] Corrected type hints --- Tests/test_file_mpo.py | 2 ++ src/PIL/JpegImagePlugin.py | 4 ++-- src/PIL/PngImagePlugin.py | 2 +- src/PIL/WebPImagePlugin.py | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Tests/test_file_mpo.py b/Tests/test_file_mpo.py index 5402fcb44..e0f42a266 100644 --- a/Tests/test_file_mpo.py +++ b/Tests/test_file_mpo.py @@ -85,7 +85,9 @@ def test_exif(test_file: str) -> None: im_reloaded = roundtrip(im_original, save_all=True, exif=im_original.getexif()) for im in (im_original, im_reloaded): + assert isinstance(im, MpoImagePlugin.MpoImageFile) info = im._getexif() + assert info is not None assert info[272] == "Nintendo 3DS" assert info[296] == 2 assert info[34665] == 188 diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index af24faa5d..d83d60b7b 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -468,7 +468,7 @@ class JpegImageFile(ImageFile.ImageFile): self.tile = [] - def _getexif(self) -> dict[str, Any] | None: + def _getexif(self) -> dict[int, Any] | None: return _getexif(self) def _read_dpi_from_exif(self) -> None: @@ -504,7 +504,7 @@ class JpegImageFile(ImageFile.ImageFile): return _getmp(self) -def _getexif(self: JpegImageFile) -> dict[str, Any] | None: +def _getexif(self: JpegImageFile) -> dict[int, Any] | None: if "exif" not in self.info: return None return self.getexif()._get_merged_dict() diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 247f908ed..58db7777c 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -1054,7 +1054,7 @@ class PngImageFile(ImageFile.ImageFile): self._prev_im.paste(updated, self.dispose_extent, mask) self.im = self._prev_im - def _getexif(self) -> dict[str, Any] | None: + def _getexif(self) -> dict[int, Any] | None: if "exif" not in self.info: self.load() if "exif" not in self.info and "Raw profile type exif" not in self.info: diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index 011de9c6a..cec796340 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -96,7 +96,7 @@ class WebPImageFile(ImageFile.ImageFile): # Initialize seek state self._reset(reset=False) - def _getexif(self) -> dict[str, Any] | None: + def _getexif(self) -> dict[int, Any] | None: if "exif" not in self.info: return None return self.getexif()._get_merged_dict() From ddc02bb78c327a1025a772619dd3114752cbb68b Mon Sep 17 00:00:00 2001 From: "Jeffrey A. Clark (Alex)" Date: Sat, 20 Jul 2024 14:41:47 -0400 Subject: [PATCH 188/662] Update and add image to PostScript printing example --- docs/handbook/hopper_ps.png | Bin 0 -> 76966 bytes docs/handbook/tutorial.rst | 65 ++++++++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 docs/handbook/hopper_ps.png diff --git a/docs/handbook/hopper_ps.png b/docs/handbook/hopper_ps.png new file mode 100644 index 0000000000000000000000000000000000000000..fe44e79843f1f46eb2db109d96248670bb645eed GIT binary patch literal 76966 zcmdqJWn5HS^fyjQg9ri&k}BN-Lk^7y5+XG;NJ$Lc-5n|=4H8OsmvooJ(A`}_^FMm; z{axZB#ASZ=``4kfY0Rcz)wfH*(1f)&`1ms@y z2f&juvFD2j2#C6-Vqyx?Vq%mEHc%r|b3+6Kx@h|-@M|P%!pB|!v=daEjvgU|m>&jan@^lQ^b~OgsJzfcN&M&8%$UCac=D#D>Wmyt^l2y& zV|ZJCyXKJ1-ixyVRxf~Cb-M;nYVlF#l%A&}{0zgTY!4d43B<5`C}sXM#7VNN>Ql^in!k1Q ziqx5g{Lejd@9&BtN@CK|z_*ftjiI5XtqIglD>*I`=xW^by_%icTUkB>s0EAO2dKUw zi<5=b?o|MU0PI1Qal z|D|MU`}eef39|k!VP$7wWBs4Lfu;h#pYkb~IvJX)ii>;Y&9@$#?>{Hgzcl>AHa zUQ4xqTk^2~r{%qp|J_pA*3d=_Y5|b66Z%&&f0Mmm_;*7A*55O~$BDn#{O2jaXCX`h z*8h>25av^X)#nHZ!U)phBJZ6LcN#F9G*_L^?)tK|Dw+1L8uxc}(Q&ErG1M{ok-nLJ zdYNweHE(w;Zxej;DO+b`TShw3Z8xsK6v@vozz+fADgu#|loa`adA*)S<*M>{;joF( zE&PT&c{o~tCOrH@Wd2o!l(Fkz-Sq$y+!43B0`hztzCk z+q3XC?V@GxJY#r}d_x=kYI1aeid;zOG`Tg|*IZlf_N~Sj{+l;$+4*bNXE|#_-Vd4VDh}tle6B56H}ZSAJ?}yR3T;0=rQVxH#6vnsMy+K zU}RvZ92t4Hg2$WQx0R4oz4tM&inI4NW&Prb@0IVicII`&WsQ33);IX>WBGFzQU~JHrKB z?lzAn!1LgOf`ak6IZLTX@(N!xJXnfgT|wbqPz+%lL|R&1^7+;N>Z>0(;iUXE$HrV1 zhfbuJK^hW@ZM7>pNLJ0kbovL_YgcE-o$&F)?3)wibeN79?uQ ze=px?gjq(qsJuL>$+KPl-2!H)J#kkt8Gj(wx(2qMfbBRoDcB?F8L!Q+uZf9h2B~94 z_zw~Py}I6bX+N|p3F=(tcGw|Ve{ndj0af=C>W+>-&drSD;3$VkNF=;X7wA5BF z3DSfuO-#y<2b-Er^&m0yQLUO!*!5Aane_)c&t(JB8iVigDacFSYk7NQlh7?HFZ_W) zwiS|fSSR&+(y_9f_?sO_$o;C#2{K+&aoPj~w6fwKDjg<<*=Wy6cx}G0<0gIjm-B!W zuwNjNCGptⅆ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

    5#|r#- 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 literal 0 HcmV?d00001 diff --git a/docs/handbook/tutorial.rst b/docs/handbook/tutorial.rst index ffa8fa019..bc4339928 100644 --- a/docs/handbook/tutorial.rst +++ b/docs/handbook/tutorial.rst @@ -567,25 +567,62 @@ Drawing PostScript :: - from PIL import Image - from PIL import PSDraw + from PIL import Image, PSDraw + import os - with Image.open("hopper.ppm") as im: - title = "hopper" - box = (1 * 72, 2 * 72, 7 * 72, 10 * 72) # in points + # Define the PostScript file + ps_file = open("hopper.ps", "wb") - ps = PSDraw.PSDraw() # default is sys.stdout or sys.stdout.buffer - ps.begin_document(title) + # Create a PSDraw object + ps = PSDraw.PSDraw(ps_file) - # draw the image (75 dpi) - ps.image(box, im, 75) - ps.rectangle(box) + # Start the document + ps.begin_document() - # draw title - ps.setfont("HelveticaNarrow-Bold", 36) - ps.text((3 * 72, 4 * 72), title) + # Set the text to be drawn + text = "Hopper" - ps.end_document() + # Define the PostScript font + font_name = "Helvetica-Narrow-Bold" + font_size = 36 + + # Calculate text size (approximation as PSDraw doesn't provide direct method) + # Assuming average character width as 0.6 of the font size + text_width = len(text) * font_size * 0.6 + text_height = font_size + + # Set the position (top-center) + page_width, page_height = 595, 842 # A4 size in points + text_x = (page_width - text_width) // 2 + text_y = page_height - text_height - 50 # Distance from the top of the page + + # Load the image + image_path = os.path.join("img", "hopper.ppm") # Update this with your image path + with Image.open(image_path) as im: + # Resize the image if it's too large + im.thumbnail((page_width - 100, page_height // 2)) + + # Define the box where the image will be placed + img_width, img_height = im.size + img_x = (page_width - img_width) // 2 + img_y = text_y + text_height - 200 # 200 points below the text + + # Draw the image (75 dpi) + ps.image((img_x, img_y, img_x + img_width, img_y + img_height), im, 75) + + # Draw the text + ps.setfont(font_name, font_size) + ps.text((text_x, text_y), text) + + # End the document + ps.end_document() + ps_file.close() + +.. image:: hopper_ps.png + +.. note:: + + PostScript converted to PDF for display purposes More on reading images ---------------------- From 1cf887dbec2387d1e3228497cc12329bf84d18e5 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 21 Jul 2024 05:22:13 +1000 Subject: [PATCH 189/662] Rearranged code --- Tests/test_file_libtiff.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py index 58ac705c9..62f8719af 100644 --- a/Tests/test_file_libtiff.py +++ b/Tests/test_file_libtiff.py @@ -241,10 +241,10 @@ class TestFileLibTiff(LibTiffTestCase): new_ifd = TiffImagePlugin.ImageFileDirectory_v2() for tag, info in core_items.items(): assert info.type is not None - if not info.length: - new_ifd[tag] = tuple(values[info.type] for _ in range(3)) - elif info.length == 1: + if info.length == 1: new_ifd[tag] = values[info.type] + elif not info.length: + new_ifd[tag] = tuple(values[info.type] for _ in range(3)) else: new_ifd[tag] = tuple(values[info.type] for _ in range(info.length)) From 22ef8df59abf461824e4672bba8c47137730ef57 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Mon, 22 Jul 2024 00:29:55 -0500 Subject: [PATCH 190/662] Do not run scheduled wheel jobs on forks --- .github/workflows/wheels.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index ffd1abd95..3ed1b5926 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -97,6 +97,7 @@ jobs: path: ./wheelhouse/*.whl build-2-native-wheels: + if: github.event_name != 'schedule' || github.repository_owner == 'python-pillow' name: ${{ matrix.name }} runs-on: ${{ matrix.os }} strategy: @@ -150,6 +151,7 @@ jobs: path: ./wheelhouse/*.whl windows: + if: github.event_name != 'schedule' || github.repository_owner == 'python-pillow' name: Windows ${{ matrix.cibw_arch }} runs-on: windows-latest strategy: @@ -256,7 +258,7 @@ jobs: path: dist/*.tar.gz scientific-python-nightly-wheels-publish: - if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' + if: github.repository_owner == 'python-pillow' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') needs: [build-2-native-wheels, windows] runs-on: ubuntu-latest name: Upload wheels to scientific-python-nightly-wheels @@ -273,7 +275,7 @@ jobs: anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} pypi-publish: - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') + if: github.repository_owner == 'python-pillow' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags') needs: [build-1-QEMU-emulated-wheels, build-2-native-wheels, windows, sdist] runs-on: ubuntu-latest name: Upload release to PyPI From 96fa1f5dbf43fe26a9b7abd98697ae46e8165435 Mon Sep 17 00:00:00 2001 From: "Jeffrey A. Clark (Alex)" Date: Tue, 23 Jul 2024 14:55:04 -0400 Subject: [PATCH 191/662] multiply each pixel by 20 --- docs/handbook/tutorial.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/handbook/tutorial.rst b/docs/handbook/tutorial.rst index bc4339928..4e7477143 100644 --- a/docs/handbook/tutorial.rst +++ b/docs/handbook/tutorial.rst @@ -412,8 +412,8 @@ Applying point transforms :: - # multiply each pixel by 1.2 - out = im.point(lambda i: i * 1.2) + # multiply each pixel by 20 + out = im.point(lambda i: i * 20) .. image:: transformed_hopper.jpg :align: center From cf6ec5e065e910d8ce5951de0d19a84879ea77c9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 24 Jul 2024 06:44:06 +1000 Subject: [PATCH 192/662] Converted images to WebP --- docs/handbook/hopper_ps.png | Bin 76966 -> 0 bytes docs/handbook/hopper_ps.webp | Bin 0 -> 8322 bytes docs/handbook/transformed_hopper.jpg | Bin 3608 -> 0 bytes docs/handbook/transformed_hopper.webp | Bin 0 -> 3054 bytes docs/handbook/tutorial.rst | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 docs/handbook/hopper_ps.png create mode 100644 docs/handbook/hopper_ps.webp delete mode 100644 docs/handbook/transformed_hopper.jpg create mode 100644 docs/handbook/transformed_hopper.webp diff --git a/docs/handbook/hopper_ps.png b/docs/handbook/hopper_ps.png deleted file mode 100644 index fe44e79843f1f46eb2db109d96248670bb645eed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76966 zcmdqJWn5HS^fyjQg9ri&k}BN-Lk^7y5+XG;NJ$Lc-5n|=4H8OsmvooJ(A`}_^FMm; z{axZB#ASZ=``4kfY0Rcz)wfH*(1f)&`1ms@y z2f&juvFD2j2#C6-Vqyx?Vq%mEHc%r|b3+6Kx@h|-@M|P%!pB|!v=daEjvgU|m>&jan@^lQ^b~OgsJzfcN&M&8%$UCac=D#D>Wmyt^l2y& zV|ZJCyXKJ1-ixyVRxf~Cb-M;nYVlF#l%A&}{0zgTY!4d43B<5`C}sXM#7VNN>Ql^in!k1Q ziqx5g{Lejd@9&BtN@CK|z_*ftjiI5XtqIglD>*I`=xW^by_%icTUkB>s0EAO2dKUw zi<5=b?o|MU0PI1Qal z|D|MU`}eef39|k!VP$7wWBs4Lfu;h#pYkb~IvJX)ii>;Y&9@$#?>{Hgzcl>AHa zUQ4xqTk^2~r{%qp|J_pA*3d=_Y5|b66Z%&&f0Mmm_;*7A*55O~$BDn#{O2jaXCX`h z*8h>25av^X)#nHZ!U)phBJZ6LcN#F9G*_L^?)tK|Dw+1L8uxc}(Q&ErG1M{ok-nLJ zdYNweHE(w;Zxej;DO+b`TShw3Z8xsK6v@vozz+fADgu#|loa`adA*)S<*M>{;joF( zE&PT&c{o~tCOrH@Wd2o!l(Fkz-Sq$y+!43B0`hztzCk z+q3XC?V@GxJY#r}d_x=kYI1aeid;zOG`Tg|*IZlf_N~Sj{+l;$+4*bNXE|#_-Vd4VDh}tle6B56H}ZSAJ?}yR3T;0=rQVxH#6vnsMy+K zU}RvZ92t4Hg2$WQx0R4oz4tM&inI4NW&Prb@0IVicII`&WsQ33);IX>WBGFzQU~JHrKB z?lzAn!1LgOf`ak6IZLTX@(N!xJXnfgT|wbqPz+%lL|R&1^7+;N>Z>0(;iUXE$HrV1 zhfbuJK^hW@ZM7>pNLJ0kbovL_YgcE-o$&F)?3)wibeN79?uQ ze=px?gjq(qsJuL>$+KPl-2!H)J#kkt8Gj(wx(2qMfbBRoDcB?F8L!Q+uZf9h2B~94 z_zw~Py}I6bX+N|p3F=(tcGw|Ve{ndj0af=C>W+>-&drSD;3$VkNF=;X7wA5BF z3DSfuO-#y<2b-Er^&m0yQLUO!*!5Aane_)c&t(JB8iVigDacFSYk7NQlh7?HFZ_W) zwiS|fSSR&+(y_9f_?sO_$o;C#2{K+&aoPj~w6fwKDjg<<*=Wy6cx}G0<0gIjm-B!W zuwNjNCGptⅆ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

    5#|r#- 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 diff --git a/docs/handbook/hopper_ps.webp b/docs/handbook/hopper_ps.webp new file mode 100644 index 0000000000000000000000000000000000000000..3dd2943d68262e42c96df88647fb958413560f20 GIT binary patch literal 8322 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 T%)hKKorTfBZ2#<;FxvkBGmtjo literal 0 HcmV?d00001 diff --git a/docs/handbook/transformed_hopper.jpg b/docs/handbook/transformed_hopper.jpg deleted file mode 100644 index 33afe67e62be8f3e2922c5cfa5c0018774ac0b5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3608 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 literal 0 HcmV?d00001 diff --git a/docs/handbook/tutorial.rst b/docs/handbook/tutorial.rst index 4e7477143..d8a1ae9c9 100644 --- a/docs/handbook/tutorial.rst +++ b/docs/handbook/tutorial.rst @@ -415,7 +415,7 @@ Applying point transforms # multiply each pixel by 20 out = im.point(lambda i: i * 20) -.. image:: transformed_hopper.jpg +.. image:: transformed_hopper.webp :align: center Using the above technique, you can quickly apply any simple expression to an @@ -618,7 +618,7 @@ Drawing PostScript ps.end_document() ps_file.close() -.. image:: hopper_ps.png +.. image:: hopper_ps.webp .. note:: From 888b2f716e0873bd7692fd1055c0b588de648352 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 24 Jul 2024 06:56:42 +1000 Subject: [PATCH 193/662] Improved consistency of example paths --- docs/handbook/tutorial.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/handbook/tutorial.rst b/docs/handbook/tutorial.rst index d8a1ae9c9..fead6fb21 100644 --- a/docs/handbook/tutorial.rst +++ b/docs/handbook/tutorial.rst @@ -332,7 +332,7 @@ choose to resize relative to a given size. from PIL import Image, ImageOps size = (100, 150) - with Image.open("Tests/images/hopper.webp") as im: + with Image.open("hopper.webp") as im: ImageOps.contain(im, size).save("imageops_contain.webp") ImageOps.cover(im, size).save("imageops_cover.webp") ImageOps.fit(im, size).save("imageops_fit.webp") @@ -597,7 +597,7 @@ Drawing PostScript text_y = page_height - text_height - 50 # Distance from the top of the page # Load the image - image_path = os.path.join("img", "hopper.ppm") # Update this with your image path + image_path = "hopper.ppm" # Update this with your image path with Image.open(image_path) as im: # Resize the image if it's too large im.thumbnail((page_width - 100, page_height // 2)) @@ -690,7 +690,7 @@ Reading from a tar archive from PIL import Image, TarIO - fp = TarIO.TarIO("Tests/images/hopper.tar", "hopper.jpg") + fp = TarIO.TarIO("hopper.tar", "hopper.jpg") im = Image.open(fp) @@ -705,7 +705,6 @@ in the current directory can be saved as JPEGs at reduced quality. import glob from PIL import Image - def compress_image(source_path, dest_path): with Image.open(source_path) as img: if img.mode != "RGB": From 8f4dbfe6a64240f613372a6a66f2e7cc563b4251 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 24 Jul 2024 06:56:59 +1000 Subject: [PATCH 194/662] Simplified code --- docs/handbook/tutorial.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/handbook/tutorial.rst b/docs/handbook/tutorial.rst index fead6fb21..c36011362 100644 --- a/docs/handbook/tutorial.rst +++ b/docs/handbook/tutorial.rst @@ -603,12 +603,11 @@ Drawing PostScript im.thumbnail((page_width - 100, page_height // 2)) # Define the box where the image will be placed - img_width, img_height = im.size - img_x = (page_width - img_width) // 2 + img_x = (page_width - im.width) // 2 img_y = text_y + text_height - 200 # 200 points below the text # Draw the image (75 dpi) - ps.image((img_x, img_y, img_x + img_width, img_y + img_height), im, 75) + ps.image((img_x, img_y, img_x + im.width, img_y + im.height), im, 75) # Draw the text ps.setfont(font_name, font_size) From 77df988d06fee6e3ba87d125912870eed55c5da0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 24 Jul 2024 19:51:19 +1000 Subject: [PATCH 195/662] Support RGBA palettes --- Tests/test_file_jpeg2k.py | 7 +++++++ src/PIL/Jpeg2KImagePlugin.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py index a5cfa7c6c..d7100a761 100644 --- a/Tests/test_file_jpeg2k.py +++ b/Tests/test_file_jpeg2k.py @@ -391,6 +391,13 @@ def test_pclr() -> None: assert len(im.palette.colors) == 256 assert im.palette.colors[(255, 255, 255)] == 0 + with Image.open( + f"{EXTRA_DIR}/147af3f1083de4393666b7d99b01b58b_signal_sigsegv_130c531_6155_5136.jp2" + ) as im: + assert im.mode == "P" + assert len(im.palette.colors) == 139 + assert im.palette.colors[(0, 0, 0, 0)] == 0 + def test_comment() -> None: with Image.open("Tests/images/comment.jp2") as im: diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py index eeec41686..c5e33b905 100644 --- a/src/PIL/Jpeg2KImagePlugin.py +++ b/src/PIL/Jpeg2KImagePlugin.py @@ -205,7 +205,7 @@ def _parse_jp2_header( if bitdepth > max_bitdepth: max_bitdepth = bitdepth if max_bitdepth <= 8: - palette = ImagePalette.ImagePalette() + palette = ImagePalette.ImagePalette("RGBA" if npc == 4 else "RGB") for i in range(ne): color: list[int] = [] for value in header.read_fields(">" + ("B" * npc)): From ab635be11bfbf1ac67fdf13f50c66781a7849ca9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 24 Jul 2024 22:08:15 +1000 Subject: [PATCH 196/662] Removed unused argument --- src/PIL/ImageDraw.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py index 2b3620e71..ce8e66571 100644 --- a/src/PIL/ImageDraw.py +++ b/src/PIL/ImageDraw.py @@ -623,7 +623,7 @@ class ImageDraw: return fill_ink return ink - def draw_text(ink, stroke_width=0, stroke_offset=None) -> None: + def draw_text(ink, stroke_width=0) -> None: mode = self.fontmode if stroke_width == 0 and embedded_color: mode = "RGBA" @@ -664,8 +664,6 @@ class ImageDraw: ) except TypeError: mask = font.getmask(text) - if stroke_offset: - coord = [coord[0] + stroke_offset[0], coord[1] + stroke_offset[1]] if mode == "RGBA": # font.getmask2(mode="RGBA") returns color in RGB bands and mask in A # extract mask and set text alpha From 7a570d67bf518684a63721ae40d151d40cf2874d Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:32:20 +0300 Subject: [PATCH 197/662] Remove unused _util.is_directory --- Tests/test_util.py | 22 ---------------------- src/PIL/_util.py | 5 ----- 2 files changed, 27 deletions(-) diff --git a/Tests/test_util.py b/Tests/test_util.py index 197ef79ee..9eaabf18a 100644 --- a/Tests/test_util.py +++ b/Tests/test_util.py @@ -30,28 +30,6 @@ def test_is_not_path(tmp_path: Path) -> None: assert not it_is_not -def test_is_directory() -> None: - # Arrange - directory = "Tests" - - # Act - it_is = _util.is_directory(directory) - - # Assert - assert it_is - - -def test_is_not_directory() -> None: - # Arrange - text = "abc" - - # Act - it_is_not = _util.is_directory(text) - - # Assert - assert not it_is_not - - def test_deferred_error() -> None: # Arrange diff --git a/src/PIL/_util.py b/src/PIL/_util.py index 6bc762816..8ef0d36f7 100644 --- a/src/PIL/_util.py +++ b/src/PIL/_util.py @@ -10,11 +10,6 @@ def is_path(f: Any) -> TypeGuard[StrOrBytesPath]: return isinstance(f, (bytes, str, os.PathLike)) -def is_directory(f: Any) -> TypeGuard[StrOrBytesPath]: - """Checks if an object is a string, and that it points to a directory.""" - return is_path(f) and os.path.isdir(f) - - class DeferredError: def __init__(self, ex: BaseException): self.ex = ex From 72a243c49815b95df5a64a950db6dc815c91cb88 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 24 Jul 2024 11:44:44 -0600 Subject: [PATCH 198/662] Revert "Corrected exiv2.org links" --- Tests/test_file_jpeg.py | 2 +- src/PIL/JpegPresets.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index 68705094b..9660e2828 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -829,7 +829,7 @@ class TestFileJpeg: with Image.open("Tests/images/no-dpi-in-exif.jpg") as im: # Act / Assert # "When the image resolution is unknown, 72 [dpi] is designated." - # https://web.archive.org/web/20240227115053/https://exiv2.org/tags.html + # https://exiv2.org/tags.html assert im.info.get("dpi") == (72, 72) def test_invalid_exif(self) -> None: diff --git a/src/PIL/JpegPresets.py b/src/PIL/JpegPresets.py index 3aefa073c..d0e64a35e 100644 --- a/src/PIL/JpegPresets.py +++ b/src/PIL/JpegPresets.py @@ -37,7 +37,7 @@ You can get the subsampling of a JPEG with the :func:`.JpegImagePlugin.get_sampling` function. In JPEG compressed data a JPEG marker is used instead of an EXIF tag. -(ref.: https://web.archive.org/web/20240227115053/https://exiv2.org/tags.html) +(ref.: https://exiv2.org/tags.html) Quantization tables From d0d4227515c91a779520881a8adf164835691859 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 25 Jul 2024 18:45:38 +1000 Subject: [PATCH 199/662] Require font parameter in FreeTypeFont --- src/PIL/ImageFont.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index d260eef69..2f41c29cd 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -203,7 +203,7 @@ class FreeTypeFont: def __init__( self, - font: StrOrBytesPath | BinaryIO | None = None, + font: StrOrBytesPath | BinaryIO, size: float = 10, index: int = 0, encoding: str = "", From 68328ccc6adadab538c559acfd6506b5c6998cd4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 25 Jul 2024 18:52:04 +1000 Subject: [PATCH 200/662] Require font parameter for truetype() --- src/PIL/ImageFont.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 2f41c29cd..b2d79c25f 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -756,7 +756,7 @@ def load(filename: str) -> ImageFont: def truetype( - font: StrOrBytesPath | BinaryIO | None = None, + font: StrOrBytesPath | BinaryIO, size: float = 10, index: int = 0, encoding: str = "", @@ -827,7 +827,7 @@ def truetype( :exception ValueError: If the font size is not greater than zero. """ - def freetype(font: StrOrBytesPath | BinaryIO | None) -> FreeTypeFont: + def freetype(font: StrOrBytesPath | BinaryIO) -> FreeTypeFont: return FreeTypeFont(font, size, index, encoding, layout_engine) try: From 726cdf5eed05b2494f2948878c3f2a8c1bc9bfab Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 25 Jul 2024 22:55:49 +1000 Subject: [PATCH 201/662] Added type hints --- Tests/test_font_pcf.py | 3 +- Tests/test_imagefont.py | 4 +- docs/reference/ImageFont.rst | 8 ++ docs/reference/internal_modules.rst | 4 + pyproject.toml | 2 - src/PIL/Image.py | 68 ++++++++------ src/PIL/ImageDraw.py | 140 +++++++++++++++------------- src/PIL/ImageFont.py | 93 +++++++++++------- src/PIL/_imaging.pyi | 1 + src/PIL/_imagingft.pyi | 58 ++++++------ 10 files changed, 223 insertions(+), 158 deletions(-) diff --git a/Tests/test_font_pcf.py b/Tests/test_font_pcf.py index 997809e46..567ddaf13 100644 --- a/Tests/test_font_pcf.py +++ b/Tests/test_font_pcf.py @@ -2,6 +2,7 @@ from __future__ import annotations import os from pathlib import Path +from typing import AnyStr import pytest @@ -92,7 +93,7 @@ def test_textsize(request: pytest.FixtureRequest, tmp_path: Path) -> None: def _test_high_characters( - request: pytest.FixtureRequest, tmp_path: Path, message: str | bytes + request: pytest.FixtureRequest, tmp_path: Path, message: AnyStr ) -> None: tempname = save_font(request, tmp_path) font = ImageFont.load(tempname) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 9cb420371..340cc4742 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -717,14 +717,14 @@ def test_variation_set_by_name(font: ImageFont.FreeTypeFont) -> None: font = ImageFont.truetype("Tests/fonts/AdobeVFPrototype.ttf", 36) _check_text(font, "Tests/images/variation_adobe.png", 11) - for name in ["Bold", b"Bold"]: + for name in ("Bold", b"Bold"): font.set_variation_by_name(name) assert font.getname()[1] == "Bold" _check_text(font, "Tests/images/variation_adobe_name.png", 16) font = ImageFont.truetype("Tests/fonts/TINY5x3GX.ttf", 36) _check_text(font, "Tests/images/variation_tiny.png", 40) - for name in ["200", b"200"]: + for name in ("200", b"200"): font.set_variation_by_name(name) assert font.getname()[1] == "200" _check_text(font, "Tests/images/variation_tiny_name.png", 40) diff --git a/docs/reference/ImageFont.rst b/docs/reference/ImageFont.rst index edbdd9a32..d9d9cac6e 100644 --- a/docs/reference/ImageFont.rst +++ b/docs/reference/ImageFont.rst @@ -91,3 +91,11 @@ Constants Set to 1,000,000, to protect against potential DOS attacks. Pillow will raise a :py:exc:`ValueError` if the number of characters is over this limit. The check can be disabled by setting ``ImageFont.MAX_STRING_LENGTH = None``. + +Dictionaries +------------ + +.. autoclass:: Axis + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/reference/internal_modules.rst b/docs/reference/internal_modules.rst index e4cb17c4d..2fb4ff8c0 100644 --- a/docs/reference/internal_modules.rst +++ b/docs/reference/internal_modules.rst @@ -78,3 +78,7 @@ on some Python versions. An internal interface module previously known as :mod:`~PIL._imaging`, implemented in :file:`_imaging.c`. + +.. py:class:: ImagingCore + + A representation of the image data. diff --git a/pyproject.toml b/pyproject.toml index b76f3c24d..0940664f3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -159,6 +159,4 @@ exclude = [ '^Tests/oss-fuzz/fuzz_font.py$', '^Tests/oss-fuzz/fuzz_pillow.py$', '^Tests/test_qt_image_qapplication.py$', - '^Tests/test_font_pcf_charsets.py$', - '^Tests/test_font_pcf.py$', ] diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 9d901e028..aa5eeabb2 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -218,6 +218,8 @@ if hasattr(core, "DEFAULT_STRATEGY"): # Registries if TYPE_CHECKING: + from xml.etree.ElementTree import Element + from . import ImageFile, ImagePalette from ._typing import NumpyArray, StrOrBytesPath, TypeGuard ID: list[str] = [] @@ -241,9 +243,9 @@ ENCODERS: dict[str, type[ImageFile.PyEncoder]] = {} _ENDIAN = "<" if sys.byteorder == "little" else ">" -def _conv_type_shape(im): +def _conv_type_shape(im: Image) -> tuple[tuple[int, ...], str]: m = ImageMode.getmode(im.mode) - shape = (im.height, im.width) + shape: tuple[int, ...] = (im.height, im.width) extra = len(m.bands) if extra != 1: shape += (extra,) @@ -470,10 +472,10 @@ class _E: self.scale = scale self.offset = offset - def __neg__(self): + def __neg__(self) -> _E: return _E(-self.scale, -self.offset) - def __add__(self, other): + def __add__(self, other) -> _E: if isinstance(other, _E): return _E(self.scale + other.scale, self.offset + other.offset) return _E(self.scale, self.offset + other) @@ -486,14 +488,14 @@ class _E: def __rsub__(self, other): return other + -self - def __mul__(self, other): + def __mul__(self, other) -> _E: if isinstance(other, _E): return NotImplemented return _E(self.scale * other, self.offset * other) __rmul__ = __mul__ - def __truediv__(self, other): + def __truediv__(self, other) -> _E: if isinstance(other, _E): return NotImplemented return _E(self.scale / other, self.offset / other) @@ -718,9 +720,9 @@ class Image: return self._repr_image("JPEG") @property - def __array_interface__(self): + def __array_interface__(self) -> dict[str, str | bytes | int | tuple[int, ...]]: # numpy array interface support - new = {"version": 3} + new: dict[str, str | bytes | int | tuple[int, ...]] = {"version": 3} try: if self.mode == "1": # Binary images need to be extended from bits to bytes @@ -1418,7 +1420,7 @@ class Image: return out return self.im.getcolors(maxcolors) - def getdata(self, band: int | None = None): + def getdata(self, band: int | None = None) -> core.ImagingCore: """ Returns the contents of this image as a sequence object containing pixel values. The sequence object is flattened, so @@ -1467,8 +1469,8 @@ class Image: def get_name(tag: str) -> str: return re.sub("^{[^}]+}", "", tag) - def get_value(element): - value = {get_name(k): v for k, v in element.attrib.items()} + def get_value(element: Element) -> str | dict[str, Any] | None: + value: dict[str, Any] = {get_name(k): v for k, v in element.attrib.items()} children = list(element) if children: for child in children: @@ -1712,7 +1714,7 @@ class Image: return self.im.histogram(extrema) return self.im.histogram() - def entropy(self, mask=None, extrema=None): + def entropy(self, mask: Image | None = None, extrema=None): """ Calculates and returns the entropy for the image. @@ -1996,7 +1998,7 @@ class Image: def putdata( self, - data: Sequence[float] | Sequence[Sequence[int]] | NumpyArray, + data: Sequence[float] | Sequence[Sequence[int]] | core.ImagingCore | NumpyArray, scale: float = 1.0, offset: float = 0.0, ) -> None: @@ -2184,7 +2186,12 @@ class Image: return m_im - def _get_safe_box(self, size, resample, box): + def _get_safe_box( + self, + size: tuple[int, int], + resample: Resampling, + box: tuple[float, float, float, float], + ) -> tuple[int, int, int, int]: """Expands the box so it includes adjacent pixels that may be used by resampling with the given resampling filter. """ @@ -2294,7 +2301,7 @@ class Image: factor_x = int((box[2] - box[0]) / size[0] / reducing_gap) or 1 factor_y = int((box[3] - box[1]) / size[1] / reducing_gap) or 1 if factor_x > 1 or factor_y > 1: - reduce_box = self._get_safe_box(size, resample, box) + reduce_box = self._get_safe_box(size, cast(Resampling, resample), box) factor = (factor_x, factor_y) self = ( self.reduce(factor, box=reduce_box) @@ -2430,7 +2437,7 @@ class Image: 0.0, ] - def transform(x, y, matrix): + def transform(x: float, y: float, matrix: list[float]) -> tuple[float, float]: (a, b, c, d, e, f) = matrix return a * x + b * y + c, d * x + e * y + f @@ -2445,9 +2452,9 @@ class Image: xx = [] yy = [] for x, y in ((0, 0), (w, 0), (w, h), (0, h)): - x, y = transform(x, y, matrix) - xx.append(x) - yy.append(y) + transformed_x, transformed_y = transform(x, y, matrix) + xx.append(transformed_x) + yy.append(transformed_y) nw = math.ceil(max(xx)) - math.floor(min(xx)) nh = math.ceil(max(yy)) - math.floor(min(yy)) @@ -2705,7 +2712,7 @@ class Image: provided_size = tuple(map(math.floor, size)) def preserve_aspect_ratio() -> tuple[int, int] | None: - def round_aspect(number, key): + def round_aspect(number: float, key: Callable[[int], float]) -> int: return max(min(math.floor(number), math.ceil(number), key=key), 1) x, y = provided_size @@ -2849,7 +2856,13 @@ class Image: return im def __transformer( - self, box, image, method, data, resample=Resampling.NEAREST, fill=1 + self, + box: tuple[int, int, int, int], + image: Image, + method, + data, + resample: int = Resampling.NEAREST, + fill: bool = True, ): w = box[2] - box[0] h = box[3] - box[1] @@ -2899,11 +2912,12 @@ class Image: Resampling.BICUBIC, ): if resample in (Resampling.BOX, Resampling.HAMMING, Resampling.LANCZOS): - msg = { + unusable: dict[int, str] = { Resampling.BOX: "Image.Resampling.BOX", Resampling.HAMMING: "Image.Resampling.HAMMING", Resampling.LANCZOS: "Image.Resampling.LANCZOS", - }[resample] + f" ({resample}) cannot be used." + } + msg = unusable[resample] + f" ({resample}) cannot be used." else: msg = f"Unknown resampling filter ({resample})." @@ -3843,7 +3857,7 @@ class Exif(_ExifBase): print(gps_ifd[ExifTags.GPS.GPSDateStamp]) # 1999:99:99 99:99:99 """ - endian = None + endian: str | None = None bigtiff = False _loaded = False @@ -3892,7 +3906,7 @@ class Exif(_ExifBase): head += b"\x00\x00\x00\x00" return head - def load(self, data): + def load(self, data: bytes) -> None: # Extract EXIF information. This is highly experimental, # and is likely to be replaced with something better in a future # version. @@ -3911,7 +3925,7 @@ class Exif(_ExifBase): self._info = None return - self.fp = io.BytesIO(data) + self.fp: IO[bytes] = io.BytesIO(data) self.head = self.fp.read(8) # process dictionary from . import TiffImagePlugin @@ -3921,7 +3935,7 @@ class Exif(_ExifBase): self.fp.seek(self._info.next) self._info.load(self.fp) - def load_from_fp(self, fp, offset=None): + def load_from_fp(self, fp: IO[bytes], offset: int | None = None) -> None: self._loaded_exif = None self._data.clear() self._hidden_data.clear() diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py index ce8e66571..6f56d0236 100644 --- a/src/PIL/ImageDraw.py +++ b/src/PIL/ImageDraw.py @@ -36,7 +36,7 @@ import numbers import struct from collections.abc import Sequence from types import ModuleType -from typing import TYPE_CHECKING, AnyStr, Callable, Union, cast +from typing import TYPE_CHECKING, Any, AnyStr, Callable, Union, cast from . import Image, ImageColor from ._deprecate import deprecate @@ -561,7 +561,12 @@ class ImageDraw: def _multiline_split(self, text: AnyStr) -> list[AnyStr]: return text.split("\n" if isinstance(text, str) else b"\n") - def _multiline_spacing(self, font, spacing, stroke_width): + def _multiline_spacing( + self, + font: ImageFont.ImageFont | ImageFont.FreeTypeFont | ImageFont.TransposedFont, + spacing: float, + stroke_width: float, + ) -> float: return ( self.textbbox((0, 0), "A", font, stroke_width=stroke_width)[3] + stroke_width @@ -571,25 +576,25 @@ class ImageDraw: def text( self, xy: tuple[float, float], - text: str, - fill=None, + text: AnyStr, + fill: _Ink | None = None, font: ( ImageFont.ImageFont | ImageFont.FreeTypeFont | ImageFont.TransposedFont | None ) = None, - anchor=None, - spacing=4, - align="left", - direction=None, - features=None, - language=None, - stroke_width=0, - stroke_fill=None, - embedded_color=False, - *args, - **kwargs, + anchor: str | None = None, + spacing: float = 4, + align: str = "left", + direction: str | None = None, + features: list[str] | None = None, + language: str | None = None, + stroke_width: float = 0, + stroke_fill: _Ink | None = None, + embedded_color: bool = False, + *args: Any, + **kwargs: Any, ) -> None: """Draw text.""" if embedded_color and self.mode not in ("RGB", "RGBA"): @@ -623,15 +628,14 @@ class ImageDraw: return fill_ink return ink - def draw_text(ink, stroke_width=0) -> None: + def draw_text(ink: int, stroke_width: float = 0) -> None: mode = self.fontmode if stroke_width == 0 and embedded_color: mode = "RGBA" coord = [] - start = [] for i in range(2): coord.append(int(xy[i])) - start.append(math.modf(xy[i])[0]) + start = (math.modf(xy[0])[0], math.modf(xy[1])[0]) try: mask, offset = font.getmask2( # type: ignore[union-attr,misc] text, @@ -697,25 +701,25 @@ class ImageDraw: def multiline_text( self, xy: tuple[float, float], - text: str, - fill=None, + text: AnyStr, + fill: _Ink | None = None, font: ( ImageFont.ImageFont | ImageFont.FreeTypeFont | ImageFont.TransposedFont | None ) = None, - anchor=None, - spacing=4, - align="left", - direction=None, - features=None, - language=None, - stroke_width=0, - stroke_fill=None, - embedded_color=False, + anchor: str | None = None, + spacing: float = 4, + align: str = "left", + direction: str | None = None, + features: list[str] | None = None, + language: str | None = None, + stroke_width: float = 0, + stroke_fill: _Ink | None = None, + embedded_color: bool = False, *, - font_size=None, + font_size: float | None = None, ) -> None: if direction == "ttb": msg = "ttb direction is unsupported for multiline text" @@ -788,19 +792,19 @@ class ImageDraw: def textlength( self, - text: str, + text: AnyStr, font: ( ImageFont.ImageFont | ImageFont.FreeTypeFont | ImageFont.TransposedFont | None ) = None, - direction=None, - features=None, - language=None, - embedded_color=False, + direction: str | None = None, + features: list[str] | None = None, + language: str | None = None, + embedded_color: bool = False, *, - font_size=None, + font_size: float | None = None, ) -> float: """Get the length of a given string, in pixels with 1/64 precision.""" if self._multiline_check(text): @@ -817,20 +821,25 @@ class ImageDraw: def textbbox( self, - xy, - text, - font=None, - anchor=None, - spacing=4, - align="left", - direction=None, - features=None, - language=None, - stroke_width=0, - embedded_color=False, + xy: tuple[float, float], + text: AnyStr, + font: ( + ImageFont.ImageFont + | ImageFont.FreeTypeFont + | ImageFont.TransposedFont + | None + ) = None, + anchor: str | None = None, + spacing: float = 4, + align: str = "left", + direction: str | None = None, + features: list[str] | None = None, + language: str | None = None, + stroke_width: float = 0, + embedded_color: bool = False, *, - font_size=None, - ) -> tuple[int, int, int, int]: + font_size: float | None = None, + ) -> tuple[float, float, float, float]: """Get the bounding box of a given string, in pixels.""" if embedded_color and self.mode not in ("RGB", "RGBA"): msg = "Embedded color supported only in RGB and RGBA modes" @@ -862,20 +871,25 @@ class ImageDraw: def multiline_textbbox( self, - xy, - text, - font=None, - anchor=None, - spacing=4, - align="left", - direction=None, - features=None, - language=None, - stroke_width=0, - embedded_color=False, + xy: tuple[float, float], + text: AnyStr, + font: ( + ImageFont.ImageFont + | ImageFont.FreeTypeFont + | ImageFont.TransposedFont + | None + ) = None, + anchor: str | None = None, + spacing: float = 4, + align: str = "left", + direction: str | None = None, + features: list[str] | None = None, + language: str | None = None, + stroke_width: float = 0, + embedded_color: bool = False, *, - font_size=None, - ) -> tuple[int, int, int, int]: + font_size: float | None = None, + ) -> tuple[float, float, float, float]: if direction == "ttb": msg = "ttb direction is unsupported for multiline text" raise ValueError(msg) @@ -914,7 +928,7 @@ class ImageDraw: elif anchor[1] == "d": top -= (len(lines) - 1) * line_spacing - bbox: tuple[int, int, int, int] | None = None + bbox: tuple[float, float, float, float] | None = None for idx, line in enumerate(lines): left = xy[0] diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index d260eef69..24490348c 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -34,7 +34,7 @@ import warnings from enum import IntEnum from io import BytesIO from types import ModuleType -from typing import IO, TYPE_CHECKING, Any, BinaryIO +from typing import IO, TYPE_CHECKING, Any, BinaryIO, TypedDict from . import Image from ._typing import StrOrBytesPath @@ -46,6 +46,13 @@ if TYPE_CHECKING: from ._imagingft import Font +class Axis(TypedDict): + minimum: int | None + default: int | None + maximum: int | None + name: bytes | None + + class Layout(IntEnum): BASIC = 0 RAQM = 1 @@ -138,7 +145,9 @@ class ImageFont: self.font = Image.core.font(image.im, data) - def getmask(self, text, mode="", *args, **kwargs): + def getmask( + self, text: str | bytes, mode: str = "", *args: Any, **kwargs: Any + ) -> Image.core.ImagingCore: """ Create a bitmap for the text. @@ -236,7 +245,7 @@ class FreeTypeFont: self.layout_engine = layout_engine - def load_from_bytes(f): + def load_from_bytes(f) -> None: self.font_bytes = f.read() self.font = core.getfont( "", size, index, encoding, self.font_bytes, layout_engine @@ -283,7 +292,12 @@ class FreeTypeFont: return self.font.ascent, self.font.descent def getlength( - self, text: str | bytes, mode="", direction=None, features=None, language=None + self, + text: str | bytes, + mode: str = "", + direction: str | None = None, + features: list[str] | None = None, + language: str | None = None, ) -> float: """ Returns length (in pixels with 1/64 precision) of given text when rendered @@ -424,16 +438,16 @@ class FreeTypeFont: def getmask( self, - text, - mode="", - direction=None, - features=None, - language=None, - stroke_width=0, - anchor=None, - ink=0, - start=None, - ): + text: str | bytes, + mode: str = "", + direction: str | None = None, + features: list[str] | None = None, + language: str | None = None, + stroke_width: float = 0, + anchor: str | None = None, + ink: int = 0, + start: tuple[float, float] | None = None, + ) -> Image.core.ImagingCore: """ Create a bitmap for the text. @@ -516,17 +530,17 @@ class FreeTypeFont: def getmask2( self, text: str | bytes, - mode="", - direction=None, - features=None, - language=None, - stroke_width=0, - anchor=None, - ink=0, - start=None, - *args, - **kwargs, - ): + mode: str = "", + direction: str | None = None, + features: list[str] | None = None, + language: str | None = None, + stroke_width: float = 0, + anchor: str | None = None, + ink: int = 0, + start: tuple[float, float] | None = None, + *args: Any, + **kwargs: Any, + ) -> tuple[Image.core.ImagingCore, tuple[int, int]]: """ Create a bitmap for the text. @@ -599,7 +613,7 @@ class FreeTypeFont: if start is None: start = (0, 0) - def fill(width, height): + def fill(width: int, height: int) -> Image.core.ImagingCore: size = (width, height) Image._decompression_bomb_check(size) return Image.core.fill("RGBA" if mode == "RGBA" else "L", size) @@ -619,8 +633,13 @@ class FreeTypeFont: ) def font_variant( - self, font=None, size=None, index=None, encoding=None, layout_engine=None - ): + self, + font: StrOrBytesPath | BinaryIO | None = None, + size: float | None = None, + index: int | None = None, + encoding: str | None = None, + layout_engine: Layout | None = None, + ) -> FreeTypeFont: """ Create a copy of this FreeTypeFont object, using any specified arguments to override the settings. @@ -655,7 +674,7 @@ class FreeTypeFont: raise NotImplementedError(msg) from e return [name.replace(b"\x00", b"") for name in names] - def set_variation_by_name(self, name): + def set_variation_by_name(self, name: str | bytes) -> None: """ :param name: The name of the style. :exception OSError: If the font is not a variation font. @@ -674,7 +693,7 @@ class FreeTypeFont: self.font.setvarname(index) - def get_variation_axes(self): + def get_variation_axes(self) -> list[Axis]: """ :returns: A list of the axes in a variation font. :exception OSError: If the font is not a variation font. @@ -704,7 +723,9 @@ class FreeTypeFont: class TransposedFont: """Wrapper for writing rotated or mirrored text""" - def __init__(self, font, orientation=None): + def __init__( + self, font: ImageFont | FreeTypeFont, orientation: Image.Transpose | None = None + ): """ Wrapper that creates a transposed font from any existing font object. @@ -718,13 +739,17 @@ class TransposedFont: self.font = font self.orientation = orientation # any 'transpose' argument, or None - def getmask(self, text, mode="", *args, **kwargs): + def getmask( + self, text: str | bytes, mode: str = "", *args: Any, **kwargs: Any + ) -> Image.core.ImagingCore: im = self.font.getmask(text, mode, *args, **kwargs) if self.orientation is not None: return im.transpose(self.orientation) return im - def getbbox(self, text, *args, **kwargs): + def getbbox( + self, text: str | bytes, *args: Any, **kwargs: Any + ) -> tuple[int, int, float, float]: # TransposedFont doesn't support getmask2, move top-left point to (0, 0) # this has no effect on ImageFont and simulates anchor="lt" for FreeTypeFont left, top, right, bottom = self.font.getbbox(text, *args, **kwargs) @@ -734,7 +759,7 @@ class TransposedFont: return 0, 0, height, width return 0, 0, width, height - def getlength(self, text: str | bytes, *args, **kwargs) -> float: + def getlength(self, text: str | bytes, *args: Any, **kwargs: Any) -> float: if self.orientation in (Image.Transpose.ROTATE_90, Image.Transpose.ROTATE_270): msg = "text length is undefined for text rotated by 90 or 270 degrees" raise ValueError(msg) diff --git a/src/PIL/_imaging.pyi b/src/PIL/_imaging.pyi index 8cccd3ac7..998bc52eb 100644 --- a/src/PIL/_imaging.pyi +++ b/src/PIL/_imaging.pyi @@ -1,6 +1,7 @@ from typing import Any class ImagingCore: + def __getitem__(self, index: int) -> float: ... def __getattr__(self, name: str) -> Any: ... class ImagingFont: diff --git a/src/PIL/_imagingft.pyi b/src/PIL/_imagingft.pyi index 5e97b40b2..9cc9822f5 100644 --- a/src/PIL/_imagingft.pyi +++ b/src/PIL/_imagingft.pyi @@ -1,12 +1,6 @@ -from typing import Any, TypedDict +from typing import Any, Callable -from . import _imaging - -class _Axis(TypedDict): - minimum: int | None - default: int | None - maximum: int | None - name: bytes | None +from . import ImageFont, _imaging class Font: @property @@ -28,42 +22,48 @@ class Font: def render( self, string: str | bytes, - fill, - mode=..., - dir=..., - features=..., - lang=..., - stroke_width=..., - anchor=..., - foreground_ink_long=..., - x_start=..., - y_start=..., + fill: Callable[[int, int], _imaging.ImagingCore], + mode: str, + dir: str | None, + features: list[str] | None, + lang: str | None, + stroke_width: float, + anchor: str | None, + foreground_ink_long: int, + x_start: float, + y_start: float, /, ) -> tuple[_imaging.ImagingCore, tuple[int, int]]: ... def getsize( self, string: str | bytes | bytearray, - mode=..., - dir=..., - features=..., - lang=..., - anchor=..., + mode: str, + dir: str | None, + features: list[str] | None, + lang: str | None, + anchor: str | None, /, ) -> tuple[tuple[int, int], tuple[int, int]]: ... def getlength( - self, string: str | bytes, mode=..., dir=..., features=..., lang=..., / + self, + string: str | bytes, + mode: str, + dir: str | None, + features: list[str] | None, + lang: str | None, + /, ) -> float: ... def getvarnames(self) -> list[bytes]: ... - def getvaraxes(self) -> list[_Axis] | None: ... + def getvaraxes(self) -> list[ImageFont.Axis]: ... def setvarname(self, instance_index: int, /) -> None: ... def setvaraxes(self, axes: list[float], /) -> None: ... def getfont( filename: str | bytes, size: float, - index=..., - encoding=..., - font_bytes=..., - layout_engine=..., + index: int, + encoding: str, + font_bytes: bytes, + layout_engine: int, ) -> Font: ... def __getattr__(name: str) -> Any: ... From 046285ac5d0998ec8c80e4cf70192dcdf4753ec4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 26 Jul 2024 16:42:28 +1000 Subject: [PATCH 202/662] Added type hints --- Tests/test_file_iptc.py | 1 + src/PIL/Image.py | 14 +++++------ src/PIL/ImageDraw2.py | 49 ++++++++++++++++++++++---------------- src/PIL/ImageQt.py | 2 +- src/PIL/IptcImagePlugin.py | 4 +++- src/PIL/TiffImagePlugin.py | 24 ++++++++++--------- 6 files changed, 53 insertions(+), 41 deletions(-) diff --git a/Tests/test_file_iptc.py b/Tests/test_file_iptc.py index 88c30d468..b0ea2bf42 100644 --- a/Tests/test_file_iptc.py +++ b/Tests/test_file_iptc.py @@ -57,6 +57,7 @@ def test_getiptcinfo_fotostation() -> None: iptc = IptcImagePlugin.getiptcinfo(im) # Assert + assert iptc is not None for tag in iptc.keys(): if tag[0] == 240: return diff --git a/src/PIL/Image.py b/src/PIL/Image.py index aa5eeabb2..72d167a8a 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -468,40 +468,40 @@ def _getencoder( class _E: - def __init__(self, scale, offset) -> None: + def __init__(self, scale: float, offset: float) -> None: self.scale = scale self.offset = offset def __neg__(self) -> _E: return _E(-self.scale, -self.offset) - def __add__(self, other) -> _E: + def __add__(self, other: _E | float) -> _E: if isinstance(other, _E): return _E(self.scale + other.scale, self.offset + other.offset) return _E(self.scale, self.offset + other) __radd__ = __add__ - def __sub__(self, other): + def __sub__(self, other: _E | float) -> _E: return self + -other - def __rsub__(self, other): + def __rsub__(self, other: _E | float) -> _E: return other + -self - def __mul__(self, other) -> _E: + def __mul__(self, other: _E | float) -> _E: if isinstance(other, _E): return NotImplemented return _E(self.scale * other, self.offset * other) __rmul__ = __mul__ - def __truediv__(self, other) -> _E: + def __truediv__(self, other: _E | float) -> _E: if isinstance(other, _E): return NotImplemented return _E(self.scale / other, self.offset / other) -def _getscaleoffset(expr): +def _getscaleoffset(expr) -> tuple[float, float]: a = expr(_E(1, 0)) return (a.scale, a.offset) if isinstance(a, _E) else (0, a) diff --git a/src/PIL/ImageDraw2.py b/src/PIL/ImageDraw2.py index e89a78be4..c0d89e4aa 100644 --- a/src/PIL/ImageDraw2.py +++ b/src/PIL/ImageDraw2.py @@ -24,10 +24,10 @@ """ from __future__ import annotations -from typing import BinaryIO +from typing import AnyStr, BinaryIO from . import Image, ImageColor, ImageDraw, ImageFont, ImagePath -from ._typing import StrOrBytesPath +from ._typing import Coords, StrOrBytesPath class Pen: @@ -74,12 +74,14 @@ class Draw: image = Image.new(image, size, color) self.draw = ImageDraw.Draw(image) self.image = image - self.transform = None + self.transform: tuple[float, float, float, float, float, float] | None = None def flush(self) -> Image.Image: return self.image - def render(self, op, xy, pen, brush=None): + def render( + self, op: str, xy: Coords, pen: Pen | Brush, brush: Brush | Pen | None = None + ) -> None: # handle color arguments outline = fill = None width = 1 @@ -95,20 +97,21 @@ class Draw: fill = pen.color # handle transformation if self.transform: - xy = ImagePath.Path(xy) - xy.transform(self.transform) + path = ImagePath.Path(xy) + path.transform(self.transform) + xy = path # render the item if op == "line": self.draw.line(xy, fill=outline, width=width) else: getattr(self.draw, op)(xy, fill=fill, outline=outline) - def settransform(self, offset): + def settransform(self, offset: tuple[float, float]) -> None: """Sets a transformation offset.""" (xoffset, yoffset) = offset self.transform = (1, 0, xoffset, 0, 1, yoffset) - def arc(self, xy, start, end, *options): + def arc(self, xy: Coords, start, end, *options) -> None: """ Draws an arc (a portion of a circle outline) between the start and end angles, inside the given bounding box. @@ -117,7 +120,7 @@ class Draw: """ self.render("arc", xy, start, end, *options) - def chord(self, xy, start, end, *options): + def chord(self, xy: Coords, start, end, *options) -> None: """ Same as :py:meth:`~PIL.ImageDraw2.Draw.arc`, but connects the end points with a straight line. @@ -126,7 +129,7 @@ class Draw: """ self.render("chord", xy, start, end, *options) - def ellipse(self, xy, *options): + def ellipse(self, xy: Coords, *options) -> None: """ Draws an ellipse inside the given bounding box. @@ -134,7 +137,7 @@ class Draw: """ self.render("ellipse", xy, *options) - def line(self, xy, *options): + def line(self, xy: Coords, *options) -> None: """ Draws a line between the coordinates in the ``xy`` list. @@ -142,7 +145,7 @@ class Draw: """ self.render("line", xy, *options) - def pieslice(self, xy, start, end, *options): + def pieslice(self, xy: Coords, start, end, *options) -> None: """ Same as arc, but also draws straight lines between the end points and the center of the bounding box. @@ -151,7 +154,7 @@ class Draw: """ self.render("pieslice", xy, start, end, *options) - def polygon(self, xy, *options): + def polygon(self, xy: Coords, *options) -> None: """ Draws a polygon. @@ -164,7 +167,7 @@ class Draw: """ self.render("polygon", xy, *options) - def rectangle(self, xy, *options): + def rectangle(self, xy: Coords, *options) -> None: """ Draws a rectangle. @@ -172,18 +175,21 @@ class Draw: """ self.render("rectangle", xy, *options) - def text(self, xy, text, font): + def text(self, xy: tuple[float, float], text: AnyStr, font: Font) -> None: """ Draws the string at the given position. .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.text` """ if self.transform: - xy = ImagePath.Path(xy) - xy.transform(self.transform) + path = ImagePath.Path(xy) + path.transform(self.transform) + xy = path self.draw.text(xy, text, font=font.font, fill=font.color) - def textbbox(self, xy, text, font): + def textbbox( + self, xy: tuple[float, float], text: AnyStr, font: Font + ) -> tuple[float, float, float, float]: """ Returns bounding box (in pixels) of given text. @@ -192,11 +198,12 @@ class Draw: .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.textbbox` """ if self.transform: - xy = ImagePath.Path(xy) - xy.transform(self.transform) + path = ImagePath.Path(xy) + path.transform(self.transform) + xy = path return self.draw.textbbox(xy, text, font=font.font) - def textlength(self, text, font): + def textlength(self, text: AnyStr, font: Font) -> float: """ Returns length (in pixels) of given text. This is the amount by which following text should be offset. diff --git a/src/PIL/ImageQt.py b/src/PIL/ImageQt.py index 346fe49d3..a2d946714 100644 --- a/src/PIL/ImageQt.py +++ b/src/PIL/ImageQt.py @@ -58,7 +58,7 @@ else: qt_version = None -def rgb(r, g, b, a=255): +def rgb(r: int, g: int, b: int, a: int = 255) -> int: """(Internal) Turns an RGB color into a Qt compatible color integer.""" # use qRgb to pack the colors, and then turn the resulting long # into a negative integer with the same bitpattern. diff --git a/src/PIL/IptcImagePlugin.py b/src/PIL/IptcImagePlugin.py index 16a18ddfa..17243e705 100644 --- a/src/PIL/IptcImagePlugin.py +++ b/src/PIL/IptcImagePlugin.py @@ -185,7 +185,9 @@ Image.register_open(IptcImageFile.format, IptcImageFile) Image.register_extension(IptcImageFile.format, ".iim") -def getiptcinfo(im: ImageFile.ImageFile): +def getiptcinfo( + im: ImageFile.ImageFile, +) -> dict[tuple[int, int], bytes | list[bytes]] | None: """ Get IPTC information from TIFF, JPEG, or IPTC file. diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 1dab0d50b..ad050ffe4 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -584,8 +584,10 @@ class ImageFileDirectory_v2(_IFDv2Base): self.tagtype: dict[int, int] = {} """ Dictionary of tag types """ self.reset() - (self.next,) = ( - self._unpack("Q", ifh[8:]) if self._bigtiff else self._unpack("L", ifh[4:]) + self.next = ( + self._unpack("Q", ifh[8:])[0] + if self._bigtiff + else self._unpack("L", ifh[4:])[0] ) self._legacy_api = False @@ -643,7 +645,7 @@ class ImageFileDirectory_v2(_IFDv2Base): def __setitem__(self, tag: int, value) -> None: self._setitem(tag, value, self.legacy_api) - def _setitem(self, tag, value, legacy_api) -> None: + def _setitem(self, tag: int, value, legacy_api: bool) -> None: basetypes = (Number, bytes, str) info = TiffTags.lookup(tag, self.group) @@ -731,7 +733,7 @@ class ImageFileDirectory_v2(_IFDv2Base): def __iter__(self): return iter(set(self._tagdata) | set(self._tags_v2)) - def _unpack(self, fmt: str, data): + def _unpack(self, fmt: str, data: bytes): return struct.unpack(self._endian + fmt, data) def _pack(self, fmt: str, *values): @@ -755,11 +757,11 @@ class ImageFileDirectory_v2(_IFDv2Base): ) @_register_loader(1, 1) # Basic type, except for the legacy API. - def load_byte(self, data, legacy_api: bool = True): + def load_byte(self, data: bytes, legacy_api: bool = True) -> bytes: return data @_register_writer(1) # Basic type, except for the legacy API. - def write_byte(self, data) -> bytes: + def write_byte(self, data: bytes | int | IFDRational) -> bytes: if isinstance(data, IFDRational): data = int(data) if isinstance(data, int): @@ -773,7 +775,7 @@ class ImageFileDirectory_v2(_IFDv2Base): return data.decode("latin-1", "replace") @_register_writer(2) - def write_string(self, value) -> bytes: + def write_string(self, value: str | bytes | int) -> bytes: # remerge of https://github.com/python-pillow/Pillow/pull/1416 if isinstance(value, int): value = str(value) @@ -782,7 +784,7 @@ class ImageFileDirectory_v2(_IFDv2Base): return value + b"\0" @_register_loader(5, 8) - def load_rational(self, data, legacy_api=True): + def load_rational(self, data, legacy_api: bool = True): vals = self._unpack(f"{len(data) // 4}L", data) def combine(a, b): @@ -797,11 +799,11 @@ class ImageFileDirectory_v2(_IFDv2Base): ) @_register_loader(7, 1) - def load_undefined(self, data, legacy_api: bool = True): + def load_undefined(self, data: bytes, legacy_api: bool = True) -> bytes: return data @_register_writer(7) - def write_undefined(self, value) -> bytes: + def write_undefined(self, value: bytes | int | IFDRational) -> bytes: if isinstance(value, IFDRational): value = int(value) if isinstance(value, int): @@ -809,7 +811,7 @@ class ImageFileDirectory_v2(_IFDv2Base): return value @_register_loader(10, 8) - def load_signed_rational(self, data, legacy_api: bool = True): + def load_signed_rational(self, data: bytes, legacy_api: bool = True): vals = self._unpack(f"{len(data) // 4}l", data) def combine(a, b): From c85eb0cae5568ba9286ac15c3e8f1709f7bbe9e0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 28 Jul 2024 12:53:02 +1000 Subject: [PATCH 203/662] Added type hints --- Tests/test_file_png.py | 2 ++ src/PIL/Image.py | 30 +++++++++++++++++------------- src/PIL/ImageDraw2.py | 14 +++++++------- src/PIL/PngImagePlugin.py | 38 +++++++++++++++++++------------------- src/PIL/TiffImagePlugin.py | 8 +++++--- 5 files changed, 50 insertions(+), 42 deletions(-) diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py index 4958b2222..0abf9866f 100644 --- a/Tests/test_file_png.py +++ b/Tests/test_file_png.py @@ -424,8 +424,10 @@ class TestFilePng: im = roundtrip(im, pnginfo=info) assert im.info == {"spam": "Eggs", "eggs": "Spam"} assert im.text == {"spam": "Eggs", "eggs": "Spam"} + assert isinstance(im.text["spam"], PngImagePlugin.iTXt) assert im.text["spam"].lang == "en" assert im.text["spam"].tkey == "Spam" + assert isinstance(im.text["eggs"], PngImagePlugin.iTXt) assert im.text["eggs"].lang == "en" assert im.text["eggs"].tkey == "Eggs" diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 72d167a8a..eb3dd5a36 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -38,7 +38,7 @@ import struct import sys import tempfile import warnings -from collections.abc import Callable, MutableMapping, Sequence +from collections.abc import Callable, Iterator, MutableMapping, Sequence from enum import IntEnum from types import ModuleType from typing import ( @@ -744,11 +744,11 @@ class Image: new["shape"], new["typestr"] = _conv_type_shape(self) return new - def __getstate__(self): + def __getstate__(self) -> list[Any]: im_data = self.tobytes() # load image first return [self.info, self.mode, self.size, self.getpalette(), im_data] - def __setstate__(self, state) -> None: + def __setstate__(self, state: list[Any]) -> None: Image.__init__(self) info, mode, size, palette, data = state self.info = info @@ -1683,7 +1683,9 @@ class Image: x, y = self.im.getprojection() return list(x), list(y) - def histogram(self, mask: Image | None = None, extrema=None) -> list[int]: + def histogram( + self, mask: Image | None = None, extrema: tuple[float, float] | None = None + ) -> list[int]: """ Returns a histogram for the image. The histogram is returned as a list of pixel counts, one for each pixel value in the source @@ -1709,12 +1711,14 @@ class Image: mask.load() return self.im.histogram((0, 0), mask.im) if self.mode in ("I", "F"): - if extrema is None: - extrema = self.getextrema() - return self.im.histogram(extrema) + return self.im.histogram( + extrema if extrema is not None else self.getextrema() + ) return self.im.histogram() - def entropy(self, mask: Image | None = None, extrema=None): + def entropy( + self, mask: Image | None = None, extrema: tuple[float, float] | None = None + ) -> float: """ Calculates and returns the entropy for the image. @@ -1735,9 +1739,9 @@ class Image: mask.load() return self.im.entropy((0, 0), mask.im) if self.mode in ("I", "F"): - if extrema is None: - extrema = self.getextrema() - return self.im.entropy(extrema) + return self.im.entropy( + extrema if extrema is not None else self.getextrema() + ) return self.im.entropy() def paste( @@ -3881,7 +3885,7 @@ class Exif(_ExifBase): # returns a dict with any single item tuples/lists as individual values return {k: self._fixup(v) for k, v in src_dict.items()} - def _get_ifd_dict(self, offset: int, group=None): + def _get_ifd_dict(self, offset: int, group: int | None = None): try: # an offset pointer to the location of the nested embedded IFD. # It should be a long, but may be corrupted. @@ -4136,7 +4140,7 @@ class Exif(_ExifBase): else: del self._data[tag] - def __iter__(self): + def __iter__(self) -> Iterator[int]: keys = set(self._data) if self._info is not None: keys.update(self._info) diff --git a/src/PIL/ImageDraw2.py b/src/PIL/ImageDraw2.py index c0d89e4aa..1ad239382 100644 --- a/src/PIL/ImageDraw2.py +++ b/src/PIL/ImageDraw2.py @@ -24,7 +24,7 @@ """ from __future__ import annotations -from typing import AnyStr, BinaryIO +from typing import Any, AnyStr, BinaryIO from . import Image, ImageColor, ImageDraw, ImageFont, ImagePath from ._typing import Coords, StrOrBytesPath @@ -111,7 +111,7 @@ class Draw: (xoffset, yoffset) = offset self.transform = (1, 0, xoffset, 0, 1, yoffset) - def arc(self, xy: Coords, start, end, *options) -> None: + def arc(self, xy: Coords, start, end, *options: Any) -> None: """ Draws an arc (a portion of a circle outline) between the start and end angles, inside the given bounding box. @@ -120,7 +120,7 @@ class Draw: """ self.render("arc", xy, start, end, *options) - def chord(self, xy: Coords, start, end, *options) -> None: + def chord(self, xy: Coords, start, end, *options: Any) -> None: """ Same as :py:meth:`~PIL.ImageDraw2.Draw.arc`, but connects the end points with a straight line. @@ -129,7 +129,7 @@ class Draw: """ self.render("chord", xy, start, end, *options) - def ellipse(self, xy: Coords, *options) -> None: + def ellipse(self, xy: Coords, *options: Any) -> None: """ Draws an ellipse inside the given bounding box. @@ -137,7 +137,7 @@ class Draw: """ self.render("ellipse", xy, *options) - def line(self, xy: Coords, *options) -> None: + def line(self, xy: Coords, *options: Any) -> None: """ Draws a line between the coordinates in the ``xy`` list. @@ -145,7 +145,7 @@ class Draw: """ self.render("line", xy, *options) - def pieslice(self, xy: Coords, start, end, *options) -> None: + def pieslice(self, xy: Coords, start, end, *options: Any) -> None: """ Same as arc, but also draws straight lines between the end points and the center of the bounding box. @@ -154,7 +154,7 @@ class Draw: """ self.render("pieslice", xy, start, end, *options) - def polygon(self, xy: Coords, *options) -> None: + def polygon(self, xy: Coords, *options: Any) -> None: """ Draws a polygon. diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 58db7777c..52cfcd13a 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -38,6 +38,7 @@ import re import struct import warnings import zlib +from collections.abc import Callable from enum import IntEnum from typing import IO, TYPE_CHECKING, Any, NamedTuple, NoReturn @@ -135,7 +136,7 @@ class Blend(IntEnum): """ -def _safe_zlib_decompress(s): +def _safe_zlib_decompress(s: bytes) -> bytes: dobj = zlib.decompressobj() plaintext = dobj.decompress(s, MAX_TEXT_CHUNK) if dobj.unconsumed_tail: @@ -783,7 +784,7 @@ class PngImageFile(ImageFile.ImageFile): self._mode = self.png.im_mode self._size = self.png.im_size self.info = self.png.im_info - self._text = None + self._text: dict[str, str | iTXt] | None = None self.tile = self.png.im_tile self.custom_mimetype = self.png.im_custom_mimetype self.n_frames = self.png.im_n_frames or 1 @@ -810,7 +811,7 @@ class PngImageFile(ImageFile.ImageFile): self.is_animated = self.n_frames > 1 @property - def text(self): + def text(self) -> dict[str, str | iTXt]: # experimental if self._text is None: # iTxt, tEXt and zTXt chunks may appear at the end of the file @@ -822,6 +823,7 @@ class PngImageFile(ImageFile.ImageFile): self.load() if self.is_animated: self.seek(frame) + assert self._text is not None return self._text def verify(self) -> None: @@ -1105,7 +1107,7 @@ def putchunk(fp: IO[bytes], cid: bytes, *data: bytes) -> None: class _idat: # wrap output from the encoder in IDAT chunks - def __init__(self, fp, chunk) -> None: + def __init__(self, fp: IO[bytes], chunk: Callable[..., None]) -> None: self.fp = fp self.chunk = chunk @@ -1116,7 +1118,7 @@ class _idat: class _fdat: # wrap encoder output in fdAT chunks - def __init__(self, fp: IO[bytes], chunk, seq_num: int) -> None: + def __init__(self, fp: IO[bytes], chunk: Callable[..., None], seq_num: int) -> None: self.fp = fp self.chunk = chunk self.seq_num = seq_num @@ -1135,7 +1137,7 @@ class _Frame(NamedTuple): def _write_multiple_frames( im: Image.Image, fp: IO[bytes], - chunk, + chunk: Callable[..., None], mode: str, rawmode: str, default_image: Image.Image | None, @@ -1275,7 +1277,11 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: def _save( - im: Image.Image, fp, filename: str | bytes, chunk=putchunk, save_all: bool = False + im: Image.Image, + fp: IO[bytes], + filename: str | bytes, + chunk: Callable[..., None] = putchunk, + save_all: bool = False, ) -> None: # save an image to disk (called by the save method) @@ -1483,22 +1489,16 @@ def _save( def getchunks(im: Image.Image, **params: Any) -> list[tuple[bytes, bytes, bytes]]: """Return a list of PNG chunks representing this image.""" + from io import BytesIO - class collector: - data = [] + chunks = [] - def write(self, data: bytes) -> None: - pass - - def append(self, chunk: tuple[bytes, bytes, bytes]) -> None: - self.data.append(chunk) - - def append(fp: collector, cid: bytes, *data: bytes) -> None: + def append(fp: IO[bytes], cid: bytes, *data: bytes) -> None: byte_data = b"".join(data) crc = o32(_crc32(byte_data, _crc32(cid))) - fp.append((cid, byte_data, crc)) + chunks.append((cid, byte_data, crc)) - fp = collector() + fp = BytesIO() try: im.encoderinfo = params @@ -1506,7 +1506,7 @@ def getchunks(im: Image.Image, **params: Any) -> list[tuple[bytes, bytes, bytes] finally: del im.encoderinfo - return fp.data + return chunks # -------------------------------------------------------------------- diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index ad050ffe4..318e9825c 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1020,7 +1020,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2): .. deprecated:: 3.0.0 """ - def __init__(self, *args, **kwargs) -> None: + def __init__(self, *args: Any, **kwargs: Any) -> None: super().__init__(*args, **kwargs) self._legacy_api = True @@ -1142,13 +1142,15 @@ class TiffImageFile(ImageFile.ImageFile): self._seek(0) @property - def n_frames(self): - if self._n_frames is None: + def n_frames(self) -> int: + current_n_frames = self._n_frames + if current_n_frames is None: current = self.tell() self._seek(len(self._frame_pos)) while self._n_frames is None: self._seek(self.tell() + 1) self.seek(current) + assert self._n_frames is not None return self._n_frames def seek(self, frame: int) -> None: From a03033e7f3cdc1bdf9a6aabc09d6dc2aca97cff7 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Sun, 7 Jul 2024 15:52:46 +0400 Subject: [PATCH 204/662] Remove all WITH_* flags from _imaging.c --- src/_imaging.c | 89 +++----------------------------------------------- 1 file changed, 4 insertions(+), 85 deletions(-) diff --git a/src/_imaging.c b/src/_imaging.c index 5c2f7b4b6..d675cf22e 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -93,19 +93,6 @@ #define _USE_MATH_DEFINES #include -/* Configuration stuff. Feel free to undef things you don't need. */ -#define WITH_IMAGECHOPS /* ImageChops support */ -#define WITH_IMAGEDRAW /* ImageDraw support */ -#define WITH_MAPPING /* use memory mapping to read some file formats */ -#define WITH_IMAGEPATH /* ImagePath stuff */ -#define WITH_ARROW /* arrow graphics stuff (experimental) */ -#define WITH_EFFECTS /* special effects */ -#define WITH_QUANTIZE /* quantization support */ -#define WITH_RANKFILTER /* rank filter */ -#define WITH_MODEFILTER /* mode filter */ -#define WITH_THREADING /* "friendly" threading support */ -#define WITH_UNSHARPMASK /* Kevin Cazabon's unsharpmask module */ - #undef VERBOSE #define B16(p, i) ((((int)p[(i)]) << 8) + p[(i) + 1]) @@ -123,8 +110,6 @@ typedef struct { static PyTypeObject Imaging_Type; -#ifdef WITH_IMAGEDRAW - typedef struct { /* to write a character, cut out sxy from glyph data, place at current position plus dxy, and advance by (dx, dy) */ @@ -151,8 +136,6 @@ typedef struct { static PyTypeObject ImagingDraw_Type; -#endif - typedef struct { PyObject_HEAD ImagingObject *image; int readonly; @@ -215,16 +198,12 @@ PyImaging_AsImaging(PyObject *op) { void ImagingSectionEnter(ImagingSectionCookie *cookie) { -#ifdef WITH_THREADING *cookie = (PyThreadState *)PyEval_SaveThread(); -#endif } void ImagingSectionLeave(ImagingSectionCookie *cookie) { -#ifdef WITH_THREADING PyEval_RestoreThread((PyThreadState *)*cookie); -#endif } /* -------------------------------------------------------------------- */ @@ -1091,7 +1070,6 @@ _filter(ImagingObject *self, PyObject *args) { return imOut; } -#ifdef WITH_UNSHARPMASK static PyObject * _gaussian_blur(ImagingObject *self, PyObject *args) { Imaging imIn; @@ -1116,7 +1094,6 @@ _gaussian_blur(ImagingObject *self, PyObject *args) { return PyImagingNew(imOut); } -#endif static PyObject * _getpalette(ImagingObject *self, PyObject *args) { @@ -1374,7 +1351,6 @@ _entropy(ImagingObject *self, PyObject *args) { return PyFloat_FromDouble(-entropy); } -#ifdef WITH_MODEFILTER static PyObject * _modefilter(ImagingObject *self, PyObject *args) { int size; @@ -1384,7 +1360,6 @@ _modefilter(ImagingObject *self, PyObject *args) { return PyImagingNew(ImagingModeFilter(self->image, size)); } -#endif static PyObject * _offset(ImagingObject *self, PyObject *args) { @@ -1716,8 +1691,6 @@ _putdata(ImagingObject *self, PyObject *args) { return Py_None; } -#ifdef WITH_QUANTIZE - static PyObject * _quantize(ImagingObject *self, PyObject *args) { int colours = 256; @@ -1734,7 +1707,6 @@ _quantize(ImagingObject *self, PyObject *args) { return PyImagingNew(ImagingQuantize(self->image, colours, method, kmeans)); } -#endif static PyObject * _putpalette(ImagingObject *self, PyObject *args) { @@ -1870,7 +1842,6 @@ _putpixel(ImagingObject *self, PyObject *args) { return Py_None; } -#ifdef WITH_RANKFILTER static PyObject * _rankfilter(ImagingObject *self, PyObject *args) { int size, rank; @@ -1880,7 +1851,6 @@ _rankfilter(ImagingObject *self, PyObject *args) { return PyImagingNew(ImagingRankFilter(self->image, size, rank)); } -#endif static PyObject * _resize(ImagingObject *self, PyObject *args) { @@ -2162,7 +2132,6 @@ _transpose(ImagingObject *self, PyObject *args) { return PyImagingNew(imOut); } -#ifdef WITH_UNSHARPMASK static PyObject * _unsharp_mask(ImagingObject *self, PyObject *args) { Imaging imIn; @@ -2186,7 +2155,6 @@ _unsharp_mask(ImagingObject *self, PyObject *args) { return PyImagingNew(imOut); } -#endif static PyObject * _box_blur(ImagingObject *self, PyObject *args) { @@ -2463,9 +2431,7 @@ _split(ImagingObject *self) { return list; } -/* -------------------------------------------------------------------- */ - -#ifdef WITH_IMAGECHOPS +/* Channel operations (ImageChops) ------------------------------------ */ static PyObject * _chop_invert(ImagingObject *self) { @@ -2646,11 +2612,8 @@ _chop_overlay(ImagingObject *self, PyObject *args) { return PyImagingNew(ImagingOverlay(self->image, imagep->image)); } -#endif -/* -------------------------------------------------------------------- */ - -#ifdef WITH_IMAGEDRAW +/* Graphics (ImageDraw) ----------------------------------------------- */ static PyObject * _font_new(PyObject *self_, PyObject *args) { @@ -3233,8 +3196,6 @@ _draw_points(ImagingDrawObject *self, PyObject *args) { return Py_None; } -#ifdef WITH_ARROW - /* from outline.c */ extern ImagingOutline PyOutline_AsOutline(PyObject *outline); @@ -3264,8 +3225,6 @@ _draw_outline(ImagingDrawObject *self, PyObject *args) { return Py_None; } -#endif - static PyObject * _draw_pieslice(ImagingDrawObject *self, PyObject *args) { double *xy; @@ -3431,12 +3390,9 @@ _draw_rectangle(ImagingDrawObject *self, PyObject *args) { } static struct PyMethodDef _draw_methods[] = { -#ifdef WITH_IMAGEDRAW /* Graphics (ImageDraw) */ {"draw_lines", (PyCFunction)_draw_lines, METH_VARARGS}, -#ifdef WITH_ARROW {"draw_outline", (PyCFunction)_draw_outline, METH_VARARGS}, -#endif {"draw_polygon", (PyCFunction)_draw_polygon, METH_VARARGS}, {"draw_rectangle", (PyCFunction)_draw_rectangle, METH_VARARGS}, {"draw_points", (PyCFunction)_draw_points, METH_VARARGS}, @@ -3446,11 +3402,9 @@ static struct PyMethodDef _draw_methods[] = { {"draw_ellipse", (PyCFunction)_draw_ellipse, METH_VARARGS}, {"draw_pieslice", (PyCFunction)_draw_pieslice, METH_VARARGS}, {"draw_ink", (PyCFunction)_draw_ink, METH_VARARGS}, -#endif {NULL, NULL} /* sentinel */ }; -#endif static PyObject * pixel_access_new(ImagingObject *imagep, PyObject *args) { @@ -3532,11 +3486,9 @@ pixel_access_setitem(PixelAccessObject *self, PyObject *xy, PyObject *color) { } /* -------------------------------------------------------------------- */ -/* EFFECTS (experimental) */ +/* EFFECTS (experimental) */ /* -------------------------------------------------------------------- */ -#ifdef WITH_EFFECTS - static PyObject * _effect_mandelbrot(ImagingObject *self, PyObject *args) { int xsize = 512; @@ -3588,8 +3540,6 @@ _effect_spread(ImagingObject *self, PyObject *args) { return PyImagingNew(ImagingEffectSpread(self->image, dist)); } -#endif - /* -------------------------------------------------------------------- */ /* UTILITIES */ /* -------------------------------------------------------------------- */ @@ -3670,20 +3620,14 @@ static struct PyMethodDef methods[] = { {"filter", (PyCFunction)_filter, METH_VARARGS}, {"histogram", (PyCFunction)_histogram, METH_VARARGS}, {"entropy", (PyCFunction)_entropy, METH_VARARGS}, -#ifdef WITH_MODEFILTER {"modefilter", (PyCFunction)_modefilter, METH_VARARGS}, -#endif {"offset", (PyCFunction)_offset, METH_VARARGS}, {"paste", (PyCFunction)_paste, METH_VARARGS}, {"point", (PyCFunction)_point, METH_VARARGS}, {"point_transform", (PyCFunction)_point_transform, METH_VARARGS}, {"putdata", (PyCFunction)_putdata, METH_VARARGS}, -#ifdef WITH_QUANTIZE {"quantize", (PyCFunction)_quantize, METH_VARARGS}, -#endif -#ifdef WITH_RANKFILTER {"rankfilter", (PyCFunction)_rankfilter, METH_VARARGS}, -#endif {"resize", (PyCFunction)_resize, METH_VARARGS}, {"reduce", (PyCFunction)_reduce, METH_VARARGS}, {"transpose", (PyCFunction)_transpose, METH_VARARGS}, @@ -3709,7 +3653,6 @@ static struct PyMethodDef methods[] = { {"putpalettealpha", (PyCFunction)_putpalettealpha, METH_VARARGS}, {"putpalettealphas", (PyCFunction)_putpalettealphas, METH_VARARGS}, -#ifdef WITH_IMAGECHOPS /* Channel operations (ImageChops) */ {"chop_invert", (PyCFunction)_chop_invert, METH_NOARGS}, {"chop_lighter", (PyCFunction)_chop_lighter, METH_VARARGS}, @@ -3728,20 +3671,14 @@ static struct PyMethodDef methods[] = { {"chop_hard_light", (PyCFunction)_chop_hard_light, METH_VARARGS}, {"chop_overlay", (PyCFunction)_chop_overlay, METH_VARARGS}, -#endif - -#ifdef WITH_UNSHARPMASK - /* Kevin Cazabon's unsharpmask extension */ + /* Unsharpmask extension */ {"gaussian_blur", (PyCFunction)_gaussian_blur, METH_VARARGS}, {"unsharp_mask", (PyCFunction)_unsharp_mask, METH_VARARGS}, -#endif {"box_blur", (PyCFunction)_box_blur, METH_VARARGS}, -#ifdef WITH_EFFECTS /* Special effects */ {"effect_spread", (PyCFunction)_effect_spread, METH_VARARGS}, -#endif /* Misc. */ {"new_block", (PyCFunction)_new_block, METH_VARARGS}, @@ -3870,8 +3807,6 @@ static PyTypeObject Imaging_Type = { getsetters, /*tp_getset*/ }; -#ifdef WITH_IMAGEDRAW - static PyTypeObject ImagingFont_Type = { PyVarObject_HEAD_INIT(NULL, 0) "ImagingFont", /*tp_name*/ sizeof(ImagingFontObject), /*tp_basicsize*/ @@ -3938,8 +3873,6 @@ static PyTypeObject ImagingDraw_Type = { 0, /*tp_getset*/ }; -#endif - static PyMappingMethods pixel_access_as_mapping = { (lenfunc)NULL, /*mp_length*/ (binaryfunc)pixel_access_getitem, /*mp_subscript*/ @@ -4283,9 +4216,7 @@ static PyMethodDef functions[] = { #endif /* Memory mapping */ -#ifdef WITH_MAPPING {"map_buffer", (PyCFunction)PyImaging_MapBuffer, METH_VARARGS}, -#endif /* Display support */ #ifdef _WIN32 @@ -4305,29 +4236,21 @@ static PyMethodDef functions[] = { {"getcodecstatus", (PyCFunction)_getcodecstatus, METH_VARARGS}, /* Special effects (experimental) */ -#ifdef WITH_EFFECTS {"effect_mandelbrot", (PyCFunction)_effect_mandelbrot, METH_VARARGS}, {"effect_noise", (PyCFunction)_effect_noise, METH_VARARGS}, {"linear_gradient", (PyCFunction)_linear_gradient, METH_VARARGS}, {"radial_gradient", (PyCFunction)_radial_gradient, METH_VARARGS}, {"wedge", (PyCFunction)_linear_gradient, METH_VARARGS}, /* Compatibility */ -#endif /* Drawing support stuff */ -#ifdef WITH_IMAGEDRAW {"font", (PyCFunction)_font_new, METH_VARARGS}, {"draw", (PyCFunction)_draw_new, METH_VARARGS}, -#endif /* Experimental path stuff */ -#ifdef WITH_IMAGEPATH {"path", (PyCFunction)PyPath_Create, METH_VARARGS}, -#endif /* Experimental arrow graphics stuff */ -#ifdef WITH_ARROW {"outline", (PyCFunction)PyOutline_Create, METH_VARARGS}, -#endif /* Resource management */ {"get_stats", (PyCFunction)_get_stats, METH_VARARGS}, @@ -4352,16 +4275,12 @@ setup_module(PyObject *m) { if (PyType_Ready(&Imaging_Type) < 0) { return -1; } - -#ifdef WITH_IMAGEDRAW if (PyType_Ready(&ImagingFont_Type) < 0) { return -1; } - if (PyType_Ready(&ImagingDraw_Type) < 0) { return -1; } -#endif if (PyType_Ready(&PixelAccess_Type) < 0) { return -1; } From cfce566d17999698e6f8fa2ccd815c8146b5de20 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Sun, 7 Jul 2024 16:08:52 +0400 Subject: [PATCH 205/662] codestyle --- src/_imaging.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/_imaging.c b/src/_imaging.c index d675cf22e..91cae2e5d 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -3405,7 +3405,6 @@ static struct PyMethodDef _draw_methods[] = { {NULL, NULL} /* sentinel */ }; - static PyObject * pixel_access_new(ImagingObject *imagep, PyObject *args) { PixelAccessObject *self; @@ -4215,11 +4214,11 @@ static PyMethodDef functions[] = { {"zip_encoder", (PyCFunction)PyImaging_ZipEncoderNew, METH_VARARGS}, #endif -/* Memory mapping */ + /* Memory mapping */ {"map_buffer", (PyCFunction)PyImaging_MapBuffer, METH_VARARGS}, -/* Display support */ #ifdef _WIN32 + /* Display support */ {"display", (PyCFunction)PyImaging_DisplayWin32, METH_VARARGS}, {"display_mode", (PyCFunction)PyImaging_DisplayModeWin32, METH_VARARGS}, {"grabscreen_win32", (PyCFunction)PyImaging_GrabScreenWin32, METH_VARARGS}, @@ -4235,21 +4234,21 @@ static PyMethodDef functions[] = { /* Utilities */ {"getcodecstatus", (PyCFunction)_getcodecstatus, METH_VARARGS}, -/* Special effects (experimental) */ + /* Special effects (experimental) */ {"effect_mandelbrot", (PyCFunction)_effect_mandelbrot, METH_VARARGS}, {"effect_noise", (PyCFunction)_effect_noise, METH_VARARGS}, {"linear_gradient", (PyCFunction)_linear_gradient, METH_VARARGS}, {"radial_gradient", (PyCFunction)_radial_gradient, METH_VARARGS}, {"wedge", (PyCFunction)_linear_gradient, METH_VARARGS}, /* Compatibility */ -/* Drawing support stuff */ + /* Drawing support stuff */ {"font", (PyCFunction)_font_new, METH_VARARGS}, {"draw", (PyCFunction)_draw_new, METH_VARARGS}, -/* Experimental path stuff */ + /* Experimental path stuff */ {"path", (PyCFunction)PyPath_Create, METH_VARARGS}, -/* Experimental arrow graphics stuff */ + /* Experimental arrow graphics stuff */ {"outline", (PyCFunction)PyOutline_Create, METH_VARARGS}, /* Resource management */ From dc53356c1a9dd222e504d390861fdac7368bb300 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Sun, 7 Jul 2024 23:47:21 +0400 Subject: [PATCH 206/662] Not needed since memcpy is used here --- src/libImaging/Pack.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/libImaging/Pack.c b/src/libImaging/Pack.c index f3b714215..c29473d90 100644 --- a/src/libImaging/Pack.c +++ b/src/libImaging/Pack.c @@ -258,16 +258,6 @@ void ImagingPackRGB(UINT8 *out, const UINT8 *in, int pixels) { int i = 0; /* RGB triplets */ -#ifdef __sparc - /* SPARC CPUs cannot read integers from nonaligned addresses. */ - for (; i < pixels; i++) { - out[0] = in[R]; - out[1] = in[G]; - out[2] = in[B]; - out += 3; - in += 4; - } -#else for (; i < pixels - 1; i++) { memcpy(out, in + i * 4, 4); out += 3; @@ -278,7 +268,6 @@ ImagingPackRGB(UINT8 *out, const UINT8 *in, int pixels) { out[2] = in[i * 4 + B]; out += 3; } -#endif } void From d00fb87fa3b06776c14b882d0b39f737c39ec8da Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 8 Jul 2024 11:08:32 +0400 Subject: [PATCH 207/662] Rename Not NO_OUTPUT to DEBUG, remove TEST_MERGESORT and TEST_SPLIT* flags --- src/libImaging/Quant.c | 106 +++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 56 deletions(-) diff --git a/src/libImaging/Quant.c b/src/libImaging/Quant.c index 197f9f3ee..595ee42a0 100644 --- a/src/libImaging/Quant.c +++ b/src/libImaging/Quant.c @@ -36,7 +36,8 @@ #define UINT32_MAX 0xffffffff #endif -#define NO_OUTPUT +// #define DEBUG +// #define TEST_NEAREST_NEIGHBOUR typedef struct { uint32_t scale; @@ -144,7 +145,7 @@ create_pixel_hash(Pixel *pixelData, uint32_t nPixels) { PixelHashData *d; HashTable *hash; uint32_t i; -#ifndef NO_OUTPUT +#ifdef DEBUG uint32_t timer, timer2, timer3; #endif @@ -156,7 +157,7 @@ create_pixel_hash(Pixel *pixelData, uint32_t nPixels) { hash = hashtable_new(pixel_hash, pixel_cmp); hashtable_set_user_data(hash, d); d->scale = 0; -#ifndef NO_OUTPUT +#ifdef DEBUG timer = timer3 = clock(); #endif for (i = 0; i < nPixels; i++) { @@ -167,22 +168,22 @@ create_pixel_hash(Pixel *pixelData, uint32_t nPixels) { } while (hashtable_get_count(hash) > MAX_HASH_ENTRIES) { d->scale++; -#ifndef NO_OUTPUT +#ifdef DEBUG printf("rehashing - new scale: %d\n", (int)d->scale); timer2 = clock(); #endif hashtable_rehash_compute(hash, rehash_collide); -#ifndef NO_OUTPUT +#ifdef DEBUG timer2 = clock() - timer2; printf("rehash took %f sec\n", timer2 / (double)CLOCKS_PER_SEC); timer += timer2; #endif } } -#ifndef NO_OUTPUT +#ifdef DEBUG printf("inserts took %f sec\n", (clock() - timer) / (double)CLOCKS_PER_SEC); #endif -#ifndef NO_OUTPUT +#ifdef DEBUG printf("total %f sec\n", (clock() - timer3) / (double)CLOCKS_PER_SEC); #endif return hash; @@ -304,7 +305,7 @@ mergesort_pixels(PixelList *head, int i) { return head; } -#if defined(TEST_MERGESORT) || defined(TEST_SORTED) +#ifdef DEBUG static int test_sorted(PixelList *pl[3]) { int i, n, l; @@ -347,12 +348,12 @@ splitlists( PixelList *l, *r, *c, *n; int i; int nRight; -#ifndef NO_OUTPUT +#ifdef DEBUG int nLeft; #endif int splitColourVal; -#ifdef TEST_SPLIT +#ifdef DEBUG { PixelList *_prevTest, *_nextTest; int _i, _nextCount[3], _prevCount[3]; @@ -402,14 +403,14 @@ splitlists( #endif nCount[0] = nCount[1] = 0; nRight = 0; -#ifndef NO_OUTPUT +#ifdef DEBUG nLeft = 0; #endif for (left = 0, c = h[axis]; c;) { left = left + c->count; nCount[0] += c->count; c->flag = 0; -#ifndef NO_OUTPUT +#ifdef DEBUG nLeft++; #endif c = c->next[axis]; @@ -424,7 +425,7 @@ splitlists( break; } c->flag = 0; -#ifndef NO_OUTPUT +#ifdef DEBUG nLeft++; #endif nCount[0] += c->count; @@ -442,14 +443,14 @@ splitlists( } c->flag = 1; nRight++; -#ifndef NO_OUTPUT +#ifdef DEBUG nLeft--; #endif nCount[0] -= c->count; nCount[1] += c->count; } } -#ifndef NO_OUTPUT +#ifdef DEBUG if (!nLeft) { for (c = h[axis]; c; c = c->next[axis]) { printf("[%d %d %d]\n", c->p.c.r, c->p.c.g, c->p.c.b); @@ -511,7 +512,7 @@ split(BoxNode *node) { gl = node->tail[1]->p.c.g; bh = node->head[2]->p.c.b; bl = node->tail[2]->p.c.b; -#ifdef TEST_SPLIT +#ifdef DEBUG printf("splitting node [%d %d %d] [%d %d %d] ", rl, gl, bl, rh, gh, bh); #endif f[0] = (rh - rl) * 77; @@ -526,11 +527,8 @@ split(BoxNode *node) { axis = i; } } -#ifdef TEST_SPLIT +#ifdef DEBUG printf("along axis %d\n", axis + 1); -#endif - -#ifdef TEST_SPLIT { PixelList *_prevTest, *_nextTest; int _i, _nextCount[3], _prevCount[3]; @@ -592,12 +590,12 @@ split(BoxNode *node) { if (!splitlists( node->head, node->tail, heads, tails, newCounts, axis, node->pixelCount )) { -#ifndef NO_OUTPUT +#ifdef DEBUG printf("list split failed.\n"); #endif return 0; } -#ifdef TEST_SPLIT +#ifdef DEBUG if (!test_sorted(heads[0])) { printf("bug in split"); exit(1); @@ -623,7 +621,7 @@ split(BoxNode *node) { node->head[i] = NULL; node->tail[i] = NULL; } -#ifdef TEST_SPLIT +#ifdef DEBUG if (left->head[0]) { rh = left->head[0]->p.c.r; rl = left->tail[0]->p.c.r; @@ -687,7 +685,7 @@ median_cut(PixelList *hl[3], uint32_t imPixelCount, int nPixels) { } } while (compute_box_volume(thisNode) == 1); if (!split(thisNode)) { -#ifndef NO_OUTPUT +#ifdef DEBUG printf("Oops, split failed...\n"); #endif exit(1); @@ -716,16 +714,14 @@ free_box_tree(BoxNode *n) { free(n); } -#ifdef TEST_SPLIT_INTEGRITY +#ifdef DEBUG static int checkContained(BoxNode *n, Pixel *pp) { if (n->l && n->r) { return checkContained(n->l, pp) + checkContained(n->r, pp); } if (n->l || n->r) { -#ifndef NO_OUTPUT printf("box tree is dead\n"); -#endif return 0; } if (pp->c.r <= n->head[0]->p.c.r && pp->c.r >= n->tail[0]->p.c.r && @@ -746,7 +742,7 @@ annotate_hash_table(BoxNode *n, HashTable *h, uint32_t *box) { return annotate_hash_table(n->l, h, box) && annotate_hash_table(n->r, h, box); } if (n->l || n->r) { -#ifndef NO_OUTPUT +#ifdef DEBUG printf("box tree is dead\n"); #endif return 0; @@ -754,7 +750,7 @@ annotate_hash_table(BoxNode *n, HashTable *h, uint32_t *box) { for (p = n->head[0]; p; p = p->next[0]) { PIXEL_UNSCALE(&(p->p), &q, d->scale); if (!hashtable_insert(h, q, *box)) { -#ifndef NO_OUTPUT +#ifdef DEBUG printf("hashtable insert failed\n"); #endif return 0; @@ -978,7 +974,7 @@ map_image_pixels_from_median_box( continue; } if (!hashtable_lookup(medianBoxHash, pixelData[i], &pixelVal)) { -#ifndef NO_OUTPUT +#ifdef DEBUG printf("pixel lookup failed\n"); #endif return 0; @@ -1043,7 +1039,7 @@ compute_palette_from_median_cut( } } for (i = 0; i < nPixels; i++) { -#ifdef TEST_SPLIT_INTEGRITY +#ifdef DEBUG if (!(i % 100)) { printf("%05d\r", i); fflush(stdout); @@ -1058,7 +1054,7 @@ compute_palette_from_median_cut( } #endif if (!hashtable_lookup(medianBoxHash, pixelData[i], &paletteEntry)) { -#ifndef NO_OUTPUT +#ifdef DEBUG printf("pixel lookup failed\n"); #endif for (i = 0; i < 3; i++) { @@ -1068,7 +1064,7 @@ compute_palette_from_median_cut( return 0; } if (paletteEntry >= nPaletteEntries) { -#ifndef NO_OUTPUT +#ifdef DEBUG printf( "panic - paletteEntry>=nPaletteEntries (%d>=%d)\n", (int)paletteEntry, @@ -1140,7 +1136,7 @@ compute_palette_from_quantized_pixels( } for (i = 0; i < nPixels; i++) { if (qp[i] >= nPaletteEntries) { -#ifndef NO_OUTPUT +#ifdef DEBUG printf("scream\n"); #endif return 0; @@ -1208,7 +1204,7 @@ k_means( goto error_2; } -#ifndef NO_OUTPUT +#ifdef DEBUG printf("["); fflush(stdout); #endif @@ -1243,7 +1239,7 @@ k_means( if (changes < 0) { goto error_3; } -#ifndef NO_OUTPUT +#ifdef DEBUG printf(".(%d)", changes); fflush(stdout); #endif @@ -1251,7 +1247,7 @@ k_means( break; } } -#ifndef NO_OUTPUT +#ifdef DEBUG printf("]\n"); #endif if (avgDistSortKey) { @@ -1311,32 +1307,32 @@ quantize( uint32_t **avgDistSortKey; Pixel *p; -#ifndef NO_OUTPUT +#ifdef DEBUG uint32_t timer, timer2; #endif -#ifndef NO_OUTPUT +#ifdef DEBUG timer2 = clock(); printf("create hash table..."); fflush(stdout); timer = clock(); #endif h = create_pixel_hash(pixelData, nPixels); -#ifndef NO_OUTPUT +#ifdef DEBUG printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC); #endif if (!h) { goto error_0; } -#ifndef NO_OUTPUT +#ifdef DEBUG printf("create lists from hash table..."); fflush(stdout); timer = clock(); #endif hl[0] = hl[1] = hl[2] = NULL; hashtable_foreach(h, hash_to_list, hl); -#ifndef NO_OUTPUT +#ifdef DEBUG printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC); #endif @@ -1344,7 +1340,7 @@ quantize( goto error_1; } -#ifndef NO_OUTPUT +#ifdef DEBUG printf("mergesort lists..."); fflush(stdout); timer = clock(); @@ -1352,39 +1348,37 @@ quantize( for (i = 0; i < 3; i++) { hl[i] = mergesort_pixels(hl[i], i); } -#ifdef TEST_MERGESORT +#ifdef DEBUG if (!test_sorted(hl)) { printf("bug in mergesort\n"); goto error_1; } -#endif -#ifndef NO_OUTPUT printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC); #endif -#ifndef NO_OUTPUT +#ifdef DEBUG printf("median cut..."); fflush(stdout); timer = clock(); #endif root = median_cut(hl, nPixels, nQuantPixels); -#ifndef NO_OUTPUT +#ifdef DEBUG printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC); #endif if (!root) { goto error_1; } nPaletteEntries = 0; -#ifndef NO_OUTPUT +#ifdef DEBUG printf("median cut tree to hash table..."); fflush(stdout); timer = clock(); #endif annotate_hash_table(root, h, &nPaletteEntries); -#ifndef NO_OUTPUT +#ifdef DEBUG printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC); #endif -#ifndef NO_OUTPUT +#ifdef DEBUG printf("compute palette...\n"); fflush(stdout); timer = clock(); @@ -1392,7 +1386,7 @@ quantize( if (!compute_palette_from_median_cut(pixelData, nPixels, h, &p, nPaletteEntries)) { goto error_3; } -#ifndef NO_OUTPUT +#ifdef DEBUG printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC); #endif @@ -1479,7 +1473,7 @@ quantize( hashtable_free(h2); } #endif -#ifndef NO_OUTPUT +#ifdef DEBUG printf("k means...\n"); fflush(stdout); timer = clock(); @@ -1487,7 +1481,7 @@ quantize( if (kmeans > 0) { k_means(pixelData, nPixels, p, nPaletteEntries, qp, kmeans - 1); } -#ifndef NO_OUTPUT +#ifdef DEBUG printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC); #endif @@ -1495,7 +1489,7 @@ quantize( *palette = p; *paletteLength = nPaletteEntries; -#ifndef NO_OUTPUT +#ifdef DEBUG printf("cleanup..."); fflush(stdout); timer = clock(); @@ -1507,7 +1501,7 @@ quantize( free(avgDistSortKey); } destroy_pixel_hash(h); -#ifndef NO_OUTPUT +#ifdef DEBUG printf("done (%f)\n", (clock() - timer) / (double)CLOCKS_PER_SEC); printf("-----\ntotal time %f\n", (clock() - timer2) / (double)CLOCKS_PER_SEC); #endif From a6d83ec9ccc23284bf5274325591499500e269d7 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Sun, 28 Jul 2024 17:09:31 +0400 Subject: [PATCH 208/662] Add relesenotes --- docs/releasenotes/11.0.0.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index bb6179de8..936a441d9 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -77,3 +77,10 @@ others prepare for 3.13, and to ensure Pillow could be used immediately at the r of 3.13.0 final (2024-10-01, :pep:`719`). Pillow 11.0.0 now officially supports Python 3.13. + +C-level Flags +^^^^^^^^^^^^^ + +Some compiling flags like ``WITH_THREADING``, ``WITH_IMAGECHOPS``, and other +``WITH_*`` were removed. These flags were not available in the build system, +but they could be edited in the C source. From 302962dae10b7dcae7e373ba8193e846211f3922 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Sun, 28 Jul 2024 17:19:50 +0400 Subject: [PATCH 209/662] Updated comments by @radarhere, lost during rebase --- docs/releasenotes/11.0.0.rst | 2 +- src/_imaging.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index 936a441d9..f30442aef 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -82,5 +82,5 @@ C-level Flags ^^^^^^^^^^^^^ Some compiling flags like ``WITH_THREADING``, ``WITH_IMAGECHOPS``, and other -``WITH_*`` were removed. These flags were not available in the build system, +``WITH_*`` were removed. These flags were not available through the build system, but they could be edited in the C source. diff --git a/src/_imaging.c b/src/_imaging.c index 91cae2e5d..b24776ead 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -2613,7 +2613,7 @@ _chop_overlay(ImagingObject *self, PyObject *args) { return PyImagingNew(ImagingOverlay(self->image, imagep->image)); } -/* Graphics (ImageDraw) ----------------------------------------------- */ +/* Fonts (ImageDraw and ImageFont) ------------------------------------ */ static PyObject * _font_new(PyObject *self_, PyObject *args) { @@ -2842,7 +2842,7 @@ static struct PyMethodDef _font_methods[] = { {NULL, NULL} /* sentinel */ }; -/* -------------------------------------------------------------------- */ +/* Graphics (ImageDraw) ----------------------------------------------- */ static PyObject * _draw_new(PyObject *self_, PyObject *args) { From 6420f73613dce5533e2d8a417f8d7fede98de07e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 29 Jul 2024 23:46:07 +1000 Subject: [PATCH 210/662] Added type hints --- src/PIL/Image.py | 6 +++- src/PIL/ImageDraw2.py | 2 +- src/PIL/ImageFont.py | 6 ++-- src/PIL/ImagePalette.py | 2 +- src/PIL/Jpeg2KImagePlugin.py | 2 +- src/PIL/PdfImagePlugin.py | 45 +++++++++++++++----------- src/PIL/TiffImagePlugin.py | 61 ++++++++++++++++++++---------------- 7 files changed, 71 insertions(+), 53 deletions(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index eb3dd5a36..ae8634539 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -2052,7 +2052,11 @@ class Image: msg = "illegal image mode" raise ValueError(msg) if isinstance(data, ImagePalette.ImagePalette): - palette = ImagePalette.raw(data.rawmode, data.palette) + if data.rawmode is not None: + palette = ImagePalette.raw(data.rawmode, data.palette) + else: + palette = ImagePalette.ImagePalette(palette=data.palette) + palette.dirty = 1 else: if not isinstance(data, bytes): data = bytes(data) diff --git a/src/PIL/ImageDraw2.py b/src/PIL/ImageDraw2.py index 1ad239382..58302f950 100644 --- a/src/PIL/ImageDraw2.py +++ b/src/PIL/ImageDraw2.py @@ -167,7 +167,7 @@ class Draw: """ self.render("polygon", xy, *options) - def rectangle(self, xy: Coords, *options) -> None: + def rectangle(self, xy: Coords, *options: Any) -> None: """ Draws a rectangle. diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 24490348c..2ab65bfef 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -269,12 +269,12 @@ class FreeTypeFont: else: load_from_bytes(font) - def __getstate__(self): + def __getstate__(self) -> list[Any]: return [self.path, self.size, self.index, self.encoding, self.layout_engine] - def __setstate__(self, state): + def __setstate__(self, state: list[Any]) -> None: path, size, index, encoding, layout_engine = state - self.__init__(path, size, index, encoding, layout_engine) + FreeTypeFont.__init__(self, path, size, index, encoding, layout_engine) def getname(self) -> tuple[str | None, str | None]: """ diff --git a/src/PIL/ImagePalette.py b/src/PIL/ImagePalette.py index 8ccecbd07..183f85526 100644 --- a/src/PIL/ImagePalette.py +++ b/src/PIL/ImagePalette.py @@ -208,7 +208,7 @@ class ImagePalette: # Internal -def raw(rawmode, data: Sequence[int] | bytes | bytearray) -> ImagePalette: +def raw(rawmode: str, data: Sequence[int] | bytes | bytearray) -> ImagePalette: palette = ImagePalette() palette.rawmode = rawmode palette.palette = data diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py index eeec41686..ef9107f00 100644 --- a/src/PIL/Jpeg2KImagePlugin.py +++ b/src/PIL/Jpeg2KImagePlugin.py @@ -324,7 +324,7 @@ class Jpeg2KImageFile(ImageFile.ImageFile): return self._reduce or super().reduce @reduce.setter - def reduce(self, value): + def reduce(self, value: int) -> None: self._reduce = value def load(self) -> Image.core.PixelAccess | None: diff --git a/src/PIL/PdfImagePlugin.py b/src/PIL/PdfImagePlugin.py index e0f732199..7fc1108bb 100644 --- a/src/PIL/PdfImagePlugin.py +++ b/src/PIL/PdfImagePlugin.py @@ -25,7 +25,7 @@ import io import math import os import time -from typing import IO +from typing import IO, Any from . import Image, ImageFile, ImageSequence, PdfParser, __version__, features @@ -48,7 +48,12 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: # (Internal) Image save plugin for the PDF format. -def _write_image(im, filename, existing_pdf, image_refs): +def _write_image( + im: Image.Image, + filename: str | bytes, + existing_pdf: PdfParser.PdfParser, + image_refs: list[PdfParser.IndirectReference], +) -> tuple[PdfParser.IndirectReference, str]: # FIXME: Should replace ASCIIHexDecode with RunLengthDecode # (packbits) or LZWDecode (tiff/lzw compression). Note that # PDF 1.2 also supports Flatedecode (zip compression). @@ -61,10 +66,10 @@ def _write_image(im, filename, existing_pdf, image_refs): width, height = im.size - dict_obj = {"BitsPerComponent": 8} + dict_obj: dict[str, Any] = {"BitsPerComponent": 8} if im.mode == "1": if features.check("libtiff"): - filter = "CCITTFaxDecode" + decode_filter = "CCITTFaxDecode" dict_obj["BitsPerComponent"] = 1 params = PdfParser.PdfArray( [ @@ -79,22 +84,23 @@ def _write_image(im, filename, existing_pdf, image_refs): ] ) else: - filter = "DCTDecode" + decode_filter = "DCTDecode" dict_obj["ColorSpace"] = PdfParser.PdfName("DeviceGray") procset = "ImageB" # grayscale elif im.mode == "L": - filter = "DCTDecode" + decode_filter = "DCTDecode" # params = f"<< /Predictor 15 /Columns {width-2} >>" dict_obj["ColorSpace"] = PdfParser.PdfName("DeviceGray") procset = "ImageB" # grayscale elif im.mode == "LA": - filter = "JPXDecode" + decode_filter = "JPXDecode" # params = f"<< /Predictor 15 /Columns {width-2} >>" procset = "ImageB" # grayscale dict_obj["SMaskInData"] = 1 elif im.mode == "P": - filter = "ASCIIHexDecode" + decode_filter = "ASCIIHexDecode" palette = im.getpalette() + assert palette is not None dict_obj["ColorSpace"] = [ PdfParser.PdfName("Indexed"), PdfParser.PdfName("DeviceRGB"), @@ -110,15 +116,15 @@ def _write_image(im, filename, existing_pdf, image_refs): image_ref = _write_image(smask, filename, existing_pdf, image_refs)[0] dict_obj["SMask"] = image_ref elif im.mode == "RGB": - filter = "DCTDecode" + decode_filter = "DCTDecode" dict_obj["ColorSpace"] = PdfParser.PdfName("DeviceRGB") procset = "ImageC" # color images elif im.mode == "RGBA": - filter = "JPXDecode" + decode_filter = "JPXDecode" procset = "ImageC" # color images dict_obj["SMaskInData"] = 1 elif im.mode == "CMYK": - filter = "DCTDecode" + decode_filter = "DCTDecode" dict_obj["ColorSpace"] = PdfParser.PdfName("DeviceCMYK") procset = "ImageC" # color images decode = [1, 0, 1, 0, 1, 0, 1, 0] @@ -131,9 +137,9 @@ def _write_image(im, filename, existing_pdf, image_refs): op = io.BytesIO() - if filter == "ASCIIHexDecode": + if decode_filter == "ASCIIHexDecode": ImageFile._save(im, op, [("hex", (0, 0) + im.size, 0, im.mode)]) - elif filter == "CCITTFaxDecode": + elif decode_filter == "CCITTFaxDecode": im.save( op, "TIFF", @@ -141,21 +147,22 @@ def _write_image(im, filename, existing_pdf, image_refs): # use a single strip strip_size=math.ceil(width / 8) * height, ) - elif filter == "DCTDecode": + elif decode_filter == "DCTDecode": Image.SAVE["JPEG"](im, op, filename) - elif filter == "JPXDecode": + elif decode_filter == "JPXDecode": del dict_obj["BitsPerComponent"] Image.SAVE["JPEG2000"](im, op, filename) else: - msg = f"unsupported PDF filter ({filter})" + msg = f"unsupported PDF filter ({decode_filter})" raise ValueError(msg) stream = op.getvalue() - if filter == "CCITTFaxDecode": + filter: PdfParser.PdfArray | PdfParser.PdfName + if decode_filter == "CCITTFaxDecode": stream = stream[8:] - filter = PdfParser.PdfArray([PdfParser.PdfName(filter)]) + filter = PdfParser.PdfArray([PdfParser.PdfName(decode_filter)]) else: - filter = PdfParser.PdfName(filter) + filter = PdfParser.PdfName(decode_filter) image_ref = image_refs.pop(0) existing_pdf.write_obj( diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 318e9825c..dd013a0cf 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -47,16 +47,18 @@ import math import os import struct import warnings -from collections.abc import MutableMapping +from collections.abc import Iterator, MutableMapping from fractions import Fraction from numbers import Number, Rational -from typing import IO, TYPE_CHECKING, Any, Callable, NoReturn +from typing import IO, TYPE_CHECKING, Any, Callable, NoReturn, cast from . import ExifTags, Image, ImageFile, ImageOps, ImagePalette, TiffTags from ._binary import i16be as i16 from ._binary import i32be as i32 from ._binary import o8 from ._deprecate import deprecate +from ._typing import StrOrBytesPath +from ._util import is_path from .TiffTags import TYPES logger = logging.getLogger(__name__) @@ -313,7 +315,7 @@ _load_dispatch = {} _write_dispatch = {} -def _delegate(op): +def _delegate(op: str): def delegate(self, *args): return getattr(self._val, op)(*args) @@ -334,7 +336,9 @@ class IFDRational(Rational): __slots__ = ("_numerator", "_denominator", "_val") - def __init__(self, value, denominator: int = 1) -> None: + def __init__( + self, value: float | Fraction | IFDRational, denominator: int = 1 + ) -> None: """ :param value: either an integer numerator, a float/rational/other number, or an IFDRational @@ -358,18 +362,20 @@ class IFDRational(Rational): self._val = float("nan") elif denominator == 1: self._val = Fraction(value) + elif int(value) == value: + self._val = Fraction(int(value), denominator) else: - self._val = Fraction(value, denominator) + self._val = Fraction(value / denominator) @property def numerator(self): return self._numerator @property - def denominator(self): + def denominator(self) -> int: return self._denominator - def limit_rational(self, max_denominator): + def limit_rational(self, max_denominator: int) -> tuple[float, int]: """ :param max_denominator: Integer, the maximum denominator value @@ -379,6 +385,7 @@ class IFDRational(Rational): if self.denominator == 0: return self.numerator, self.denominator + assert isinstance(self._val, Fraction) f = self._val.limit_denominator(max_denominator) return f.numerator, f.denominator @@ -396,14 +403,15 @@ class IFDRational(Rational): val = float(val) return val == other - def __getstate__(self): + def __getstate__(self) -> list[float | Fraction]: return [self._val, self._numerator, self._denominator] - def __setstate__(self, state): + def __setstate__(self, state: list[float | Fraction]) -> None: IFDRational.__init__(self, 0) _val, _numerator, _denominator = state self._val = _val self._numerator = _numerator + assert isinstance(_denominator, int) self._denominator = _denominator """ a = ['add','radd', 'sub', 'rsub', 'mul', 'rmul', @@ -730,13 +738,13 @@ class ImageFileDirectory_v2(_IFDv2Base): self._tags_v1.pop(tag, None) self._tagdata.pop(tag, None) - def __iter__(self): + def __iter__(self) -> Iterator[int]: return iter(set(self._tagdata) | set(self._tags_v2)) def _unpack(self, fmt: str, data: bytes): return struct.unpack(self._endian + fmt, data) - def _pack(self, fmt: str, *values): + def _pack(self, fmt: str, *values) -> bytes: return struct.pack(self._endian + fmt, *values) list( @@ -787,7 +795,7 @@ class ImageFileDirectory_v2(_IFDv2Base): def load_rational(self, data, legacy_api: bool = True): vals = self._unpack(f"{len(data) // 4}L", data) - def combine(a, b): + def combine(a: int, b: int) -> tuple[int, int] | IFDRational: return (a, b) if legacy_api else IFDRational(a, b) return tuple(combine(num, denom) for num, denom in zip(vals[::2], vals[1::2])) @@ -814,7 +822,7 @@ class ImageFileDirectory_v2(_IFDv2Base): def load_signed_rational(self, data: bytes, legacy_api: bool = True): vals = self._unpack(f"{len(data) // 4}l", data) - def combine(a, b): + def combine(a: int, b: int) -> tuple[int, int] | IFDRational: return (a, b) if legacy_api else IFDRational(a, b) return tuple(combine(num, denom) for num, denom in zip(vals[::2], vals[1::2])) @@ -903,11 +911,11 @@ class ImageFileDirectory_v2(_IFDv2Base): warnings.warn(str(msg)) return - def tobytes(self, offset=0): + def tobytes(self, offset: int = 0) -> bytes: # FIXME What about tagdata? result = self._pack("H", len(self._tags_v2)) - entries = [] + entries: list[tuple[int, int, int, bytes, bytes]] = [] offset = offset + len(result) + len(self._tags_v2) * 12 + 4 stripoffsets = None @@ -916,7 +924,7 @@ class ImageFileDirectory_v2(_IFDv2Base): for tag, value in sorted(self._tags_v2.items()): if tag == STRIPOFFSETS: stripoffsets = len(entries) - typ = self.tagtype.get(tag) + typ = self.tagtype[tag] logger.debug("Tag %s, Type: %s, Value: %s", tag, typ, repr(value)) is_ifd = typ == TiffTags.LONG and isinstance(value, dict) if is_ifd: @@ -1072,7 +1080,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2): def __len__(self) -> int: return len(set(self._tagdata) | set(self._tags_v1)) - def __iter__(self): + def __iter__(self) -> Iterator[int]: return iter(set(self._tagdata) | set(self._tags_v1)) def __setitem__(self, tag: int, value) -> None: @@ -1943,17 +1951,18 @@ class AppendingTiffWriter: 521, # JPEGACTables } - def __init__(self, fn, new: bool = False) -> None: - if hasattr(fn, "read"): - self.f = fn - self.close_fp = False - else: + def __init__(self, fn: StrOrBytesPath | IO[bytes], new: bool = False) -> None: + self.f: IO[bytes] + if is_path(fn): self.name = fn self.close_fp = True try: self.f = open(fn, "w+b" if new else "r+b") except OSError: self.f = open(fn, "w+b") + else: + self.f = cast(IO[bytes], fn) + self.close_fp = False self.beginning = self.f.tell() self.setup() @@ -1961,7 +1970,7 @@ class AppendingTiffWriter: # Reset everything. self.f.seek(self.beginning, os.SEEK_SET) - self.whereToWriteNewIFDOffset = None + self.whereToWriteNewIFDOffset: int | None = None self.offsetOfNewPage = 0 self.IIMM = iimm = self.f.read(4) @@ -2000,6 +2009,7 @@ class AppendingTiffWriter: ifd_offset = self.readLong() ifd_offset += self.offsetOfNewPage + assert self.whereToWriteNewIFDOffset is not None self.f.seek(self.whereToWriteNewIFDOffset) self.writeLong(ifd_offset) self.f.seek(ifd_offset) @@ -2020,7 +2030,7 @@ class AppendingTiffWriter: def tell(self) -> int: return self.f.tell() - self.offsetOfNewPage - def seek(self, offset: int, whence=io.SEEK_SET) -> int: + def seek(self, offset: int, whence: int = io.SEEK_SET) -> int: if whence == os.SEEK_SET: offset += self.offsetOfNewPage @@ -2111,7 +2121,6 @@ class AppendingTiffWriter: field_size = self.fieldSizes[field_type] total_size = field_size * count is_local = total_size <= 4 - offset: int | None if not is_local: offset = self.readLong() + self.offsetOfNewPage self.rewriteLastLong(offset) @@ -2131,8 +2140,6 @@ class AppendingTiffWriter: ) self.f.seek(cur_pos) - offset = cur_pos = None - elif is_local: # skip the locally stored value that is not an offset self.f.seek(4, os.SEEK_CUR) From db5c4fbb2cb0978f58d503aadc6901c01c023a47 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 27 Jul 2024 18:41:37 +1000 Subject: [PATCH 211/662] Include required arguments --- src/PIL/ImageDraw2.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/PIL/ImageDraw2.py b/src/PIL/ImageDraw2.py index 58302f950..6e848663b 100644 --- a/src/PIL/ImageDraw2.py +++ b/src/PIL/ImageDraw2.py @@ -80,7 +80,7 @@ class Draw: return self.image def render( - self, op: str, xy: Coords, pen: Pen | Brush, brush: Brush | Pen | None = None + self, op: str, xy: Coords, pen: Pen | Brush | None, brush: Brush | Pen | None = None ) -> None: # handle color arguments outline = fill = None @@ -111,50 +111,50 @@ class Draw: (xoffset, yoffset) = offset self.transform = (1, 0, xoffset, 0, 1, yoffset) - def arc(self, xy: Coords, start, end, *options: Any) -> None: + def arc(self, xy: Coords, pen: Pen | Brush | None, start, end, *options: Any) -> None: """ Draws an arc (a portion of a circle outline) between the start and end angles, inside the given bounding box. .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.arc` """ - self.render("arc", xy, start, end, *options) + self.render("arc", xy, pen, start, end, *options) - def chord(self, xy: Coords, start, end, *options: Any) -> None: + def chord(self, xy: Coords, pen: Pen | Brush | None, start, end, *options: Any) -> None: """ Same as :py:meth:`~PIL.ImageDraw2.Draw.arc`, but connects the end points with a straight line. .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.chord` """ - self.render("chord", xy, start, end, *options) + self.render("chord", xy, pen, start, end, *options) - def ellipse(self, xy: Coords, *options: Any) -> None: + def ellipse(self, xy: Coords, pen: Pen | Brush | None, *options: Any) -> None: """ Draws an ellipse inside the given bounding box. .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.ellipse` """ - self.render("ellipse", xy, *options) + self.render("ellipse", xy, pen, *options) - def line(self, xy: Coords, *options: Any) -> None: + def line(self, xy: Coords, pen: Pen | Brush | None, *options: Any) -> None: """ Draws a line between the coordinates in the ``xy`` list. .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.line` """ - self.render("line", xy, *options) + self.render("line", xy, pen, *options) - def pieslice(self, xy: Coords, start, end, *options: Any) -> None: + def pieslice(self, xy: Coords, pen: Pen | Brush | None, start, end, *options: Any) -> None: """ Same as arc, but also draws straight lines between the end points and the center of the bounding box. .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.pieslice` """ - self.render("pieslice", xy, start, end, *options) + self.render("pieslice", xy, pen, start, end, *options) - def polygon(self, xy: Coords, *options: Any) -> None: + def polygon(self, xy: Coords, pen: Pen | Brush | None, *options: Any) -> None: """ Draws a polygon. @@ -165,15 +165,15 @@ class Draw: .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.polygon` """ - self.render("polygon", xy, *options) + self.render("polygon", xy, pen, *options) - def rectangle(self, xy: Coords, *options: Any) -> None: + def rectangle(self, xy: Coords, pen: Pen | Brush | None, *options: Any) -> None: """ Draws a rectangle. .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.rectangle` """ - self.render("rectangle", xy, *options) + self.render("rectangle", xy, pen, *options) def text(self, xy: tuple[float, float], text: AnyStr, font: Font) -> None: """ From b84e2a9935a49197012002122ad84a856940133a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 27 Jul 2024 18:55:17 +1000 Subject: [PATCH 212/662] Do not pass outline to arc --- src/PIL/ImageDraw2.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/PIL/ImageDraw2.py b/src/PIL/ImageDraw2.py index 6e848663b..97898ffd9 100644 --- a/src/PIL/ImageDraw2.py +++ b/src/PIL/ImageDraw2.py @@ -101,7 +101,9 @@ class Draw: path.transform(self.transform) xy = path # render the item - if op == "line": + if op == "arc": + self.draw.arc(xy, fill=outline) + elif op == "line": self.draw.line(xy, fill=outline, width=width) else: getattr(self.draw, op)(xy, fill=fill, outline=outline) From 955854728acf3456866bbfa152920b5d81eb449a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 27 Jul 2024 18:44:13 +1000 Subject: [PATCH 213/662] Pass start and end to arc, chord and pieslice --- Tests/test_imagedraw2.py | 46 +++++++++++++++++++++++++++++++++++ src/PIL/ImageDraw2.py | 52 ++++++++++++++++++++++++++++++---------- 2 files changed, 86 insertions(+), 12 deletions(-) diff --git a/Tests/test_imagedraw2.py b/Tests/test_imagedraw2.py index c80aa739c..e0d368228 100644 --- a/Tests/test_imagedraw2.py +++ b/Tests/test_imagedraw2.py @@ -65,6 +65,36 @@ def test_mode() -> None: ImageDraw2.Draw("L") +@pytest.mark.parametrize("bbox", BBOX) +@pytest.mark.parametrize("start, end", ((0, 180), (0.5, 180.4))) +def test_arc(bbox: Coords, start: float, end: float) -> None: + # Arrange + im = Image.new("RGB", (W, H)) + draw = ImageDraw2.Draw(im) + pen = ImageDraw2.Pen("white", width=1) + + # Act + draw.arc(bbox, pen, start, end) + + # Assert + assert_image_similar_tofile(im, "Tests/images/imagedraw_arc.png", 1) + + +@pytest.mark.parametrize("bbox", BBOX) +def test_chord(bbox: Coords) -> None: + # Arrange + im = Image.new("RGB", (W, H)) + draw = ImageDraw2.Draw(im) + pen = ImageDraw2.Pen("yellow") + brush = ImageDraw2.Brush("red") + + # Act + draw.chord(bbox, pen, 0, 180, brush) + + # Assert + assert_image_similar_tofile(im, "Tests/images/imagedraw_chord_RGB.png", 1) + + @pytest.mark.parametrize("bbox", BBOX) def test_ellipse(bbox: Coords) -> None: # Arrange @@ -123,6 +153,22 @@ def test_line_pen_as_brush(points: Coords) -> None: assert_image_equal_tofile(im, "Tests/images/imagedraw_line.png") +@pytest.mark.parametrize("bbox", BBOX) +@pytest.mark.parametrize("start, end", ((-92, 46), (-92.2, 46.2))) +def test_pieslice(bbox: Coords, start: float, end: float) -> None: + # Arrange + im = Image.new("RGB", (W, H)) + draw = ImageDraw2.Draw(im) + pen = ImageDraw2.Pen("blue") + brush = ImageDraw2.Brush("white") + + # Act + draw.pieslice(bbox, pen, start, end, brush) + + # Assert + assert_image_similar_tofile(im, "Tests/images/imagedraw_pieslice.png", 1) + + @pytest.mark.parametrize("points", POINTS) def test_polygon(points: Coords) -> None: # Arrange diff --git a/src/PIL/ImageDraw2.py b/src/PIL/ImageDraw2.py index 97898ffd9..3d68658ed 100644 --- a/src/PIL/ImageDraw2.py +++ b/src/PIL/ImageDraw2.py @@ -80,7 +80,12 @@ class Draw: return self.image def render( - self, op: str, xy: Coords, pen: Pen | Brush | None, brush: Brush | Pen | None = None + self, + op: str, + xy: Coords, + pen: Pen | Brush | None, + brush: Brush | Pen | None = None, + **kwargs: Any, ) -> None: # handle color arguments outline = fill = None @@ -101,35 +106,51 @@ class Draw: path.transform(self.transform) xy = path # render the item - if op == "arc": - self.draw.arc(xy, fill=outline) - elif op == "line": - self.draw.line(xy, fill=outline, width=width) + if op in ("arc", "line"): + kwargs.setdefault("fill", outline) else: - getattr(self.draw, op)(xy, fill=fill, outline=outline) + kwargs.setdefault("fill", fill) + kwargs.setdefault("outline", outline) + if op == "line": + kwargs.setdefault("width", width) + getattr(self.draw, op)(xy, **kwargs) def settransform(self, offset: tuple[float, float]) -> None: """Sets a transformation offset.""" (xoffset, yoffset) = offset self.transform = (1, 0, xoffset, 0, 1, yoffset) - def arc(self, xy: Coords, pen: Pen | Brush | None, start, end, *options: Any) -> None: + def arc( + self, + xy: Coords, + pen: Pen | Brush | None, + start: float, + end: float, + *options: Any, + ) -> None: """ Draws an arc (a portion of a circle outline) between the start and end angles, inside the given bounding box. .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.arc` """ - self.render("arc", xy, pen, start, end, *options) + self.render("arc", xy, pen, *options, start=start, end=end) - def chord(self, xy: Coords, pen: Pen | Brush | None, start, end, *options: Any) -> None: + def chord( + self, + xy: Coords, + pen: Pen | Brush | None, + start: float, + end: float, + *options: Any, + ) -> None: """ Same as :py:meth:`~PIL.ImageDraw2.Draw.arc`, but connects the end points with a straight line. .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.chord` """ - self.render("chord", xy, pen, start, end, *options) + self.render("chord", xy, pen, *options, start=start, end=end) def ellipse(self, xy: Coords, pen: Pen | Brush | None, *options: Any) -> None: """ @@ -147,14 +168,21 @@ class Draw: """ self.render("line", xy, pen, *options) - def pieslice(self, xy: Coords, pen: Pen | Brush | None, start, end, *options: Any) -> None: + def pieslice( + self, + xy: Coords, + pen: Pen | Brush | None, + start: float, + end: float, + *options: Any, + ) -> None: """ Same as arc, but also draws straight lines between the end points and the center of the bounding box. .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.pieslice` """ - self.render("pieslice", xy, pen, start, end, *options) + self.render("pieslice", xy, pen, *options, start=start, end=end) def polygon(self, xy: Coords, pen: Pen | Brush | None, *options: Any) -> None: """ From accfaf1c092517f7f3918c33b8f9fc38f9ae6a62 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 30 Jul 2024 20:20:09 +1000 Subject: [PATCH 214/662] Added type hints --- Tests/test_file_jpeg.py | 2 +- Tests/test_image.py | 2 +- docs/reference/plugins.rst | 8 +++++++ src/PIL/EpsImagePlugin.py | 20 ++++++++++++---- src/PIL/Image.py | 48 +++++++++++++++++++++----------------- src/PIL/ImageFile.py | 19 +++++++++++---- src/PIL/JpegImagePlugin.py | 25 ++++++++++++-------- src/PIL/PngImagePlugin.py | 16 +++++++++---- src/PIL/TiffImagePlugin.py | 14 +++++++---- 9 files changed, 101 insertions(+), 53 deletions(-) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index 9660e2828..b4b3f71cb 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -154,7 +154,7 @@ class TestFileJpeg: assert k > 0.9 def test_rgb(self) -> None: - def getchannels(im: JpegImagePlugin.JpegImageFile) -> tuple[int, int, int]: + def getchannels(im: JpegImagePlugin.JpegImageFile) -> tuple[int, ...]: return tuple(v[0] for v in im.layer) im = hopper() diff --git a/Tests/test_image.py b/Tests/test_image.py index 4fdc41791..d8372789b 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -99,7 +99,7 @@ class TestImage: im = Image.new("L", (100, 100)) p = Pretty() - im._repr_pretty_(p, None) + im._repr_pretty_(p, False) assert p.pretty_output == "" def test_open_formats(self) -> None: diff --git a/docs/reference/plugins.rst b/docs/reference/plugins.rst index 18cd99cf3..454b94d8c 100644 --- a/docs/reference/plugins.rst +++ b/docs/reference/plugins.rst @@ -185,6 +185,14 @@ Plugin reference :undoc-members: :show-inheritance: +:mod:`~PIL.MpoImagePlugin` Module +---------------------------------- + +.. automodule:: PIL.MpoImagePlugin + :members: + :undoc-members: + :show-inheritance: + :mod:`~PIL.MspImagePlugin` Module --------------------------------- diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index 7a73d1f69..35915e652 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -65,16 +65,24 @@ def has_ghostscript() -> bool: return gs_binary is not False -def Ghostscript(tile, size, fp, scale=1, transparency: bool = False) -> Image.Image: +def Ghostscript( + tile: list[ImageFile._Tile], + size: tuple[int, int], + fp: IO[bytes], + scale: int = 1, + transparency: bool = False, +) -> Image.Image: """Render an image using Ghostscript""" global gs_binary if not has_ghostscript(): msg = "Unable to locate Ghostscript on paths" raise OSError(msg) + assert isinstance(gs_binary, str) # Unpack decoder tile - decoder, tile, offset, data = tile[0] - length, bbox = data + args = tile[0].args + assert isinstance(args, tuple) + length, bbox = args # Hack to support hi-res rendering scale = int(scale) or 1 @@ -227,7 +235,11 @@ class EpsImageFile(ImageFile.ImageFile): # put floating point values there anyway. box = [int(float(i)) for i in v.split()] self._size = box[2] - box[0], box[3] - box[1] - self.tile = [("eps", (0, 0) + self.size, offset, (length, box))] + self.tile = [ + ImageFile._Tile( + "eps", (0, 0) + self.size, offset, (length, box) + ) + ] except Exception: pass return True diff --git a/src/PIL/Image.py b/src/PIL/Image.py index ae8634539..ebf4f46c4 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -220,7 +220,7 @@ if hasattr(core, "DEFAULT_STRATEGY"): if TYPE_CHECKING: from xml.etree.ElementTree import Element - from . import ImageFile, ImagePalette + from . import ImageFile, ImagePalette, TiffImagePlugin from ._typing import NumpyArray, StrOrBytesPath, TypeGuard ID: list[str] = [] OPEN: dict[ @@ -676,7 +676,7 @@ class Image: id(self), ) - def _repr_pretty_(self, p, cycle) -> None: + def _repr_pretty_(self, p, cycle: bool) -> None: """IPython plain text display support""" # Same as __repr__ but without unpredictable id(self), @@ -1551,6 +1551,7 @@ class Image: ifds.append((exif._get_ifd_dict(subifd_offset), subifd_offset)) ifd1 = exif.get_ifd(ExifTags.IFD.IFD1) if ifd1 and ifd1.get(513): + assert exif._info is not None ifds.append((ifd1, exif._info.next)) offset = None @@ -1560,12 +1561,13 @@ class Image: offset = current_offset fp = self.fp - thumbnail_offset = ifd.get(513) - if thumbnail_offset is not None: - thumbnail_offset += getattr(self, "_exif_offset", 0) - self.fp.seek(thumbnail_offset) - data = self.fp.read(ifd.get(514)) - fp = io.BytesIO(data) + if ifd is not None: + thumbnail_offset = ifd.get(513) + if thumbnail_offset is not None: + thumbnail_offset += getattr(self, "_exif_offset", 0) + self.fp.seek(thumbnail_offset) + data = self.fp.read(ifd.get(514)) + fp = io.BytesIO(data) with open(fp) as im: from . import TiffImagePlugin @@ -3869,14 +3871,14 @@ class Exif(_ExifBase): bigtiff = False _loaded = False - def __init__(self): - self._data = {} - self._hidden_data = {} - self._ifds = {} - self._info = None - self._loaded_exif = None + def __init__(self) -> None: + self._data: dict[int, Any] = {} + self._hidden_data: dict[int, Any] = {} + self._ifds: dict[int, dict[int, Any]] = {} + self._info: TiffImagePlugin.ImageFileDirectory_v2 | None = None + self._loaded_exif: bytes | None = None - def _fixup(self, value): + def _fixup(self, value: Any) -> Any: try: if len(value) == 1 and isinstance(value, tuple): return value[0] @@ -3884,24 +3886,26 @@ class Exif(_ExifBase): pass return value - def _fixup_dict(self, src_dict): + def _fixup_dict(self, src_dict: dict[int, Any]) -> dict[int, Any]: # Helper function # returns a dict with any single item tuples/lists as individual values return {k: self._fixup(v) for k, v in src_dict.items()} - def _get_ifd_dict(self, offset: int, group: int | None = None): + def _get_ifd_dict( + self, offset: int, group: int | None = None + ) -> dict[int, Any] | None: try: # an offset pointer to the location of the nested embedded IFD. # It should be a long, but may be corrupted. self.fp.seek(offset) except (KeyError, TypeError): - pass + return None else: from . import TiffImagePlugin info = TiffImagePlugin.ImageFileDirectory_v2(self.head, group=group) info.load(self.fp) - return self._fixup_dict(info) + return self._fixup_dict(dict(info)) def _get_head(self) -> bytes: version = b"\x2B" if self.bigtiff else b"\x2A" @@ -3966,7 +3970,7 @@ class Exif(_ExifBase): self.fp.seek(offset) self._info.load(self.fp) - def _get_merged_dict(self): + def _get_merged_dict(self) -> dict[int, Any]: merged_dict = dict(self) # get EXIF extension @@ -4124,7 +4128,7 @@ class Exif(_ExifBase): keys.update(self._info) return len(keys) - def __getitem__(self, tag: int): + def __getitem__(self, tag: int) -> Any: if self._info is not None and tag not in self._data and tag in self._info: self._data[tag] = self._fixup(self._info[tag]) del self._info[tag] @@ -4133,7 +4137,7 @@ class Exif(_ExifBase): def __contains__(self, tag: object) -> bool: return tag in self._data or (self._info is not None and tag in self._info) - def __setitem__(self, tag: int, value) -> None: + def __setitem__(self, tag: int, value: Any) -> None: if self._info is not None and tag in self._info: del self._info[tag] self._data[tag] = value diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index e4a7dba44..2a8846c1a 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -86,7 +86,7 @@ def raise_oserror(error: int) -> OSError: raise _get_oserror(error, encoder=False) -def _tilesort(t) -> int: +def _tilesort(t: _Tile) -> int: # sort on offset return t[2] @@ -161,7 +161,7 @@ class ImageFile(Image.Image): return Image.MIME.get(self.format.upper()) return None - def __setstate__(self, state) -> None: + def __setstate__(self, state: list[Any]) -> None: self.tile = [] super().__setstate__(state) @@ -525,7 +525,7 @@ class Parser: # -------------------------------------------------------------------- -def _save(im, fp, tile, bufsize: int = 0) -> None: +def _save(im: Image.Image, fp: IO[bytes], tile, bufsize: int = 0) -> None: """Helper to save image based on tile list :param im: Image object. @@ -554,7 +554,12 @@ def _save(im, fp, tile, bufsize: int = 0) -> None: def _encode_tile( - im, fp: IO[bytes], tile: list[_Tile], bufsize: int, fh, exc=None + im: Image.Image, + fp: IO[bytes], + tile: list[_Tile], + bufsize: int, + fh, + exc: BaseException | None = None, ) -> None: for encoder_name, extents, offset, args in tile: if offset > 0: @@ -664,7 +669,11 @@ class PyCodec: """ self.fd = fd - def setimage(self, im, extents=None): + def setimage( + self, + im: Image.core.ImagingCore, + extents: tuple[int, int, int, int] | None = None, + ) -> None: """ Called from ImageFile to set the core output image for the codec diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index d83d60b7b..3a83f9ca6 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -42,7 +42,7 @@ import subprocess import sys import tempfile import warnings -from typing import IO, Any +from typing import IO, TYPE_CHECKING, Any from . import Image, ImageFile from ._binary import i16be as i16 @@ -51,6 +51,9 @@ from ._binary import o8 from ._binary import o16be as o16 from .JpegPresets import presets +if TYPE_CHECKING: + from .MpoImagePlugin import MpoImageFile + # # Parser @@ -329,7 +332,7 @@ class JpegImageFile(ImageFile.ImageFile): format = "JPEG" format_description = "JPEG (ISO 10918)" - def _open(self): + def _open(self) -> None: s = self.fp.read(3) if not _accept(s): @@ -342,13 +345,13 @@ class JpegImageFile(ImageFile.ImageFile): self._exif_offset = 0 # JPEG specifics (internal) - self.layer = [] - self.huffman_dc = {} - self.huffman_ac = {} - self.quantization = {} - self.app = {} # compatibility - self.applist = [] - self.icclist = [] + self.layer: list[tuple[int, int, int, int]] = [] + self.huffman_dc: dict[Any, Any] = {} + self.huffman_ac: dict[Any, Any] = {} + self.quantization: dict[int, list[int]] = {} + self.app: dict[str, bytes] = {} # compatibility + self.applist: list[tuple[str, bytes]] = [] + self.icclist: list[bytes] = [] while True: i = s[0] @@ -831,7 +834,9 @@ def _save_cjpeg(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: ## # Factory for making JPEG and MPO instances -def jpeg_factory(fp: IO[bytes] | None = None, filename: str | bytes | None = None): +def jpeg_factory( + fp: IO[bytes] | None = None, filename: str | bytes | None = None +) -> JpegImageFile | MpoImageFile: im = JpegImageFile(fp, filename) try: mpheader = im._getmp() diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 52cfcd13a..910fa9755 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -40,7 +40,7 @@ import warnings import zlib from collections.abc import Callable from enum import IntEnum -from typing import IO, TYPE_CHECKING, Any, NamedTuple, NoReturn +from typing import IO, TYPE_CHECKING, Any, NamedTuple, NoReturn, cast from . import Image, ImageChops, ImageFile, ImagePalette, ImageSequence from ._binary import i16be as i16 @@ -1223,7 +1223,11 @@ def _write_multiple_frames( if default_image: if im.mode != mode: im = im.convert(mode) - ImageFile._save(im, _idat(fp, chunk), [("zip", (0, 0) + im.size, 0, rawmode)]) + ImageFile._save( + im, + cast(IO[bytes], _idat(fp, chunk)), + [("zip", (0, 0) + im.size, 0, rawmode)], + ) seq_num = 0 for frame, frame_data in enumerate(im_frames): @@ -1258,14 +1262,14 @@ def _write_multiple_frames( # first frame must be in IDAT chunks for backwards compatibility ImageFile._save( im_frame, - _idat(fp, chunk), + cast(IO[bytes], _idat(fp, chunk)), [("zip", (0, 0) + im_frame.size, 0, rawmode)], ) else: fdat_chunks = _fdat(fp, chunk, seq_num) ImageFile._save( im_frame, - fdat_chunks, + cast(IO[bytes], fdat_chunks), [("zip", (0, 0) + im_frame.size, 0, rawmode)], ) seq_num = fdat_chunks.seq_num @@ -1465,7 +1469,9 @@ def _save( ) if single_im: ImageFile._save( - single_im, _idat(fp, chunk), [("zip", (0, 0) + single_im.size, 0, rawmode)] + single_im, + cast(IO[bytes], _idat(fp, chunk)), + [("zip", (0, 0) + single_im.size, 0, rawmode)], ) if info: diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index dd013a0cf..d9d1bab5a 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -288,8 +288,10 @@ def _accept(prefix: bytes) -> bool: return prefix[:4] in PREFIXES -def _limit_rational(val, max_val): - inv = abs(val) > 1 +def _limit_rational( + val: float | Fraction | IFDRational, max_val: int +) -> tuple[float, float]: + inv = abs(float(val)) > 1 n_d = IFDRational(1 / val if inv else val).limit_rational(max_val) return n_d[::-1] if inv else n_d @@ -792,7 +794,9 @@ class ImageFileDirectory_v2(_IFDv2Base): return value + b"\0" @_register_loader(5, 8) - def load_rational(self, data, legacy_api: bool = True): + def load_rational( + self, data: bytes, legacy_api: bool = True + ) -> tuple[tuple[int, int] | IFDRational, ...]: vals = self._unpack(f"{len(data) // 4}L", data) def combine(a: int, b: int) -> tuple[int, int] | IFDRational: @@ -801,7 +805,7 @@ class ImageFileDirectory_v2(_IFDv2Base): return tuple(combine(num, denom) for num, denom in zip(vals[::2], vals[1::2])) @_register_writer(5) - def write_rational(self, *values) -> bytes: + def write_rational(self, *values: IFDRational) -> bytes: return b"".join( self._pack("2L", *_limit_rational(frac, 2**32 - 1)) for frac in values ) @@ -828,7 +832,7 @@ class ImageFileDirectory_v2(_IFDv2Base): return tuple(combine(num, denom) for num, denom in zip(vals[::2], vals[1::2])) @_register_writer(10) - def write_signed_rational(self, *values) -> bytes: + def write_signed_rational(self, *values: IFDRational) -> bytes: return b"".join( self._pack("2l", *_limit_signed_rational(frac, 2**31 - 1, -(2**31))) for frac in values From e6fd8359d3184e09b8194c8ae8ec87c5a8c27c7f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 1 Aug 2024 12:27:45 +1000 Subject: [PATCH 215/662] Deprecate huffman_ac and huffman_dc --- Tests/test_file_jpeg.py | 7 +++++++ docs/deprecations.rst | 8 ++++++++ docs/releasenotes/11.0.0.rst | 8 ++++++++ src/PIL/JpegImagePlugin.py | 11 +++++++++-- 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index b4b3f71cb..df589e24a 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -1045,6 +1045,13 @@ class TestFileJpeg: assert im._repr_jpeg_() is None + def test_deprecation(self) -> None: + with Image.open(TEST_FILE) as im: + with pytest.warns(DeprecationWarning): + assert im.huffman_ac == {} + with pytest.warns(DeprecationWarning): + assert im.huffman_dc == {} + @pytest.mark.skipif(not is_win32(), reason="Windows only") @skip_unless_feature("jpg") diff --git a/docs/deprecations.rst b/docs/deprecations.rst index 2f5800e07..a03f274a9 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -118,6 +118,14 @@ The ``options`` parameter in :py:meth:`~PIL.ImageMath.lambda_eval()` and :py:meth:`~PIL.ImageMath.unsafe_eval()` has been deprecated. One or more keyword arguments can be used instead. +JpegImageFile.huffman_ac and JpegImageFile.huffman_dc +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 11.0.0 + +The ``huffman_ac`` and ``huffman_dc`` dictionaries on JPEG images were unused, and have +been deprecated. + Removed features ---------------- diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index bb6179de8..579821ba9 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -50,6 +50,14 @@ The ``options`` parameter in :py:meth:`~PIL.ImageMath.lambda_eval()` and :py:meth:`~PIL.ImageMath.unsafe_eval()` has been deprecated. One or more keyword arguments can be used instead. +JpegImageFile.huffman_ac and JpegImageFile.huffman_dc +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 11.0.0 + +The ``huffman_ac`` and ``huffman_dc`` dictionaries on JPEG images were unused, and have +been deprecated. + API Changes =========== diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 3a83f9ca6..fc897e2b9 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -49,6 +49,7 @@ from ._binary import i16be as i16 from ._binary import i32be as i32 from ._binary import o8 from ._binary import o16be as o16 +from ._deprecate import deprecate from .JpegPresets import presets if TYPE_CHECKING: @@ -346,8 +347,8 @@ class JpegImageFile(ImageFile.ImageFile): # JPEG specifics (internal) self.layer: list[tuple[int, int, int, int]] = [] - self.huffman_dc: dict[Any, Any] = {} - self.huffman_ac: dict[Any, Any] = {} + self._huffman_dc: dict[Any, Any] = {} + self._huffman_ac: dict[Any, Any] = {} self.quantization: dict[int, list[int]] = {} self.app: dict[str, bytes] = {} # compatibility self.applist: list[tuple[str, bytes]] = [] @@ -386,6 +387,12 @@ class JpegImageFile(ImageFile.ImageFile): self._read_dpi_from_exif() + def __getattr__(self, name: str) -> Any: + if name in ("huffman_ac", "huffman_dc"): + deprecate(name, 12) + return getattr(self, "_" + name) + raise AttributeError(name) + def load_read(self, read_bytes: int) -> bytes: """ internal: read more image data From 488e1982bd8d1152c202652260ce8f239178c8f8 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 1 Aug 2024 16:29:46 +1000 Subject: [PATCH 216/662] Added removal version and date --- docs/deprecations.rst | 4 ++-- docs/releasenotes/11.0.0.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index a03f274a9..058468cfe 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -123,8 +123,8 @@ JpegImageFile.huffman_ac and JpegImageFile.huffman_dc .. deprecated:: 11.0.0 -The ``huffman_ac`` and ``huffman_dc`` dictionaries on JPEG images were unused, and have -been deprecated. +The ``huffman_ac`` and ``huffman_dc`` dictionaries on JPEG images were unused. They +have been deprecated, and will be removed in Pillow 12 (2025-10-15). Removed features ---------------- diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index 579821ba9..0175ae52d 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -55,8 +55,8 @@ JpegImageFile.huffman_ac and JpegImageFile.huffman_dc .. deprecated:: 11.0.0 -The ``huffman_ac`` and ``huffman_dc`` dictionaries on JPEG images were unused, and have -been deprecated. +The ``huffman_ac`` and ``huffman_dc`` dictionaries on JPEG images were unused. They +have been deprecated, and will be removed in Pillow 12 (2025-10-15). API Changes =========== From 8f1157a61d70ee003df5a9a91f77219beb8038a9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 2 Aug 2024 23:30:27 +1000 Subject: [PATCH 217/662] Added type hints to Image.__init__() --- Tests/test_box_blur.py | 1 + Tests/test_color_lut.py | 16 ++++++ Tests/test_file_webp.py | 1 + Tests/test_image.py | 7 +++ Tests/test_image_array.py | 2 + Tests/test_image_convert.py | 1 + Tests/test_image_filter.py | 4 +- Tests/test_image_getim.py | 1 + Tests/test_image_putpalette.py | 1 + Tests/test_image_quantize.py | 4 ++ Tests/test_image_resample.py | 1 + Tests/test_image_resize.py | 5 ++ Tests/test_imagemorph.py | 2 + Tests/test_imageops_usm.py | 2 + Tests/test_lib_image.py | 3 ++ src/PIL/BlpImagePlugin.py | 1 + src/PIL/BmpImagePlugin.py | 3 ++ src/PIL/EpsImagePlugin.py | 8 +-- src/PIL/FpxImagePlugin.py | 2 + src/PIL/GifImagePlugin.py | 48 ++++++++++++------ src/PIL/IcnsImagePlugin.py | 1 + src/PIL/ImImagePlugin.py | 1 + src/PIL/Image.py | 90 +++++++++++++++++++++++++++------- src/PIL/ImageChops.py | 17 +++++++ src/PIL/ImageCms.py | 3 ++ src/PIL/ImageDraw.py | 5 +- src/PIL/ImageFile.py | 2 + src/PIL/ImageFont.py | 1 + src/PIL/ImageMath.py | 5 ++ src/PIL/ImageMorph.py | 4 ++ src/PIL/ImageTk.py | 9 ++-- src/PIL/IptcImagePlugin.py | 11 ++++- src/PIL/JpegImagePlugin.py | 1 + src/PIL/PalmImagePlugin.py | 1 + src/PIL/PcdImagePlugin.py | 1 + src/PIL/PngImagePlugin.py | 15 ++++-- src/PIL/QoiImagePlugin.py | 2 +- src/PIL/TiffImagePlugin.py | 1 + 38 files changed, 232 insertions(+), 51 deletions(-) diff --git a/Tests/test_box_blur.py b/Tests/test_box_blur.py index 1f6ed6127..dd5fe0290 100644 --- a/Tests/test_box_blur.py +++ b/Tests/test_box_blur.py @@ -24,6 +24,7 @@ def test_imageops_box_blur() -> None: def box_blur(image: Image.Image, radius: float = 1, n: int = 1) -> Image.Image: + assert image.im is not None return image._new(image.im.box_blur((radius, radius), n)) diff --git a/Tests/test_color_lut.py b/Tests/test_color_lut.py index 0d9c0b419..574ccd124 100644 --- a/Tests/test_color_lut.py +++ b/Tests/test_color_lut.py @@ -47,6 +47,7 @@ class TestColorLut3DCoreAPI: def test_wrong_args(self) -> None: im = Image.new("RGB", (10, 10), 0) + assert im.im is not None with pytest.raises(ValueError, match="filter"): im.im.color_lut_3d( @@ -107,6 +108,7 @@ class TestColorLut3DCoreAPI: def test_correct_args(self) -> None: im = Image.new("RGB", (10, 10), 0) + assert im.im is not None im.im.color_lut_3d( "RGB", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) @@ -143,51 +145,60 @@ class TestColorLut3DCoreAPI: def test_wrong_mode(self) -> None: with pytest.raises(ValueError, match="wrong mode"): im = Image.new("L", (10, 10), 0) + assert im.im is not None im.im.color_lut_3d( "RGB", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) ) with pytest.raises(ValueError, match="wrong mode"): im = Image.new("RGB", (10, 10), 0) + assert im.im is not None im.im.color_lut_3d( "L", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) ) with pytest.raises(ValueError, match="wrong mode"): im = Image.new("L", (10, 10), 0) + assert im.im is not None im.im.color_lut_3d( "L", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) ) with pytest.raises(ValueError, match="wrong mode"): im = Image.new("RGB", (10, 10), 0) + assert im.im is not None im.im.color_lut_3d( "RGBA", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) ) with pytest.raises(ValueError, match="wrong mode"): im = Image.new("RGB", (10, 10), 0) + assert im.im is not None im.im.color_lut_3d( "RGB", Image.Resampling.BILINEAR, *self.generate_identity_table(4, 3) ) def test_correct_mode(self) -> None: im = Image.new("RGBA", (10, 10), 0) + assert im.im is not None im.im.color_lut_3d( "RGBA", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) ) im = Image.new("RGBA", (10, 10), 0) + assert im.im is not None im.im.color_lut_3d( "RGBA", Image.Resampling.BILINEAR, *self.generate_identity_table(4, 3) ) im = Image.new("RGB", (10, 10), 0) + assert im.im is not None im.im.color_lut_3d( "HSV", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) ) im = Image.new("RGB", (10, 10), 0) + assert im.im is not None im.im.color_lut_3d( "RGBA", Image.Resampling.BILINEAR, *self.generate_identity_table(4, 3) ) @@ -202,6 +213,7 @@ class TestColorLut3DCoreAPI: g.transpose(Image.Transpose.ROTATE_180), ], ) + assert im.im is not None # Fast test with small cubes for size in [2, 3, 5, 7, 11, 16, 17]: @@ -238,6 +250,7 @@ class TestColorLut3DCoreAPI: g.transpose(Image.Transpose.ROTATE_180), ], ) + assert im.im is not None # Red channel copied to alpha assert_image_equal( @@ -262,6 +275,7 @@ class TestColorLut3DCoreAPI: g.transpose(Image.Transpose.ROTATE_270), ], ) + assert im.im is not None assert_image_equal( im, @@ -284,6 +298,7 @@ class TestColorLut3DCoreAPI: g.transpose(Image.Transpose.ROTATE_180), ], ) + assert im.im is not None # Reverse channels by splitting and using table # fmt: off @@ -309,6 +324,7 @@ class TestColorLut3DCoreAPI: g.transpose(Image.Transpose.ROTATE_180), ], ) + assert im.im is not None # fmt: off transformed = im._new(im.im.color_lut_3d('RGB', Image.Resampling.BILINEAR, diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index cbc905de4..3fb416ffe 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -250,6 +250,7 @@ class TestFileWebp: temp_file = str(tmp_path / "temp.webp") im = Image.new("RGBA", (1, 1)).convert("P") assert im.mode == "P" + assert im.palette is not None assert im.palette.mode == "RGBA" im.save(temp_file) diff --git a/Tests/test_image.py b/Tests/test_image.py index d8372789b..d4ab8ad38 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -695,11 +695,13 @@ class TestImage: image: Image.Image, palette_result: ImagePalette.ImagePalette | None = None, ) -> None: + assert image.im is not None new_image = base_image._new(image.im) assert new_image.mode == image.mode assert new_image.size == image.size assert new_image.info == base_image.info if palette_result is not None: + assert new_image.palette is not None assert new_image.palette.tobytes() == palette_result.tobytes() else: assert new_image.palette is None @@ -990,12 +992,14 @@ class TestImage: # P mode with RGBA palette im = Image.new("RGBA", (1, 1)).convert("P") assert im.mode == "P" + assert im.palette is not None assert im.palette.mode == "RGBA" assert im.has_transparency_data def test_apply_transparency(self) -> None: im = Image.new("P", (1, 1)) im.putpalette((0, 0, 0, 1, 1, 1)) + assert im.palette is not None assert im.palette.colors == {(0, 0, 0): 0, (1, 1, 1): 1} # Test that no transformation is applied without transparency @@ -1013,13 +1017,16 @@ class TestImage: im.putpalette((0, 0, 0, 255, 1, 1, 1, 128), "RGBA") im.info["transparency"] = 0 im.apply_transparency() + assert im.palette is not None assert im.palette.colors == {(0, 0, 0, 0): 0, (1, 1, 1, 128): 1} # Test that transparency bytes are applied with Image.open("Tests/images/pil123p.png") as im: assert isinstance(im.info["transparency"], bytes) + assert im.palette is not None assert im.palette.colors[(27, 35, 6)] == 24 im.apply_transparency() + assert im.palette is not None assert im.palette.colors[(27, 35, 6, 214)] == 24 def test_constants(self) -> None: diff --git a/Tests/test_image_array.py b/Tests/test_image_array.py index bb6064882..4d8ffbf4a 100644 --- a/Tests/test_image_array.py +++ b/Tests/test_image_array.py @@ -113,4 +113,6 @@ def test_fromarray_palette() -> None: out = Image.fromarray(a, "P") # Assert that the Python and C palettes match + assert out.palette is not None + assert out.im is not None assert len(out.palette.colors) == len(out.im.getpalette()) / 3 diff --git a/Tests/test_image_convert.py b/Tests/test_image_convert.py index ebb7f2822..6a925975e 100644 --- a/Tests/test_image_convert.py +++ b/Tests/test_image_convert.py @@ -218,6 +218,7 @@ def test_trns_RGB(tmp_path: Path) -> None: def test_l_macro_rounding(convert_mode: str) -> None: for mode in ("P", "PA"): im = Image.new(mode, (1, 1)) + assert im.palette is not None im.palette.getcolor((0, 1, 2)) converted_im = im.convert(convert_mode) diff --git a/Tests/test_image_filter.py b/Tests/test_image_filter.py index 412ab44c3..ea5438f3d 100644 --- a/Tests/test_image_filter.py +++ b/Tests/test_image_filter.py @@ -137,7 +137,9 @@ def test_builtinfilter_p() -> None: builtin_filter = ImageFilter.BuiltinFilter() with pytest.raises(ValueError): - builtin_filter.filter(hopper("P").im) + im = hopper("P").im + assert im is not None + builtin_filter.filter(im) def test_kernel_not_enough_coefficients() -> None: diff --git a/Tests/test_image_getim.py b/Tests/test_image_getim.py index 9afa02b0a..e62d6e0ec 100644 --- a/Tests/test_image_getim.py +++ b/Tests/test_image_getim.py @@ -8,4 +8,5 @@ def test_sanity() -> None: type_repr = repr(type(im.getim())) assert "PyCapsule" in type_repr + assert im.im is not None assert isinstance(im.im.id, int) diff --git a/Tests/test_image_putpalette.py b/Tests/test_image_putpalette.py index 75d9d2fc1..f2c447f71 100644 --- a/Tests/test_image_putpalette.py +++ b/Tests/test_image_putpalette.py @@ -86,6 +86,7 @@ def test_rgba_palette(mode: str, palette: tuple[int, ...]) -> None: im = Image.new("P", (1, 1)) im.putpalette(palette, mode) assert im.getpalette() == [1, 2, 3] + assert im.palette is not None assert im.palette.colors == {(1, 2, 3, 4): 0} diff --git a/Tests/test_image_quantize.py b/Tests/test_image_quantize.py index 903cd8550..7c564d967 100644 --- a/Tests/test_image_quantize.py +++ b/Tests/test_image_quantize.py @@ -69,6 +69,7 @@ def test_quantize_no_dither() -> None: converted = image.quantize(dither=Image.Dither.NONE, palette=palette) assert converted.mode == "P" + assert converted.palette is not None assert converted.palette.palette == palette.palette.palette @@ -81,6 +82,7 @@ def test_quantize_no_dither2() -> None: palette.putpalette(data) quantized = im.quantize(dither=Image.Dither.NONE, palette=palette) + assert quantized.palette is not None assert tuple(quantized.palette.palette) == data px = quantized.load() @@ -117,6 +119,7 @@ def test_colors() -> None: im = hopper() colors = 2 converted = im.quantize(colors) + assert converted.palette is not None assert len(converted.palette.palette) == colors * len("RGB") @@ -147,6 +150,7 @@ def test_palette(method: Image.Quantize, color: tuple[int, ...]) -> None: converted = im.quantize(method=method) converted_px = converted.load() assert converted_px is not None + assert converted.palette is not None assert converted_px[0, 0] == converted.palette.colors[color] diff --git a/Tests/test_image_resample.py b/Tests/test_image_resample.py index ce6209c0d..4a5901d47 100644 --- a/Tests/test_image_resample.py +++ b/Tests/test_image_resample.py @@ -27,6 +27,7 @@ class TestImagingResampleVulnerability: ): with pytest.raises(MemoryError): # any resampling filter will do here + assert im.im is not None im.im.resize((xsize, ysize), Image.Resampling.BILINEAR) def test_invalid_size(self) -> None: diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py index c9e304512..5700b3e06 100644 --- a/Tests/test_image_resize.py +++ b/Tests/test_image_resize.py @@ -27,6 +27,7 @@ class TestImagingCoreResize: ) -> Image.Image: # Image class independent version of resize. im.load() + assert im.im is not None return im._new(im.im.resize(size, f)) @pytest.mark.parametrize( @@ -37,6 +38,8 @@ class TestImagingCoreResize: r = self.resize(im, (15, 12), Image.Resampling.NEAREST) assert r.mode == mode assert r.size == (15, 12) + assert r.im is not None + assert im.im is not None assert r.im.bands == im.im.bands def test_convolution_modes(self) -> None: @@ -51,6 +54,8 @@ class TestImagingCoreResize: r = self.resize(im, (15, 12), Image.Resampling.BILINEAR) assert r.mode == mode assert r.size == (15, 12) + assert r.im is not None + assert im.im is not None assert r.im.bands == im.im.bands @pytest.mark.parametrize( diff --git a/Tests/test_imagemorph.py b/Tests/test_imagemorph.py index 4363f456e..b40de7f98 100644 --- a/Tests/test_imagemorph.py +++ b/Tests/test_imagemorph.py @@ -325,6 +325,8 @@ def test_wrong_mode() -> None: lut = ImageMorph.LutBuilder(op_name="corner").build_lut() imrgb = Image.new("RGB", (10, 10)) iml = Image.new("L", (10, 10)) + assert imrgb.im is not None + assert iml.im is not None with pytest.raises(RuntimeError): _imagingmorph.apply(bytes(lut), imrgb.im.id, iml.im.id) diff --git a/Tests/test_imageops_usm.py b/Tests/test_imageops_usm.py index 920012d86..64116bf70 100644 --- a/Tests/test_imageops_usm.py +++ b/Tests/test_imageops_usm.py @@ -98,10 +98,12 @@ def test_blur_accuracy(test_images: dict[str, ImageFile.ImageFile]) -> None: (4, 3, 2), (4, 2, 2), ]: + assert i.im is not None assert i.im.getpixel((x, y))[c] >= 250 # Fuzzy match. def gp(x: int, y: int) -> tuple[int, ...]: + assert i.im is not None return i.im.getpixel((x, y)) assert 236 <= gp(7, 4)[0] <= 239 diff --git a/Tests/test_lib_image.py b/Tests/test_lib_image.py index 31548bbc9..0a36af8b6 100644 --- a/Tests/test_lib_image.py +++ b/Tests/test_lib_image.py @@ -7,18 +7,21 @@ from PIL import Image def test_setmode() -> None: im = Image.new("L", (1, 1), 255) + assert im.im is not None im.im.setmode("1") assert im.im.getpixel((0, 0)) == 255 im.im.setmode("L") assert im.im.getpixel((0, 0)) == 255 im = Image.new("1", (1, 1), 1) + assert im.im is not None im.im.setmode("L") assert im.im.getpixel((0, 0)) == 255 im.im.setmode("1") assert im.im.getpixel((0, 0)) == 255 im = Image.new("RGB", (1, 1), (1, 2, 3)) + assert im.im is not None im.im.setmode("RGB") assert im.im.getpixel((0, 0)) == (1, 2, 3) im.im.setmode("RGBA") diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py index 6d71049a9..dc7192b99 100644 --- a/src/PIL/BlpImagePlugin.py +++ b/src/PIL/BlpImagePlugin.py @@ -467,6 +467,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: magic = b"BLP1" if im.encoderinfo.get("blp_version") == "BLP1" else b"BLP2" fp.write(magic) + assert im.palette is not None fp.write(struct.pack("= 16 + assert isinstance(file_info["width"], int) + assert isinstance(file_info["height"], int) self._size = file_info["width"], file_info["height"] # ------- If color count was not found in the header, compute from bits @@ -443,6 +445,7 @@ def _save( elif im.mode == "L": palette = b"".join(o8(i) * 4 for i in range(256)) elif im.mode == "P": + assert im.im is not None palette = im.im.getpalette("RGB", "BGRX") colors = len(palette) // 4 else: diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index 35915e652..c5ca8dadc 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -71,7 +71,7 @@ def Ghostscript( fp: IO[bytes], scale: int = 1, transparency: bool = False, -) -> Image.Image: +) -> Image.core.ImagingCore: """Render an image using Ghostscript""" global gs_binary if not has_ghostscript(): @@ -161,6 +161,7 @@ def Ghostscript( except OSError: pass + assert out_im.im is not None im = out_im.im.copy() out_im.close() return im @@ -190,7 +191,6 @@ class EpsImageFile(ImageFile.ImageFile): self.fp.seek(offset) self._mode = "RGB" - self._size = None byte_arr = bytearray(255) bytes_mv = memoryview(byte_arr) @@ -228,7 +228,7 @@ class EpsImageFile(ImageFile.ImageFile): if k == "BoundingBox": if v == "(atend)": reading_trailer_comments = True - elif not self._size or (trailer_reached and reading_trailer_comments): + elif not self.tile or (trailer_reached and reading_trailer_comments): try: # Note: The DSC spec says that BoundingBox # fields should be integers, but some drivers @@ -346,7 +346,7 @@ class EpsImageFile(ImageFile.ImageFile): trailer_reached = True bytes_read = 0 - if not self._size: + if not self.tile: msg = "cannot determine EPS bounding box" raise OSError(msg) diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py index 386e37233..64d48635e 100644 --- a/src/PIL/FpxImagePlugin.py +++ b/src/PIL/FpxImagePlugin.py @@ -81,6 +81,8 @@ class FpxImageFile(ImageFile.ImageFile): # size (highest resolution) + assert isinstance(prop[0x1000002], int) + assert isinstance(prop[0x1000003], int) self._size = prop[0x1000002], prop[0x1000003] size = max(self.size) diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index bf74f9356..55f927d40 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -307,6 +307,7 @@ class GifImageFile(ImageFile.ImageFile): self.tile = [] if self.dispose: + assert self.im is not None self.im.paste(self.dispose, self.dispose_extent) self._frame_palette = palette if palette is not None else self.global_palette @@ -320,17 +321,21 @@ class GifImageFile(ImageFile.ImageFile): else: self._mode = "L" - if not palette and self.global_palette: + if palette: + self.palette = palette + elif self.global_palette: from copy import copy - palette = copy(self.global_palette) - self.palette = palette + self.palette = copy(self.global_palette) + else: + self.palette = None else: if self.mode == "P": if ( LOADING_STRATEGY != LoadingStrategy.RGB_AFTER_DIFFERENT_PALETTE_ONLY or palette ): + assert self.im is not None if "transparency" in self.info: self.im.putpalettealpha(self.info["transparency"], 0) self.im = self.im.convert("RGBA", Image.Dither.FLOYDSTEINBERG) @@ -432,6 +437,7 @@ class GifImageFile(ImageFile.ImageFile): self._prev_im = self.im if self._frame_palette: self.im = Image.core.fill("P", self.size, self._frame_transparency or 0) + assert self.im is not None self.im.putpalette("RGB", *self._frame_palette.getdata()) else: self.im = None @@ -441,6 +447,7 @@ class GifImageFile(ImageFile.ImageFile): super().load_prepare() def load_end(self) -> None: + assert self.im is not None if self.__frame == 0: if self.mode == "P" and LOADING_STRATEGY == LoadingStrategy.RGB_ALWAYS: if self._frame_transparency is not None: @@ -495,6 +502,7 @@ def _normalize_mode(im: Image.Image) -> Image.Image: return im if Image.getmodebase(im.mode) == "RGB": im = im.convert("P", palette=Image.Palette.ADAPTIVE) + assert im.palette is not None if im.palette.mode == "RGBA": for rgba in im.palette.colors: if rgba[3] == 0: @@ -531,16 +539,17 @@ def _normalize_palette( if im.mode == "P": if not source_palette: + assert im.im is not None source_palette = im.im.getpalette("RGB")[:768] else: # L-mode if not source_palette: source_palette = bytearray(i // 3 for i in range(768)) im.palette = ImagePalette.ImagePalette("RGB", palette=source_palette) + assert source_palette is not None - used_palette_colors: list[int] | None if palette: - used_palette_colors = [] - assert source_palette is not None + used_palette_colors: list[int | None] = [] + assert im.palette is not None for i in range(0, len(source_palette), 3): source_color = tuple(source_palette[i : i + 3]) index = im.palette.colors.get(source_color) @@ -553,20 +562,25 @@ def _normalize_palette( if j not in used_palette_colors: used_palette_colors[i] = j break - im = im.remap_palette(used_palette_colors) + dest_map: list[int] = [] + for index in used_palette_colors: + assert index is not None + dest_map.append(index) + im = im.remap_palette(dest_map) else: - used_palette_colors = _get_optimize(im, info) - if used_palette_colors is not None: - im = im.remap_palette(used_palette_colors, source_palette) + optimized_palette_colors = _get_optimize(im, info) + if optimized_palette_colors is not None: + im = im.remap_palette(optimized_palette_colors, source_palette) if "transparency" in info: try: - info["transparency"] = used_palette_colors.index( + info["transparency"] = optimized_palette_colors.index( info["transparency"] ) except ValueError: del info["transparency"] return im + assert im.palette is not None im.palette.palette = source_palette return im @@ -578,7 +592,8 @@ def _write_single_frame( ) -> None: im_out = _normalize_mode(im) for k, v in im_out.info.items(): - im.encoderinfo.setdefault(k, v) + if isinstance(k, str): + im.encoderinfo.setdefault(k, v) im_out = _normalize_palette(im_out, palette, im.encoderinfo) for s in _get_global_header(im_out, im.encoderinfo): @@ -630,7 +645,8 @@ def _write_multiple_frames( for k, v in im_frame.info.items(): if k == "transparency": continue - im.encoderinfo.setdefault(k, v) + if isinstance(k, str): + im.encoderinfo.setdefault(k, v) encoderinfo = im.encoderinfo.copy() if "transparency" in im_frame.info: @@ -660,10 +676,12 @@ def _write_multiple_frames( ) background = _get_background(im_frame, color) background_im = Image.new("P", im_frame.size, background) + assert im_frames[0].im.palette is not None background_im.putpalette(im_frames[0].im.palette) bbox = _getbbox(background_im, im_frame)[1] elif encoderinfo.get("optimize") and im_frame.mode != "1": if "transparency" not in encoderinfo: + assert im_frame.palette is not None try: encoderinfo["transparency"] = ( im_frame.palette._new_color_index(im_frame) @@ -901,6 +919,7 @@ def _get_optimize(im: Image.Image, info: dict[str, Any]) -> list[int] | None: if optimise or max(used_palette_colors) >= len(used_palette_colors): return used_palette_colors + assert im.palette is not None num_palette_colors = len(im.palette.palette) // Image.getmodebands( im.palette.mode ) @@ -950,7 +969,7 @@ def _get_palette_bytes(im: Image.Image) -> bytes: :param im: Image object :returns: Bytes, len<=768 suitable for inclusion in gif header """ - return im.palette.palette if im.palette else b"" + return bytes(im.palette.palette) if im.palette else b"" def _get_background( @@ -963,6 +982,7 @@ def _get_background( # WebPImagePlugin stores an RGBA value in info["background"] # So it must be converted to the same format as GifImagePlugin's # info["background"] - a global color table index + assert im.palette is not None try: background = im.palette.getcolor(info_background, im) except ValueError as e: diff --git a/src/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py index 8729f7643..58d4a90a0 100644 --- a/src/PIL/IcnsImagePlugin.py +++ b/src/PIL/IcnsImagePlugin.py @@ -92,6 +92,7 @@ def read_32( msg = f"Error reading channel [{repr(bytesleft)} left]" raise SyntaxError(msg) band = Image.frombuffer("L", pixel_size, b"".join(data), "raw", "L", 0, 1) + assert im.im is not None im.im.putband(band.im, band_ix) return {"RGB": im} diff --git a/src/PIL/ImImagePlugin.py b/src/PIL/ImImagePlugin.py index 2fb7ecd52..9d60011be 100644 --- a/src/PIL/ImImagePlugin.py +++ b/src/PIL/ImImagePlugin.py @@ -353,6 +353,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: fp.write(b"Lut: 1\r\n") fp.write(b"\000" * (511 - fp.tell()) + b"\032") if im.mode in ["P", "PA"]: + assert im.im is not None im_palette = im.im.getpalette("RGB", "RGB;L") colors = len(im_palette) // 3 palette = b"" diff --git a/src/PIL/Image.py b/src/PIL/Image.py index ebf4f46c4..7532a49a2 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -532,16 +532,16 @@ class Image: format_description: str | None = None _close_exclusive_fp_after_loading = True - def __init__(self): + def __init__(self) -> None: # FIXME: take "new" parameters / other image? # FIXME: turn mode and size into delegating properties? - self.im = None + self.im: core.ImagingCore | None = None self._mode = "" self._size = (0, 0) - self.palette = None - self.info = {} + self.palette: ImagePalette.ImagePalette | None = None + self.info: dict[str | tuple[int, int], Any] = {} self.readonly = 0 - self._exif = None + self._exif: Exif | None = None @property def width(self) -> int: @@ -617,11 +617,12 @@ class Image: # Instead of simply setting to None, we're setting up a # deferred error that will better explain that the core image # object is gone. - self.im = DeferredError(ValueError("Operation on closed image")) + self.im = DeferredError(ValueError("Operation on closed image")) # type: ignore[assignment] def _copy(self) -> None: self.load() - self.im = self.im.copy() + if self.im: + self.im = self.im.copy() self.readonly = 0 def _ensure_mutable(self) -> None: @@ -648,6 +649,7 @@ class Image: self.load() if not format or format == "PPM": + assert self.im is not None self.im.save_ppm(filename) else: self.save(filename, format, **options) @@ -796,6 +798,7 @@ class Image: # unpack data e = _getencoder(self.mode, encoder_name, encoder_args) + assert self.im is not None e.setimage(self.im) bufsize = max(65536, self.size[0] * 4) # see RawEncode.c @@ -862,6 +865,7 @@ class Image: # unpack data d = _getdecoder(self.mode, decoder_name, decoder_args) + assert self.im is not None d.setimage(self.im) s = d.decode(data) @@ -975,6 +979,7 @@ class Image: deprecate(mode, 12) self.load() + assert self.im is not None has_transparency = "transparency" in self.info if not mode and self.mode == "P": @@ -1045,9 +1050,11 @@ class Image: # use existing conversions trns_im = new(self.mode, (1, 1)) if self.mode == "P": + assert self.palette is not None trns_im.putpalette(self.palette) if isinstance(t, tuple): err = "Couldn't allocate a palette color for transparency" + assert trns_im.palette is not None try: t = trns_im.palette.getcolor(t, self) except ValueError as e: @@ -1087,6 +1094,7 @@ class Image: new_im = self._new(im) from . import ImagePalette + assert new_im.im is not None new_im.palette = ImagePalette.ImagePalette( "RGB", new_im.im.getpalette("RGB") ) @@ -1149,7 +1157,9 @@ class Image: if trns is not None: if new_im.mode == "P" and new_im.palette: try: - new_im.info["transparency"] = new_im.palette.getcolor(trns, new_im) + new_im.info["transparency"] = new_im.palette.getcolor( + cast(tuple[int, ...], trns), new_im # trns was converted to RGB + ) except ValueError as e: del new_im.info["transparency"] if str(e) != "cannot allocate more than 256 colors": @@ -1216,6 +1226,7 @@ class Image: ) raise ValueError(msg) + assert self.im is not None if palette: # use palette from reference image palette.load() @@ -1227,6 +1238,7 @@ class Image: raise ValueError(msg) im = self.im.convert("P", dither, palette.im) new_im = self._new(im) + assert palette.palette is not None new_im.palette = palette.palette.copy() return new_im @@ -1253,6 +1265,7 @@ class Image: :returns: An :py:class:`~PIL.Image.Image` object. """ self.load() + assert self.im is not None return self._new(self.im.copy()) __copy__ = copy @@ -1281,6 +1294,7 @@ class Image: raise ValueError(msg) self.load() + assert self.im is not None return self._new(self._crop(self.im, box)) def _crop( @@ -1334,6 +1348,7 @@ class Image: if ymargin is None: ymargin = xmargin self.load() + assert self.im is not None return self._new(self.im.expand(xmargin, ymargin)) if TYPE_CHECKING: @@ -1358,6 +1373,7 @@ class Image: raise TypeError(msg) multiband = isinstance(filter, ImageFilter.MultibandFilter) + assert self.im is not None if self.im.bands == 1 or multiband: return self._new(filter.filter(self.im)) @@ -1393,6 +1409,7 @@ class Image: """ self.load() + assert self.im is not None return self.im.getbbox(alpha_only) def getcolors( @@ -1412,6 +1429,7 @@ class Image: """ self.load() + assert self.im is not None if self.mode in ("1", "L", "P"): h = self.im.histogram() out: list[tuple[int, float]] = [(h[i], i) for i in range(256) if h[i]] @@ -1439,6 +1457,7 @@ class Image: """ self.load() + assert self.im is not None if band is not None: return self.im.getband(band) return self.im # could be abused @@ -1454,6 +1473,7 @@ class Image: """ self.load() + assert self.im is not None if self.im.bands > 1: return tuple(self.im.getband(i).getextrema() for i in range(self.im.bands)) return self.im.getextrema() @@ -1592,6 +1612,7 @@ class Image: """ self.load() + assert self.im is not None return self.im.ptr def getpalette(self, rawmode: str | None = "RGB") -> list[int] | None: @@ -1608,6 +1629,7 @@ class Image: """ self.load() + assert self.im is not None try: mode = self.im.getpalettemode() except ValueError: @@ -1628,11 +1650,15 @@ class Image: :returns: A boolean. """ - return ( + if ( self.mode in ("LA", "La", "PA", "RGBA", "RGBa") - or (self.mode == "P" and self.palette.mode.endswith("A")) or "transparency" in self.info - ) + ): + return True + if self.mode == "P": + assert self.palette is not None + return self.palette.mode.endswith("A") + return False def apply_transparency(self) -> None: """ @@ -1671,6 +1697,7 @@ class Image: """ self.load() + assert self.im is not None return self.im.getpixel(tuple(xy)) def getprojection(self) -> tuple[list[int], list[int]]: @@ -1682,6 +1709,7 @@ class Image: """ self.load() + assert self.im is not None x, y = self.im.getprojection() return list(x), list(y) @@ -1709,6 +1737,7 @@ class Image: :returns: A list containing pixel counts. """ self.load() + assert self.im is not None if mask: mask.load() return self.im.histogram((0, 0), mask.im) @@ -1737,6 +1766,7 @@ class Image: :returns: A float value representing the image entropy """ self.load() + assert self.im is not None if mask: mask.load() return self.im.entropy((0, 0), mask.im) @@ -1815,26 +1845,32 @@ class Image: raise ValueError(msg) box += (box[0] + size[0], box[1] + size[1]) + source: core.ImagingCore | str | float | tuple[float, ...] if isinstance(im, str): from . import ImageColor - im = ImageColor.getcolor(im, self.mode) - + source = ImageColor.getcolor(im, self.mode) elif isImageType(im): im.load() if self.mode != im.mode: if self.mode != "RGB" or im.mode not in ("LA", "RGBA", "RGBa"): # should use an adapter for this! im = im.convert(self.mode) - im = im.im + assert im.im is not None + source = im.im + elif isinstance(im, tuple): + source = im + else: + source = cast(float, im) self._ensure_mutable() + assert self.im is not None if mask: mask.load() - self.im.paste(im, box, mask.im) + self.im.paste(source, box, mask.im) else: - self.im.paste(im, box) + self.im.paste(source, box) def alpha_composite( self, im: Image, dest: Sequence[int] = (0, 0), source: Sequence[int] = (0, 0) @@ -1924,6 +1960,7 @@ class Image: if isinstance(lut, ImagePointHandler): return lut.point(self) + assert self.im is not None if callable(lut): # if it isn't a list, it should be a function if self.mode in ("I", "I;16", "F"): @@ -1960,17 +1997,20 @@ class Image: if self.mode not in ("LA", "PA", "RGBA"): # attempt to promote self to a matching alpha mode + assert self.im is not None try: mode = getmodebase(self.mode) + "A" try: self.im.setmode(mode) except (AttributeError, ValueError) as e: # do things the hard way + assert self.im is not None im = self.im.convert(mode) if im.mode not in ("LA", "PA", "RGBA"): msg = "alpha channel could not be added" raise ValueError(msg) from e # sanity check self.im = im + assert self.im is not None self._mode = self.im.mode except KeyError as e: msg = "illegal image mode" @@ -1981,6 +2021,7 @@ class Image: else: band = 3 + assert self.im is not None if isImageType(alpha): # alpha layer if alpha.mode not in ("1", "L"): @@ -2023,6 +2064,7 @@ class Image: self._ensure_mutable() + assert self.im is not None self.im.putdata(data, scale, offset) def putpalette( @@ -2105,8 +2147,10 @@ class Image: if self.mode == "PA": alpha = value[3] if len(value) == 4 else 255 value = value[:3] - palette_index = self.palette.getcolor(value, self) + assert self.palette is not None + palette_index = self.palette.getcolor(tuple(value), self) value = (palette_index, alpha) if self.mode == "PA" else palette_index + assert self.im is not None return self.im.putpixel(xy, value) def remap_palette( @@ -2133,6 +2177,7 @@ class Image: if source_palette is None: if self.mode == "P": self.load() + assert self.im is not None palette_mode = self.im.getpalettemode() if palette_mode == "RGBA": bands = 4 @@ -2180,6 +2225,7 @@ class Image: # m_im.putpalette(mapping_palette, 'L') # converts to 'P' # or just force it. # UNDONE -- this is part of the general issue with palettes + assert m_im.im is not None m_im.im.putpalette(palette_mode, palette_mode + ";L", m_im.palette.tobytes()) m_im = m_im.convert("L") @@ -2325,6 +2371,7 @@ class Image: (box[3] - reduce_box[1]) / factor_y, ) + assert self.im is not None return self._new(self.im.resize(size, resample, box)) def reduce( @@ -2359,7 +2406,7 @@ class Image: return im.convert(self.mode) self.load() - + assert self.im is not None return self._new(self.im.reduce(factor, box)) def rotate( @@ -2637,6 +2684,7 @@ class Image: """ self.load() + assert self.im is not None if self.im.bands == 1: return (self.copy(),) return tuple(map(self._new, self.im.split())) @@ -2661,6 +2709,7 @@ class Image: msg = f'The image has no channel "{channel}"' raise ValueError(msg) from e + assert self.im is not None return self._new(self.im.getband(channel)) def tell(self) -> int: @@ -2765,6 +2814,7 @@ class Image: self.im = im.im self._size = final_size + assert self.im is not None self._mode = self.im.mode self.readonly = 0 @@ -2949,6 +2999,7 @@ class Image: if image.mode in ("1", "P"): resample = Resampling.NEAREST + assert self.im is not None self.im.transform(box, image.im, method, data, resample, fill) def transpose(self, method: Transpose) -> Image: @@ -2963,6 +3014,7 @@ class Image: """ self.load() + assert self.im is not None return self._new(self.im.transpose(method)) def effect_spread(self, distance: int) -> Image: @@ -2972,6 +3024,7 @@ class Image: :param distance: Distance to spread pixels. """ self.load() + assert self.im is not None return self._new(self.im.effect_spread(distance)) def toqimage(self): @@ -3205,6 +3258,7 @@ def frombuffer( if mode == "P": from . import ImagePalette + assert im.im is not None im.palette = ImagePalette.ImagePalette("RGB", im.im.getpalette("RGB")) im.readonly = 1 return im diff --git a/src/PIL/ImageChops.py b/src/PIL/ImageChops.py index 29a5c995f..b1b616d5c 100644 --- a/src/PIL/ImageChops.py +++ b/src/PIL/ImageChops.py @@ -48,6 +48,7 @@ def invert(image: Image.Image) -> Image.Image: """ image.load() + assert image.im is not None return image._new(image.im.chop_invert()) @@ -63,6 +64,7 @@ def lighter(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_lighter(image2.im)) @@ -78,6 +80,7 @@ def darker(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_darker(image2.im)) @@ -93,6 +96,7 @@ def difference(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_difference(image2.im)) @@ -110,6 +114,7 @@ def multiply(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_multiply(image2.im)) @@ -124,6 +129,7 @@ def screen(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_screen(image2.im)) @@ -136,6 +142,7 @@ def soft_light(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_soft_light(image2.im)) @@ -148,6 +155,7 @@ def hard_light(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_hard_light(image2.im)) @@ -160,6 +168,7 @@ def overlay(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_overlay(image2.im)) @@ -177,6 +186,7 @@ def add( image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_add(image2.im, scale, offset)) @@ -194,6 +204,7 @@ def subtract( image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_subtract(image2.im, scale, offset)) @@ -207,6 +218,7 @@ def add_modulo(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_add_modulo(image2.im)) @@ -220,6 +232,7 @@ def subtract_modulo(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_subtract_modulo(image2.im)) @@ -238,6 +251,7 @@ def logical_and(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_and(image2.im)) @@ -253,6 +267,7 @@ def logical_or(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_or(image2.im)) @@ -268,6 +283,7 @@ def logical_xor(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() + assert image1.im is not None return image1._new(image1.im.chop_xor(image2.im)) @@ -308,4 +324,5 @@ def offset(image: Image.Image, xoffset: int, yoffset: int | None = None) -> Imag if yoffset is None: yoffset = xoffset image.load() + assert image.im is not None return image._new(image.im.offset(xoffset, yoffset)) diff --git a/src/PIL/ImageCms.py b/src/PIL/ImageCms.py index ec10230f1..3a6d52949 100644 --- a/src/PIL/ImageCms.py +++ b/src/PIL/ImageCms.py @@ -352,6 +352,8 @@ class ImageCmsTransform(Image.ImagePointHandler): im.load() if imOut is None: imOut = Image.new(self.output_mode, im.size, None) + assert im.im is not None + assert imOut.im is not None self.transform.apply(im.im.id, imOut.im.id) imOut.info["icc_profile"] = self.output_profile.tobytes() return imOut @@ -361,6 +363,7 @@ class ImageCmsTransform(Image.ImagePointHandler): if im.mode != self.output_mode: msg = "mode mismatch" raise ValueError(msg) # wrong output mode + assert im.im is not None self.transform.apply(im.im.id, im.im.id) im.info["icc_profile"] = self.output_profile.tobytes() return im diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py index 6f56d0236..988e3d7c5 100644 --- a/src/PIL/ImageDraw.py +++ b/src/PIL/ImageDraw.py @@ -32,7 +32,6 @@ from __future__ import annotations import math -import numbers import struct from collections.abc import Sequence from types import ModuleType @@ -160,13 +159,13 @@ class ImageDraw: if ink is not None: if isinstance(ink, str): ink = ImageColor.getcolor(ink, self.mode) - if self.palette and not isinstance(ink, numbers.Number): + if self.palette and isinstance(ink, tuple): ink = self.palette.getcolor(ink, self._image) result_ink = self.draw.draw_ink(ink) if fill is not None: if isinstance(fill, str): fill = ImageColor.getcolor(fill, self.mode) - if self.palette and not isinstance(fill, numbers.Number): + if self.palette and isinstance(fill, tuple): fill = self.palette.getcolor(fill, self._image) result_fill = self.draw.draw_ink(fill) return result_ink, result_fill diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 2a8846c1a..babf453cb 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -475,6 +475,7 @@ class Parser: d, e, o, a = im.tile[0] im.tile = [] self.decoder = Image._getdecoder(im.mode, d, a, im.decoderconfig) + assert im.im is not None self.decoder.setimage(im.im, e) # calculate decoder offset @@ -566,6 +567,7 @@ def _encode_tile( fp.seek(offset) encoder = Image._getencoder(im.mode, encoder_name, args, im.encoderconfig) try: + assert im.im is not None encoder.setimage(im.im, extents) if encoder.pushes_fd: encoder.setfd(fp) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 2ab65bfef..2d71b4df4 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -142,6 +142,7 @@ class ImageFont: raise TypeError(msg) image.load() + assert image.im is not None self.font = Image.core.font(image.im, data) diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py index 191cc2a5f..c8f0406ed 100644 --- a/src/PIL/ImageMath.py +++ b/src/PIL/ImageMath.py @@ -65,6 +65,8 @@ class _Operand: except AttributeError as e: msg = f"bad operand type for '{op}'" raise TypeError(msg) from e + assert out.im is not None + assert im_1.im is not None _imagingmath.unop(op, out.im.id, im_1.im.id) else: # binary operation @@ -93,6 +95,9 @@ class _Operand: except AttributeError as e: msg = f"bad operand type for '{op}'" raise TypeError(msg) from e + assert out.im is not None + assert im_1.im is not None + assert im_2.im is not None _imagingmath.binop(op, out.im.id, im_1.im.id, im_2.im.id) return _Operand(out) diff --git a/src/PIL/ImageMorph.py b/src/PIL/ImageMorph.py index 6a43983d3..cd4fa3cfe 100644 --- a/src/PIL/ImageMorph.py +++ b/src/PIL/ImageMorph.py @@ -213,6 +213,8 @@ class MorphOp: msg = "Image mode must be L" raise ValueError(msg) outimage = Image.new(image.mode, image.size, None) + assert image.im is not None + assert outimage.im is not None count = _imagingmorph.apply(bytes(self.lut), image.im.id, outimage.im.id) return count, outimage @@ -229,6 +231,7 @@ class MorphOp: if image.mode != "L": msg = "Image mode must be L" raise ValueError(msg) + assert image.im is not None return _imagingmorph.match(bytes(self.lut), image.im.id) def get_on_pixels(self, image: Image.Image) -> list[tuple[int, int]]: @@ -240,6 +243,7 @@ class MorphOp: if image.mode != "L": msg = "Image mode must be L" raise ValueError(msg) + assert image.im is not None return _imagingmorph.get_on_pixels(image.im.id) def load_lut(self, filename: str) -> None: diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index 6b13e57a0..6344220ef 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -43,6 +43,7 @@ def _pilbitmap_check() -> int: if _pilbitmap_ok is None: try: im = Image.new("1", (1, 1)) + assert im.im is not None tkinter.BitmapImage(data=f"PIL:{im.im.id}") _pilbitmap_ok = 1 except tkinter.TclError: @@ -127,10 +128,7 @@ class PhotoImage: # palette mapped data image.apply_transparency() image.load() - try: - mode = image.palette.mode - except AttributeError: - mode = "RGB" # default + mode = image.palette.mode if image.palette else "RGB" size = image.size kw["width"], kw["height"] = size @@ -190,6 +188,7 @@ class PhotoImage: # convert to blittable im.load() image = im.im + assert image is not None if image.isblock() and im.mode == self.__mode: block = image else: @@ -231,6 +230,7 @@ class BitmapImage: if _pilbitmap_check(): # fast way (requires the pilbitmap booster patch) image.load() + assert image.im is not None kw["data"] = f"PIL:{image.im.id}" self.__im = image # must keep a reference else: @@ -277,6 +277,7 @@ def getimage(photo: PhotoImage) -> Image.Image: """Copies the contents of a PhotoImage to a PIL image memory.""" im = Image.new("RGBA", (photo.width(), photo.height())) block = im.im + assert block is not None _pyimagingtkcall("PyImagingPhotoGet", photo, block.id) diff --git a/src/PIL/IptcImagePlugin.py b/src/PIL/IptcImagePlugin.py index 17243e705..03712d24c 100644 --- a/src/PIL/IptcImagePlugin.py +++ b/src/PIL/IptcImagePlugin.py @@ -199,9 +199,13 @@ def getiptcinfo( data = None + info: dict[tuple[int, int], bytes | list[bytes]] = {} if isinstance(im, IptcImageFile): # return info dictionary right away - return im.info + for k, v in im.info.items(): + if isinstance(k, tuple): + info[k] = v + return info elif isinstance(im, JpegImagePlugin.JpegImageFile): # extract the IPTC/NAA resource @@ -237,4 +241,7 @@ def getiptcinfo( except (IndexError, KeyError): pass # expected failure - return iptc_im.info + for k, v in iptc_im.info.items(): + if isinstance(k, tuple): + info[k] = v + return info diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index fc897e2b9..04fe8ba85 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -473,6 +473,7 @@ class JpegImageFile(ImageFile.ImageFile): except OSError: pass + assert self.im is not None self._mode = self.im.mode self._size = self.im.size diff --git a/src/PIL/PalmImagePlugin.py b/src/PIL/PalmImagePlugin.py index 1735070f8..9ca93c531 100644 --- a/src/PIL/PalmImagePlugin.py +++ b/src/PIL/PalmImagePlugin.py @@ -173,6 +173,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: flags = 0 if im.mode == "P" and "custom-colormap" in im.info: + assert im.palette is not None flags = flags & _FLAGS["custom-colormap"] colormapsize = 4 * 256 + 2 colormapmode = im.palette.mode diff --git a/src/PIL/PcdImagePlugin.py b/src/PIL/PcdImagePlugin.py index 1cd5c4a9d..64898e235 100644 --- a/src/PIL/PcdImagePlugin.py +++ b/src/PIL/PcdImagePlugin.py @@ -55,6 +55,7 @@ class PcdImageFile(ImageFile.ImageFile): assert self.im is not None self.im = self.im.rotate(self.tile_post_rotate) + assert self.im is not None self._size = self.im.size diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 910fa9755..59b5d0a8b 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -863,6 +863,7 @@ class PngImageFile(ImageFile.ImageFile): assert self.png is not None self.dispose: _imaging.ImagingCore | None + dispose_extent = None if frame == 0: if rewind: self._fp.seek(self.__rewind) @@ -877,7 +878,7 @@ class PngImageFile(ImageFile.ImageFile): self.default_image = self.info.get("default_image", False) self.dispose_op = self.info.get("disposal") self.blend_op = self.info.get("blend") - self.dispose_extent = self.info.get("bbox") + dispose_extent = self.info.get("bbox") self.__frame = 0 else: if frame != self.__frame + 1: @@ -886,6 +887,7 @@ class PngImageFile(ImageFile.ImageFile): # ensure previous frame was loaded self.load() + assert self.im is not None if self.dispose: self.im.paste(self.dispose, self.dispose_extent) @@ -935,11 +937,13 @@ class PngImageFile(ImageFile.ImageFile): self.tile = self.png.im_tile self.dispose_op = self.info.get("disposal") self.blend_op = self.info.get("blend") - self.dispose_extent = self.info.get("bbox") + dispose_extent = self.info.get("bbox") if not self.tile: msg = "image not found in APNG frame" raise EOFError(msg) + if dispose_extent: + self.dispose_extent: tuple[float, float, float, float] = dispose_extent # setup frame disposal (actual disposal done when needed in the next _seek()) if self._prev_im is None and self.dispose_op == Disposal.OP_PREVIOUS: @@ -1046,6 +1050,7 @@ class PngImageFile(ImageFile.ImageFile): self.png = None else: if self._prev_im and self.blend_op == Blend.OP_OVER: + assert self.im is not None updated = self._crop(self.im, self.dispose_extent) if self.im.mode == "RGB" and "transparency" in self.info: mask = updated.convert_transparent( @@ -1400,6 +1405,7 @@ def _save( chunk(fp, cid, data) if im.mode == "P": + assert im.im is not None palette_byte_number = colors * 3 palette_bytes = im.im.getpalette("RGB")[:palette_byte_number] while len(palette_bytes) < palette_byte_number: @@ -1430,8 +1436,9 @@ def _save( # and it's in the info dict. It's probably just stale. msg = "cannot use transparency for this mode" raise OSError(msg) - else: - if im.mode == "P" and im.im.getpalettemode() == "RGBA": + elif im.mode == "P": + assert im.im is not None + if im.im.getpalettemode() == "RGBA": alpha = im.im.getpalette("RGBA", "A") alpha_bytes = colors chunk(fp, b"tRNS", alpha[:alpha_bytes]) diff --git a/src/PIL/QoiImagePlugin.py b/src/PIL/QoiImagePlugin.py index 202ef52d0..c81d381fb 100644 --- a/src/PIL/QoiImagePlugin.py +++ b/src/PIL/QoiImagePlugin.py @@ -26,7 +26,7 @@ class QoiImageFile(ImageFile.ImageFile): msg = "not a QOI file" raise SyntaxError(msg) - self._size = tuple(i32(self.fp.read(4)) for i in range(2)) + self._size = i32(self.fp.read(4)), i32(self.fp.read(4)) channels = self.fp.read(1)[0] self._mode = "RGB" if channels == 3 else "RGBA" diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index d9d1bab5a..2b53c7dfa 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1313,6 +1313,7 @@ class TiffImageFile(ImageFile.ImageFile): decoder = Image._getdecoder( self.mode, "libtiff", tuple(args), self.decoderconfig ) + assert self.im is not None try: decoder.setimage(self.im, extents) except ValueError as e: From 3e93b806cc68aedb887fa9071cfe35a2144cd960 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 3 Aug 2024 02:29:19 +0000 Subject: [PATCH 218/662] Update dependency mypy to v1.11.1 --- .ci/requirements-mypy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-mypy.txt b/.ci/requirements-mypy.txt index 776bb0dbb..ebb80e03b 100644 --- a/.ci/requirements-mypy.txt +++ b/.ci/requirements-mypy.txt @@ -1 +1 @@ -mypy==1.11.0 +mypy==1.11.1 From 69076fa3d9c04e00ab20cc7ba13ab046547b5138 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 4 Aug 2024 06:21:13 +0000 Subject: [PATCH 219/662] Update dependency cibuildwheel to v2.20.0 --- .ci/requirements-cibw.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-cibw.txt b/.ci/requirements-cibw.txt index a2bf2a7b0..b8e6c3947 100644 --- a/.ci/requirements-cibw.txt +++ b/.ci/requirements-cibw.txt @@ -1 +1 @@ -cibuildwheel==2.19.2 +cibuildwheel==2.20.0 From 2722cfd72b6b458f709d71c2ef06e9949cf3bbe2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 5 Aug 2024 20:20:24 +1000 Subject: [PATCH 220/662] Added writing XMP bytes to JPEG --- Tests/test_file_jpeg.py | 7 +++++++ src/PIL/JpegImagePlugin.py | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index df589e24a..8feae2edd 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -991,6 +991,13 @@ class TestFileJpeg: else: assert im.getxmp() == {"xmpmeta": None} + def test_save_xmp(self, tmp_path: Path) -> None: + f = str(tmp_path / "temp.jpg") + hopper().save(f, xmp=b"XMP test") + + with Image.open(f) as reloaded: + assert reloaded.info["xmp"] == b"XMP test" + @pytest.mark.timeout(timeout=1) def test_eof(self) -> None: # Even though this decoder never says that it is finished diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index fc897e2b9..f15b62f0f 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -746,6 +746,11 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: extra = info.get("extra", b"") + xmp = info.get("xmp") + if xmp: + size = o16(31 + len(xmp)) + extra += b"\xFF\xE1" + size + b"http://ns.adobe.com/xap/1.0/\x00" + xmp + MAX_BYTES_IN_MARKER = 65533 icc_profile = info.get("icc_profile") if icc_profile: From d49884e40c204db7ce89b621823b2ac37ad51a10 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 5 Aug 2024 21:48:36 +1000 Subject: [PATCH 221/662] Raise ValueError is XMP data is too long --- Tests/test_file_jpeg.py | 8 +++++++- src/PIL/JpegImagePlugin.py | 19 ++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index 8feae2edd..f9c5fbc0b 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -993,11 +993,17 @@ class TestFileJpeg: def test_save_xmp(self, tmp_path: Path) -> None: f = str(tmp_path / "temp.jpg") - hopper().save(f, xmp=b"XMP test") + im = hopper() + im.save(f, xmp=b"XMP test") with Image.open(f) as reloaded: assert reloaded.info["xmp"] == b"XMP test" + im.save(f, xmp=b"1" * 65504) + + with pytest.raises(ValueError): + im.save(f, xmp=b"1" * 65505) + @pytest.mark.timeout(timeout=1) def test_eof(self) -> None: # Even though this decoder never says that it is finished diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index f15b62f0f..75c0ae384 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -746,23 +746,28 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: extra = info.get("extra", b"") + MAX_BYTES_IN_MARKER = 65533 xmp = info.get("xmp") if xmp: - size = o16(31 + len(xmp)) + overhead_len = 29 + max_data_bytes_in_marker = MAX_BYTES_IN_MARKER - overhead_len + if len(xmp) > max_data_bytes_in_marker: + msg = "XMP data is too long" + raise ValueError(msg) + size = o16(2 + overhead_len + len(xmp)) extra += b"\xFF\xE1" + size + b"http://ns.adobe.com/xap/1.0/\x00" + xmp - MAX_BYTES_IN_MARKER = 65533 icc_profile = info.get("icc_profile") if icc_profile: - ICC_OVERHEAD_LEN = 14 - MAX_DATA_BYTES_IN_MARKER = MAX_BYTES_IN_MARKER - ICC_OVERHEAD_LEN + overhead_len = 14 + max_data_bytes_in_marker = MAX_BYTES_IN_MARKER - overhead_len markers = [] while icc_profile: - markers.append(icc_profile[:MAX_DATA_BYTES_IN_MARKER]) - icc_profile = icc_profile[MAX_DATA_BYTES_IN_MARKER:] + markers.append(icc_profile[:max_data_bytes_in_marker]) + icc_profile = icc_profile[max_data_bytes_in_marker:] i = 1 for marker in markers: - size = o16(2 + ICC_OVERHEAD_LEN + len(marker)) + size = o16(2 + overhead_len + len(marker)) extra += ( b"\xFF\xE2" + size From 554f8bb23a9a35fbfd638b7677f1af12043ce9d0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 17:37:42 +0000 Subject: [PATCH 222/662] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.5.0 → v0.5.6](https://github.com/astral-sh/ruff-pre-commit/compare/v0.5.0...v0.5.6) - [github.com/python-jsonschema/check-jsonschema: 0.28.6 → 0.29.1](https://github.com/python-jsonschema/check-jsonschema/compare/0.28.6...0.29.1) - [github.com/tox-dev/pyproject-fmt: 2.1.3 → 2.2.1](https://github.com/tox-dev/pyproject-fmt/compare/2.1.3...2.2.1) --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 659409de4..74764752e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.0 + rev: v0.5.6 hooks: - id: ruff args: [--exit-non-zero-on-fix] @@ -50,7 +50,7 @@ repos: exclude: ^.github/.*TEMPLATE|^Tests/(fonts|images)/ - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.6 + rev: 0.29.1 hooks: - id: check-github-workflows - id: check-readthedocs @@ -62,7 +62,7 @@ repos: - id: sphinx-lint - repo: https://github.com/tox-dev/pyproject-fmt - rev: 2.1.3 + rev: 2.2.1 hooks: - id: pyproject-fmt From c056406f21e2a5aa87a8e4560fc33e079bed59e8 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 6 Aug 2024 06:19:15 +1000 Subject: [PATCH 223/662] Added comments to explain overhead_len --- src/PIL/JpegImagePlugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 75c0ae384..0cb50e0bf 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -749,7 +749,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: MAX_BYTES_IN_MARKER = 65533 xmp = info.get("xmp") if xmp: - overhead_len = 29 + overhead_len = 29 # b"http://ns.adobe.com/xap/1.0/\x00" max_data_bytes_in_marker = MAX_BYTES_IN_MARKER - overhead_len if len(xmp) > max_data_bytes_in_marker: msg = "XMP data is too long" @@ -759,7 +759,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: icc_profile = info.get("icc_profile") if icc_profile: - overhead_len = 14 + overhead_len = 14 # b"ICC_PROFILE\0" + o8(i) + o8(len(markers)) max_data_bytes_in_marker = MAX_BYTES_IN_MARKER - overhead_len markers = [] while icc_profile: From 1fd4d1478226e0b745b42ed33a9ade993cd393df Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 6 Aug 2024 06:31:47 +1000 Subject: [PATCH 224/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index bd8d3af03..ae995e0a0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,18 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Remove all WITH_* flags from _imaging.c and other flags #8211 + [homm] + +- Improve ImageDraw2 shape methods #8265 + [radarhere] + +- Lock around usages of imaging memory arenas #8238 + [lysnikolaou] + +- Deprecate JpegImageFile huffman_ac and huffman_dc #8274 + [radarhere] + - Deprecate ImageMath lambda_eval and unsafe_eval options argument #8242 [radarhere] From 13c00bab86df263a83874304972951bd847439ac Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 6 Aug 2024 11:16:55 +1000 Subject: [PATCH 225/662] Updated libimagequant to 4.3.3 --- depends/install_imagequant.sh | 2 +- docs/installation/building-from-source.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/install_imagequant.sh b/depends/install_imagequant.sh index 9dd7742ed..867b31e4d 100755 --- a/depends/install_imagequant.sh +++ b/depends/install_imagequant.sh @@ -2,7 +2,7 @@ # install libimagequant archive_name=libimagequant -archive_version=4.3.1 +archive_version=4.3.3 archive=$archive_name-$archive_version diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst index 7f7dfa6ff..fc02bb382 100644 --- a/docs/installation/building-from-source.rst +++ b/docs/installation/building-from-source.rst @@ -68,7 +68,7 @@ Many of Pillow's features require external libraries: * **libimagequant** provides improved color quantization - * Pillow has been tested with libimagequant **2.6-4.3.1** + * Pillow has been tested with libimagequant **2.6-4.3.3** * Libimagequant is licensed GPLv3, which is more restrictive than the Pillow license, therefore we will not be distributing binaries with libimagequant support enabled. From 5e8dbbbf9e22b7615157172fa11bc7f7bf86f4c6 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 6 Aug 2024 13:32:46 +1000 Subject: [PATCH 226/662] Removed unused variable --- src/libImaging/Quant.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libImaging/Quant.c b/src/libImaging/Quant.c index 595ee42a0..55b5e7a55 100644 --- a/src/libImaging/Quant.c +++ b/src/libImaging/Quant.c @@ -308,11 +308,10 @@ mergesort_pixels(PixelList *head, int i) { #ifdef DEBUG static int test_sorted(PixelList *pl[3]) { - int i, n, l; + int i, l; PixelList *t; for (i = 0; i < 3; i++) { - n = 0; l = 256; for (t = pl[i]; t; t = t->next[i]) { if (l < t->p.a.v[i]) From 9d6d16d5cc7bcf6070f5ad002de8642cbb2a17ab Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Tue, 6 Aug 2024 15:19:40 +0300 Subject: [PATCH 227/662] Parametrize some color_lut tests for DRYness --- Tests/test_color_lut.py | 133 +++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 78 deletions(-) diff --git a/Tests/test_color_lut.py b/Tests/test_color_lut.py index 0d9c0b419..152a7a1e6 100644 --- a/Tests/test_color_lut.py +++ b/Tests/test_color_lut.py @@ -105,91 +105,68 @@ class TestColorLut3DCoreAPI: with pytest.raises(TypeError): im.im.color_lut_3d("RGB", Image.Resampling.BILINEAR, 3, 2, 2, 2, 16) - def test_correct_args(self) -> None: + @pytest.mark.parametrize( + ("lut_mode", "table_size"), + [ + ("RGB", (3, 3)), + ("CMYK", (4, 3)), + ("RGB", (3, (2, 3, 3))), + ("RGB", (3, (65, 3, 3))), + ("RGB", (3, (3, 65, 3))), + ("RGB", (3, (3, 3, 65))), + ], + ) + def test_correct_args( + self, lut_mode: str, table_size: tuple[int, int | tuple[int, int, int]] + ) -> None: im = Image.new("RGB", (10, 10), 0) - + assert im.im is not None im.im.color_lut_3d( - "RGB", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) - ) - - im.im.color_lut_3d( - "CMYK", Image.Resampling.BILINEAR, *self.generate_identity_table(4, 3) - ) - - im.im.color_lut_3d( - "RGB", + lut_mode, Image.Resampling.BILINEAR, - *self.generate_identity_table(3, (2, 3, 3)), + *self.generate_identity_table(*table_size), ) + @pytest.mark.parametrize( + ("image_mode", "lut_mode", "table_size"), + [ + ("L", "RGB", (3, 3)), + ("RGB", "L", (3, 3)), + ("L", "L", (3, 3)), + ("RGB", "RGBA", (3, 3)), + ("RGB", "RGB", (4, 3)), + ], + ) + def test_wrong_mode( + self, image_mode: str, lut_mode: str, table_size: tuple[int, int] + ) -> None: + with pytest.raises(ValueError, match="wrong mode"): + im = Image.new(image_mode, (10, 10), 0) + assert im.im is not None + im.im.color_lut_3d( + lut_mode, + Image.Resampling.BILINEAR, + *self.generate_identity_table(*table_size), + ) + + @pytest.mark.parametrize( + ("image_mode", "lut_mode", "table_size"), + [ + ("RGBA", "RGB", (3, 3)), + ("RGBA", "RGBA", (4, 3)), + ("RGB", "HSV", (3, 3)), + ("RGB", "RGBA", (4, 3)), + ], + ) + def test_correct_mode( + self, image_mode: str, lut_mode: str, table_size: tuple[int, int] + ) -> None: + im = Image.new(image_mode, (10, 10), 0) + assert im.im is not None im.im.color_lut_3d( - "RGB", + lut_mode, Image.Resampling.BILINEAR, - *self.generate_identity_table(3, (65, 3, 3)), - ) - - im.im.color_lut_3d( - "RGB", - Image.Resampling.BILINEAR, - *self.generate_identity_table(3, (3, 65, 3)), - ) - - im.im.color_lut_3d( - "RGB", - Image.Resampling.BILINEAR, - *self.generate_identity_table(3, (3, 3, 65)), - ) - - def test_wrong_mode(self) -> None: - with pytest.raises(ValueError, match="wrong mode"): - im = Image.new("L", (10, 10), 0) - im.im.color_lut_3d( - "RGB", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) - ) - - with pytest.raises(ValueError, match="wrong mode"): - im = Image.new("RGB", (10, 10), 0) - im.im.color_lut_3d( - "L", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) - ) - - with pytest.raises(ValueError, match="wrong mode"): - im = Image.new("L", (10, 10), 0) - im.im.color_lut_3d( - "L", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) - ) - - with pytest.raises(ValueError, match="wrong mode"): - im = Image.new("RGB", (10, 10), 0) - im.im.color_lut_3d( - "RGBA", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) - ) - - with pytest.raises(ValueError, match="wrong mode"): - im = Image.new("RGB", (10, 10), 0) - im.im.color_lut_3d( - "RGB", Image.Resampling.BILINEAR, *self.generate_identity_table(4, 3) - ) - - def test_correct_mode(self) -> None: - im = Image.new("RGBA", (10, 10), 0) - im.im.color_lut_3d( - "RGBA", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) - ) - - im = Image.new("RGBA", (10, 10), 0) - im.im.color_lut_3d( - "RGBA", Image.Resampling.BILINEAR, *self.generate_identity_table(4, 3) - ) - - im = Image.new("RGB", (10, 10), 0) - im.im.color_lut_3d( - "HSV", Image.Resampling.BILINEAR, *self.generate_identity_table(3, 3) - ) - - im = Image.new("RGB", (10, 10), 0) - im.im.color_lut_3d( - "RGBA", Image.Resampling.BILINEAR, *self.generate_identity_table(4, 3) + *self.generate_identity_table(*table_size), ) def test_identities(self) -> None: From 70298d3be948e4245e2f24481b33d8d877c45e1d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 7 Aug 2024 06:38:46 +1000 Subject: [PATCH 228/662] Fix undefined variable --- src/libImaging/Quant.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/libImaging/Quant.c b/src/libImaging/Quant.c index 55b5e7a55..a489a882d 100644 --- a/src/libImaging/Quant.c +++ b/src/libImaging/Quant.c @@ -314,8 +314,9 @@ test_sorted(PixelList *pl[3]) { for (i = 0; i < 3; i++) { l = 256; for (t = pl[i]; t; t = t->next[i]) { - if (l < t->p.a.v[i]) + if (l < t->p.a.v[i]) { return 0; + } l = t->p.a.v[i]; } } @@ -1009,7 +1010,8 @@ compute_palette_from_median_cut( uint32_t nPixels, HashTable *medianBoxHash, Pixel **palette, - uint32_t nPaletteEntries + uint32_t nPaletteEntries, + BoxNode *root ) { uint32_t i; uint32_t paletteEntry; @@ -1382,7 +1384,9 @@ quantize( fflush(stdout); timer = clock(); #endif - if (!compute_palette_from_median_cut(pixelData, nPixels, h, &p, nPaletteEntries)) { + if (!compute_palette_from_median_cut( + pixelData, nPixels, h, &p, nPaletteEntries, root + )) { goto error_3; } #ifdef DEBUG From 59c69f8d71d7f3e43cb09bd6bd2271c6e332c7ba Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Mon, 5 Aug 2024 19:12:12 +0300 Subject: [PATCH 229/662] Move auxiliary mypy requirements to a requirements file For easier installation outside tox --- .ci/requirements-mypy.txt | 9 +++++++++ tox.ini | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.ci/requirements-mypy.txt b/.ci/requirements-mypy.txt index ebb80e03b..23792281b 100644 --- a/.ci/requirements-mypy.txt +++ b/.ci/requirements-mypy.txt @@ -1 +1,10 @@ mypy==1.11.1 +IceSpringPySideStubs-PyQt6 +IceSpringPySideStubs-PySide6 +ipython +numpy +packaging +pytest +types-defusedxml +types-olefile +types-setuptools diff --git a/tox.ini b/tox.ini index c1bc3b17d..4b4059455 100644 --- a/tox.ini +++ b/tox.ini @@ -33,15 +33,6 @@ commands = skip_install = true deps = -r .ci/requirements-mypy.txt - IceSpringPySideStubs-PyQt6 - IceSpringPySideStubs-PySide6 - ipython - numpy - packaging - pytest - types-defusedxml - types-olefile - types-setuptools extras = typing commands = From 7581b48706cb3ce8af112305bae22af705134608 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 7 Aug 2024 18:44:43 +1000 Subject: [PATCH 230/662] Fixed sign comparison warning --- src/_imagingft.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_imagingft.c b/src/_imagingft.c index da03e3ba9..f8143e0cc 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -1243,7 +1243,7 @@ font_getvarnames(FontObject *self) { return PyErr_NoMemory(); } - for (int i = 0; i < num_namedstyles; i++) { + for (unsigned int i = 0; i < num_namedstyles; i++) { list_names_filled[i] = 0; } From 4fddc625f177d8b7cd2120fa2c7880f664e25e67 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 7 Aug 2024 18:26:24 +1000 Subject: [PATCH 231/662] Corrected lut mode --- Tests/test_color_lut.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_color_lut.py b/Tests/test_color_lut.py index 152a7a1e6..1543faf01 100644 --- a/Tests/test_color_lut.py +++ b/Tests/test_color_lut.py @@ -152,7 +152,7 @@ class TestColorLut3DCoreAPI: @pytest.mark.parametrize( ("image_mode", "lut_mode", "table_size"), [ - ("RGBA", "RGB", (3, 3)), + ("RGBA", "RGBA", (3, 3)), ("RGBA", "RGBA", (4, 3)), ("RGB", "HSV", (3, 3)), ("RGB", "RGBA", (4, 3)), From 5c4aeaa3296c748facfafc265e29fbb1c7c8e518 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 7 Aug 2024 18:24:50 +1000 Subject: [PATCH 232/662] Concatenate parameters into single string --- Tests/test_color_lut.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/test_color_lut.py b/Tests/test_color_lut.py index 1543faf01..346ea749a 100644 --- a/Tests/test_color_lut.py +++ b/Tests/test_color_lut.py @@ -106,7 +106,7 @@ class TestColorLut3DCoreAPI: im.im.color_lut_3d("RGB", Image.Resampling.BILINEAR, 3, 2, 2, 2, 16) @pytest.mark.parametrize( - ("lut_mode", "table_size"), + "lut_mode, table_size", [ ("RGB", (3, 3)), ("CMYK", (4, 3)), @@ -128,7 +128,7 @@ class TestColorLut3DCoreAPI: ) @pytest.mark.parametrize( - ("image_mode", "lut_mode", "table_size"), + "image_mode, lut_mode, table_size", [ ("L", "RGB", (3, 3)), ("RGB", "L", (3, 3)), @@ -150,7 +150,7 @@ class TestColorLut3DCoreAPI: ) @pytest.mark.parametrize( - ("image_mode", "lut_mode", "table_size"), + "image_mode, lut_mode, table_size", [ ("RGBA", "RGBA", (3, 3)), ("RGBA", "RGBA", (4, 3)), From a06529a3a89d3e57e584b85c25fa24cf075f4dcd Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 7 Aug 2024 18:28:51 +1000 Subject: [PATCH 233/662] Added channels parameter --- Tests/test_color_lut.py | 48 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Tests/test_color_lut.py b/Tests/test_color_lut.py index 346ea749a..084cb19e1 100644 --- a/Tests/test_color_lut.py +++ b/Tests/test_color_lut.py @@ -106,39 +106,39 @@ class TestColorLut3DCoreAPI: im.im.color_lut_3d("RGB", Image.Resampling.BILINEAR, 3, 2, 2, 2, 16) @pytest.mark.parametrize( - "lut_mode, table_size", + "lut_mode, table_channels, table_size", [ - ("RGB", (3, 3)), - ("CMYK", (4, 3)), - ("RGB", (3, (2, 3, 3))), - ("RGB", (3, (65, 3, 3))), - ("RGB", (3, (3, 65, 3))), - ("RGB", (3, (3, 3, 65))), + ("RGB", 3, 3), + ("CMYK", 4, 3), + ("RGB", 3, (2, 3, 3)), + ("RGB", 3, (65, 3, 3)), + ("RGB", 3, (3, 65, 3)), + ("RGB", 3, (2, 3, 65)), ], ) def test_correct_args( - self, lut_mode: str, table_size: tuple[int, int | tuple[int, int, int]] + self, lut_mode: str, table_channels: int, table_size: int | tuple[int, int, int] ) -> None: im = Image.new("RGB", (10, 10), 0) assert im.im is not None im.im.color_lut_3d( lut_mode, Image.Resampling.BILINEAR, - *self.generate_identity_table(*table_size), + *self.generate_identity_table(table_channels, table_size), ) @pytest.mark.parametrize( - "image_mode, lut_mode, table_size", + "image_mode, lut_mode, table_channels, table_size", [ - ("L", "RGB", (3, 3)), - ("RGB", "L", (3, 3)), - ("L", "L", (3, 3)), - ("RGB", "RGBA", (3, 3)), - ("RGB", "RGB", (4, 3)), + ("L", "RGB", 3, 3), + ("RGB", "L", 3, 3), + ("L", "L", 3, 3), + ("RGB", "RGBA", 3, 3), + ("RGB", "RGB", 4, 3), ], ) def test_wrong_mode( - self, image_mode: str, lut_mode: str, table_size: tuple[int, int] + self, image_mode: str, lut_mode: str, table_channels: int, table_size: int ) -> None: with pytest.raises(ValueError, match="wrong mode"): im = Image.new(image_mode, (10, 10), 0) @@ -146,27 +146,27 @@ class TestColorLut3DCoreAPI: im.im.color_lut_3d( lut_mode, Image.Resampling.BILINEAR, - *self.generate_identity_table(*table_size), + *self.generate_identity_table(table_channels, table_size), ) @pytest.mark.parametrize( - "image_mode, lut_mode, table_size", + "image_mode, lut_mode, table_channels, table_size", [ - ("RGBA", "RGBA", (3, 3)), - ("RGBA", "RGBA", (4, 3)), - ("RGB", "HSV", (3, 3)), - ("RGB", "RGBA", (4, 3)), + ("RGBA", "RGBA", 3, 3), + ("RGBA", "RGBA", 4, 3), + ("RGB", "HSV", 3, 3), + ("RGB", "RGBA", 4, 3), ], ) def test_correct_mode( - self, image_mode: str, lut_mode: str, table_size: tuple[int, int] + self, image_mode: str, lut_mode: str, table_channels: int, table_size: int ) -> None: im = Image.new(image_mode, (10, 10), 0) assert im.im is not None im.im.color_lut_3d( lut_mode, Image.Resampling.BILINEAR, - *self.generate_identity_table(*table_size), + *self.generate_identity_table(table_channels, table_size), ) def test_identities(self) -> None: From 8ca53b312d7fbac101a688c6864b4eeed9bae168 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Wed, 7 Aug 2024 12:17:49 +0300 Subject: [PATCH 234/662] Enforce CSV parametrize names style --- Tests/test_file_dds.py | 6 +++--- Tests/test_file_eps.py | 4 +--- Tests/test_image_access.py | 2 +- Tests/test_pickle.py | 2 +- pyproject.toml | 3 +++ 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Tests/test_file_dds.py b/Tests/test_file_dds.py index ebc0e89a1..9a826ebe8 100644 --- a/Tests/test_file_dds.py +++ b/Tests/test_file_dds.py @@ -152,7 +152,7 @@ def test_sanity_ati2_bc5u(image_path: str) -> None: @pytest.mark.parametrize( - ("image_path", "expected_path"), + "image_path, expected_path", ( # hexeditted to be typeless (TEST_FILE_DX10_BC5_TYPELESS, TEST_FILE_DX10_BC5_UNORM), @@ -248,7 +248,7 @@ def test_dx10_r8g8b8a8_unorm_srgb() -> None: @pytest.mark.parametrize( - ("mode", "size", "test_file"), + "mode, size, test_file", [ ("L", (128, 128), TEST_FILE_UNCOMPRESSED_L), ("LA", (128, 128), TEST_FILE_UNCOMPRESSED_L_WITH_ALPHA), @@ -373,7 +373,7 @@ def test_save_unsupported_mode(tmp_path: Path) -> None: @pytest.mark.parametrize( - ("mode", "test_file"), + "mode, test_file", [ ("L", "Tests/images/linear_gradient.png"), ("LA", "Tests/images/uncompressed_la.png"), diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py index b54238132..d54deb515 100644 --- a/Tests/test_file_eps.py +++ b/Tests/test_file_eps.py @@ -80,9 +80,7 @@ simple_eps_file_with_long_binary_data = ( @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available") -@pytest.mark.parametrize( - ("filename", "size"), ((FILE1, (460, 352)), (FILE2, (360, 252))) -) +@pytest.mark.parametrize("filename, size", ((FILE1, (460, 352)), (FILE2, (360, 252)))) @pytest.mark.parametrize("scale", (1, 2)) def test_sanity(filename: str, size: tuple[int, int], scale: int) -> None: expected_size = tuple(s * scale for s in size) diff --git a/Tests/test_image_access.py b/Tests/test_image_access.py index 854c79dae..bb30b462d 100644 --- a/Tests/test_image_access.py +++ b/Tests/test_image_access.py @@ -230,7 +230,7 @@ class TestImagePutPixelError: im.putpixel((0, 0), v) # type: ignore[arg-type] @pytest.mark.parametrize( - ("mode", "band_numbers", "match"), + "mode, band_numbers, match", ( ("L", (0, 2), "color must be int or single-element tuple"), ("LA", (0, 3), "color must be int, or tuple of one or two elements"), diff --git a/Tests/test_pickle.py b/Tests/test_pickle.py index ed415953f..be143e9c6 100644 --- a/Tests/test_pickle.py +++ b/Tests/test_pickle.py @@ -46,7 +46,7 @@ def helper_pickle_string(protocol: int, test_file: str, mode: str | None) -> Non @pytest.mark.parametrize( - ("test_file", "test_mode"), + "test_file, test_mode", [ ("Tests/images/hopper.jpg", None), ("Tests/images/hopper.jpg", "L"), diff --git a/pyproject.toml b/pyproject.toml index 0940664f3..d81f79c5f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -109,6 +109,7 @@ lint.select = [ "ISC", # flake8-implicit-str-concat "LOG", # flake8-logging "PGH", # pygrep-hooks + "PT006", # pytest-parametrize-names-wrong-type "PYI", # flake8-pyi "RUF100", # unused noqa (yesqa) "UP", # pyupgrade @@ -129,6 +130,8 @@ lint.per-file-ignores."Tests/oss-fuzz/fuzz_font.py" = [ lint.per-file-ignores."Tests/oss-fuzz/fuzz_pillow.py" = [ "I002", ] +lint.flake8-pytest-style.parametrize-names-type = "csv" + lint.isort.known-first-party = [ "PIL", ] From 1c998d7f7c5378ae2ed3a029ef7c4724633050e1 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Thu, 8 Aug 2024 14:10:18 +0300 Subject: [PATCH 235/662] Update pyproject.toml Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d81f79c5f..8bb21019c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -131,7 +131,6 @@ lint.per-file-ignores."Tests/oss-fuzz/fuzz_pillow.py" = [ "I002", ] lint.flake8-pytest-style.parametrize-names-type = "csv" - lint.isort.known-first-party = [ "PIL", ] From e938283eb9ff28fbd18432eae3aa5b0ec79967d3 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 9 Aug 2024 20:56:14 +1000 Subject: [PATCH 236/662] Allow docs to build without lcms2 --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 41f9c0e38..75e4c2a20 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -121,7 +121,7 @@ nitpicky = True # generating warnings in “nitpicky mode”. Note that type should include the domain name # if present. Example entries would be ('py:func', 'int') or # ('envvar', 'LD_LIBRARY_PATH'). -# nitpick_ignore = [] +nitpick_ignore = [("py:class", "_CmsProfileCompatible")] # -- Options for HTML output ---------------------------------------------- From 4d0e8e74b4998422141e77525d9cfe30ccb7dc2e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 10 Aug 2024 10:20:08 +1000 Subject: [PATCH 237/662] Use im property --- Tests/test_box_blur.py | 1 - Tests/test_color_lut.py | 9 ------ Tests/test_image.py | 1 - Tests/test_image_array.py | 1 - Tests/test_image_filter.py | 4 +-- Tests/test_image_getim.py | 1 - Tests/test_image_resample.py | 1 - Tests/test_image_resize.py | 5 --- Tests/test_imagemorph.py | 2 -- Tests/test_imageops_usm.py | 2 -- Tests/test_lib_image.py | 3 -- selftest.py | 2 +- src/PIL/BmpImagePlugin.py | 1 - src/PIL/EpsImagePlugin.py | 1 - src/PIL/GbrImagePlugin.py | 2 +- src/PIL/GifImagePlugin.py | 11 ++----- src/PIL/IcnsImagePlugin.py | 3 +- src/PIL/IcoImagePlugin.py | 2 +- src/PIL/ImImagePlugin.py | 1 - src/PIL/Image.py | 63 ++++++++++-------------------------- src/PIL/ImageChops.py | 17 ---------- src/PIL/ImageCms.py | 3 -- src/PIL/ImageFile.py | 4 +-- src/PIL/ImageFont.py | 1 - src/PIL/ImageMath.py | 5 --- src/PIL/ImageMorph.py | 4 --- src/PIL/ImageTk.py | 4 --- src/PIL/JpegImagePlugin.py | 1 - src/PIL/PcdImagePlugin.py | 3 -- src/PIL/PcxImagePlugin.py | 2 -- src/PIL/PngImagePlugin.py | 10 ++---- src/PIL/TgaImagePlugin.py | 2 -- src/PIL/TiffImagePlugin.py | 1 - src/PIL/WalImageFile.py | 2 +- 34 files changed, 30 insertions(+), 145 deletions(-) diff --git a/Tests/test_box_blur.py b/Tests/test_box_blur.py index dd5fe0290..1f6ed6127 100644 --- a/Tests/test_box_blur.py +++ b/Tests/test_box_blur.py @@ -24,7 +24,6 @@ def test_imageops_box_blur() -> None: def box_blur(image: Image.Image, radius: float = 1, n: int = 1) -> Image.Image: - assert image.im is not None return image._new(image.im.box_blur((radius, radius), n)) diff --git a/Tests/test_color_lut.py b/Tests/test_color_lut.py index 4b083d689..36ab187f2 100644 --- a/Tests/test_color_lut.py +++ b/Tests/test_color_lut.py @@ -47,7 +47,6 @@ class TestColorLut3DCoreAPI: def test_wrong_args(self) -> None: im = Image.new("RGB", (10, 10), 0) - assert im.im is not None with pytest.raises(ValueError, match="filter"): im.im.color_lut_3d( @@ -121,7 +120,6 @@ class TestColorLut3DCoreAPI: self, lut_mode: str, table_channels: int, table_size: int | tuple[int, int, int] ) -> None: im = Image.new("RGB", (10, 10), 0) - assert im.im is not None im.im.color_lut_3d( lut_mode, Image.Resampling.BILINEAR, @@ -143,7 +141,6 @@ class TestColorLut3DCoreAPI: ) -> None: with pytest.raises(ValueError, match="wrong mode"): im = Image.new(image_mode, (10, 10), 0) - assert im.im is not None im.im.color_lut_3d( lut_mode, Image.Resampling.BILINEAR, @@ -163,7 +160,6 @@ class TestColorLut3DCoreAPI: self, image_mode: str, lut_mode: str, table_channels: int, table_size: int ) -> None: im = Image.new(image_mode, (10, 10), 0) - assert im.im is not None im.im.color_lut_3d( lut_mode, Image.Resampling.BILINEAR, @@ -180,7 +176,6 @@ class TestColorLut3DCoreAPI: g.transpose(Image.Transpose.ROTATE_180), ], ) - assert im.im is not None # Fast test with small cubes for size in [2, 3, 5, 7, 11, 16, 17]: @@ -217,7 +212,6 @@ class TestColorLut3DCoreAPI: g.transpose(Image.Transpose.ROTATE_180), ], ) - assert im.im is not None # Red channel copied to alpha assert_image_equal( @@ -242,7 +236,6 @@ class TestColorLut3DCoreAPI: g.transpose(Image.Transpose.ROTATE_270), ], ) - assert im.im is not None assert_image_equal( im, @@ -265,7 +258,6 @@ class TestColorLut3DCoreAPI: g.transpose(Image.Transpose.ROTATE_180), ], ) - assert im.im is not None # Reverse channels by splitting and using table # fmt: off @@ -291,7 +283,6 @@ class TestColorLut3DCoreAPI: g.transpose(Image.Transpose.ROTATE_180), ], ) - assert im.im is not None # fmt: off transformed = im._new(im.im.color_lut_3d('RGB', Image.Resampling.BILINEAR, diff --git a/Tests/test_image.py b/Tests/test_image.py index d4ab8ad38..12b6c1fdd 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -695,7 +695,6 @@ class TestImage: image: Image.Image, palette_result: ImagePalette.ImagePalette | None = None, ) -> None: - assert image.im is not None new_image = base_image._new(image.im) assert new_image.mode == image.mode assert new_image.size == image.size diff --git a/Tests/test_image_array.py b/Tests/test_image_array.py index 4d8ffbf4a..2b9ccd04e 100644 --- a/Tests/test_image_array.py +++ b/Tests/test_image_array.py @@ -114,5 +114,4 @@ def test_fromarray_palette() -> None: # Assert that the Python and C palettes match assert out.palette is not None - assert out.im is not None assert len(out.palette.colors) == len(out.im.getpalette()) / 3 diff --git a/Tests/test_image_filter.py b/Tests/test_image_filter.py index ea5438f3d..412ab44c3 100644 --- a/Tests/test_image_filter.py +++ b/Tests/test_image_filter.py @@ -137,9 +137,7 @@ def test_builtinfilter_p() -> None: builtin_filter = ImageFilter.BuiltinFilter() with pytest.raises(ValueError): - im = hopper("P").im - assert im is not None - builtin_filter.filter(im) + builtin_filter.filter(hopper("P").im) def test_kernel_not_enough_coefficients() -> None: diff --git a/Tests/test_image_getim.py b/Tests/test_image_getim.py index e62d6e0ec..9afa02b0a 100644 --- a/Tests/test_image_getim.py +++ b/Tests/test_image_getim.py @@ -8,5 +8,4 @@ def test_sanity() -> None: type_repr = repr(type(im.getim())) assert "PyCapsule" in type_repr - assert im.im is not None assert isinstance(im.im.id, int) diff --git a/Tests/test_image_resample.py b/Tests/test_image_resample.py index 4a5901d47..ce6209c0d 100644 --- a/Tests/test_image_resample.py +++ b/Tests/test_image_resample.py @@ -27,7 +27,6 @@ class TestImagingResampleVulnerability: ): with pytest.raises(MemoryError): # any resampling filter will do here - assert im.im is not None im.im.resize((xsize, ysize), Image.Resampling.BILINEAR) def test_invalid_size(self) -> None: diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py index 5700b3e06..c9e304512 100644 --- a/Tests/test_image_resize.py +++ b/Tests/test_image_resize.py @@ -27,7 +27,6 @@ class TestImagingCoreResize: ) -> Image.Image: # Image class independent version of resize. im.load() - assert im.im is not None return im._new(im.im.resize(size, f)) @pytest.mark.parametrize( @@ -38,8 +37,6 @@ class TestImagingCoreResize: r = self.resize(im, (15, 12), Image.Resampling.NEAREST) assert r.mode == mode assert r.size == (15, 12) - assert r.im is not None - assert im.im is not None assert r.im.bands == im.im.bands def test_convolution_modes(self) -> None: @@ -54,8 +51,6 @@ class TestImagingCoreResize: r = self.resize(im, (15, 12), Image.Resampling.BILINEAR) assert r.mode == mode assert r.size == (15, 12) - assert r.im is not None - assert im.im is not None assert r.im.bands == im.im.bands @pytest.mark.parametrize( diff --git a/Tests/test_imagemorph.py b/Tests/test_imagemorph.py index b40de7f98..4363f456e 100644 --- a/Tests/test_imagemorph.py +++ b/Tests/test_imagemorph.py @@ -325,8 +325,6 @@ def test_wrong_mode() -> None: lut = ImageMorph.LutBuilder(op_name="corner").build_lut() imrgb = Image.new("RGB", (10, 10)) iml = Image.new("L", (10, 10)) - assert imrgb.im is not None - assert iml.im is not None with pytest.raises(RuntimeError): _imagingmorph.apply(bytes(lut), imrgb.im.id, iml.im.id) diff --git a/Tests/test_imageops_usm.py b/Tests/test_imageops_usm.py index 64116bf70..920012d86 100644 --- a/Tests/test_imageops_usm.py +++ b/Tests/test_imageops_usm.py @@ -98,12 +98,10 @@ def test_blur_accuracy(test_images: dict[str, ImageFile.ImageFile]) -> None: (4, 3, 2), (4, 2, 2), ]: - assert i.im is not None assert i.im.getpixel((x, y))[c] >= 250 # Fuzzy match. def gp(x: int, y: int) -> tuple[int, ...]: - assert i.im is not None return i.im.getpixel((x, y)) assert 236 <= gp(7, 4)[0] <= 239 diff --git a/Tests/test_lib_image.py b/Tests/test_lib_image.py index 0a36af8b6..31548bbc9 100644 --- a/Tests/test_lib_image.py +++ b/Tests/test_lib_image.py @@ -7,21 +7,18 @@ from PIL import Image def test_setmode() -> None: im = Image.new("L", (1, 1), 255) - assert im.im is not None im.im.setmode("1") assert im.im.getpixel((0, 0)) == 255 im.im.setmode("L") assert im.im.getpixel((0, 0)) == 255 im = Image.new("1", (1, 1), 1) - assert im.im is not None im.im.setmode("L") assert im.im.getpixel((0, 0)) == 255 im.im.setmode("1") assert im.im.getpixel((0, 0)) == 255 im = Image.new("RGB", (1, 1), (1, 2, 3)) - assert im.im is not None im.im.setmode("RGB") assert im.im.getpixel((0, 0)) == (1, 2, 3) im.im.setmode("RGBA") diff --git a/selftest.py b/selftest.py index 9e049367e..e9b5689a0 100755 --- a/selftest.py +++ b/selftest.py @@ -52,7 +52,7 @@ def testimage() -> None: or you call the "load" method: >>> im = Image.open("Tests/images/hopper.ppm") - >>> print(im.im) # internal image attribute + >>> print(im._im) # internal image attribute None >>> a = im.load() >>> type(im.im) # doctest: +ELLIPSIS diff --git a/src/PIL/BmpImagePlugin.py b/src/PIL/BmpImagePlugin.py index ce2ee464a..da9f2eba5 100644 --- a/src/PIL/BmpImagePlugin.py +++ b/src/PIL/BmpImagePlugin.py @@ -445,7 +445,6 @@ def _save( elif im.mode == "L": palette = b"".join(o8(i) * 4 for i in range(256)) elif im.mode == "P": - assert im.im is not None palette = im.im.getpalette("RGB", "BGRX") colors = len(palette) // 4 else: diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index c5ca8dadc..28aa9689d 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -161,7 +161,6 @@ def Ghostscript( except OSError: pass - assert out_im.im is not None im = out_im.im.copy() out_im.close() return im diff --git a/src/PIL/GbrImagePlugin.py b/src/PIL/GbrImagePlugin.py index 3c8feea5f..f319d7e84 100644 --- a/src/PIL/GbrImagePlugin.py +++ b/src/PIL/GbrImagePlugin.py @@ -89,7 +89,7 @@ class GbrImageFile(ImageFile.ImageFile): self._data_size = width * height * color_depth def load(self) -> Image.core.PixelAccess | None: - if not self.im: + if self._im is None: self.im = Image.core.new(self.mode, self.size) self.frombytes(self.fp.read(self._data_size)) return Image.Image.load(self) diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index 55f927d40..74aebcb1f 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -155,7 +155,7 @@ class GifImageFile(ImageFile.ImageFile): if not self._seek_check(frame): return if frame < self.__frame: - self.im = None + self._im = None self._seek(0) last_frame = self.__frame @@ -307,7 +307,6 @@ class GifImageFile(ImageFile.ImageFile): self.tile = [] if self.dispose: - assert self.im is not None self.im.paste(self.dispose, self.dispose_extent) self._frame_palette = palette if palette is not None else self.global_palette @@ -335,7 +334,6 @@ class GifImageFile(ImageFile.ImageFile): LOADING_STRATEGY != LoadingStrategy.RGB_AFTER_DIFFERENT_PALETTE_ONLY or palette ): - assert self.im is not None if "transparency" in self.info: self.im.putpalettealpha(self.info["transparency"], 0) self.im = self.im.convert("RGBA", Image.Dither.FLOYDSTEINBERG) @@ -381,7 +379,7 @@ class GifImageFile(ImageFile.ImageFile): self.dispose = Image.core.fill(dispose_mode, dispose_size, color) else: # replace with previous contents - if self.im is not None: + if self._im is not None: # only dispose the extent in this frame self.dispose = self._crop(self.im, self.dispose_extent) elif frame_transparency is not None: @@ -437,17 +435,15 @@ class GifImageFile(ImageFile.ImageFile): self._prev_im = self.im if self._frame_palette: self.im = Image.core.fill("P", self.size, self._frame_transparency or 0) - assert self.im is not None self.im.putpalette("RGB", *self._frame_palette.getdata()) else: - self.im = None + self._im = None self._mode = temp_mode self._frame_palette = None super().load_prepare() def load_end(self) -> None: - assert self.im is not None if self.__frame == 0: if self.mode == "P" and LOADING_STRATEGY == LoadingStrategy.RGB_ALWAYS: if self._frame_transparency is not None: @@ -539,7 +535,6 @@ def _normalize_palette( if im.mode == "P": if not source_palette: - assert im.im is not None source_palette = im.im.getpalette("RGB")[:768] else: # L-mode if not source_palette: diff --git a/src/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py index 58d4a90a0..ca66aa0fd 100644 --- a/src/PIL/IcnsImagePlugin.py +++ b/src/PIL/IcnsImagePlugin.py @@ -92,7 +92,6 @@ def read_32( msg = f"Error reading channel [{repr(bytesleft)} left]" raise SyntaxError(msg) band = Image.frombuffer("L", pixel_size, b"".join(data), "raw", "L", 0, 1) - assert im.im is not None im.im.putband(band.im, band_ix) return {"RGB": im} @@ -309,7 +308,7 @@ class IcnsImageFile(ImageFile.ImageFile): ) px = Image.Image.load(self) - if self.im is not None and self.im.size == self.size: + if self._im is not None and self.im.size == self.size: # Already loaded return px self.load_prepare() diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py index c891024f5..4613379b6 100644 --- a/src/PIL/IcoImagePlugin.py +++ b/src/PIL/IcoImagePlugin.py @@ -328,7 +328,7 @@ class IcoImageFile(ImageFile.ImageFile): self._size = value def load(self) -> Image.core.PixelAccess | None: - if self.im is not None and self.im.size == self.size: + if self._im is not None and self.im.size == self.size: # Already loaded return Image.Image.load(self) im = self.ico.getimage(self.size) diff --git a/src/PIL/ImImagePlugin.py b/src/PIL/ImImagePlugin.py index 9d60011be..2fb7ecd52 100644 --- a/src/PIL/ImImagePlugin.py +++ b/src/PIL/ImImagePlugin.py @@ -353,7 +353,6 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: fp.write(b"Lut: 1\r\n") fp.write(b"\000" * (511 - fp.tell()) + b"\032") if im.mode in ["P", "PA"]: - assert im.im is not None im_palette = im.im.getpalette("RGB", "RGB;L") colors = len(im_palette) // 3 palette = b"" diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 7532a49a2..5ec416081 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -535,7 +535,7 @@ class Image: def __init__(self) -> None: # FIXME: take "new" parameters / other image? # FIXME: turn mode and size into delegating properties? - self.im: core.ImagingCore | None = None + self._im: core.ImagingCore | DeferredError | None = None self._mode = "" self._size = (0, 0) self.palette: ImagePalette.ImagePalette | None = None @@ -543,6 +543,17 @@ class Image: self.readonly = 0 self._exif: Exif | None = None + @property + def im(self) -> core.ImagingCore: + if isinstance(self._im, DeferredError): + raise self._im.ex + assert self._im is not None + return self._im + + @im.setter + def im(self, im: core.ImagingCore) -> None: + self._im = im + @property def width(self) -> int: return self.size[0] @@ -617,12 +628,11 @@ class Image: # Instead of simply setting to None, we're setting up a # deferred error that will better explain that the core image # object is gone. - self.im = DeferredError(ValueError("Operation on closed image")) # type: ignore[assignment] + self._im = DeferredError(ValueError("Operation on closed image")) def _copy(self) -> None: self.load() - if self.im: - self.im = self.im.copy() + self.im = self.im.copy() self.readonly = 0 def _ensure_mutable(self) -> None: @@ -649,7 +659,6 @@ class Image: self.load() if not format or format == "PPM": - assert self.im is not None self.im.save_ppm(filename) else: self.save(filename, format, **options) @@ -798,7 +807,6 @@ class Image: # unpack data e = _getencoder(self.mode, encoder_name, encoder_args) - assert self.im is not None e.setimage(self.im) bufsize = max(65536, self.size[0] * 4) # see RawEncode.c @@ -865,7 +873,6 @@ class Image: # unpack data d = _getdecoder(self.mode, decoder_name, decoder_args) - assert self.im is not None d.setimage(self.im) s = d.decode(data) @@ -891,7 +898,7 @@ class Image: :returns: An image access object. :rtype: :py:class:`.PixelAccess` """ - if self.im is not None and self.palette and self.palette.dirty: + if self._im is not None and self.palette and self.palette.dirty: # realize palette mode, arr = self.palette.getdata() self.im.putpalette(self.palette.mode, mode, arr) @@ -908,7 +915,7 @@ class Image: self.palette.mode, self.palette.mode ) - if self.im is not None: + if self._im is not None: return self.im.pixel_access(self.readonly) return None @@ -979,7 +986,6 @@ class Image: deprecate(mode, 12) self.load() - assert self.im is not None has_transparency = "transparency" in self.info if not mode and self.mode == "P": @@ -1094,7 +1100,6 @@ class Image: new_im = self._new(im) from . import ImagePalette - assert new_im.im is not None new_im.palette = ImagePalette.ImagePalette( "RGB", new_im.im.getpalette("RGB") ) @@ -1226,7 +1231,6 @@ class Image: ) raise ValueError(msg) - assert self.im is not None if palette: # use palette from reference image palette.load() @@ -1265,7 +1269,6 @@ class Image: :returns: An :py:class:`~PIL.Image.Image` object. """ self.load() - assert self.im is not None return self._new(self.im.copy()) __copy__ = copy @@ -1294,7 +1297,6 @@ class Image: raise ValueError(msg) self.load() - assert self.im is not None return self._new(self._crop(self.im, box)) def _crop( @@ -1348,7 +1350,6 @@ class Image: if ymargin is None: ymargin = xmargin self.load() - assert self.im is not None return self._new(self.im.expand(xmargin, ymargin)) if TYPE_CHECKING: @@ -1373,7 +1374,6 @@ class Image: raise TypeError(msg) multiband = isinstance(filter, ImageFilter.MultibandFilter) - assert self.im is not None if self.im.bands == 1 or multiband: return self._new(filter.filter(self.im)) @@ -1409,7 +1409,6 @@ class Image: """ self.load() - assert self.im is not None return self.im.getbbox(alpha_only) def getcolors( @@ -1429,7 +1428,6 @@ class Image: """ self.load() - assert self.im is not None if self.mode in ("1", "L", "P"): h = self.im.histogram() out: list[tuple[int, float]] = [(h[i], i) for i in range(256) if h[i]] @@ -1457,7 +1455,6 @@ class Image: """ self.load() - assert self.im is not None if band is not None: return self.im.getband(band) return self.im # could be abused @@ -1473,7 +1470,6 @@ class Image: """ self.load() - assert self.im is not None if self.im.bands > 1: return tuple(self.im.getband(i).getextrema() for i in range(self.im.bands)) return self.im.getextrema() @@ -1612,7 +1608,6 @@ class Image: """ self.load() - assert self.im is not None return self.im.ptr def getpalette(self, rawmode: str | None = "RGB") -> list[int] | None: @@ -1629,7 +1624,6 @@ class Image: """ self.load() - assert self.im is not None try: mode = self.im.getpalettemode() except ValueError: @@ -1697,7 +1691,6 @@ class Image: """ self.load() - assert self.im is not None return self.im.getpixel(tuple(xy)) def getprojection(self) -> tuple[list[int], list[int]]: @@ -1709,7 +1702,6 @@ class Image: """ self.load() - assert self.im is not None x, y = self.im.getprojection() return list(x), list(y) @@ -1737,7 +1729,6 @@ class Image: :returns: A list containing pixel counts. """ self.load() - assert self.im is not None if mask: mask.load() return self.im.histogram((0, 0), mask.im) @@ -1766,7 +1757,6 @@ class Image: :returns: A float value representing the image entropy """ self.load() - assert self.im is not None if mask: mask.load() return self.im.entropy((0, 0), mask.im) @@ -1856,7 +1846,6 @@ class Image: if self.mode != "RGB" or im.mode not in ("LA", "RGBA", "RGBa"): # should use an adapter for this! im = im.convert(self.mode) - assert im.im is not None source = im.im elif isinstance(im, tuple): source = im @@ -1864,7 +1853,6 @@ class Image: source = cast(float, im) self._ensure_mutable() - assert self.im is not None if mask: mask.load() @@ -1960,7 +1948,6 @@ class Image: if isinstance(lut, ImagePointHandler): return lut.point(self) - assert self.im is not None if callable(lut): # if it isn't a list, it should be a function if self.mode in ("I", "I;16", "F"): @@ -1997,20 +1984,17 @@ class Image: if self.mode not in ("LA", "PA", "RGBA"): # attempt to promote self to a matching alpha mode - assert self.im is not None try: mode = getmodebase(self.mode) + "A" try: self.im.setmode(mode) except (AttributeError, ValueError) as e: # do things the hard way - assert self.im is not None im = self.im.convert(mode) if im.mode not in ("LA", "PA", "RGBA"): msg = "alpha channel could not be added" raise ValueError(msg) from e # sanity check self.im = im - assert self.im is not None self._mode = self.im.mode except KeyError as e: msg = "illegal image mode" @@ -2021,7 +2005,6 @@ class Image: else: band = 3 - assert self.im is not None if isImageType(alpha): # alpha layer if alpha.mode not in ("1", "L"): @@ -2064,7 +2047,6 @@ class Image: self._ensure_mutable() - assert self.im is not None self.im.putdata(data, scale, offset) def putpalette( @@ -2150,7 +2132,6 @@ class Image: assert self.palette is not None palette_index = self.palette.getcolor(tuple(value), self) value = (palette_index, alpha) if self.mode == "PA" else palette_index - assert self.im is not None return self.im.putpixel(xy, value) def remap_palette( @@ -2177,7 +2158,6 @@ class Image: if source_palette is None: if self.mode == "P": self.load() - assert self.im is not None palette_mode = self.im.getpalettemode() if palette_mode == "RGBA": bands = 4 @@ -2225,7 +2205,6 @@ class Image: # m_im.putpalette(mapping_palette, 'L') # converts to 'P' # or just force it. # UNDONE -- this is part of the general issue with palettes - assert m_im.im is not None m_im.im.putpalette(palette_mode, palette_mode + ";L", m_im.palette.tobytes()) m_im = m_im.convert("L") @@ -2371,7 +2350,6 @@ class Image: (box[3] - reduce_box[1]) / factor_y, ) - assert self.im is not None return self._new(self.im.resize(size, resample, box)) def reduce( @@ -2406,7 +2384,7 @@ class Image: return im.convert(self.mode) self.load() - assert self.im is not None + return self._new(self.im.reduce(factor, box)) def rotate( @@ -2684,7 +2662,6 @@ class Image: """ self.load() - assert self.im is not None if self.im.bands == 1: return (self.copy(),) return tuple(map(self._new, self.im.split())) @@ -2709,7 +2686,6 @@ class Image: msg = f'The image has no channel "{channel}"' raise ValueError(msg) from e - assert self.im is not None return self._new(self.im.getband(channel)) def tell(self) -> int: @@ -2814,7 +2790,6 @@ class Image: self.im = im.im self._size = final_size - assert self.im is not None self._mode = self.im.mode self.readonly = 0 @@ -2999,7 +2974,6 @@ class Image: if image.mode in ("1", "P"): resample = Resampling.NEAREST - assert self.im is not None self.im.transform(box, image.im, method, data, resample, fill) def transpose(self, method: Transpose) -> Image: @@ -3014,7 +2988,6 @@ class Image: """ self.load() - assert self.im is not None return self._new(self.im.transpose(method)) def effect_spread(self, distance: int) -> Image: @@ -3024,7 +2997,6 @@ class Image: :param distance: Distance to spread pixels. """ self.load() - assert self.im is not None return self._new(self.im.effect_spread(distance)) def toqimage(self): @@ -3258,7 +3230,6 @@ def frombuffer( if mode == "P": from . import ImagePalette - assert im.im is not None im.palette = ImagePalette.ImagePalette("RGB", im.im.getpalette("RGB")) im.readonly = 1 return im diff --git a/src/PIL/ImageChops.py b/src/PIL/ImageChops.py index b1b616d5c..29a5c995f 100644 --- a/src/PIL/ImageChops.py +++ b/src/PIL/ImageChops.py @@ -48,7 +48,6 @@ def invert(image: Image.Image) -> Image.Image: """ image.load() - assert image.im is not None return image._new(image.im.chop_invert()) @@ -64,7 +63,6 @@ def lighter(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_lighter(image2.im)) @@ -80,7 +78,6 @@ def darker(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_darker(image2.im)) @@ -96,7 +93,6 @@ def difference(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_difference(image2.im)) @@ -114,7 +110,6 @@ def multiply(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_multiply(image2.im)) @@ -129,7 +124,6 @@ def screen(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_screen(image2.im)) @@ -142,7 +136,6 @@ def soft_light(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_soft_light(image2.im)) @@ -155,7 +148,6 @@ def hard_light(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_hard_light(image2.im)) @@ -168,7 +160,6 @@ def overlay(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_overlay(image2.im)) @@ -186,7 +177,6 @@ def add( image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_add(image2.im, scale, offset)) @@ -204,7 +194,6 @@ def subtract( image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_subtract(image2.im, scale, offset)) @@ -218,7 +207,6 @@ def add_modulo(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_add_modulo(image2.im)) @@ -232,7 +220,6 @@ def subtract_modulo(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_subtract_modulo(image2.im)) @@ -251,7 +238,6 @@ def logical_and(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_and(image2.im)) @@ -267,7 +253,6 @@ def logical_or(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_or(image2.im)) @@ -283,7 +268,6 @@ def logical_xor(image1: Image.Image, image2: Image.Image) -> Image.Image: image1.load() image2.load() - assert image1.im is not None return image1._new(image1.im.chop_xor(image2.im)) @@ -324,5 +308,4 @@ def offset(image: Image.Image, xoffset: int, yoffset: int | None = None) -> Imag if yoffset is None: yoffset = xoffset image.load() - assert image.im is not None return image._new(image.im.offset(xoffset, yoffset)) diff --git a/src/PIL/ImageCms.py b/src/PIL/ImageCms.py index 3a6d52949..ec10230f1 100644 --- a/src/PIL/ImageCms.py +++ b/src/PIL/ImageCms.py @@ -352,8 +352,6 @@ class ImageCmsTransform(Image.ImagePointHandler): im.load() if imOut is None: imOut = Image.new(self.output_mode, im.size, None) - assert im.im is not None - assert imOut.im is not None self.transform.apply(im.im.id, imOut.im.id) imOut.info["icc_profile"] = self.output_profile.tobytes() return imOut @@ -363,7 +361,6 @@ class ImageCmsTransform(Image.ImagePointHandler): if im.mode != self.output_mode: msg = "mode mismatch" raise ValueError(msg) # wrong output mode - assert im.im is not None self.transform.apply(im.im.id, im.im.id) im.info["icc_profile"] = self.output_profile.tobytes() return im diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index babf453cb..24b3a9eb1 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -315,7 +315,7 @@ class ImageFile(Image.Image): def load_prepare(self) -> None: # create image memory if necessary - if not self.im or self.im.mode != self.mode or self.im.size != self.size: + if self._im is None or self.im.mode != self.mode or self.im.size != self.size: self.im = Image.core.new(self.mode, self.size) # create palette (optional) if self.mode == "P": @@ -475,7 +475,6 @@ class Parser: d, e, o, a = im.tile[0] im.tile = [] self.decoder = Image._getdecoder(im.mode, d, a, im.decoderconfig) - assert im.im is not None self.decoder.setimage(im.im, e) # calculate decoder offset @@ -567,7 +566,6 @@ def _encode_tile( fp.seek(offset) encoder = Image._getencoder(im.mode, encoder_name, args, im.encoderconfig) try: - assert im.im is not None encoder.setimage(im.im, extents) if encoder.pushes_fd: encoder.setfd(fp) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 2d71b4df4..2ab65bfef 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -142,7 +142,6 @@ class ImageFont: raise TypeError(msg) image.load() - assert image.im is not None self.font = Image.core.font(image.im, data) diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py index c8f0406ed..191cc2a5f 100644 --- a/src/PIL/ImageMath.py +++ b/src/PIL/ImageMath.py @@ -65,8 +65,6 @@ class _Operand: except AttributeError as e: msg = f"bad operand type for '{op}'" raise TypeError(msg) from e - assert out.im is not None - assert im_1.im is not None _imagingmath.unop(op, out.im.id, im_1.im.id) else: # binary operation @@ -95,9 +93,6 @@ class _Operand: except AttributeError as e: msg = f"bad operand type for '{op}'" raise TypeError(msg) from e - assert out.im is not None - assert im_1.im is not None - assert im_2.im is not None _imagingmath.binop(op, out.im.id, im_1.im.id, im_2.im.id) return _Operand(out) diff --git a/src/PIL/ImageMorph.py b/src/PIL/ImageMorph.py index cd4fa3cfe..6a43983d3 100644 --- a/src/PIL/ImageMorph.py +++ b/src/PIL/ImageMorph.py @@ -213,8 +213,6 @@ class MorphOp: msg = "Image mode must be L" raise ValueError(msg) outimage = Image.new(image.mode, image.size, None) - assert image.im is not None - assert outimage.im is not None count = _imagingmorph.apply(bytes(self.lut), image.im.id, outimage.im.id) return count, outimage @@ -231,7 +229,6 @@ class MorphOp: if image.mode != "L": msg = "Image mode must be L" raise ValueError(msg) - assert image.im is not None return _imagingmorph.match(bytes(self.lut), image.im.id) def get_on_pixels(self, image: Image.Image) -> list[tuple[int, int]]: @@ -243,7 +240,6 @@ class MorphOp: if image.mode != "L": msg = "Image mode must be L" raise ValueError(msg) - assert image.im is not None return _imagingmorph.get_on_pixels(image.im.id) def load_lut(self, filename: str) -> None: diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index 6344220ef..a788c9d1f 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -43,7 +43,6 @@ def _pilbitmap_check() -> int: if _pilbitmap_ok is None: try: im = Image.new("1", (1, 1)) - assert im.im is not None tkinter.BitmapImage(data=f"PIL:{im.im.id}") _pilbitmap_ok = 1 except tkinter.TclError: @@ -188,7 +187,6 @@ class PhotoImage: # convert to blittable im.load() image = im.im - assert image is not None if image.isblock() and im.mode == self.__mode: block = image else: @@ -230,7 +228,6 @@ class BitmapImage: if _pilbitmap_check(): # fast way (requires the pilbitmap booster patch) image.load() - assert image.im is not None kw["data"] = f"PIL:{image.im.id}" self.__im = image # must keep a reference else: @@ -277,7 +274,6 @@ def getimage(photo: PhotoImage) -> Image.Image: """Copies the contents of a PhotoImage to a PIL image memory.""" im = Image.new("RGBA", (photo.width(), photo.height())) block = im.im - assert block is not None _pyimagingtkcall("PyImagingPhotoGet", photo, block.id) diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 04fe8ba85..fc897e2b9 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -473,7 +473,6 @@ class JpegImageFile(ImageFile.ImageFile): except OSError: pass - assert self.im is not None self._mode = self.im.mode self._size = self.im.size diff --git a/src/PIL/PcdImagePlugin.py b/src/PIL/PcdImagePlugin.py index 64898e235..d9970405c 100644 --- a/src/PIL/PcdImagePlugin.py +++ b/src/PIL/PcdImagePlugin.py @@ -52,10 +52,7 @@ class PcdImageFile(ImageFile.ImageFile): def load_end(self) -> None: if self.tile_post_rotate: # Handle rotated PCDs - assert self.im is not None - self.im = self.im.rotate(self.tile_post_rotate) - assert self.im is not None self._size = self.im.size diff --git a/src/PIL/PcxImagePlugin.py b/src/PIL/PcxImagePlugin.py index dd42003b5..2b8ced8af 100644 --- a/src/PIL/PcxImagePlugin.py +++ b/src/PIL/PcxImagePlugin.py @@ -202,8 +202,6 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if im.mode == "P": # colour palette - assert im.im is not None - fp.write(o8(12)) palette = im.im.getpalette("RGB", "RGB") palette += b"\x00" * (768 - len(palette)) diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 59b5d0a8b..a0ac24571 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -869,7 +869,7 @@ class PngImageFile(ImageFile.ImageFile): self._fp.seek(self.__rewind) self.png.rewind() self.__prepare_idat = self.__rewind_idat - self.im = None + self._im = None self.info = self.png.im_info self.tile = self.png.im_tile self.fp = self._fp @@ -887,7 +887,6 @@ class PngImageFile(ImageFile.ImageFile): # ensure previous frame was loaded self.load() - assert self.im is not None if self.dispose: self.im.paste(self.dispose, self.dispose_extent) @@ -1050,7 +1049,6 @@ class PngImageFile(ImageFile.ImageFile): self.png = None else: if self._prev_im and self.blend_op == Blend.OP_OVER: - assert self.im is not None updated = self._crop(self.im, self.dispose_extent) if self.im.mode == "RGB" and "transparency" in self.info: mask = updated.convert_transparent( @@ -1405,7 +1403,6 @@ def _save( chunk(fp, cid, data) if im.mode == "P": - assert im.im is not None palette_byte_number = colors * 3 palette_bytes = im.im.getpalette("RGB")[:palette_byte_number] while len(palette_bytes) < palette_byte_number: @@ -1436,9 +1433,8 @@ def _save( # and it's in the info dict. It's probably just stale. msg = "cannot use transparency for this mode" raise OSError(msg) - elif im.mode == "P": - assert im.im is not None - if im.im.getpalettemode() == "RGBA": + else: + if im.mode == "P" and im.im.getpalettemode() == "RGBA": alpha = im.im.getpalette("RGBA", "A") alpha_bytes = colors chunk(fp, b"tRNS", alpha[:alpha_bytes]) diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py index 39104aece..c2a0ee4e9 100644 --- a/src/PIL/TgaImagePlugin.py +++ b/src/PIL/TgaImagePlugin.py @@ -158,7 +158,6 @@ class TgaImageFile(ImageFile.ImageFile): def load_end(self) -> None: if self._flip_horizontally: - assert self.im is not None self.im = self.im.transpose(Image.Transpose.FLIP_LEFT_RIGHT) @@ -200,7 +199,6 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: warnings.warn("id_section has been trimmed to 255 characters") if colormaptype: - assert im.im is not None palette = im.im.getpalette("RGB", "BGR") colormaplength, colormapentry = len(palette) // 3, 24 else: diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 2b53c7dfa..d9d1bab5a 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1313,7 +1313,6 @@ class TiffImageFile(ImageFile.ImageFile): decoder = Image._getdecoder( self.mode, "libtiff", tuple(args), self.decoderconfig ) - assert self.im is not None try: decoder.setimage(self.im, extents) except ValueError as e: diff --git a/src/PIL/WalImageFile.py b/src/PIL/WalImageFile.py index ec5c74900..87e32878b 100644 --- a/src/PIL/WalImageFile.py +++ b/src/PIL/WalImageFile.py @@ -54,7 +54,7 @@ class WalImageFile(ImageFile.ImageFile): self.info["next_name"] = next_name def load(self) -> Image.core.PixelAccess | None: - if not self.im: + if self._im is None: self.im = Image.core.new(self.mode, self.size) self.frombytes(self.fp.read(self.size[0] * self.size[1])) self.putpalette(quake2palette) From de441ee09107a2ac544eee905f6e94aeaa21cb55 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 10 Aug 2024 21:05:14 +1000 Subject: [PATCH 238/662] Updated to Python 3.10 --- Tests/oss-fuzz/python.supp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/oss-fuzz/python.supp b/Tests/oss-fuzz/python.supp index 94cc87db9..36385d672 100644 --- a/Tests/oss-fuzz/python.supp +++ b/Tests/oss-fuzz/python.supp @@ -1,5 +1,5 @@ { - + Memcheck:Cond ... fun:encode_current_locale From 0d79a38e77ddcf5e386d2153e791f12e5d67a2f5 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Sun, 11 Aug 2024 15:14:29 +0400 Subject: [PATCH 239/662] Add missing TIFF CMYK;16B reader --- src/PIL/TiffImagePlugin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index d9d1bab5a..deae199d5 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -259,6 +259,7 @@ OPEN_INFO = { (II, 5, (1,), 1, (8, 8, 8, 8, 8, 8), (0, 0)): ("CMYK", "CMYKXX"), (MM, 5, (1,), 1, (8, 8, 8, 8, 8, 8), (0, 0)): ("CMYK", "CMYKXX"), (II, 5, (1,), 1, (16, 16, 16, 16), ()): ("CMYK", "CMYK;16L"), + (MM, 5, (1,), 1, (16, 16, 16, 16), ()): ("CMYK", "CMYK;16B"), (II, 6, (1,), 1, (8,), ()): ("L", "L"), (MM, 6, (1,), 1, (8,), ()): ("L", "L"), # JPEG compressed images handled by LibTiff and auto-converted to RGBX From f801649513f1e1a89505cc6c481d5b26202dc2f4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 13 Aug 2024 06:11:32 +1000 Subject: [PATCH 240/662] Updated freetype to 2.13.3 --- winbuild/build_prepare.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 9837589b2..241737f92 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -111,7 +111,7 @@ ARCHITECTURES = { V = { "BROTLI": "1.1.0", - "FREETYPE": "2.13.2", + "FREETYPE": "2.13.3", "FRIBIDI": "1.0.15", "HARFBUZZ": "8.5.0", "JPEGTURBO": "3.0.3", @@ -293,12 +293,8 @@ DEPS = { }, "build": [ cmd_rmdir("objs"), - cmd_msbuild( - r"builds\windows\vc2010\freetype.sln", "Release Static", "Clean" - ), - cmd_msbuild( - r"builds\windows\vc2010\freetype.sln", "Release Static", "Build" - ), + cmd_msbuild("MSBuild.sln", "Release Static", "Clean"), + cmd_msbuild("MSBuild.sln", "Release Static", "Build"), cmd_xcopy("include", "{inc_dir}"), ], "libs": [r"objs\{msbuild_arch}\Release Static\freetype.lib"], From c1e8375af834b190386cd2cfa30703c7975675a8 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Sun, 7 Jul 2024 21:51:14 +0400 Subject: [PATCH 241/662] Require webpmux and webpdemux --- Tests/check_wheel.py | 1 - Tests/test_features.py | 5 --- Tests/test_file_webp_metadata.py | 5 +-- docs/handbook/image-file-formats.rst | 9 ++--- docs/installation/building-from-source.rst | 8 ++-- docs/reference/features.rst | 1 - setup.py | 46 ++++++++-------------- src/PIL/features.py | 2 - src/_webp.c | 33 ---------------- winbuild/build_prepare.py | 2 +- 10 files changed, 26 insertions(+), 86 deletions(-) diff --git a/Tests/check_wheel.py b/Tests/check_wheel.py index 4b91984f5..2e4498db6 100644 --- a/Tests/check_wheel.py +++ b/Tests/check_wheel.py @@ -28,7 +28,6 @@ def test_wheel_codecs() -> None: def test_wheel_features() -> None: expected_features = { "webp_anim", - "webp_mux", "transp_webp", "raqm", "fribidi", diff --git a/Tests/test_features.py b/Tests/test_features.py index b7eefa09a..33509a346 100644 --- a/Tests/test_features.py +++ b/Tests/test_features.py @@ -57,11 +57,6 @@ def test_webp_transparency() -> None: assert features.check("transp_webp") == _webp.HAVE_TRANSPARENCY -@skip_unless_feature("webp") -def test_webp_mux() -> None: - assert features.check("webp_mux") == _webp.HAVE_WEBPMUX - - @skip_unless_feature("webp") def test_webp_anim() -> None: assert features.check("webp_anim") == _webp.HAVE_WEBPANIM diff --git a/Tests/test_file_webp_metadata.py b/Tests/test_file_webp_metadata.py index c3df4ad7b..52a84a83e 100644 --- a/Tests/test_file_webp_metadata.py +++ b/Tests/test_file_webp_metadata.py @@ -10,10 +10,7 @@ from PIL import Image from .helper import mark_if_feature_version, skip_unless_feature -pytestmark = [ - skip_unless_feature("webp"), - skip_unless_feature("webp_mux"), -] +pytestmark = [skip_unless_feature("webp")] ElementTree: ModuleType | None try: diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst index 1ec972149..8561cc4aa 100644 --- a/docs/handbook/image-file-formats.rst +++ b/docs/handbook/image-file-formats.rst @@ -1252,16 +1252,13 @@ The :py:meth:`~PIL.Image.Image.save` method supports the following options: Requires libwebp 0.5.0 or later. **icc_profile** - The ICC Profile to include in the saved file. Only supported if - the system WebP library was built with webpmux support. + The ICC Profile to include in the saved file. **exif** - The exif data to include in the saved file. Only supported if - the system WebP library was built with webpmux support. + The exif data to include in the saved file. **xmp** - The XMP data to include in the saved file. Only supported if - the system WebP library was built with webpmux support. + The XMP data to include in the saved file. Saving sequences ~~~~~~~~~~~~~~~~ diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst index 7f7dfa6ff..f47edbc5b 100644 --- a/docs/installation/building-from-source.rst +++ b/docs/installation/building-from-source.rst @@ -275,18 +275,18 @@ Build Options * Config settings: ``-C zlib=disable``, ``-C jpeg=disable``, ``-C tiff=disable``, ``-C freetype=disable``, ``-C raqm=disable``, - ``-C lcms=disable``, ``-C webp=disable``, ``-C webpmux=disable``, + ``-C lcms=disable``, ``-C webp=disable``, ``-C jpeg2000=disable``, ``-C imagequant=disable``, ``-C xcb=disable``. Disable building the corresponding feature even if the development libraries are present on the building machine. * Config settings: ``-C zlib=enable``, ``-C jpeg=enable``, ``-C tiff=enable``, ``-C freetype=enable``, ``-C raqm=enable``, - ``-C lcms=enable``, ``-C webp=enable``, ``-C webpmux=enable``, + ``-C lcms=enable``, ``-C webp=enable``, ``-C jpeg2000=enable``, ``-C imagequant=enable``, ``-C xcb=enable``. Require that the corresponding feature is built. The build will raise - an exception if the libraries are not found. Webpmux (WebP metadata) - relies on WebP support. Tcl and Tk also must be used together. + an exception if the libraries are not found. Tcl and Tk must be used + together. * Config settings: ``-C raqm=vendor``, ``-C fribidi=vendor``. These flags are used to compile a modified version of libraqm and diff --git a/docs/reference/features.rst b/docs/reference/features.rst index c66193061..55c0b1200 100644 --- a/docs/reference/features.rst +++ b/docs/reference/features.rst @@ -55,7 +55,6 @@ Support for the following features can be checked: * ``libjpeg_turbo``: (compile time) Whether Pillow was compiled against the libjpeg-turbo version of libjpeg. Compile-time version number is available. * ``transp_webp``: Support for transparency in WebP images. -* ``webp_mux``: (compile time) Support for EXIF data in WebP images. * ``webp_anim``: (compile time) Support for animated WebP images. * ``raqm``: Raqm library, required for ``ImageFont.Layout.RAQM`` in :py:func:`PIL.ImageFont.truetype`. Run-time version number is available for Raqm 0.7.0 or newer. * ``libimagequant``: (compile time) ImageQuant quantization support in :py:func:`PIL.Image.Image.quantize`. Run-time version number is available. diff --git a/setup.py b/setup.py index b26852b0b..8d0dfb6fa 100644 --- a/setup.py +++ b/setup.py @@ -295,7 +295,6 @@ class pil_build_ext(build_ext): "raqm", "lcms", "webp", - "webpmux", "jpeg2000", "imagequant", "xcb", @@ -794,29 +793,22 @@ class pil_build_ext(build_ext): if feature.want("webp"): _dbg("Looking for webp") - if _find_include_file(self, "webp/encode.h") and _find_include_file( - self, "webp/decode.h" + if all( + _find_include_file(self, src) + for src in ["webp/encode.h", "webp/mux.h", "webp/demux.h"] ): # In Google's precompiled zip it is call "libwebp": - if _find_library_file(self, "webp"): + if all( + _find_library_file(self, lib) + for lib in ["webp", "webpmux", "webpdemux"] + ): feature.webp = "webp" - elif _find_library_file(self, "libwebp"): + elif all( + _find_library_file(self, lib) + for lib in ["libwebp", "libwebpmux", "libwebpdemux"] + ): feature.webp = "libwebp" - if feature.want("webpmux"): - _dbg("Looking for webpmux") - if _find_include_file(self, "webp/mux.h") and _find_include_file( - self, "webp/demux.h" - ): - if _find_library_file(self, "webpmux") and _find_library_file( - self, "webpdemux" - ): - feature.webpmux = "webpmux" - if _find_library_file(self, "libwebpmux") and _find_library_file( - self, "libwebpdemux" - ): - feature.webpmux = "libwebpmux" - if feature.want("xcb"): _dbg("Looking for xcb") if _find_include_file(self, "xcb/xcb.h"): @@ -904,15 +896,12 @@ class pil_build_ext(build_ext): self._remove_extension("PIL._imagingcms") if feature.webp: - libs = [feature.webp] - defs = [] - - if feature.webpmux: - defs.append(("HAVE_WEBPMUX", None)) - libs.append(feature.webpmux) - libs.append(feature.webpmux.replace("pmux", "pdemux")) - - self._update_extension("PIL._webp", libs, defs) + libs = [ + feature.webp, + feature.webp + "mux", + feature.webp + "demux", + ] + self._update_extension("PIL._webp", libs, []) else: self._remove_extension("PIL._webp") @@ -953,7 +942,6 @@ class pil_build_ext(build_ext): (feature.raqm, "RAQM (Text shaping)", raqm_extra_info), (feature.lcms, "LITTLECMS2"), (feature.webp, "WEBP"), - (feature.webpmux, "WEBPMUX"), (feature.xcb, "XCB (X protocol)"), ] diff --git a/src/PIL/features.py b/src/PIL/features.py index 13908c4eb..7f6cdb161 100644 --- a/src/PIL/features.py +++ b/src/PIL/features.py @@ -120,7 +120,6 @@ def get_supported_codecs() -> list[str]: features = { "webp_anim": ("PIL._webp", "HAVE_WEBPANIM", None), - "webp_mux": ("PIL._webp", "HAVE_WEBPMUX", None), "transp_webp": ("PIL._webp", "HAVE_TRANSPARENCY", None), "raqm": ("PIL._imagingft", "HAVE_RAQM", "raqm_version"), "fribidi": ("PIL._imagingft", "HAVE_FRIBIDI", "fribidi_version"), @@ -272,7 +271,6 @@ def pilinfo(out: IO[str] | None = None, supported_formats: bool = True) -> None: ("littlecms2", "LITTLECMS2"), ("webp", "WEBP"), ("transp_webp", "WEBP Transparency"), - ("webp_mux", "WEBPMUX"), ("webp_anim", "WEBP Animation"), ("jpg", "JPEG"), ("jpg_2000", "OPENJPEG (JPEG2000)"), diff --git a/src/_webp.c b/src/_webp.c index e686ec820..ab229058b 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -4,8 +4,6 @@ #include #include #include - -#ifdef HAVE_WEBPMUX #include #include @@ -19,8 +17,6 @@ #define HAVE_WEBPANIM #endif -#endif - void ImagingSectionEnter(ImagingSectionCookie *cookie) { *cookie = (PyThreadState *)PyEval_SaveThread(); @@ -35,8 +31,6 @@ ImagingSectionLeave(ImagingSectionCookie *cookie) { /* WebP Muxer Error Handling */ /* -------------------------------------------------------------------- */ -#ifdef HAVE_WEBPMUX - static const char *const kErrorMessages[-WEBP_MUX_NOT_ENOUGH_DATA + 1] = { "WEBP_MUX_NOT_FOUND", "WEBP_MUX_INVALID_ARGUMENT", @@ -89,8 +83,6 @@ HandleMuxError(WebPMuxError err, char *chunk) { return NULL; } -#endif - /* -------------------------------------------------------------------- */ /* WebP Animation Support */ /* -------------------------------------------------------------------- */ @@ -693,13 +685,6 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) { output = writer.mem; ret_size = writer.size; -#ifndef HAVE_WEBPMUX - if (ret_size > 0) { - PyObject *ret = PyBytes_FromStringAndSize((char *)output, ret_size); - free(output); - return ret; - } -#else { /* I want to truncate the *_size items that get passed into WebP data. Pypy2.1.0 had some issues where the Py_ssize_t items had @@ -775,7 +760,6 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) { return ret; } } -#endif Py_RETURN_NONE; } @@ -809,9 +793,6 @@ WebPDecode_wrapper(PyObject *self, PyObject *args) { mode = "RGBA"; } -#ifndef HAVE_WEBPMUX - vp8_status_code = WebPDecode(webp, size, &config); -#else { int copy_data = 0; WebPData data = {webp, size}; @@ -849,7 +830,6 @@ WebPDecode_wrapper(PyObject *self, PyObject *args) { WebPDataClear(&image.bitstream); WebPMuxDelete(mux); } -#endif } if (vp8_status_code != VP8_STATUS_OK) { @@ -949,18 +929,6 @@ static PyMethodDef webpMethods[] = { {NULL, NULL} }; -void -addMuxFlagToModule(PyObject *m) { - PyObject *have_webpmux; -#ifdef HAVE_WEBPMUX - have_webpmux = Py_True; -#else - have_webpmux = Py_False; -#endif - Py_INCREF(have_webpmux); - PyModule_AddObject(m, "HAVE_WEBPMUX", have_webpmux); -} - void addAnimFlagToModule(PyObject *m) { PyObject *have_webpanim; @@ -991,7 +959,6 @@ setup_module(PyObject *m) { } #endif PyObject *d = PyModule_GetDict(m); - addMuxFlagToModule(m); addAnimFlagToModule(m); addTransparencyFlagToModule(m); diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 9837589b2..7129699eb 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -201,7 +201,7 @@ DEPS = { }, "build": [ *cmds_cmake( - "webp webpdemux webpmux", + "webp webpmux webpdemux", "-DBUILD_SHARED_LIBS:BOOL=OFF", "-DWEBP_LINK_STATIC:BOOL=OFF", ), From 9bed5b426437ad4aacd36288fcfb9422cac8c9c9 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Sun, 7 Jul 2024 22:05:57 +0400 Subject: [PATCH 242/662] Remove _webp.WebPDecoderBuggyAlpha and _webp.HAVE_TRANSPARENCY --- Tests/check_wheel.py | 1 - Tests/test_features.py | 6 ------ Tests/test_file_webp.py | 1 - Tests/test_file_webp_alpha.py | 8 -------- docs/reference/features.rst | 1 - src/PIL/features.py | 2 -- src/_webp.c | 27 --------------------------- 7 files changed, 46 deletions(-) diff --git a/Tests/check_wheel.py b/Tests/check_wheel.py index 2e4498db6..f862e4fff 100644 --- a/Tests/check_wheel.py +++ b/Tests/check_wheel.py @@ -28,7 +28,6 @@ def test_wheel_codecs() -> None: def test_wheel_features() -> None: expected_features = { "webp_anim", - "transp_webp", "raqm", "fribidi", "harfbuzz", diff --git a/Tests/test_features.py b/Tests/test_features.py index 33509a346..577e7a5d5 100644 --- a/Tests/test_features.py +++ b/Tests/test_features.py @@ -51,12 +51,6 @@ def test_version() -> None: test(feature, features.version_feature) -@skip_unless_feature("webp") -def test_webp_transparency() -> None: - assert features.check("transp_webp") != _webp.WebPDecoderBuggyAlpha() - assert features.check("transp_webp") == _webp.HAVE_TRANSPARENCY - - @skip_unless_feature("webp") def test_webp_anim() -> None: assert features.check("webp_anim") == _webp.HAVE_WEBPANIM diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index cbc905de4..f132d0a64 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -49,7 +49,6 @@ class TestFileWebp: def test_version(self) -> None: _webp.WebPDecoderVersion() - _webp.WebPDecoderBuggyAlpha() version = features.version_module("webp") assert version is not None assert re.search(r"\d+\.\d+\.\d+$", version) diff --git a/Tests/test_file_webp_alpha.py b/Tests/test_file_webp_alpha.py index c74452121..e80ef7d4f 100644 --- a/Tests/test_file_webp_alpha.py +++ b/Tests/test_file_webp_alpha.py @@ -16,11 +16,6 @@ from .helper import ( _webp = pytest.importorskip("PIL._webp", reason="WebP support not installed") -def setup_module() -> None: - if _webp.WebPDecoderBuggyAlpha(): - pytest.skip("Buggy early version of WebP installed, not testing transparency") - - def test_read_rgba() -> None: """ Can we read an RGBA mode file without error? @@ -81,9 +76,6 @@ def test_write_rgba(tmp_path: Path) -> None: pil_image = Image.new("RGBA", (10, 10), (255, 0, 0, 20)) pil_image.save(temp_file) - if _webp.WebPDecoderBuggyAlpha(): - return - with Image.open(temp_file) as image: image.load() diff --git a/docs/reference/features.rst b/docs/reference/features.rst index 55c0b1200..d4fb340bd 100644 --- a/docs/reference/features.rst +++ b/docs/reference/features.rst @@ -54,7 +54,6 @@ Feature version numbers are available only where stated. Support for the following features can be checked: * ``libjpeg_turbo``: (compile time) Whether Pillow was compiled against the libjpeg-turbo version of libjpeg. Compile-time version number is available. -* ``transp_webp``: Support for transparency in WebP images. * ``webp_anim``: (compile time) Support for animated WebP images. * ``raqm``: Raqm library, required for ``ImageFont.Layout.RAQM`` in :py:func:`PIL.ImageFont.truetype`. Run-time version number is available for Raqm 0.7.0 or newer. * ``libimagequant``: (compile time) ImageQuant quantization support in :py:func:`PIL.Image.Image.quantize`. Run-time version number is available. diff --git a/src/PIL/features.py b/src/PIL/features.py index 7f6cdb161..60590dc09 100644 --- a/src/PIL/features.py +++ b/src/PIL/features.py @@ -120,7 +120,6 @@ def get_supported_codecs() -> list[str]: features = { "webp_anim": ("PIL._webp", "HAVE_WEBPANIM", None), - "transp_webp": ("PIL._webp", "HAVE_TRANSPARENCY", None), "raqm": ("PIL._imagingft", "HAVE_RAQM", "raqm_version"), "fribidi": ("PIL._imagingft", "HAVE_FRIBIDI", "fribidi_version"), "harfbuzz": ("PIL._imagingft", "HAVE_HARFBUZZ", "harfbuzz_version"), @@ -270,7 +269,6 @@ def pilinfo(out: IO[str] | None = None, supported_formats: bool = True) -> None: ("freetype2", "FREETYPE2"), ("littlecms2", "LITTLECMS2"), ("webp", "WEBP"), - ("transp_webp", "WEBP Transparency"), ("webp_anim", "WEBP Animation"), ("jpg", "JPEG"), ("jpg_2000", "OPENJPEG (JPEG2000)"), diff --git a/src/_webp.c b/src/_webp.c index ab229058b..a10eb111c 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -896,20 +896,6 @@ WebPDecoderVersion_str(void) { return version; } -/* - * The version of webp that ships with (0.1.3) Ubuntu 12.04 doesn't handle alpha well. - * Files that are valid with 0.3 are reported as being invalid. - */ -int -WebPDecoderBuggyAlpha(void) { - return WebPGetDecoderVersion() == 0x0103; -} - -PyObject * -WebPDecoderBuggyAlpha_wrapper() { - return Py_BuildValue("i", WebPDecoderBuggyAlpha()); -} - /* -------------------------------------------------------------------- */ /* Module Setup */ /* -------------------------------------------------------------------- */ @@ -922,10 +908,6 @@ static PyMethodDef webpMethods[] = { {"WebPEncode", WebPEncode_wrapper, METH_VARARGS, "WebPEncode"}, {"WebPDecode", WebPDecode_wrapper, METH_VARARGS, "WebPDecode"}, {"WebPDecoderVersion", WebPDecoderVersion_wrapper, METH_NOARGS, "WebPVersion"}, - {"WebPDecoderBuggyAlpha", - WebPDecoderBuggyAlpha_wrapper, - METH_NOARGS, - "WebPDecoderBuggyAlpha"}, {NULL, NULL} }; @@ -941,14 +923,6 @@ addAnimFlagToModule(PyObject *m) { PyModule_AddObject(m, "HAVE_WEBPANIM", have_webpanim); } -void -addTransparencyFlagToModule(PyObject *m) { - PyObject *have_transparency = PyBool_FromLong(!WebPDecoderBuggyAlpha()); - if (PyModule_AddObject(m, "HAVE_TRANSPARENCY", have_transparency)) { - Py_DECREF(have_transparency); - } -} - static int setup_module(PyObject *m) { #ifdef HAVE_WEBPANIM @@ -960,7 +934,6 @@ setup_module(PyObject *m) { #endif PyObject *d = PyModule_GetDict(m); addAnimFlagToModule(m); - addTransparencyFlagToModule(m); PyObject *v = PyUnicode_FromString(WebPDecoderVersion_str()); PyDict_SetItemString(d, "webpdecoder_version", v ? v : Py_None); From a3468996c0b7b6df2b685ff21c4f515f5105ff8c Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Sun, 7 Jul 2024 22:47:06 +0400 Subject: [PATCH 243/662] Remove webp animations flags and conditions Removed: _webp.WebPDecode _webp.HAVE_WEBPANIM features.webp_anim --- Tests/check_wheel.py | 1 - Tests/test_features.py | 10 -- Tests/test_file_gif.py | 2 +- Tests/test_file_webp.py | 24 ++--- Tests/test_file_webp_alpha.py | 7 +- Tests/test_file_webp_animated.py | 5 +- Tests/test_file_webp_lossless.py | 3 - Tests/test_file_webp_metadata.py | 3 +- Tests/test_image.py | 1 - Tests/test_imagefile.py | 1 - Tests/test_imageops.py | 2 +- docs/handbook/image-file-formats.rst | 9 +- docs/reference/features.rst | 1 - setup.py | 7 +- src/PIL/WebPImagePlugin.py | 47 +++------ src/PIL/features.py | 2 - src/_webp.c | 150 +-------------------------- 17 files changed, 34 insertions(+), 241 deletions(-) diff --git a/Tests/check_wheel.py b/Tests/check_wheel.py index f862e4fff..8fcb75dad 100644 --- a/Tests/check_wheel.py +++ b/Tests/check_wheel.py @@ -27,7 +27,6 @@ def test_wheel_codecs() -> None: def test_wheel_features() -> None: expected_features = { - "webp_anim", "raqm", "fribidi", "harfbuzz", diff --git a/Tests/test_features.py b/Tests/test_features.py index 577e7a5d5..40466082f 100644 --- a/Tests/test_features.py +++ b/Tests/test_features.py @@ -10,11 +10,6 @@ from PIL import features from .helper import skip_unless_feature -try: - from PIL import _webp -except ImportError: - pass - def test_check() -> None: # Check the correctness of the convenience function @@ -51,11 +46,6 @@ def test_version() -> None: test(feature, features.version_feature) -@skip_unless_feature("webp") -def test_webp_anim() -> None: - assert features.check("webp_anim") == _webp.HAVE_WEBPANIM - - @skip_unless_feature("libjpeg_turbo") def test_libjpeg_turbo_version() -> None: version = features.version("libjpeg_turbo") diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py index 85b017d29..8cefdb628 100644 --- a/Tests/test_file_gif.py +++ b/Tests/test_file_gif.py @@ -978,7 +978,7 @@ def test_webp_background(tmp_path: Path) -> None: out = str(tmp_path / "temp.gif") # Test opaque WebP background - if features.check("webp") and features.check("webp_anim"): + if features.check("webp"): with Image.open("Tests/images/hopper.webp") as im: assert im.info["background"] == (255, 255, 255, 255) im.save(out) diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index f132d0a64..6e9eea4ae 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -48,7 +48,6 @@ class TestFileWebp: self.rgb_mode = "RGB" def test_version(self) -> None: - _webp.WebPDecoderVersion() version = features.version_module("webp") assert version is not None assert re.search(r"\d+\.\d+\.\d+$", version) @@ -116,7 +115,6 @@ class TestFileWebp: hopper().save(buffer_method, format="WEBP", method=6) assert buffer_no_args.getbuffer() != buffer_method.getbuffer() - @skip_unless_feature("webp_anim") def test_save_all(self, tmp_path: Path) -> None: temp_file = str(tmp_path / "temp.webp") im = Image.new("RGB", (1, 1)) @@ -131,10 +129,9 @@ class TestFileWebp: def test_icc_profile(self, tmp_path: Path) -> None: self._roundtrip(tmp_path, self.rgb_mode, 12.5, {"icc_profile": None}) - if _webp.HAVE_WEBPANIM: - self._roundtrip( - tmp_path, self.rgb_mode, 12.5, {"icc_profile": None, "save_all": True} - ) + self._roundtrip( + tmp_path, self.rgb_mode, 12.5, {"icc_profile": None, "save_all": True} + ) def test_write_unsupported_mode_L(self, tmp_path: Path) -> None: """ @@ -164,10 +161,8 @@ class TestFileWebp: """ Calling encoder functions with no arguments should result in an error. """ - - if _webp.HAVE_WEBPANIM: - with pytest.raises(TypeError): - _webp.WebPAnimEncoder() + with pytest.raises(TypeError): + _webp.WebPAnimEncoder() with pytest.raises(TypeError): _webp.WebPEncode() @@ -175,12 +170,8 @@ class TestFileWebp: """ Calling decoder functions with no arguments should result in an error. """ - - if _webp.HAVE_WEBPANIM: - with pytest.raises(TypeError): - _webp.WebPAnimDecoder() with pytest.raises(TypeError): - _webp.WebPDecode() + _webp.WebPAnimDecoder() def test_no_resource_warning(self, tmp_path: Path) -> None: file_path = "Tests/images/hopper.webp" @@ -199,7 +190,6 @@ class TestFileWebp: "background", (0, (0,), (-1, 0, 1, 2), (253, 254, 255, 256)), ) - @skip_unless_feature("webp_anim") def test_invalid_background( self, background: int | tuple[int, ...], tmp_path: Path ) -> None: @@ -208,7 +198,6 @@ class TestFileWebp: with pytest.raises(OSError): im.save(temp_file, save_all=True, append_images=[im], background=background) - @skip_unless_feature("webp_anim") def test_background_from_gif(self, tmp_path: Path) -> None: # Save L mode GIF with background with Image.open("Tests/images/no_palette_with_background.gif") as im: @@ -233,7 +222,6 @@ class TestFileWebp: difference = sum(abs(original_value[i] - reread_value[i]) for i in range(0, 3)) assert difference < 5 - @skip_unless_feature("webp_anim") def test_duration(self, tmp_path: Path) -> None: with Image.open("Tests/images/dispose_bgnd.gif") as im: assert im.info["duration"] == 1000 diff --git a/Tests/test_file_webp_alpha.py b/Tests/test_file_webp_alpha.py index e80ef7d4f..53cdfff03 100644 --- a/Tests/test_file_webp_alpha.py +++ b/Tests/test_file_webp_alpha.py @@ -85,12 +85,7 @@ def test_write_rgba(tmp_path: Path) -> None: image.load() image.getdata() - # Early versions of WebP are known to produce higher deviations: - # deal with it - if _webp.WebPDecoderVersion() <= 0x201: - assert_image_similar(image, pil_image, 3.0) - else: - assert_image_similar(image, pil_image, 1.0) + assert_image_similar(image, pil_image, 1.0) def test_keep_rgb_values_when_transparent(tmp_path: Path) -> None: diff --git a/Tests/test_file_webp_animated.py b/Tests/test_file_webp_animated.py index e0d7999e3..967a0aae8 100644 --- a/Tests/test_file_webp_animated.py +++ b/Tests/test_file_webp_animated.py @@ -15,10 +15,7 @@ from .helper import ( skip_unless_feature, ) -pytestmark = [ - skip_unless_feature("webp"), - skip_unless_feature("webp_anim"), -] +pytestmark = skip_unless_feature("webp") def test_n_frames() -> None: diff --git a/Tests/test_file_webp_lossless.py b/Tests/test_file_webp_lossless.py index 32e29de56..dc98ad3f0 100644 --- a/Tests/test_file_webp_lossless.py +++ b/Tests/test_file_webp_lossless.py @@ -13,9 +13,6 @@ RGB_MODE = "RGB" def test_write_lossless_rgb(tmp_path: Path) -> None: - if _webp.WebPDecoderVersion() < 0x0200: - pytest.skip("lossless not included") - temp_file = str(tmp_path / "temp.webp") hopper(RGB_MODE).save(temp_file, lossless=True) diff --git a/Tests/test_file_webp_metadata.py b/Tests/test_file_webp_metadata.py index 52a84a83e..4ef3d95f2 100644 --- a/Tests/test_file_webp_metadata.py +++ b/Tests/test_file_webp_metadata.py @@ -10,7 +10,7 @@ from PIL import Image from .helper import mark_if_feature_version, skip_unless_feature -pytestmark = [skip_unless_feature("webp")] +pytestmark = skip_unless_feature("webp") ElementTree: ModuleType | None try: @@ -133,7 +133,6 @@ def test_getxmp() -> None: ) -@skip_unless_feature("webp_anim") def test_write_animated_metadata(tmp_path: Path) -> None: iccp_data = b"" exif_data = b"" diff --git a/Tests/test_image.py b/Tests/test_image.py index d8372789b..719732d12 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -817,7 +817,6 @@ class TestImage: assert reloaded_exif[305] == "Pillow test" @skip_unless_feature("webp") - @skip_unless_feature("webp_anim") def test_exif_webp(self, tmp_path: Path) -> None: with Image.open("Tests/images/hopper.webp") as im: exif = im.getexif() diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index 44a6e6a42..fe7d44785 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -94,7 +94,6 @@ class TestImageFile: assert (48, 48) == p.image.size @skip_unless_feature("webp") - @skip_unless_feature("webp_anim") def test_incremental_webp(self) -> None: with ImageFile.Parser() as p: with open("Tests/images/hopper.webp", "rb") as f: diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py index e33e6d4c8..2fb2a60b6 100644 --- a/Tests/test_imageops.py +++ b/Tests/test_imageops.py @@ -390,7 +390,7 @@ def test_colorize_3color_offset() -> None: def test_exif_transpose() -> None: exts = [".jpg"] - if features.check("webp") and features.check("webp_anim"): + if features.check("webp"): exts.append(".webp") for ext in exts: with Image.open("Tests/images/hopper" + ext) as base_im: diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst index 8561cc4aa..49a17bb5c 100644 --- a/docs/handbook/image-file-formats.rst +++ b/docs/handbook/image-file-formats.rst @@ -1220,8 +1220,7 @@ using the general tags available through tiffinfo. WebP ^^^^ -Pillow reads and writes WebP files. The specifics of Pillow's capabilities with -this format are currently undocumented. +Pillow reads and writes WebP files. Requires libwebp v0.5.0 or later. .. _webp-saving: @@ -1263,12 +1262,6 @@ The :py:meth:`~PIL.Image.Image.save` method supports the following options: Saving sequences ~~~~~~~~~~~~~~~~ -.. note:: - - Support for animated WebP files will only be enabled if the system WebP - library is v0.5.0 or later. You can check webp animation support at - runtime by calling ``features.check("webp_anim")``. - When calling :py:meth:`~PIL.Image.Image.save` to write a WebP file, by default only the first frame of a multiframe image will be saved. If the ``save_all`` argument is present and true, then all frames will be saved, and the following diff --git a/docs/reference/features.rst b/docs/reference/features.rst index d4fb340bd..26c8ab8cd 100644 --- a/docs/reference/features.rst +++ b/docs/reference/features.rst @@ -54,7 +54,6 @@ Feature version numbers are available only where stated. Support for the following features can be checked: * ``libjpeg_turbo``: (compile time) Whether Pillow was compiled against the libjpeg-turbo version of libjpeg. Compile-time version number is available. -* ``webp_anim``: (compile time) Support for animated WebP images. * ``raqm``: Raqm library, required for ``ImageFont.Layout.RAQM`` in :py:func:`PIL.ImageFont.truetype`. Run-time version number is available for Raqm 0.7.0 or newer. * ``libimagequant``: (compile time) ImageQuant quantization support in :py:func:`PIL.Image.Image.quantize`. Run-time version number is available. * ``xcb``: (compile time) Support for X11 in :py:func:`PIL.ImageGrab.grab` via the XCB library. diff --git a/setup.py b/setup.py index 8d0dfb6fa..edfa9ee28 100644 --- a/setup.py +++ b/setup.py @@ -795,7 +795,12 @@ class pil_build_ext(build_ext): _dbg("Looking for webp") if all( _find_include_file(self, src) - for src in ["webp/encode.h", "webp/mux.h", "webp/demux.h"] + for src in [ + "webp/encode.h", + "webp/decode.h", + "webp/mux.h", + "webp/demux.h", + ] ): # In Google's precompiled zip it is call "libwebp": if all( diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index cec796340..fc8f4fc2e 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -45,22 +45,6 @@ class WebPImageFile(ImageFile.ImageFile): __logical_frame = 0 def _open(self) -> None: - if not _webp.HAVE_WEBPANIM: - # Legacy mode - data, width, height, self._mode, icc_profile, exif = _webp.WebPDecode( - self.fp.read() - ) - if icc_profile: - self.info["icc_profile"] = icc_profile - if exif: - self.info["exif"] = exif - self._size = width, height - self.fp = BytesIO(data) - self.tile = [("raw", (0, 0) + self.size, 0, self.mode)] - self.n_frames = 1 - self.is_animated = False - return - # Use the newer AnimDecoder API to parse the (possibly) animated file, # and access muxed chunks like ICC/EXIF/XMP. self._decoder = _webp.WebPAnimDecoder(self.fp.read()) @@ -145,21 +129,20 @@ class WebPImageFile(ImageFile.ImageFile): self._get_next() # Advance to the requested frame def load(self) -> Image.core.PixelAccess | None: - if _webp.HAVE_WEBPANIM: - if self.__loaded != self.__logical_frame: - self._seek(self.__logical_frame) + if self.__loaded != self.__logical_frame: + self._seek(self.__logical_frame) - # We need to load the image data for this frame - data, timestamp, duration = self._get_next() - self.info["timestamp"] = timestamp - self.info["duration"] = duration - self.__loaded = self.__logical_frame + # We need to load the image data for this frame + data, timestamp, duration = self._get_next() + self.info["timestamp"] = timestamp + self.info["duration"] = duration + self.__loaded = self.__logical_frame - # Set tile - if self.fp and self._exclusive_fp: - self.fp.close() - self.fp = BytesIO(data) - self.tile = [("raw", (0, 0) + self.size, 0, self.rawmode)] + # Set tile + if self.fp and self._exclusive_fp: + self.fp.close() + self.fp = BytesIO(data) + self.tile = [("raw", (0, 0) + self.size, 0, self.rawmode)] return super().load() @@ -167,9 +150,6 @@ class WebPImageFile(ImageFile.ImageFile): pass def tell(self) -> int: - if not _webp.HAVE_WEBPANIM: - return super().tell() - return self.__logical_frame @@ -357,7 +337,6 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: Image.register_open(WebPImageFile.format, WebPImageFile, _accept) if SUPPORTED: Image.register_save(WebPImageFile.format, _save) - if _webp.HAVE_WEBPANIM: - Image.register_save_all(WebPImageFile.format, _save_all) + Image.register_save_all(WebPImageFile.format, _save_all) Image.register_extension(WebPImageFile.format, ".webp") Image.register_mime(WebPImageFile.format, "image/webp") diff --git a/src/PIL/features.py b/src/PIL/features.py index 60590dc09..bbf7c641b 100644 --- a/src/PIL/features.py +++ b/src/PIL/features.py @@ -119,7 +119,6 @@ def get_supported_codecs() -> list[str]: features = { - "webp_anim": ("PIL._webp", "HAVE_WEBPANIM", None), "raqm": ("PIL._imagingft", "HAVE_RAQM", "raqm_version"), "fribidi": ("PIL._imagingft", "HAVE_FRIBIDI", "fribidi_version"), "harfbuzz": ("PIL._imagingft", "HAVE_HARFBUZZ", "harfbuzz_version"), @@ -269,7 +268,6 @@ def pilinfo(out: IO[str] | None = None, supported_formats: bool = True) -> None: ("freetype2", "FREETYPE2"), ("littlecms2", "LITTLECMS2"), ("webp", "WEBP"), - ("webp_anim", "WEBP Animation"), ("jpg", "JPEG"), ("jpg_2000", "OPENJPEG (JPEG2000)"), ("zlib", "ZLIB (PNG/ZIP)"), diff --git a/src/_webp.c b/src/_webp.c index a10eb111c..8302925b0 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -13,8 +13,8 @@ * very early versions had some significant differences, so we require later * versions, before enabling animation support. */ -#if WEBP_MUX_ABI_VERSION >= 0x0104 && WEBP_DEMUX_ABI_VERSION >= 0x0105 -#define HAVE_WEBPANIM +#if WEBP_MUX_ABI_VERSION < 0x0106 || WEBP_DEMUX_ABI_VERSION < 0x0107 +#error libwebp 0.5.0 and above is required. Upgrade libwebp or build with --disable-webp flag #endif void @@ -87,8 +87,6 @@ HandleMuxError(WebPMuxError err, char *chunk) { /* WebP Animation Support */ /* -------------------------------------------------------------------- */ -#ifdef HAVE_WEBPANIM - // Encoder type typedef struct { PyObject_HEAD WebPAnimEncoder *enc; @@ -568,8 +566,6 @@ static PyTypeObject WebPAnimDecoder_Type = { 0, /*tp_getset*/ }; -#endif - /* -------------------------------------------------------------------- */ /* Legacy WebP Support */ /* -------------------------------------------------------------------- */ @@ -644,10 +640,7 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) { config.quality = quality_factor; config.alpha_quality = alpha_quality_factor; config.method = method; -#if WEBP_ENCODER_ABI_VERSION >= 0x0209 - // the "exact" flag is only available in libwebp 0.5.0 and later config.exact = exact; -#endif // Validate the config if (!WebPValidateConfig(&config)) { @@ -763,124 +756,6 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) { Py_RETURN_NONE; } -PyObject * -WebPDecode_wrapper(PyObject *self, PyObject *args) { - PyBytesObject *webp_string; - const uint8_t *webp; - Py_ssize_t size; - PyObject *ret = Py_None, *bytes = NULL, *pymode = NULL, *icc_profile = NULL, - *exif = NULL; - WebPDecoderConfig config; - VP8StatusCode vp8_status_code = VP8_STATUS_OK; - char *mode = "RGB"; - - if (!PyArg_ParseTuple(args, "S", &webp_string)) { - return NULL; - } - - if (!WebPInitDecoderConfig(&config)) { - Py_RETURN_NONE; - } - - PyBytes_AsStringAndSize((PyObject *)webp_string, (char **)&webp, &size); - - vp8_status_code = WebPGetFeatures(webp, size, &config.input); - if (vp8_status_code == VP8_STATUS_OK) { - // If we don't set it, we don't get alpha. - // Initialized to MODE_RGB - if (config.input.has_alpha) { - config.output.colorspace = MODE_RGBA; - mode = "RGBA"; - } - - { - int copy_data = 0; - WebPData data = {webp, size}; - WebPMuxFrameInfo image; - WebPData icc_profile_data = {0}; - WebPData exif_data = {0}; - - WebPMux *mux = WebPMuxCreate(&data, copy_data); - if (NULL == mux) { - goto end; - } - - if (WEBP_MUX_OK != WebPMuxGetFrame(mux, 1, &image)) { - WebPMuxDelete(mux); - goto end; - } - - webp = image.bitstream.bytes; - size = image.bitstream.size; - - vp8_status_code = WebPDecode(webp, size, &config); - - if (WEBP_MUX_OK == WebPMuxGetChunk(mux, "ICCP", &icc_profile_data)) { - icc_profile = PyBytes_FromStringAndSize( - (const char *)icc_profile_data.bytes, icc_profile_data.size - ); - } - - if (WEBP_MUX_OK == WebPMuxGetChunk(mux, "EXIF", &exif_data)) { - exif = PyBytes_FromStringAndSize( - (const char *)exif_data.bytes, exif_data.size - ); - } - - WebPDataClear(&image.bitstream); - WebPMuxDelete(mux); - } - } - - if (vp8_status_code != VP8_STATUS_OK) { - goto end; - } - - if (config.output.colorspace < MODE_YUV) { - bytes = PyBytes_FromStringAndSize( - (char *)config.output.u.RGBA.rgba, config.output.u.RGBA.size - ); - } else { - // Skipping YUV for now. Need Test Images. - // UNDONE -- unclear if we'll ever get here if we set mode_rgb* - bytes = PyBytes_FromStringAndSize( - (char *)config.output.u.YUVA.y, config.output.u.YUVA.y_size - ); - } - - pymode = PyUnicode_FromString(mode); - ret = Py_BuildValue( - "SiiSSS", - bytes, - config.output.width, - config.output.height, - pymode, - NULL == icc_profile ? Py_None : icc_profile, - NULL == exif ? Py_None : exif - ); - -end: - WebPFreeDecBuffer(&config.output); - - Py_XDECREF(bytes); - Py_XDECREF(pymode); - Py_XDECREF(icc_profile); - Py_XDECREF(exif); - - if (Py_None == ret) { - Py_RETURN_NONE; - } - - return ret; -} - -// Return the decoder's version number, packed in hexadecimal using 8bits for -// each of major/minor/revision. E.g: v2.5.7 is 0x020507. -PyObject * -WebPDecoderVersion_wrapper() { - return Py_BuildValue("i", WebPGetDecoderVersion()); -} - // Version as string const char * WebPDecoderVersion_str(void) { @@ -901,39 +776,20 @@ WebPDecoderVersion_str(void) { /* -------------------------------------------------------------------- */ static PyMethodDef webpMethods[] = { -#ifdef HAVE_WEBPANIM {"WebPAnimDecoder", _anim_decoder_new, METH_VARARGS, "WebPAnimDecoder"}, {"WebPAnimEncoder", _anim_encoder_new, METH_VARARGS, "WebPAnimEncoder"}, -#endif {"WebPEncode", WebPEncode_wrapper, METH_VARARGS, "WebPEncode"}, - {"WebPDecode", WebPDecode_wrapper, METH_VARARGS, "WebPDecode"}, - {"WebPDecoderVersion", WebPDecoderVersion_wrapper, METH_NOARGS, "WebPVersion"}, {NULL, NULL} }; -void -addAnimFlagToModule(PyObject *m) { - PyObject *have_webpanim; -#ifdef HAVE_WEBPANIM - have_webpanim = Py_True; -#else - have_webpanim = Py_False; -#endif - Py_INCREF(have_webpanim); - PyModule_AddObject(m, "HAVE_WEBPANIM", have_webpanim); -} - static int setup_module(PyObject *m) { -#ifdef HAVE_WEBPANIM + PyObject *d = PyModule_GetDict(m); /* Ready object types */ if (PyType_Ready(&WebPAnimDecoder_Type) < 0 || PyType_Ready(&WebPAnimEncoder_Type) < 0) { return -1; } -#endif - PyObject *d = PyModule_GetDict(m); - addAnimFlagToModule(m); PyObject *v = PyUnicode_FromString(WebPDecoderVersion_str()); PyDict_SetItemString(d, "webpdecoder_version", v ? v : Py_None); From 56ca359c657ee2f4e81426f780c4b4e2e281e404 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 8 Jul 2024 20:07:43 +0400 Subject: [PATCH 244/662] Bring back removed features, add deprecations and Release notes --- Tests/check_wheel.py | 3 +++ Tests/test_features.py | 12 ++++++++++++ docs/reference/features.rst | 3 +++ docs/releasenotes/11.0.0.rst | 8 ++++++++ src/PIL/features.py | 10 +++++++++- 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Tests/check_wheel.py b/Tests/check_wheel.py index 8fcb75dad..4b91984f5 100644 --- a/Tests/check_wheel.py +++ b/Tests/check_wheel.py @@ -27,6 +27,9 @@ def test_wheel_codecs() -> None: def test_wheel_features() -> None: expected_features = { + "webp_anim", + "webp_mux", + "transp_webp", "raqm", "fribidi", "harfbuzz", diff --git a/Tests/test_features.py b/Tests/test_features.py index 40466082f..cb8fd8688 100644 --- a/Tests/test_features.py +++ b/Tests/test_features.py @@ -46,6 +46,18 @@ def test_version() -> None: test(feature, features.version_feature) +def test_webp_transparency() -> None: + assert features.check("transp_webp") == features.check_module("webp") + + +def test_webp_mux() -> None: + assert features.check("webp_mux") == features.check_module("webp") + + +def test_webp_anim() -> None: + assert features.check("webp_anim") == features.check_module("webp") + + @skip_unless_feature("libjpeg_turbo") def test_libjpeg_turbo_version() -> None: version = features.version("libjpeg_turbo") diff --git a/docs/reference/features.rst b/docs/reference/features.rst index 26c8ab8cd..fcff96735 100644 --- a/docs/reference/features.rst +++ b/docs/reference/features.rst @@ -57,6 +57,9 @@ Support for the following features can be checked: * ``raqm``: Raqm library, required for ``ImageFont.Layout.RAQM`` in :py:func:`PIL.ImageFont.truetype`. Run-time version number is available for Raqm 0.7.0 or newer. * ``libimagequant``: (compile time) ImageQuant quantization support in :py:func:`PIL.Image.Image.quantize`. Run-time version number is available. * ``xcb``: (compile time) Support for X11 in :py:func:`PIL.ImageGrab.grab` via the XCB library. +* ``transp_webp``: Deprecated. Always ``True`` if WebP module is installed. +* ``webp_mux``: Deprecated. Always ``True`` if WebP module is installed. +* ``webp_anim``: Deprecated. Always ``True`` if WebP module is installed. .. autofunction:: PIL.features.check_feature .. autofunction:: PIL.features.version_feature diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index 1d1afcde5..bb707a044 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -58,6 +58,14 @@ JpegImageFile.huffman_ac and JpegImageFile.huffman_dc The ``huffman_ac`` and ``huffman_dc`` dictionaries on JPEG images were unused. They have been deprecated, and will be removed in Pillow 12 (2025-10-15). +Specific WebP Feature Checks +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The following features ``features.check("transp_webp")``, +``features.check("webp_mux")``, and ``features.check("webp_anim")`` are now +always ``True`` if the WebP module is installed and should not be used. +These checks will be removed in Pillow 12.0.0 (2025-10-15). + API Changes =========== diff --git a/src/PIL/features.py b/src/PIL/features.py index bbf7c641b..f594a2cdc 100644 --- a/src/PIL/features.py +++ b/src/PIL/features.py @@ -7,6 +7,7 @@ import warnings from typing import IO import PIL +from PIL import _deprecate from . import Image @@ -119,6 +120,9 @@ def get_supported_codecs() -> list[str]: features = { + "webp_anim": ("PIL._webp", True, None), + "webp_mux": ("PIL._webp", True, None), + "transp_webp": ("PIL._webp", True, None), "raqm": ("PIL._imagingft", "HAVE_RAQM", "raqm_version"), "fribidi": ("PIL._imagingft", "HAVE_FRIBIDI", "fribidi_version"), "harfbuzz": ("PIL._imagingft", "HAVE_HARFBUZZ", "harfbuzz_version"), @@ -144,7 +148,11 @@ def check_feature(feature: str) -> bool | None: try: imported_module = __import__(module, fromlist=["PIL"]) - return getattr(imported_module, flag) + if isinstance(flag, str): + return getattr(imported_module, flag) + else: + _deprecate.deprecate(f'check_feature("{feature}")', 12) + return flag except ModuleNotFoundError: return None except ImportError as ex: From 6180abc75c3dfa950276b2586cd1a8aab1bede70 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 8 Jul 2024 20:32:35 +0400 Subject: [PATCH 245/662] Remove WebP versions notes from docs --- docs/handbook/image-file-formats.rst | 1 - docs/installation/building-from-source.rst | 4 ---- 2 files changed, 5 deletions(-) diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst index 49a17bb5c..861e09a43 100644 --- a/docs/handbook/image-file-formats.rst +++ b/docs/handbook/image-file-formats.rst @@ -1248,7 +1248,6 @@ The :py:meth:`~PIL.Image.Image.save` method supports the following options: **exact** If true, preserve the transparent RGB values. Otherwise, discard invisible RGB values for better compression. Defaults to false. - Requires libwebp 0.5.0 or later. **icc_profile** The ICC Profile to include in the saved file. diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst index f47edbc5b..71787311f 100644 --- a/docs/installation/building-from-source.rst +++ b/docs/installation/building-from-source.rst @@ -55,10 +55,6 @@ Many of Pillow's features require external libraries: * **libwebp** provides the WebP format. - * Pillow has been tested with version **0.1.3**, which does not read - transparent WebP files. Versions **0.3.0** and above support - transparency. - * **openjpeg** provides JPEG 2000 functionality. * Pillow has been tested with openjpeg **2.0.0**, **2.1.0**, **2.3.1**, From 924df9e60b39c6ced91553895497fa43db2d232d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 13 Aug 2024 06:46:46 +1000 Subject: [PATCH 246/662] Moved line after early return Improve compiler advice Update src/PIL/features.py --- src/PIL/features.py | 5 ++--- src/_webp.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/PIL/features.py b/src/PIL/features.py index f594a2cdc..a5487042e 100644 --- a/src/PIL/features.py +++ b/src/PIL/features.py @@ -148,11 +148,10 @@ def check_feature(feature: str) -> bool | None: try: imported_module = __import__(module, fromlist=["PIL"]) - if isinstance(flag, str): - return getattr(imported_module, flag) - else: + if isinstance(flag, bool): _deprecate.deprecate(f'check_feature("{feature}")', 12) return flag + return getattr(imported_module, flag) except ModuleNotFoundError: return None except ImportError as ex: diff --git a/src/_webp.c b/src/_webp.c index 8302925b0..306a290bd 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -14,7 +14,7 @@ * versions, before enabling animation support. */ #if WEBP_MUX_ABI_VERSION < 0x0106 || WEBP_DEMUX_ABI_VERSION < 0x0107 -#error libwebp 0.5.0 and above is required. Upgrade libwebp or build with --disable-webp flag +#error libwebp 0.5.0 and above is required. Upgrade libwebp or build Pillow with --disable-webp flag #endif void @@ -784,13 +784,13 @@ static PyMethodDef webpMethods[] = { static int setup_module(PyObject *m) { - PyObject *d = PyModule_GetDict(m); /* Ready object types */ if (PyType_Ready(&WebPAnimDecoder_Type) < 0 || PyType_Ready(&WebPAnimEncoder_Type) < 0) { return -1; } + PyObject *d = PyModule_GetDict(m); PyObject *v = PyUnicode_FromString(WebPDecoderVersion_str()); PyDict_SetItemString(d, "webpdecoder_version", v ? v : Py_None); Py_XDECREF(v); From 93ce9ce0048639706eecd523fc54c7d6cfc15bef Mon Sep 17 00:00:00 2001 From: Alexander Karpinsky Date: Tue, 13 Aug 2024 09:52:07 +0400 Subject: [PATCH 247/662] Update features type Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- src/PIL/features.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/features.py b/src/PIL/features.py index a5487042e..9421dbd3c 100644 --- a/src/PIL/features.py +++ b/src/PIL/features.py @@ -119,7 +119,7 @@ def get_supported_codecs() -> list[str]: return [f for f in codecs if check_codec(f)] -features = { +features: dict[str, tuple[str, str | bool, str | None]] = { "webp_anim": ("PIL._webp", True, None), "webp_mux": ("PIL._webp", True, None), "transp_webp": ("PIL._webp", True, None), From 55469948282fe2dd763dcb8e66a767b5c63adb54 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 13 Aug 2024 19:03:14 +1000 Subject: [PATCH 248/662] Removed unnecessary variable --- Tests/test_file_webp_alpha.py | 2 +- Tests/test_file_webp_lossless.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/test_file_webp_alpha.py b/Tests/test_file_webp_alpha.py index 53cdfff03..c88fe3589 100644 --- a/Tests/test_file_webp_alpha.py +++ b/Tests/test_file_webp_alpha.py @@ -13,7 +13,7 @@ from .helper import ( hopper, ) -_webp = pytest.importorskip("PIL._webp", reason="WebP support not installed") +pytest.importorskip("PIL._webp", reason="WebP support not installed") def test_read_rgba() -> None: diff --git a/Tests/test_file_webp_lossless.py b/Tests/test_file_webp_lossless.py index dc98ad3f0..80429715e 100644 --- a/Tests/test_file_webp_lossless.py +++ b/Tests/test_file_webp_lossless.py @@ -8,7 +8,7 @@ from PIL import Image from .helper import assert_image_equal, hopper -_webp = pytest.importorskip("PIL._webp", reason="WebP support not installed") +pytest.importorskip("PIL._webp", reason="WebP support not installed") RGB_MODE = "RGB" From f3aec6dd383bb27676e7e02a7749a5bff1cc30c2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 13 Aug 2024 19:05:32 +1000 Subject: [PATCH 249/662] Simplified code --- setup.py | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/setup.py b/setup.py index edfa9ee28..863d102cf 100644 --- a/setup.py +++ b/setup.py @@ -794,25 +794,17 @@ class pil_build_ext(build_ext): if feature.want("webp"): _dbg("Looking for webp") if all( - _find_include_file(self, src) - for src in [ - "webp/encode.h", - "webp/decode.h", - "webp/mux.h", - "webp/demux.h", - ] + _find_include_file(self, "webp/" + include) + for include in ("encode.h", "decode.h", "mux.h", "demux.h") ): - # In Google's precompiled zip it is call "libwebp": - if all( - _find_library_file(self, lib) - for lib in ["webp", "webpmux", "webpdemux"] - ): - feature.webp = "webp" - elif all( - _find_library_file(self, lib) - for lib in ["libwebp", "libwebpmux", "libwebpdemux"] - ): - feature.webp = "libwebp" + # In Google's precompiled zip it is called "libwebp" + for prefix in ("", "lib"): + if all( + _find_library_file(self, prefix + library) + for library in ("webp", "webpmux", "webpdemux") + ): + feature.webp = prefix + "webp" + break if feature.want("xcb"): _dbg("Looking for xcb") @@ -901,12 +893,8 @@ class pil_build_ext(build_ext): self._remove_extension("PIL._imagingcms") if feature.webp: - libs = [ - feature.webp, - feature.webp + "mux", - feature.webp + "demux", - ] - self._update_extension("PIL._webp", libs, []) + libs = [feature.webp, feature.webp + "mux", feature.webp + "demux"] + self._update_extension("PIL._webp", libs) else: self._remove_extension("PIL._webp") From c7e6289b36d4eb1823b6bfcace27674826a58e43 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 13 Aug 2024 19:07:01 +1000 Subject: [PATCH 250/662] Use relative import --- src/PIL/features.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PIL/features.py b/src/PIL/features.py index 9421dbd3c..e505adae0 100644 --- a/src/PIL/features.py +++ b/src/PIL/features.py @@ -7,9 +7,9 @@ import warnings from typing import IO import PIL -from PIL import _deprecate from . import Image +from ._deprecate import deprecate modules = { "pil": ("PIL._imaging", "PILLOW_VERSION"), @@ -149,7 +149,7 @@ def check_feature(feature: str) -> bool | None: try: imported_module = __import__(module, fromlist=["PIL"]) if isinstance(flag, bool): - _deprecate.deprecate(f'check_feature("{feature}")', 12) + deprecate(f'check_feature("{feature}")', 12) return flag return getattr(imported_module, flag) except ModuleNotFoundError: From ba82dff7bc6c489f299a63d2f2d3722dfe11852e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 13 Aug 2024 19:10:54 +1000 Subject: [PATCH 251/662] Updated test name --- Tests/test_file_webp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index 6e9eea4ae..6ccd489bb 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -166,7 +166,7 @@ class TestFileWebp: with pytest.raises(TypeError): _webp.WebPEncode() - def test_WebPDecode_with_invalid_args(self) -> None: + def test_WebPAnimDecoder_with_invalid_args(self) -> None: """ Calling decoder functions with no arguments should result in an error. """ From 66319fcce764f4f09e53900b2896ec15457f691f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 13 Aug 2024 19:17:36 +1000 Subject: [PATCH 252/662] Animation support is no longer conditionally enabled --- src/_webp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_webp.c b/src/_webp.c index 306a290bd..d1943b3e0 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -11,7 +11,7 @@ * Check the versions from mux.h and demux.h, to ensure the WebPAnimEncoder and * WebPAnimDecoder APIs are present (initial support was added in 0.5.0). The * very early versions had some significant differences, so we require later - * versions, before enabling animation support. + * versions. */ #if WEBP_MUX_ABI_VERSION < 0x0106 || WEBP_DEMUX_ABI_VERSION < 0x0107 #error libwebp 0.5.0 and above is required. Upgrade libwebp or build Pillow with --disable-webp flag From 45552b5b4f6ea470639e5c7ff0d9efb96ad7db68 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 13 Aug 2024 19:24:34 +1000 Subject: [PATCH 253/662] Updated documentation --- docs/deprecations.rst | 10 ++++++++++ docs/releasenotes/11.0.0.rst | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index 058468cfe..a9498d5ed 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -126,6 +126,16 @@ JpegImageFile.huffman_ac and JpegImageFile.huffman_dc The ``huffman_ac`` and ``huffman_dc`` dictionaries on JPEG images were unused. They have been deprecated, and will be removed in Pillow 12 (2025-10-15). +Specific WebP Feature Checks +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 11.0.0 + +``features.check("transp_webp")``, ``features.check("webp_mux")`` and +``features.check("webp_anim")`` are now deprecated. They will always return +``True`` if the WebP module is installed, until they are removed in Pillow +12.0.0 (2025-10-15). + Removed features ---------------- diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index bb707a044..ac9237acf 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -61,10 +61,10 @@ have been deprecated, and will be removed in Pillow 12 (2025-10-15). Specific WebP Feature Checks ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The following features ``features.check("transp_webp")``, -``features.check("webp_mux")``, and ``features.check("webp_anim")`` are now -always ``True`` if the WebP module is installed and should not be used. -These checks will be removed in Pillow 12.0.0 (2025-10-15). +``features.check("transp_webp")``, ``features.check("webp_mux")`` and +``features.check("webp_anim")`` are now deprecated. They will always return +``True`` if the WebP module is installed, until they are removed in Pillow +12.0.0 (2025-10-15). API Changes =========== From 359d7592c7861729092434154d131310c7bf1d71 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 14 Aug 2024 18:41:39 +1000 Subject: [PATCH 254/662] Test deprecation warnings --- Tests/test_features.py | 21 ++++++++++++++++----- src/PIL/features.py | 12 +++++++++++- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/Tests/test_features.py b/Tests/test_features.py index cb8fd8688..807782847 100644 --- a/Tests/test_features.py +++ b/Tests/test_features.py @@ -18,7 +18,11 @@ def test_check() -> None: for codec in features.codecs: assert features.check_codec(codec) == features.check(codec) for feature in features.features: - assert features.check_feature(feature) == features.check(feature) + if "webp" in feature: + with pytest.warns(DeprecationWarning): + assert features.check_feature(feature) == features.check(feature) + else: + assert features.check_feature(feature) == features.check(feature) def test_version() -> None: @@ -43,19 +47,26 @@ def test_version() -> None: for codec in features.codecs: test(codec, features.version_codec) for feature in features.features: - test(feature, features.version_feature) + if "webp" in feature: + with pytest.warns(DeprecationWarning): + test(feature, features.version_feature) + else: + test(feature, features.version_feature) def test_webp_transparency() -> None: - assert features.check("transp_webp") == features.check_module("webp") + with pytest.warns(DeprecationWarning): + assert features.check("transp_webp") == features.check_module("webp") def test_webp_mux() -> None: - assert features.check("webp_mux") == features.check_module("webp") + with pytest.warns(DeprecationWarning): + assert features.check("webp_mux") == features.check_module("webp") def test_webp_anim() -> None: - assert features.check("webp_anim") == features.check_module("webp") + with pytest.warns(DeprecationWarning): + assert features.check("webp_anim") == features.check_module("webp") @skip_unless_feature("libjpeg_turbo") diff --git a/src/PIL/features.py b/src/PIL/features.py index e505adae0..24c5ee978 100644 --- a/src/PIL/features.py +++ b/src/PIL/features.py @@ -180,7 +180,17 @@ def get_supported_features() -> list[str]: """ :returns: A list of all supported features. """ - return [f for f in features if check_feature(f)] + supported_features = [] + for f, (module, flag, _) in features.items(): + if flag is True: + for feature, (feature_module, _) in modules.items(): + if feature_module == module: + if check_module(feature): + supported_features.append(f) + break + elif check_feature(f): + supported_features.append(f) + return supported_features def check(feature: str) -> bool | None: From 4cf5688cfd42caed6f25db2d5ea29271ea8c1c9f Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Tue, 2 Jul 2024 16:43:34 +0400 Subject: [PATCH 255/662] Optimize getbbox() and getextrema() --- src/libImaging/GetBBox.c | 62 +++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 20 deletions(-) diff --git a/src/libImaging/GetBBox.c b/src/libImaging/GetBBox.c index c61a27d3b..680d1cf77 100644 --- a/src/libImaging/GetBBox.c +++ b/src/libImaging/GetBBox.c @@ -30,26 +30,45 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) { bbox[1] = -1; bbox[2] = bbox[3] = 0; -#define GETBBOX(image, mask) \ - for (y = 0; y < im->ysize; y++) { \ - has_data = 0; \ - for (x = 0; x < im->xsize; x++) { \ - if (im->image[y][x] & mask) { \ - has_data = 1; \ - if (x < bbox[0]) { \ - bbox[0] = x; \ - } \ - if (x >= bbox[2]) { \ - bbox[2] = x + 1; \ - } \ - } \ - } \ - if (has_data) { \ - if (bbox[1] < 0) { \ - bbox[1] = y; \ - } \ - bbox[3] = y + 1; \ - } \ +#define GETBBOX(image, mask) \ + /* first stage: looking for any px from top */ \ + for (y = 0; y < im->ysize; y++) { \ + has_data = 0; \ + for (x = 0; x < im->xsize; x++) \ + if (im->image[y][x] & mask) { \ + has_data = 1; \ + bbox[0] = x; \ + bbox[1] = y; \ + break; \ + } \ + if (has_data) break; \ + } \ + /* Check that we got a box */ \ + if (bbox[1] < 0) \ + return 0; /* no data */ \ + /* second stage: looking for any px from bottom */ \ + for (y = im->ysize - 1; y >= bbox[1]; y--) { \ + has_data = 0; \ + for (x = 0; x < im->xsize; x++) \ + if (im->image[y][x] & mask) { \ + has_data = 1; \ + bbox[3] = y + 1; \ + break; \ + } \ + if (has_data) break; \ + } \ + /* third stage: looking for left and right boundaries */ \ + for (y = bbox[1]; y < bbox[3]; y++) { \ + for (x = 0; x < bbox[0]; x++) \ + if (im->image[y][x] & mask) { \ + bbox[0] = x; \ + break; \ + } \ + for (x = im->xsize - 1; x >= bbox[2]; x--) \ + if (im->image[y][x] & mask) { \ + bbox[2] = x + 1; \ + break; \ + } \ } if (im->image8) { @@ -144,6 +163,9 @@ ImagingGetExtrema(Imaging im, void *extrema) { imax = in[x]; } } + if (imin == 0 && imax == 255) { + break; + } } ((UINT8 *)extrema)[0] = (UINT8)imin; ((UINT8 *)extrema)[1] = (UINT8)imax; From 6a87df2c1fdd0dea1a3bdd5fb85e388e535e063b Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Tue, 2 Jul 2024 18:40:19 +0400 Subject: [PATCH 256/662] clang-format --- src/libImaging/GetBBox.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libImaging/GetBBox.c b/src/libImaging/GetBBox.c index 680d1cf77..46a678078 100644 --- a/src/libImaging/GetBBox.c +++ b/src/libImaging/GetBBox.c @@ -30,7 +30,7 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) { bbox[1] = -1; bbox[2] = bbox[3] = 0; -#define GETBBOX(image, mask) \ +#define GETBBOX(image, mask) \ /* first stage: looking for any px from top */ \ for (y = 0; y < im->ysize; y++) { \ has_data = 0; \ @@ -41,7 +41,8 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) { bbox[1] = y; \ break; \ } \ - if (has_data) break; \ + if (has_data) \ + break; \ } \ /* Check that we got a box */ \ if (bbox[1] < 0) \ @@ -55,7 +56,8 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) { bbox[3] = y + 1; \ break; \ } \ - if (has_data) break; \ + if (has_data) \ + break; \ } \ /* third stage: looking for left and right boundaries */ \ for (y = bbox[1]; y < bbox[3]; y++) { \ From 5fb44ab694bc5576c6cd7e7ee54dfce660f497af Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Tue, 2 Jul 2024 18:45:13 +0400 Subject: [PATCH 257/662] This check is useless, since moved after the first stage --- src/libImaging/GetBBox.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libImaging/GetBBox.c b/src/libImaging/GetBBox.c index 46a678078..2e8afc8d5 100644 --- a/src/libImaging/GetBBox.c +++ b/src/libImaging/GetBBox.c @@ -92,11 +92,6 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) { GETBBOX(image32, mask); } - /* Check that we got a box */ - if (bbox[1] < 0) { - return 0; /* no data */ - } - return 1; /* ok */ } From 8256b9bb7fd22abfe61ed0013c02fa18255f398f Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Tue, 2 Jul 2024 19:05:24 +0400 Subject: [PATCH 258/662] Correct left boundary on the second stage --- src/libImaging/GetBBox.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libImaging/GetBBox.c b/src/libImaging/GetBBox.c index 2e8afc8d5..50b2253a0 100644 --- a/src/libImaging/GetBBox.c +++ b/src/libImaging/GetBBox.c @@ -53,6 +53,8 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) { for (x = 0; x < im->xsize; x++) \ if (im->image[y][x] & mask) { \ has_data = 1; \ + if (x < bbox[0]) \ + bbox[0] = x; \ bbox[3] = y + 1; \ break; \ } \ From 2b6c5a27a1a6813fef4f06d45cf63428b2ae2da6 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 3 Jul 2024 22:42:52 +1000 Subject: [PATCH 259/662] Added braces --- src/libImaging/GetBBox.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/libImaging/GetBBox.c b/src/libImaging/GetBBox.c index 50b2253a0..1303617ad 100644 --- a/src/libImaging/GetBBox.c +++ b/src/libImaging/GetBBox.c @@ -34,45 +34,53 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) { /* first stage: looking for any px from top */ \ for (y = 0; y < im->ysize; y++) { \ has_data = 0; \ - for (x = 0; x < im->xsize; x++) \ + for (x = 0; x < im->xsize; x++) { \ if (im->image[y][x] & mask) { \ has_data = 1; \ bbox[0] = x; \ bbox[1] = y; \ break; \ } \ - if (has_data) \ + } \ + if (has_data) { \ break; \ + } \ } \ /* Check that we got a box */ \ - if (bbox[1] < 0) \ + if (bbox[1] < 0) { \ return 0; /* no data */ \ + } \ /* second stage: looking for any px from bottom */ \ for (y = im->ysize - 1; y >= bbox[1]; y--) { \ has_data = 0; \ - for (x = 0; x < im->xsize; x++) \ + for (x = 0; x < im->xsize; x++) { \ if (im->image[y][x] & mask) { \ has_data = 1; \ - if (x < bbox[0]) \ + if (x < bbox[0]) { \ bbox[0] = x; \ + } \ bbox[3] = y + 1; \ break; \ } \ - if (has_data) \ + } \ + if (has_data) { \ break; \ + } \ } \ /* third stage: looking for left and right boundaries */ \ for (y = bbox[1]; y < bbox[3]; y++) { \ - for (x = 0; x < bbox[0]; x++) \ + for (x = 0; x < bbox[0]; x++) { \ if (im->image[y][x] & mask) { \ bbox[0] = x; \ break; \ } \ - for (x = im->xsize - 1; x >= bbox[2]; x--) \ + } \ + for (x = im->xsize - 1; x >= bbox[2]; x--) { \ if (im->image[y][x] & mask) { \ bbox[2] = x + 1; \ break; \ } \ + } \ } if (im->image8) { From e4e2cd65642fa3dc02793fe426ba22a00d163db9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 3 Jul 2024 22:45:10 +1000 Subject: [PATCH 260/662] Updated comments --- src/libImaging/GetBBox.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libImaging/GetBBox.c b/src/libImaging/GetBBox.c index 1303617ad..d430893dd 100644 --- a/src/libImaging/GetBBox.c +++ b/src/libImaging/GetBBox.c @@ -31,7 +31,7 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) { bbox[2] = bbox[3] = 0; #define GETBBOX(image, mask) \ - /* first stage: looking for any px from top */ \ + /* first stage: looking for any pixels from top */ \ for (y = 0; y < im->ysize; y++) { \ has_data = 0; \ for (x = 0; x < im->xsize; x++) { \ @@ -46,11 +46,11 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) { break; \ } \ } \ - /* Check that we got a box */ \ + /* Check that we have a box */ \ if (bbox[1] < 0) { \ return 0; /* no data */ \ } \ - /* second stage: looking for any px from bottom */ \ + /* second stage: looking for any pixels from bottom */ \ for (y = im->ysize - 1; y >= bbox[1]; y--) { \ has_data = 0; \ for (x = 0; x < im->xsize; x++) { \ From b14142462e1d4f0205b7e77c647a02c760b99a05 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 15 Aug 2024 05:11:00 +1000 Subject: [PATCH 261/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index ae995e0a0..25dcb1887 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,12 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Remove WebP support without anim, mux/demux, and with buggy alpha #8213 + [homm, radarhere] + +- Add missing TIFF CMYK;16B reader #8298 + [homm] + - Remove all WITH_* flags from _imaging.c and other flags #8211 [homm] From 873770978197484b284a267d247d1b832afc2a24 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 5 Aug 2024 13:32:59 +1000 Subject: [PATCH 262/662] Added return type to ImageFile.load() --- src/PIL/Image.py | 8 +++----- src/PIL/ImageFile.py | 19 ++++++++----------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index ebf4f46c4..a6eefff56 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -218,9 +218,10 @@ if hasattr(core, "DEFAULT_STRATEGY"): # Registries if TYPE_CHECKING: + import mmap from xml.etree.ElementTree import Element - from . import ImageFile, ImagePalette, TiffImagePlugin + from . import ImageFile, ImageFilter, ImagePalette, TiffImagePlugin from ._typing import NumpyArray, StrOrBytesPath, TypeGuard ID: list[str] = [] OPEN: dict[ @@ -612,7 +613,7 @@ class Image: logger.debug("Error closing: %s", msg) if getattr(self, "map", None): - self.map = None + self.map: mmap.mmap | None = None # Instead of simply setting to None, we're setting up a # deferred error that will better explain that the core image @@ -1336,9 +1337,6 @@ class Image: self.load() return self._new(self.im.expand(xmargin, ymargin)) - if TYPE_CHECKING: - from . import ImageFilter - def filter(self, filter: ImageFilter.Filter | type[ImageFilter.Filter]) -> Image: """ Filters this image using the given filter. For a list of diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 2a8846c1a..829082e94 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -174,7 +174,7 @@ class ImageFile(Image.Image): self.fp.close() self.fp = None - def load(self): + def load(self) -> Image.core.PixelAccess | None: """Load image data based on tile list""" if self.tile is None: @@ -185,7 +185,7 @@ class ImageFile(Image.Image): if not self.tile: return pixel - self.map = None + self.map: mmap.mmap | None = None use_mmap = self.filename and len(self.tile) == 1 # As of pypy 2.1.0, memory mapping was failing here. use_mmap = use_mmap and not hasattr(sys, "pypy_version_info") @@ -193,17 +193,17 @@ class ImageFile(Image.Image): readonly = 0 # look for read/seek overrides - try: + if hasattr(self, "load_read"): read = self.load_read # don't use mmap if there are custom read/seek functions use_mmap = False - except AttributeError: + else: read = self.fp.read - try: + if hasattr(self, "load_seek"): seek = self.load_seek use_mmap = False - except AttributeError: + else: seek = self.fp.seek if use_mmap: @@ -243,11 +243,8 @@ class ImageFile(Image.Image): # sort tiles in file order self.tile.sort(key=_tilesort) - try: - # FIXME: This is a hack to handle TIFF's JpegTables tag. - prefix = self.tile_prefix - except AttributeError: - prefix = b"" + # FIXME: This is a hack to handle TIFF's JpegTables tag. + prefix = getattr(self, "tile_prefix", b"") # Remove consecutive duplicates that only differ by their offset self.tile = [ From 497080f63b62c9acbb427c7e554f222de70fe3a9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 5 Aug 2024 15:20:34 +1000 Subject: [PATCH 263/662] Added type hint to ImageFile._save tile parameter --- Tests/test_imagefile.py | 30 ++++++++++++++++++++++++------ src/PIL/BlpImagePlugin.py | 2 +- src/PIL/BmpImagePlugin.py | 4 +++- src/PIL/EpsImagePlugin.py | 2 +- src/PIL/GifImagePlugin.py | 8 ++++++-- src/PIL/IcoImagePlugin.py | 4 +++- src/PIL/ImImagePlugin.py | 4 +++- src/PIL/ImageFile.py | 4 ++-- src/PIL/Jpeg2KImagePlugin.py | 2 +- src/PIL/JpegImagePlugin.py | 4 +++- src/PIL/MspImagePlugin.py | 2 +- src/PIL/PalmImagePlugin.py | 4 +++- src/PIL/PcxImagePlugin.py | 4 +++- src/PIL/PdfImagePlugin.py | 2 +- src/PIL/PngImagePlugin.py | 8 ++++---- src/PIL/PpmImagePlugin.py | 4 +++- src/PIL/SpiderImagePlugin.py | 4 +++- src/PIL/TgaImagePlugin.py | 8 ++++++-- src/PIL/XbmImagePlugin.py | 2 +- 19 files changed, 72 insertions(+), 30 deletions(-) diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index fe7d44785..95e91db83 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -317,7 +317,13 @@ class TestPyEncoder(CodecsTest): fp = BytesIO() ImageFile._save( - im, fp, [("MOCK", (xoff, yoff, xoff + xsize, yoff + ysize), 0, "RGB")] + im, + fp, + [ + ImageFile._Tile( + "MOCK", (xoff, yoff, xoff + xsize, yoff + ysize), 0, "RGB" + ) + ], ) assert MockPyEncoder.last @@ -333,7 +339,7 @@ class TestPyEncoder(CodecsTest): im.tile = [("MOCK", None, 32, None)] fp = BytesIO() - ImageFile._save(im, fp, [("MOCK", None, 0, "RGB")]) + ImageFile._save(im, fp, [ImageFile._Tile("MOCK", None, 0, "RGB")]) assert MockPyEncoder.last assert MockPyEncoder.last.state.xoff == 0 @@ -350,7 +356,9 @@ class TestPyEncoder(CodecsTest): MockPyEncoder.last = None with pytest.raises(ValueError): ImageFile._save( - im, fp, [("MOCK", (xoff, yoff, -10, yoff + ysize), 0, "RGB")] + im, + fp, + [ImageFile._Tile("MOCK", (xoff, yoff, -10, yoff + ysize), 0, "RGB")], ) last: MockPyEncoder | None = MockPyEncoder.last assert last @@ -358,7 +366,9 @@ class TestPyEncoder(CodecsTest): with pytest.raises(ValueError): ImageFile._save( - im, fp, [("MOCK", (xoff, yoff, xoff + xsize, -10), 0, "RGB")] + im, + fp, + [ImageFile._Tile("MOCK", (xoff, yoff, xoff + xsize, -10), 0, "RGB")], ) def test_oversize(self) -> None: @@ -371,14 +381,22 @@ class TestPyEncoder(CodecsTest): ImageFile._save( im, fp, - [("MOCK", (xoff, yoff, xoff + xsize + 100, yoff + ysize), 0, "RGB")], + [ + ImageFile._Tile( + "MOCK", (xoff, yoff, xoff + xsize + 100, yoff + ysize), 0, "RGB" + ) + ], ) with pytest.raises(ValueError): ImageFile._save( im, fp, - [("MOCK", (xoff, yoff, xoff + xsize, yoff + ysize + 100), 0, "RGB")], + [ + ImageFile._Tile( + "MOCK", (xoff, yoff, xoff + xsize, yoff + ysize + 100), 0, "RGB" + ) + ], ) def test_encode(self) -> None: diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py index 6d71049a9..569f2c9bf 100644 --- a/src/PIL/BlpImagePlugin.py +++ b/src/PIL/BlpImagePlugin.py @@ -477,7 +477,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: fp.write(struct.pack(" None: if bits != 32: and_mask = Image.new("1", size) ImageFile._save( - and_mask, image_io, [("raw", (0, 0) + size, 0, ("1", 0, -1))] + and_mask, + image_io, + [ImageFile._Tile("raw", (0, 0) + size, 0, ("1", 0, -1))], ) else: frame.save(image_io, "png") diff --git a/src/PIL/ImImagePlugin.py b/src/PIL/ImImagePlugin.py index 2fb7ecd52..b94165089 100644 --- a/src/PIL/ImImagePlugin.py +++ b/src/PIL/ImImagePlugin.py @@ -360,7 +360,9 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: palette += im_palette[colors * i : colors * (i + 1)] palette += b"\x00" * (256 - colors) fp.write(palette) # 768 bytes - ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, -1))]) + ImageFile._save( + im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, 0, -1))] + ) # diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 829082e94..73554fa53 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -93,7 +93,7 @@ def _tilesort(t: _Tile) -> int: class _Tile(NamedTuple): codec_name: str - extents: tuple[int, int, int, int] + extents: tuple[int, int, int, int] | None offset: int args: tuple[Any, ...] | str | None @@ -522,7 +522,7 @@ class Parser: # -------------------------------------------------------------------- -def _save(im: Image.Image, fp: IO[bytes], tile, bufsize: int = 0) -> None: +def _save(im: Image.Image, fp: IO[bytes], tile: list[_Tile], bufsize: int = 0) -> None: """Helper to save image based on tile list :param im: Image object. diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py index ef9107f00..02c2e48cf 100644 --- a/src/PIL/Jpeg2KImagePlugin.py +++ b/src/PIL/Jpeg2KImagePlugin.py @@ -419,7 +419,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: plt, ) - ImageFile._save(im, fp, [("jpeg2k", (0, 0) + im.size, 0, kind)]) + ImageFile._save(im, fp, [ImageFile._Tile("jpeg2k", (0, 0) + im.size, 0, kind)]) # ------------------------------------------------------------ diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index fc897e2b9..bd4539be4 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -826,7 +826,9 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: # Ensure that our buffer is big enough. Same with the icc_profile block. bufsize = max(bufsize, len(exif) + 5, len(extra) + 1) - ImageFile._save(im, fp, [("jpeg", (0, 0) + im.size, 0, rawmode)], bufsize) + ImageFile._save( + im, fp, [ImageFile._Tile("jpeg", (0, 0) + im.size, 0, rawmode)], bufsize + ) def _save_cjpeg(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: diff --git a/src/PIL/MspImagePlugin.py b/src/PIL/MspImagePlugin.py index 0a75c868b..40e5fa435 100644 --- a/src/PIL/MspImagePlugin.py +++ b/src/PIL/MspImagePlugin.py @@ -188,7 +188,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: fp.write(o16(h)) # image body - ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 32, ("1", 0, 1))]) + ImageFile._save(im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 32, ("1", 0, 1))]) # diff --git a/src/PIL/PalmImagePlugin.py b/src/PIL/PalmImagePlugin.py index 1735070f8..62bf5f542 100644 --- a/src/PIL/PalmImagePlugin.py +++ b/src/PIL/PalmImagePlugin.py @@ -213,7 +213,9 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: ) # now convert data to raw form - ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, rowbytes, 1))]) + ImageFile._save( + im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, rowbytes, 1))] + ) if hasattr(fp, "flush"): fp.flush() diff --git a/src/PIL/PcxImagePlugin.py b/src/PIL/PcxImagePlugin.py index dd42003b5..4fb04715b 100644 --- a/src/PIL/PcxImagePlugin.py +++ b/src/PIL/PcxImagePlugin.py @@ -198,7 +198,9 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: assert fp.tell() == 128 - ImageFile._save(im, fp, [("pcx", (0, 0) + im.size, 0, (rawmode, bits * planes))]) + ImageFile._save( + im, fp, [ImageFile._Tile("pcx", (0, 0) + im.size, 0, (rawmode, bits * planes))] + ) if im.mode == "P": # colour palette diff --git a/src/PIL/PdfImagePlugin.py b/src/PIL/PdfImagePlugin.py index 7fc1108bb..e9c20ddc1 100644 --- a/src/PIL/PdfImagePlugin.py +++ b/src/PIL/PdfImagePlugin.py @@ -138,7 +138,7 @@ def _write_image( op = io.BytesIO() if decode_filter == "ASCIIHexDecode": - ImageFile._save(im, op, [("hex", (0, 0) + im.size, 0, im.mode)]) + ImageFile._save(im, op, [ImageFile._Tile("hex", (0, 0) + im.size, 0, im.mode)]) elif decode_filter == "CCITTFaxDecode": im.save( op, diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 910fa9755..fc20b18a8 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -1226,7 +1226,7 @@ def _write_multiple_frames( ImageFile._save( im, cast(IO[bytes], _idat(fp, chunk)), - [("zip", (0, 0) + im.size, 0, rawmode)], + [ImageFile._Tile("zip", (0, 0) + im.size, 0, rawmode)], ) seq_num = 0 @@ -1263,14 +1263,14 @@ def _write_multiple_frames( ImageFile._save( im_frame, cast(IO[bytes], _idat(fp, chunk)), - [("zip", (0, 0) + im_frame.size, 0, rawmode)], + [ImageFile._Tile("zip", (0, 0) + im_frame.size, 0, rawmode)], ) else: fdat_chunks = _fdat(fp, chunk, seq_num) ImageFile._save( im_frame, cast(IO[bytes], fdat_chunks), - [("zip", (0, 0) + im_frame.size, 0, rawmode)], + [ImageFile._Tile("zip", (0, 0) + im_frame.size, 0, rawmode)], ) seq_num = fdat_chunks.seq_num return None @@ -1471,7 +1471,7 @@ def _save( ImageFile._save( single_im, cast(IO[bytes], _idat(fp, chunk)), - [("zip", (0, 0) + single_im.size, 0, rawmode)], + [ImageFile._Tile("zip", (0, 0) + single_im.size, 0, rawmode)], ) if info: diff --git a/src/PIL/PpmImagePlugin.py b/src/PIL/PpmImagePlugin.py index 16c9ccbba..7bdaa9fe7 100644 --- a/src/PIL/PpmImagePlugin.py +++ b/src/PIL/PpmImagePlugin.py @@ -353,7 +353,9 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: elif head == b"Pf": fp.write(b"-1.0\n") row_order = -1 if im.mode == "F" else 1 - ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, row_order))]) + ImageFile._save( + im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, 0, row_order))] + ) # diff --git a/src/PIL/SpiderImagePlugin.py b/src/PIL/SpiderImagePlugin.py index a07101e54..7045ab566 100644 --- a/src/PIL/SpiderImagePlugin.py +++ b/src/PIL/SpiderImagePlugin.py @@ -278,7 +278,9 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: fp.writelines(hdr) rawmode = "F;32NF" # 32-bit native floating point - ImageFile._save(im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))]) + ImageFile._save( + im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))] + ) def _save_spider(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py index 39104aece..a43aae1ec 100644 --- a/src/PIL/TgaImagePlugin.py +++ b/src/PIL/TgaImagePlugin.py @@ -238,11 +238,15 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if rle: ImageFile._save( - im, fp, [("tga_rle", (0, 0) + im.size, 0, (rawmode, orientation))] + im, + fp, + [ImageFile._Tile("tga_rle", (0, 0) + im.size, 0, (rawmode, orientation))], ) else: ImageFile._save( - im, fp, [("raw", (0, 0) + im.size, 0, (rawmode, 0, orientation))] + im, + fp, + [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, 0, orientation))], ) # write targa version 2 footer diff --git a/src/PIL/XbmImagePlugin.py b/src/PIL/XbmImagePlugin.py index 6d11bbfcf..6c2e32804 100644 --- a/src/PIL/XbmImagePlugin.py +++ b/src/PIL/XbmImagePlugin.py @@ -85,7 +85,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: fp.write(b"static char im_bits[] = {\n") - ImageFile._save(im, fp, [("xbm", (0, 0) + im.size, 0, None)]) + ImageFile._save(im, fp, [ImageFile._Tile("xbm", (0, 0) + im.size, 0, None)]) fp.write(b"};\n") From 8afb7ddb4ed265caf67213f4fd5416cd29ae24a1 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 15 Aug 2024 08:08:43 +1000 Subject: [PATCH 264/662] Added type hints --- .ci/requirements-mypy.txt | 1 + docs/example/DdsImagePlugin.py | 29 +++++++++++++++------------ src/PIL/TiffImagePlugin.py | 36 ++++++++++++++++++++-------------- tox.ini | 2 +- winbuild/build_prepare.py | 12 ++++++------ 5 files changed, 45 insertions(+), 35 deletions(-) diff --git a/.ci/requirements-mypy.txt b/.ci/requirements-mypy.txt index 23792281b..47fc64399 100644 --- a/.ci/requirements-mypy.txt +++ b/.ci/requirements-mypy.txt @@ -5,6 +5,7 @@ ipython numpy packaging pytest +sphinx types-defusedxml types-olefile types-setuptools diff --git a/docs/example/DdsImagePlugin.py b/docs/example/DdsImagePlugin.py index 2a2a0ba29..caa852b1f 100644 --- a/docs/example/DdsImagePlugin.py +++ b/docs/example/DdsImagePlugin.py @@ -14,6 +14,7 @@ from __future__ import annotations import struct from io import BytesIO +from typing import IO from PIL import Image, ImageFile @@ -94,26 +95,26 @@ DXT3_FOURCC = 0x33545844 DXT5_FOURCC = 0x35545844 -def _decode565(bits): +def _decode565(bits: int) -> tuple[int, int, int]: a = ((bits >> 11) & 0x1F) << 3 b = ((bits >> 5) & 0x3F) << 2 c = (bits & 0x1F) << 3 return a, b, c -def _c2a(a, b): +def _c2a(a: int, b: int) -> int: return (2 * a + b) // 3 -def _c2b(a, b): +def _c2b(a: int, b: int) -> int: return (a + b) // 2 -def _c3(a, b): +def _c3(a: int, b: int) -> int: return (2 * b + a) // 3 -def _dxt1(data, width, height): +def _dxt1(data: IO[bytes], width: int, height: int) -> bytes: # TODO implement this function as pixel format in decode.c ret = bytearray(4 * width * height) @@ -151,7 +152,7 @@ def _dxt1(data, width, height): return bytes(ret) -def _dxtc_alpha(a0, a1, ac0, ac1, ai): +def _dxtc_alpha(a0: int, a1: int, ac0: int, ac1: int, ai: int) -> int: if ai <= 12: ac = (ac0 >> ai) & 7 elif ai == 15: @@ -175,7 +176,7 @@ def _dxtc_alpha(a0, a1, ac0, ac1, ai): return alpha -def _dxt5(data, width, height): +def _dxt5(data: IO[bytes], width: int, height: int) -> bytes: # TODO implement this function as pixel format in decode.c ret = bytearray(4 * width * height) @@ -211,7 +212,7 @@ class DdsImageFile(ImageFile.ImageFile): format = "DDS" format_description = "DirectDraw Surface" - def _open(self): + def _open(self) -> None: if not _accept(self.fp.read(4)): msg = "not a DDS file" raise SyntaxError(msg) @@ -242,19 +243,20 @@ class DdsImageFile(ImageFile.ImageFile): elif fourcc == b"DXT5": self.decoder = "DXT5" else: - msg = f"Unimplemented pixel format {fourcc}" + msg = f"Unimplemented pixel format {repr(fourcc)}" raise NotImplementedError(msg) self.tile = [(self.decoder, (0, 0) + self.size, 0, (self.mode, 0, 1))] - def load_seek(self, pos): + def load_seek(self, pos: int) -> None: pass class DXT1Decoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer): + def decode(self, buffer: bytes) -> tuple[int, int]: + assert self.fd is not None try: self.set_as_raw(_dxt1(self.fd, self.state.xsize, self.state.ysize)) except struct.error as e: @@ -266,7 +268,8 @@ class DXT1Decoder(ImageFile.PyDecoder): class DXT5Decoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer): + def decode(self, buffer: bytes) -> tuple[int, int]: + assert self.fd is not None try: self.set_as_raw(_dxt5(self.fd, self.state.xsize, self.state.ysize)) except struct.error as e: @@ -279,7 +282,7 @@ Image.register_decoder("DXT1", DXT1Decoder) Image.register_decoder("DXT5", DXT5Decoder) -def _accept(prefix): +def _accept(prefix: bytes) -> bool: return prefix[:4] == b"DDS " diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index deae199d5..2ce8a6c2a 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -456,8 +456,11 @@ class IFDRational(Rational): __int__ = _delegate("__int__") -def _register_loader(idx: int, size: int): - def decorator(func): +_LoaderFunc = Callable[["ImageFileDirectory_v2", bytes, bool], Any] + + +def _register_loader(idx: int, size: int) -> Callable[[_LoaderFunc], _LoaderFunc]: + def decorator(func: _LoaderFunc) -> _LoaderFunc: from .TiffTags import TYPES if func.__name__.startswith("load_"): @@ -482,12 +485,13 @@ def _register_basic(idx_fmt_name: tuple[int, str, str]) -> None: idx, fmt, name = idx_fmt_name TYPES[idx] = name size = struct.calcsize(f"={fmt}") - _load_dispatch[idx] = ( # noqa: F821 - size, - lambda self, data, legacy_api=True: ( - self._unpack(f"{len(data) // size}{fmt}", data) - ), - ) + + def basic_handler( + self: ImageFileDirectory_v2, data: bytes, legacy_api: bool = True + ) -> tuple[Any, ...]: + return self._unpack(f"{len(data) // size}{fmt}", data) + + _load_dispatch[idx] = size, basic_handler # noqa: F821 _write_dispatch[idx] = lambda self, *values: ( # noqa: F821 b"".join(self._pack(fmt, value) for value in values) ) @@ -560,7 +564,7 @@ class ImageFileDirectory_v2(_IFDv2Base): """ - _load_dispatch: dict[int, Callable[[ImageFileDirectory_v2, bytes, bool], Any]] = {} + _load_dispatch: dict[int, tuple[int, _LoaderFunc]] = {} _write_dispatch: dict[int, Callable[..., Any]] = {} def __init__( @@ -653,10 +657,10 @@ class ImageFileDirectory_v2(_IFDv2Base): def __contains__(self, tag: object) -> bool: return tag in self._tags_v2 or tag in self._tagdata - def __setitem__(self, tag: int, value) -> None: + def __setitem__(self, tag: int, value: Any) -> None: self._setitem(tag, value, self.legacy_api) - def _setitem(self, tag: int, value, legacy_api: bool) -> None: + def _setitem(self, tag: int, value: Any, legacy_api: bool) -> None: basetypes = (Number, bytes, str) info = TiffTags.lookup(tag, self.group) @@ -744,10 +748,10 @@ class ImageFileDirectory_v2(_IFDv2Base): def __iter__(self) -> Iterator[int]: return iter(set(self._tagdata) | set(self._tags_v2)) - def _unpack(self, fmt: str, data: bytes): + def _unpack(self, fmt: str, data: bytes) -> tuple[Any, ...]: return struct.unpack(self._endian + fmt, data) - def _pack(self, fmt: str, *values) -> bytes: + def _pack(self, fmt: str, *values: Any) -> bytes: return struct.pack(self._endian + fmt, *values) list( @@ -824,7 +828,9 @@ class ImageFileDirectory_v2(_IFDv2Base): return value @_register_loader(10, 8) - def load_signed_rational(self, data: bytes, legacy_api: bool = True): + def load_signed_rational( + self, data: bytes, legacy_api: bool = True + ) -> tuple[tuple[int, int] | IFDRational, ...]: vals = self._unpack(f"{len(data) // 4}l", data) def combine(a: int, b: int) -> tuple[int, int] | IFDRational: @@ -1088,7 +1094,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2): def __iter__(self) -> Iterator[int]: return iter(set(self._tagdata) | set(self._tags_v1)) - def __setitem__(self, tag: int, value) -> None: + def __setitem__(self, tag: int, value: Any) -> None: for legacy_api in (False, True): self._setitem(tag, value, legacy_api) diff --git a/tox.ini b/tox.ini index 4b4059455..70b8bf145 100644 --- a/tox.ini +++ b/tox.ini @@ -36,4 +36,4 @@ deps = extras = typing commands = - mypy src Tests {posargs} + mypy docs src winbuild Tests {posargs} diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 7129699eb..1021e4f22 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -7,6 +7,7 @@ import re import shutil import struct import subprocess +from typing import Any def cmd_cd(path: str) -> str: @@ -43,21 +44,19 @@ def cmd_nmake( target: str = "", params: list[str] | None = None, ) -> str: - params = "" if params is None else " ".join(params) - return " ".join( [ "{nmake}", "-nologo", f'-f "{makefile}"' if makefile is not None else "", - f"{params}", + f'{" ".join(params)}' if params is not None else "", f'"{target}"', ] ) def cmds_cmake( - target: str | tuple[str, ...] | list[str], *params, build_dir: str = "." + target: str | tuple[str, ...] | list[str], *params: str, build_dir: str = "." ) -> list[str]: if not isinstance(target, str): target = " ".join(target) @@ -129,7 +128,7 @@ V["ZLIB_DOTLESS"] = V["ZLIB"].replace(".", "") # dependencies, listed in order of compilation -DEPS = { +DEPS: dict[str, dict[str, Any]] = { "libjpeg": { "url": f"{SF_PROJECTS}/libjpeg-turbo/files/{V['JPEGTURBO']}/" f"libjpeg-turbo-{V['JPEGTURBO']}.tar.gz/download", @@ -538,7 +537,7 @@ def write_script( print(" " + line) -def get_footer(dep: dict) -> list[str]: +def get_footer(dep: dict[str, Any]) -> list[str]: lines = [] for out in dep.get("headers", []): lines.append(cmd_copy(out, "{inc_dir}")) @@ -583,6 +582,7 @@ def build_dep(name: str, prefs: dict[str, str], verbose: bool) -> str: license_text += f.read() if "license_pattern" in dep: match = re.search(dep["license_pattern"], license_text, re.DOTALL) + assert match is not None license_text = "\n".join(match.groups()) assert len(license_text) > 50 with open(os.path.join(license_dir, f"{directory}.txt"), "w") as f: From d4c72da6b2ae5aabc45f679f8feeaf2726976a2b Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 15 Aug 2024 14:10:31 +1000 Subject: [PATCH 265/662] Added type hints to example code --- docs/handbook/image-file-formats.rst | 12 +++++++----- docs/handbook/tutorial.rst | 6 +++--- docs/handbook/writing-your-own-image-plugin.rst | 6 +++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst index 861e09a43..ca0e05eb6 100644 --- a/docs/handbook/image-file-formats.rst +++ b/docs/handbook/image-file-formats.rst @@ -1517,19 +1517,21 @@ To add other read or write support, use :py:func:`PIL.WmfImagePlugin.register_handler` to register a WMF and EMF handler. :: - from PIL import Image + from typing import IO + + from PIL import Image, ImageFile from PIL import WmfImagePlugin - class WmfHandler: - def open(self, im): + class WmfHandler(ImageFile.StubHandler): + def open(self, im: ImageFile.StubImageFile) -> None: ... - def load(self, im): + def load(self, im: ImageFile.StubImageFile) -> Image.Image: ... return image - def save(self, im, fp, filename): + def save(self, im: Image.Image, fp: IO[bytes], filename: str) -> None: ... diff --git a/docs/handbook/tutorial.rst b/docs/handbook/tutorial.rst index c36011362..3df8e0d20 100644 --- a/docs/handbook/tutorial.rst +++ b/docs/handbook/tutorial.rst @@ -186,7 +186,7 @@ Rolling an image :: - def roll(im, delta): + def roll(im: Image.Image, delta: int) -> Image.Image: """Roll an image sideways.""" xsize, ysize = im.size @@ -211,7 +211,7 @@ Merging images :: - def merge(im1, im2): + def merge(im1: Image.Image, im2: Image.Image) -> Image.Image: w = im1.size[0] + im2.size[0] h = max(im1.size[1], im2.size[1]) im = Image.new("RGBA", (w, h)) @@ -704,7 +704,7 @@ in the current directory can be saved as JPEGs at reduced quality. import glob from PIL import Image - def compress_image(source_path, dest_path): + def compress_image(source_path: str, dest_path: str) -> None: with Image.open(source_path) as img: if img.mode != "RGB": img = img.convert("RGB") diff --git a/docs/handbook/writing-your-own-image-plugin.rst b/docs/handbook/writing-your-own-image-plugin.rst index 956d63aa7..2e853224d 100644 --- a/docs/handbook/writing-your-own-image-plugin.rst +++ b/docs/handbook/writing-your-own-image-plugin.rst @@ -53,7 +53,7 @@ true color. from PIL import Image, ImageFile - def _accept(prefix): + def _accept(prefix: bytes) -> bool: return prefix[:4] == b"SPAM" @@ -62,7 +62,7 @@ true color. format = "SPAM" format_description = "Spam raster image" - def _open(self): + def _open(self) -> None: header = self.fp.read(128).split() @@ -82,7 +82,7 @@ true color. raise SyntaxError(msg) # data descriptor - self.tile = [("raw", (0, 0) + self.size, 128, (self.mode, 0, 1))] + self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 128, (self.mode, 0, 1))] Image.register_open(SpamImageFile.format, SpamImageFile, _accept) From d5e3f6b51673564c16a8973a72a2b68e8ba96f0c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 15 Aug 2024 14:46:23 +1000 Subject: [PATCH 266/662] If left and right sides meet, do not draw rectangle to fill gap --- ...d_rectangle_joined_x_different_corners.png | Bin 0 -> 411 bytes Tests/test_imagedraw.py | 21 ++++++++++++++++++ src/PIL/ImageDraw.py | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 Tests/images/imagedraw_rounded_rectangle_joined_x_different_corners.png diff --git a/Tests/images/imagedraw_rounded_rectangle_joined_x_different_corners.png b/Tests/images/imagedraw_rounded_rectangle_joined_x_different_corners.png new file mode 100644 index 0000000000000000000000000000000000000000..b225afc2dc1449375e748d59e2336eedd9ddceaf GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^DIm None: + # Arrange + im = Image.new("RGB", (W, H)) + draw = ImageDraw.Draw(im, "RGBA") + + # Act + draw.rounded_rectangle( + (20, 10, 80, 90), + 30, + fill="red", + outline="green", + width=5, + corners=(True, False, False, False), + ) + + # Assert + assert_image_equal_tofile( + im, "Tests/images/imagedraw_rounded_rectangle_joined_x_different_corners.png" + ) + + @pytest.mark.parametrize( "xy, radius, type", [ diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py index 6f56d0236..5609bf971 100644 --- a/src/PIL/ImageDraw.py +++ b/src/PIL/ImageDraw.py @@ -505,7 +505,7 @@ class ImageDraw: if full_x: self.draw.draw_rectangle((x0, y0 + r + 1, x1, y1 - r - 1), fill_ink, 1) - else: + elif x1 - r - 1 > x0 + r + 1: self.draw.draw_rectangle((x0 + r + 1, y0, x1 - r - 1, y1), fill_ink, 1) if not full_x and not full_y: left = [x0, y0, x0 + r, y1] From 0a03b77daf088e2aac0e32acbbc370704c749591 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 16 Aug 2024 06:36:31 +1000 Subject: [PATCH 267/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 25dcb1887..a7edc340c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- If left and right sides meet in ImageDraw.rounded_rectangle(), do not draw rectangle to fill gap #8304 + [radarhere] + - Remove WebP support without anim, mux/demux, and with buggy alpha #8213 [homm, radarhere] From 617699ffc76230d481d903c7a9b000d96b7e89e7 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 16 Aug 2024 12:03:02 +1000 Subject: [PATCH 268/662] Log value from tag_v2 --- src/PIL/TiffImagePlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 2ce8a6c2a..7bbbc832e 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1393,7 +1393,7 @@ class TiffImageFile(ImageFile.ImageFile): logger.debug("- photometric_interpretation: %s", photo) logger.debug("- planar_configuration: %s", self._planar_configuration) logger.debug("- fill_order: %s", fillorder) - logger.debug("- YCbCr subsampling: %s", self.tag.get(YCBCRSUBSAMPLING)) + logger.debug("- YCbCr subsampling: %s", self.tag_v2.get(YCBCRSUBSAMPLING)) # size xsize = int(self.tag_v2.get(IMAGEWIDTH)) From 5cb79c6a69b7d9b56607b7b7499b03c1aa434a35 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 16 Aug 2024 18:31:07 +1000 Subject: [PATCH 269/662] Check object is bytes --- Tests/test_imagefont.py | 3 +++ src/_imagingft.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 340cc4742..953706010 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -1113,6 +1113,9 @@ def test_bytes(font: ImageFont.FreeTypeFont) -> None: ) assert font.getmask2(b"test")[1] == font.getmask2("test")[1] + with pytest.raises(TypeError): + font.getlength((0, 0)) # type: ignore[arg-type] + @pytest.mark.parametrize( "test_file", diff --git a/src/_imagingft.c b/src/_imagingft.c index f8143e0cc..5c446e641 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -272,7 +272,7 @@ text_layout_raqm( } set_text = raqm_set_text(rq, text, size); PyMem_Free(text); - } else { + } else if (PyBytes_Check(string)) { char *buffer; PyBytes_AsStringAndSize(string, &buffer, &size); if (!buffer || !size) { @@ -281,6 +281,9 @@ text_layout_raqm( goto failed; } set_text = raqm_set_text_utf8(rq, buffer, size); + } else { + PyErr_SetString(PyExc_TypeError, "expected string or bytes"); + goto failed; } if (!set_text) { PyErr_SetString(PyExc_ValueError, "raqm_set_text() failed"); @@ -425,8 +428,11 @@ text_layout_fallback( if (PyUnicode_Check(string)) { count = PyUnicode_GET_LENGTH(string); - } else { + } else if (PyBytes_Check(string)) { PyBytes_AsStringAndSize(string, &buffer, &count); + } else { + PyErr_SetString(PyExc_TypeError, "expected string or bytes"); + return 0; } if (count == 0) { return 0; From 6f506d2ae3879256e8a893233fc28ba6fb2518d8 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 16 Aug 2024 14:59:46 +0300 Subject: [PATCH 270/662] Run all flake8-pytest-style except rules some that fail --- .pre-commit-config.yaml | 6 +++--- pyproject.toml | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 74764752e..8ab478e84 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,12 +1,12 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.5.6 + rev: v0.6.0 hooks: - id: ruff args: [--exit-non-zero-on-fix] - repo: https://github.com/psf/black-pre-commit-mirror - rev: 24.4.2 + rev: 24.8.0 hooks: - id: black @@ -67,7 +67,7 @@ repos: - id: pyproject-fmt - repo: https://github.com/abravalheri/validate-pyproject - rev: v0.18 + rev: v0.19 hooks: - id: validate-pyproject diff --git a/pyproject.toml b/pyproject.toml index 8bb21019c..d4b83ef7f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -109,7 +109,7 @@ lint.select = [ "ISC", # flake8-implicit-str-concat "LOG", # flake8-logging "PGH", # pygrep-hooks - "PT006", # pytest-parametrize-names-wrong-type + "PT", # flake8-pytest-style "PYI", # flake8-pyi "RUF100", # unused noqa (yesqa) "UP", # pyupgrade @@ -121,6 +121,14 @@ lint.ignore = [ "E221", # Multiple spaces before operator "E226", # Missing whitespace around arithmetic operator "E241", # Multiple spaces after ',' + "PT001", # pytest-fixture-incorrect-parentheses-style + "PT007", # pytest-parametrize-values-wrong-type + "PT011", # pytest-raises-too-broad + "PT012", # pytest-raises-with-multiple-statements + "PT014", # pytest-duplicate-parametrize-test-cases + "PT016", # pytest-fail-without-message + "PT017", # pytest-assert-in-except + "PT018", # pytest-composite-assertion "PYI026", # flake8-pyi: typing.TypeAlias added in Python 3.10 "PYI034", # flake8-pyi: typing.Self added in Python 3.11 ] From 5c282d02991e6bca1993c974d85dd19bce734ddd Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 16 Aug 2024 14:47:11 +0300 Subject: [PATCH 271/662] Fix PT014: duplicate test cases in pytest.mark.parametrize --- Tests/test_file_jpeg2k.py | 2 +- pyproject.toml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py index a5cfa7c6c..5e11465ca 100644 --- a/Tests/test_file_jpeg2k.py +++ b/Tests/test_file_jpeg2k.py @@ -233,7 +233,7 @@ def test_layers() -> None: ("foo.jp2", {"no_jp2": True}, 0, b"\xff\x4f"), ("foo.j2k", {"no_jp2": False}, 0, b"\xff\x4f"), ("foo.jp2", {"no_jp2": False}, 4, b"jP"), - ("foo.jp2", {"no_jp2": False}, 4, b"jP"), + (None, {"no_jp2": False}, 4, b"jP"), ), ) def test_no_jp2(name: str, args: dict[str, bool], offset: int, data: bytes) -> None: diff --git a/pyproject.toml b/pyproject.toml index d4b83ef7f..b42ad7424 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,7 +125,6 @@ lint.ignore = [ "PT007", # pytest-parametrize-values-wrong-type "PT011", # pytest-raises-too-broad "PT012", # pytest-raises-with-multiple-statements - "PT014", # pytest-duplicate-parametrize-test-cases "PT016", # pytest-fail-without-message "PT017", # pytest-assert-in-except "PT018", # pytest-composite-assertion From 5747267eb39961101d8ed6f18e77cefc1fc5c4b8 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 16 Aug 2024 14:52:56 +0300 Subject: [PATCH 272/662] Fix PT018: Assert only one thing --- Tests/test_file_jpeg.py | 9 ++++++--- Tests/test_imagechops.py | 3 ++- Tests/test_imagemorph.py | 3 ++- Tests/test_tiff_ifdrational.py | 4 ++-- pyproject.toml | 1 - 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index df589e24a..8e6221750 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -1019,13 +1019,16 @@ class TestFileJpeg: # SOI, EOI for marker in b"\xff\xd8", b"\xff\xd9": - assert marker in data[1] and marker in data[2] + assert marker in data[1] + assert marker in data[2] # DHT, DQT for marker in b"\xff\xc4", b"\xff\xdb": - assert marker in data[1] and marker not in data[2] + assert marker in data[1] + assert marker not in data[2] # SOF0, SOS, APP0 (JFIF header) for marker in b"\xff\xc0", b"\xff\xda", b"\xff\xe0": - assert marker not in data[1] and marker in data[2] + assert marker not in data[1] + assert marker in data[2] with Image.open(BytesIO(data[0])) as interchange_im: with Image.open(BytesIO(data[1] + data[2])) as combined_im: diff --git a/Tests/test_imagechops.py b/Tests/test_imagechops.py index 4fc28cdb9..4309214f5 100644 --- a/Tests/test_imagechops.py +++ b/Tests/test_imagechops.py @@ -398,7 +398,8 @@ def test_logical() -> None: for y in (a, b): imy = Image.new("1", (1, 1), y) value = op(imx, imy).getpixel((0, 0)) - assert not isinstance(value, tuple) and value is not None + assert not isinstance(value, tuple) + assert value is not None out.append(value) return out diff --git a/Tests/test_imagemorph.py b/Tests/test_imagemorph.py index 4363f456e..80d8c3815 100644 --- a/Tests/test_imagemorph.py +++ b/Tests/test_imagemorph.py @@ -46,7 +46,8 @@ def img_to_string(im: Image.Image) -> str: line = "" for c in range(im.width): value = im.getpixel((c, r)) - assert not isinstance(value, tuple) and value is not None + assert not isinstance(value, tuple) + assert value is not None line += chars[value > 0] result.append(line) return "\n".join(result) diff --git a/Tests/test_tiff_ifdrational.py b/Tests/test_tiff_ifdrational.py index 9d06a9332..13f1f9c80 100644 --- a/Tests/test_tiff_ifdrational.py +++ b/Tests/test_tiff_ifdrational.py @@ -54,8 +54,8 @@ def test_nonetype() -> None: assert xres.denominator is not None assert yres._val is not None - assert xres and 1 - assert xres and yres + assert xres + assert yres @pytest.mark.parametrize( diff --git a/pyproject.toml b/pyproject.toml index b42ad7424..9e53d4bfe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -127,7 +127,6 @@ lint.ignore = [ "PT012", # pytest-raises-with-multiple-statements "PT016", # pytest-fail-without-message "PT017", # pytest-assert-in-except - "PT018", # pytest-composite-assertion "PYI026", # flake8-pyi: typing.TypeAlias added in Python 3.10 "PYI034", # flake8-pyi: typing.Self added in Python 3.11 ] From f26b47595b10eaf3d781a8ea3f357f78f0a2774c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 19 Aug 2024 06:56:31 +1000 Subject: [PATCH 273/662] Get IPTC info from tag_v2 --- Tests/test_file_iptc.py | 10 ++++++++++ src/PIL/IptcImagePlugin.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Tests/test_file_iptc.py b/Tests/test_file_iptc.py index b0ea2bf42..8a7c59fb1 100644 --- a/Tests/test_file_iptc.py +++ b/Tests/test_file_iptc.py @@ -77,6 +77,16 @@ def test_getiptcinfo_zero_padding() -> None: assert len(iptc) == 3 +def test_getiptcinfo_tiff() -> None: + # Arrange + with Image.open("Tests/images/hopper.Lab.tif") as im: + # Act + iptc = IptcImagePlugin.getiptcinfo(im) + + # Assert + assert iptc == {(1, 90): b"\x1b%G", (2, 0): b"\xcf\xc0"} + + def test_getiptcinfo_tiff_none() -> None: # Arrange with Image.open("Tests/images/hopper.tif") as im: diff --git a/src/PIL/IptcImagePlugin.py b/src/PIL/IptcImagePlugin.py index 17243e705..153243519 100644 --- a/src/PIL/IptcImagePlugin.py +++ b/src/PIL/IptcImagePlugin.py @@ -213,7 +213,7 @@ def getiptcinfo( # get raw data from the IPTC/NAA tag (PhotoShop tags the data # as 4-byte integers, so we cannot use the get method...) try: - data = im.tag.tagdata[TiffImagePlugin.IPTC_NAA_CHUNK] + data = im.tag_v2[TiffImagePlugin.IPTC_NAA_CHUNK] except (AttributeError, KeyError): pass From cd76b4853319619a0cb9726dcd7907551794f049 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Fri, 16 Aug 2024 09:08:18 -0500 Subject: [PATCH 274/662] move repeated code to private helper function --- src/PIL/TiffImagePlugin.py | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index deae199d5..7dda413e6 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -2080,38 +2080,34 @@ class AppendingTiffWriter: (value,) = struct.unpack(self.longFmt, self.f.read(4)) return value + @staticmethod + def _verify_bytes_written(bytes_written: int | None, expected: int) -> None: + if bytes_written is not None and bytes_written != expected: + msg = f"wrote only {bytes_written} bytes but wanted {expected}" + raise RuntimeError(msg) + def rewriteLastShortToLong(self, value: int) -> None: self.f.seek(-2, os.SEEK_CUR) bytes_written = self.f.write(struct.pack(self.longFmt, value)) - if bytes_written is not None and bytes_written != 4: - msg = f"wrote only {bytes_written} bytes but wanted 4" - raise RuntimeError(msg) + self._verify_bytes_written(bytes_written, 4) def rewriteLastShort(self, value: int) -> None: self.f.seek(-2, os.SEEK_CUR) bytes_written = self.f.write(struct.pack(self.shortFmt, value)) - if bytes_written is not None and bytes_written != 2: - msg = f"wrote only {bytes_written} bytes but wanted 2" - raise RuntimeError(msg) + self._verify_bytes_written(bytes_written, 2) def rewriteLastLong(self, value: int) -> None: self.f.seek(-4, os.SEEK_CUR) bytes_written = self.f.write(struct.pack(self.longFmt, value)) - if bytes_written is not None and bytes_written != 4: - msg = f"wrote only {bytes_written} bytes but wanted 4" - raise RuntimeError(msg) + self._verify_bytes_written(bytes_written, 4) def writeShort(self, value: int) -> None: bytes_written = self.f.write(struct.pack(self.shortFmt, value)) - if bytes_written is not None and bytes_written != 2: - msg = f"wrote only {bytes_written} bytes but wanted 2" - raise RuntimeError(msg) + self._verify_bytes_written(bytes_written, 2) def writeLong(self, value: int) -> None: bytes_written = self.f.write(struct.pack(self.longFmt, value)) - if bytes_written is not None and bytes_written != 4: - msg = f"wrote only {bytes_written} bytes but wanted 4" - raise RuntimeError(msg) + self._verify_bytes_written(bytes_written, 4) def close(self) -> None: self.finalize() From 2467369c134a882473e46928eac952d7fab5f7a4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 19 Aug 2024 20:50:45 +1000 Subject: [PATCH 275/662] Uninstall gradle and maven on macOS 13 --- .github/workflows/macos-install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh index d35cfcd31..25943776f 100755 --- a/.github/workflows/macos-install.sh +++ b/.github/workflows/macos-install.sh @@ -2,6 +2,9 @@ set -e +if [[ "$ImageOS" == "macos13" ]]; then + brew uninstall gradle maven +fi brew install \ freetype \ ghostscript \ From d1d567bb59886f15e91522d937e5399395158692 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 19 Aug 2024 08:47:35 +1000 Subject: [PATCH 276/662] Do not use sys.stdout in PSDraw --- Tests/test_psdraw.py | 11 +++-------- src/PIL/PSDraw.py | 11 ++++------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Tests/test_psdraw.py b/Tests/test_psdraw.py index c3afa9089..a743d831f 100644 --- a/Tests/test_psdraw.py +++ b/Tests/test_psdraw.py @@ -5,8 +5,6 @@ import sys from io import BytesIO from pathlib import Path -import pytest - from PIL import Image, PSDraw @@ -49,15 +47,14 @@ def test_draw_postscript(tmp_path: Path) -> None: assert os.path.getsize(tempfile) > 0 -@pytest.mark.parametrize("buffer", (True, False)) -def test_stdout(buffer: bool) -> None: +def test_stdout() -> None: # Temporarily redirect stdout old_stdout = sys.stdout class MyStdOut: buffer = BytesIO() - mystdout: MyStdOut | BytesIO = MyStdOut() if buffer else BytesIO() + mystdout = MyStdOut() sys.stdout = mystdout @@ -67,6 +64,4 @@ def test_stdout(buffer: bool) -> None: # Reset stdout sys.stdout = old_stdout - if isinstance(mystdout, MyStdOut): - mystdout = mystdout.buffer - assert mystdout.getvalue() != b"" + assert mystdout.buffer.getvalue() != b"" diff --git a/src/PIL/PSDraw.py b/src/PIL/PSDraw.py index 673eae1d1..02939d26b 100644 --- a/src/PIL/PSDraw.py +++ b/src/PIL/PSDraw.py @@ -17,7 +17,7 @@ from __future__ import annotations import sys -from typing import TYPE_CHECKING +from typing import IO, TYPE_CHECKING from . import EpsImagePlugin @@ -28,15 +28,12 @@ from . import EpsImagePlugin class PSDraw: """ Sets up printing to the given file. If ``fp`` is omitted, - ``sys.stdout.buffer`` or ``sys.stdout`` is assumed. + ``sys.stdout.buffer`` is assumed. """ - def __init__(self, fp=None): + def __init__(self, fp: IO[bytes] | None = None) -> None: if not fp: - try: - fp = sys.stdout.buffer - except AttributeError: - fp = sys.stdout + fp = sys.stdout.buffer self.fp = fp def begin_document(self, id: str | None = None) -> None: From 2ed8502d12a0f0efd7d4cd2c65b4c6a7e59aaa2a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 19 Aug 2024 22:55:07 +1000 Subject: [PATCH 277/662] Use ipython PrettyPrinter, rather than custom class --- .appveyor.yml | 2 +- .ci/install.sh | 1 + .github/workflows/macos-install.sh | 1 + .github/workflows/test-cygwin.yml | 1 + Tests/test_image.py | 17 +++++++++++------ src/PIL/Image.py | 4 +++- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index e12987a5f..f490561cd 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -51,7 +51,7 @@ build_script: test_script: - cd c:\pillow -- '%PYTHON%\%EXECUTABLE% -m pip install pytest pytest-cov pytest-timeout defusedxml numpy olefile pyroma' +- '%PYTHON%\%EXECUTABLE% -m pip install pytest pytest-cov pytest-timeout defusedxml ipython numpy olefile pyroma' - c:\"Program Files (x86)"\"Windows Kits"\10\Debuggers\x86\gflags.exe /p /enable %PYTHON%\%EXECUTABLE% - '%PYTHON%\%EXECUTABLE% -c "from PIL import Image"' - '%PYTHON%\%EXECUTABLE% -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests' diff --git a/.ci/install.sh b/.ci/install.sh index 8e65f64c4..b2d615866 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -30,6 +30,7 @@ python3 -m pip install --upgrade pip python3 -m pip install --upgrade wheel python3 -m pip install coverage python3 -m pip install defusedxml +python3 -m pip install ipython python3 -m pip install olefile python3 -m pip install -U pytest python3 -m pip install -U pytest-cov diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh index 25943776f..ddb421230 100755 --- a/.github/workflows/macos-install.sh +++ b/.github/workflows/macos-install.sh @@ -23,6 +23,7 @@ export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig" python3 -m pip install coverage python3 -m pip install defusedxml +python3 -m pip install ipython python3 -m pip install olefile python3 -m pip install -U pytest python3 -m pip install -U pytest-cov diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml index 8e2827099..0aa79e423 100644 --- a/.github/workflows/test-cygwin.yml +++ b/.github/workflows/test-cygwin.yml @@ -74,6 +74,7 @@ jobs: perl python3${{ matrix.python-minor-version }}-cython python3${{ matrix.python-minor-version }}-devel + python3${{ matrix.python-minor-version }}-ipython python3${{ matrix.python-minor-version }}-numpy python3${{ matrix.python-minor-version }}-sip python3${{ matrix.python-minor-version }}-tkinter diff --git a/Tests/test_image.py b/Tests/test_image.py index 719732d12..2afcf2efd 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -42,6 +42,12 @@ try: except ImportError: ElementTree = None +PrettyPrinter: type | None +try: + from IPython.lib.pretty import PrettyPrinter +except ImportError: + PrettyPrinter = None + # Deprecation helper def helper_image_new(mode: str, size: tuple[int, int]) -> Image.Image: @@ -91,16 +97,15 @@ class TestImage: # with pytest.raises(MemoryError): # Image.new("L", (1000000, 1000000)) + @pytest.mark.skipif(PrettyPrinter is None, reason="IPython is not installed") def test_repr_pretty(self) -> None: - class Pretty: - def text(self, text: str) -> None: - self.pretty_output = text - im = Image.new("L", (100, 100)) - p = Pretty() + output = io.StringIO() + assert PrettyPrinter is not None + p = PrettyPrinter(output) im._repr_pretty_(p, False) - assert p.pretty_output == "" + assert output.getvalue() == "" def test_open_formats(self) -> None: PNGFILE = "Tests/images/hopper.png" diff --git a/src/PIL/Image.py b/src/PIL/Image.py index a6eefff56..705d0a144 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -221,6 +221,8 @@ if TYPE_CHECKING: import mmap from xml.etree.ElementTree import Element + from IPython.lib.pretty import PrettyPrinter + from . import ImageFile, ImageFilter, ImagePalette, TiffImagePlugin from ._typing import NumpyArray, StrOrBytesPath, TypeGuard ID: list[str] = [] @@ -677,7 +679,7 @@ class Image: id(self), ) - def _repr_pretty_(self, p, cycle: bool) -> None: + def _repr_pretty_(self, p: PrettyPrinter, cycle: bool) -> None: """IPython plain text display support""" # Same as __repr__ but without unpredictable id(self), From e6e5ef5c5fbd83ac5dd63301e4d7d6860a7b2d09 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 21 Aug 2024 08:05:02 +1000 Subject: [PATCH 278/662] Added type hints --- Tests/test_file_tiff.py | 7 +++++ Tests/test_imagefile.py | 3 +- docs/reference/Image.rst | 1 + src/PIL/IcoImagePlugin.py | 4 +-- src/PIL/Image.py | 42 ++++++++++++++++++--------- src/PIL/ImageFile.py | 8 ++++-- src/PIL/IptcImagePlugin.py | 2 +- src/PIL/TiffImagePlugin.py | 59 ++++++++++++++++++++++---------------- 8 files changed, 80 insertions(+), 46 deletions(-) diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 8cad25272..190f83f40 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -684,6 +684,13 @@ class TestFileTiff: with Image.open(outfile) as reloaded: assert_image_equal_tofile(reloaded, infile) + def test_invalid_tiled_dimensions(self) -> None: + with open("Tests/images/tiff_tiled_planar_raw.tif", "rb") as fp: + data = fp.read() + b = BytesIO(data[:144] + b"\x02" + data[145:]) + with pytest.raises(ValueError): + Image.open(b) + @pytest.mark.parametrize("mode", ("P", "PA")) def test_palette(self, mode: str, tmp_path: Path) -> None: outfile = str(tmp_path / "temp.tif") diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index 95e91db83..a8bd798c1 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -412,9 +412,8 @@ class TestPyEncoder(CodecsTest): with pytest.raises(NotImplementedError): encoder.encode_to_pyfd() - fh = BytesIO() with pytest.raises(NotImplementedError): - encoder.encode_to_file(fh, 0) + encoder.encode_to_file(0, 0) def test_zero_height(self) -> None: with pytest.raises(UnidentifiedImageError): diff --git a/docs/reference/Image.rst b/docs/reference/Image.rst index 66c5e5422..02e714f20 100644 --- a/docs/reference/Image.rst +++ b/docs/reference/Image.rst @@ -363,6 +363,7 @@ Classes :show-inheritance: .. autoclass:: PIL.Image.ImagePointHandler .. autoclass:: PIL.Image.ImageTransformHandler +.. autoclass:: PIL.Image._E Protocols --------- diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py index 3bf5d9c04..926562497 100644 --- a/src/PIL/IcoImagePlugin.py +++ b/src/PIL/IcoImagePlugin.py @@ -319,11 +319,11 @@ class IcoImageFile(ImageFile.ImageFile): self.load() @property - def size(self): + def size(self) -> tuple[int, int]: return self._size @size.setter - def size(self, value): + def size(self, value: tuple[int, int]) -> None: if value not in self.info["sizes"]: msg = "This is not one of the allowed sizes of this image" raise ValueError(msg) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 705d0a144..ffc6bec34 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -504,7 +504,7 @@ class _E: return _E(self.scale / other, self.offset / other) -def _getscaleoffset(expr) -> tuple[float, float]: +def _getscaleoffset(expr: Callable[[_E], _E | float]) -> tuple[float, float]: a = expr(_E(1, 0)) return (a.scale, a.offset) if isinstance(a, _E) else (0, a) @@ -1894,7 +1894,13 @@ class Image: def point( self, - lut: Sequence[float] | NumpyArray | Callable[[int], float] | ImagePointHandler, + lut: ( + Sequence[float] + | NumpyArray + | Callable[[int], float] + | Callable[[_E], _E | float] + | ImagePointHandler + ), mode: str | None = None, ) -> Image: """ @@ -1930,10 +1936,10 @@ class Image: # check if the function can be used with point_transform # UNDONE wiredfool -- I think this prevents us from ever doing # a gamma function point transform on > 8bit images. - scale, offset = _getscaleoffset(lut) + scale, offset = _getscaleoffset(lut) # type: ignore[arg-type] return self._new(self.im.point_transform(scale, offset)) # for other modes, convert the function to a table - flatLut = [lut(i) for i in range(256)] * self.im.bands + flatLut = [lut(i) for i in range(256)] * self.im.bands # type: ignore[arg-type] else: flatLut = lut @@ -2869,11 +2875,11 @@ class Image: self, box: tuple[int, int, int, int], image: Image, - method, - data, + method: Transform, + data: Sequence[float], resample: int = Resampling.NEAREST, fill: bool = True, - ): + ) -> None: w = box[2] - box[0] h = box[3] - box[1] @@ -4008,15 +4014,19 @@ class Exif(_ExifBase): ifd[tag] = value return b"Exif\x00\x00" + head + ifd.tobytes(offset) - def get_ifd(self, tag): + def get_ifd(self, tag: int) -> dict[int, Any]: if tag not in self._ifds: if tag == ExifTags.IFD.IFD1: if self._info is not None and self._info.next != 0: - self._ifds[tag] = self._get_ifd_dict(self._info.next) + ifd = self._get_ifd_dict(self._info.next) + if ifd is not None: + self._ifds[tag] = ifd elif tag in [ExifTags.IFD.Exif, ExifTags.IFD.GPSInfo]: offset = self._hidden_data.get(tag, self.get(tag)) if offset is not None: - self._ifds[tag] = self._get_ifd_dict(offset, tag) + ifd = self._get_ifd_dict(offset, tag) + if ifd is not None: + self._ifds[tag] = ifd elif tag in [ExifTags.IFD.Interop, ExifTags.IFD.Makernote]: if ExifTags.IFD.Exif not in self._ifds: self.get_ifd(ExifTags.IFD.Exif) @@ -4073,7 +4083,9 @@ class Exif(_ExifBase): (offset,) = struct.unpack(">L", data) self.fp.seek(offset) - camerainfo = {"ModelID": self.fp.read(4)} + camerainfo: dict[str, int | bytes] = { + "ModelID": self.fp.read(4) + } self.fp.read(4) # Seconds since 2000 @@ -4089,16 +4101,18 @@ class Exif(_ExifBase): ][1] camerainfo["Parallax"] = handler( ImageFileDirectory_v2(), parallax, False - ) + )[0] self.fp.read(4) camerainfo["Category"] = self.fp.read(2) - makernote = {0x1101: dict(self._fixup_dict(camerainfo))} + makernote = {0x1101: camerainfo} self._ifds[tag] = makernote else: # Interop - self._ifds[tag] = self._get_ifd_dict(tag_data, tag) + ifd = self._get_ifd_dict(tag_data, tag) + if ifd is not None: + self._ifds[tag] = ifd ifd = self._ifds.get(tag, {}) if tag == ExifTags.IFD.Exif and self._hidden_data: ifd = { diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 73554fa53..fdeb81d7a 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -31,6 +31,7 @@ from __future__ import annotations import abc import io import itertools +import os import struct import sys from typing import IO, Any, NamedTuple @@ -555,7 +556,7 @@ def _encode_tile( fp: IO[bytes], tile: list[_Tile], bufsize: int, - fh, + fh: int | None, exc: BaseException | None = None, ) -> None: for encoder_name, extents, offset, args in tile: @@ -577,6 +578,7 @@ def _encode_tile( break else: # slight speedup: compress to real file object + assert fh is not None errcode = encoder.encode_to_file(fh, bufsize) if errcode < 0: raise _get_oserror(errcode, encoder=True) from exc @@ -801,7 +803,7 @@ class PyEncoder(PyCodec): self.fd.write(data) return bytes_consumed, errcode - def encode_to_file(self, fh: IO[bytes], bufsize: int) -> int: + def encode_to_file(self, fh: int, bufsize: int) -> int: """ :param fh: File handle. :param bufsize: Buffer size. @@ -814,5 +816,5 @@ class PyEncoder(PyCodec): while errcode == 0: status, errcode, buf = self.encode(bufsize) if status > 0: - fh.write(buf[status:]) + os.write(fh, buf[status:]) return errcode diff --git a/src/PIL/IptcImagePlugin.py b/src/PIL/IptcImagePlugin.py index 153243519..6ccf28aa1 100644 --- a/src/PIL/IptcImagePlugin.py +++ b/src/PIL/IptcImagePlugin.py @@ -214,7 +214,7 @@ def getiptcinfo( # as 4-byte integers, so we cannot use the get method...) try: data = im.tag_v2[TiffImagePlugin.IPTC_NAA_CHUNK] - except (AttributeError, KeyError): + except KeyError: pass if data is None: diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 7bbbc832e..5c6996a65 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -624,12 +624,12 @@ class ImageFileDirectory_v2(_IFDv2Base): self._tagdata: dict[int, bytes] = {} self.tagtype = {} # added 2008-06-05 by Florian Hoech self._next = None - self._offset = None + self._offset: int | None = None def __str__(self) -> str: return str(dict(self)) - def named(self): + def named(self) -> dict[str, Any]: """ :returns: dict of name|key: value @@ -643,7 +643,7 @@ class ImageFileDirectory_v2(_IFDv2Base): def __len__(self) -> int: return len(set(self._tagdata) | set(self._tags_v2)) - def __getitem__(self, tag): + def __getitem__(self, tag: int) -> Any: if tag not in self._tags_v2: # unpack on the fly data = self._tagdata[tag] typ = self.tagtype[tag] @@ -855,7 +855,7 @@ class ImageFileDirectory_v2(_IFDv2Base): raise OSError(msg) return ret - def load(self, fp): + def load(self, fp: IO[bytes]) -> None: self.reset() self._offset = fp.tell() @@ -1098,7 +1098,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2): for legacy_api in (False, True): self._setitem(tag, value, legacy_api) - def __getitem__(self, tag): + def __getitem__(self, tag: int) -> Any: if tag not in self._tags_v1: # unpack on the fly data = self._tagdata[tag] typ = self.tagtype[tag] @@ -1124,11 +1124,15 @@ class TiffImageFile(ImageFile.ImageFile): format_description = "Adobe TIFF" _close_exclusive_fp_after_loading = False - def __init__(self, fp=None, filename=None): - self.tag_v2 = None + def __init__( + self, + fp: StrOrBytesPath | IO[bytes] | None = None, + filename: str | bytes | None = None, + ) -> None: + self.tag_v2: ImageFileDirectory_v2 """ Image file directory (tag dictionary) """ - self.tag = None + self.tag: ImageFileDirectory_v1 """ Legacy tag entries """ super().__init__(fp, filename) @@ -1143,9 +1147,6 @@ class TiffImageFile(ImageFile.ImageFile): self.tag_v2 = ImageFileDirectory_v2(ifh) - # legacy IFD entries will be filled in later - self.ifd: ImageFileDirectory_v1 | None = None - # setup frame pointers self.__first = self.__next = self.tag_v2.next self.__frame = -1 @@ -1396,8 +1397,11 @@ class TiffImageFile(ImageFile.ImageFile): logger.debug("- YCbCr subsampling: %s", self.tag_v2.get(YCBCRSUBSAMPLING)) # size - xsize = int(self.tag_v2.get(IMAGEWIDTH)) - ysize = int(self.tag_v2.get(IMAGELENGTH)) + xsize = self.tag_v2.get(IMAGEWIDTH) + ysize = self.tag_v2.get(IMAGELENGTH) + if not isinstance(xsize, int) or not isinstance(ysize, int): + msg = "Invalid dimensions" + raise ValueError(msg) self._size = xsize, ysize logger.debug("- size: %s", self.size) @@ -1545,8 +1549,12 @@ class TiffImageFile(ImageFile.ImageFile): else: # tiled image offsets = self.tag_v2[TILEOFFSETS] - w = self.tag_v2.get(TILEWIDTH) + tilewidth = self.tag_v2.get(TILEWIDTH) h = self.tag_v2.get(TILELENGTH) + if not isinstance(tilewidth, int) or not isinstance(h, int): + msg = "Invalid tile dimensions" + raise ValueError(msg) + w = tilewidth for offset in offsets: if x + w > xsize: @@ -1624,7 +1632,7 @@ SAVE_INFO = { } -def _save(im, fp, filename): +def _save(im: Image.Image, fp, filename: str | bytes) -> None: try: rawmode, prefix, photo, format, bits, extra = SAVE_INFO[im.mode] except KeyError as e: @@ -1760,10 +1768,11 @@ def _save(im, fp, filename): if im.mode == "1": inverted_im = im.copy() px = inverted_im.load() - for y in range(inverted_im.height): - for x in range(inverted_im.width): - px[x, y] = 0 if px[x, y] == 255 else 255 - im = inverted_im + if px is not None: + for y in range(inverted_im.height): + for x in range(inverted_im.width): + px[x, y] = 0 if px[x, y] == 255 else 255 + im = inverted_im else: im = ImageOps.invert(im) @@ -1805,11 +1814,11 @@ def _save(im, fp, filename): ifd[COMPRESSION] = COMPRESSION_INFO_REV.get(compression, 1) if im.mode == "YCbCr": - for tag, value in { + for tag, default_value in { YCBCRSUBSAMPLING: (1, 1), REFERENCEBLACKWHITE: (0, 255, 128, 255, 128, 255), }.items(): - ifd.setdefault(tag, value) + ifd.setdefault(tag, default_value) blocklist = [TILEWIDTH, TILELENGTH, TILEOFFSETS, TILEBYTECOUNTS] if libtiff: @@ -1852,7 +1861,7 @@ def _save(im, fp, filename): ] # bits per sample is a single short in the tiff directory, not a list. - atts = {BITSPERSAMPLE: bits[0]} + atts: dict[int, Any] = {BITSPERSAMPLE: bits[0]} # Merge the ones that we have with (optional) more bits from # the original file, e.g x,y resolution so that we can # save(load('')) == original file. @@ -1923,13 +1932,15 @@ def _save(im, fp, filename): offset = ifd.save(fp) ImageFile._save( - im, fp, [("raw", (0, 0) + im.size, offset, (rawmode, stride, 1))] + im, + fp, + [ImageFile._Tile("raw", (0, 0) + im.size, offset, (rawmode, stride, 1))], ) # -- helper for multi-page save -- if "_debug_multipage" in encoderinfo: # just to access o32 and o16 (using correct byte order) - im._debug_multipage = ifd + setattr(im, "_debug_multipage", ifd) class AppendingTiffWriter: From 388fc78e36e60f45a9b5ff0cd3223e3b8bc2c307 Mon Sep 17 00:00:00 2001 From: Jeffrey 'Alex' Clark Date: Wed, 21 Aug 2024 15:32:06 -0400 Subject: [PATCH 279/662] Add/update project-makefile files --- Makefile | 4757 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 4644 insertions(+), 113 deletions(-) diff --git a/Makefile b/Makefile index 94f7565d8..4200f95da 100644 --- a/Makefile +++ b/Makefile @@ -1,125 +1,4656 @@ -.DEFAULT_GOAL := help +# Project Makefile +# +# A makefile to automate setup of a Wagtail CMS project and related tasks. +# +# https://github.com/aclark4life/project-makefile +# +# -------------------------------------------------------------------------------- +# Set the default goal to be `git commit -a -m $(GIT_MESSAGE)` and `git push` +# -------------------------------------------------------------------------------- -.PHONY: clean -clean: - rm src/PIL/*.so || true - rm -r build || true - find . -name __pycache__ | xargs rm -r || true +.DEFAULT_GOAL := git-commit -.PHONY: coverage -coverage: - python3 -c "import pytest" > /dev/null 2>&1 || python3 -m pip install pytest - python3 -m pytest -qq - rm -r htmlcov || true - python3 -c "import coverage" > /dev/null 2>&1 || python3 -m pip install coverage - python3 -m coverage report +# -------------------------------------------------------------------------------- +# Single line variables to be used by phony target rules +# -------------------------------------------------------------------------------- -.PHONY: doc -.PHONY: html -doc html: - python3 -c "import PIL" > /dev/null 2>&1 || python3 -m pip install . - $(MAKE) -C docs html +ADD_DIR := mkdir -pv +ADD_FILE := touch +AWS_OPTS := --no-cli-pager --output table +COPY_DIR := cp -rv +COPY_FILE := cp -v +DEL_DIR := rm -rv +DEL_FILE := rm -v +DJANGO_DB_COL = awk -F\= '{print $$2}' +DJANGO_DB_URL = eb ssh -c "source /opt/elasticbeanstalk/deployment/custom_env_var; env | grep DATABASE_URL" +DJANGO_DB_HOST = $(shell $(DJANGO_DB_URL) | $(DJANGO_DB_COL) |\ + python -c 'import dj_database_url; url = input(); url = dj_database_url.parse(url); print(url["HOST"])') +DJANGO_DB_NAME = $(shell $(DJANGO_DB_URL) | $(DJANGO_DB_COL) |\ + python -c 'import dj_database_url; url = input(); url = dj_database_url.parse(url); print(url["NAME"])') +DJANGO_DB_PASS = $(shell $(DJANGO_DB_URL) | $(DJANGO_DB_COL) |\ + python -c 'import dj_database_url; url = input(); url = dj_database_url.parse(url); print(url["PASSWORD"])') +DJANGO_DB_USER = $(shell $(DJANGO_DB_URL) | $(DJANGO_DB_COL) |\ + python -c 'import dj_database_url; url = input(); url = dj_database_url.parse(url); print(url["USER"])') +DJANGO_BACKEND_APPS_FILE := backend/apps.py +DJANGO_CUSTOM_ADMIN_FILE := backend/admin.py +DJANGO_FRONTEND_FILES = .babelrc .browserslistrc .eslintrc .nvmrc .stylelintrc.json frontend package-lock.json \ + package.json postcss.config.js +DJANGO_SETTINGS_DIR = backend/settings +DJANGO_SETTINGS_BASE_FILE = $(DJANGO_SETTINGS_DIR)/base.py +DJANGO_SETTINGS_DEV_FILE = $(DJANGO_SETTINGS_DIR)/dev.py +DJANGO_SETTINGS_PROD_FILE = $(DJANGO_SETTINGS_DIR)/production.py +DJANGO_SETTINGS_SECRET_KEY = $(shell openssl rand -base64 48) +DJANGO_URLS_FILE = backend/urls.py +EB_DIR_NAME := .elasticbeanstalk +EB_ENV_NAME ?= $(PROJECT_NAME)-$(GIT_BRANCH)-$(GIT_REV) +EB_PLATFORM ?= "Python 3.11 running on 64bit Amazon Linux 2023" +EC2_INSTANCE_MAX ?= 1 +EC2_INSTANCE_MIN ?= 1 +EC2_INSTANCE_PROFILE ?= aws-elasticbeanstalk-ec2-role +EC2_INSTANCE_TYPE ?= t4g.small +EC2_LB_TYPE ?= application +EDITOR_REVIEW = subl +GIT_ADD := git add +GIT_BRANCH = $(shell git branch --show-current) +GIT_BRANCHES = $(shell git branch -a) +GIT_CHECKOUT = git checkout +GIT_COMMIT_MSG = "Update $(PROJECT_NAME)" +GIT_COMMIT = git commit +GIT_PUSH = git push +GIT_PUSH_FORCE = git push --force-with-lease +GIT_REV = $(shell git rev-parse --short HEAD) +MAKEFILE_CUSTOM_FILE := project.mk +PACKAGE_NAME = $(shell echo $(PROJECT_NAME) | sed 's/-/_/g') +PAGER ?= less +PIP_ENSURE = python -m ensurepip +PIP_INSTALL_PLONE_CONSTRAINTS = https://dist.plone.org/release/6.0.11.1/constraints.txt +PROJECT_DIRS = backend contactpage home privacy siteuser +PROJECT_EMAIL := aclark@aclark.net +PROJECT_NAME = project-makefile +RANDIR := $(shell openssl rand -base64 12 | sed 's/\///g') +TMPDIR := $(shell mktemp -d) +UNAME := $(shell uname) +WAGTAIL_CLEAN_DIRS = backend contactpage dist frontend home logging_demo model_form_demo node_modules payments privacy search sitepage siteuser +WAGTAIL_CLEAN_FILES = .babelrc .browserslistrc .dockerignore .eslintrc .gitignore .nvmrc .stylelintrc.json Dockerfile db.sqlite3 docker-compose.yml manage.py package-lock.json package.json postcss.config.js requirements-test.txt requirements.txt -.PHONY: htmlview -htmlview: - python3 -c "import PIL" > /dev/null 2>&1 || python3 -m pip install . - $(MAKE) -C docs htmlview +# -------------------------------------------------------------------------------- +# Include $(MAKEFILE_CUSTOM_FILE) if it exists +# -------------------------------------------------------------------------------- -.PHONY: doccheck -doccheck: - $(MAKE) doc -# Don't make our tests rely on the links in the docs being up every single build. -# We don't control them. But do check, and update them to the target of their redirects. - $(MAKE) -C docs linkcheck || true +ifneq ($(wildcard $(MAKEFILE_CUSTOM_FILE)),) + include $(MAKEFILE_CUSTOM_FILE) +endif -.PHONY: docserve -docserve: - cd docs/_build/html && python3 -m http.server 2> /dev/null& +# -------------------------------------------------------------------------------- +# Multi-line variables to be used in phony target rules +# -------------------------------------------------------------------------------- -.PHONY: help -help: - @echo "Welcome to Pillow development. Please use \`make \` where is one of" - @echo " clean remove build products" - @echo " coverage run coverage test (in progress)" - @echo " doc make HTML docs" - @echo " docserve run an HTTP server on the docs directory" - @echo " html make HTML docs" - @echo " htmlview open the index page built by the html target in your browser" - @echo " install make and install" - @echo " install-coverage make and install with C coverage" - @echo " lint run the lint checks" - @echo " lint-fix run Ruff to (mostly) fix lint issues" - @echo " release-test run code and package tests before release" - @echo " test run tests on installed Pillow" +define DJANGO_ALLAUTH_BASE_TEMPLATE +{% extends 'base.html' %} +endef -.PHONY: install -install: - python3 -m pip -v install . - python3 selftest.py - -.PHONY: install-coverage -install-coverage: - CFLAGS="-coverage -Werror=implicit-function-declaration" python3 -m pip -v install . - python3 selftest.py - -.PHONY: debug -debug: -# make a debug version if we don't have a -dbg python. Leaves in symbols -# for our stuff, kills optimization, and redirects to dev null so we -# see any build failures. - make clean > /dev/null - CFLAGS='-g -O0' python3 -m pip -v install . > /dev/null - -.PHONY: release-test -release-test: - python3 Tests/check_release_notes.py - python3 -m pip install -e .[tests] - python3 selftest.py - python3 -m pytest Tests - python3 -m pip install . - python3 -m pytest -qq - python3 -m check_manifest - python3 -m pyroma . - $(MAKE) readme - -.PHONY: sdist -sdist: - python3 -m build --help > /dev/null 2>&1 || python3 -m pip install build - python3 -m build --sdist - python3 -m twine --help > /dev/null 2>&1 || python3 -m pip install twine - python3 -m twine check --strict dist/* - -.PHONY: test -test: - python3 -c "import pytest" > /dev/null 2>&1 || python3 -m pip install pytest - python3 -m pytest -qq - -.PHONY: valgrind -valgrind: - python3 -c "import pytest_valgrind" > /dev/null 2>&1 || python3 -m pip install pytest-valgrind - PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss-fuzz/python.supp --leak-check=no \ - --log-file=/tmp/valgrind-output \ - python3 -m pytest --no-memcheck -vv --valgrind --valgrind-log=/tmp/valgrind-output - -.PHONY: readme -readme: - python3 -c "import markdown2" > /dev/null 2>&1 || python3 -m pip install markdown2 - python3 -m markdown2 README.md > .long-description.html && open .long-description.html +define DJANGO_API_SERIALIZERS +from rest_framework import serializers +from siteuser.models import User -.PHONY: lint -lint: - python3 -c "import tox" > /dev/null 2>&1 || python3 -m pip install tox - python3 -m tox -e lint +class UserSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = User + fields = ["url", "username", "email", "is_staff"] +endef -.PHONY: lint-fix -lint-fix: - python3 -c "import black" > /dev/null 2>&1 || python3 -m pip install black - python3 -m black . - python3 -c "import ruff" > /dev/null 2>&1 || python3 -m pip install ruff - python3 -m ruff --fix . +define DJANGO_API_VIEWS +from ninja import NinjaAPI +from rest_framework import viewsets +from siteuser.models import User +from .serializers import UserSerializer -.PHONY: mypy -mypy: - python3 -c "import tox" > /dev/null 2>&1 || python3 -m pip install tox - python3 -m tox -e mypy +api = NinjaAPI() + + +@api.get("/hello") +def hello(request): + return "Hello world" + + +class UserViewSet(viewsets.ModelViewSet): + queryset = User.objects.all() + serializer_class = UserSerializer +endef + +define DJANGO_APP_TESTS +from django.test import TestCase +from django.urls import reverse +from .models import YourModel +from .forms import YourForm + + +class YourModelTest(TestCase): + def setUp(self): + self.instance = YourModel.objects.create(field1="value1", field2="value2") + + def test_instance_creation(self): + self.assertIsInstance(self.instance, YourModel) + self.assertEqual(self.instance.field1, "value1") + self.assertEqual(self.instance.field2, "value2") + + def test_str_method(self): + self.assertEqual(str(self.instance), "Expected String Representation") + + +class YourViewTest(TestCase): + def setUp(self): + self.instance = YourModel.objects.create(field1="value1", field2="value2") + + def test_view_url_exists_at_desired_location(self): + response = self.client.get("/your-url/") + self.assertEqual(response.status_code, 200) + + def test_view_url_accessible_by_name(self): + response = self.client.get(reverse("your-view-name")) + self.assertEqual(response.status_code, 200) + + def test_view_uses_correct_template(self): + response = self.client.get(reverse("your-view-name")) + self.assertEqual(response.status_code, 200) + self.assertTemplateUsed(response, "your_template.html") + + def test_view_context(self): + response = self.client.get(reverse("your-view-name")) + self.assertEqual(response.status_code, 200) + self.assertIn("context_variable", response.context) + + +class YourFormTest(TestCase): + def test_form_valid_data(self): + form = YourForm(data={"field1": "value1", "field2": "value2"}) + self.assertTrue(form.is_valid()) + + def test_form_invalid_data(self): + form = YourForm(data={"field1": "", "field2": "value2"}) + self.assertFalse(form.is_valid()) + self.assertIn("field1", form.errors) + + def test_form_save(self): + form = YourForm(data={"field1": "value1", "field2": "value2"}) + if form.is_valid(): + instance = form.save() + self.assertEqual(instance.field1, "value1") + self.assertEqual(instance.field2, "value2") +endef + +define DJANGO_BACKEND_APPS +from django.contrib.admin.apps import AdminConfig + + +class CustomAdminConfig(AdminConfig): + default_site = "backend.admin.CustomAdminSite" +endef + +define DJANGO_BASE_TEMPLATE +{% load static webpack_loader %} + + + + + + {% block title %}{% endblock %} + {% block title_suffix %}{% endblock %} + + + {% stylesheet_pack 'app' %} + {% block extra_css %}{# Override this in templates to add extra stylesheets #}{% endblock %} + + {% include 'favicon.html' %} + {% csrf_token %} + + +

    +
    + {% include 'header.html' %} + {% if messages %} +
    + {% for message in messages %} + + {% endfor %} +
    + {% endif %} +
    + {% block content %}{% endblock %} +
    +
    + {% include 'footer.html' %} + {% include 'offcanvas.html' %} + {% javascript_pack 'app' %} + {% block extra_js %}{# Override this in templates to add extra javascript #}{% endblock %} + + +endef + +define DJANGO_CUSTOM_ADMIN +from django.contrib.admin import AdminSite + + +class CustomAdminSite(AdminSite): + site_header = "Project Makefile" + site_title = "Project Makefile" + index_title = "Project Makefile" + + +custom_admin_site = CustomAdminSite(name="custom_admin") +endef + +define DJANGO_DOCKERCOMPOSE +version: '3' + +services: + db: + image: postgres:latest + volumes: + - postgres_data:/var/lib/postgresql/data + environment: + POSTGRES_DB: project + POSTGRES_USER: admin + POSTGRES_PASSWORD: admin + + web: + build: . + command: sh -c "python manage.py migrate && gunicorn project.wsgi:application -b 0.0.0.0:8000" + volumes: + - .:/app + ports: + - "8000:8000" + depends_on: + - db + environment: + DATABASE_URL: postgres://admin:admin@db:5432/project + +volumes: + postgres_data: +endef + +define DJANGO_DOCKERFILE +FROM amazonlinux:2023 +RUN dnf install -y shadow-utils python3.11 python3.11-pip make nodejs20-npm nodejs postgresql15 postgresql15-server +USER postgres +RUN initdb -D /var/lib/pgsql/data +USER root +RUN useradd wagtail +EXPOSE 8000 +ENV PYTHONUNBUFFERED=1 PORT=8000 +COPY requirements.txt / +RUN python3.11 -m pip install -r /requirements.txt +WORKDIR /app +RUN chown wagtail:wagtail /app +COPY --chown=wagtail:wagtail . . +USER wagtail +RUN npm-20 install; npm-20 run build +RUN python3.11 manage.py collectstatic --noinput --clear +CMD set -xe; pg_ctl -D /var/lib/pgsql/data -l /tmp/logfile start; python3.11 manage.py migrate --noinput; gunicorn backend.wsgi:application +endef + +define DJANGO_FAVICON_TEMPLATE +{% load static %} + +endef + +define DJANGO_FOOTER_TEMPLATE + +endef + +define DJANGO_FRONTEND_APP +import React from 'react'; +import { createRoot } from 'react-dom/client'; +import 'bootstrap'; +import '@fortawesome/fontawesome-free/js/fontawesome'; +import '@fortawesome/fontawesome-free/js/solid'; +import '@fortawesome/fontawesome-free/js/regular'; +import '@fortawesome/fontawesome-free/js/brands'; +import getDataComponents from '../dataComponents'; +import UserContextProvider from '../context'; +import * as components from '../components'; +import "../styles/index.scss"; +import "../styles/theme-blue.scss"; +import "./config"; + +const { ErrorBoundary } = components; +const dataComponents = getDataComponents(components); +const container = document.getElementById('app'); +const root = createRoot(container); +const App = () => ( + + + {dataComponents} + + +); +root.render(); +endef + +define DJANGO_FRONTEND_APP_CONFIG +import '../utils/themeToggler.js'; +// import '../utils/tinymce.js'; +endef + +define DJANGO_FRONTEND_BABELRC +{ + "presets": [ + [ + "@babel/preset-react", + ], + [ + "@babel/preset-env", + { + "useBuiltIns": "usage", + "corejs": "3.0.0" + } + ] + ], + "plugins": [ + "@babel/plugin-syntax-dynamic-import", + "@babel/plugin-transform-class-properties" + ] +} +endef + +define DJANGO_FRONTEND_COMPONENTS +export { default as ErrorBoundary } from './ErrorBoundary'; +export { default as UserMenu } from './UserMenu'; +endef + +define DJANGO_FRONTEND_COMPONENT_CLOCK +// Via ChatGPT +import React, { useState, useEffect, useCallback, useRef } from 'react'; +import PropTypes from 'prop-types'; + +const Clock = ({ color = '#fff' }) => { + const [date, setDate] = useState(new Date()); + const [blink, setBlink] = useState(true); + const timerID = useRef(); + + const tick = useCallback(() => { + setDate(new Date()); + setBlink(prevBlink => !prevBlink); + }, []); + + useEffect(() => { + timerID.current = setInterval(() => tick(), 1000); + + // Return a cleanup function to be run on component unmount + return () => clearInterval(timerID.current); + }, [tick]); + + const formattedDate = date.toLocaleDateString(undefined, { + weekday: 'short', + year: 'numeric', + month: 'short', + day: 'numeric', + }); + + const formattedTime = date.toLocaleTimeString(undefined, { + hour: 'numeric', + minute: 'numeric', + }); + + return ( + <> +
    {formattedDate} {formattedTime}
    + + ); +}; + +Clock.propTypes = { + color: PropTypes.string, +}; + +export default Clock; +endef + +define DJANGO_FRONTEND_COMPONENT_ERROR +import { Component } from 'react'; +import PropTypes from 'prop-types'; + +class ErrorBoundary extends Component { + constructor (props) { + super(props); + this.state = { hasError: false }; + } + + static getDerivedStateFromError () { + return { hasError: true }; + } + + componentDidCatch (error, info) { + const { onError } = this.props; + console.error(error); + onError && onError(error, info); + } + + render () { + const { children = null } = this.props; + const { hasError } = this.state; + + return hasError ? null : children; + } +} + +ErrorBoundary.propTypes = { + onError: PropTypes.func, + children: PropTypes.node, +}; + +export default ErrorBoundary; +endef + +define DJANGO_FRONTEND_COMPONENT_USER_MENU +// UserMenu.js +import React from 'react'; +import PropTypes from 'prop-types'; + +function handleLogout() { + window.location.href = '/accounts/logout'; +} + +const UserMenu = ({ isAuthenticated, isSuperuser, textColor }) => { + return ( +
    + {isAuthenticated ? ( +
  1. + + +
    2. + ) : ( +
  2. + +
    3. + )} +
    + ); +}; + +UserMenu.propTypes = { + isAuthenticated: PropTypes.bool.isRequired, + isSuperuser: PropTypes.bool.isRequired, + textColor: PropTypes.string, +}; + +export default UserMenu; +endef + +define DJANGO_FRONTEND_CONTEXT_INDEX +export { UserContextProvider as default } from './UserContextProvider'; +endef + +define DJANGO_FRONTEND_CONTEXT_USER_PROVIDER +// UserContextProvider.js +import React, { createContext, useContext, useState } from 'react'; +import PropTypes from 'prop-types'; + +const UserContext = createContext(); + +export const UserContextProvider = ({ children }) => { + const [isAuthenticated, setIsAuthenticated] = useState(false); + + const login = () => { + try { + // Add logic to handle login, set isAuthenticated to true + setIsAuthenticated(true); + } catch (error) { + console.error('Login error:', error); + // Handle error, e.g., show an error message to the user + } + }; + + const logout = () => { + try { + // Add logic to handle logout, set isAuthenticated to false + setIsAuthenticated(false); + } catch (error) { + console.error('Logout error:', error); + // Handle error, e.g., show an error message to the user + } + }; + + return ( + + {children} + + ); +}; + +UserContextProvider.propTypes = { + children: PropTypes.node.isRequired, +}; + +export const useUserContext = () => { + const context = useContext(UserContext); + + if (!context) { + throw new Error('useUserContext must be used within a UserContextProvider'); + } + + return context; +}; + +// Add PropTypes for the return value of useUserContext +useUserContext.propTypes = { + isAuthenticated: PropTypes.bool.isRequired, + login: PropTypes.func.isRequired, + logout: PropTypes.func.isRequired, +}; +endef + +define DJANGO_FRONTEND_ESLINTRC +{ + "env": { + "browser": true, + "es2021": true, + "node": true + }, + "extends": [ + "eslint:recommended", + "plugin:react/recommended" + ], + "overrides": [ + { + "env": { + "node": true + }, + "files": [ + ".eslintrc.{js,cjs}" + ], + "parserOptions": { + "sourceType": "script" + } + } + ], + "parserOptions": { + "ecmaVersion": "latest", + "sourceType": "module" + }, + "plugins": [ + "react" + ], + "rules": { + "no-unused-vars": "off" + }, + settings: { + react: { + version: 'detect', + }, + }, +} +endef + +define DJANGO_FRONTEND_OFFCANVAS_TEMPLATE +
    +
    + {{ current_site.site_name|default:"Project Makefile" }} + +
    +
    +
      +
    • + Home +
      • + {% for child in current_site.root_page.get_children %} +
    • + {{ child }} +
      • + {% endfor %} + +
      +
    +
    +
    +endef + +define DJANGO_FRONTEND_PORTAL +// Via pwellever +import React from 'react'; +import { createPortal } from 'react-dom'; + +const parseProps = data => Object.entries(data).reduce((result, [key, value]) => { + if (value.toLowerCase() === 'true') { + value = true; + } else if (value.toLowerCase() === 'false') { + value = false; + } else if (value.toLowerCase() === 'null') { + value = null; + } else if (!isNaN(parseFloat(value)) && isFinite(value)) { + // Parse numeric value + value = parseFloat(value); + } else if ( + (value[0] === '[' && value.slice(-1) === ']') || (value[0] === '{' && value.slice(-1) === '}') + ) { + // Parse JSON strings + value = JSON.parse(value); + } + + result[key] = value; + return result; +}, {}); + +// This method of using portals instead of calling ReactDOM.render on individual components +// ensures that all components are mounted under a single React tree, and are therefore able +// to share context. + +export default function getPageComponents (components) { + const getPortalComponent = domEl => { + // The element's "data-component" attribute is used to determine which component to render. + // All other "data-*" attributes are passed as props. + const { component: componentName, ...rest } = domEl.dataset; + const Component = components[componentName]; + if (!Component) { + console.error(`Component "$${componentName}" not found.`); + return null; + } + const props = parseProps(rest); + domEl.innerHTML = ''; + + // eslint-disable-next-line no-unused-vars + const { ErrorBoundary } = components; + return createPortal( + + + , + domEl, + ); + }; + + return Array.from(document.querySelectorAll('[data-component]')).map(getPortalComponent); +} +endef + +define DJANGO_FRONTEND_STYLES +// If you comment out code below, bootstrap will use red as primary color +// and btn-primary will become red + +// $primary: red; + +@import "~bootstrap/scss/bootstrap.scss"; + +.jumbotron { + // should be relative path of the entry scss file + background-image: url("../../vendors/images/sample.jpg"); + background-size: cover; +} + +#theme-toggler-authenticated:hover { + cursor: pointer; /* Change cursor to pointer on hover */ + color: #007bff; /* Change color on hover */ +} + +#theme-toggler-anonymous:hover { + cursor: pointer; /* Change cursor to pointer on hover */ + color: #007bff; /* Change color on hover */ +} +endef + +define DJANGO_FRONTEND_THEME_BLUE +@import "~bootstrap/scss/bootstrap.scss"; + +[data-bs-theme="blue"] { + --bs-body-color: var(--bs-white); + --bs-body-color-rgb: #{to-rgb($$white)}; + --bs-body-bg: var(--bs-blue); + --bs-body-bg-rgb: #{to-rgb($$blue)}; + --bs-tertiary-bg: #{$$blue-600}; + + .dropdown-menu { + --bs-dropdown-bg: #{color-mix($$blue-500, $$blue-600)}; + --bs-dropdown-link-active-bg: #{$$blue-700}; + } + + .btn-secondary { + --bs-btn-bg: #{color-mix($gray-600, $blue-400, .5)}; + --bs-btn-border-color: #{rgba($$white, .25)}; + --bs-btn-hover-bg: #{color-adjust(color-mix($gray-600, $blue-400, .5), 5%)}; + --bs-btn-hover-border-color: #{rgba($$white, .25)}; + --bs-btn-active-bg: #{color-adjust(color-mix($gray-600, $blue-400, .5), 10%)}; + --bs-btn-active-border-color: #{rgba($$white, .5)}; + --bs-btn-focus-border-color: #{rgba($$white, .5)}; + + // --bs-btn-focus-box-shadow: 0 0 0 .25rem rgba(255, 255, 255, 20%); + } +} +endef + +define DJANGO_FRONTEND_THEME_TOGGLER +document.addEventListener('DOMContentLoaded', function () { + const rootElement = document.documentElement; + const anonThemeToggle = document.getElementById('theme-toggler-anonymous'); + const authThemeToggle = document.getElementById('theme-toggler-authenticated'); + if (authThemeToggle) { + localStorage.removeItem('data-bs-theme'); + } + const anonSavedTheme = localStorage.getItem('data-bs-theme'); + if (anonSavedTheme) { + rootElement.setAttribute('data-bs-theme', anonSavedTheme); + } + if (anonThemeToggle) { + anonThemeToggle.addEventListener('click', function () { + const currentTheme = rootElement.getAttribute('data-bs-theme') || 'light'; + const newTheme = currentTheme === 'light' ? 'dark' : 'light'; + rootElement.setAttribute('data-bs-theme', newTheme); + localStorage.setItem('data-bs-theme', newTheme); + }); + } + if (authThemeToggle) { + const csrfToken = document.querySelector('[name=csrfmiddlewaretoken]').value; + authThemeToggle.addEventListener('click', function () { + const currentTheme = rootElement.getAttribute('data-bs-theme') || 'light'; + const newTheme = currentTheme === 'light' ? 'dark' : 'light'; + fetch('/user/update_theme_preference/', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'X-CSRFToken': csrfToken, // Include the CSRF token in the headers + }, + body: JSON.stringify({ theme: newTheme }), + }) + .then(response => response.json()) + .then(data => { + rootElement.setAttribute('data-bs-theme', newTheme); + }) + .catch(error => { + console.error('Error updating theme preference:', error); + }); + }); + } +}); +endef + +define DJANGO_HEADER_TEMPLATE +
    +
    + +
    +
    +endef + +define DJANGO_HOME_PAGE_ADMIN +from django.contrib import admin # noqa + +# Register your models here. +endef + +define DJANGO_HOME_PAGE_MODELS +from django.db import models # noqa + +# Create your models here. +endef + +define DJANGO_HOME_PAGE_TEMPLATE +{% extends "base.html" %} +{% block content %} +
    +
    +{% endblock %} +endef + +define DJANGO_HOME_PAGE_URLS +from django.urls import path +from .views import HomeView + +urlpatterns = [path("", HomeView.as_view(), name="home")] +endef + +define DJANGO_HOME_PAGE_VIEWS +from django.views.generic import TemplateView + + +class HomeView(TemplateView): + template_name = "home.html" +endef + +define DJANGO_LOGGING_DEMO_ADMIN +# Register your models here. +endef + +define DJANGO_LOGGING_DEMO_MODELS +from django.db import models # noqa + +# Create your models here. +endef + +define DJANGO_LOGGING_DEMO_SETTINGS +INSTALLED_APPS.append("logging_demo") # noqa +endef + +define DJANGO_LOGGING_DEMO_URLS +from django.urls import path +from .views import logging_demo + +urlpatterns = [ + path("", logging_demo, name="logging_demo"), +] +endef + +define DJANGO_LOGGING_DEMO_VIEWS +from django.http import HttpResponse +import logging + +logger = logging.getLogger(__name__) + + +def logging_demo(request): + logger.debug("Hello, world!") + return HttpResponse("Hello, world!") +endef + +define DJANGO_MANAGE_PY +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" + +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "backend.settings.dev") + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == "__main__": + main() +endef + +define DJANGO_MODEL_FORM_DEMO_ADMIN +from django.contrib import admin +from .models import ModelFormDemo + + +@admin.register(ModelFormDemo) +class ModelFormDemoAdmin(admin.ModelAdmin): + pass +endef + +define DJANGO_MODEL_FORM_DEMO_FORMS +from django import forms +from .models import ModelFormDemo + + +class ModelFormDemoForm(forms.ModelForm): + class Meta: + model = ModelFormDemo + fields = ["name", "email", "age", "is_active"] +endef + +define DJANGO_MODEL_FORM_DEMO_MODEL +from django.db import models +from django.shortcuts import reverse + + +class ModelFormDemo(models.Model): + name = models.CharField(max_length=100, blank=True, null=True) + email = models.EmailField(blank=True, null=True) + age = models.IntegerField(blank=True, null=True) + is_active = models.BooleanField(default=True) + created_at = models.DateTimeField(auto_now_add=True) + + def __str__(self): + return self.name or f"test-model-{self.pk}" + + def get_absolute_url(self): + return reverse("model_form_demo_detail", kwargs={"pk": self.pk}) +endef + +define DJANGO_MODEL_FORM_DEMO_TEMPLATE_DETAIL +{% extends 'base.html' %} +{% block content %} +

    Test Model Detail: {{ model_form_demo.name }}

    +

    Name: {{ model_form_demo.name }}

    +

    Email: {{ model_form_demo.email }}

    +

    Age: {{ model_form_demo.age }}

    +

    Active: {{ model_form_demo.is_active }}

    +

    Created At: {{ model_form_demo.created_at }}

    + Edit Test Model +{% endblock %} +endef + +define DJANGO_MODEL_FORM_DEMO_TEMPLATE_FORM +{% extends 'base.html' %} +{% block content %} +

    + {% if form.instance.pk %} + Update Test Model + {% else %} + Create Test Model + {% endif %} +

    +
    + {% csrf_token %} + {{ form.as_p }} + +
    +{% endblock %} +endef + +define DJANGO_MODEL_FORM_DEMO_TEMPLATE_LIST +{% extends 'base.html' %} +{% block content %} +

    Test Models List

    + + Create New Test Model +{% endblock %} +endef + +define DJANGO_MODEL_FORM_DEMO_URLS +from django.urls import path +from .views import ( + ModelFormDemoListView, + ModelFormDemoCreateView, + ModelFormDemoUpdateView, + ModelFormDemoDetailView, +) + +urlpatterns = [ + path("", ModelFormDemoListView.as_view(), name="model_form_demo_list"), + path("create/", ModelFormDemoCreateView.as_view(), name="model_form_demo_create"), + path( + "/update/", + ModelFormDemoUpdateView.as_view(), + name="model_form_demo_update", + ), + path("/", ModelFormDemoDetailView.as_view(), name="model_form_demo_detail"), +] +endef + +define DJANGO_MODEL_FORM_DEMO_VIEWS +from django.views.generic import ListView, CreateView, UpdateView, DetailView +from .models import ModelFormDemo +from .forms import ModelFormDemoForm + + +class ModelFormDemoListView(ListView): + model = ModelFormDemo + template_name = "model_form_demo_list.html" + context_object_name = "model_form_demos" + + +class ModelFormDemoCreateView(CreateView): + model = ModelFormDemo + form_class = ModelFormDemoForm + template_name = "model_form_demo_form.html" + + def form_valid(self, form): + form.instance.created_by = self.request.user + return super().form_valid(form) + + +class ModelFormDemoUpdateView(UpdateView): + model = ModelFormDemo + form_class = ModelFormDemoForm + template_name = "model_form_demo_form.html" + + +class ModelFormDemoDetailView(DetailView): + model = ModelFormDemo + template_name = "model_form_demo_detail.html" + context_object_name = "model_form_demo" +endef + +define DJANGO_PAYMENTS_ADMIN +from django.contrib import admin +from .models import Product, Order + +admin.site.register(Product) +admin.site.register(Order) +endef + +define DJANGO_PAYMENTS_FORM +from django import forms + + +class PaymentsForm(forms.Form): + stripeToken = forms.CharField(widget=forms.HiddenInput()) + amount = forms.DecimalField( + max_digits=10, decimal_places=2, widget=forms.HiddenInput() + ) +endef + +define DJANGO_PAYMENTS_MIGRATION_0002 +from django.db import migrations +import os +import secrets +import logging + +logger = logging.getLogger(__name__) + + +def generate_default_key(): + return "sk_test_" + secrets.token_hex(24) + + +def set_stripe_api_keys(apps, schema_editor): + # Get the Stripe API Key model + APIKey = apps.get_model("djstripe", "APIKey") + + # Fetch the keys from environment variables or generate default keys + test_secret_key = os.environ.get("STRIPE_TEST_SECRET_KEY", generate_default_key()) + live_secret_key = os.environ.get("STRIPE_LIVE_SECRET_KEY", generate_default_key()) + + logger.info("STRIPE_TEST_SECRET_KEY: %s", test_secret_key) + logger.info("STRIPE_LIVE_SECRET_KEY: %s", live_secret_key) + + # Check if the keys are not already in the database + if not APIKey.objects.filter(secret=test_secret_key).exists(): + APIKey.objects.create(secret=test_secret_key, livemode=False) + logger.info("Added test secret key to the database.") + else: + logger.info("Test secret key already exists in the database.") + + if not APIKey.objects.filter(secret=live_secret_key).exists(): + APIKey.objects.create(secret=live_secret_key, livemode=True) + logger.info("Added live secret key to the database.") + else: + logger.info("Live secret key already exists in the database.") + + +class Migration(migrations.Migration): + + dependencies = [ + ("payments", "0001_initial"), + ] + + operations = [ + migrations.RunPython(set_stripe_api_keys), + ] +endef + +define DJANGO_PAYMENTS_MIGRATION_0003 +from django.db import migrations + + +def create_initial_products(apps, schema_editor): + Product = apps.get_model("payments", "Product") + Product.objects.create(name="T-shirt", description="A cool T-shirt", price=20.00) + Product.objects.create(name="Mug", description="A nice mug", price=10.00) + Product.objects.create(name="Hat", description="A stylish hat", price=15.00) + + +class Migration(migrations.Migration): + dependencies = [ + ( + "payments", + "0002_set_stripe_api_keys", + ), + ] + + operations = [ + migrations.RunPython(create_initial_products), + ] +endef + +define DJANGO_PAYMENTS_MODELS +from django.db import models + + +class Product(models.Model): + name = models.CharField(max_length=100) + description = models.TextField() + price = models.DecimalField(max_digits=10, decimal_places=2) + + def __str__(self): + return self.name + + +class Order(models.Model): + product = models.ForeignKey(Product, on_delete=models.CASCADE) + created_at = models.DateTimeField(auto_now_add=True) + stripe_checkout_session_id = models.CharField(max_length=200) + + def __str__(self): + return f"Order {self.id} for {self.product.name}" +endef + +define DJANGO_PAYMENTS_TEMPLATE_CANCEL +{% extends "base.html" %} +{% block title %}Cancel{% endblock %} +{% block content %} +

    Payment Cancelled

    +

    Your payment was cancelled.

    +{% endblock %} +endef + +define DJANGO_PAYMENTS_TEMPLATE_CHECKOUT +{% extends "base.html" %} +{% block title %}Checkout{% endblock %} +{% block content %} +

    Checkout

    +
    + {% csrf_token %} + +
    +{% endblock %} +endef + +define DJANGO_PAYMENTS_TEMPLATE_PRODUCT_DETAIL +{% extends "base.html" %} +{% block title %}{{ product.name }}{% endblock %} +{% block content %} +

    {{ product.name }}

    +

    {{ product.description }}

    +

    Price: ${{ product.price }}

    +
    + {% csrf_token %} + + +
    +{% endblock %} +endef + +define DJANGO_PAYMENTS_TEMPLATE_PRODUCT_LIST +{% extends "base.html" %} +{% block title %}Products{% endblock %} +{% block content %} +

    Products

    + +{% endblock %} +endef + +define DJANGO_PAYMENTS_TEMPLATE_SUCCESS +{% extends "base.html" %} +{% block title %}Success{% endblock %} +{% block content %} +

    Payment Successful

    +

    Thank you for your purchase!

    +{% endblock %} +endef + +define DJANGO_PAYMENTS_URLS +from django.urls import path +from .views import ( + CheckoutView, + SuccessView, + CancelView, + ProductListView, + ProductDetailView, +) + +urlpatterns = [ + path("", ProductListView.as_view(), name="product_list"), + path("product//", ProductDetailView.as_view(), name="product_detail"), + path("checkout/", CheckoutView.as_view(), name="checkout"), + path("success/", SuccessView.as_view(), name="success"), + path("cancel/", CancelView.as_view(), name="cancel"), +] +endef + +define DJANGO_PAYMENTS_VIEW +from django.conf import settings +from django.shortcuts import render, redirect, get_object_or_404 +from django.views.generic import TemplateView, View, ListView, DetailView +import stripe +from .models import Product, Order + +stripe.api_key = settings.STRIPE_TEST_SECRET_KEY + + +class ProductListView(ListView): + model = Product + template_name = "payments/product_list.html" + context_object_name = "products" + + +class ProductDetailView(DetailView): + model = Product + template_name = "payments/product_detail.html" + context_object_name = "product" + + +class CheckoutView(View): + template_name = "payments/checkout.html" + + def get(self, request, *args, **kwargs): + products = Product.objects.all() + return render(request, self.template_name, {"products": products}) + + def post(self, request, *args, **kwargs): + product_id = request.POST.get("product_id") + product = get_object_or_404(Product, id=product_id) + + session = stripe.checkout.Session.create( + payment_method_types=["card"], + line_items=[ + { + "price_data": { + "currency": "usd", + "product_data": { + "name": product.name, + }, + "unit_amount": int(product.price * 100), + }, + "quantity": 1, + } + ], + mode="payment", + success_url="http://localhost:8000/payments/success/", + cancel_url="http://localhost:8000/payments/cancel/", + ) + + Order.objects.create(product=product, stripe_checkout_session_id=session.id) + return redirect(session.url, code=303) + + +class SuccessView(TemplateView): + + template_name = "payments/success.html" + + +class CancelView(TemplateView): + + template_name = "payments/cancel.html" +endef + +define DJANGO_SEARCH_FORMS +from django import forms + + +class SearchForm(forms.Form): + query = forms.CharField(max_length=100, required=True, label="Search") + +endef + +define DJANGO_SEARCH_SETTINGS +SEARCH_MODELS = [ + # Add search models here. +] +endef + +define DJANGO_SEARCH_TEMPLATE +{% extends "base.html" %} +{% block body_class %}template-searchresults{% endblock %} +{% block title %}Search{% endblock %} +{% block content %} +

    Search

    +
    + + +
    + {% if search_results %} +
      + {% for result in search_results %} +
    • +

      + {{ result }} +

      + {% if result.search_description %}{{ result.search_description }}{% endif %} +
      • + {% endfor %} +
    + {% if search_results.has_previous %} + Previous + {% endif %} + {% if search_results.has_next %} + Next + {% endif %} + {% elif search_query %} + No results found + {% else %} + No results found. Try a test query? + {% endif %} +{% endblock %} +endef + +define DJANGO_SEARCH_URLS +from django.urls import path +from .views import SearchView + +urlpatterns = [ + path("search/", SearchView.as_view(), name="search"), +] +endef + +define DJANGO_SEARCH_UTILS +from django.apps import apps +from django.conf import settings + +def get_search_models(): + models = [] + for model_path in settings.SEARCH_MODELS: + app_label, model_name = model_path.split(".") + model = apps.get_model(app_label, model_name) + models.append(model) + return models +endef + +define DJANGO_SEARCH_VIEWS +from django.views.generic import ListView +from django.db import models +from django.db.models import Q +from .forms import SearchForm +from .utils import get_search_models + + +class SearchView(ListView): + template_name = "your_app/search_results.html" + context_object_name = "results" + paginate_by = 10 + + def get_queryset(self): + form = SearchForm(self.request.GET) + query = None + results = [] + + if form.is_valid(): + query = form.cleaned_data["query"] + search_models = get_search_models() + + for model in search_models: + fields = [f.name for f in model._meta.fields if isinstance(f, (models.CharField, models.TextField))] + queries = [Q(**{f"{field}__icontains": query}) for field in fields] + model_results = model.objects.filter(queries.pop()) + + for item in queries: + model_results = model_results.filter(item) + + results.extend(model_results) + + return results + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["form"] = SearchForm(self.request.GET) + context["query"] = self.request.GET.get("query", "") + return context +endef + +define DJANGO_SETTINGS_AUTHENTICATION_BACKENDS +AUTHENTICATION_BACKENDS = [ + "django.contrib.auth.backends.ModelBackend", + "allauth.account.auth_backends.AuthenticationBackend", +] +endef + +define DJANGO_SETTINGS_BASE +# $(PROJECT_NAME) +# +# Uncomment next two lines to enable custom admin +# INSTALLED_APPS = [app for app in INSTALLED_APPS if app != 'django.contrib.admin'] +# INSTALLED_APPS.append('backend.apps.CustomAdminConfig') +import os # noqa +import dj_database_url # noqa + +DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" +EXPLORER_CONNECTIONS = {"Default": "default"} +EXPLORER_DEFAULT_CONNECTION = "default" +LOGIN_REDIRECT_URL = "/" +PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +SILENCED_SYSTEM_CHECKS = ["django_recaptcha.recaptcha_test_key_error"] +BASE_DIR = os.path.dirname(PROJECT_DIR) +STATICFILES_DIRS = [] +WEBPACK_LOADER = { + "MANIFEST_FILE": os.path.join(BASE_DIR, "frontend/build/manifest.json"), +} +STATICFILES_DIRS.append(os.path.join(BASE_DIR, "frontend/build")) +TEMPLATES[0]["DIRS"].append(os.path.join(PROJECT_DIR, "templates")) +endef + +define DJANGO_SETTINGS_BASE_MINIMAL +# $(PROJECT_NAME) +import os # noqa +import dj_database_url # noqa + +INSTALLED_APPS.append("debug_toolbar") +INSTALLED_APPS.append("webpack_boilerplate") +PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +BASE_DIR = os.path.dirname(PROJECT_DIR) +STATICFILES_DIRS = [] +STATICFILES_DIRS.append(os.path.join(BASE_DIR, "frontend/build")) +TEMPLATES[0]["DIRS"].append(os.path.join(PROJECT_DIR, "templates")) +WEBPACK_LOADER = { + "MANIFEST_FILE": os.path.join(BASE_DIR, "frontend/build/manifest.json"), +} +endef + +define DJANGO_SETTINGS_CRISPY_FORMS +CRISPY_TEMPLATE_PACK = "bootstrap5" +CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" +endef + +define DJANGO_SETTINGS_DATABASE +DATABASE_URL = os.environ.get("DATABASE_URL", "postgres://:@:/$(PROJECT_NAME)") +DATABASES["default"] = dj_database_url.parse(DATABASE_URL) +endef + +define DJANGO_SETTINGS_DEV +from .base import * # noqa + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +# SECURITY WARNING: define the correct hosts in production! +ALLOWED_HOSTS = ["*"] + +EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" + +try: + from .local import * # noqa +except ImportError: + pass + +LOGGING = { + "version": 1, + "disable_existing_loggers": False, + "formatters": { + "verbose": { + "format": "{levelname} {asctime} {module} {message}", + "style": "{", + }, + "simple": { + "format": "{levelname} {message}", + "style": "{", + }, + }, + "handlers": { + "console": { + "level": "DEBUG", + "class": "logging.StreamHandler", + "formatter": "verbose", + }, + }, + "loggers": { + "django": { + "handlers": ["console"], + "level": "DEBUG", + "propagate": True, + }, + }, +} + +INTERNAL_IPS = [ + "127.0.0.1", +] + +MIDDLEWARE.append("debug_toolbar.middleware.DebugToolbarMiddleware") # noqa +MIDDLEWARE.append("hijack.middleware.HijackUserMiddleware") # noqa +INSTALLED_APPS.append("django.contrib.admindocs") # noqa +SECRET_KEY = "$(DJANGO_SETTINGS_SECRET_KEY)" +endef + + +define DJANGO_SETTINGS_HOME_PAGE +INSTALLED_APPS.append("home") +endef + +define DJANGO_SETTINGS_INSTALLED_APPS +INSTALLED_APPS.append("allauth") +INSTALLED_APPS.append("allauth.account") +INSTALLED_APPS.append("allauth.socialaccount") +INSTALLED_APPS.append("crispy_bootstrap5") +INSTALLED_APPS.append("crispy_forms") +INSTALLED_APPS.append("debug_toolbar") +INSTALLED_APPS.append("django_extensions") +INSTALLED_APPS.append("django_recaptcha") +INSTALLED_APPS.append("rest_framework") +INSTALLED_APPS.append("rest_framework.authtoken") +INSTALLED_APPS.append("webpack_boilerplate") +INSTALLED_APPS.append("explorer") +endef + +define DJANGO_SETTINGS_MIDDLEWARE +MIDDLEWARE.append("allauth.account.middleware.AccountMiddleware") +endef + +define DJANGO_SETTINGS_MODEL_FORM_DEMO +INSTALLED_APPS.append("model_form_demo") # noqa +endef + +define DJANGO_SETTINGS_PAYMENTS +DJSTRIPE_FOREIGN_KEY_TO_FIELD = "id" +DJSTRIPE_WEBHOOK_VALIDATION = "retrieve_event" +STRIPE_PUBLISHABLE_KEY = os.environ.get("STRIPE_PUBLISHABLE_KEY") +STRIPE_SECRET_KEY = os.environ.get("STRIPE_SECRET_KEY") +STRIPE_TEST_SECRET_KEY = os.environ.get("STRIPE_TEST_SECRET_KEY") +INSTALLED_APPS.append("payments") # noqa +INSTALLED_APPS.append("djstripe") # noqa +endef + +define DJANGO_SETTINGS_REST_FRAMEWORK +REST_FRAMEWORK = { + # Use Django's standard `django.contrib.auth` permissions, + # or allow read-only access for unauthenticated users. + "DEFAULT_PERMISSION_CLASSES": [ + "rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly" + ] +} +endef + +define DJANGO_SETTINGS_SITEUSER +INSTALLED_APPS.append("siteuser") # noqa +AUTH_USER_MODEL = "siteuser.User" +endef + +define DJANGO_SETTINGS_PROD +from .base import * # noqa +from backend.utils import get_ec2_metadata + +DEBUG = False + +try: + from .local import * # noqa +except ImportError: + pass + +LOCAL_IPV4 = get_ec2_metadata() +ALLOWED_HOSTS.append(LOCAL_IPV4) # noqa +endef + +define DJANGO_SETTINGS_THEMES +THEMES = [ + ("light", "Light Theme"), + ("dark", "Dark Theme"), +] +endef + +define DJANGO_SITEUSER_ADMIN +from django.contrib.auth.admin import UserAdmin +from django.contrib import admin + +from .models import User + +admin.site.register(User, UserAdmin) +endef + +define DJANGO_SITEUSER_EDIT_TEMPLATE +{% extends 'base.html' %} +{% load crispy_forms_tags %} +{% block content %} +

    Edit User

    + {% crispy form %} +{% endblock %} +endef + +define DJANGO_SITEUSER_FORM +from django import forms +from django.contrib.auth.forms import UserChangeForm +from crispy_forms.helper import FormHelper +from crispy_forms.layout import Layout, Fieldset, ButtonHolder, Submit +from .models import User + + +class SiteUserForm(UserChangeForm): + bio = forms.CharField(widget=forms.Textarea(attrs={"id": "editor"}), required=False) + + class Meta(UserChangeForm.Meta): + model = User + fields = ("username", "user_theme_preference", "bio", "rate") + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.helper = FormHelper() + self.helper.form_method = "post" + self.helper.layout = Layout( + Fieldset( + "Edit Your Profile", + "username", + "user_theme_preference", + "bio", + "rate", + ), + ButtonHolder(Submit("submit", "Save", css_class="btn btn-primary")), + ) +endef + +define DJANGO_SITEUSER_MODEL +from django.db import models +from django.contrib.auth.models import AbstractUser, Group, Permission +from django.conf import settings + + +class User(AbstractUser): + groups = models.ManyToManyField(Group, related_name="siteuser_set", blank=True) + user_permissions = models.ManyToManyField( + Permission, related_name="siteuser_set", blank=True + ) + + user_theme_preference = models.CharField( + max_length=10, choices=settings.THEMES, default="light" + ) + + bio = models.TextField(blank=True, null=True) + rate = models.FloatField(blank=True, null=True) +endef + +define DJANGO_SITEUSER_URLS +from django.urls import path +from .views import UserProfileView, UpdateThemePreferenceView, UserEditView + +urlpatterns = [ + path("profile/", UserProfileView.as_view(), name="user-profile"), + path( + "update_theme_preference/", + UpdateThemePreferenceView.as_view(), + name="update_theme_preference", + ), + path("/edit/", UserEditView.as_view(), name="user-edit"), +] +endef + +define DJANGO_SITEUSER_VIEW +import json + +from django.contrib.auth.mixins import LoginRequiredMixin +from django.http import JsonResponse +from django.utils.decorators import method_decorator +from django.views import View +from django.views.decorators.csrf import csrf_exempt +from django.views.generic import DetailView +from django.views.generic.edit import UpdateView +from django.urls import reverse_lazy + +from .models import User +from .forms import SiteUserForm + + +class UserProfileView(LoginRequiredMixin, DetailView): + model = User + template_name = "profile.html" + + def get_object(self, queryset=None): + return self.request.user + + +@method_decorator(csrf_exempt, name="dispatch") +class UpdateThemePreferenceView(View): + def post(self, request, *args, **kwargs): + try: + data = json.loads(request.body.decode("utf-8")) + new_theme = data.get("theme") + user = request.user + user.user_theme_preference = new_theme + user.save() + response_data = {"theme": new_theme} + return JsonResponse(response_data) + except json.JSONDecodeError as e: + return JsonResponse({"error": e}, status=400) + + def http_method_not_allowed(self, request, *args, **kwargs): + return JsonResponse({"error": "Invalid request method"}, status=405) + + +class UserEditView(LoginRequiredMixin, UpdateView): + model = User + template_name = "user_edit.html" # Create this template in your templates folder + form_class = SiteUserForm + + def get_success_url(self): + # return reverse_lazy("user-profile", kwargs={"pk": self.object.pk}) + return reverse_lazy("user-profile") +endef + +define DJANGO_SITEUSER_VIEW_TEMPLATE +{% extends 'base.html' %} +{% block content %} +

    User Profile

    +
    + Edit +
    +

    Username: {{ user.username }}

    +

    Theme: {{ user.user_theme_preference }}

    +

    Bio: {{ user.bio|default:""|safe }}

    +

    Rate: {{ user.rate|default:"" }}

    +{% endblock %} +endef + +define DJANGO_URLS +from django.contrib import admin +from django.urls import path, include +from django.conf import settings + +urlpatterns = [ + path("django/", admin.site.urls), +] +endef + +define DJANGO_URLS_ALLAUTH +urlpatterns += [path("accounts/", include("allauth.urls"))] +endef + +define DJANGO_URLS_API +from rest_framework import routers # noqa +from .api import UserViewSet, api # noqa + +router = routers.DefaultRouter() +router.register(r"users", UserViewSet) +# urlpatterns += [path("api/", include(router.urls))] +urlpatterns += [path("api/", api.urls)] +endef + +define DJANGO_URLS_DEBUG_TOOLBAR +if settings.DEBUG: + urlpatterns += [path("__debug__/", include("debug_toolbar.urls"))] +endef + +define DJANGO_URLS_HOME_PAGE +urlpatterns += [path("", include("home.urls"))] +endef + +define DJANGO_URLS_LOGGING_DEMO +urlpatterns += [path("logging-demo/", include("logging_demo.urls"))] +endef + +define DJANGO_URLS_MODEL_FORM_DEMO +urlpatterns += [path("model-form-demo/", include("model_form_demo.urls"))] +endef + +define DJANGO_URLS_PAYMENTS +urlpatterns += [path("payments/", include("payments.urls"))] +endef + +define DJANGO_URLS_SITEUSER +urlpatterns += [path("user/", include("siteuser.urls"))] +endef + +define DJANGO_UTILS +from django.urls import URLResolver +import requests + + +def get_ec2_metadata(): + try: + # Step 1: Get the token + token_url = "http://169.254.169.254/latest/api/token" + headers = {"X-aws-ec2-metadata-token-ttl-seconds": "21600"} + response = requests.put(token_url, headers=headers) + response.raise_for_status() # Raise an error for bad responses + + token = response.text + + # Step 2: Use the token to get the instance metadata + metadata_url = "http://169.254.169.254/latest/meta-data/local-ipv4" + headers = {"X-aws-ec2-metadata-token": token} + response = requests.get(metadata_url, headers=headers) + response.raise_for_status() # Raise an error for bad responses + + metadata = response.text + return metadata + except requests.RequestException as e: + print(f"Error retrieving EC2 metadata: {e}") + return None + + +# Function to remove a specific URL pattern based on its route (including catch-all) +def remove_urlpattern(urlpatterns, route_to_remove): + urlpatterns[:] = [ + urlpattern + for urlpattern in urlpatterns + if not ( + isinstance(urlpattern, URLResolver) + and urlpattern.pattern._route == route_to_remove + ) + ] +endef + +define EB_CUSTOM_ENV_EC2_USER +files: + "/home/ec2-user/.bashrc": + mode: "000644" + owner: ec2-user + group: ec2-user + content: | + # .bashrc + + # Source global definitions + if [ -f /etc/bashrc ]; then + . /etc/bashrc + fi + + # User specific aliases and functions + set -o vi + + source <(sed -E -n 's/[^#]+/export &/ p' /opt/elasticbeanstalk/deployment/custom_env_var) +endef + +define EB_CUSTOM_ENV_VAR_FILE +#!/bin/bash + +# Via https://aws.amazon.com/premiumsupport/knowledge-center/elastic-beanstalk-env-variables-linux2/ + +#Create a copy of the environment variable file. +cat /opt/elasticbeanstalk/deployment/env | perl -p -e 's/(.*)=(.*)/export $$1="$$2"/;' > /opt/elasticbeanstalk/deployment/custom_env_var + +#Set permissions to the custom_env_var file so this file can be accessed by any user on the instance. You can restrict permissions as per your requirements. +chmod 644 /opt/elasticbeanstalk/deployment/custom_env_var + +# add the virtual env path in. +VENV=/var/app/venv/`ls /var/app/venv` +cat <> /opt/elasticbeanstalk/deployment/custom_env_var +VENV=$$ENV +EOF + +#Remove duplicate files upon deployment. +rm -f /opt/elasticbeanstalk/deployment/*.bak +endef + +define GIT_IGNORE +__pycache__ +*.pyc +dist/ +node_modules/ +_build/ +.elasticbeanstalk/ +db.sqlite3 +static/ +backend/var +endef + +define JENKINS_FILE +pipeline { + agent any + stages { + stage('') { + steps { + echo '' + } + } + } +} +endef + +define MAKEFILE_CUSTOM +# Custom Makefile +# Add your custom makefile commands here +# +# PROJECT_NAME := my-new-project +endef + +define PIP_INSTALL_REQUIREMENTS_TEST +pytest +pytest-runner +coverage +pytest-mock +pytest-cov +hypothesis +selenium +pytest-django +factory-boy +flake8 +tox +endef + +define PROGRAMMING_INTERVIEW +from rich import print as rprint +from rich.console import Console +from rich.panel import Panel + +import argparse +import locale +import math +import time + +import code # noqa +import readline # noqa +import rlcompleter # noqa + + +locale.setlocale(locale.LC_ALL, "en_US.UTF-8") + + +class DataStructure: + # Data Structure: Binary Tree + class TreeNode: + def __init__(self, value=0, left=None, right=None): + self.value = value + self.left = left + self.right = right + + # Data Structure: Stack + class Stack: + def __init__(self): + self.items = [] + + def push(self, item): + self.items.append(item) + + def pop(self): + if not self.is_empty(): + return self.items.pop() + return None + + def peek(self): + if not self.is_empty(): + return self.items[-1] + return None + + def is_empty(self): + return len(self.items) == 0 + + def size(self): + return len(self.items) + + # Data Structure: Queue + class Queue: + def __init__(self): + self.items = [] + + def enqueue(self, item): + self.items.append(item) + + def dequeue(self): + if not self.is_empty(): + return self.items.pop(0) + return None + + def is_empty(self): + return len(self.items) == 0 + + def size(self): + return len(self.items) + + # Data Structure: Linked List + class ListNode: + def __init__(self, value=0, next=None): + self.value = value + self.next = next + + +class Interview(DataStructure): + + # Protected methods for factorial calculation + def _factorial_recursive(self, n): + if n == 0: + return 1 + return n * self._factorial_recursive(n - 1) + + def _factorial_divide_and_conquer(self, low, high): + if low > high: + return 1 + if low == high: + return low + mid = (low + high) // 2 + return self._factorial_divide_and_conquer( + low, mid + ) * self._factorial_divide_and_conquer(mid + 1, high) + + # Recursive Factorial with Timing + def factorial_recursive(self, n): + start_time = time.time() # Start timing + result = self._factorial_recursive(n) # Calculate factorial + end_time = time.time() # End timing + elapsed_time = end_time - start_time + return f" Factorial: {locale.format_string("%.2f", result, grouping=True)} Elapsed time: {elapsed_time:.6f}" + + # Iterative Factorial with Timing + def factorial_iterative(self, n): + start_time = time.time() # Start timing + result = 1 + for i in range(1, n + 1): + result *= i + end_time = time.time() # End timing + elapsed_time = end_time - start_time + return f" Factorial: {locale.format_string("%.2f", result, grouping=True)} Elapsed time: {elapsed_time:.6f}" + + # Divide and Conquer Factorial with Timing + def factorial_divide_and_conquer(self, n): + start_time = time.time() # Start timing + result = self._factorial_divide_and_conquer(1, n) # Calculate factorial + end_time = time.time() # End timing + elapsed_time = end_time - start_time + return f" Factorial: {locale.format_string("%.2f", result, grouping=True)} Elapsed time: {elapsed_time:.6f}" + + # Built-in Factorial with Timing + def factorial_builtin(self, n): + start_time = time.time() # Start timing + result = math.factorial(n) # Calculate factorial using built-in + end_time = time.time() # End timing + + # Calculate elapsed time + elapsed_time = end_time - start_time + + # Print complexity and runtime + return f" Factorial: {locale.format_string("%.2f", result, grouping=True)} Elapsed time: {elapsed_time:.6f}" + + # Recursion: Fibonacci + def fibonacci_recursive(self, n): + if n <= 1: + return n + return self.fibonacci_recursive(n - 1) + self.fibonacci_recursive(n - 2) + + # Iteration: Fibonacci + def fibonacci_iterative(self, n): + if n <= 1: + return n + a, b = 0, 1 + for _ in range(n - 1): + a, b = b, a + b + return b + + # Searching: Linear Search + def linear_search(self, arr, target): + for i, value in enumerate(arr): + if value == target: + return i + return -1 + + # Searching: Binary Search + def binary_search(self, arr, target): + left, right = 0, len(arr) - 1 + while left <= right: + mid = (left + right) // 2 + if arr[mid] == target: + return mid + elif arr[mid] < target: + left = mid + 1 + else: + right = mid - 1 + return -1 + + # Sorting: Bubble Sort + def bubble_sort(self, arr): + n = len(arr) + for i in range(n): + for j in range(0, n - i - 1): + if arr[j] > arr[j + 1]: + arr[j], arr[j + 1] = arr[j + 1], arr[j] + return arr + + # Sorting: Merge Sort + def merge_sort(self, arr): + if len(arr) > 1: + mid = len(arr) // 2 + left_half = arr[:mid] + right_half = arr[mid:] + + self.merge_sort(left_half) + self.merge_sort(right_half) + + i = j = k = 0 + + while i < len(left_half) and j < len(right_half): + if left_half[i] < right_half[j]: + arr[k] = left_half[i] + i += 1 + else: + arr[k] = right_half[j] + j += 1 + k += 1 + + while i < len(left_half): + arr[k] = left_half[i] + i += 1 + k += 1 + + while j < len(right_half): + arr[k] = right_half[j] + j += 1 + k += 1 + return arr + + def insert_linked_list(self, head, value): + new_node = self.ListNode(value) + if not head: + return new_node + current = head + while current.next: + current = current.next + current.next = new_node + return head + + def print_linked_list(self, head): + current = head + while current: + print(current.value, end=" -> ") + current = current.next + print("None") + + def inorder_traversal(self, root): + return ( + self.inorder_traversal(root.left) + + [root.value] + + self.inorder_traversal(root.right) + if root + else [] + ) + + def preorder_traversal(self, root): + return ( + [root.value] + + self.preorder_traversal(root.left) + + self.preorder_traversal(root.right) + if root + else [] + ) + + def postorder_traversal(self, root): + return ( + self.postorder_traversal(root.left) + + self.postorder_traversal(root.right) + + [root.value] + if root + else [] + ) + + # Graph Algorithms: Depth-First Search + def dfs(self, graph, start): + visited, stack = set(), [start] + while stack: + vertex = stack.pop() + if vertex not in visited: + visited.add(vertex) + stack.extend(set(graph[vertex]) - visited) + return visited + + # Graph Algorithms: Breadth-First Search + def bfs(self, graph, start): + visited, queue = set(), [start] + while queue: + vertex = queue.pop(0) + if vertex not in visited: + visited.add(vertex) + queue.extend(set(graph[vertex]) - visited) + return visited + + +def setup_readline(local): + + # Enable tab completion + readline.parse_and_bind("tab: complete") + # Optionally, you can set the completer function manually + readline.set_completer(rlcompleter.Completer(local).complete) + + +def main(): + + console = Console() + interview = Interview() + + parser = argparse.ArgumentParser(description="Programming Interview Questions") + + parser.add_argument( + "-f", "--factorial", type=int, help="Factorial algorithm examples" + ) + parser.add_argument("--fibonacci", type=int, help="Fibonacci algorithm examples") + parser.add_argument( + "--search", action="store_true", help="Search algorithm examples" + ) + parser.add_argument("--sort", action="store_true", help="Search algorithm examples") + parser.add_argument("--stack", action="store_true", help="Stack algorithm examples") + parser.add_argument("--queue", action="store_true", help="Queue algorithm examples") + parser.add_argument( + "--list", action="store_true", help="Linked List algorithm examples" + ) + parser.add_argument( + "--tree", action="store_true", help="Tree traversal algorithm examples" + ) + parser.add_argument("--graph", action="store_true", help="Graph algorithm examples") + parser.add_argument( + "-i", "--interactive", action="store_true", help="Interactive mode" + ) + + args = parser.parse_args() + + if args.factorial: + # Factorial examples + console.rule("Factorial Examples") + rprint( + Panel( + "[bold cyan]Recursive Factorial - Time Complexity: O(n)[/bold cyan]\n" + + str(interview.factorial_recursive(args.factorial)), + title="Factorial Recursive", + ) + ) + rprint( + Panel( + "[bold cyan]Iterative Factorial - Time Complexity: O(n)[/bold cyan]\n" + + str(interview.factorial_iterative(args.factorial)), + title="Factorial Iterative", + ) + ) + rprint( + Panel( + "[bold cyan]Built-in Factorial - Time Complexity: O(n)[/bold cyan]\n" + + str(interview.factorial_builtin(args.factorial)), + title="Factorial Built-in", + ) + ) + rprint( + Panel( + "[bold cyan]Divide and Conquer Factorial - Time Complexity: O(n log n)[/bold cyan]\n" + + str(interview.factorial_divide_and_conquer(args.factorial)), + title="Factorial Divide and Conquer", + ) + ) + exit() + + if args.fibonacci: + # Fibonacci examples + console.rule("Fibonacci Examples") + rprint( + Panel( + str(interview.fibonacci_recursive(args.fibonacci)), + title="Fibonacci Recursive", + ) + ) + rprint( + Panel( + str(interview.fibonacci_iterative(args.fibonacci)), + title="Fibonacci Iterative", + ) + ) + exit() + + if args.search: + # Searching examples + console.rule("Searching Examples") + array = [1, 3, 5, 7, 9] + rprint(Panel(str(interview.linear_search(array, 5)), title="Linear Search")) + rprint(Panel(str(interview.binary_search(array, 5)), title="Binary Search")) + exit() + + if args.sort: + # Sorting examples + console.rule("Sorting Examples") + unsorted_array = [64, 34, 25, 12, 22, 11, 90] + rprint( + Panel( + str(interview.bubble_sort(unsorted_array.copy())), title="Bubble Sort" + ) + ) + rprint( + Panel(str(interview.merge_sort(unsorted_array.copy())), title="Merge Sort") + ) + exit() + + if args.stack: + # Stack example + console.rule("Stack Example") + stack = interview.Stack() + stack.push(1) + stack.push(2) + stack.push(3) + rprint(Panel(str(stack.pop()), title="Stack Pop")) + rprint(Panel(str(stack.peek()), title="Stack Peek")) + rprint(Panel(str(stack.size()), title="Stack Size")) + + if args.queue: + # Queue example + console.rule("Queue Example") + queue = interview.Queue() + queue.enqueue(1) + queue.enqueue(2) + queue.enqueue(3) + rprint(Panel(str(queue.dequeue()), title="Queue Dequeue")) + rprint(Panel(str(queue.is_empty()), title="Queue Is Empty")) + rprint(Panel(str(queue.size()), title="Queue Size")) + + if args.list: + # Linked List example + console.rule("Linked List Example") + head = None + head = interview.insert_linked_list(head, 1) + head = interview.insert_linked_list(head, 2) + head = interview.insert_linked_list(head, 3) + interview.print_linked_list(head) # Output: 1 -> 2 -> 3 -> None + + if args.tree: + # Tree Traversal example + console.rule("Tree Traversal Example") + root = interview.TreeNode(1) + root.left = interview.TreeNode(2) + root.right = interview.TreeNode(3) + root.left.left = interview.TreeNode(4) + root.left.right = interview.TreeNode(5) + rprint(Panel(str(interview.inorder_traversal(root)), title="Inorder Traversal")) + rprint( + Panel(str(interview.preorder_traversal(root)), title="Preorder Traversal") + ) + rprint( + Panel(str(interview.postorder_traversal(root)), title="Postorder Traversal") + ) + + if args.graph: + # Graph Algorithms example + console.rule("Graph Algorithms Example") + graph = { + "A": ["B", "C"], + "B": ["A", "D", "E"], + "C": ["A", "F"], + "D": ["B"], + "E": ["B", "F"], + "F": ["C", "E"], + } + rprint(Panel(str(interview.dfs(graph, "A")), title="DFS")) + rprint(Panel(str(interview.bfs(graph, "A")), title="BFS")) + + if args.interactive: + # Starting interactive session with tab completion + setup_readline(locals()) + banner = "Interactive programming interview session started. Type 'exit()' or 'Ctrl-D' to exit." + code.interact( + banner=banner, + local=locals(), + exitmsg="Great interview!", + ) + + +if __name__ == "__main__": + main() + +endef + +define PYTHON_CI_YAML +name: Build Wheels +endef + +define PYTHON_LICENSE_TXT +MIT License + +Copyright (c) [YEAR] [OWNER NAME] + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +endef + +define PYTHON_PROJECT_TOML +[build-system] +endef + +define SEPARATOR +.==========================================================================================================================================. +| | +| _|_|_| _| _| _| _| _| _|_| _| _| | +| _| _| _| _|_| _|_| _|_| _|_|_| _|_|_|_| _|_| _|_| _|_|_| _| _| _|_| _| _| _|_| | +| _|_|_| _|_| _| _| _| _|_|_|_| _| _| _| _| _| _| _| _|_| _|_|_|_| _|_|_|_| _| _| _|_|_|_| | +| _| _| _| _| _| _| _| _| _| _| _| _| _| _| _| _| _| _| _| | +| _| _| _|_| _| _|_|_| _|_|_| _|_| _| _| _|_|_| _| _| _|_|_| _| _| _| _|_|_| | +| _| | +| _| | +`==========================================================================================================================================' +endef + +define TINYMCE_JS +import tinymce from 'tinymce'; +import 'tinymce/icons/default'; +import 'tinymce/themes/silver'; +import 'tinymce/skins/ui/oxide/skin.css'; +import 'tinymce/plugins/advlist'; +import 'tinymce/plugins/code'; +import 'tinymce/plugins/emoticons'; +import 'tinymce/plugins/emoticons/js/emojis'; +import 'tinymce/plugins/link'; +import 'tinymce/plugins/lists'; +import 'tinymce/plugins/table'; +import 'tinymce/models/dom'; + +tinymce.init({ + selector: 'textarea#editor', + plugins: 'advlist code emoticons link lists table', + toolbar: 'bold italic | bullist numlist | link emoticons', + skin: false, + content_css: false, +}); +endef + +define WAGTAIL_BASE_TEMPLATE +{% load static wagtailcore_tags wagtailuserbar webpack_loader %} + + + + + + {% block title %} + {% if page.seo_title %} + {{ page.seo_title }} + {% else %} + {{ page.title }} + {% endif %} + {% endblock %} + {% block title_suffix %} + {% wagtail_site as current_site %} + {% if current_site and current_site.site_name %}- {{ current_site.site_name }}{% endif %} + {% endblock %} + + {% if page.search_description %}{% endif %} + + {# Force all links in the live preview panel to be opened in a new tab #} + {% if request.in_preview_panel %}{% endif %} + {% stylesheet_pack 'app' %} + {% block extra_css %}{# Override this in templates to add extra stylesheets #}{% endblock %} + + {% include 'favicon.html' %} + {% csrf_token %} + + +
    + {% wagtailuserbar %} +
    + {% include 'header.html' %} + {% if messages %} +
    + {% for message in messages %} + + {% endfor %} +
    + {% endif %} +
    + {% block content %}{% endblock %} +
    +
    + {% include 'footer.html' %} + {% include 'offcanvas.html' %} + {% javascript_pack 'app' %} + {% block extra_js %}{# Override this in templates to add extra javascript #}{% endblock %} + + +endef + +define WAGTAIL_BLOCK_CAROUSEL + +endef + +define WAGTAIL_BLOCK_MARKETING +{% load wagtailcore_tags %} +
    + {% if block.value.images.0 %} + {% include 'blocks/carousel_block.html' %} + {% else %} + {{ self.title }} + {{ self.content }} + {% endif %} +
    +endef + +define WAGTAIL_CONTACT_PAGE_LANDING +{% extends 'base.html' %} +{% block content %}

    Thank you!

    {% endblock %} +endef + +define WAGTAIL_CONTACT_PAGE_MODEL +from django.db import models +from modelcluster.fields import ParentalKey +from wagtail.admin.panels import ( + FieldPanel, FieldRowPanel, + InlinePanel, MultiFieldPanel +) +from wagtail.fields import RichTextField +from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField + + +class FormField(AbstractFormField): + page = ParentalKey('ContactPage', on_delete=models.CASCADE, related_name='form_fields') + + +class ContactPage(AbstractEmailForm): + intro = RichTextField(blank=True) + thank_you_text = RichTextField(blank=True) + + content_panels = AbstractEmailForm.content_panels + [ + FieldPanel('intro'), + InlinePanel('form_fields', label="Form fields"), + FieldPanel('thank_you_text'), + MultiFieldPanel([ + FieldRowPanel([ + FieldPanel('from_address', classname="col6"), + FieldPanel('to_address', classname="col6"), + ]), + FieldPanel('subject'), + ], "Email"), + ] + + class Meta: + verbose_name = "Contact Page" +endef + +define WAGTAIL_CONTACT_PAGE_TEMPLATE +{% extends 'base.html' %} +{% load crispy_forms_tags static wagtailcore_tags %} +{% block content %} +

    {{ page.title }}

    + {{ page.intro|richtext }} +
    + {% csrf_token %} + {{ form.as_p }} + +
    +{% endblock %} +endef + +define WAGTAIL_CONTACT_PAGE_TEST +from django.test import TestCase +from wagtail.test.utils import WagtailPageTestCase +from wagtail.models import Page + +from contactpage.models import ContactPage, FormField + +class ContactPageTest(TestCase, WagtailPageTestCase): + def test_contact_page_creation(self): + # Create a ContactPage instance + contact_page = ContactPage( + title='Contact', + intro='Welcome to our contact page!', + thank_you_text='Thank you for reaching out.' + ) + + # Save the ContactPage instance + self.assertEqual(contact_page.save_revision().publish().get_latest_revision_as_page(), contact_page) + + def test_form_field_creation(self): + # Create a ContactPage instance + contact_page = ContactPage( + title='Contact', + intro='Welcome to our contact page!', + thank_you_text='Thank you for reaching out.' + ) + # Save the ContactPage instance + contact_page_revision = contact_page.save_revision() + contact_page_revision.publish() + + # Create a FormField associated with the ContactPage + form_field = FormField( + page=contact_page, + label='Your Name', + field_type='singleline', + required=True + ) + form_field.save() + + # Retrieve the ContactPage from the database + contact_page_from_db = Page.objects.get(id=contact_page.id).specific + + # Check if the FormField is associated with the ContactPage + self.assertEqual(contact_page_from_db.form_fields.first(), form_field) + + def test_contact_page_form_submission(self): + # Create a ContactPage instance + contact_page = ContactPage( + title='Contact', + intro='Welcome to our contact page!', + thank_you_text='Thank you for reaching out.' + ) + # Save the ContactPage instance + contact_page_revision = contact_page.save_revision() + contact_page_revision.publish() + + # Simulate a form submission + form_data = { + 'your_name': 'John Doe', + # Add other form fields as needed + } + + response = self.client.post(contact_page.url, form_data) + + # Check if the form submission is successful (assuming a 302 redirect) + self.assertEqual(response.status_code, 302) + + # You may add more assertions based on your specific requirements +endef + +define WAGTAIL_HEADER_PREFIX +{% load wagtailcore_tags %} +{% wagtail_site as current_site %} +endef + +define WAGTAIL_HOME_PAGE_MODEL +from wagtail.models import Page +from wagtail.fields import StreamField +from wagtail import blocks +from wagtail.admin.panels import FieldPanel +from wagtail.images.blocks import ImageChooserBlock + + +class MarketingBlock(blocks.StructBlock): + title = blocks.CharBlock(required=False, help_text="Enter the block title") + content = blocks.RichTextBlock(required=False, help_text="Enter the block content") + images = blocks.ListBlock( + ImageChooserBlock(required=False), + help_text="Select one or two images for column display. Select three or more images for carousel display.", + ) + image = ImageChooserBlock( + required=False, help_text="Select one image for background display." + ) + block_class = blocks.CharBlock( + required=False, + help_text="Enter a CSS class for styling the marketing block", + classname="full title", + default="vh-100 bg-secondary", + ) + image_class = blocks.CharBlock( + required=False, + help_text="Enter a CSS class for styling the column display image(s)", + classname="full title", + default="img-thumbnail p-5", + ) + layout_class = blocks.CharBlock( + required=False, + help_text="Enter a CSS class for styling the layout.", + classname="full title", + default="d-flex flex-row", + ) + + class Meta: + icon = "placeholder" + template = "blocks/marketing_block.html" + + +class HomePage(Page): + template = "home/home_page.html" # Create a template for rendering the home page + + marketing_blocks = StreamField( + [ + ("marketing_block", MarketingBlock()), + ], + blank=True, + null=True, + use_json_field=True, + ) + content_panels = Page.content_panels + [ + FieldPanel("marketing_blocks"), + ] + + class Meta: + verbose_name = "Home Page" +endef + +define WAGTAIL_HOME_PAGE_TEMPLATE +{% extends "base.html" %} +{% load wagtailcore_tags %} +{% block content %} +
    + {% for block in page.marketing_blocks %} + {% include_block block %} + {% endfor %} +
    +{% endblock %} +endef + +define WAGTAIL_PRIVACY_PAGE_MODEL +from wagtail.models import Page +from wagtail.admin.panels import FieldPanel +from wagtailmarkdown.fields import MarkdownField + + +class PrivacyPage(Page): + """ + A Wagtail Page model for the Privacy Policy page. + """ + + template = "privacy_page.html" + + body = MarkdownField() + + content_panels = Page.content_panels + [ + FieldPanel("body", classname="full"), + ] + + class Meta: + verbose_name = "Privacy Page" +endef + +define WAGTAIL_PRIVACY_PAGE_TEMPLATE +{% extends 'base.html' %} +{% load wagtailmarkdown %} +{% block content %}
    {{ page.body|markdown }}
    {% endblock %} +endef + +define WAGTAIL_SEARCH_TEMPLATE +{% extends "base.html" %} +{% load static wagtailcore_tags %} +{% block body_class %}template-searchresults{% endblock %} +{% block title %}Search{% endblock %} +{% block content %} +

    Search

    +
    + + +
    + {% if search_results %} +
      + {% for result in search_results %} +
    • +

      + {{ result }} +

      + {% if result.search_description %}{{ result.search_description }}{% endif %} +
      • + {% endfor %} +
    + {% if search_results.has_previous %} + Previous + {% endif %} + {% if search_results.has_next %} + Next + {% endif %} + {% elif search_query %} + No results found + {% else %} + No results found. Try a test query? + {% endif %} +{% endblock %} +endef + +define WAGTAIL_SEARCH_URLS +from django.urls import path +from .views import search + +urlpatterns = [path("", search, name="search")] +endef + +define WAGTAIL_SETTINGS +INSTALLED_APPS.append("wagtail_color_panel") +INSTALLED_APPS.append("wagtail_modeladmin") +INSTALLED_APPS.append("wagtail.contrib.settings") +INSTALLED_APPS.append("wagtailmarkdown") +INSTALLED_APPS.append("wagtailmenus") +INSTALLED_APPS.append("wagtailseo") +TEMPLATES[0]["OPTIONS"]["context_processors"].append( + "wagtail.contrib.settings.context_processors.settings" +) +TEMPLATES[0]["OPTIONS"]["context_processors"].append( + "wagtailmenus.context_processors.wagtailmenus" +) +endef + +define WAGTAIL_SITEPAGE_MODEL +from wagtail.models import Page + + +class SitePage(Page): + template = "sitepage/site_page.html" + + class Meta: + verbose_name = "Site Page" +endef + +define WAGTAIL_SITEPAGE_TEMPLATE +{% extends 'base.html' %} +{% block content %} +

    {{ page.title }}

    +{% endblock %} +endef + +define WAGTAIL_URLS +from django.conf import settings +from django.urls import include, path +from django.contrib import admin + +from wagtail.admin import urls as wagtailadmin_urls +from wagtail.documents import urls as wagtaildocs_urls + +from search import views as search_views + +urlpatterns = [ + path("django/", admin.site.urls), + path("wagtail/", include(wagtailadmin_urls)), + path("documents/", include(wagtaildocs_urls)), + path("search/", search_views.search, name="search"), +] + +if settings.DEBUG: + from django.conf.urls.static import static + from django.contrib.staticfiles.urls import staticfiles_urlpatterns + + # Serve static and media files from development server + urlpatterns += staticfiles_urlpatterns() + urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) +endef + +define WAGTAIL_URLS_HOME +urlpatterns += [ + # For anything not caught by a more specific rule above, hand over to + # Wagtail's page serving mechanism. This should be the last pattern in + # the list: + path("", include("wagtail.urls")), + # Alternatively, if you want Wagtail pages to be served from a subpath + # of your site, rather than the site root: + # path("pages/", include("wagtail.urls"), +] +endef + +define WEBPACK_CONFIG_JS +const path = require('path'); + +module.exports = { + mode: 'development', + entry: './src/index.js', + output: { + filename: 'bundle.js', + path: path.resolve(__dirname, 'dist'), + }, +}; +endef + +define WEBPACK_INDEX_HTML + + + + + + Hello, Webpack! + + + + + +endef + +define WEBPACK_INDEX_JS +const message = "Hello, World!"; +console.log(message); +endef + +define WEBPACK_REVEAL_CONFIG_JS +const path = require('path'); +const MiniCssExtractPlugin = require('mini-css-extract-plugin'); + +module.exports = { + mode: 'development', + entry: './src/index.js', + output: { + filename: 'bundle.js', + path: path.resolve(__dirname, 'dist'), + }, + module: { + rules: [ + { + test: /\.css$$/, + use: [MiniCssExtractPlugin.loader, 'css-loader'], + }, + ], + }, + plugins: [ + new MiniCssExtractPlugin({ + filename: 'bundle.css', + }), + ], +}; +endef + +define WEBPACK_REVEAL_INDEX_HTML + + + + + + Project Makefile + + +
    +
    +
    + Slide 1: Draw some circles +
    +
    + Slide 2: Draw the rest of the owl +
    +
    +
    + + +endef + +define WEBPACK_REVEAL_INDEX_JS +import 'reveal.js/dist/reveal.css'; +import 'reveal.js/dist/theme/black.css'; +import Reveal from 'reveal.js'; +import RevealNotes from 'reveal.js/plugin/notes/notes.js'; +Reveal.initialize({ slideNumber: true, plugins: [ RevealNotes ]}); +endef + +# ------------------------------------------------------------------------------ +# Export variables used by phony target rules +# ------------------------------------------------------------------------------ + +export DJANGO_ALLAUTH_BASE_TEMPLATE +export DJANGO_API_SERIALIZERS +export DJANGO_API_VIEWS +export DJANGO_APP_TESTS +export DJANGO_BACKEND_APPS +export DJANGO_BASE_TEMPLATE +export DJANGO_CUSTOM_ADMIN +export DJANGO_DOCKERCOMPOSE +export DJANGO_DOCKERFILE +export DJANGO_FAVICON_TEMPLATE +export DJANGO_FOOTER_TEMPLATE +export DJANGO_FRONTEND_APP +export DJANGO_FRONTEND_APP_CONFIG +export DJANGO_FRONTEND_BABELRC +export DJANGO_FRONTEND_COMPONENTS +export DJANGO_FRONTEND_COMPONENT_CLOCK +export DJANGO_FRONTEND_COMPONENT_ERROR +export DJANGO_FRONTEND_COMPONENT_USER_MENU +export DJANGO_FRONTEND_CONTEXT_INDEX +export DJANGO_FRONTEND_CONTEXT_USER_PROVIDER +export DJANGO_FRONTEND_ESLINTRC +export DJANGO_FRONTEND_OFFCANVAS_TEMPLATE +export DJANGO_FRONTEND_PORTAL +export DJANGO_FRONTEND_STYLES +export DJANGO_FRONTEND_THEME_BLUE +export DJANGO_FRONTEND_THEME_TOGGLER +export DJANGO_HEADER_TEMPLATE +export DJANGO_HOME_PAGE_ADMIN +export DJANGO_HOME_PAGE_MODELS +export DJANGO_HOME_PAGE_TEMPLATE +export DJANGO_HOME_PAGE_URLS +export DJANGO_HOME_PAGE_VIEWS +export DJANGO_LOGGING_DEMO_ADMIN +export DJANGO_LOGGING_DEMO_MODELS +export DJANGO_LOGGING_DEMO_SETTINGS +export DJANGO_LOGGING_DEMO_URLS +export DJANGO_LOGGING_DEMO_VIEWS +export DJANGO_MANAGE_PY +export DJANGO_MODEL_FORM_DEMO_ADMIN +export DJANGO_MODEL_FORM_DEMO_FORMS +export DJANGO_MODEL_FORM_DEMO_MODEL +export DJANGO_MODEL_FORM_DEMO_TEMPLATE_DETAIL +export DJANGO_MODEL_FORM_DEMO_TEMPLATE_FORM +export DJANGO_MODEL_FORM_DEMO_TEMPLATE_LIST +export DJANGO_MODEL_FORM_DEMO_URLS +export DJANGO_MODEL_FORM_DEMO_VIEWS +export DJANGO_PAYMENTS_ADMIN +export DJANGO_PAYMENTS_FORM +export DJANGO_PAYMENTS_MIGRATION_0002 +export DJANGO_PAYMENTS_MIGRATION_0003 +export DJANGO_PAYMENTS_MODELS +export DJANGO_PAYMENTS_TEMPLATE_CANCEL +export DJANGO_PAYMENTS_TEMPLATE_CHECKOUT +export DJANGO_PAYMENTS_TEMPLATE_PRODUCT_DETAIL +export DJANGO_PAYMENTS_TEMPLATE_PRODUCT_LIST +export DJANGO_PAYMENTS_TEMPLATE_SUCCESS +export DJANGO_PAYMENTS_URLS +export DJANGO_PAYMENTS_VIEW +export DJANGO_SEARCH_FORMS +export DJANGO_SEARCH_SETTINGS +export DJANGO_SEARCH_TEMPLATE +export DJANGO_SEARCH_URLS +export DJANGO_SEARCH_UTILS +export DJANGO_SEARCH_VIEWS +export DJANGO_SETTINGS_AUTHENTICATION_BACKENDS +export DJANGO_SETTINGS_BASE +export DJANGO_SETTINGS_BASE_MINIMAL +export DJANGO_SETTINGS_CRISPY_FORMS +export DJANGO_SETTINGS_DATABASE +export DJANGO_SETTINGS_DEV +export DJANGO_SETTINGS_HOME_PAGE +export DJANGO_SETTINGS_INSTALLED_APPS +export DJANGO_SETTINGS_MIDDLEWARE +export DJANGO_SETTINGS_MODEL_FORM_DEMO +export DJANGO_SETTINGS_PAYMENTS +export DJANGO_SETTINGS_PROD +export DJANGO_SETTINGS_REST_FRAMEWORK +export DJANGO_SETTINGS_SITEUSER +export DJANGO_SETTINGS_THEMES +export DJANGO_SITEUSER_ADMIN +export DJANGO_SITEUSER_EDIT_TEMPLATE +export DJANGO_SITEUSER_FORM +export DJANGO_SITEUSER_MODEL +export DJANGO_SITEUSER_URLS +export DJANGO_SITEUSER_VIEW +export DJANGO_SITEUSER_VIEW_TEMPLATE +export DJANGO_URLS +export DJANGO_URLS_ALLAUTH +export DJANGO_URLS_API +export DJANGO_URLS_DEBUG_TOOLBAR +export DJANGO_URLS_HOME_PAGE +export DJANGO_URLS_LOGGING_DEMO +export DJANGO_URLS_MODEL_FORM_DEMO +export DJANGO_URLS_SITEUSER +export DJANGO_UTILS +export EB_CUSTOM_ENV_EC2_USER +export EB_CUSTOM_ENV_VAR_FILE +export GIT_IGNORE +export JENKINS_FILE +export MAKEFILE_CUSTOM +export PIP_INSTALL_REQUIREMENTS_TEST +export PROGRAMMING_INTERVIEW +export PYTHON_CI_YAML +export PYTHON_LICENSE_TXT +export PYTHON_PROJECT_TOML +export SEPARATOR +export TINYMCE_JS +export WAGTAIL_BASE_TEMPLATE +export WAGTAIL_BLOCK_CAROUSEL +export WAGTAIL_BLOCK_MARKETING +export WAGTAIL_CONTACT_PAGE_LANDING +export WAGTAIL_CONTACT_PAGE_MODEL +export WAGTAIL_CONTACT_PAGE_TEMPLATE +export WAGTAIL_CONTACT_PAGE_TEST +export WAGTAIL_HOME_PAGE_MODEL +export WAGTAIL_HOME_PAGE_TEMPLATE +export WAGTAIL_HOME_PAGE_URLS +export WAGTAIL_HOME_PAGE_VIEWS +export WAGTAIL_PRIVACY_PAGE_MODEL +export WAGTAIL_PRIVACY_PAGE_MODEL +export WAGTAIL_PRIVACY_PAGE_TEMPLATE +export WAGTAIL_SEARCH_TEMPLATE +export WAGTAIL_SEARCH_URLS +export WAGTAIL_SETTINGS +export WAGTAIL_SITEPAGE_MODEL +export WAGTAIL_SITEPAGE_TEMPLATE +export WAGTAIL_URLS +export WAGTAIL_URLS_HOME +export WEBPACK_CONFIG_JS +export WEBPACK_INDEX_HTML +export WEBPACK_INDEX_JS +export WEBPACK_REVEAL_CONFIG_JS +export WEBPACK_REVEAL_INDEX_HTML +export WEBPACK_REVEAL_INDEX_JS + +# ------------------------------------------------------------------------------ +# Multi-line phony target rules +# ------------------------------------------------------------------------------ + +.PHONY: aws-check-env-profile-default +aws-check-env-profile-default: +ifndef AWS_PROFILE + $(error AWS_PROFILE is undefined) +endif + +.PHONY: aws-check-env-region-default +aws-check-env-region-default: +ifndef AWS_REGION + $(error AWS_REGION is undefined) +endif + +.PHONY: aws-secret-default +aws-secret-default: aws-check-env + @SECRET_KEY=$$(openssl rand -base64 48); aws ssm put-parameter --name "SECRET_KEY" --value "$$SECRET_KEY" --type String + +.PHONY: aws-sg-default +aws-sg-default: aws-check-env + aws ec2 describe-security-groups $(AWS_OPTS) + +.PHONY: aws-ssm-default +aws-ssm-default: aws-check-env + aws ssm describe-parameters $(AWS_OPTS) + @echo "Get parameter values with: aws ssm getparameter --name ." + +.PHONY: aws-subnet-default +aws-subnet-default: aws-check-env + aws ec2 describe-subnets $(AWS_OPTS) + +.PHONY: aws-vol-available-default +aws-vol-available-default: aws-check-env + aws ec2 describe-volumes --filters Name=status,Values=available --query "Volumes[*].{ID:VolumeId,Size:Size}" --output table + +.PHONY: aws-vol-default +aws-vol-default: aws-check-env + aws ec2 describe-volumes --output table + +.PHONY: aws-vpc-default +aws-vpc-default: aws-check-env + aws ec2 describe-vpcs $(AWS_OPTS) + +.PHONY: db-import-default +db-import-default: + @psql $(DJANGO_DB_NAME) < $(DJANGO_DB_NAME).sql + +.PHONY: db-init-default +db-init-default: + -dropdb $(PROJECT_NAME) + -createdb $(PROJECT_NAME) + +.PHONY: db-init-mysql-default +db-init-mysql-default: + -mysqladmin -u root drop $(PROJECT_NAME) + -mysqladmin -u root create $(PROJECT_NAME) + +.PHONY: db-init-test-default +db-init-test-default: + -dropdb test_$(PROJECT_NAME) + -createdb test_$(PROJECT_NAME) + +.PHONY: django-allauth-default +django-allauth-default: + $(ADD_DIR) backend/templates/allauth/layouts + @echo "$$DJANGO_ALLAUTH_BASE_TEMPLATE" > backend/templates/allauth/layouts/base.html + @echo "$$DJANGO_URLS_ALLAUTH" >> $(DJANGO_URLS_FILE) + -$(GIT_ADD) backend/templates/allauth/layouts/base.html + +.PHONY: django-app-tests-default +django-app-tests-default: + @echo "$$DJANGO_APP_TESTS" > $(APP_DIR)/tests.py + +.PHONY: django-base-template-default +django-base-template-default: + @$(ADD_DIR) backend/templates + @echo "$$DJANGO_BASE_TEMPLATE" > backend/templates/base.html + -$(GIT_ADD) backend/templates/base.html + +.PHONY: django-custom-admin-default +django-custom-admin-default: + @echo "$$DJANGO_CUSTOM_ADMIN" > $(DJANGO_CUSTOM_ADMIN_FILE) + @echo "$$DJANGO_BACKEND_APPS" > $(DJANGO_BACKEND_APPS_FILE) + -$(GIT_ADD) backend/*.py + +.PHONY: django-db-shell-default +django-db-shell-default: + python manage.py dbshell + +.PHONY: django-dockerfile-default +django-dockerfile-default: + @echo "$$DJANGO_DOCKERFILE" > Dockerfile + -$(GIT_ADD) Dockerfile + @echo "$$DJANGO_DOCKERCOMPOSE" > docker-compose.yml + -$(GIT_ADD) docker-compose.yml + +.PHONY: django-favicon-default +django-favicon-default: + @echo "$$DJANGO_FAVICON_TEMPLATE" > backend/templates/favicon.html + -$(GIT_ADD) backend/templates/favicon.html + +.PHONY: django-footer-template-default +django-footer-template-default: + @echo "$$DJANGO_FOOTER_TEMPLATE" > backend/templates/footer.html + -$(GIT_ADD) backend/templates/footer.html + +.PHONY: django-frontend-default +django-frontend-default: python-webpack-init + $(ADD_DIR) frontend/src/context + $(ADD_DIR) frontend/src/images + $(ADD_DIR) frontend/src/utils + @echo "$$DJANGO_FRONTEND_APP" > frontend/src/application/app.js + @echo "$$DJANGO_FRONTEND_APP_CONFIG" > frontend/src/application/config.js + @echo "$$DJANGO_FRONTEND_BABELRC" > frontend/.babelrc + @echo "$$DJANGO_FRONTEND_COMPONENT_CLOCK" > frontend/src/components/Clock.js + @echo "$$DJANGO_FRONTEND_COMPONENT_ERROR" > frontend/src/components/ErrorBoundary.js + @echo "$$DJANGO_FRONTEND_CONTEXT_INDEX" > frontend/src/context/index.js + @echo "$$DJANGO_FRONTEND_CONTEXT_USER_PROVIDER" > frontend/src/context/UserContextProvider.js + @echo "$$DJANGO_FRONTEND_COMPONENT_USER_MENU" > frontend/src/components/UserMenu.js + @echo "$$DJANGO_FRONTEND_COMPONENTS" > frontend/src/components/index.js + @echo "$$DJANGO_FRONTEND_ESLINTRC" > frontend/.eslintrc + @echo "$$DJANGO_FRONTEND_PORTAL" > frontend/src/dataComponents.js + @echo "$$DJANGO_FRONTEND_STYLES" > frontend/src/styles/index.scss + @echo "$$DJANGO_FRONTEND_THEME_BLUE" > frontend/src/styles/theme-blue.scss + @echo "$$DJANGO_FRONTEND_THEME_TOGGLER" > frontend/src/utils/themeToggler.js + # @echo "$$TINYMCE_JS" > frontend/src/utils/tinymce.js + @$(MAKE) npm-install-django + @$(MAKE) npm-install-django-dev + -$(GIT_ADD) $(DJANGO_FRONTEND_FILES) + +.PHONY: django-graph-default +django-graph-default: + python manage.py graph_models -a -o $(PROJECT_NAME).png + +.PHONY: django-header-template-default +django-header-template-default: + @echo "$$DJANGO_HEADER_TEMPLATE" > backend/templates/header.html + -$(GIT_ADD) backend/templates/header.html + +.PHONY: django-home-default +django-home-default: + python manage.py startapp home + $(ADD_DIR) home/templates + @echo "$$DJANGO_HOME_PAGE_ADMIN" > home/admin.py + @echo "$$DJANGO_HOME_PAGE_MODELS" > home/models.py + @echo "$$DJANGO_HOME_PAGE_TEMPLATE" > home/templates/home.html + @echo "$$DJANGO_HOME_PAGE_VIEWS" > home/views.py + @echo "$$DJANGO_HOME_PAGE_URLS" > home/urls.py + @echo "$$DJANGO_URLS_HOME_PAGE" >> $(DJANGO_URLS_FILE) + @echo "$$DJANGO_SETTINGS_HOME_PAGE" >> $(DJANGO_SETTINGS_BASE_FILE) + export APP_DIR="home"; $(MAKE) django-app-tests + -$(GIT_ADD) home/templates + -$(GIT_ADD) home/*.py + -$(GIT_ADD) home/migrations/*.py + +.PHONY: django-init-default +django-init-default: separator \ + db-init \ + django-install \ + django-project \ + django-utils \ + pip-freeze \ + pip-init-test \ + django-settings-directory \ + django-custom-admin \ + django-dockerfile \ + django-offcanvas-template \ + django-header-template \ + django-footer-template \ + django-base-template \ + django-manage-py \ + django-urls \ + django-urls-debug-toolbar \ + django-allauth \ + django-favicon \ + git-ignore \ + django-settings-base \ + django-settings-dev \ + django-settings-prod \ + django-siteuser \ + django-home \ + django-rest-serializers \ + django-rest-views \ + django-urls-api \ + django-frontend \ + django-migrate \ + django-su + +.PHONY: django-init-minimal-default +django-init-minimal-default: separator \ + db-init \ + django-install-minimal \ + django-project \ + django-settings-directory \ + django-settings-base-minimal \ + django-settings-dev \ + pip-freeze \ + pip-init-test \ + django-custom-admin \ + django-dockerfile \ + django-offcanvas-template \ + django-header-template \ + django-footer-template \ + django-base-template \ + django-manage-py \ + django-urls \ + django-urls-debug-toolbar \ + django-favicon \ + django-settings-prod \ + django-home \ + django-utils \ + django-frontend \ + django-migrate \ + git-ignore \ + django-su + +.PHONY: django-init-wagtail-default +django-init-wagtail-default: separator \ + db-init \ + django-install \ + wagtail-install \ + wagtail-project \ + django-utils \ + pip-freeze \ + pip-init-test \ + django-custom-admin \ + django-dockerfile \ + django-offcanvas-template \ + wagtail-header-prefix-template \ + django-header-template \ + wagtail-base-template \ + django-footer-template \ + django-manage-py \ + wagtail-home \ + wagtail-urls \ + django-urls-debug-toolbar \ + django-allauth \ + django-favicon \ + git-ignore \ + wagtail-search \ + django-settings-base \ + django-settings-dev \ + django-settings-prod \ + wagtail-settings \ + django-siteuser \ + django-model-form-demo \ + django-logging-demo \ + django-payments-demo-default \ + django-rest-serializers \ + django-rest-views \ + django-urls-api \ + wagtail-urls-home \ + django-frontend \ + django-migrate \ + django-su + +.PHONY: django-install-default +django-install-default: + $(PIP_ENSURE) + python -m pip install \ + Django \ + Faker \ + boto3 \ + crispy-bootstrap5 \ + djangorestframework \ + django-allauth \ + django-after-response \ + django-ckeditor \ + django-colorful \ + django-cors-headers \ + django-countries \ + django-crispy-forms \ + django-debug-toolbar \ + django-extensions \ + django-hijack \ + django-honeypot \ + django-imagekit \ + django-import-export \ + django-ipware \ + django-multiselectfield \ + django-ninja \ + django-phonenumber-field \ + django-recurrence \ + django-recaptcha \ + django-registration \ + django-richtextfield \ + django-sendgrid-v5 \ + django-social-share \ + django-sql-explorer \ + django-storages \ + django-tables2 \ + django-timezone-field \ + django-widget-tweaks \ + dj-database-url \ + dj-rest-auth \ + dj-stripe \ + docutils \ + enmerkar \ + gunicorn \ + html2docx \ + icalendar \ + mailchimp-marketing \ + mailchimp-transactional \ + phonenumbers \ + pipdeptree \ + psycopg2-binary \ + pydotplus \ + python-webpack-boilerplate \ + python-docx \ + reportlab \ + texttable + +.PHONY: django-install-minimal-default +django-install-minimal-default: + $(PIP_ENSURE) + python -m pip install \ + Django \ + dj-database-url \ + django-debug-toolbar \ + python-webpack-boilerplate + +.PHONY: django-lint-default +django-lint-default: + -ruff format -v + -djlint --reformat --format-css --format-js . + -ruff check -v --fix + +.PHONY: django-loaddata-default +django-loaddata-default: + python manage.py loaddata + +.PHONY: django-logging-demo-default +django-logging-demo-default: + python manage.py startapp logging_demo + @echo "$$DJANGO_LOGGING_DEMO_ADMIN" > logging_demo/admin.py + @echo "$$DJANGO_LOGGING_DEMO_MODELS" > logging_demo/models.py + @echo "$$DJANGO_LOGGING_DEMO_SETTINGS" >> $(DJANGO_SETTINGS_BASE_FILE) + @echo "$$DJANGO_LOGGING_DEMO_URLS" > logging_demo/urls.py + @echo "$$DJANGO_LOGGING_DEMO_VIEWS" > logging_demo/views.py + @echo "$$DJANGO_URLS_LOGGING_DEMO" >> $(DJANGO_URLS_FILE) + export APP_DIR="logging_demo"; $(MAKE) django-app-tests + -$(GIT_ADD) logging_demo/*.py + -$(GIT_ADD) logging_demo/migrations/*.py + +.PHONY: django-manage-py-default +django-manage-py-default: + @echo "$$DJANGO_MANAGE_PY" > manage.py + -$(GIT_ADD) manage.py + +.PHONY: django-migrate-default +django-migrate-default: + python manage.py migrate + +.PHONY: django-migrations-make-default +django-migrations-make-default: + python manage.py makemigrations + +.PHONY: django-migrations-show-default +django-migrations-show-default: + python manage.py showmigrations + +.PHONY: django-model-form-demo-default +django-model-form-demo-default: + python manage.py startapp model_form_demo + @echo "$$DJANGO_MODEL_FORM_DEMO_ADMIN" > model_form_demo/admin.py + @echo "$$DJANGO_MODEL_FORM_DEMO_FORMS" > model_form_demo/forms.py + @echo "$$DJANGO_MODEL_FORM_DEMO_MODEL" > model_form_demo/models.py + @echo "$$DJANGO_MODEL_FORM_DEMO_URLS" > model_form_demo/urls.py + @echo "$$DJANGO_MODEL_FORM_DEMO_VIEWS" > model_form_demo/views.py + $(ADD_DIR) model_form_demo/templates + @echo "$$DJANGO_MODEL_FORM_DEMO_TEMPLATE_DETAIL" > model_form_demo/templates/model_form_demo_detail.html + @echo "$$DJANGO_MODEL_FORM_DEMO_TEMPLATE_FORM" > model_form_demo/templates/model_form_demo_form.html + @echo "$$DJANGO_MODEL_FORM_DEMO_TEMPLATE_LIST" > model_form_demo/templates/model_form_demo_list.html + @echo "$$DJANGO_SETTINGS_MODEL_FORM_DEMO" >> $(DJANGO_SETTINGS_BASE_FILE) + @echo "$$DJANGO_URLS_MODEL_FORM_DEMO" >> $(DJANGO_URLS_FILE) + export APP_DIR="model_form_demo"; $(MAKE) django-app-tests + python manage.py makemigrations + -$(GIT_ADD) model_form_demo/*.py + -$(GIT_ADD) model_form_demo/templates + -$(GIT_ADD) model_form_demo/migrations + +.PHONY: django-offcanvas-template-default +django-offcanvas-template-default: + -$(ADD_DIR) backend/templates + @echo "$$DJANGO_FRONTEND_OFFCANVAS_TEMPLATE" > backend/templates/offcanvas.html + -$(GIT_ADD) backend/templates/offcanvas.html + +.PHONY: django-open-default +django-open-default: +ifeq ($(UNAME), Linux) + @echo "Opening on Linux." + xdg-open http://0.0.0.0:8000 +else ifeq ($(UNAME), Darwin) + @echo "Opening on macOS (Darwin)." + open http://0.0.0.0:8000 +else + @echo "Unable to open on: $(UNAME)" +endif + +.PHONY: django-payments-demo-default +django-payments-demo-default: + python manage.py startapp payments + @echo "$$DJANGO_PAYMENTS_FORM" > payments/forms.py + @echo "$$DJANGO_PAYMENTS_MODELS" > payments/models.py + @echo "$$DJANGO_PAYMENTS_ADMIN" > payments/admin.py + @echo "$$DJANGO_PAYMENTS_VIEW" > payments/views.py + @echo "$$DJANGO_PAYMENTS_URLS" > payments/urls.py + $(ADD_DIR) payments/templates/payments + $(ADD_DIR) payments/management/commands + @echo "$$DJANGO_PAYMENTS_TEMPLATE_CANCEL" > payments/templates/payments/cancel.html + @echo "$$DJANGO_PAYMENTS_TEMPLATE_CHECKOUT" > payments/templates/payments/checkout.html + @echo "$$DJANGO_PAYMENTS_TEMPLATE_SUCCESS" > payments/templates/payments/success.html + @echo "$$DJANGO_PAYMENTS_TEMPLATE_PRODUCT_LIST" > payments/templates/payments/product_list.html + @echo "$$DJANGO_PAYMENTS_TEMPLATE_PRODUCT_DETAIL" > payments/templates/payments/product_detail.html + @echo "$$DJANGO_SETTINGS_PAYMENTS" >> $(DJANGO_SETTINGS_BASE_FILE) + @echo "$$DJANGO_URLS_PAYMENTS" >> $(DJANGO_URLS_FILE) + export APP_DIR="payments"; $(MAKE) django-app-tests + python manage.py makemigrations payments + @echo "$$DJANGO_PAYMENTS_MIGRATION_0002" > payments/migrations/0002_set_stripe_api_keys.py + @echo "$$DJANGO_PAYMENTS_MIGRATION_0003" > payments/migrations/0003_create_initial_products.py + -$(GIT_ADD) payments/ + +.PHONY: django-project-default +django-project-default: + django-admin startproject backend . + -$(GIT_ADD) backend + +.PHONY: django-rest-serializers-default +django-rest-serializers-default: + @echo "$$DJANGO_API_SERIALIZERS" > backend/serializers.py + -$(GIT_ADD) backend/serializers.py + +.PHONY: django-rest-views-default +django-rest-views-default: + @echo "$$DJANGO_API_VIEWS" > backend/api.py + -$(GIT_ADD) backend/api.py + +.PHONY: django-search-default +django-search-default: + python manage.py startapp search + $(ADD_DIR) search/templates + @echo "$$DJANGO_SEARCH_TEMPLATE" > search/templates/search.html + @echo "$$DJANGO_SEARCH_FORMS" > search/forms.py + @echo "$$DJANGO_SEARCH_URLS" > search/urls.py + @echo "$$DJANGO_SEARCH_UTILS" > search/utils.py + @echo "$$DJANGO_SEARCH_VIEWS" > search/views.py + @echo "$$DJANGO_SEARCH_SETTINGS" >> $(DJANGO_SETTINGS_BASE_FILE) + @echo "INSTALLED_APPS.append('search')" >> $(DJANGO_SETTINGS_BASE_FILE) + @echo "urlpatterns += [path('search/', include('search.urls'))]" >> $(DJANGO_URLS_FILE) + -$(GIT_ADD) search/templates + -$(GIT_ADD) search/*.py + +.PHONY: django-secret-key-default +django-secret-key-default: + @python -c "from secrets import token_urlsafe; print(token_urlsafe(50))" + +.PHONY: django-serve-default +django-serve-default: + npm run watch & + python manage.py runserver 0.0.0.0:8000 + +.PHONY: django-settings-base-default +django-settings-base-default: + @echo "$$DJANGO_SETTINGS_BASE" >> $(DJANGO_SETTINGS_BASE_FILE) + @echo "$$DJANGO_SETTINGS_AUTHENTICATION_BACKENDS" >> $(DJANGO_SETTINGS_BASE_FILE) + @echo "$$DJANGO_SETTINGS_REST_FRAMEWORK" >> $(DJANGO_SETTINGS_BASE_FILE) + @echo "$$DJANGO_SETTINGS_THEMES" >> $(DJANGO_SETTINGS_BASE_FILE) + @echo "$$DJANGO_SETTINGS_DATABASE" >> $(DJANGO_SETTINGS_BASE_FILE) + @echo "$$DJANGO_SETTINGS_INSTALLED_APPS" >> $(DJANGO_SETTINGS_BASE_FILE) + @echo "$$DJANGO_SETTINGS_MIDDLEWARE" >> $(DJANGO_SETTINGS_BASE_FILE) + @echo "$$DJANGO_SETTINGS_CRISPY_FORMS" >> $(DJANGO_SETTINGS_BASE_FILE) + +.PHONY: django-settings-base-minimal-default +django-settings-base-minimal-default: + @echo "$$DJANGO_SETTINGS_BASE_MINIMAL" >> $(DJANGO_SETTINGS_BASE_FILE) + +.PHONY: django-settings-dev-default +django-settings-dev-default: + @echo "# $(PROJECT_NAME)" > $(DJANGO_SETTINGS_DEV_FILE) + @echo "$$DJANGO_SETTINGS_DEV" >> backend/settings/dev.py + -$(GIT_ADD) $(DJANGO_SETTINGS_DEV_FILE) + +.PHONY: django-settings-directory-default +django-settings-directory-default: + @$(ADD_DIR) $(DJANGO_SETTINGS_DIR) + @$(COPY_FILE) backend/settings.py backend/settings/base.py + @$(DEL_FILE) backend/settings.py + -$(GIT_ADD) backend/settings/*.py + +.PHONY: django-settings-prod-default +django-settings-prod-default: + @echo "$$DJANGO_SETTINGS_PROD" > $(DJANGO_SETTINGS_PROD_FILE) + -$(GIT_ADD) $(DJANGO_SETTINGS_PROD_FILE) + +.PHONY: django-shell-default +django-shell-default: + python manage.py shell + +.PHONY: django-siteuser-default +django-siteuser-default: + python manage.py startapp siteuser + $(ADD_DIR) siteuser/templates/ + @echo "$$DJANGO_SITEUSER_FORM" > siteuser/forms.py + @echo "$$DJANGO_SITEUSER_MODEL" > siteuser/models.py + @echo "$$DJANGO_SITEUSER_ADMIN" > siteuser/admin.py + @echo "$$DJANGO_SITEUSER_VIEW" > siteuser/views.py + @echo "$$DJANGO_SITEUSER_URLS" > siteuser/urls.py + @echo "$$DJANGO_SITEUSER_VIEW_TEMPLATE" > siteuser/templates/profile.html + @echo "$$DJANGO_SITEUSER_TEMPLATE" > siteuser/templates/user.html + @echo "$$DJANGO_SITEUSER_EDIT_TEMPLATE" > siteuser/templates/user_edit.html + @echo "$$DJANGO_URLS_SITEUSER" >> $(DJANGO_URLS_FILE) + @echo "$$DJANGO_SETTINGS_SITEUSER" >> $(DJANGO_SETTINGS_BASE_FILE) + export APP_DIR="siteuser"; $(MAKE) django-app-tests + -$(GIT_ADD) siteuser/templates + -$(GIT_ADD) siteuser/*.py + python manage.py makemigrations siteuser + -$(GIT_ADD) siteuser/migrations/*.py + +.PHONY: django-static-default +django-static-default: + python manage.py collectstatic --noinput + +.PHONY: django-su-default +django-su-default: + DJANGO_SUPERUSER_PASSWORD=admin python manage.py createsuperuser --noinput --username=admin --email=$(PROJECT_EMAIL) + +.PHONY: django-test-default +django-test-default: npm-install django-static + -$(MAKE) pip-install-test + python manage.py test + +.PHONY: django-urls-api-default +django-urls-api-default: + @echo "$$DJANGO_URLS_API" >> $(DJANGO_URLS_FILE) + -$(GIT_ADD) $(DJANGO_URLS_FILE) + +.PHONY: django-urls-debug-toolbar-default +django-urls-debug-toolbar-default: + @echo "$$DJANGO_URLS_DEBUG_TOOLBAR" >> $(DJANGO_URLS_FILE) + +.PHONY: django-urls-default +django-urls-default: + @echo "$$DJANGO_URLS" > $(DJANGO_URLS_FILE) + -$(GIT_ADD) $(DJANGO_URLS_FILE) + +.PHONY: django-urls-show-default +django-urls-show-default: + python manage.py show_urls + +.PHONY: django-user-default +django-user-default: + python manage.py shell -c "from django.contrib.auth.models import User; \ + User.objects.create_user('user', '', 'user')" + +.PHONY: django-utils-default +django-utils-default: + @echo "$$DJANGO_UTILS" > backend/utils.py + -$(GIT_ADD) backend/utils.py + +.PHONY: docker-build-default +docker-build-default: + podman build -t $(PROJECT_NAME) . + +.PHONY: docker-compose-default +docker-compose-default: + podman compose up + +.PHONY: docker-list-default +docker-list-default: + podman container list --all + podman images --all + +.PHONY: docker-run-default +docker-run-default: + podman run $(PROJECT_NAME) + +.PHONY: docker-serve-default +docker-serve-default: + podman run -p 8000:8000 $(PROJECT_NAME) + +.PHONY: docker-shell-default +docker-shell-default: + podman run -it $(PROJECT_NAME) /bin/bash + +.PHONY: eb-check-env-default +eb-check-env-default: # https://stackoverflow.com/a/4731504/185820 +ifndef EB_SSH_KEY + $(error EB_SSH_KEY is undefined) +endif +ifndef VPC_ID + $(error VPC_ID is undefined) +endif +ifndef VPC_SG + $(error VPC_SG is undefined) +endif +ifndef VPC_SUBNET_EC2 + $(error VPC_SUBNET_EC2 is undefined) +endif +ifndef VPC_SUBNET_ELB + $(error VPC_SUBNET_ELB is undefined) +endif + +.PHONY: eb-create-default +eb-create-default: aws-check-env eb-check-env + eb create $(EB_ENV_NAME) \ + -im $(EC2_INSTANCE_MIN) \ + -ix $(EC2_INSTANCE_MAX) \ + -ip $(EC2_INSTANCE_PROFILE) \ + -i $(EC2_INSTANCE_TYPE) \ + -k $(EB_SSH_KEY) \ + -p $(EB_PLATFORM) \ + --elb-type $(EC2_LB_TYPE) \ + --vpc \ + --vpc.id $(VPC_ID) \ + --vpc.elbpublic \ + --vpc.publicip \ + --vpc.ec2subnets $(VPC_SUBNET_EC2) \ + --vpc.elbsubnets $(VPC_SUBNET_ELB) \ + --vpc.securitygroups $(VPC_SG) + +.PHONY: eb-custom-env-default +eb-custom-env-default: + $(ADD_DIR) .ebextensions + @echo "$$EB_CUSTOM_ENV_EC2_USER" > .ebextensions/bash.config + -$(GIT_ADD) .ebextensions/bash.config + $(ADD_DIR) .platform/hooks/postdeploy + @echo "$$EB_CUSTOM_ENV_VAR_FILE" > .platform/hooks/postdeploy/setenv.sh + -$(GIT_ADD) .platform/hooks/postdeploy/setenv.sh + +.PHONY: eb-deploy-default +eb-deploy-default: + eb deploy + +.PHONY: eb-export-default +eb-export-default: + @if [ ! -d $(EB_DIR_NAME) ]; then \ + echo "Directory $(EB_DIR_NAME) does not exist"; \ + else \ + echo "Directory $(EB_DIR_NAME) does exist!"; \ + eb ssh --quiet -c "export PGPASSWORD=$(DJANGO_DB_PASS); pg_dump -U $(DJANGO_DB_USER) -h $(DJANGO_DB_HOST) $(DJANGO_DB_NAME)" > $(DJANGO_DB_NAME).sql; \ + echo "Wrote $(DJANGO_DB_NAME).sql"; \ + fi + +.PHONY: eb-restart-default +eb-restart-default: + eb ssh -c "systemctl restart web" + +.PHONY: eb-rebuild-default +eb-rebuild-default: + aws elasticbeanstalk rebuild-environment --environment-name $(ENV_NAME) + +.PHONY: eb-upgrade-default +eb-upgrade-default: + eb upgrade + +.PHONY: eb-init-default +eb-init-default: aws-check-env-profile + eb init --profile=$(AWS_PROFILE) + +.PHONY: eb-list-default +eb-list-platforms-default: + aws elasticbeanstalk list-platform-versions + +.PHONY: eb-list-databases-default +eb-list-databases-default: + @eb ssh --quiet -c "export PGPASSWORD=$(DJANGO_DB_PASS); psql -l -U $(DJANGO_DB_USER) -h $(DJANGO_DB_HOST) $(DJANGO_DB_NAME)" + +.PHONY: eb-logs-default +eb-logs-default: + eb logs + +.PHONY: eb-print-env-default +eb-print-env-default: + eb printenv + +.PHONY: favicon-default +favicon-init-default: + dd if=/dev/urandom bs=64 count=1 status=none | base64 | convert -size 16x16 -depth 8 -background none -fill white label:@- favicon.png + convert favicon.png favicon.ico + -$(GIT_ADD) favicon.ico + $(DEL_FILE) favicon.png + +.PHONY: git-ignore-default +git-ignore-default: + @echo "$$GIT_IGNORE" > .gitignore + -$(GIT_ADD) .gitignore + +.PHONY: git-branches-default +git-branches-default: + -for i in $(GIT_BRANCHES) ; do \ + -@$(GIT_CHECKOUT) -t $$i ; done + +.PHONY: git-commit-message-clean-default +git-commit-message-clean-default: + -@$(GIT_COMMIT) -a -m "Clean" + +.PHONY: git-commit-message-default +git-commit-message-default: + -@$(GIT_COMMIT) -a -m $(GIT_COMMIT_MSG) + +.PHONY: git-commit-message-empty-default +git-commit-message-empty-default: + -@$(GIT_COMMIT) --allow-empty -m "Empty-Commit" + +.PHONY: git-commit-message-init-default +git-commit-message-init-default: + -@$(GIT_COMMIT) -a -m "Init" + +.PHONY: git-commit-message-last-default +git-commit-message-last-default: + git log -1 --pretty=%B > $(TMPDIR)/commit.txt + -$(GIT_COMMIT) -a -F $(TMPDIR)/commit.txt + +.PHONY: git-commit-message-lint-default +git-commit-message-lint-default: + -@$(GIT_COMMIT) -a -m "Lint" + +.PHONY: git-commit-message-mk-default +git-commit-message-mk-default: + -@$(GIT_COMMIT) project.mk -m "Add/update $(MAKEFILE_CUSTOM_FILE)" + +.PHONY: git-commit-message-rename-default +git-commit-message-rename-default: + -@$(GIT_COMMIT) -a -m "Rename" + +.PHONY: git-commit-message-sort-default +git-commit-message-sort-default: + -@$(GIT_COMMIT) -a -m "Sort" + +.PHONY: git-push-default +git-push-default: + -@$(GIT_PUSH) + +.PHONY: git-push-force-default +git-push-force-default: + -@$(GIT_PUSH_FORCE) + +.PHONY: git-commit-edit-default +git-commit-edit-default: + -$(GIT_COMMIT) -a + +.PHONY: git-prune-default +git-prune-default: + git remote update origin --prune + +.PHONY: git-set-upstream-default +git-set-upstream-default: + git push --set-upstream origin main + +.PHONY: git-set-default-default +git-set-default-default: + gh repo set-default + +.PHONY: git-short-default +git-short-default: + @echo $(GIT_REV) + +.PHONY: help-default +help-default: + @echo "Project Makefile 🤷" + @echo "Usage: make [options] [target] ..." + @echo "Examples:" + @echo " make help Print this message" + @echo " make list-defines list all defines in the Makefile" + @echo " make list-commands list all targets in the Makefile" + +.PHONY: jenkins-init-default +jenkins-init-default: + @echo "$$JENKINS_FILE" > Jenkinsfile + +.PHONY: makefile-list-commands-default +makefile-list-commands-default: + @for makefile in $(MAKEFILE_LIST); do \ + echo "Commands from $$makefile:"; \ + $(MAKE) -pRrq -f $$makefile : 2>/dev/null | \ + awk -v RS= -F: '/^# File/,/^# Finished Make data base/ { \ + if ($$1 !~ "^[#.]") { sub(/-default$$/, "", $$1); print $$1 } }' | \ + egrep -v -e '^[^[:alnum:]]' -e '^$@$$' | \ + tr ' ' '\n' | \ + sort | \ + awk '{print $$0}' ; \ + echo; \ + done | $(PAGER) + +.PHONY: makefile-list-defines-default +makefile-list-defines-default: + @grep '^define [A-Za-z_][A-Za-z0-9_]*' Makefile + +.PHONY: makefile-list-exports-default +makefile-list-exports-default: + @grep '^export [A-Z][A-Z_]*' Makefile + +.PHONY: makefile-list-targets-default +makefile-list-targets-default: + @perl -ne 'print if /^\s*\.PHONY:/ .. /^[a-zA-Z0-9_-]+:/;' Makefile | grep -v .PHONY + +.PHONY: make-default +make-default: + -$(GIT_ADD) Makefile + -$(GIT_COMMIT) Makefile -m "Add/update project-makefile files" + -git push + +.PHONY: npm-init-default +npm-init-default: + npm init -y + -$(GIT_ADD) package.json + -$(GIT_ADD) package-lock.json + +.PHONY: npm-build-default +npm-build-default: + npm run build + +.PHONY: npm-install-default +npm-install-default: + npm install + -$(GIT_ADD) package-lock.json + +.PHONY: npm-install-django-default +npm-install-django-default: + npm install \ + @fortawesome/fontawesome-free \ + @fortawesome/fontawesome-svg-core \ + @fortawesome/free-brands-svg-icons \ + @fortawesome/free-solid-svg-icons \ + @fortawesome/react-fontawesome \ + bootstrap \ + camelize \ + date-fns \ + history \ + mapbox-gl \ + query-string \ + react-animate-height \ + react-chartjs-2 \ + react-copy-to-clipboard \ + react-date-range \ + react-dom \ + react-dropzone \ + react-hook-form \ + react-image-crop \ + react-map-gl \ + react-modal \ + react-resize-detector \ + react-select \ + react-swipeable \ + snakeize \ + striptags \ + url-join \ + viewport-mercator-project + +.PHONY: npm-install-django-dev-default +npm-install-django-dev-default: + npm install \ + eslint-plugin-react \ + eslint-config-standard \ + eslint-config-standard-jsx \ + @babel/core \ + @babel/preset-env \ + @babel/preset-react \ + --save-dev + +.PHONY: npm-serve-default +npm-serve-default: + npm run start + +.PHONY: npm-test-default +npm-test-default: + npm run test + +.PHONY: pip-deps-default +pip-deps-default: + $(PIP_ENSURE) + python -m pip install pipdeptree + python -m pipdeptree + pipdeptree + +.PHONY: pip-freeze-default +pip-freeze-default: + $(PIP_ENSURE) + python -m pip freeze | sort > $(TMPDIR)/requirements.txt + mv -f $(TMPDIR)/requirements.txt . + -$(GIT_ADD) requirements.txt + +.PHONY: pip-init-default +pip-init-default: + touch requirements.txt + -$(GIT_ADD) requirements.txt + +.PHONY: pip-init-test-default +pip-init-test-default: + @echo "$$PIP_INSTALL_REQUIREMENTS_TEST" > requirements-test.txt + -$(GIT_ADD) requirements-test.txt + +.PHONY: pip-install-default +pip-install-default: + $(PIP_ENSURE) + $(MAKE) pip-upgrade + python -m pip install wheel + python -m pip install -r requirements.txt + +.PHONY: pip-install-dev-default +pip-install-dev-default: + $(PIP_ENSURE) + python -m pip install -r requirements-dev.txt + +.PHONY: pip-install-test-default +pip-install-test-default: + $(PIP_ENSURE) + python -m pip install -r requirements-test.txt + +.PHONY: pip-install-upgrade-default +pip-install-upgrade-default: + cat requirements.txt | awk -F\= '{print $$1}' > $(TMPDIR)/requirements.txt + mv -f $(TMPDIR)/requirements.txt . + $(PIP_ENSURE) + python -m pip install -U -r requirements.txt + python -m pip freeze | sort > $(TMPDIR)/requirements.txt + mv -f $(TMPDIR)/requirements.txt . + +.PHONY: pip-upgrade-default +pip-upgrade-default: + $(PIP_ENSURE) + python -m pip install -U pip + +.PHONY: pip-uninstall-default +pip-uninstall-default: + $(PIP_ENSURE) + python -m pip freeze | xargs python -m pip uninstall -y + +.PHONY: plone-clean-default +plone-clean-default: + $(DEL_DIR) $(PROJECT_NAME) + $(DEL_DIR) $(PACKAGE_NAME) + +.PHONY: plone-init-default +plone-init-default: git-ignore plone-install plone-instance plone-serve + +.PHONY: plone-install-default +plone-install-default: + $(PIP_ENSURE) + python -m pip install plone -c $(PIP_INSTALL_PLONE_CONSTRAINTS) + +.PHONY: plone-instance-default +plone-instance-default: + mkwsgiinstance -d backend -u admin:admin + cat backend/etc/zope.ini | sed -e 's/host = 127.0.0.1/host = 0.0.0.0/; s/port = 8080/port = 8000/' > $(TMPDIR)/zope.ini + mv -f $(TMPDIR)/zope.ini backend/etc/zope.ini + -$(GIT_ADD) backend/etc/site.zcml + -$(GIT_ADD) backend/etc/zope.conf + -$(GIT_ADD) backend/etc/zope.ini + +.PHONY: plone-serve-default +plone-serve-default: + runwsgi backend/etc/zope.ini + +.PHONY: plone-build-default +plone-build-default: + buildout + +.PHONY: programming-interview-default +programming-interview-default: + @echo "$$PROGRAMMING_INTERVIEW" > interview.py + @echo "Created interview.py!" + -@$(GIT_ADD) interview.py > /dev/null 2>&1 + +# .NOT_PHONY! +$(MAKEFILE_CUSTOM_FILE): + @echo "$$MAKEFILE_CUSTOM" > $(MAKEFILE_CUSTOM_FILE) + -$(GIT_ADD) $(MAKEFILE_CUSTOM_FILE) + +.PHONY: python-license-default +python-license-default: + @echo "$(PYTHON_LICENSE_TXT)" > LICENSE.txt + -$(GIT_ADD) LICENSE.txt + +.PHONY: python-project-default +python-project-default: + @echo "$(PYTHON_PROJECT_TOML)" > pyproject.toml + -$(GIT_ADD) pyproject.toml + +.PHONY: python-serve-default +python-serve-default: + @echo "\n\tServing HTTP on http://0.0.0.0:8000\n" + python3 -m http.server + +.PHONY: python-sdist-default +python-sdist-default: + $(PIP_ENSURE) + python setup.py sdist --format=zip + +.PHONY: python-webpack-init-default +python-webpack-init-default: + python manage.py webpack_init --no-input + +.PHONY: python-ci-default +python-ci-default: + $(ADD_DIR) .github/workflows + @echo "$(PYTHON_CI_YAML)" > .github/workflows/build_wheels.yml + -$(GIT_ADD) .github/workflows/build_wheels.yml + +.PHONY: rand-default +rand-default: + @openssl rand -base64 12 | sed 's/\///g' + +.PHONY: readme-init-default +readme-init-default: + @echo "# $(PROJECT_NAME)" > README.md + -$(GIT_ADD) README.md + +.PHONY: readme-edit-default +readme-edit-default: + $(EDITOR) README.md + +.PHONY: reveal-init-default +reveal-init-default: webpack-init-reveal + npm install \ + css-loader \ + mini-css-extract-plugin \ + reveal.js \ + style-loader + jq '.scripts += {"build": "webpack"}' package.json > \ + $(TMPDIR)/tmp.json && mv $(TMPDIR)/tmp.json package.json + jq '.scripts += {"start": "webpack serve --mode development --port 8000 --static"}' package.json > \ + $(TMPDIR)/tmp.json && mv $(TMPDIR)/tmp.json package.json + jq '.scripts += {"watch": "webpack watch --mode development"}' package.json > \ + $(TMPDIR)/tmp.json && mv $(TMPDIR)/tmp.json package.json + +.PHONY: reveal-serve-default +reveal-serve-default: + npm run watch & + python -m http.server + +.PHONY: review-default +review-default: +ifeq ($(UNAME), Darwin) + $(EDITOR_REVIEW) `find backend/ -name \*.py` `find backend/ -name \*.html` `find frontend/ -name \*.js` `find frontend/ -name \*.js` +else + @echo "Unsupported" +endif + +.PHONY: separator-default +separator-default: + @echo "$$SEPARATOR" + +.PHONY: sphinx-init-default +sphinx-init-default: sphinx-install + sphinx-quickstart -q -p $(PROJECT_NAME) -a $(USER) -v 0.0.1 $(RANDIR) + $(COPY_DIR) $(RANDIR)/* . + $(DEL_DIR) $(RANDIR) + -$(GIT_ADD) index.rst + -$(GIT_ADD) conf.py + $(DEL_FILE) make.bat + -@$(GIT_CHECKOUT) Makefile + $(MAKE) git-ignore + +.PHONY: sphinx-theme-init-default +sphinx-theme-init-default: + export DJANGO_FRONTEND_THEME_NAME=$(PROJECT_NAME)_theme; \ + $(ADD_DIR) $$DJANGO_FRONTEND_THEME_NAME ; \ + $(ADD_FILE) $$DJANGO_FRONTEND_THEME_NAME/__init__.py ; \ + -$(GIT_ADD) $$DJANGO_FRONTEND_THEME_NAME/__init__.py ; \ + $(ADD_FILE) $$DJANGO_FRONTEND_THEME_NAME/theme.conf ; \ + -$(GIT_ADD) $$DJANGO_FRONTEND_THEME_NAME/theme.conf ; \ + $(ADD_FILE) $$DJANGO_FRONTEND_THEME_NAME/layout.html ; \ + -$(GIT_ADD) $$DJANGO_FRONTEND_THEME_NAME/layout.html ; \ + $(ADD_DIR) $$DJANGO_FRONTEND_THEME_NAME/static/css ; \ + $(ADD_FILE) $$DJANGO_FRONTEND_THEME_NAME/static/css/style.css ; \ + $(ADD_DIR) $$DJANGO_FRONTEND_THEME_NAME/static/js ; \ + $(ADD_FILE) $$DJANGO_FRONTEND_THEME_NAME/static/js/script.js ; \ + -$(GIT_ADD) $$DJANGO_FRONTEND_THEME_NAME/static + +.PHONY: sphinx-install-default +sphinx-install-default: + echo "Sphinx\n" > requirements.txt + @$(MAKE) pip-install + @$(MAKE) pip-freeze + -$(GIT_ADD) requirements.txt + +.PHONY: sphinx-build-default +sphinx-build-default: + sphinx-build -b html -d _build/doctrees . _build/html + sphinx-build -b rinoh . _build/rinoh + +.PHONY: sphinx-serve-default +sphinx-serve-default: + cd _build/html;python3 -m http.server + +.PHONY: wagtail-base-template-default +wagtail-base-template-default: + @echo "$$WAGTAIL_BASE_TEMPLATE" > backend/templates/base.html + +.PHONY: wagtail-clean-default +wagtail-clean-default: + -@for dir in $(shell echo "$(WAGTAIL_CLEAN_DIRS)"); do \ + echo "Cleaning $$dir"; \ + $(DEL_DIR) $$dir >/dev/null 2>&1; \ + done + -@for file in $(shell echo "$(WAGTAIL_CLEAN_FILES)"); do \ + echo "Cleaning $$file"; \ + $(DEL_FILE) $$file >/dev/null 2>&1; \ + done + +.PHONY: wagtail-contactpage-default +wagtail-contactpage-default: + python manage.py startapp contactpage + @echo "$$WAGTAIL_CONTACT_PAGE_MODEL" > contactpage/models.py + @echo "$$WAGTAIL_CONTACT_PAGE_TEST" > contactpage/tests.py + $(ADD_DIR) contactpage/templates/contactpage/ + @echo "$$WAGTAIL_CONTACT_PAGE_TEMPLATE" > contactpage/templates/contactpage/contact_page.html + @echo "$$WAGTAIL_CONTACT_PAGE_LANDING" > contactpage/templates/contactpage/contact_page_landing.html + @echo "INSTALLED_APPS.append('contactpage')" >> $(DJANGO_SETTINGS_BASE_FILE) + python manage.py makemigrations contactpage + -$(GIT_ADD) contactpage/templates + -$(GIT_ADD) contactpage/*.py + -$(GIT_ADD) contactpage/migrations/*.py + +.PHONY: wagtail-header-prefix-template-default +wagtail-header-prefix-template-default: + @echo "$$WAGTAIL_HEADER_PREFIX" > backend/templates/header.html + +.PHONY: wagtail-home-default +wagtail-home-default: + @echo "$$WAGTAIL_HOME_PAGE_MODEL" > home/models.py + @echo "$$WAGTAIL_HOME_PAGE_TEMPLATE" > home/templates/home/home_page.html + $(ADD_DIR) home/templates/blocks + @echo "$$WAGTAIL_BLOCK_MARKETING" > home/templates/blocks/marketing_block.html + @echo "$$WAGTAIL_BLOCK_CAROUSEL" > home/templates/blocks/carousel_block.html + -$(GIT_ADD) home/templates + -$(GIT_ADD) home/*.py + python manage.py makemigrations home + -$(GIT_ADD) home/migrations/*.py + +.PHONY: wagtail-install-default +wagtail-install-default: + $(PIP_ENSURE) + python -m pip install \ + wagtail \ + wagtailmenus \ + wagtail-color-panel \ + wagtail-django-recaptcha \ + wagtail-markdown \ + wagtail-modeladmin \ + wagtail-seo \ + weasyprint \ + whitenoise \ + xhtml2pdf + +.PHONY: wagtail-private-default +wagtail-privacy-default: + python manage.py startapp privacy + @echo "$$WAGTAIL_PRIVACY_PAGE_MODEL" > privacy/models.py + $(ADD_DIR) privacy/templates + @echo "$$WAGTAIL_PRIVACY_PAGE_TEMPLATE" > privacy/templates/privacy_page.html + @echo "INSTALLED_APPS.append('privacy')" >> $(DJANGO_SETTINGS_BASE_FILE) + python manage.py makemigrations privacy + -$(GIT_ADD) privacy/templates + -$(GIT_ADD) privacy/*.py + -$(GIT_ADD) privacy/migrations/*.py + +.PHONY: wagtail-project-default +wagtail-project-default: + wagtail start backend . + $(DEL_FILE) home/templates/home/welcome_page.html + -$(GIT_ADD) backend/ + -$(GIT_ADD) .dockerignore + -$(GIT_ADD) Dockerfile + -$(GIT_ADD) manage.py + -$(GIT_ADD) requirements.txt + +.PHONY: wagtail-search-default +wagtail-search-default: + @echo "$$WAGTAIL_SEARCH_TEMPLATE" > search/templates/search/search.html + @echo "$$WAGTAIL_SEARCH_URLS" > search/urls.py + -$(GIT_ADD) search/templates + -$(GIT_ADD) search/*.py + +.PHONY: wagtail-settings-default +wagtail-settings-default: + @echo "$$WAGTAIL_SETTINGS" >> $(DJANGO_SETTINGS_BASE_FILE) + +.PHONY: wagtail-sitepage-default +wagtail-sitepage-default: + python manage.py startapp sitepage + @echo "$$WAGTAIL_SITEPAGE_MODEL" > sitepage/models.py + $(ADD_DIR) sitepage/templates/sitepage/ + @echo "$$WAGTAIL_SITEPAGE_TEMPLATE" > sitepage/templates/sitepage/site_page.html + @echo "INSTALLED_APPS.append('sitepage')" >> $(DJANGO_SETTINGS_BASE_FILE) + python manage.py makemigrations sitepage + -$(GIT_ADD) sitepage/templates + -$(GIT_ADD) sitepage/*.py + -$(GIT_ADD) sitepage/migrations/*.py + +.PHONY: wagtail-urls-default +wagtail-urls-default: + @echo "$$WAGTAIL_URLS" > $(DJANGO_URLS_FILE) + +.PHONY: wagtail-urls-home-default +wagtail-urls-home-default: + @echo "$$WAGTAIL_URLS_HOME" >> $(DJANGO_URLS_FILE) + +.PHONY: webpack-init-default +webpack-init-default: npm-init + @echo "$$WEBPACK_CONFIG_JS" > webpack.config.js + -$(GIT_ADD) webpack.config.js + npm install --save-dev webpack webpack-cli webpack-dev-server + $(ADD_DIR) src/ + @echo "$$WEBPACK_INDEX_JS" > src/index.js + -$(GIT_ADD) src/index.js + @echo "$$WEBPACK_INDEX_HTML" > index.html + -$(GIT_ADD) index.html + $(MAKE) git-ignore + +.PHONY: webpack-init-reveal-default +webpack-init-reveal-default: npm-init + @echo "$$WEBPACK_REVEAL_CONFIG_JS" > webpack.config.js + -$(GIT_ADD) webpack.config.js + npm install --save-dev webpack webpack-cli webpack-dev-server + $(ADD_DIR) src/ + @echo "$$WEBPACK_REVEAL_INDEX_JS" > src/index.js + -$(GIT_ADD) src/index.js + @echo "$$WEBPACK_REVEAL_INDEX_HTML" > index.html + -$(GIT_ADD) index.html + $(MAKE) git-ignore + +# -------------------------------------------------------------------------------- +# Single-line phony target rules +# -------------------------------------------------------------------------------- + +.PHONY: aws-check-env-default +aws-check-env-default: aws-check-env-profile aws-check-env-region + +.PHONY: ce-default +ce-default: git-commit-edit git-push + +.PHONY: clean-default +clean-default: wagtail-clean + +.PHONY: cp-default +cp-default: git-commit-message git-push + +.PHONY: db-dump-default +db-dump-default: eb-export + +.PHONY: dbshell-default +dbshell-default: django-db-shell + +.PHONY: deploy-default +deploy-default: eb-deploy + +.PHONY: d-default +d-default: eb-deploy + +.PHONY: deps-default +deps-default: pip-deps + +.PHONY: e-default +e-default: edit + +.PHONY: edit-default +edit-default: readme-edit + +.PHONY: empty-default +empty-default: git-commit-message-empty git-push + +.PHONY: fp-default +fp-default: git-push-force + +.PHONY: freeze-default +freeze-default: pip-freeze git-push + +.PHONY: git-commit-default +git-commit-default: git-commit-message git-push + +.PHONY: git-commit-clean-default +git-commit-clean-default: git-commit-message-clean git-push + +.PHONY: git-commit-init-default +git-commit-init-default: git-commit-message-init git-push + +.PHONY: git-commit-lint-default +git-commit-lint-default: git-commit-message-lint git-push + +.PHONY: gitignore-default +gitignore-default: git-ignore + +.PHONY: h-default +h-default: help + +.PHONY: init-default +init-default: django-init-wagtail django-serve + +.PHONY: init-wagtail-default +init-wagtail-default: django-init-wagtail + +.PHONY: install-default +install-default: pip-install + +.PHONY: l-default +l-default: makefile-list-commands + +.PHONY: last-default +last-default: git-commit-message-last git-push + +.PHONY: lint-default +lint-default: django-lint + +.PHONY: list-commands-default +list-commands-default: makefile-list-commands + +.PHONY: list-defines-default +list-defines-default: makefile-list-defines + +.PHONY: list-exports-default +list-exports-default: makefile-list-exports + +.PHONY: list-targets-default +list-targets-default: makefile-list-targets + +.PHONY: migrate-default +migrate-default: django-migrate + +.PHONY: migrations-default +migrations-default: django-migrations-make + +.PHONY: migrations-show-default +migrations-show-default: django-migrations-show + +.PHONY: mk-default +mk-default: project.mk git-commit-message-mk git-push + +.PHONY: open-default +open-default: django-open + +.PHONY: o-default +o-default: django-open + +.PHONY: readme-default +readme-default: readme-init + +.PHONY: rename-default +rename-default: git-commit-message-rename git-push + +.PHONY: s-default +s-default: django-serve + +.PHONY: shell-default +shell-default: django-shell + +.PHONY: serve-default +serve-default: django-serve + +.PHONY: static-default +static-default: django-static + +.PHONY: sort-default +sort-default: git-commit-message-sort git-push + +.PHONY: su-default +su-default: django-su + +.PHONY: test-default +test-default: django-test + +.PHONY: t-default +t-default: django-test + +.PHONY: u-default +u-default: help + +.PHONY: urls-default +urls-default: django-urls-show + +# -------------------------------------------------------------------------------- +# Allow customizing rules defined in this Makefile with rules defined in +# $(MAKEFILE_CUSTOM_FILE) +# -------------------------------------------------------------------------------- + +%: %-default # https://stackoverflow.com/a/49804748 + @ true From 776eb9e9b7b4406767a45523cc833f7fbc20100b Mon Sep 17 00:00:00 2001 From: Jeffrey 'Alex' Clark Date: Wed, 21 Aug 2024 16:08:26 -0400 Subject: [PATCH 280/662] Add/update project-makefile files --- Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 4200f95da..b5fbff2c9 100644 --- a/Makefile +++ b/Makefile @@ -4521,21 +4521,21 @@ db-dump-default: eb-export .PHONY: dbshell-default dbshell-default: django-db-shell +.PHONY: d-default +d-default: deploy + .PHONY: deploy-default deploy-default: eb-deploy -.PHONY: d-default -d-default: eb-deploy - .PHONY: deps-default deps-default: pip-deps -.PHONY: e-default -e-default: edit - .PHONY: edit-default edit-default: readme-edit +.PHONY: e-default +e-default: edit + .PHONY: empty-default empty-default: git-commit-message-empty git-push @@ -4605,12 +4605,12 @@ migrations-show-default: django-migrations-show .PHONY: mk-default mk-default: project.mk git-commit-message-mk git-push -.PHONY: open-default -open-default: django-open - .PHONY: o-default o-default: django-open +.PHONY: open-default +open-default: open + .PHONY: readme-default readme-default: readme-init @@ -4618,14 +4618,14 @@ readme-default: readme-init rename-default: git-commit-message-rename git-push .PHONY: s-default -s-default: django-serve - -.PHONY: shell-default -shell-default: django-shell +s-default: serve .PHONY: serve-default serve-default: django-serve +.PHONY: shell-default +shell-default: django-shell + .PHONY: static-default static-default: django-static @@ -4639,7 +4639,7 @@ su-default: django-su test-default: django-test .PHONY: t-default -t-default: django-test +t-default: test .PHONY: u-default u-default: help From 837af6420d40fe772bcd910d9c531c2ca8fe980e Mon Sep 17 00:00:00 2001 From: Jeffrey 'Alex' Clark Date: Wed, 21 Aug 2024 16:43:28 -0400 Subject: [PATCH 281/662] Add/update project-makefile files --- Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Makefile b/Makefile index b5fbff2c9..d8e621c6c 100644 --- a/Makefile +++ b/Makefile @@ -3980,6 +3980,10 @@ git-commit-message-default: git-commit-message-empty-default: -@$(GIT_COMMIT) --allow-empty -m "Empty-Commit" +.PHONY: git-commit-message-ignore-default +git-commit-message-ignore-default: + -@$(GIT_COMMIT) -a -m "Ignore" + .PHONY: git-commit-message-init-default git-commit-message-init-default: -@$(GIT_COMMIT) -a -m "Init" @@ -4225,6 +4229,7 @@ plone-instance-default: -$(GIT_ADD) backend/etc/site.zcml -$(GIT_ADD) backend/etc/zope.conf -$(GIT_ADD) backend/etc/zope.ini + -$(GIT_ADD) backend/inituser .PHONY: plone-serve-default plone-serve-default: @@ -4530,6 +4535,9 @@ deploy-default: eb-deploy .PHONY: deps-default deps-default: pip-deps +.PHONY: dump-default +dump-default: db-dump + .PHONY: edit-default edit-default: readme-edit @@ -4551,6 +4559,9 @@ git-commit-default: git-commit-message git-push .PHONY: git-commit-clean-default git-commit-clean-default: git-commit-message-clean git-push +.PHONY: git-commit-ignore-default +git-commit-ignore-default: git-commit-message-ignore git-push + .PHONY: git-commit-init-default git-commit-init-default: git-commit-message-init git-push @@ -4563,6 +4574,9 @@ gitignore-default: git-ignore .PHONY: h-default h-default: help +.PHONY: ignore-default +ignore-default: git-commit-message-ignore git-push + .PHONY: init-default init-default: django-init-wagtail django-serve From 575fad24726fe25d06ea985ca59eb9126e26a00b Mon Sep 17 00:00:00 2001 From: Jeffrey 'Alex' Clark Date: Wed, 21 Aug 2024 17:02:53 -0400 Subject: [PATCH 282/662] Add/update project-makefile files --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d8e621c6c..a16a18055 100644 --- a/Makefile +++ b/Makefile @@ -1996,6 +1996,7 @@ _build/ .elasticbeanstalk/ db.sqlite3 static/ +backend/inituser backend/var endef @@ -4229,7 +4230,6 @@ plone-instance-default: -$(GIT_ADD) backend/etc/site.zcml -$(GIT_ADD) backend/etc/zope.conf -$(GIT_ADD) backend/etc/zope.ini - -$(GIT_ADD) backend/inituser .PHONY: plone-serve-default plone-serve-default: From 132663a881bfe2bfc5265e7e05de7113f06501a5 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 22 Aug 2024 07:36:52 +1000 Subject: [PATCH 283/662] Updated error message for invalid width or height --- Tests/test_file_webp.py | 8 ++++++++ src/_webp.c | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index 6ccd489bb..ad08da364 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -157,6 +157,14 @@ class TestFileWebp: im.save(temp_file, method=0) assert str(e.value) == "encoding error 6" + @pytest.mark.skipif(sys.maxsize <= 2**32, reason="Requires 64-bit system") + def test_write_encoding_error_bad_dimension(self, tmp_path: Path) -> None: + temp_file = str(tmp_path / "temp.webp") + im = Image.new("L", (16384, 16384)) + with pytest.raises(ValueError) as e: + im.save(temp_file) + assert str(e.value) == "encoding error 5: Image size exceeds WebP limit" + def test_WebPEncode_with_invalid_args(self) -> None: """ Calling encoder functions with no arguments should result in an error. diff --git a/src/_webp.c b/src/_webp.c index d1943b3e0..0d2d6f023 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -672,7 +672,12 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) { WebPPictureFree(&pic); if (!ok) { - PyErr_Format(PyExc_ValueError, "encoding error %d", (&pic)->error_code); + int error_code = (&pic)->error_code; + const char *message = ""; + if (error_code == VP8_ENC_ERROR_BAD_DIMENSION) { + message = ": Image size exceeds WebP limit"; + } + PyErr_Format(PyExc_ValueError, "encoding error %d%s", error_code, message); return NULL; } output = writer.mem; From 0f64d08e64e2a1d8bedf280626006a95cbb2b086 Mon Sep 17 00:00:00 2001 From: Jeffrey 'Alex' Clark Date: Wed, 21 Aug 2024 21:16:02 -0400 Subject: [PATCH 284/662] Revert "Add/update project-makefile files" This reverts commit 575fad24726fe25d06ea985ca59eb9126e26a00b. Sorry for the noise (1/4)! --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a16a18055..d8e621c6c 100644 --- a/Makefile +++ b/Makefile @@ -1996,7 +1996,6 @@ _build/ .elasticbeanstalk/ db.sqlite3 static/ -backend/inituser backend/var endef @@ -4230,6 +4229,7 @@ plone-instance-default: -$(GIT_ADD) backend/etc/site.zcml -$(GIT_ADD) backend/etc/zope.conf -$(GIT_ADD) backend/etc/zope.ini + -$(GIT_ADD) backend/inituser .PHONY: plone-serve-default plone-serve-default: From e19841afa486c33673d9ff6cb8330761414f91de Mon Sep 17 00:00:00 2001 From: Jeffrey 'Alex' Clark Date: Wed, 21 Aug 2024 21:16:35 -0400 Subject: [PATCH 285/662] Revert "Add/update project-makefile files" This reverts commit 837af6420d40fe772bcd910d9c531c2ca8fe980e. Sorry for the noise (2/4)! --- Makefile | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Makefile b/Makefile index d8e621c6c..b5fbff2c9 100644 --- a/Makefile +++ b/Makefile @@ -3980,10 +3980,6 @@ git-commit-message-default: git-commit-message-empty-default: -@$(GIT_COMMIT) --allow-empty -m "Empty-Commit" -.PHONY: git-commit-message-ignore-default -git-commit-message-ignore-default: - -@$(GIT_COMMIT) -a -m "Ignore" - .PHONY: git-commit-message-init-default git-commit-message-init-default: -@$(GIT_COMMIT) -a -m "Init" @@ -4229,7 +4225,6 @@ plone-instance-default: -$(GIT_ADD) backend/etc/site.zcml -$(GIT_ADD) backend/etc/zope.conf -$(GIT_ADD) backend/etc/zope.ini - -$(GIT_ADD) backend/inituser .PHONY: plone-serve-default plone-serve-default: @@ -4535,9 +4530,6 @@ deploy-default: eb-deploy .PHONY: deps-default deps-default: pip-deps -.PHONY: dump-default -dump-default: db-dump - .PHONY: edit-default edit-default: readme-edit @@ -4559,9 +4551,6 @@ git-commit-default: git-commit-message git-push .PHONY: git-commit-clean-default git-commit-clean-default: git-commit-message-clean git-push -.PHONY: git-commit-ignore-default -git-commit-ignore-default: git-commit-message-ignore git-push - .PHONY: git-commit-init-default git-commit-init-default: git-commit-message-init git-push @@ -4574,9 +4563,6 @@ gitignore-default: git-ignore .PHONY: h-default h-default: help -.PHONY: ignore-default -ignore-default: git-commit-message-ignore git-push - .PHONY: init-default init-default: django-init-wagtail django-serve From 1143bffe1a0a5fe6b7d58dd2c3660f91299cff8d Mon Sep 17 00:00:00 2001 From: Jeffrey 'Alex' Clark Date: Wed, 21 Aug 2024 21:17:06 -0400 Subject: [PATCH 286/662] Revert "Add/update project-makefile files" This reverts commit 776eb9e9b7b4406767a45523cc833f7fbc20100b. Sorry for the noise (3/4)! --- Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index b5fbff2c9..4200f95da 100644 --- a/Makefile +++ b/Makefile @@ -4521,21 +4521,21 @@ db-dump-default: eb-export .PHONY: dbshell-default dbshell-default: django-db-shell -.PHONY: d-default -d-default: deploy - .PHONY: deploy-default deploy-default: eb-deploy +.PHONY: d-default +d-default: eb-deploy + .PHONY: deps-default deps-default: pip-deps -.PHONY: edit-default -edit-default: readme-edit - .PHONY: e-default e-default: edit +.PHONY: edit-default +edit-default: readme-edit + .PHONY: empty-default empty-default: git-commit-message-empty git-push @@ -4605,12 +4605,12 @@ migrations-show-default: django-migrations-show .PHONY: mk-default mk-default: project.mk git-commit-message-mk git-push +.PHONY: open-default +open-default: django-open + .PHONY: o-default o-default: django-open -.PHONY: open-default -open-default: open - .PHONY: readme-default readme-default: readme-init @@ -4618,14 +4618,14 @@ readme-default: readme-init rename-default: git-commit-message-rename git-push .PHONY: s-default -s-default: serve - -.PHONY: serve-default -serve-default: django-serve +s-default: django-serve .PHONY: shell-default shell-default: django-shell +.PHONY: serve-default +serve-default: django-serve + .PHONY: static-default static-default: django-static @@ -4639,7 +4639,7 @@ su-default: django-su test-default: django-test .PHONY: t-default -t-default: test +t-default: django-test .PHONY: u-default u-default: help From d6cfebd016db25549d05a9c5caa2ef3b53cff5c5 Mon Sep 17 00:00:00 2001 From: Jeffrey 'Alex' Clark Date: Wed, 21 Aug 2024 21:17:29 -0400 Subject: [PATCH 287/662] Revert "Add/update project-makefile files" This reverts commit 388fc78e36e60f45a9b5ff0cd3223e3b8bc2c307. Sorry for the noise (4/4)! --- Makefile | 4781 ++---------------------------------------------------- 1 file changed, 125 insertions(+), 4656 deletions(-) diff --git a/Makefile b/Makefile index 4200f95da..94f7565d8 100644 --- a/Makefile +++ b/Makefile @@ -1,4656 +1,125 @@ -# Project Makefile -# -# A makefile to automate setup of a Wagtail CMS project and related tasks. -# -# https://github.com/aclark4life/project-makefile -# -# -------------------------------------------------------------------------------- -# Set the default goal to be `git commit -a -m $(GIT_MESSAGE)` and `git push` -# -------------------------------------------------------------------------------- - -.DEFAULT_GOAL := git-commit - -# -------------------------------------------------------------------------------- -# Single line variables to be used by phony target rules -# -------------------------------------------------------------------------------- - -ADD_DIR := mkdir -pv -ADD_FILE := touch -AWS_OPTS := --no-cli-pager --output table -COPY_DIR := cp -rv -COPY_FILE := cp -v -DEL_DIR := rm -rv -DEL_FILE := rm -v -DJANGO_DB_COL = awk -F\= '{print $$2}' -DJANGO_DB_URL = eb ssh -c "source /opt/elasticbeanstalk/deployment/custom_env_var; env | grep DATABASE_URL" -DJANGO_DB_HOST = $(shell $(DJANGO_DB_URL) | $(DJANGO_DB_COL) |\ - python -c 'import dj_database_url; url = input(); url = dj_database_url.parse(url); print(url["HOST"])') -DJANGO_DB_NAME = $(shell $(DJANGO_DB_URL) | $(DJANGO_DB_COL) |\ - python -c 'import dj_database_url; url = input(); url = dj_database_url.parse(url); print(url["NAME"])') -DJANGO_DB_PASS = $(shell $(DJANGO_DB_URL) | $(DJANGO_DB_COL) |\ - python -c 'import dj_database_url; url = input(); url = dj_database_url.parse(url); print(url["PASSWORD"])') -DJANGO_DB_USER = $(shell $(DJANGO_DB_URL) | $(DJANGO_DB_COL) |\ - python -c 'import dj_database_url; url = input(); url = dj_database_url.parse(url); print(url["USER"])') -DJANGO_BACKEND_APPS_FILE := backend/apps.py -DJANGO_CUSTOM_ADMIN_FILE := backend/admin.py -DJANGO_FRONTEND_FILES = .babelrc .browserslistrc .eslintrc .nvmrc .stylelintrc.json frontend package-lock.json \ - package.json postcss.config.js -DJANGO_SETTINGS_DIR = backend/settings -DJANGO_SETTINGS_BASE_FILE = $(DJANGO_SETTINGS_DIR)/base.py -DJANGO_SETTINGS_DEV_FILE = $(DJANGO_SETTINGS_DIR)/dev.py -DJANGO_SETTINGS_PROD_FILE = $(DJANGO_SETTINGS_DIR)/production.py -DJANGO_SETTINGS_SECRET_KEY = $(shell openssl rand -base64 48) -DJANGO_URLS_FILE = backend/urls.py -EB_DIR_NAME := .elasticbeanstalk -EB_ENV_NAME ?= $(PROJECT_NAME)-$(GIT_BRANCH)-$(GIT_REV) -EB_PLATFORM ?= "Python 3.11 running on 64bit Amazon Linux 2023" -EC2_INSTANCE_MAX ?= 1 -EC2_INSTANCE_MIN ?= 1 -EC2_INSTANCE_PROFILE ?= aws-elasticbeanstalk-ec2-role -EC2_INSTANCE_TYPE ?= t4g.small -EC2_LB_TYPE ?= application -EDITOR_REVIEW = subl -GIT_ADD := git add -GIT_BRANCH = $(shell git branch --show-current) -GIT_BRANCHES = $(shell git branch -a) -GIT_CHECKOUT = git checkout -GIT_COMMIT_MSG = "Update $(PROJECT_NAME)" -GIT_COMMIT = git commit -GIT_PUSH = git push -GIT_PUSH_FORCE = git push --force-with-lease -GIT_REV = $(shell git rev-parse --short HEAD) -MAKEFILE_CUSTOM_FILE := project.mk -PACKAGE_NAME = $(shell echo $(PROJECT_NAME) | sed 's/-/_/g') -PAGER ?= less -PIP_ENSURE = python -m ensurepip -PIP_INSTALL_PLONE_CONSTRAINTS = https://dist.plone.org/release/6.0.11.1/constraints.txt -PROJECT_DIRS = backend contactpage home privacy siteuser -PROJECT_EMAIL := aclark@aclark.net -PROJECT_NAME = project-makefile -RANDIR := $(shell openssl rand -base64 12 | sed 's/\///g') -TMPDIR := $(shell mktemp -d) -UNAME := $(shell uname) -WAGTAIL_CLEAN_DIRS = backend contactpage dist frontend home logging_demo model_form_demo node_modules payments privacy search sitepage siteuser -WAGTAIL_CLEAN_FILES = .babelrc .browserslistrc .dockerignore .eslintrc .gitignore .nvmrc .stylelintrc.json Dockerfile db.sqlite3 docker-compose.yml manage.py package-lock.json package.json postcss.config.js requirements-test.txt requirements.txt - -# -------------------------------------------------------------------------------- -# Include $(MAKEFILE_CUSTOM_FILE) if it exists -# -------------------------------------------------------------------------------- - -ifneq ($(wildcard $(MAKEFILE_CUSTOM_FILE)),) - include $(MAKEFILE_CUSTOM_FILE) -endif - -# -------------------------------------------------------------------------------- -# Multi-line variables to be used in phony target rules -# -------------------------------------------------------------------------------- - -define DJANGO_ALLAUTH_BASE_TEMPLATE -{% extends 'base.html' %} -endef - -define DJANGO_API_SERIALIZERS -from rest_framework import serializers -from siteuser.models import User - - -class UserSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = User - fields = ["url", "username", "email", "is_staff"] -endef - -define DJANGO_API_VIEWS -from ninja import NinjaAPI -from rest_framework import viewsets -from siteuser.models import User -from .serializers import UserSerializer - -api = NinjaAPI() - - -@api.get("/hello") -def hello(request): - return "Hello world" - - -class UserViewSet(viewsets.ModelViewSet): - queryset = User.objects.all() - serializer_class = UserSerializer -endef - -define DJANGO_APP_TESTS -from django.test import TestCase -from django.urls import reverse -from .models import YourModel -from .forms import YourForm - - -class YourModelTest(TestCase): - def setUp(self): - self.instance = YourModel.objects.create(field1="value1", field2="value2") - - def test_instance_creation(self): - self.assertIsInstance(self.instance, YourModel) - self.assertEqual(self.instance.field1, "value1") - self.assertEqual(self.instance.field2, "value2") - - def test_str_method(self): - self.assertEqual(str(self.instance), "Expected String Representation") - - -class YourViewTest(TestCase): - def setUp(self): - self.instance = YourModel.objects.create(field1="value1", field2="value2") - - def test_view_url_exists_at_desired_location(self): - response = self.client.get("/your-url/") - self.assertEqual(response.status_code, 200) - - def test_view_url_accessible_by_name(self): - response = self.client.get(reverse("your-view-name")) - self.assertEqual(response.status_code, 200) - - def test_view_uses_correct_template(self): - response = self.client.get(reverse("your-view-name")) - self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "your_template.html") - - def test_view_context(self): - response = self.client.get(reverse("your-view-name")) - self.assertEqual(response.status_code, 200) - self.assertIn("context_variable", response.context) - - -class YourFormTest(TestCase): - def test_form_valid_data(self): - form = YourForm(data={"field1": "value1", "field2": "value2"}) - self.assertTrue(form.is_valid()) - - def test_form_invalid_data(self): - form = YourForm(data={"field1": "", "field2": "value2"}) - self.assertFalse(form.is_valid()) - self.assertIn("field1", form.errors) - - def test_form_save(self): - form = YourForm(data={"field1": "value1", "field2": "value2"}) - if form.is_valid(): - instance = form.save() - self.assertEqual(instance.field1, "value1") - self.assertEqual(instance.field2, "value2") -endef - -define DJANGO_BACKEND_APPS -from django.contrib.admin.apps import AdminConfig - - -class CustomAdminConfig(AdminConfig): - default_site = "backend.admin.CustomAdminSite" -endef - -define DJANGO_BASE_TEMPLATE -{% load static webpack_loader %} - - - - - - {% block title %}{% endblock %} - {% block title_suffix %}{% endblock %} - - - {% stylesheet_pack 'app' %} - {% block extra_css %}{# Override this in templates to add extra stylesheets #}{% endblock %} - - {% include 'favicon.html' %} - {% csrf_token %} - - -
    -
    - {% include 'header.html' %} - {% if messages %} -
    - {% for message in messages %} - - {% endfor %} -
    - {% endif %} -
    - {% block content %}{% endblock %} -
    -
    - {% include 'footer.html' %} - {% include 'offcanvas.html' %} - {% javascript_pack 'app' %} - {% block extra_js %}{# Override this in templates to add extra javascript #}{% endblock %} - - -endef - -define DJANGO_CUSTOM_ADMIN -from django.contrib.admin import AdminSite - - -class CustomAdminSite(AdminSite): - site_header = "Project Makefile" - site_title = "Project Makefile" - index_title = "Project Makefile" - - -custom_admin_site = CustomAdminSite(name="custom_admin") -endef - -define DJANGO_DOCKERCOMPOSE -version: '3' - -services: - db: - image: postgres:latest - volumes: - - postgres_data:/var/lib/postgresql/data - environment: - POSTGRES_DB: project - POSTGRES_USER: admin - POSTGRES_PASSWORD: admin - - web: - build: . - command: sh -c "python manage.py migrate && gunicorn project.wsgi:application -b 0.0.0.0:8000" - volumes: - - .:/app - ports: - - "8000:8000" - depends_on: - - db - environment: - DATABASE_URL: postgres://admin:admin@db:5432/project - -volumes: - postgres_data: -endef - -define DJANGO_DOCKERFILE -FROM amazonlinux:2023 -RUN dnf install -y shadow-utils python3.11 python3.11-pip make nodejs20-npm nodejs postgresql15 postgresql15-server -USER postgres -RUN initdb -D /var/lib/pgsql/data -USER root -RUN useradd wagtail -EXPOSE 8000 -ENV PYTHONUNBUFFERED=1 PORT=8000 -COPY requirements.txt / -RUN python3.11 -m pip install -r /requirements.txt -WORKDIR /app -RUN chown wagtail:wagtail /app -COPY --chown=wagtail:wagtail . . -USER wagtail -RUN npm-20 install; npm-20 run build -RUN python3.11 manage.py collectstatic --noinput --clear -CMD set -xe; pg_ctl -D /var/lib/pgsql/data -l /tmp/logfile start; python3.11 manage.py migrate --noinput; gunicorn backend.wsgi:application -endef - -define DJANGO_FAVICON_TEMPLATE -{% load static %} - -endef - -define DJANGO_FOOTER_TEMPLATE -
    -

    © {% now "Y" %} {{ current_site.site_name|default:"Project Makefile" }}

    -
      -
    • - Home -
      • - {% for child in current_site.root_page.get_children %} -
    • - {{ child }} -
      • - {% endfor %} -
    -
    -endef - -define DJANGO_FRONTEND_APP -import React from 'react'; -import { createRoot } from 'react-dom/client'; -import 'bootstrap'; -import '@fortawesome/fontawesome-free/js/fontawesome'; -import '@fortawesome/fontawesome-free/js/solid'; -import '@fortawesome/fontawesome-free/js/regular'; -import '@fortawesome/fontawesome-free/js/brands'; -import getDataComponents from '../dataComponents'; -import UserContextProvider from '../context'; -import * as components from '../components'; -import "../styles/index.scss"; -import "../styles/theme-blue.scss"; -import "./config"; - -const { ErrorBoundary } = components; -const dataComponents = getDataComponents(components); -const container = document.getElementById('app'); -const root = createRoot(container); -const App = () => ( - - - {dataComponents} - - -); -root.render(); -endef - -define DJANGO_FRONTEND_APP_CONFIG -import '../utils/themeToggler.js'; -// import '../utils/tinymce.js'; -endef - -define DJANGO_FRONTEND_BABELRC -{ - "presets": [ - [ - "@babel/preset-react", - ], - [ - "@babel/preset-env", - { - "useBuiltIns": "usage", - "corejs": "3.0.0" - } - ] - ], - "plugins": [ - "@babel/plugin-syntax-dynamic-import", - "@babel/plugin-transform-class-properties" - ] -} -endef - -define DJANGO_FRONTEND_COMPONENTS -export { default as ErrorBoundary } from './ErrorBoundary'; -export { default as UserMenu } from './UserMenu'; -endef - -define DJANGO_FRONTEND_COMPONENT_CLOCK -// Via ChatGPT -import React, { useState, useEffect, useCallback, useRef } from 'react'; -import PropTypes from 'prop-types'; - -const Clock = ({ color = '#fff' }) => { - const [date, setDate] = useState(new Date()); - const [blink, setBlink] = useState(true); - const timerID = useRef(); - - const tick = useCallback(() => { - setDate(new Date()); - setBlink(prevBlink => !prevBlink); - }, []); - - useEffect(() => { - timerID.current = setInterval(() => tick(), 1000); - - // Return a cleanup function to be run on component unmount - return () => clearInterval(timerID.current); - }, [tick]); - - const formattedDate = date.toLocaleDateString(undefined, { - weekday: 'short', - year: 'numeric', - month: 'short', - day: 'numeric', - }); - - const formattedTime = date.toLocaleTimeString(undefined, { - hour: 'numeric', - minute: 'numeric', - }); - - return ( - <> -
    {formattedDate} {formattedTime}
    - - ); -}; - -Clock.propTypes = { - color: PropTypes.string, -}; - -export default Clock; -endef - -define DJANGO_FRONTEND_COMPONENT_ERROR -import { Component } from 'react'; -import PropTypes from 'prop-types'; - -class ErrorBoundary extends Component { - constructor (props) { - super(props); - this.state = { hasError: false }; - } - - static getDerivedStateFromError () { - return { hasError: true }; - } - - componentDidCatch (error, info) { - const { onError } = this.props; - console.error(error); - onError && onError(error, info); - } - - render () { - const { children = null } = this.props; - const { hasError } = this.state; - - return hasError ? null : children; - } -} - -ErrorBoundary.propTypes = { - onError: PropTypes.func, - children: PropTypes.node, -}; - -export default ErrorBoundary; -endef - -define DJANGO_FRONTEND_COMPONENT_USER_MENU -// UserMenu.js -import React from 'react'; -import PropTypes from 'prop-types'; - -function handleLogout() { - window.location.href = '/accounts/logout'; -} - -const UserMenu = ({ isAuthenticated, isSuperuser, textColor }) => { - return ( -
    - {isAuthenticated ? ( -
  3. - - -
    4. - ) : ( -
  4. - -
    5. - )} -
    - ); -}; - -UserMenu.propTypes = { - isAuthenticated: PropTypes.bool.isRequired, - isSuperuser: PropTypes.bool.isRequired, - textColor: PropTypes.string, -}; - -export default UserMenu; -endef - -define DJANGO_FRONTEND_CONTEXT_INDEX -export { UserContextProvider as default } from './UserContextProvider'; -endef - -define DJANGO_FRONTEND_CONTEXT_USER_PROVIDER -// UserContextProvider.js -import React, { createContext, useContext, useState } from 'react'; -import PropTypes from 'prop-types'; - -const UserContext = createContext(); - -export const UserContextProvider = ({ children }) => { - const [isAuthenticated, setIsAuthenticated] = useState(false); - - const login = () => { - try { - // Add logic to handle login, set isAuthenticated to true - setIsAuthenticated(true); - } catch (error) { - console.error('Login error:', error); - // Handle error, e.g., show an error message to the user - } - }; - - const logout = () => { - try { - // Add logic to handle logout, set isAuthenticated to false - setIsAuthenticated(false); - } catch (error) { - console.error('Logout error:', error); - // Handle error, e.g., show an error message to the user - } - }; - - return ( - - {children} - - ); -}; - -UserContextProvider.propTypes = { - children: PropTypes.node.isRequired, -}; - -export const useUserContext = () => { - const context = useContext(UserContext); - - if (!context) { - throw new Error('useUserContext must be used within a UserContextProvider'); - } - - return context; -}; - -// Add PropTypes for the return value of useUserContext -useUserContext.propTypes = { - isAuthenticated: PropTypes.bool.isRequired, - login: PropTypes.func.isRequired, - logout: PropTypes.func.isRequired, -}; -endef - -define DJANGO_FRONTEND_ESLINTRC -{ - "env": { - "browser": true, - "es2021": true, - "node": true - }, - "extends": [ - "eslint:recommended", - "plugin:react/recommended" - ], - "overrides": [ - { - "env": { - "node": true - }, - "files": [ - ".eslintrc.{js,cjs}" - ], - "parserOptions": { - "sourceType": "script" - } - } - ], - "parserOptions": { - "ecmaVersion": "latest", - "sourceType": "module" - }, - "plugins": [ - "react" - ], - "rules": { - "no-unused-vars": "off" - }, - settings: { - react: { - version: 'detect', - }, - }, -} -endef - -define DJANGO_FRONTEND_OFFCANVAS_TEMPLATE -
    -
    - {{ current_site.site_name|default:"Project Makefile" }} - -
    -
    -
      -
    • - Home -
      • - {% for child in current_site.root_page.get_children %} -
    • - {{ child }} -
      • - {% endfor %} - -
      -
    -
    -
    -endef - -define DJANGO_FRONTEND_PORTAL -// Via pwellever -import React from 'react'; -import { createPortal } from 'react-dom'; - -const parseProps = data => Object.entries(data).reduce((result, [key, value]) => { - if (value.toLowerCase() === 'true') { - value = true; - } else if (value.toLowerCase() === 'false') { - value = false; - } else if (value.toLowerCase() === 'null') { - value = null; - } else if (!isNaN(parseFloat(value)) && isFinite(value)) { - // Parse numeric value - value = parseFloat(value); - } else if ( - (value[0] === '[' && value.slice(-1) === ']') || (value[0] === '{' && value.slice(-1) === '}') - ) { - // Parse JSON strings - value = JSON.parse(value); - } - - result[key] = value; - return result; -}, {}); - -// This method of using portals instead of calling ReactDOM.render on individual components -// ensures that all components are mounted under a single React tree, and are therefore able -// to share context. - -export default function getPageComponents (components) { - const getPortalComponent = domEl => { - // The element's "data-component" attribute is used to determine which component to render. - // All other "data-*" attributes are passed as props. - const { component: componentName, ...rest } = domEl.dataset; - const Component = components[componentName]; - if (!Component) { - console.error(`Component "$${componentName}" not found.`); - return null; - } - const props = parseProps(rest); - domEl.innerHTML = ''; - - // eslint-disable-next-line no-unused-vars - const { ErrorBoundary } = components; - return createPortal( - - - , - domEl, - ); - }; - - return Array.from(document.querySelectorAll('[data-component]')).map(getPortalComponent); -} -endef - -define DJANGO_FRONTEND_STYLES -// If you comment out code below, bootstrap will use red as primary color -// and btn-primary will become red - -// $primary: red; - -@import "~bootstrap/scss/bootstrap.scss"; - -.jumbotron { - // should be relative path of the entry scss file - background-image: url("../../vendors/images/sample.jpg"); - background-size: cover; -} - -#theme-toggler-authenticated:hover { - cursor: pointer; /* Change cursor to pointer on hover */ - color: #007bff; /* Change color on hover */ -} - -#theme-toggler-anonymous:hover { - cursor: pointer; /* Change cursor to pointer on hover */ - color: #007bff; /* Change color on hover */ -} -endef - -define DJANGO_FRONTEND_THEME_BLUE -@import "~bootstrap/scss/bootstrap.scss"; - -[data-bs-theme="blue"] { - --bs-body-color: var(--bs-white); - --bs-body-color-rgb: #{to-rgb($$white)}; - --bs-body-bg: var(--bs-blue); - --bs-body-bg-rgb: #{to-rgb($$blue)}; - --bs-tertiary-bg: #{$$blue-600}; - - .dropdown-menu { - --bs-dropdown-bg: #{color-mix($$blue-500, $$blue-600)}; - --bs-dropdown-link-active-bg: #{$$blue-700}; - } - - .btn-secondary { - --bs-btn-bg: #{color-mix($gray-600, $blue-400, .5)}; - --bs-btn-border-color: #{rgba($$white, .25)}; - --bs-btn-hover-bg: #{color-adjust(color-mix($gray-600, $blue-400, .5), 5%)}; - --bs-btn-hover-border-color: #{rgba($$white, .25)}; - --bs-btn-active-bg: #{color-adjust(color-mix($gray-600, $blue-400, .5), 10%)}; - --bs-btn-active-border-color: #{rgba($$white, .5)}; - --bs-btn-focus-border-color: #{rgba($$white, .5)}; - - // --bs-btn-focus-box-shadow: 0 0 0 .25rem rgba(255, 255, 255, 20%); - } -} -endef - -define DJANGO_FRONTEND_THEME_TOGGLER -document.addEventListener('DOMContentLoaded', function () { - const rootElement = document.documentElement; - const anonThemeToggle = document.getElementById('theme-toggler-anonymous'); - const authThemeToggle = document.getElementById('theme-toggler-authenticated'); - if (authThemeToggle) { - localStorage.removeItem('data-bs-theme'); - } - const anonSavedTheme = localStorage.getItem('data-bs-theme'); - if (anonSavedTheme) { - rootElement.setAttribute('data-bs-theme', anonSavedTheme); - } - if (anonThemeToggle) { - anonThemeToggle.addEventListener('click', function () { - const currentTheme = rootElement.getAttribute('data-bs-theme') || 'light'; - const newTheme = currentTheme === 'light' ? 'dark' : 'light'; - rootElement.setAttribute('data-bs-theme', newTheme); - localStorage.setItem('data-bs-theme', newTheme); - }); - } - if (authThemeToggle) { - const csrfToken = document.querySelector('[name=csrfmiddlewaretoken]').value; - authThemeToggle.addEventListener('click', function () { - const currentTheme = rootElement.getAttribute('data-bs-theme') || 'light'; - const newTheme = currentTheme === 'light' ? 'dark' : 'light'; - fetch('/user/update_theme_preference/', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - 'X-CSRFToken': csrfToken, // Include the CSRF token in the headers - }, - body: JSON.stringify({ theme: newTheme }), - }) - .then(response => response.json()) - .then(data => { - rootElement.setAttribute('data-bs-theme', newTheme); - }) - .catch(error => { - console.error('Error updating theme preference:', error); - }); - }); - } -}); -endef - -define DJANGO_HEADER_TEMPLATE -
    -
    - -
    -
    -endef - -define DJANGO_HOME_PAGE_ADMIN -from django.contrib import admin # noqa - -# Register your models here. -endef - -define DJANGO_HOME_PAGE_MODELS -from django.db import models # noqa - -# Create your models here. -endef - -define DJANGO_HOME_PAGE_TEMPLATE -{% extends "base.html" %} -{% block content %} -
    -
    -{% endblock %} -endef - -define DJANGO_HOME_PAGE_URLS -from django.urls import path -from .views import HomeView - -urlpatterns = [path("", HomeView.as_view(), name="home")] -endef - -define DJANGO_HOME_PAGE_VIEWS -from django.views.generic import TemplateView - - -class HomeView(TemplateView): - template_name = "home.html" -endef - -define DJANGO_LOGGING_DEMO_ADMIN -# Register your models here. -endef - -define DJANGO_LOGGING_DEMO_MODELS -from django.db import models # noqa - -# Create your models here. -endef - -define DJANGO_LOGGING_DEMO_SETTINGS -INSTALLED_APPS.append("logging_demo") # noqa -endef - -define DJANGO_LOGGING_DEMO_URLS -from django.urls import path -from .views import logging_demo - -urlpatterns = [ - path("", logging_demo, name="logging_demo"), -] -endef - -define DJANGO_LOGGING_DEMO_VIEWS -from django.http import HttpResponse -import logging - -logger = logging.getLogger(__name__) - - -def logging_demo(request): - logger.debug("Hello, world!") - return HttpResponse("Hello, world!") -endef - -define DJANGO_MANAGE_PY -#!/usr/bin/env python -"""Django's command-line utility for administrative tasks.""" - -import os -import sys - - -def main(): - """Run administrative tasks.""" - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "backend.settings.dev") - try: - from django.core.management import execute_from_command_line - except ImportError as exc: - raise ImportError( - "Couldn't import Django. Are you sure it's installed and " - "available on your PYTHONPATH environment variable? Did you " - "forget to activate a virtual environment?" - ) from exc - execute_from_command_line(sys.argv) - - -if __name__ == "__main__": - main() -endef - -define DJANGO_MODEL_FORM_DEMO_ADMIN -from django.contrib import admin -from .models import ModelFormDemo - - -@admin.register(ModelFormDemo) -class ModelFormDemoAdmin(admin.ModelAdmin): - pass -endef - -define DJANGO_MODEL_FORM_DEMO_FORMS -from django import forms -from .models import ModelFormDemo - - -class ModelFormDemoForm(forms.ModelForm): - class Meta: - model = ModelFormDemo - fields = ["name", "email", "age", "is_active"] -endef - -define DJANGO_MODEL_FORM_DEMO_MODEL -from django.db import models -from django.shortcuts import reverse - - -class ModelFormDemo(models.Model): - name = models.CharField(max_length=100, blank=True, null=True) - email = models.EmailField(blank=True, null=True) - age = models.IntegerField(blank=True, null=True) - is_active = models.BooleanField(default=True) - created_at = models.DateTimeField(auto_now_add=True) - - def __str__(self): - return self.name or f"test-model-{self.pk}" - - def get_absolute_url(self): - return reverse("model_form_demo_detail", kwargs={"pk": self.pk}) -endef - -define DJANGO_MODEL_FORM_DEMO_TEMPLATE_DETAIL -{% extends 'base.html' %} -{% block content %} -

    Test Model Detail: {{ model_form_demo.name }}

    -

    Name: {{ model_form_demo.name }}

    -

    Email: {{ model_form_demo.email }}

    -

    Age: {{ model_form_demo.age }}

    -

    Active: {{ model_form_demo.is_active }}

    -

    Created At: {{ model_form_demo.created_at }}

    - Edit Test Model -{% endblock %} -endef - -define DJANGO_MODEL_FORM_DEMO_TEMPLATE_FORM -{% extends 'base.html' %} -{% block content %} -

    - {% if form.instance.pk %} - Update Test Model - {% else %} - Create Test Model - {% endif %} -

    -
    - {% csrf_token %} - {{ form.as_p }} - -
    -{% endblock %} -endef - -define DJANGO_MODEL_FORM_DEMO_TEMPLATE_LIST -{% extends 'base.html' %} -{% block content %} -

    Test Models List

    - - Create New Test Model -{% endblock %} -endef - -define DJANGO_MODEL_FORM_DEMO_URLS -from django.urls import path -from .views import ( - ModelFormDemoListView, - ModelFormDemoCreateView, - ModelFormDemoUpdateView, - ModelFormDemoDetailView, -) - -urlpatterns = [ - path("", ModelFormDemoListView.as_view(), name="model_form_demo_list"), - path("create/", ModelFormDemoCreateView.as_view(), name="model_form_demo_create"), - path( - "/update/", - ModelFormDemoUpdateView.as_view(), - name="model_form_demo_update", - ), - path("/", ModelFormDemoDetailView.as_view(), name="model_form_demo_detail"), -] -endef - -define DJANGO_MODEL_FORM_DEMO_VIEWS -from django.views.generic import ListView, CreateView, UpdateView, DetailView -from .models import ModelFormDemo -from .forms import ModelFormDemoForm - - -class ModelFormDemoListView(ListView): - model = ModelFormDemo - template_name = "model_form_demo_list.html" - context_object_name = "model_form_demos" - - -class ModelFormDemoCreateView(CreateView): - model = ModelFormDemo - form_class = ModelFormDemoForm - template_name = "model_form_demo_form.html" - - def form_valid(self, form): - form.instance.created_by = self.request.user - return super().form_valid(form) - - -class ModelFormDemoUpdateView(UpdateView): - model = ModelFormDemo - form_class = ModelFormDemoForm - template_name = "model_form_demo_form.html" - - -class ModelFormDemoDetailView(DetailView): - model = ModelFormDemo - template_name = "model_form_demo_detail.html" - context_object_name = "model_form_demo" -endef - -define DJANGO_PAYMENTS_ADMIN -from django.contrib import admin -from .models import Product, Order - -admin.site.register(Product) -admin.site.register(Order) -endef - -define DJANGO_PAYMENTS_FORM -from django import forms - - -class PaymentsForm(forms.Form): - stripeToken = forms.CharField(widget=forms.HiddenInput()) - amount = forms.DecimalField( - max_digits=10, decimal_places=2, widget=forms.HiddenInput() - ) -endef - -define DJANGO_PAYMENTS_MIGRATION_0002 -from django.db import migrations -import os -import secrets -import logging - -logger = logging.getLogger(__name__) - - -def generate_default_key(): - return "sk_test_" + secrets.token_hex(24) - - -def set_stripe_api_keys(apps, schema_editor): - # Get the Stripe API Key model - APIKey = apps.get_model("djstripe", "APIKey") - - # Fetch the keys from environment variables or generate default keys - test_secret_key = os.environ.get("STRIPE_TEST_SECRET_KEY", generate_default_key()) - live_secret_key = os.environ.get("STRIPE_LIVE_SECRET_KEY", generate_default_key()) - - logger.info("STRIPE_TEST_SECRET_KEY: %s", test_secret_key) - logger.info("STRIPE_LIVE_SECRET_KEY: %s", live_secret_key) - - # Check if the keys are not already in the database - if not APIKey.objects.filter(secret=test_secret_key).exists(): - APIKey.objects.create(secret=test_secret_key, livemode=False) - logger.info("Added test secret key to the database.") - else: - logger.info("Test secret key already exists in the database.") - - if not APIKey.objects.filter(secret=live_secret_key).exists(): - APIKey.objects.create(secret=live_secret_key, livemode=True) - logger.info("Added live secret key to the database.") - else: - logger.info("Live secret key already exists in the database.") - - -class Migration(migrations.Migration): - - dependencies = [ - ("payments", "0001_initial"), - ] - - operations = [ - migrations.RunPython(set_stripe_api_keys), - ] -endef - -define DJANGO_PAYMENTS_MIGRATION_0003 -from django.db import migrations - - -def create_initial_products(apps, schema_editor): - Product = apps.get_model("payments", "Product") - Product.objects.create(name="T-shirt", description="A cool T-shirt", price=20.00) - Product.objects.create(name="Mug", description="A nice mug", price=10.00) - Product.objects.create(name="Hat", description="A stylish hat", price=15.00) - - -class Migration(migrations.Migration): - dependencies = [ - ( - "payments", - "0002_set_stripe_api_keys", - ), - ] - - operations = [ - migrations.RunPython(create_initial_products), - ] -endef - -define DJANGO_PAYMENTS_MODELS -from django.db import models - - -class Product(models.Model): - name = models.CharField(max_length=100) - description = models.TextField() - price = models.DecimalField(max_digits=10, decimal_places=2) - - def __str__(self): - return self.name - - -class Order(models.Model): - product = models.ForeignKey(Product, on_delete=models.CASCADE) - created_at = models.DateTimeField(auto_now_add=True) - stripe_checkout_session_id = models.CharField(max_length=200) - - def __str__(self): - return f"Order {self.id} for {self.product.name}" -endef - -define DJANGO_PAYMENTS_TEMPLATE_CANCEL -{% extends "base.html" %} -{% block title %}Cancel{% endblock %} -{% block content %} -

    Payment Cancelled

    -

    Your payment was cancelled.

    -{% endblock %} -endef - -define DJANGO_PAYMENTS_TEMPLATE_CHECKOUT -{% extends "base.html" %} -{% block title %}Checkout{% endblock %} -{% block content %} -

    Checkout

    -
    - {% csrf_token %} - -
    -{% endblock %} -endef - -define DJANGO_PAYMENTS_TEMPLATE_PRODUCT_DETAIL -{% extends "base.html" %} -{% block title %}{{ product.name }}{% endblock %} -{% block content %} -

    {{ product.name }}

    -

    {{ product.description }}

    -

    Price: ${{ product.price }}

    -
    - {% csrf_token %} - - -
    -{% endblock %} -endef - -define DJANGO_PAYMENTS_TEMPLATE_PRODUCT_LIST -{% extends "base.html" %} -{% block title %}Products{% endblock %} -{% block content %} -

    Products

    - -{% endblock %} -endef - -define DJANGO_PAYMENTS_TEMPLATE_SUCCESS -{% extends "base.html" %} -{% block title %}Success{% endblock %} -{% block content %} -

    Payment Successful

    -

    Thank you for your purchase!

    -{% endblock %} -endef - -define DJANGO_PAYMENTS_URLS -from django.urls import path -from .views import ( - CheckoutView, - SuccessView, - CancelView, - ProductListView, - ProductDetailView, -) - -urlpatterns = [ - path("", ProductListView.as_view(), name="product_list"), - path("product//", ProductDetailView.as_view(), name="product_detail"), - path("checkout/", CheckoutView.as_view(), name="checkout"), - path("success/", SuccessView.as_view(), name="success"), - path("cancel/", CancelView.as_view(), name="cancel"), -] -endef - -define DJANGO_PAYMENTS_VIEW -from django.conf import settings -from django.shortcuts import render, redirect, get_object_or_404 -from django.views.generic import TemplateView, View, ListView, DetailView -import stripe -from .models import Product, Order - -stripe.api_key = settings.STRIPE_TEST_SECRET_KEY - - -class ProductListView(ListView): - model = Product - template_name = "payments/product_list.html" - context_object_name = "products" - - -class ProductDetailView(DetailView): - model = Product - template_name = "payments/product_detail.html" - context_object_name = "product" - - -class CheckoutView(View): - template_name = "payments/checkout.html" - - def get(self, request, *args, **kwargs): - products = Product.objects.all() - return render(request, self.template_name, {"products": products}) - - def post(self, request, *args, **kwargs): - product_id = request.POST.get("product_id") - product = get_object_or_404(Product, id=product_id) - - session = stripe.checkout.Session.create( - payment_method_types=["card"], - line_items=[ - { - "price_data": { - "currency": "usd", - "product_data": { - "name": product.name, - }, - "unit_amount": int(product.price * 100), - }, - "quantity": 1, - } - ], - mode="payment", - success_url="http://localhost:8000/payments/success/", - cancel_url="http://localhost:8000/payments/cancel/", - ) - - Order.objects.create(product=product, stripe_checkout_session_id=session.id) - return redirect(session.url, code=303) - - -class SuccessView(TemplateView): - - template_name = "payments/success.html" - - -class CancelView(TemplateView): - - template_name = "payments/cancel.html" -endef - -define DJANGO_SEARCH_FORMS -from django import forms - - -class SearchForm(forms.Form): - query = forms.CharField(max_length=100, required=True, label="Search") - -endef - -define DJANGO_SEARCH_SETTINGS -SEARCH_MODELS = [ - # Add search models here. -] -endef - -define DJANGO_SEARCH_TEMPLATE -{% extends "base.html" %} -{% block body_class %}template-searchresults{% endblock %} -{% block title %}Search{% endblock %} -{% block content %} -

    Search

    -
    - - -
    - {% if search_results %} -
      - {% for result in search_results %} -
    • -

      - {{ result }} -

      - {% if result.search_description %}{{ result.search_description }}{% endif %} -
      • - {% endfor %} -
    - {% if search_results.has_previous %} - Previous - {% endif %} - {% if search_results.has_next %} - Next - {% endif %} - {% elif search_query %} - No results found - {% else %} - No results found. Try a test query? - {% endif %} -{% endblock %} -endef - -define DJANGO_SEARCH_URLS -from django.urls import path -from .views import SearchView - -urlpatterns = [ - path("search/", SearchView.as_view(), name="search"), -] -endef - -define DJANGO_SEARCH_UTILS -from django.apps import apps -from django.conf import settings - -def get_search_models(): - models = [] - for model_path in settings.SEARCH_MODELS: - app_label, model_name = model_path.split(".") - model = apps.get_model(app_label, model_name) - models.append(model) - return models -endef - -define DJANGO_SEARCH_VIEWS -from django.views.generic import ListView -from django.db import models -from django.db.models import Q -from .forms import SearchForm -from .utils import get_search_models - - -class SearchView(ListView): - template_name = "your_app/search_results.html" - context_object_name = "results" - paginate_by = 10 - - def get_queryset(self): - form = SearchForm(self.request.GET) - query = None - results = [] - - if form.is_valid(): - query = form.cleaned_data["query"] - search_models = get_search_models() - - for model in search_models: - fields = [f.name for f in model._meta.fields if isinstance(f, (models.CharField, models.TextField))] - queries = [Q(**{f"{field}__icontains": query}) for field in fields] - model_results = model.objects.filter(queries.pop()) - - for item in queries: - model_results = model_results.filter(item) - - results.extend(model_results) - - return results - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context["form"] = SearchForm(self.request.GET) - context["query"] = self.request.GET.get("query", "") - return context -endef - -define DJANGO_SETTINGS_AUTHENTICATION_BACKENDS -AUTHENTICATION_BACKENDS = [ - "django.contrib.auth.backends.ModelBackend", - "allauth.account.auth_backends.AuthenticationBackend", -] -endef - -define DJANGO_SETTINGS_BASE -# $(PROJECT_NAME) -# -# Uncomment next two lines to enable custom admin -# INSTALLED_APPS = [app for app in INSTALLED_APPS if app != 'django.contrib.admin'] -# INSTALLED_APPS.append('backend.apps.CustomAdminConfig') -import os # noqa -import dj_database_url # noqa - -DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" -EXPLORER_CONNECTIONS = {"Default": "default"} -EXPLORER_DEFAULT_CONNECTION = "default" -LOGIN_REDIRECT_URL = "/" -PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -SILENCED_SYSTEM_CHECKS = ["django_recaptcha.recaptcha_test_key_error"] -BASE_DIR = os.path.dirname(PROJECT_DIR) -STATICFILES_DIRS = [] -WEBPACK_LOADER = { - "MANIFEST_FILE": os.path.join(BASE_DIR, "frontend/build/manifest.json"), -} -STATICFILES_DIRS.append(os.path.join(BASE_DIR, "frontend/build")) -TEMPLATES[0]["DIRS"].append(os.path.join(PROJECT_DIR, "templates")) -endef - -define DJANGO_SETTINGS_BASE_MINIMAL -# $(PROJECT_NAME) -import os # noqa -import dj_database_url # noqa - -INSTALLED_APPS.append("debug_toolbar") -INSTALLED_APPS.append("webpack_boilerplate") -PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -BASE_DIR = os.path.dirname(PROJECT_DIR) -STATICFILES_DIRS = [] -STATICFILES_DIRS.append(os.path.join(BASE_DIR, "frontend/build")) -TEMPLATES[0]["DIRS"].append(os.path.join(PROJECT_DIR, "templates")) -WEBPACK_LOADER = { - "MANIFEST_FILE": os.path.join(BASE_DIR, "frontend/build/manifest.json"), -} -endef - -define DJANGO_SETTINGS_CRISPY_FORMS -CRISPY_TEMPLATE_PACK = "bootstrap5" -CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5" -endef - -define DJANGO_SETTINGS_DATABASE -DATABASE_URL = os.environ.get("DATABASE_URL", "postgres://:@:/$(PROJECT_NAME)") -DATABASES["default"] = dj_database_url.parse(DATABASE_URL) -endef - -define DJANGO_SETTINGS_DEV -from .base import * # noqa - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -# SECURITY WARNING: define the correct hosts in production! -ALLOWED_HOSTS = ["*"] - -EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" - -try: - from .local import * # noqa -except ImportError: - pass - -LOGGING = { - "version": 1, - "disable_existing_loggers": False, - "formatters": { - "verbose": { - "format": "{levelname} {asctime} {module} {message}", - "style": "{", - }, - "simple": { - "format": "{levelname} {message}", - "style": "{", - }, - }, - "handlers": { - "console": { - "level": "DEBUG", - "class": "logging.StreamHandler", - "formatter": "verbose", - }, - }, - "loggers": { - "django": { - "handlers": ["console"], - "level": "DEBUG", - "propagate": True, - }, - }, -} - -INTERNAL_IPS = [ - "127.0.0.1", -] - -MIDDLEWARE.append("debug_toolbar.middleware.DebugToolbarMiddleware") # noqa -MIDDLEWARE.append("hijack.middleware.HijackUserMiddleware") # noqa -INSTALLED_APPS.append("django.contrib.admindocs") # noqa -SECRET_KEY = "$(DJANGO_SETTINGS_SECRET_KEY)" -endef - - -define DJANGO_SETTINGS_HOME_PAGE -INSTALLED_APPS.append("home") -endef - -define DJANGO_SETTINGS_INSTALLED_APPS -INSTALLED_APPS.append("allauth") -INSTALLED_APPS.append("allauth.account") -INSTALLED_APPS.append("allauth.socialaccount") -INSTALLED_APPS.append("crispy_bootstrap5") -INSTALLED_APPS.append("crispy_forms") -INSTALLED_APPS.append("debug_toolbar") -INSTALLED_APPS.append("django_extensions") -INSTALLED_APPS.append("django_recaptcha") -INSTALLED_APPS.append("rest_framework") -INSTALLED_APPS.append("rest_framework.authtoken") -INSTALLED_APPS.append("webpack_boilerplate") -INSTALLED_APPS.append("explorer") -endef - -define DJANGO_SETTINGS_MIDDLEWARE -MIDDLEWARE.append("allauth.account.middleware.AccountMiddleware") -endef - -define DJANGO_SETTINGS_MODEL_FORM_DEMO -INSTALLED_APPS.append("model_form_demo") # noqa -endef - -define DJANGO_SETTINGS_PAYMENTS -DJSTRIPE_FOREIGN_KEY_TO_FIELD = "id" -DJSTRIPE_WEBHOOK_VALIDATION = "retrieve_event" -STRIPE_PUBLISHABLE_KEY = os.environ.get("STRIPE_PUBLISHABLE_KEY") -STRIPE_SECRET_KEY = os.environ.get("STRIPE_SECRET_KEY") -STRIPE_TEST_SECRET_KEY = os.environ.get("STRIPE_TEST_SECRET_KEY") -INSTALLED_APPS.append("payments") # noqa -INSTALLED_APPS.append("djstripe") # noqa -endef - -define DJANGO_SETTINGS_REST_FRAMEWORK -REST_FRAMEWORK = { - # Use Django's standard `django.contrib.auth` permissions, - # or allow read-only access for unauthenticated users. - "DEFAULT_PERMISSION_CLASSES": [ - "rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly" - ] -} -endef - -define DJANGO_SETTINGS_SITEUSER -INSTALLED_APPS.append("siteuser") # noqa -AUTH_USER_MODEL = "siteuser.User" -endef - -define DJANGO_SETTINGS_PROD -from .base import * # noqa -from backend.utils import get_ec2_metadata - -DEBUG = False - -try: - from .local import * # noqa -except ImportError: - pass - -LOCAL_IPV4 = get_ec2_metadata() -ALLOWED_HOSTS.append(LOCAL_IPV4) # noqa -endef - -define DJANGO_SETTINGS_THEMES -THEMES = [ - ("light", "Light Theme"), - ("dark", "Dark Theme"), -] -endef - -define DJANGO_SITEUSER_ADMIN -from django.contrib.auth.admin import UserAdmin -from django.contrib import admin - -from .models import User - -admin.site.register(User, UserAdmin) -endef - -define DJANGO_SITEUSER_EDIT_TEMPLATE -{% extends 'base.html' %} -{% load crispy_forms_tags %} -{% block content %} -

    Edit User

    - {% crispy form %} -{% endblock %} -endef - -define DJANGO_SITEUSER_FORM -from django import forms -from django.contrib.auth.forms import UserChangeForm -from crispy_forms.helper import FormHelper -from crispy_forms.layout import Layout, Fieldset, ButtonHolder, Submit -from .models import User - - -class SiteUserForm(UserChangeForm): - bio = forms.CharField(widget=forms.Textarea(attrs={"id": "editor"}), required=False) - - class Meta(UserChangeForm.Meta): - model = User - fields = ("username", "user_theme_preference", "bio", "rate") - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.helper = FormHelper() - self.helper.form_method = "post" - self.helper.layout = Layout( - Fieldset( - "Edit Your Profile", - "username", - "user_theme_preference", - "bio", - "rate", - ), - ButtonHolder(Submit("submit", "Save", css_class="btn btn-primary")), - ) -endef - -define DJANGO_SITEUSER_MODEL -from django.db import models -from django.contrib.auth.models import AbstractUser, Group, Permission -from django.conf import settings - - -class User(AbstractUser): - groups = models.ManyToManyField(Group, related_name="siteuser_set", blank=True) - user_permissions = models.ManyToManyField( - Permission, related_name="siteuser_set", blank=True - ) - - user_theme_preference = models.CharField( - max_length=10, choices=settings.THEMES, default="light" - ) - - bio = models.TextField(blank=True, null=True) - rate = models.FloatField(blank=True, null=True) -endef - -define DJANGO_SITEUSER_URLS -from django.urls import path -from .views import UserProfileView, UpdateThemePreferenceView, UserEditView - -urlpatterns = [ - path("profile/", UserProfileView.as_view(), name="user-profile"), - path( - "update_theme_preference/", - UpdateThemePreferenceView.as_view(), - name="update_theme_preference", - ), - path("/edit/", UserEditView.as_view(), name="user-edit"), -] -endef - -define DJANGO_SITEUSER_VIEW -import json - -from django.contrib.auth.mixins import LoginRequiredMixin -from django.http import JsonResponse -from django.utils.decorators import method_decorator -from django.views import View -from django.views.decorators.csrf import csrf_exempt -from django.views.generic import DetailView -from django.views.generic.edit import UpdateView -from django.urls import reverse_lazy - -from .models import User -from .forms import SiteUserForm - - -class UserProfileView(LoginRequiredMixin, DetailView): - model = User - template_name = "profile.html" - - def get_object(self, queryset=None): - return self.request.user - - -@method_decorator(csrf_exempt, name="dispatch") -class UpdateThemePreferenceView(View): - def post(self, request, *args, **kwargs): - try: - data = json.loads(request.body.decode("utf-8")) - new_theme = data.get("theme") - user = request.user - user.user_theme_preference = new_theme - user.save() - response_data = {"theme": new_theme} - return JsonResponse(response_data) - except json.JSONDecodeError as e: - return JsonResponse({"error": e}, status=400) - - def http_method_not_allowed(self, request, *args, **kwargs): - return JsonResponse({"error": "Invalid request method"}, status=405) - - -class UserEditView(LoginRequiredMixin, UpdateView): - model = User - template_name = "user_edit.html" # Create this template in your templates folder - form_class = SiteUserForm - - def get_success_url(self): - # return reverse_lazy("user-profile", kwargs={"pk": self.object.pk}) - return reverse_lazy("user-profile") -endef - -define DJANGO_SITEUSER_VIEW_TEMPLATE -{% extends 'base.html' %} -{% block content %} -

    User Profile

    -
    - Edit -
    -

    Username: {{ user.username }}

    -

    Theme: {{ user.user_theme_preference }}

    -

    Bio: {{ user.bio|default:""|safe }}

    -

    Rate: {{ user.rate|default:"" }}

    -{% endblock %} -endef - -define DJANGO_URLS -from django.contrib import admin -from django.urls import path, include -from django.conf import settings - -urlpatterns = [ - path("django/", admin.site.urls), -] -endef - -define DJANGO_URLS_ALLAUTH -urlpatterns += [path("accounts/", include("allauth.urls"))] -endef - -define DJANGO_URLS_API -from rest_framework import routers # noqa -from .api import UserViewSet, api # noqa - -router = routers.DefaultRouter() -router.register(r"users", UserViewSet) -# urlpatterns += [path("api/", include(router.urls))] -urlpatterns += [path("api/", api.urls)] -endef - -define DJANGO_URLS_DEBUG_TOOLBAR -if settings.DEBUG: - urlpatterns += [path("__debug__/", include("debug_toolbar.urls"))] -endef - -define DJANGO_URLS_HOME_PAGE -urlpatterns += [path("", include("home.urls"))] -endef - -define DJANGO_URLS_LOGGING_DEMO -urlpatterns += [path("logging-demo/", include("logging_demo.urls"))] -endef - -define DJANGO_URLS_MODEL_FORM_DEMO -urlpatterns += [path("model-form-demo/", include("model_form_demo.urls"))] -endef - -define DJANGO_URLS_PAYMENTS -urlpatterns += [path("payments/", include("payments.urls"))] -endef - -define DJANGO_URLS_SITEUSER -urlpatterns += [path("user/", include("siteuser.urls"))] -endef - -define DJANGO_UTILS -from django.urls import URLResolver -import requests - - -def get_ec2_metadata(): - try: - # Step 1: Get the token - token_url = "http://169.254.169.254/latest/api/token" - headers = {"X-aws-ec2-metadata-token-ttl-seconds": "21600"} - response = requests.put(token_url, headers=headers) - response.raise_for_status() # Raise an error for bad responses - - token = response.text - - # Step 2: Use the token to get the instance metadata - metadata_url = "http://169.254.169.254/latest/meta-data/local-ipv4" - headers = {"X-aws-ec2-metadata-token": token} - response = requests.get(metadata_url, headers=headers) - response.raise_for_status() # Raise an error for bad responses - - metadata = response.text - return metadata - except requests.RequestException as e: - print(f"Error retrieving EC2 metadata: {e}") - return None - - -# Function to remove a specific URL pattern based on its route (including catch-all) -def remove_urlpattern(urlpatterns, route_to_remove): - urlpatterns[:] = [ - urlpattern - for urlpattern in urlpatterns - if not ( - isinstance(urlpattern, URLResolver) - and urlpattern.pattern._route == route_to_remove - ) - ] -endef - -define EB_CUSTOM_ENV_EC2_USER -files: - "/home/ec2-user/.bashrc": - mode: "000644" - owner: ec2-user - group: ec2-user - content: | - # .bashrc - - # Source global definitions - if [ -f /etc/bashrc ]; then - . /etc/bashrc - fi - - # User specific aliases and functions - set -o vi - - source <(sed -E -n 's/[^#]+/export &/ p' /opt/elasticbeanstalk/deployment/custom_env_var) -endef - -define EB_CUSTOM_ENV_VAR_FILE -#!/bin/bash - -# Via https://aws.amazon.com/premiumsupport/knowledge-center/elastic-beanstalk-env-variables-linux2/ - -#Create a copy of the environment variable file. -cat /opt/elasticbeanstalk/deployment/env | perl -p -e 's/(.*)=(.*)/export $$1="$$2"/;' > /opt/elasticbeanstalk/deployment/custom_env_var - -#Set permissions to the custom_env_var file so this file can be accessed by any user on the instance. You can restrict permissions as per your requirements. -chmod 644 /opt/elasticbeanstalk/deployment/custom_env_var - -# add the virtual env path in. -VENV=/var/app/venv/`ls /var/app/venv` -cat <> /opt/elasticbeanstalk/deployment/custom_env_var -VENV=$$ENV -EOF - -#Remove duplicate files upon deployment. -rm -f /opt/elasticbeanstalk/deployment/*.bak -endef - -define GIT_IGNORE -__pycache__ -*.pyc -dist/ -node_modules/ -_build/ -.elasticbeanstalk/ -db.sqlite3 -static/ -backend/var -endef - -define JENKINS_FILE -pipeline { - agent any - stages { - stage('') { - steps { - echo '' - } - } - } -} -endef - -define MAKEFILE_CUSTOM -# Custom Makefile -# Add your custom makefile commands here -# -# PROJECT_NAME := my-new-project -endef - -define PIP_INSTALL_REQUIREMENTS_TEST -pytest -pytest-runner -coverage -pytest-mock -pytest-cov -hypothesis -selenium -pytest-django -factory-boy -flake8 -tox -endef - -define PROGRAMMING_INTERVIEW -from rich import print as rprint -from rich.console import Console -from rich.panel import Panel - -import argparse -import locale -import math -import time - -import code # noqa -import readline # noqa -import rlcompleter # noqa - - -locale.setlocale(locale.LC_ALL, "en_US.UTF-8") - - -class DataStructure: - # Data Structure: Binary Tree - class TreeNode: - def __init__(self, value=0, left=None, right=None): - self.value = value - self.left = left - self.right = right - - # Data Structure: Stack - class Stack: - def __init__(self): - self.items = [] - - def push(self, item): - self.items.append(item) - - def pop(self): - if not self.is_empty(): - return self.items.pop() - return None - - def peek(self): - if not self.is_empty(): - return self.items[-1] - return None - - def is_empty(self): - return len(self.items) == 0 - - def size(self): - return len(self.items) - - # Data Structure: Queue - class Queue: - def __init__(self): - self.items = [] - - def enqueue(self, item): - self.items.append(item) - - def dequeue(self): - if not self.is_empty(): - return self.items.pop(0) - return None - - def is_empty(self): - return len(self.items) == 0 - - def size(self): - return len(self.items) - - # Data Structure: Linked List - class ListNode: - def __init__(self, value=0, next=None): - self.value = value - self.next = next - - -class Interview(DataStructure): - - # Protected methods for factorial calculation - def _factorial_recursive(self, n): - if n == 0: - return 1 - return n * self._factorial_recursive(n - 1) - - def _factorial_divide_and_conquer(self, low, high): - if low > high: - return 1 - if low == high: - return low - mid = (low + high) // 2 - return self._factorial_divide_and_conquer( - low, mid - ) * self._factorial_divide_and_conquer(mid + 1, high) - - # Recursive Factorial with Timing - def factorial_recursive(self, n): - start_time = time.time() # Start timing - result = self._factorial_recursive(n) # Calculate factorial - end_time = time.time() # End timing - elapsed_time = end_time - start_time - return f" Factorial: {locale.format_string("%.2f", result, grouping=True)} Elapsed time: {elapsed_time:.6f}" - - # Iterative Factorial with Timing - def factorial_iterative(self, n): - start_time = time.time() # Start timing - result = 1 - for i in range(1, n + 1): - result *= i - end_time = time.time() # End timing - elapsed_time = end_time - start_time - return f" Factorial: {locale.format_string("%.2f", result, grouping=True)} Elapsed time: {elapsed_time:.6f}" - - # Divide and Conquer Factorial with Timing - def factorial_divide_and_conquer(self, n): - start_time = time.time() # Start timing - result = self._factorial_divide_and_conquer(1, n) # Calculate factorial - end_time = time.time() # End timing - elapsed_time = end_time - start_time - return f" Factorial: {locale.format_string("%.2f", result, grouping=True)} Elapsed time: {elapsed_time:.6f}" - - # Built-in Factorial with Timing - def factorial_builtin(self, n): - start_time = time.time() # Start timing - result = math.factorial(n) # Calculate factorial using built-in - end_time = time.time() # End timing - - # Calculate elapsed time - elapsed_time = end_time - start_time - - # Print complexity and runtime - return f" Factorial: {locale.format_string("%.2f", result, grouping=True)} Elapsed time: {elapsed_time:.6f}" - - # Recursion: Fibonacci - def fibonacci_recursive(self, n): - if n <= 1: - return n - return self.fibonacci_recursive(n - 1) + self.fibonacci_recursive(n - 2) - - # Iteration: Fibonacci - def fibonacci_iterative(self, n): - if n <= 1: - return n - a, b = 0, 1 - for _ in range(n - 1): - a, b = b, a + b - return b - - # Searching: Linear Search - def linear_search(self, arr, target): - for i, value in enumerate(arr): - if value == target: - return i - return -1 - - # Searching: Binary Search - def binary_search(self, arr, target): - left, right = 0, len(arr) - 1 - while left <= right: - mid = (left + right) // 2 - if arr[mid] == target: - return mid - elif arr[mid] < target: - left = mid + 1 - else: - right = mid - 1 - return -1 - - # Sorting: Bubble Sort - def bubble_sort(self, arr): - n = len(arr) - for i in range(n): - for j in range(0, n - i - 1): - if arr[j] > arr[j + 1]: - arr[j], arr[j + 1] = arr[j + 1], arr[j] - return arr - - # Sorting: Merge Sort - def merge_sort(self, arr): - if len(arr) > 1: - mid = len(arr) // 2 - left_half = arr[:mid] - right_half = arr[mid:] - - self.merge_sort(left_half) - self.merge_sort(right_half) - - i = j = k = 0 - - while i < len(left_half) and j < len(right_half): - if left_half[i] < right_half[j]: - arr[k] = left_half[i] - i += 1 - else: - arr[k] = right_half[j] - j += 1 - k += 1 - - while i < len(left_half): - arr[k] = left_half[i] - i += 1 - k += 1 - - while j < len(right_half): - arr[k] = right_half[j] - j += 1 - k += 1 - return arr - - def insert_linked_list(self, head, value): - new_node = self.ListNode(value) - if not head: - return new_node - current = head - while current.next: - current = current.next - current.next = new_node - return head - - def print_linked_list(self, head): - current = head - while current: - print(current.value, end=" -> ") - current = current.next - print("None") - - def inorder_traversal(self, root): - return ( - self.inorder_traversal(root.left) - + [root.value] - + self.inorder_traversal(root.right) - if root - else [] - ) - - def preorder_traversal(self, root): - return ( - [root.value] - + self.preorder_traversal(root.left) - + self.preorder_traversal(root.right) - if root - else [] - ) - - def postorder_traversal(self, root): - return ( - self.postorder_traversal(root.left) - + self.postorder_traversal(root.right) - + [root.value] - if root - else [] - ) - - # Graph Algorithms: Depth-First Search - def dfs(self, graph, start): - visited, stack = set(), [start] - while stack: - vertex = stack.pop() - if vertex not in visited: - visited.add(vertex) - stack.extend(set(graph[vertex]) - visited) - return visited - - # Graph Algorithms: Breadth-First Search - def bfs(self, graph, start): - visited, queue = set(), [start] - while queue: - vertex = queue.pop(0) - if vertex not in visited: - visited.add(vertex) - queue.extend(set(graph[vertex]) - visited) - return visited - - -def setup_readline(local): - - # Enable tab completion - readline.parse_and_bind("tab: complete") - # Optionally, you can set the completer function manually - readline.set_completer(rlcompleter.Completer(local).complete) - - -def main(): - - console = Console() - interview = Interview() - - parser = argparse.ArgumentParser(description="Programming Interview Questions") - - parser.add_argument( - "-f", "--factorial", type=int, help="Factorial algorithm examples" - ) - parser.add_argument("--fibonacci", type=int, help="Fibonacci algorithm examples") - parser.add_argument( - "--search", action="store_true", help="Search algorithm examples" - ) - parser.add_argument("--sort", action="store_true", help="Search algorithm examples") - parser.add_argument("--stack", action="store_true", help="Stack algorithm examples") - parser.add_argument("--queue", action="store_true", help="Queue algorithm examples") - parser.add_argument( - "--list", action="store_true", help="Linked List algorithm examples" - ) - parser.add_argument( - "--tree", action="store_true", help="Tree traversal algorithm examples" - ) - parser.add_argument("--graph", action="store_true", help="Graph algorithm examples") - parser.add_argument( - "-i", "--interactive", action="store_true", help="Interactive mode" - ) - - args = parser.parse_args() - - if args.factorial: - # Factorial examples - console.rule("Factorial Examples") - rprint( - Panel( - "[bold cyan]Recursive Factorial - Time Complexity: O(n)[/bold cyan]\n" - + str(interview.factorial_recursive(args.factorial)), - title="Factorial Recursive", - ) - ) - rprint( - Panel( - "[bold cyan]Iterative Factorial - Time Complexity: O(n)[/bold cyan]\n" - + str(interview.factorial_iterative(args.factorial)), - title="Factorial Iterative", - ) - ) - rprint( - Panel( - "[bold cyan]Built-in Factorial - Time Complexity: O(n)[/bold cyan]\n" - + str(interview.factorial_builtin(args.factorial)), - title="Factorial Built-in", - ) - ) - rprint( - Panel( - "[bold cyan]Divide and Conquer Factorial - Time Complexity: O(n log n)[/bold cyan]\n" - + str(interview.factorial_divide_and_conquer(args.factorial)), - title="Factorial Divide and Conquer", - ) - ) - exit() - - if args.fibonacci: - # Fibonacci examples - console.rule("Fibonacci Examples") - rprint( - Panel( - str(interview.fibonacci_recursive(args.fibonacci)), - title="Fibonacci Recursive", - ) - ) - rprint( - Panel( - str(interview.fibonacci_iterative(args.fibonacci)), - title="Fibonacci Iterative", - ) - ) - exit() - - if args.search: - # Searching examples - console.rule("Searching Examples") - array = [1, 3, 5, 7, 9] - rprint(Panel(str(interview.linear_search(array, 5)), title="Linear Search")) - rprint(Panel(str(interview.binary_search(array, 5)), title="Binary Search")) - exit() - - if args.sort: - # Sorting examples - console.rule("Sorting Examples") - unsorted_array = [64, 34, 25, 12, 22, 11, 90] - rprint( - Panel( - str(interview.bubble_sort(unsorted_array.copy())), title="Bubble Sort" - ) - ) - rprint( - Panel(str(interview.merge_sort(unsorted_array.copy())), title="Merge Sort") - ) - exit() - - if args.stack: - # Stack example - console.rule("Stack Example") - stack = interview.Stack() - stack.push(1) - stack.push(2) - stack.push(3) - rprint(Panel(str(stack.pop()), title="Stack Pop")) - rprint(Panel(str(stack.peek()), title="Stack Peek")) - rprint(Panel(str(stack.size()), title="Stack Size")) - - if args.queue: - # Queue example - console.rule("Queue Example") - queue = interview.Queue() - queue.enqueue(1) - queue.enqueue(2) - queue.enqueue(3) - rprint(Panel(str(queue.dequeue()), title="Queue Dequeue")) - rprint(Panel(str(queue.is_empty()), title="Queue Is Empty")) - rprint(Panel(str(queue.size()), title="Queue Size")) - - if args.list: - # Linked List example - console.rule("Linked List Example") - head = None - head = interview.insert_linked_list(head, 1) - head = interview.insert_linked_list(head, 2) - head = interview.insert_linked_list(head, 3) - interview.print_linked_list(head) # Output: 1 -> 2 -> 3 -> None - - if args.tree: - # Tree Traversal example - console.rule("Tree Traversal Example") - root = interview.TreeNode(1) - root.left = interview.TreeNode(2) - root.right = interview.TreeNode(3) - root.left.left = interview.TreeNode(4) - root.left.right = interview.TreeNode(5) - rprint(Panel(str(interview.inorder_traversal(root)), title="Inorder Traversal")) - rprint( - Panel(str(interview.preorder_traversal(root)), title="Preorder Traversal") - ) - rprint( - Panel(str(interview.postorder_traversal(root)), title="Postorder Traversal") - ) - - if args.graph: - # Graph Algorithms example - console.rule("Graph Algorithms Example") - graph = { - "A": ["B", "C"], - "B": ["A", "D", "E"], - "C": ["A", "F"], - "D": ["B"], - "E": ["B", "F"], - "F": ["C", "E"], - } - rprint(Panel(str(interview.dfs(graph, "A")), title="DFS")) - rprint(Panel(str(interview.bfs(graph, "A")), title="BFS")) - - if args.interactive: - # Starting interactive session with tab completion - setup_readline(locals()) - banner = "Interactive programming interview session started. Type 'exit()' or 'Ctrl-D' to exit." - code.interact( - banner=banner, - local=locals(), - exitmsg="Great interview!", - ) - - -if __name__ == "__main__": - main() - -endef - -define PYTHON_CI_YAML -name: Build Wheels -endef - -define PYTHON_LICENSE_TXT -MIT License - -Copyright (c) [YEAR] [OWNER NAME] - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -endef - -define PYTHON_PROJECT_TOML -[build-system] -endef - -define SEPARATOR -.==========================================================================================================================================. -| | -| _|_|_| _| _| _| _| _| _|_| _| _| | -| _| _| _| _|_| _|_| _|_| _|_|_| _|_|_|_| _|_| _|_| _|_|_| _| _| _|_| _| _| _|_| | -| _|_|_| _|_| _| _| _| _|_|_|_| _| _| _| _| _| _| _| _|_| _|_|_|_| _|_|_|_| _| _| _|_|_|_| | -| _| _| _| _| _| _| _| _| _| _| _| _| _| _| _| _| _| _| _| | -| _| _| _|_| _| _|_|_| _|_|_| _|_| _| _| _|_|_| _| _| _|_|_| _| _| _| _|_|_| | -| _| | -| _| | -`==========================================================================================================================================' -endef - -define TINYMCE_JS -import tinymce from 'tinymce'; -import 'tinymce/icons/default'; -import 'tinymce/themes/silver'; -import 'tinymce/skins/ui/oxide/skin.css'; -import 'tinymce/plugins/advlist'; -import 'tinymce/plugins/code'; -import 'tinymce/plugins/emoticons'; -import 'tinymce/plugins/emoticons/js/emojis'; -import 'tinymce/plugins/link'; -import 'tinymce/plugins/lists'; -import 'tinymce/plugins/table'; -import 'tinymce/models/dom'; - -tinymce.init({ - selector: 'textarea#editor', - plugins: 'advlist code emoticons link lists table', - toolbar: 'bold italic | bullist numlist | link emoticons', - skin: false, - content_css: false, -}); -endef - -define WAGTAIL_BASE_TEMPLATE -{% load static wagtailcore_tags wagtailuserbar webpack_loader %} - - - - - - {% block title %} - {% if page.seo_title %} - {{ page.seo_title }} - {% else %} - {{ page.title }} - {% endif %} - {% endblock %} - {% block title_suffix %} - {% wagtail_site as current_site %} - {% if current_site and current_site.site_name %}- {{ current_site.site_name }}{% endif %} - {% endblock %} - - {% if page.search_description %}{% endif %} - - {# Force all links in the live preview panel to be opened in a new tab #} - {% if request.in_preview_panel %}{% endif %} - {% stylesheet_pack 'app' %} - {% block extra_css %}{# Override this in templates to add extra stylesheets #}{% endblock %} - - {% include 'favicon.html' %} - {% csrf_token %} - - -
    - {% wagtailuserbar %} -
    - {% include 'header.html' %} - {% if messages %} -
    - {% for message in messages %} - - {% endfor %} -
    - {% endif %} -
    - {% block content %}{% endblock %} -
    -
    - {% include 'footer.html' %} - {% include 'offcanvas.html' %} - {% javascript_pack 'app' %} - {% block extra_js %}{# Override this in templates to add extra javascript #}{% endblock %} - - -endef - -define WAGTAIL_BLOCK_CAROUSEL - -endef - -define WAGTAIL_BLOCK_MARKETING -{% load wagtailcore_tags %} -
    - {% if block.value.images.0 %} - {% include 'blocks/carousel_block.html' %} - {% else %} - {{ self.title }} - {{ self.content }} - {% endif %} -
    -endef - -define WAGTAIL_CONTACT_PAGE_LANDING -{% extends 'base.html' %} -{% block content %}

    Thank you!

    {% endblock %} -endef - -define WAGTAIL_CONTACT_PAGE_MODEL -from django.db import models -from modelcluster.fields import ParentalKey -from wagtail.admin.panels import ( - FieldPanel, FieldRowPanel, - InlinePanel, MultiFieldPanel -) -from wagtail.fields import RichTextField -from wagtail.contrib.forms.models import AbstractEmailForm, AbstractFormField - - -class FormField(AbstractFormField): - page = ParentalKey('ContactPage', on_delete=models.CASCADE, related_name='form_fields') - - -class ContactPage(AbstractEmailForm): - intro = RichTextField(blank=True) - thank_you_text = RichTextField(blank=True) - - content_panels = AbstractEmailForm.content_panels + [ - FieldPanel('intro'), - InlinePanel('form_fields', label="Form fields"), - FieldPanel('thank_you_text'), - MultiFieldPanel([ - FieldRowPanel([ - FieldPanel('from_address', classname="col6"), - FieldPanel('to_address', classname="col6"), - ]), - FieldPanel('subject'), - ], "Email"), - ] - - class Meta: - verbose_name = "Contact Page" -endef - -define WAGTAIL_CONTACT_PAGE_TEMPLATE -{% extends 'base.html' %} -{% load crispy_forms_tags static wagtailcore_tags %} -{% block content %} -

    {{ page.title }}

    - {{ page.intro|richtext }} -
    - {% csrf_token %} - {{ form.as_p }} - -
    -{% endblock %} -endef - -define WAGTAIL_CONTACT_PAGE_TEST -from django.test import TestCase -from wagtail.test.utils import WagtailPageTestCase -from wagtail.models import Page - -from contactpage.models import ContactPage, FormField - -class ContactPageTest(TestCase, WagtailPageTestCase): - def test_contact_page_creation(self): - # Create a ContactPage instance - contact_page = ContactPage( - title='Contact', - intro='Welcome to our contact page!', - thank_you_text='Thank you for reaching out.' - ) - - # Save the ContactPage instance - self.assertEqual(contact_page.save_revision().publish().get_latest_revision_as_page(), contact_page) - - def test_form_field_creation(self): - # Create a ContactPage instance - contact_page = ContactPage( - title='Contact', - intro='Welcome to our contact page!', - thank_you_text='Thank you for reaching out.' - ) - # Save the ContactPage instance - contact_page_revision = contact_page.save_revision() - contact_page_revision.publish() - - # Create a FormField associated with the ContactPage - form_field = FormField( - page=contact_page, - label='Your Name', - field_type='singleline', - required=True - ) - form_field.save() - - # Retrieve the ContactPage from the database - contact_page_from_db = Page.objects.get(id=contact_page.id).specific - - # Check if the FormField is associated with the ContactPage - self.assertEqual(contact_page_from_db.form_fields.first(), form_field) - - def test_contact_page_form_submission(self): - # Create a ContactPage instance - contact_page = ContactPage( - title='Contact', - intro='Welcome to our contact page!', - thank_you_text='Thank you for reaching out.' - ) - # Save the ContactPage instance - contact_page_revision = contact_page.save_revision() - contact_page_revision.publish() - - # Simulate a form submission - form_data = { - 'your_name': 'John Doe', - # Add other form fields as needed - } - - response = self.client.post(contact_page.url, form_data) - - # Check if the form submission is successful (assuming a 302 redirect) - self.assertEqual(response.status_code, 302) - - # You may add more assertions based on your specific requirements -endef - -define WAGTAIL_HEADER_PREFIX -{% load wagtailcore_tags %} -{% wagtail_site as current_site %} -endef - -define WAGTAIL_HOME_PAGE_MODEL -from wagtail.models import Page -from wagtail.fields import StreamField -from wagtail import blocks -from wagtail.admin.panels import FieldPanel -from wagtail.images.blocks import ImageChooserBlock - - -class MarketingBlock(blocks.StructBlock): - title = blocks.CharBlock(required=False, help_text="Enter the block title") - content = blocks.RichTextBlock(required=False, help_text="Enter the block content") - images = blocks.ListBlock( - ImageChooserBlock(required=False), - help_text="Select one or two images for column display. Select three or more images for carousel display.", - ) - image = ImageChooserBlock( - required=False, help_text="Select one image for background display." - ) - block_class = blocks.CharBlock( - required=False, - help_text="Enter a CSS class for styling the marketing block", - classname="full title", - default="vh-100 bg-secondary", - ) - image_class = blocks.CharBlock( - required=False, - help_text="Enter a CSS class for styling the column display image(s)", - classname="full title", - default="img-thumbnail p-5", - ) - layout_class = blocks.CharBlock( - required=False, - help_text="Enter a CSS class for styling the layout.", - classname="full title", - default="d-flex flex-row", - ) - - class Meta: - icon = "placeholder" - template = "blocks/marketing_block.html" - - -class HomePage(Page): - template = "home/home_page.html" # Create a template for rendering the home page - - marketing_blocks = StreamField( - [ - ("marketing_block", MarketingBlock()), - ], - blank=True, - null=True, - use_json_field=True, - ) - content_panels = Page.content_panels + [ - FieldPanel("marketing_blocks"), - ] - - class Meta: - verbose_name = "Home Page" -endef - -define WAGTAIL_HOME_PAGE_TEMPLATE -{% extends "base.html" %} -{% load wagtailcore_tags %} -{% block content %} -
    - {% for block in page.marketing_blocks %} - {% include_block block %} - {% endfor %} -
    -{% endblock %} -endef - -define WAGTAIL_PRIVACY_PAGE_MODEL -from wagtail.models import Page -from wagtail.admin.panels import FieldPanel -from wagtailmarkdown.fields import MarkdownField - - -class PrivacyPage(Page): - """ - A Wagtail Page model for the Privacy Policy page. - """ - - template = "privacy_page.html" - - body = MarkdownField() - - content_panels = Page.content_panels + [ - FieldPanel("body", classname="full"), - ] - - class Meta: - verbose_name = "Privacy Page" -endef - -define WAGTAIL_PRIVACY_PAGE_TEMPLATE -{% extends 'base.html' %} -{% load wagtailmarkdown %} -{% block content %}
    {{ page.body|markdown }}
    {% endblock %} -endef - -define WAGTAIL_SEARCH_TEMPLATE -{% extends "base.html" %} -{% load static wagtailcore_tags %} -{% block body_class %}template-searchresults{% endblock %} -{% block title %}Search{% endblock %} -{% block content %} -

    Search

    -
    - - -
    - {% if search_results %} -
      - {% for result in search_results %} -
    • -

      - {{ result }} -

      - {% if result.search_description %}{{ result.search_description }}{% endif %} -
      • - {% endfor %} -
    - {% if search_results.has_previous %} - Previous - {% endif %} - {% if search_results.has_next %} - Next - {% endif %} - {% elif search_query %} - No results found - {% else %} - No results found. Try a test query? - {% endif %} -{% endblock %} -endef - -define WAGTAIL_SEARCH_URLS -from django.urls import path -from .views import search - -urlpatterns = [path("", search, name="search")] -endef - -define WAGTAIL_SETTINGS -INSTALLED_APPS.append("wagtail_color_panel") -INSTALLED_APPS.append("wagtail_modeladmin") -INSTALLED_APPS.append("wagtail.contrib.settings") -INSTALLED_APPS.append("wagtailmarkdown") -INSTALLED_APPS.append("wagtailmenus") -INSTALLED_APPS.append("wagtailseo") -TEMPLATES[0]["OPTIONS"]["context_processors"].append( - "wagtail.contrib.settings.context_processors.settings" -) -TEMPLATES[0]["OPTIONS"]["context_processors"].append( - "wagtailmenus.context_processors.wagtailmenus" -) -endef - -define WAGTAIL_SITEPAGE_MODEL -from wagtail.models import Page - - -class SitePage(Page): - template = "sitepage/site_page.html" - - class Meta: - verbose_name = "Site Page" -endef - -define WAGTAIL_SITEPAGE_TEMPLATE -{% extends 'base.html' %} -{% block content %} -

    {{ page.title }}

    -{% endblock %} -endef - -define WAGTAIL_URLS -from django.conf import settings -from django.urls import include, path -from django.contrib import admin - -from wagtail.admin import urls as wagtailadmin_urls -from wagtail.documents import urls as wagtaildocs_urls - -from search import views as search_views - -urlpatterns = [ - path("django/", admin.site.urls), - path("wagtail/", include(wagtailadmin_urls)), - path("documents/", include(wagtaildocs_urls)), - path("search/", search_views.search, name="search"), -] - -if settings.DEBUG: - from django.conf.urls.static import static - from django.contrib.staticfiles.urls import staticfiles_urlpatterns - - # Serve static and media files from development server - urlpatterns += staticfiles_urlpatterns() - urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) -endef - -define WAGTAIL_URLS_HOME -urlpatterns += [ - # For anything not caught by a more specific rule above, hand over to - # Wagtail's page serving mechanism. This should be the last pattern in - # the list: - path("", include("wagtail.urls")), - # Alternatively, if you want Wagtail pages to be served from a subpath - # of your site, rather than the site root: - # path("pages/", include("wagtail.urls"), -] -endef - -define WEBPACK_CONFIG_JS -const path = require('path'); - -module.exports = { - mode: 'development', - entry: './src/index.js', - output: { - filename: 'bundle.js', - path: path.resolve(__dirname, 'dist'), - }, -}; -endef - -define WEBPACK_INDEX_HTML - - - - - - Hello, Webpack! - - - - - -endef - -define WEBPACK_INDEX_JS -const message = "Hello, World!"; -console.log(message); -endef - -define WEBPACK_REVEAL_CONFIG_JS -const path = require('path'); -const MiniCssExtractPlugin = require('mini-css-extract-plugin'); - -module.exports = { - mode: 'development', - entry: './src/index.js', - output: { - filename: 'bundle.js', - path: path.resolve(__dirname, 'dist'), - }, - module: { - rules: [ - { - test: /\.css$$/, - use: [MiniCssExtractPlugin.loader, 'css-loader'], - }, - ], - }, - plugins: [ - new MiniCssExtractPlugin({ - filename: 'bundle.css', - }), - ], -}; -endef - -define WEBPACK_REVEAL_INDEX_HTML - - - - - - Project Makefile - - -
    -
    -
    - Slide 1: Draw some circles -
    -
    - Slide 2: Draw the rest of the owl -
    -
    -
    - - -endef - -define WEBPACK_REVEAL_INDEX_JS -import 'reveal.js/dist/reveal.css'; -import 'reveal.js/dist/theme/black.css'; -import Reveal from 'reveal.js'; -import RevealNotes from 'reveal.js/plugin/notes/notes.js'; -Reveal.initialize({ slideNumber: true, plugins: [ RevealNotes ]}); -endef - -# ------------------------------------------------------------------------------ -# Export variables used by phony target rules -# ------------------------------------------------------------------------------ - -export DJANGO_ALLAUTH_BASE_TEMPLATE -export DJANGO_API_SERIALIZERS -export DJANGO_API_VIEWS -export DJANGO_APP_TESTS -export DJANGO_BACKEND_APPS -export DJANGO_BASE_TEMPLATE -export DJANGO_CUSTOM_ADMIN -export DJANGO_DOCKERCOMPOSE -export DJANGO_DOCKERFILE -export DJANGO_FAVICON_TEMPLATE -export DJANGO_FOOTER_TEMPLATE -export DJANGO_FRONTEND_APP -export DJANGO_FRONTEND_APP_CONFIG -export DJANGO_FRONTEND_BABELRC -export DJANGO_FRONTEND_COMPONENTS -export DJANGO_FRONTEND_COMPONENT_CLOCK -export DJANGO_FRONTEND_COMPONENT_ERROR -export DJANGO_FRONTEND_COMPONENT_USER_MENU -export DJANGO_FRONTEND_CONTEXT_INDEX -export DJANGO_FRONTEND_CONTEXT_USER_PROVIDER -export DJANGO_FRONTEND_ESLINTRC -export DJANGO_FRONTEND_OFFCANVAS_TEMPLATE -export DJANGO_FRONTEND_PORTAL -export DJANGO_FRONTEND_STYLES -export DJANGO_FRONTEND_THEME_BLUE -export DJANGO_FRONTEND_THEME_TOGGLER -export DJANGO_HEADER_TEMPLATE -export DJANGO_HOME_PAGE_ADMIN -export DJANGO_HOME_PAGE_MODELS -export DJANGO_HOME_PAGE_TEMPLATE -export DJANGO_HOME_PAGE_URLS -export DJANGO_HOME_PAGE_VIEWS -export DJANGO_LOGGING_DEMO_ADMIN -export DJANGO_LOGGING_DEMO_MODELS -export DJANGO_LOGGING_DEMO_SETTINGS -export DJANGO_LOGGING_DEMO_URLS -export DJANGO_LOGGING_DEMO_VIEWS -export DJANGO_MANAGE_PY -export DJANGO_MODEL_FORM_DEMO_ADMIN -export DJANGO_MODEL_FORM_DEMO_FORMS -export DJANGO_MODEL_FORM_DEMO_MODEL -export DJANGO_MODEL_FORM_DEMO_TEMPLATE_DETAIL -export DJANGO_MODEL_FORM_DEMO_TEMPLATE_FORM -export DJANGO_MODEL_FORM_DEMO_TEMPLATE_LIST -export DJANGO_MODEL_FORM_DEMO_URLS -export DJANGO_MODEL_FORM_DEMO_VIEWS -export DJANGO_PAYMENTS_ADMIN -export DJANGO_PAYMENTS_FORM -export DJANGO_PAYMENTS_MIGRATION_0002 -export DJANGO_PAYMENTS_MIGRATION_0003 -export DJANGO_PAYMENTS_MODELS -export DJANGO_PAYMENTS_TEMPLATE_CANCEL -export DJANGO_PAYMENTS_TEMPLATE_CHECKOUT -export DJANGO_PAYMENTS_TEMPLATE_PRODUCT_DETAIL -export DJANGO_PAYMENTS_TEMPLATE_PRODUCT_LIST -export DJANGO_PAYMENTS_TEMPLATE_SUCCESS -export DJANGO_PAYMENTS_URLS -export DJANGO_PAYMENTS_VIEW -export DJANGO_SEARCH_FORMS -export DJANGO_SEARCH_SETTINGS -export DJANGO_SEARCH_TEMPLATE -export DJANGO_SEARCH_URLS -export DJANGO_SEARCH_UTILS -export DJANGO_SEARCH_VIEWS -export DJANGO_SETTINGS_AUTHENTICATION_BACKENDS -export DJANGO_SETTINGS_BASE -export DJANGO_SETTINGS_BASE_MINIMAL -export DJANGO_SETTINGS_CRISPY_FORMS -export DJANGO_SETTINGS_DATABASE -export DJANGO_SETTINGS_DEV -export DJANGO_SETTINGS_HOME_PAGE -export DJANGO_SETTINGS_INSTALLED_APPS -export DJANGO_SETTINGS_MIDDLEWARE -export DJANGO_SETTINGS_MODEL_FORM_DEMO -export DJANGO_SETTINGS_PAYMENTS -export DJANGO_SETTINGS_PROD -export DJANGO_SETTINGS_REST_FRAMEWORK -export DJANGO_SETTINGS_SITEUSER -export DJANGO_SETTINGS_THEMES -export DJANGO_SITEUSER_ADMIN -export DJANGO_SITEUSER_EDIT_TEMPLATE -export DJANGO_SITEUSER_FORM -export DJANGO_SITEUSER_MODEL -export DJANGO_SITEUSER_URLS -export DJANGO_SITEUSER_VIEW -export DJANGO_SITEUSER_VIEW_TEMPLATE -export DJANGO_URLS -export DJANGO_URLS_ALLAUTH -export DJANGO_URLS_API -export DJANGO_URLS_DEBUG_TOOLBAR -export DJANGO_URLS_HOME_PAGE -export DJANGO_URLS_LOGGING_DEMO -export DJANGO_URLS_MODEL_FORM_DEMO -export DJANGO_URLS_SITEUSER -export DJANGO_UTILS -export EB_CUSTOM_ENV_EC2_USER -export EB_CUSTOM_ENV_VAR_FILE -export GIT_IGNORE -export JENKINS_FILE -export MAKEFILE_CUSTOM -export PIP_INSTALL_REQUIREMENTS_TEST -export PROGRAMMING_INTERVIEW -export PYTHON_CI_YAML -export PYTHON_LICENSE_TXT -export PYTHON_PROJECT_TOML -export SEPARATOR -export TINYMCE_JS -export WAGTAIL_BASE_TEMPLATE -export WAGTAIL_BLOCK_CAROUSEL -export WAGTAIL_BLOCK_MARKETING -export WAGTAIL_CONTACT_PAGE_LANDING -export WAGTAIL_CONTACT_PAGE_MODEL -export WAGTAIL_CONTACT_PAGE_TEMPLATE -export WAGTAIL_CONTACT_PAGE_TEST -export WAGTAIL_HOME_PAGE_MODEL -export WAGTAIL_HOME_PAGE_TEMPLATE -export WAGTAIL_HOME_PAGE_URLS -export WAGTAIL_HOME_PAGE_VIEWS -export WAGTAIL_PRIVACY_PAGE_MODEL -export WAGTAIL_PRIVACY_PAGE_MODEL -export WAGTAIL_PRIVACY_PAGE_TEMPLATE -export WAGTAIL_SEARCH_TEMPLATE -export WAGTAIL_SEARCH_URLS -export WAGTAIL_SETTINGS -export WAGTAIL_SITEPAGE_MODEL -export WAGTAIL_SITEPAGE_TEMPLATE -export WAGTAIL_URLS -export WAGTAIL_URLS_HOME -export WEBPACK_CONFIG_JS -export WEBPACK_INDEX_HTML -export WEBPACK_INDEX_JS -export WEBPACK_REVEAL_CONFIG_JS -export WEBPACK_REVEAL_INDEX_HTML -export WEBPACK_REVEAL_INDEX_JS - -# ------------------------------------------------------------------------------ -# Multi-line phony target rules -# ------------------------------------------------------------------------------ - -.PHONY: aws-check-env-profile-default -aws-check-env-profile-default: -ifndef AWS_PROFILE - $(error AWS_PROFILE is undefined) -endif - -.PHONY: aws-check-env-region-default -aws-check-env-region-default: -ifndef AWS_REGION - $(error AWS_REGION is undefined) -endif - -.PHONY: aws-secret-default -aws-secret-default: aws-check-env - @SECRET_KEY=$$(openssl rand -base64 48); aws ssm put-parameter --name "SECRET_KEY" --value "$$SECRET_KEY" --type String - -.PHONY: aws-sg-default -aws-sg-default: aws-check-env - aws ec2 describe-security-groups $(AWS_OPTS) - -.PHONY: aws-ssm-default -aws-ssm-default: aws-check-env - aws ssm describe-parameters $(AWS_OPTS) - @echo "Get parameter values with: aws ssm getparameter --name ." - -.PHONY: aws-subnet-default -aws-subnet-default: aws-check-env - aws ec2 describe-subnets $(AWS_OPTS) - -.PHONY: aws-vol-available-default -aws-vol-available-default: aws-check-env - aws ec2 describe-volumes --filters Name=status,Values=available --query "Volumes[*].{ID:VolumeId,Size:Size}" --output table - -.PHONY: aws-vol-default -aws-vol-default: aws-check-env - aws ec2 describe-volumes --output table - -.PHONY: aws-vpc-default -aws-vpc-default: aws-check-env - aws ec2 describe-vpcs $(AWS_OPTS) - -.PHONY: db-import-default -db-import-default: - @psql $(DJANGO_DB_NAME) < $(DJANGO_DB_NAME).sql - -.PHONY: db-init-default -db-init-default: - -dropdb $(PROJECT_NAME) - -createdb $(PROJECT_NAME) - -.PHONY: db-init-mysql-default -db-init-mysql-default: - -mysqladmin -u root drop $(PROJECT_NAME) - -mysqladmin -u root create $(PROJECT_NAME) - -.PHONY: db-init-test-default -db-init-test-default: - -dropdb test_$(PROJECT_NAME) - -createdb test_$(PROJECT_NAME) - -.PHONY: django-allauth-default -django-allauth-default: - $(ADD_DIR) backend/templates/allauth/layouts - @echo "$$DJANGO_ALLAUTH_BASE_TEMPLATE" > backend/templates/allauth/layouts/base.html - @echo "$$DJANGO_URLS_ALLAUTH" >> $(DJANGO_URLS_FILE) - -$(GIT_ADD) backend/templates/allauth/layouts/base.html - -.PHONY: django-app-tests-default -django-app-tests-default: - @echo "$$DJANGO_APP_TESTS" > $(APP_DIR)/tests.py - -.PHONY: django-base-template-default -django-base-template-default: - @$(ADD_DIR) backend/templates - @echo "$$DJANGO_BASE_TEMPLATE" > backend/templates/base.html - -$(GIT_ADD) backend/templates/base.html - -.PHONY: django-custom-admin-default -django-custom-admin-default: - @echo "$$DJANGO_CUSTOM_ADMIN" > $(DJANGO_CUSTOM_ADMIN_FILE) - @echo "$$DJANGO_BACKEND_APPS" > $(DJANGO_BACKEND_APPS_FILE) - -$(GIT_ADD) backend/*.py - -.PHONY: django-db-shell-default -django-db-shell-default: - python manage.py dbshell - -.PHONY: django-dockerfile-default -django-dockerfile-default: - @echo "$$DJANGO_DOCKERFILE" > Dockerfile - -$(GIT_ADD) Dockerfile - @echo "$$DJANGO_DOCKERCOMPOSE" > docker-compose.yml - -$(GIT_ADD) docker-compose.yml - -.PHONY: django-favicon-default -django-favicon-default: - @echo "$$DJANGO_FAVICON_TEMPLATE" > backend/templates/favicon.html - -$(GIT_ADD) backend/templates/favicon.html - -.PHONY: django-footer-template-default -django-footer-template-default: - @echo "$$DJANGO_FOOTER_TEMPLATE" > backend/templates/footer.html - -$(GIT_ADD) backend/templates/footer.html - -.PHONY: django-frontend-default -django-frontend-default: python-webpack-init - $(ADD_DIR) frontend/src/context - $(ADD_DIR) frontend/src/images - $(ADD_DIR) frontend/src/utils - @echo "$$DJANGO_FRONTEND_APP" > frontend/src/application/app.js - @echo "$$DJANGO_FRONTEND_APP_CONFIG" > frontend/src/application/config.js - @echo "$$DJANGO_FRONTEND_BABELRC" > frontend/.babelrc - @echo "$$DJANGO_FRONTEND_COMPONENT_CLOCK" > frontend/src/components/Clock.js - @echo "$$DJANGO_FRONTEND_COMPONENT_ERROR" > frontend/src/components/ErrorBoundary.js - @echo "$$DJANGO_FRONTEND_CONTEXT_INDEX" > frontend/src/context/index.js - @echo "$$DJANGO_FRONTEND_CONTEXT_USER_PROVIDER" > frontend/src/context/UserContextProvider.js - @echo "$$DJANGO_FRONTEND_COMPONENT_USER_MENU" > frontend/src/components/UserMenu.js - @echo "$$DJANGO_FRONTEND_COMPONENTS" > frontend/src/components/index.js - @echo "$$DJANGO_FRONTEND_ESLINTRC" > frontend/.eslintrc - @echo "$$DJANGO_FRONTEND_PORTAL" > frontend/src/dataComponents.js - @echo "$$DJANGO_FRONTEND_STYLES" > frontend/src/styles/index.scss - @echo "$$DJANGO_FRONTEND_THEME_BLUE" > frontend/src/styles/theme-blue.scss - @echo "$$DJANGO_FRONTEND_THEME_TOGGLER" > frontend/src/utils/themeToggler.js - # @echo "$$TINYMCE_JS" > frontend/src/utils/tinymce.js - @$(MAKE) npm-install-django - @$(MAKE) npm-install-django-dev - -$(GIT_ADD) $(DJANGO_FRONTEND_FILES) - -.PHONY: django-graph-default -django-graph-default: - python manage.py graph_models -a -o $(PROJECT_NAME).png - -.PHONY: django-header-template-default -django-header-template-default: - @echo "$$DJANGO_HEADER_TEMPLATE" > backend/templates/header.html - -$(GIT_ADD) backend/templates/header.html - -.PHONY: django-home-default -django-home-default: - python manage.py startapp home - $(ADD_DIR) home/templates - @echo "$$DJANGO_HOME_PAGE_ADMIN" > home/admin.py - @echo "$$DJANGO_HOME_PAGE_MODELS" > home/models.py - @echo "$$DJANGO_HOME_PAGE_TEMPLATE" > home/templates/home.html - @echo "$$DJANGO_HOME_PAGE_VIEWS" > home/views.py - @echo "$$DJANGO_HOME_PAGE_URLS" > home/urls.py - @echo "$$DJANGO_URLS_HOME_PAGE" >> $(DJANGO_URLS_FILE) - @echo "$$DJANGO_SETTINGS_HOME_PAGE" >> $(DJANGO_SETTINGS_BASE_FILE) - export APP_DIR="home"; $(MAKE) django-app-tests - -$(GIT_ADD) home/templates - -$(GIT_ADD) home/*.py - -$(GIT_ADD) home/migrations/*.py - -.PHONY: django-init-default -django-init-default: separator \ - db-init \ - django-install \ - django-project \ - django-utils \ - pip-freeze \ - pip-init-test \ - django-settings-directory \ - django-custom-admin \ - django-dockerfile \ - django-offcanvas-template \ - django-header-template \ - django-footer-template \ - django-base-template \ - django-manage-py \ - django-urls \ - django-urls-debug-toolbar \ - django-allauth \ - django-favicon \ - git-ignore \ - django-settings-base \ - django-settings-dev \ - django-settings-prod \ - django-siteuser \ - django-home \ - django-rest-serializers \ - django-rest-views \ - django-urls-api \ - django-frontend \ - django-migrate \ - django-su - -.PHONY: django-init-minimal-default -django-init-minimal-default: separator \ - db-init \ - django-install-minimal \ - django-project \ - django-settings-directory \ - django-settings-base-minimal \ - django-settings-dev \ - pip-freeze \ - pip-init-test \ - django-custom-admin \ - django-dockerfile \ - django-offcanvas-template \ - django-header-template \ - django-footer-template \ - django-base-template \ - django-manage-py \ - django-urls \ - django-urls-debug-toolbar \ - django-favicon \ - django-settings-prod \ - django-home \ - django-utils \ - django-frontend \ - django-migrate \ - git-ignore \ - django-su - -.PHONY: django-init-wagtail-default -django-init-wagtail-default: separator \ - db-init \ - django-install \ - wagtail-install \ - wagtail-project \ - django-utils \ - pip-freeze \ - pip-init-test \ - django-custom-admin \ - django-dockerfile \ - django-offcanvas-template \ - wagtail-header-prefix-template \ - django-header-template \ - wagtail-base-template \ - django-footer-template \ - django-manage-py \ - wagtail-home \ - wagtail-urls \ - django-urls-debug-toolbar \ - django-allauth \ - django-favicon \ - git-ignore \ - wagtail-search \ - django-settings-base \ - django-settings-dev \ - django-settings-prod \ - wagtail-settings \ - django-siteuser \ - django-model-form-demo \ - django-logging-demo \ - django-payments-demo-default \ - django-rest-serializers \ - django-rest-views \ - django-urls-api \ - wagtail-urls-home \ - django-frontend \ - django-migrate \ - django-su - -.PHONY: django-install-default -django-install-default: - $(PIP_ENSURE) - python -m pip install \ - Django \ - Faker \ - boto3 \ - crispy-bootstrap5 \ - djangorestframework \ - django-allauth \ - django-after-response \ - django-ckeditor \ - django-colorful \ - django-cors-headers \ - django-countries \ - django-crispy-forms \ - django-debug-toolbar \ - django-extensions \ - django-hijack \ - django-honeypot \ - django-imagekit \ - django-import-export \ - django-ipware \ - django-multiselectfield \ - django-ninja \ - django-phonenumber-field \ - django-recurrence \ - django-recaptcha \ - django-registration \ - django-richtextfield \ - django-sendgrid-v5 \ - django-social-share \ - django-sql-explorer \ - django-storages \ - django-tables2 \ - django-timezone-field \ - django-widget-tweaks \ - dj-database-url \ - dj-rest-auth \ - dj-stripe \ - docutils \ - enmerkar \ - gunicorn \ - html2docx \ - icalendar \ - mailchimp-marketing \ - mailchimp-transactional \ - phonenumbers \ - pipdeptree \ - psycopg2-binary \ - pydotplus \ - python-webpack-boilerplate \ - python-docx \ - reportlab \ - texttable - -.PHONY: django-install-minimal-default -django-install-minimal-default: - $(PIP_ENSURE) - python -m pip install \ - Django \ - dj-database-url \ - django-debug-toolbar \ - python-webpack-boilerplate - -.PHONY: django-lint-default -django-lint-default: - -ruff format -v - -djlint --reformat --format-css --format-js . - -ruff check -v --fix - -.PHONY: django-loaddata-default -django-loaddata-default: - python manage.py loaddata - -.PHONY: django-logging-demo-default -django-logging-demo-default: - python manage.py startapp logging_demo - @echo "$$DJANGO_LOGGING_DEMO_ADMIN" > logging_demo/admin.py - @echo "$$DJANGO_LOGGING_DEMO_MODELS" > logging_demo/models.py - @echo "$$DJANGO_LOGGING_DEMO_SETTINGS" >> $(DJANGO_SETTINGS_BASE_FILE) - @echo "$$DJANGO_LOGGING_DEMO_URLS" > logging_demo/urls.py - @echo "$$DJANGO_LOGGING_DEMO_VIEWS" > logging_demo/views.py - @echo "$$DJANGO_URLS_LOGGING_DEMO" >> $(DJANGO_URLS_FILE) - export APP_DIR="logging_demo"; $(MAKE) django-app-tests - -$(GIT_ADD) logging_demo/*.py - -$(GIT_ADD) logging_demo/migrations/*.py - -.PHONY: django-manage-py-default -django-manage-py-default: - @echo "$$DJANGO_MANAGE_PY" > manage.py - -$(GIT_ADD) manage.py - -.PHONY: django-migrate-default -django-migrate-default: - python manage.py migrate - -.PHONY: django-migrations-make-default -django-migrations-make-default: - python manage.py makemigrations - -.PHONY: django-migrations-show-default -django-migrations-show-default: - python manage.py showmigrations - -.PHONY: django-model-form-demo-default -django-model-form-demo-default: - python manage.py startapp model_form_demo - @echo "$$DJANGO_MODEL_FORM_DEMO_ADMIN" > model_form_demo/admin.py - @echo "$$DJANGO_MODEL_FORM_DEMO_FORMS" > model_form_demo/forms.py - @echo "$$DJANGO_MODEL_FORM_DEMO_MODEL" > model_form_demo/models.py - @echo "$$DJANGO_MODEL_FORM_DEMO_URLS" > model_form_demo/urls.py - @echo "$$DJANGO_MODEL_FORM_DEMO_VIEWS" > model_form_demo/views.py - $(ADD_DIR) model_form_demo/templates - @echo "$$DJANGO_MODEL_FORM_DEMO_TEMPLATE_DETAIL" > model_form_demo/templates/model_form_demo_detail.html - @echo "$$DJANGO_MODEL_FORM_DEMO_TEMPLATE_FORM" > model_form_demo/templates/model_form_demo_form.html - @echo "$$DJANGO_MODEL_FORM_DEMO_TEMPLATE_LIST" > model_form_demo/templates/model_form_demo_list.html - @echo "$$DJANGO_SETTINGS_MODEL_FORM_DEMO" >> $(DJANGO_SETTINGS_BASE_FILE) - @echo "$$DJANGO_URLS_MODEL_FORM_DEMO" >> $(DJANGO_URLS_FILE) - export APP_DIR="model_form_demo"; $(MAKE) django-app-tests - python manage.py makemigrations - -$(GIT_ADD) model_form_demo/*.py - -$(GIT_ADD) model_form_demo/templates - -$(GIT_ADD) model_form_demo/migrations - -.PHONY: django-offcanvas-template-default -django-offcanvas-template-default: - -$(ADD_DIR) backend/templates - @echo "$$DJANGO_FRONTEND_OFFCANVAS_TEMPLATE" > backend/templates/offcanvas.html - -$(GIT_ADD) backend/templates/offcanvas.html - -.PHONY: django-open-default -django-open-default: -ifeq ($(UNAME), Linux) - @echo "Opening on Linux." - xdg-open http://0.0.0.0:8000 -else ifeq ($(UNAME), Darwin) - @echo "Opening on macOS (Darwin)." - open http://0.0.0.0:8000 -else - @echo "Unable to open on: $(UNAME)" -endif - -.PHONY: django-payments-demo-default -django-payments-demo-default: - python manage.py startapp payments - @echo "$$DJANGO_PAYMENTS_FORM" > payments/forms.py - @echo "$$DJANGO_PAYMENTS_MODELS" > payments/models.py - @echo "$$DJANGO_PAYMENTS_ADMIN" > payments/admin.py - @echo "$$DJANGO_PAYMENTS_VIEW" > payments/views.py - @echo "$$DJANGO_PAYMENTS_URLS" > payments/urls.py - $(ADD_DIR) payments/templates/payments - $(ADD_DIR) payments/management/commands - @echo "$$DJANGO_PAYMENTS_TEMPLATE_CANCEL" > payments/templates/payments/cancel.html - @echo "$$DJANGO_PAYMENTS_TEMPLATE_CHECKOUT" > payments/templates/payments/checkout.html - @echo "$$DJANGO_PAYMENTS_TEMPLATE_SUCCESS" > payments/templates/payments/success.html - @echo "$$DJANGO_PAYMENTS_TEMPLATE_PRODUCT_LIST" > payments/templates/payments/product_list.html - @echo "$$DJANGO_PAYMENTS_TEMPLATE_PRODUCT_DETAIL" > payments/templates/payments/product_detail.html - @echo "$$DJANGO_SETTINGS_PAYMENTS" >> $(DJANGO_SETTINGS_BASE_FILE) - @echo "$$DJANGO_URLS_PAYMENTS" >> $(DJANGO_URLS_FILE) - export APP_DIR="payments"; $(MAKE) django-app-tests - python manage.py makemigrations payments - @echo "$$DJANGO_PAYMENTS_MIGRATION_0002" > payments/migrations/0002_set_stripe_api_keys.py - @echo "$$DJANGO_PAYMENTS_MIGRATION_0003" > payments/migrations/0003_create_initial_products.py - -$(GIT_ADD) payments/ - -.PHONY: django-project-default -django-project-default: - django-admin startproject backend . - -$(GIT_ADD) backend - -.PHONY: django-rest-serializers-default -django-rest-serializers-default: - @echo "$$DJANGO_API_SERIALIZERS" > backend/serializers.py - -$(GIT_ADD) backend/serializers.py - -.PHONY: django-rest-views-default -django-rest-views-default: - @echo "$$DJANGO_API_VIEWS" > backend/api.py - -$(GIT_ADD) backend/api.py - -.PHONY: django-search-default -django-search-default: - python manage.py startapp search - $(ADD_DIR) search/templates - @echo "$$DJANGO_SEARCH_TEMPLATE" > search/templates/search.html - @echo "$$DJANGO_SEARCH_FORMS" > search/forms.py - @echo "$$DJANGO_SEARCH_URLS" > search/urls.py - @echo "$$DJANGO_SEARCH_UTILS" > search/utils.py - @echo "$$DJANGO_SEARCH_VIEWS" > search/views.py - @echo "$$DJANGO_SEARCH_SETTINGS" >> $(DJANGO_SETTINGS_BASE_FILE) - @echo "INSTALLED_APPS.append('search')" >> $(DJANGO_SETTINGS_BASE_FILE) - @echo "urlpatterns += [path('search/', include('search.urls'))]" >> $(DJANGO_URLS_FILE) - -$(GIT_ADD) search/templates - -$(GIT_ADD) search/*.py - -.PHONY: django-secret-key-default -django-secret-key-default: - @python -c "from secrets import token_urlsafe; print(token_urlsafe(50))" - -.PHONY: django-serve-default -django-serve-default: - npm run watch & - python manage.py runserver 0.0.0.0:8000 - -.PHONY: django-settings-base-default -django-settings-base-default: - @echo "$$DJANGO_SETTINGS_BASE" >> $(DJANGO_SETTINGS_BASE_FILE) - @echo "$$DJANGO_SETTINGS_AUTHENTICATION_BACKENDS" >> $(DJANGO_SETTINGS_BASE_FILE) - @echo "$$DJANGO_SETTINGS_REST_FRAMEWORK" >> $(DJANGO_SETTINGS_BASE_FILE) - @echo "$$DJANGO_SETTINGS_THEMES" >> $(DJANGO_SETTINGS_BASE_FILE) - @echo "$$DJANGO_SETTINGS_DATABASE" >> $(DJANGO_SETTINGS_BASE_FILE) - @echo "$$DJANGO_SETTINGS_INSTALLED_APPS" >> $(DJANGO_SETTINGS_BASE_FILE) - @echo "$$DJANGO_SETTINGS_MIDDLEWARE" >> $(DJANGO_SETTINGS_BASE_FILE) - @echo "$$DJANGO_SETTINGS_CRISPY_FORMS" >> $(DJANGO_SETTINGS_BASE_FILE) - -.PHONY: django-settings-base-minimal-default -django-settings-base-minimal-default: - @echo "$$DJANGO_SETTINGS_BASE_MINIMAL" >> $(DJANGO_SETTINGS_BASE_FILE) - -.PHONY: django-settings-dev-default -django-settings-dev-default: - @echo "# $(PROJECT_NAME)" > $(DJANGO_SETTINGS_DEV_FILE) - @echo "$$DJANGO_SETTINGS_DEV" >> backend/settings/dev.py - -$(GIT_ADD) $(DJANGO_SETTINGS_DEV_FILE) - -.PHONY: django-settings-directory-default -django-settings-directory-default: - @$(ADD_DIR) $(DJANGO_SETTINGS_DIR) - @$(COPY_FILE) backend/settings.py backend/settings/base.py - @$(DEL_FILE) backend/settings.py - -$(GIT_ADD) backend/settings/*.py - -.PHONY: django-settings-prod-default -django-settings-prod-default: - @echo "$$DJANGO_SETTINGS_PROD" > $(DJANGO_SETTINGS_PROD_FILE) - -$(GIT_ADD) $(DJANGO_SETTINGS_PROD_FILE) - -.PHONY: django-shell-default -django-shell-default: - python manage.py shell - -.PHONY: django-siteuser-default -django-siteuser-default: - python manage.py startapp siteuser - $(ADD_DIR) siteuser/templates/ - @echo "$$DJANGO_SITEUSER_FORM" > siteuser/forms.py - @echo "$$DJANGO_SITEUSER_MODEL" > siteuser/models.py - @echo "$$DJANGO_SITEUSER_ADMIN" > siteuser/admin.py - @echo "$$DJANGO_SITEUSER_VIEW" > siteuser/views.py - @echo "$$DJANGO_SITEUSER_URLS" > siteuser/urls.py - @echo "$$DJANGO_SITEUSER_VIEW_TEMPLATE" > siteuser/templates/profile.html - @echo "$$DJANGO_SITEUSER_TEMPLATE" > siteuser/templates/user.html - @echo "$$DJANGO_SITEUSER_EDIT_TEMPLATE" > siteuser/templates/user_edit.html - @echo "$$DJANGO_URLS_SITEUSER" >> $(DJANGO_URLS_FILE) - @echo "$$DJANGO_SETTINGS_SITEUSER" >> $(DJANGO_SETTINGS_BASE_FILE) - export APP_DIR="siteuser"; $(MAKE) django-app-tests - -$(GIT_ADD) siteuser/templates - -$(GIT_ADD) siteuser/*.py - python manage.py makemigrations siteuser - -$(GIT_ADD) siteuser/migrations/*.py - -.PHONY: django-static-default -django-static-default: - python manage.py collectstatic --noinput - -.PHONY: django-su-default -django-su-default: - DJANGO_SUPERUSER_PASSWORD=admin python manage.py createsuperuser --noinput --username=admin --email=$(PROJECT_EMAIL) - -.PHONY: django-test-default -django-test-default: npm-install django-static - -$(MAKE) pip-install-test - python manage.py test - -.PHONY: django-urls-api-default -django-urls-api-default: - @echo "$$DJANGO_URLS_API" >> $(DJANGO_URLS_FILE) - -$(GIT_ADD) $(DJANGO_URLS_FILE) - -.PHONY: django-urls-debug-toolbar-default -django-urls-debug-toolbar-default: - @echo "$$DJANGO_URLS_DEBUG_TOOLBAR" >> $(DJANGO_URLS_FILE) - -.PHONY: django-urls-default -django-urls-default: - @echo "$$DJANGO_URLS" > $(DJANGO_URLS_FILE) - -$(GIT_ADD) $(DJANGO_URLS_FILE) - -.PHONY: django-urls-show-default -django-urls-show-default: - python manage.py show_urls - -.PHONY: django-user-default -django-user-default: - python manage.py shell -c "from django.contrib.auth.models import User; \ - User.objects.create_user('user', '', 'user')" - -.PHONY: django-utils-default -django-utils-default: - @echo "$$DJANGO_UTILS" > backend/utils.py - -$(GIT_ADD) backend/utils.py - -.PHONY: docker-build-default -docker-build-default: - podman build -t $(PROJECT_NAME) . - -.PHONY: docker-compose-default -docker-compose-default: - podman compose up - -.PHONY: docker-list-default -docker-list-default: - podman container list --all - podman images --all - -.PHONY: docker-run-default -docker-run-default: - podman run $(PROJECT_NAME) - -.PHONY: docker-serve-default -docker-serve-default: - podman run -p 8000:8000 $(PROJECT_NAME) - -.PHONY: docker-shell-default -docker-shell-default: - podman run -it $(PROJECT_NAME) /bin/bash - -.PHONY: eb-check-env-default -eb-check-env-default: # https://stackoverflow.com/a/4731504/185820 -ifndef EB_SSH_KEY - $(error EB_SSH_KEY is undefined) -endif -ifndef VPC_ID - $(error VPC_ID is undefined) -endif -ifndef VPC_SG - $(error VPC_SG is undefined) -endif -ifndef VPC_SUBNET_EC2 - $(error VPC_SUBNET_EC2 is undefined) -endif -ifndef VPC_SUBNET_ELB - $(error VPC_SUBNET_ELB is undefined) -endif - -.PHONY: eb-create-default -eb-create-default: aws-check-env eb-check-env - eb create $(EB_ENV_NAME) \ - -im $(EC2_INSTANCE_MIN) \ - -ix $(EC2_INSTANCE_MAX) \ - -ip $(EC2_INSTANCE_PROFILE) \ - -i $(EC2_INSTANCE_TYPE) \ - -k $(EB_SSH_KEY) \ - -p $(EB_PLATFORM) \ - --elb-type $(EC2_LB_TYPE) \ - --vpc \ - --vpc.id $(VPC_ID) \ - --vpc.elbpublic \ - --vpc.publicip \ - --vpc.ec2subnets $(VPC_SUBNET_EC2) \ - --vpc.elbsubnets $(VPC_SUBNET_ELB) \ - --vpc.securitygroups $(VPC_SG) - -.PHONY: eb-custom-env-default -eb-custom-env-default: - $(ADD_DIR) .ebextensions - @echo "$$EB_CUSTOM_ENV_EC2_USER" > .ebextensions/bash.config - -$(GIT_ADD) .ebextensions/bash.config - $(ADD_DIR) .platform/hooks/postdeploy - @echo "$$EB_CUSTOM_ENV_VAR_FILE" > .platform/hooks/postdeploy/setenv.sh - -$(GIT_ADD) .platform/hooks/postdeploy/setenv.sh - -.PHONY: eb-deploy-default -eb-deploy-default: - eb deploy - -.PHONY: eb-export-default -eb-export-default: - @if [ ! -d $(EB_DIR_NAME) ]; then \ - echo "Directory $(EB_DIR_NAME) does not exist"; \ - else \ - echo "Directory $(EB_DIR_NAME) does exist!"; \ - eb ssh --quiet -c "export PGPASSWORD=$(DJANGO_DB_PASS); pg_dump -U $(DJANGO_DB_USER) -h $(DJANGO_DB_HOST) $(DJANGO_DB_NAME)" > $(DJANGO_DB_NAME).sql; \ - echo "Wrote $(DJANGO_DB_NAME).sql"; \ - fi - -.PHONY: eb-restart-default -eb-restart-default: - eb ssh -c "systemctl restart web" - -.PHONY: eb-rebuild-default -eb-rebuild-default: - aws elasticbeanstalk rebuild-environment --environment-name $(ENV_NAME) - -.PHONY: eb-upgrade-default -eb-upgrade-default: - eb upgrade - -.PHONY: eb-init-default -eb-init-default: aws-check-env-profile - eb init --profile=$(AWS_PROFILE) - -.PHONY: eb-list-default -eb-list-platforms-default: - aws elasticbeanstalk list-platform-versions - -.PHONY: eb-list-databases-default -eb-list-databases-default: - @eb ssh --quiet -c "export PGPASSWORD=$(DJANGO_DB_PASS); psql -l -U $(DJANGO_DB_USER) -h $(DJANGO_DB_HOST) $(DJANGO_DB_NAME)" - -.PHONY: eb-logs-default -eb-logs-default: - eb logs - -.PHONY: eb-print-env-default -eb-print-env-default: - eb printenv - -.PHONY: favicon-default -favicon-init-default: - dd if=/dev/urandom bs=64 count=1 status=none | base64 | convert -size 16x16 -depth 8 -background none -fill white label:@- favicon.png - convert favicon.png favicon.ico - -$(GIT_ADD) favicon.ico - $(DEL_FILE) favicon.png - -.PHONY: git-ignore-default -git-ignore-default: - @echo "$$GIT_IGNORE" > .gitignore - -$(GIT_ADD) .gitignore - -.PHONY: git-branches-default -git-branches-default: - -for i in $(GIT_BRANCHES) ; do \ - -@$(GIT_CHECKOUT) -t $$i ; done - -.PHONY: git-commit-message-clean-default -git-commit-message-clean-default: - -@$(GIT_COMMIT) -a -m "Clean" - -.PHONY: git-commit-message-default -git-commit-message-default: - -@$(GIT_COMMIT) -a -m $(GIT_COMMIT_MSG) - -.PHONY: git-commit-message-empty-default -git-commit-message-empty-default: - -@$(GIT_COMMIT) --allow-empty -m "Empty-Commit" - -.PHONY: git-commit-message-init-default -git-commit-message-init-default: - -@$(GIT_COMMIT) -a -m "Init" - -.PHONY: git-commit-message-last-default -git-commit-message-last-default: - git log -1 --pretty=%B > $(TMPDIR)/commit.txt - -$(GIT_COMMIT) -a -F $(TMPDIR)/commit.txt - -.PHONY: git-commit-message-lint-default -git-commit-message-lint-default: - -@$(GIT_COMMIT) -a -m "Lint" - -.PHONY: git-commit-message-mk-default -git-commit-message-mk-default: - -@$(GIT_COMMIT) project.mk -m "Add/update $(MAKEFILE_CUSTOM_FILE)" - -.PHONY: git-commit-message-rename-default -git-commit-message-rename-default: - -@$(GIT_COMMIT) -a -m "Rename" - -.PHONY: git-commit-message-sort-default -git-commit-message-sort-default: - -@$(GIT_COMMIT) -a -m "Sort" - -.PHONY: git-push-default -git-push-default: - -@$(GIT_PUSH) - -.PHONY: git-push-force-default -git-push-force-default: - -@$(GIT_PUSH_FORCE) - -.PHONY: git-commit-edit-default -git-commit-edit-default: - -$(GIT_COMMIT) -a - -.PHONY: git-prune-default -git-prune-default: - git remote update origin --prune - -.PHONY: git-set-upstream-default -git-set-upstream-default: - git push --set-upstream origin main - -.PHONY: git-set-default-default -git-set-default-default: - gh repo set-default - -.PHONY: git-short-default -git-short-default: - @echo $(GIT_REV) - -.PHONY: help-default -help-default: - @echo "Project Makefile 🤷" - @echo "Usage: make [options] [target] ..." - @echo "Examples:" - @echo " make help Print this message" - @echo " make list-defines list all defines in the Makefile" - @echo " make list-commands list all targets in the Makefile" - -.PHONY: jenkins-init-default -jenkins-init-default: - @echo "$$JENKINS_FILE" > Jenkinsfile - -.PHONY: makefile-list-commands-default -makefile-list-commands-default: - @for makefile in $(MAKEFILE_LIST); do \ - echo "Commands from $$makefile:"; \ - $(MAKE) -pRrq -f $$makefile : 2>/dev/null | \ - awk -v RS= -F: '/^# File/,/^# Finished Make data base/ { \ - if ($$1 !~ "^[#.]") { sub(/-default$$/, "", $$1); print $$1 } }' | \ - egrep -v -e '^[^[:alnum:]]' -e '^$@$$' | \ - tr ' ' '\n' | \ - sort | \ - awk '{print $$0}' ; \ - echo; \ - done | $(PAGER) - -.PHONY: makefile-list-defines-default -makefile-list-defines-default: - @grep '^define [A-Za-z_][A-Za-z0-9_]*' Makefile - -.PHONY: makefile-list-exports-default -makefile-list-exports-default: - @grep '^export [A-Z][A-Z_]*' Makefile - -.PHONY: makefile-list-targets-default -makefile-list-targets-default: - @perl -ne 'print if /^\s*\.PHONY:/ .. /^[a-zA-Z0-9_-]+:/;' Makefile | grep -v .PHONY - -.PHONY: make-default -make-default: - -$(GIT_ADD) Makefile - -$(GIT_COMMIT) Makefile -m "Add/update project-makefile files" - -git push - -.PHONY: npm-init-default -npm-init-default: - npm init -y - -$(GIT_ADD) package.json - -$(GIT_ADD) package-lock.json - -.PHONY: npm-build-default -npm-build-default: - npm run build - -.PHONY: npm-install-default -npm-install-default: - npm install - -$(GIT_ADD) package-lock.json - -.PHONY: npm-install-django-default -npm-install-django-default: - npm install \ - @fortawesome/fontawesome-free \ - @fortawesome/fontawesome-svg-core \ - @fortawesome/free-brands-svg-icons \ - @fortawesome/free-solid-svg-icons \ - @fortawesome/react-fontawesome \ - bootstrap \ - camelize \ - date-fns \ - history \ - mapbox-gl \ - query-string \ - react-animate-height \ - react-chartjs-2 \ - react-copy-to-clipboard \ - react-date-range \ - react-dom \ - react-dropzone \ - react-hook-form \ - react-image-crop \ - react-map-gl \ - react-modal \ - react-resize-detector \ - react-select \ - react-swipeable \ - snakeize \ - striptags \ - url-join \ - viewport-mercator-project - -.PHONY: npm-install-django-dev-default -npm-install-django-dev-default: - npm install \ - eslint-plugin-react \ - eslint-config-standard \ - eslint-config-standard-jsx \ - @babel/core \ - @babel/preset-env \ - @babel/preset-react \ - --save-dev - -.PHONY: npm-serve-default -npm-serve-default: - npm run start - -.PHONY: npm-test-default -npm-test-default: - npm run test - -.PHONY: pip-deps-default -pip-deps-default: - $(PIP_ENSURE) - python -m pip install pipdeptree - python -m pipdeptree - pipdeptree - -.PHONY: pip-freeze-default -pip-freeze-default: - $(PIP_ENSURE) - python -m pip freeze | sort > $(TMPDIR)/requirements.txt - mv -f $(TMPDIR)/requirements.txt . - -$(GIT_ADD) requirements.txt - -.PHONY: pip-init-default -pip-init-default: - touch requirements.txt - -$(GIT_ADD) requirements.txt - -.PHONY: pip-init-test-default -pip-init-test-default: - @echo "$$PIP_INSTALL_REQUIREMENTS_TEST" > requirements-test.txt - -$(GIT_ADD) requirements-test.txt - -.PHONY: pip-install-default -pip-install-default: - $(PIP_ENSURE) - $(MAKE) pip-upgrade - python -m pip install wheel - python -m pip install -r requirements.txt - -.PHONY: pip-install-dev-default -pip-install-dev-default: - $(PIP_ENSURE) - python -m pip install -r requirements-dev.txt - -.PHONY: pip-install-test-default -pip-install-test-default: - $(PIP_ENSURE) - python -m pip install -r requirements-test.txt - -.PHONY: pip-install-upgrade-default -pip-install-upgrade-default: - cat requirements.txt | awk -F\= '{print $$1}' > $(TMPDIR)/requirements.txt - mv -f $(TMPDIR)/requirements.txt . - $(PIP_ENSURE) - python -m pip install -U -r requirements.txt - python -m pip freeze | sort > $(TMPDIR)/requirements.txt - mv -f $(TMPDIR)/requirements.txt . - -.PHONY: pip-upgrade-default -pip-upgrade-default: - $(PIP_ENSURE) - python -m pip install -U pip - -.PHONY: pip-uninstall-default -pip-uninstall-default: - $(PIP_ENSURE) - python -m pip freeze | xargs python -m pip uninstall -y - -.PHONY: plone-clean-default -plone-clean-default: - $(DEL_DIR) $(PROJECT_NAME) - $(DEL_DIR) $(PACKAGE_NAME) - -.PHONY: plone-init-default -plone-init-default: git-ignore plone-install plone-instance plone-serve - -.PHONY: plone-install-default -plone-install-default: - $(PIP_ENSURE) - python -m pip install plone -c $(PIP_INSTALL_PLONE_CONSTRAINTS) - -.PHONY: plone-instance-default -plone-instance-default: - mkwsgiinstance -d backend -u admin:admin - cat backend/etc/zope.ini | sed -e 's/host = 127.0.0.1/host = 0.0.0.0/; s/port = 8080/port = 8000/' > $(TMPDIR)/zope.ini - mv -f $(TMPDIR)/zope.ini backend/etc/zope.ini - -$(GIT_ADD) backend/etc/site.zcml - -$(GIT_ADD) backend/etc/zope.conf - -$(GIT_ADD) backend/etc/zope.ini - -.PHONY: plone-serve-default -plone-serve-default: - runwsgi backend/etc/zope.ini - -.PHONY: plone-build-default -plone-build-default: - buildout - -.PHONY: programming-interview-default -programming-interview-default: - @echo "$$PROGRAMMING_INTERVIEW" > interview.py - @echo "Created interview.py!" - -@$(GIT_ADD) interview.py > /dev/null 2>&1 - -# .NOT_PHONY! -$(MAKEFILE_CUSTOM_FILE): - @echo "$$MAKEFILE_CUSTOM" > $(MAKEFILE_CUSTOM_FILE) - -$(GIT_ADD) $(MAKEFILE_CUSTOM_FILE) - -.PHONY: python-license-default -python-license-default: - @echo "$(PYTHON_LICENSE_TXT)" > LICENSE.txt - -$(GIT_ADD) LICENSE.txt - -.PHONY: python-project-default -python-project-default: - @echo "$(PYTHON_PROJECT_TOML)" > pyproject.toml - -$(GIT_ADD) pyproject.toml - -.PHONY: python-serve-default -python-serve-default: - @echo "\n\tServing HTTP on http://0.0.0.0:8000\n" - python3 -m http.server - -.PHONY: python-sdist-default -python-sdist-default: - $(PIP_ENSURE) - python setup.py sdist --format=zip - -.PHONY: python-webpack-init-default -python-webpack-init-default: - python manage.py webpack_init --no-input - -.PHONY: python-ci-default -python-ci-default: - $(ADD_DIR) .github/workflows - @echo "$(PYTHON_CI_YAML)" > .github/workflows/build_wheels.yml - -$(GIT_ADD) .github/workflows/build_wheels.yml - -.PHONY: rand-default -rand-default: - @openssl rand -base64 12 | sed 's/\///g' - -.PHONY: readme-init-default -readme-init-default: - @echo "# $(PROJECT_NAME)" > README.md - -$(GIT_ADD) README.md - -.PHONY: readme-edit-default -readme-edit-default: - $(EDITOR) README.md - -.PHONY: reveal-init-default -reveal-init-default: webpack-init-reveal - npm install \ - css-loader \ - mini-css-extract-plugin \ - reveal.js \ - style-loader - jq '.scripts += {"build": "webpack"}' package.json > \ - $(TMPDIR)/tmp.json && mv $(TMPDIR)/tmp.json package.json - jq '.scripts += {"start": "webpack serve --mode development --port 8000 --static"}' package.json > \ - $(TMPDIR)/tmp.json && mv $(TMPDIR)/tmp.json package.json - jq '.scripts += {"watch": "webpack watch --mode development"}' package.json > \ - $(TMPDIR)/tmp.json && mv $(TMPDIR)/tmp.json package.json - -.PHONY: reveal-serve-default -reveal-serve-default: - npm run watch & - python -m http.server - -.PHONY: review-default -review-default: -ifeq ($(UNAME), Darwin) - $(EDITOR_REVIEW) `find backend/ -name \*.py` `find backend/ -name \*.html` `find frontend/ -name \*.js` `find frontend/ -name \*.js` -else - @echo "Unsupported" -endif - -.PHONY: separator-default -separator-default: - @echo "$$SEPARATOR" - -.PHONY: sphinx-init-default -sphinx-init-default: sphinx-install - sphinx-quickstart -q -p $(PROJECT_NAME) -a $(USER) -v 0.0.1 $(RANDIR) - $(COPY_DIR) $(RANDIR)/* . - $(DEL_DIR) $(RANDIR) - -$(GIT_ADD) index.rst - -$(GIT_ADD) conf.py - $(DEL_FILE) make.bat - -@$(GIT_CHECKOUT) Makefile - $(MAKE) git-ignore - -.PHONY: sphinx-theme-init-default -sphinx-theme-init-default: - export DJANGO_FRONTEND_THEME_NAME=$(PROJECT_NAME)_theme; \ - $(ADD_DIR) $$DJANGO_FRONTEND_THEME_NAME ; \ - $(ADD_FILE) $$DJANGO_FRONTEND_THEME_NAME/__init__.py ; \ - -$(GIT_ADD) $$DJANGO_FRONTEND_THEME_NAME/__init__.py ; \ - $(ADD_FILE) $$DJANGO_FRONTEND_THEME_NAME/theme.conf ; \ - -$(GIT_ADD) $$DJANGO_FRONTEND_THEME_NAME/theme.conf ; \ - $(ADD_FILE) $$DJANGO_FRONTEND_THEME_NAME/layout.html ; \ - -$(GIT_ADD) $$DJANGO_FRONTEND_THEME_NAME/layout.html ; \ - $(ADD_DIR) $$DJANGO_FRONTEND_THEME_NAME/static/css ; \ - $(ADD_FILE) $$DJANGO_FRONTEND_THEME_NAME/static/css/style.css ; \ - $(ADD_DIR) $$DJANGO_FRONTEND_THEME_NAME/static/js ; \ - $(ADD_FILE) $$DJANGO_FRONTEND_THEME_NAME/static/js/script.js ; \ - -$(GIT_ADD) $$DJANGO_FRONTEND_THEME_NAME/static - -.PHONY: sphinx-install-default -sphinx-install-default: - echo "Sphinx\n" > requirements.txt - @$(MAKE) pip-install - @$(MAKE) pip-freeze - -$(GIT_ADD) requirements.txt - -.PHONY: sphinx-build-default -sphinx-build-default: - sphinx-build -b html -d _build/doctrees . _build/html - sphinx-build -b rinoh . _build/rinoh - -.PHONY: sphinx-serve-default -sphinx-serve-default: - cd _build/html;python3 -m http.server - -.PHONY: wagtail-base-template-default -wagtail-base-template-default: - @echo "$$WAGTAIL_BASE_TEMPLATE" > backend/templates/base.html - -.PHONY: wagtail-clean-default -wagtail-clean-default: - -@for dir in $(shell echo "$(WAGTAIL_CLEAN_DIRS)"); do \ - echo "Cleaning $$dir"; \ - $(DEL_DIR) $$dir >/dev/null 2>&1; \ - done - -@for file in $(shell echo "$(WAGTAIL_CLEAN_FILES)"); do \ - echo "Cleaning $$file"; \ - $(DEL_FILE) $$file >/dev/null 2>&1; \ - done - -.PHONY: wagtail-contactpage-default -wagtail-contactpage-default: - python manage.py startapp contactpage - @echo "$$WAGTAIL_CONTACT_PAGE_MODEL" > contactpage/models.py - @echo "$$WAGTAIL_CONTACT_PAGE_TEST" > contactpage/tests.py - $(ADD_DIR) contactpage/templates/contactpage/ - @echo "$$WAGTAIL_CONTACT_PAGE_TEMPLATE" > contactpage/templates/contactpage/contact_page.html - @echo "$$WAGTAIL_CONTACT_PAGE_LANDING" > contactpage/templates/contactpage/contact_page_landing.html - @echo "INSTALLED_APPS.append('contactpage')" >> $(DJANGO_SETTINGS_BASE_FILE) - python manage.py makemigrations contactpage - -$(GIT_ADD) contactpage/templates - -$(GIT_ADD) contactpage/*.py - -$(GIT_ADD) contactpage/migrations/*.py - -.PHONY: wagtail-header-prefix-template-default -wagtail-header-prefix-template-default: - @echo "$$WAGTAIL_HEADER_PREFIX" > backend/templates/header.html - -.PHONY: wagtail-home-default -wagtail-home-default: - @echo "$$WAGTAIL_HOME_PAGE_MODEL" > home/models.py - @echo "$$WAGTAIL_HOME_PAGE_TEMPLATE" > home/templates/home/home_page.html - $(ADD_DIR) home/templates/blocks - @echo "$$WAGTAIL_BLOCK_MARKETING" > home/templates/blocks/marketing_block.html - @echo "$$WAGTAIL_BLOCK_CAROUSEL" > home/templates/blocks/carousel_block.html - -$(GIT_ADD) home/templates - -$(GIT_ADD) home/*.py - python manage.py makemigrations home - -$(GIT_ADD) home/migrations/*.py - -.PHONY: wagtail-install-default -wagtail-install-default: - $(PIP_ENSURE) - python -m pip install \ - wagtail \ - wagtailmenus \ - wagtail-color-panel \ - wagtail-django-recaptcha \ - wagtail-markdown \ - wagtail-modeladmin \ - wagtail-seo \ - weasyprint \ - whitenoise \ - xhtml2pdf - -.PHONY: wagtail-private-default -wagtail-privacy-default: - python manage.py startapp privacy - @echo "$$WAGTAIL_PRIVACY_PAGE_MODEL" > privacy/models.py - $(ADD_DIR) privacy/templates - @echo "$$WAGTAIL_PRIVACY_PAGE_TEMPLATE" > privacy/templates/privacy_page.html - @echo "INSTALLED_APPS.append('privacy')" >> $(DJANGO_SETTINGS_BASE_FILE) - python manage.py makemigrations privacy - -$(GIT_ADD) privacy/templates - -$(GIT_ADD) privacy/*.py - -$(GIT_ADD) privacy/migrations/*.py - -.PHONY: wagtail-project-default -wagtail-project-default: - wagtail start backend . - $(DEL_FILE) home/templates/home/welcome_page.html - -$(GIT_ADD) backend/ - -$(GIT_ADD) .dockerignore - -$(GIT_ADD) Dockerfile - -$(GIT_ADD) manage.py - -$(GIT_ADD) requirements.txt - -.PHONY: wagtail-search-default -wagtail-search-default: - @echo "$$WAGTAIL_SEARCH_TEMPLATE" > search/templates/search/search.html - @echo "$$WAGTAIL_SEARCH_URLS" > search/urls.py - -$(GIT_ADD) search/templates - -$(GIT_ADD) search/*.py - -.PHONY: wagtail-settings-default -wagtail-settings-default: - @echo "$$WAGTAIL_SETTINGS" >> $(DJANGO_SETTINGS_BASE_FILE) - -.PHONY: wagtail-sitepage-default -wagtail-sitepage-default: - python manage.py startapp sitepage - @echo "$$WAGTAIL_SITEPAGE_MODEL" > sitepage/models.py - $(ADD_DIR) sitepage/templates/sitepage/ - @echo "$$WAGTAIL_SITEPAGE_TEMPLATE" > sitepage/templates/sitepage/site_page.html - @echo "INSTALLED_APPS.append('sitepage')" >> $(DJANGO_SETTINGS_BASE_FILE) - python manage.py makemigrations sitepage - -$(GIT_ADD) sitepage/templates - -$(GIT_ADD) sitepage/*.py - -$(GIT_ADD) sitepage/migrations/*.py - -.PHONY: wagtail-urls-default -wagtail-urls-default: - @echo "$$WAGTAIL_URLS" > $(DJANGO_URLS_FILE) - -.PHONY: wagtail-urls-home-default -wagtail-urls-home-default: - @echo "$$WAGTAIL_URLS_HOME" >> $(DJANGO_URLS_FILE) - -.PHONY: webpack-init-default -webpack-init-default: npm-init - @echo "$$WEBPACK_CONFIG_JS" > webpack.config.js - -$(GIT_ADD) webpack.config.js - npm install --save-dev webpack webpack-cli webpack-dev-server - $(ADD_DIR) src/ - @echo "$$WEBPACK_INDEX_JS" > src/index.js - -$(GIT_ADD) src/index.js - @echo "$$WEBPACK_INDEX_HTML" > index.html - -$(GIT_ADD) index.html - $(MAKE) git-ignore - -.PHONY: webpack-init-reveal-default -webpack-init-reveal-default: npm-init - @echo "$$WEBPACK_REVEAL_CONFIG_JS" > webpack.config.js - -$(GIT_ADD) webpack.config.js - npm install --save-dev webpack webpack-cli webpack-dev-server - $(ADD_DIR) src/ - @echo "$$WEBPACK_REVEAL_INDEX_JS" > src/index.js - -$(GIT_ADD) src/index.js - @echo "$$WEBPACK_REVEAL_INDEX_HTML" > index.html - -$(GIT_ADD) index.html - $(MAKE) git-ignore - -# -------------------------------------------------------------------------------- -# Single-line phony target rules -# -------------------------------------------------------------------------------- - -.PHONY: aws-check-env-default -aws-check-env-default: aws-check-env-profile aws-check-env-region - -.PHONY: ce-default -ce-default: git-commit-edit git-push - -.PHONY: clean-default -clean-default: wagtail-clean - -.PHONY: cp-default -cp-default: git-commit-message git-push - -.PHONY: db-dump-default -db-dump-default: eb-export - -.PHONY: dbshell-default -dbshell-default: django-db-shell - -.PHONY: deploy-default -deploy-default: eb-deploy - -.PHONY: d-default -d-default: eb-deploy - -.PHONY: deps-default -deps-default: pip-deps - -.PHONY: e-default -e-default: edit - -.PHONY: edit-default -edit-default: readme-edit - -.PHONY: empty-default -empty-default: git-commit-message-empty git-push - -.PHONY: fp-default -fp-default: git-push-force - -.PHONY: freeze-default -freeze-default: pip-freeze git-push - -.PHONY: git-commit-default -git-commit-default: git-commit-message git-push - -.PHONY: git-commit-clean-default -git-commit-clean-default: git-commit-message-clean git-push - -.PHONY: git-commit-init-default -git-commit-init-default: git-commit-message-init git-push - -.PHONY: git-commit-lint-default -git-commit-lint-default: git-commit-message-lint git-push - -.PHONY: gitignore-default -gitignore-default: git-ignore - -.PHONY: h-default -h-default: help - -.PHONY: init-default -init-default: django-init-wagtail django-serve - -.PHONY: init-wagtail-default -init-wagtail-default: django-init-wagtail - -.PHONY: install-default -install-default: pip-install - -.PHONY: l-default -l-default: makefile-list-commands - -.PHONY: last-default -last-default: git-commit-message-last git-push - -.PHONY: lint-default -lint-default: django-lint - -.PHONY: list-commands-default -list-commands-default: makefile-list-commands - -.PHONY: list-defines-default -list-defines-default: makefile-list-defines - -.PHONY: list-exports-default -list-exports-default: makefile-list-exports - -.PHONY: list-targets-default -list-targets-default: makefile-list-targets - -.PHONY: migrate-default -migrate-default: django-migrate - -.PHONY: migrations-default -migrations-default: django-migrations-make - -.PHONY: migrations-show-default -migrations-show-default: django-migrations-show - -.PHONY: mk-default -mk-default: project.mk git-commit-message-mk git-push - -.PHONY: open-default -open-default: django-open - -.PHONY: o-default -o-default: django-open - -.PHONY: readme-default -readme-default: readme-init - -.PHONY: rename-default -rename-default: git-commit-message-rename git-push - -.PHONY: s-default -s-default: django-serve - -.PHONY: shell-default -shell-default: django-shell - -.PHONY: serve-default -serve-default: django-serve - -.PHONY: static-default -static-default: django-static - -.PHONY: sort-default -sort-default: git-commit-message-sort git-push - -.PHONY: su-default -su-default: django-su - -.PHONY: test-default -test-default: django-test - -.PHONY: t-default -t-default: django-test - -.PHONY: u-default -u-default: help - -.PHONY: urls-default -urls-default: django-urls-show - -# -------------------------------------------------------------------------------- -# Allow customizing rules defined in this Makefile with rules defined in -# $(MAKEFILE_CUSTOM_FILE) -# -------------------------------------------------------------------------------- - -%: %-default # https://stackoverflow.com/a/49804748 - @ true +.DEFAULT_GOAL := help + +.PHONY: clean +clean: + rm src/PIL/*.so || true + rm -r build || true + find . -name __pycache__ | xargs rm -r || true + +.PHONY: coverage +coverage: + python3 -c "import pytest" > /dev/null 2>&1 || python3 -m pip install pytest + python3 -m pytest -qq + rm -r htmlcov || true + python3 -c "import coverage" > /dev/null 2>&1 || python3 -m pip install coverage + python3 -m coverage report + +.PHONY: doc +.PHONY: html +doc html: + python3 -c "import PIL" > /dev/null 2>&1 || python3 -m pip install . + $(MAKE) -C docs html + +.PHONY: htmlview +htmlview: + python3 -c "import PIL" > /dev/null 2>&1 || python3 -m pip install . + $(MAKE) -C docs htmlview + +.PHONY: doccheck +doccheck: + $(MAKE) doc +# Don't make our tests rely on the links in the docs being up every single build. +# We don't control them. But do check, and update them to the target of their redirects. + $(MAKE) -C docs linkcheck || true + +.PHONY: docserve +docserve: + cd docs/_build/html && python3 -m http.server 2> /dev/null& + +.PHONY: help +help: + @echo "Welcome to Pillow development. Please use \`make \` where is one of" + @echo " clean remove build products" + @echo " coverage run coverage test (in progress)" + @echo " doc make HTML docs" + @echo " docserve run an HTTP server on the docs directory" + @echo " html make HTML docs" + @echo " htmlview open the index page built by the html target in your browser" + @echo " install make and install" + @echo " install-coverage make and install with C coverage" + @echo " lint run the lint checks" + @echo " lint-fix run Ruff to (mostly) fix lint issues" + @echo " release-test run code and package tests before release" + @echo " test run tests on installed Pillow" + +.PHONY: install +install: + python3 -m pip -v install . + python3 selftest.py + +.PHONY: install-coverage +install-coverage: + CFLAGS="-coverage -Werror=implicit-function-declaration" python3 -m pip -v install . + python3 selftest.py + +.PHONY: debug +debug: +# make a debug version if we don't have a -dbg python. Leaves in symbols +# for our stuff, kills optimization, and redirects to dev null so we +# see any build failures. + make clean > /dev/null + CFLAGS='-g -O0' python3 -m pip -v install . > /dev/null + +.PHONY: release-test +release-test: + python3 Tests/check_release_notes.py + python3 -m pip install -e .[tests] + python3 selftest.py + python3 -m pytest Tests + python3 -m pip install . + python3 -m pytest -qq + python3 -m check_manifest + python3 -m pyroma . + $(MAKE) readme + +.PHONY: sdist +sdist: + python3 -m build --help > /dev/null 2>&1 || python3 -m pip install build + python3 -m build --sdist + python3 -m twine --help > /dev/null 2>&1 || python3 -m pip install twine + python3 -m twine check --strict dist/* + +.PHONY: test +test: + python3 -c "import pytest" > /dev/null 2>&1 || python3 -m pip install pytest + python3 -m pytest -qq + +.PHONY: valgrind +valgrind: + python3 -c "import pytest_valgrind" > /dev/null 2>&1 || python3 -m pip install pytest-valgrind + PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss-fuzz/python.supp --leak-check=no \ + --log-file=/tmp/valgrind-output \ + python3 -m pytest --no-memcheck -vv --valgrind --valgrind-log=/tmp/valgrind-output + +.PHONY: readme +readme: + python3 -c "import markdown2" > /dev/null 2>&1 || python3 -m pip install markdown2 + python3 -m markdown2 README.md > .long-description.html && open .long-description.html + + +.PHONY: lint +lint: + python3 -c "import tox" > /dev/null 2>&1 || python3 -m pip install tox + python3 -m tox -e lint + +.PHONY: lint-fix +lint-fix: + python3 -c "import black" > /dev/null 2>&1 || python3 -m pip install black + python3 -m black . + python3 -c "import ruff" > /dev/null 2>&1 || python3 -m pip install ruff + python3 -m ruff --fix . + +.PHONY: mypy +mypy: + python3 -c "import tox" > /dev/null 2>&1 || python3 -m pip install tox + python3 -m tox -e mypy From d49ea378115f4ae32e12f1f0c3e6146ebdc68fe0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 22 Aug 2024 17:50:42 +1000 Subject: [PATCH 288/662] Include limit in error message --- Tests/test_file_webp.py | 4 +++- src/_webp.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index ad08da364..a86757e64 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -163,7 +163,9 @@ class TestFileWebp: im = Image.new("L", (16384, 16384)) with pytest.raises(ValueError) as e: im.save(temp_file) - assert str(e.value) == "encoding error 5: Image size exceeds WebP limit" + assert ( + str(e.value) == "encoding error 5: Image size exceeds WebP limit of 16383" + ) def test_WebPEncode_with_invalid_args(self) -> None: """ diff --git a/src/_webp.c b/src/_webp.c index 0d2d6f023..c0e1a6f63 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -673,9 +673,11 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) { WebPPictureFree(&pic); if (!ok) { int error_code = (&pic)->error_code; - const char *message = ""; + char message[50] = ""; if (error_code == VP8_ENC_ERROR_BAD_DIMENSION) { - message = ": Image size exceeds WebP limit"; + sprintf( + message, ": Image size exceeds WebP limit of %d", WEBP_MAX_DIMENSION + ); } PyErr_Format(PyExc_ValueError, "encoding error %d%s", error_code, message); return NULL; From fed916825290cb1f45610017993c82ccca2b7843 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 23 Aug 2024 18:48:28 +1000 Subject: [PATCH 289/662] Catch defusedxml warnings --- Tests/test_file_webp_metadata.py | 10 +++++++++- Tests/test_image.py | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Tests/test_file_webp_metadata.py b/Tests/test_file_webp_metadata.py index 4ef3d95f2..d9a834c75 100644 --- a/Tests/test_file_webp_metadata.py +++ b/Tests/test_file_webp_metadata.py @@ -116,7 +116,15 @@ def test_read_no_exif() -> None: def test_getxmp() -> None: with Image.open("Tests/images/flower.webp") as im: assert "xmp" not in im.info - assert im.getxmp() == {} + if ElementTree is None: + with pytest.warns( + UserWarning, + match="XMP data cannot be read without defusedxml dependency", + ): + xmp = im.getxmp() + else: + xmp = im.getxmp() + assert xmp == {} with Image.open("Tests/images/flower2.webp") as im: if ElementTree is None: diff --git a/Tests/test_image.py b/Tests/test_image.py index 719732d12..b1ecc6184 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -938,7 +938,15 @@ class TestImage: def test_empty_xmp(self) -> None: with Image.open("Tests/images/hopper.gif") as im: - assert im.getxmp() == {} + if ElementTree is None: + with pytest.warns( + UserWarning, + match="XMP data cannot be read without defusedxml dependency", + ): + xmp = im.getxmp() + else: + xmp = im.getxmp() + assert xmp == {} def test_getxmp_padded(self) -> None: im = Image.new("RGB", (1, 1)) From e382ebed3ad757567ce8522c41a6c704c68c16a1 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 23 Aug 2024 19:38:07 +1000 Subject: [PATCH 290/662] Remove warning if NumPy failed to raise an error during conversion --- Tests/test_image_array.py | 2 +- src/PIL/Image.py | 24 ++++++------------------ 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/Tests/test_image_array.py b/Tests/test_image_array.py index bb6064882..38425a515 100644 --- a/Tests/test_image_array.py +++ b/Tests/test_image_array.py @@ -47,7 +47,7 @@ def test_toarray() -> None: with pytest.raises(OSError): numpy.array(im_truncated) else: - with pytest.warns(UserWarning): + with pytest.warns(DeprecationWarning): numpy.array(im_truncated) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index a6eefff56..2f1a878c1 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -724,24 +724,12 @@ class Image: def __array_interface__(self) -> dict[str, str | bytes | int | tuple[int, ...]]: # numpy array interface support new: dict[str, str | bytes | int | tuple[int, ...]] = {"version": 3} - try: - if self.mode == "1": - # Binary images need to be extended from bits to bytes - # See: https://github.com/python-pillow/Pillow/issues/350 - new["data"] = self.tobytes("raw", "L") - else: - new["data"] = self.tobytes() - except Exception as e: - if not isinstance(e, (MemoryError, RecursionError)): - try: - import numpy - from packaging.version import parse as parse_version - except ImportError: - pass - else: - if parse_version(numpy.__version__) < parse_version("1.23"): - warnings.warn(str(e)) - raise + if self.mode == "1": + # Binary images need to be extended from bits to bytes + # See: https://github.com/python-pillow/Pillow/issues/350 + new["data"] = self.tobytes("raw", "L") + else: + new["data"] = self.tobytes() new["shape"], new["typestr"] = _conv_type_shape(self) return new From 6e9518b88de595c56a955a20a7359ff93a7e9668 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 24 Aug 2024 19:18:25 +1000 Subject: [PATCH 291/662] Added type hint to example code --- src/PIL/Image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index ffc6bec34..37d8cb335 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1917,7 +1917,7 @@ class Image: object:: class Example(Image.ImagePointHandler): - def point(self, data): + def point(self, im: Image) -> Image: # Return result :param mode: Output mode (default is same as input). This can only be used if the source image has mode "L" or "P", and the output has mode "1" or the From 8aa58e320fd2dde581325c63d1673d6a2e3648f4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 24 Aug 2024 21:25:41 +1000 Subject: [PATCH 292/662] Rename _E to ImagePointTransform --- docs/reference/Image.rst | 2 +- src/PIL/Image.py | 48 ++++++++++++++++++++++++---------------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/docs/reference/Image.rst b/docs/reference/Image.rst index 02e714f20..bc3758218 100644 --- a/docs/reference/Image.rst +++ b/docs/reference/Image.rst @@ -362,8 +362,8 @@ Classes :undoc-members: :show-inheritance: .. autoclass:: PIL.Image.ImagePointHandler +.. autoclass:: PIL.Image.ImagePointTransform .. autoclass:: PIL.Image.ImageTransformHandler -.. autoclass:: PIL.Image._E Protocols --------- diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 37d8cb335..5aa49b619 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -470,43 +470,53 @@ def _getencoder( # Simple expression analyzer -class _E: +class ImagePointTransform: + """ + Used with :py:meth:`~PIL.Image.Image.point` for single band images with more than + 8 bits, this represents an affine transformation, where the value is multiplied by + ``scale`` and ``offset`` is added. + """ + def __init__(self, scale: float, offset: float) -> None: self.scale = scale self.offset = offset - def __neg__(self) -> _E: - return _E(-self.scale, -self.offset) + def __neg__(self) -> ImagePointTransform: + return ImagePointTransform(-self.scale, -self.offset) - def __add__(self, other: _E | float) -> _E: - if isinstance(other, _E): - return _E(self.scale + other.scale, self.offset + other.offset) - return _E(self.scale, self.offset + other) + def __add__(self, other: ImagePointTransform | float) -> ImagePointTransform: + if isinstance(other, ImagePointTransform): + return ImagePointTransform( + self.scale + other.scale, self.offset + other.offset + ) + return ImagePointTransform(self.scale, self.offset + other) __radd__ = __add__ - def __sub__(self, other: _E | float) -> _E: + def __sub__(self, other: ImagePointTransform | float) -> ImagePointTransform: return self + -other - def __rsub__(self, other: _E | float) -> _E: + def __rsub__(self, other: ImagePointTransform | float) -> ImagePointTransform: return other + -self - def __mul__(self, other: _E | float) -> _E: - if isinstance(other, _E): + def __mul__(self, other: ImagePointTransform | float) -> ImagePointTransform: + if isinstance(other, ImagePointTransform): return NotImplemented - return _E(self.scale * other, self.offset * other) + return ImagePointTransform(self.scale * other, self.offset * other) __rmul__ = __mul__ - def __truediv__(self, other: _E | float) -> _E: - if isinstance(other, _E): + def __truediv__(self, other: ImagePointTransform | float) -> ImagePointTransform: + if isinstance(other, ImagePointTransform): return NotImplemented - return _E(self.scale / other, self.offset / other) + return ImagePointTransform(self.scale / other, self.offset / other) -def _getscaleoffset(expr: Callable[[_E], _E | float]) -> tuple[float, float]: - a = expr(_E(1, 0)) - return (a.scale, a.offset) if isinstance(a, _E) else (0, a) +def _getscaleoffset( + expr: Callable[[ImagePointTransform], ImagePointTransform | float] +) -> tuple[float, float]: + a = expr(ImagePointTransform(1, 0)) + return (a.scale, a.offset) if isinstance(a, ImagePointTransform) else (0, a) # -------------------------------------------------------------------- @@ -1898,7 +1908,7 @@ class Image: Sequence[float] | NumpyArray | Callable[[int], float] - | Callable[[_E], _E | float] + | Callable[[ImagePointTransform], ImagePointTransform | float] | ImagePointHandler ), mode: str | None = None, From 658b60e3a33d6bf4e3ff3a2053cb73faa466772d Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Sat, 24 Aug 2024 21:26:56 +1000 Subject: [PATCH 293/662] Include units Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- Tests/test_file_webp.py | 2 +- src/_webp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index a86757e64..4a048f2c2 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -164,7 +164,7 @@ class TestFileWebp: with pytest.raises(ValueError) as e: im.save(temp_file) assert ( - str(e.value) == "encoding error 5: Image size exceeds WebP limit of 16383" + str(e.value) == "encoding error 5: Image size exceeds WebP limit of 16383 pixels" ) def test_WebPEncode_with_invalid_args(self) -> None: diff --git a/src/_webp.c b/src/_webp.c index c0e1a6f63..b4cf9c329 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -676,7 +676,7 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) { char message[50] = ""; if (error_code == VP8_ENC_ERROR_BAD_DIMENSION) { sprintf( - message, ": Image size exceeds WebP limit of %d", WEBP_MAX_DIMENSION + message, ": Image size exceeds WebP limit of %d pixels", WEBP_MAX_DIMENSION ); } PyErr_Format(PyExc_ValueError, "encoding error %d%s", error_code, message); From a3e3639a59ffaf33430b08b089da1eedf04286ab Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2024 11:27:40 +0000 Subject: [PATCH 294/662] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- Tests/test_file_webp.py | 3 ++- src/_webp.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index 4a048f2c2..247fc6021 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -164,7 +164,8 @@ class TestFileWebp: with pytest.raises(ValueError) as e: im.save(temp_file) assert ( - str(e.value) == "encoding error 5: Image size exceeds WebP limit of 16383 pixels" + str(e.value) + == "encoding error 5: Image size exceeds WebP limit of 16383 pixels" ) def test_WebPEncode_with_invalid_args(self) -> None: diff --git a/src/_webp.c b/src/_webp.c index b4cf9c329..f59ad3036 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -676,7 +676,9 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) { char message[50] = ""; if (error_code == VP8_ENC_ERROR_BAD_DIMENSION) { sprintf( - message, ": Image size exceeds WebP limit of %d pixels", WEBP_MAX_DIMENSION + message, + ": Image size exceeds WebP limit of %d pixels", + WEBP_MAX_DIMENSION ); } PyErr_Format(PyExc_ValueError, "encoding error %d%s", error_code, message); From cfb093af39cf01fc631845d941e0bfda0bb4a52f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 24 Aug 2024 23:15:35 +1000 Subject: [PATCH 295/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index a7edc340c..9da76d82a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,12 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Updated error message when saving WebP with invalid width or height #8322 + [radarhere, hugovk] + +- Remove warning if NumPy failed to raise an error during conversion #8326 + [radarhere] + - If left and right sides meet in ImageDraw.rounded_rectangle(), do not draw rectangle to fill gap #8304 [radarhere] From 53bbfea7637e5cc16d074a205784d0408f13de6e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 26 Aug 2024 23:49:03 +1000 Subject: [PATCH 296/662] Added type hints --- Tests/test_qt_image_qapplication.py | 42 +++++++++++++++------- Tests/test_qt_image_toqimage.py | 2 +- pyproject.toml | 1 - src/PIL/EpsImagePlugin.py | 2 +- src/PIL/Image.py | 10 +++--- src/PIL/ImageQt.py | 54 +++++++++++++++++------------ 6 files changed, 67 insertions(+), 44 deletions(-) diff --git a/Tests/test_qt_image_qapplication.py b/Tests/test_qt_image_qapplication.py index 28f66891c..0ed9fbfa5 100644 --- a/Tests/test_qt_image_qapplication.py +++ b/Tests/test_qt_image_qapplication.py @@ -1,6 +1,7 @@ from __future__ import annotations from pathlib import Path +from typing import TYPE_CHECKING, Union import pytest @@ -8,6 +9,20 @@ from PIL import Image, ImageQt from .helper import assert_image_equal_tofile, assert_image_similar, hopper +if TYPE_CHECKING: + import PyQt6 + import PySide6 + + QApplication = Union[PyQt6.QtWidgets.QApplication, PySide6.QtWidgets.QApplication] + QHBoxLayout = Union[PyQt6.QtWidgets.QHBoxLayout, PySide6.QtWidgets.QHBoxLayout] + QImage = Union[PyQt6.QtGui.QImage, PySide6.QtGui.QImage] + QLabel = Union[PyQt6.QtWidgets.QLabel, PySide6.QtWidgets.QLabel] + QPainter = Union[PyQt6.QtGui.QPainter, PySide6.QtGui.QPainter] + QPixmap = Union[PyQt6.QtGui.QPixmap, PySide6.QtGui.QPixmap] + QPoint = Union[PyQt6.QtCore.QPoint, PySide6.QtCore.QPoint] + QRegion = Union[PyQt6.QtGui.QRegion, PySide6.QtGui.QRegion] + QWidget = Union[PyQt6.QtWidgets.QWidget, PySide6.QtWidgets.QWidget] + if ImageQt.qt_is_installed: from PIL.ImageQt import QPixmap @@ -20,7 +35,7 @@ if ImageQt.qt_is_installed: from PySide6.QtGui import QImage, QPainter, QRegion from PySide6.QtWidgets import QApplication, QHBoxLayout, QLabel, QWidget - class Example(QWidget): + class Example(QWidget): # type: ignore[misc] def __init__(self) -> None: super().__init__() @@ -28,11 +43,12 @@ if ImageQt.qt_is_installed: qimage = ImageQt.ImageQt(img) - pixmap1 = ImageQt.QPixmap.fromImage(qimage) + pixmap1 = getattr(ImageQt.QPixmap, "fromImage")(qimage) - QHBoxLayout(self) # hbox + # hbox + QHBoxLayout(self) # type: ignore[operator] - lbl = QLabel(self) + lbl = QLabel(self) # type: ignore[operator] # Segfault in the problem lbl.setPixmap(pixmap1.copy()) @@ -46,7 +62,7 @@ def roundtrip(expected: Image.Image) -> None: @pytest.mark.skipif(not ImageQt.qt_is_installed, reason="Qt bindings are not installed") def test_sanity(tmp_path: Path) -> None: # Segfault test - app: QApplication | None = QApplication([]) + app: QApplication | None = QApplication([]) # type: ignore[operator] ex = Example() assert app # Silence warning assert ex # Silence warning @@ -56,7 +72,7 @@ def test_sanity(tmp_path: Path) -> None: im = hopper(mode) data = ImageQt.toqpixmap(im) - assert isinstance(data, QPixmap) + assert data.__class__.__name__ == "QPixmap" assert not data.isNull() # Test saving the file @@ -64,14 +80,14 @@ def test_sanity(tmp_path: Path) -> None: data.save(tempfile) # Render the image - qimage = ImageQt.ImageQt(im) - data = QPixmap.fromImage(qimage) - qt_format = QImage.Format if ImageQt.qt_version == "6" else QImage - qimage = QImage(128, 128, qt_format.Format_ARGB32) - painter = QPainter(qimage) - image_label = QLabel() + imageqt = ImageQt.ImageQt(im) + data = getattr(QPixmap, "fromImage")(imageqt) + qt_format = getattr(QImage, "Format") if ImageQt.qt_version == "6" else QImage + qimage = QImage(128, 128, getattr(qt_format, "Format_ARGB32")) # type: ignore[operator] + painter = QPainter(qimage) # type: ignore[operator] + image_label = QLabel() # type: ignore[operator] image_label.setPixmap(data) - image_label.render(painter, QPoint(0, 0), QRegion(0, 0, 128, 128)) + image_label.render(painter, QPoint(0, 0), QRegion(0, 0, 128, 128)) # type: ignore[operator] painter.end() rendered_tempfile = str(tmp_path / f"temp_rendered_{mode}.png") qimage.save(rendered_tempfile) diff --git a/Tests/test_qt_image_toqimage.py b/Tests/test_qt_image_toqimage.py index 6110be707..8cb7ffb9b 100644 --- a/Tests/test_qt_image_toqimage.py +++ b/Tests/test_qt_image_toqimage.py @@ -21,7 +21,7 @@ def test_sanity(mode: str, tmp_path: Path) -> None: src = hopper(mode) data = ImageQt.toqimage(src) - assert isinstance(data, QImage) + assert isinstance(data, QImage) # type: ignore[arg-type, misc] assert not data.isNull() # reload directly from the qimage diff --git a/pyproject.toml b/pyproject.toml index 9e53d4bfe..e4ae73acf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -166,5 +166,4 @@ warn_unused_ignores = true exclude = [ '^Tests/oss-fuzz/fuzz_font.py$', '^Tests/oss-fuzz/fuzz_pillow.py$', - '^Tests/test_qt_image_qapplication.py$', ] diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index 4da0cd230..d830ad53f 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -71,7 +71,7 @@ def Ghostscript( fp: IO[bytes], scale: int = 1, transparency: bool = False, -) -> Image.Image: +) -> Image.core.ImagingCore: """Render an image using Ghostscript""" global gs_binary if not has_ghostscript(): diff --git a/src/PIL/Image.py b/src/PIL/Image.py index fbeecef0e..0877f7792 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -223,7 +223,7 @@ if TYPE_CHECKING: from IPython.lib.pretty import PrettyPrinter - from . import ImageFile, ImageFilter, ImagePalette, TiffImagePlugin + from . import ImageFile, ImageFilter, ImagePalette, ImageQt, TiffImagePlugin from ._typing import NumpyArray, StrOrBytesPath, TypeGuard ID: list[str] = [] OPEN: dict[ @@ -2978,7 +2978,7 @@ class Image: self.load() return self._new(self.im.effect_spread(distance)) - def toqimage(self): + def toqimage(self) -> ImageQt.ImageQt: """Returns a QImage copy of this image""" from . import ImageQt @@ -2987,7 +2987,7 @@ class Image: raise ImportError(msg) return ImageQt.toqimage(self) - def toqpixmap(self): + def toqpixmap(self) -> ImageQt.QPixmap: """Returns a QPixmap copy of this image""" from . import ImageQt @@ -3314,7 +3314,7 @@ def fromarray(obj: SupportsArrayInterface, mode: str | None = None) -> Image: return frombuffer(mode, size, obj, "raw", rawmode, 0, 1) -def fromqimage(im) -> ImageFile.ImageFile: +def fromqimage(im: ImageQt.QImage) -> ImageFile.ImageFile: """Creates an image instance from a QImage image""" from . import ImageQt @@ -3324,7 +3324,7 @@ def fromqimage(im) -> ImageFile.ImageFile: return ImageQt.fromqimage(im) -def fromqpixmap(im) -> ImageFile.ImageFile: +def fromqpixmap(im: ImageQt.QPixmap) -> ImageFile.ImageFile: """Creates an image instance from a QPixmap image""" from . import ImageQt diff --git a/src/PIL/ImageQt.py b/src/PIL/ImageQt.py index a2d946714..a3d647138 100644 --- a/src/PIL/ImageQt.py +++ b/src/PIL/ImageQt.py @@ -19,14 +19,23 @@ from __future__ import annotations import sys from io import BytesIO -from typing import TYPE_CHECKING, Callable +from typing import TYPE_CHECKING, Any, Callable, Union from . import Image from ._util import is_path if TYPE_CHECKING: + import PyQt6 + import PySide6 + from . import ImageFile + QBuffer: type + QByteArray = Union[PyQt6.QtCore.QByteArray, PySide6.QtCore.QByteArray] + QIODevice = Union[PyQt6.QtCore.QIODevice, PySide6.QtCore.QIODevice] + QImage = Union[PyQt6.QtGui.QImage, PySide6.QtGui.QImage] + QPixmap = Union[PyQt6.QtGui.QPixmap, PySide6.QtGui.QPixmap] + qt_version: str | None qt_versions = [ ["6", "PyQt6"], @@ -37,10 +46,6 @@ qt_versions = [ qt_versions.sort(key=lambda version: version[1] in sys.modules, reverse=True) for version, qt_module in qt_versions: try: - QBuffer: type - QIODevice: type - QImage: type - QPixmap: type qRgba: Callable[[int, int, int, int], int] if qt_module == "PyQt6": from PyQt6.QtCore import QBuffer, QIODevice @@ -65,19 +70,20 @@ def rgb(r: int, g: int, b: int, a: int = 255) -> int: return qRgba(r, g, b, a) & 0xFFFFFFFF -def fromqimage(im): +def fromqimage(im: QImage | QPixmap) -> ImageFile.ImageFile: """ :param im: QImage or PIL ImageQt object """ buffer = QBuffer() + qt_openmode: object if qt_version == "6": try: - qt_openmode = QIODevice.OpenModeFlag + qt_openmode = getattr(QIODevice, "OpenModeFlag") except AttributeError: - qt_openmode = QIODevice.OpenMode + qt_openmode = getattr(QIODevice, "OpenMode") else: qt_openmode = QIODevice - buffer.open(qt_openmode.ReadWrite) + buffer.open(getattr(qt_openmode, "ReadWrite")) # preserve alpha channel with png # otherwise ppm is more friendly with Image.open if im.hasAlphaChannel(): @@ -93,7 +99,7 @@ def fromqimage(im): return Image.open(b) -def fromqpixmap(im) -> ImageFile.ImageFile: +def fromqpixmap(im: QPixmap) -> ImageFile.ImageFile: return fromqimage(im) @@ -123,7 +129,7 @@ def align8to32(bytes: bytes, width: int, mode: str) -> bytes: return b"".join(new_data) -def _toqclass_helper(im): +def _toqclass_helper(im: Image.Image | str | QByteArray) -> dict[str, Any]: data = None colortable = None exclusive_fp = False @@ -135,30 +141,32 @@ def _toqclass_helper(im): if is_path(im): im = Image.open(im) exclusive_fp = True + assert isinstance(im, Image.Image) - qt_format = QImage.Format if qt_version == "6" else QImage + qt_format = getattr(QImage, "Format") if qt_version == "6" else QImage if im.mode == "1": - format = qt_format.Format_Mono + format = getattr(qt_format, "Format_Mono") elif im.mode == "L": - format = qt_format.Format_Indexed8 + format = getattr(qt_format, "Format_Indexed8") colortable = [rgb(i, i, i) for i in range(256)] elif im.mode == "P": - format = qt_format.Format_Indexed8 + format = getattr(qt_format, "Format_Indexed8") palette = im.getpalette() + assert palette is not None colortable = [rgb(*palette[i : i + 3]) for i in range(0, len(palette), 3)] elif im.mode == "RGB": # Populate the 4th channel with 255 im = im.convert("RGBA") data = im.tobytes("raw", "BGRA") - format = qt_format.Format_RGB32 + format = getattr(qt_format, "Format_RGB32") elif im.mode == "RGBA": data = im.tobytes("raw", "BGRA") - format = qt_format.Format_ARGB32 + format = getattr(qt_format, "Format_ARGB32") elif im.mode == "I;16": im = im.point(lambda i: i * 256) - format = qt_format.Format_Grayscale16 + format = getattr(qt_format, "Format_Grayscale16") else: if exclusive_fp: im.close() @@ -174,8 +182,8 @@ def _toqclass_helper(im): if qt_is_installed: - class ImageQt(QImage): - def __init__(self, im) -> None: + class ImageQt(QImage): # type: ignore[misc] + def __init__(self, im: Image.Image | str | QByteArray) -> None: """ An PIL image wrapper for Qt. This is a subclass of PyQt's QImage class. @@ -199,10 +207,10 @@ if qt_is_installed: self.setColorTable(im_data["colortable"]) -def toqimage(im) -> ImageQt: +def toqimage(im: Image.Image | str | QByteArray) -> ImageQt: return ImageQt(im) -def toqpixmap(im): +def toqpixmap(im: Image.Image | str | QByteArray) -> QPixmap: qimage = toqimage(im) - return QPixmap.fromImage(qimage) + return getattr(QPixmap, "fromImage")(qimage) From 65172db28db0cc965c026512546857540b0c6e20 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 27 Aug 2024 19:04:46 +1000 Subject: [PATCH 297/662] Corrected Ghostscript path --- .github/workflows/test-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 5b34d6703..2943bbe31 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -87,7 +87,7 @@ jobs: echo "C:\Program Files\NASM" >> $env:GITHUB_PATH choco install ghostscript --version=10.3.1 --no-progress - echo "C:\Program Files\gs\gs10.00.0\bin" >> $env:GITHUB_PATH + echo "C:\Program Files\gs\gs10.03.1\bin" >> $env:GITHUB_PATH # Install extra test images xcopy /S /Y Tests\test-images\* Tests\images From ae59ea4899e05146188230ddcbd11ca2e51511d5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 00:52:05 +0000 Subject: [PATCH 298/662] Update dependency mypy to v1.11.2 --- .ci/requirements-mypy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-mypy.txt b/.ci/requirements-mypy.txt index 47fc64399..5b09ef64c 100644 --- a/.ci/requirements-mypy.txt +++ b/.ci/requirements-mypy.txt @@ -1,4 +1,4 @@ -mypy==1.11.1 +mypy==1.11.2 IceSpringPySideStubs-PyQt6 IceSpringPySideStubs-PySide6 ipython From bdc53f6c4d499c918cc8d050ed163b8b9a178fe3 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 28 Aug 2024 18:33:43 +1000 Subject: [PATCH 299/662] Expand C image to match GIF frame image size --- Tests/images/test_extents_transparency.gif | Bin 0 -> 415 bytes Tests/test_file_gif.py | 37 ++++++++++++++++----- src/PIL/GifImagePlugin.py | 18 ++++++++++ 3 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 Tests/images/test_extents_transparency.gif diff --git a/Tests/images/test_extents_transparency.gif b/Tests/images/test_extents_transparency.gif new file mode 100644 index 0000000000000000000000000000000000000000..739c82ad47c73560495e23c4b44bab5e1a88184f GIT binary patch literal 415 zcmZ?wbhEHbOkqf2Xk=jc&wv1mKUo+V7#JCJKtdpS29AXcj2to^8x|aF<`CA3Ik92k z;dTLKuQ?tY7ai@EFwVMjV&mfD{R+-qGM<~3oSdu?yej78rlqH+8zi5aWIx*cTa6yeSLkx;VxP4 zZEJ3B&bYiP_Vl*3x3?EOJ~h{S`?|ZkD?Y!vdwTo&`}-T1x#fIzY None: im.load() -def test_extents() -> None: - with Image.open("Tests/images/test_extents.gif") as im: - assert im.size == (100, 100) +@pytest.mark.parametrize( + "test_file, loading_strategy", + ( + ("test_extents.gif", GifImagePlugin.LoadingStrategy.RGB_AFTER_FIRST), + ( + "test_extents.gif", + GifImagePlugin.LoadingStrategy.RGB_AFTER_DIFFERENT_PALETTE_ONLY, + ), + ( + "test_extents_transparency.gif", + GifImagePlugin.LoadingStrategy.RGB_AFTER_FIRST, + ), + ), +) +def test_extents(test_file, loading_strategy) -> None: + GifImagePlugin.LOADING_STRATEGY = loading_strategy + try: + with Image.open("Tests/images/" + test_file) as im: + assert im.size == (100, 100) - # Check that n_frames does not change the size - assert im.n_frames == 2 - assert im.size == (100, 100) + # Check that n_frames does not change the size + assert im.n_frames == 2 + assert im.size == (100, 100) - im.seek(1) - assert im.size == (150, 150) + im.seek(1) + assert im.size == (150, 150) + + im.load() + assert im.im.size == (150, 150) + finally: + GifImagePlugin.LOADING_STRATEGY = GifImagePlugin.LoadingStrategy.RGB_AFTER_FIRST def test_missing_background() -> None: diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index fa8137fb9..82f58905d 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -438,6 +438,13 @@ class GifImageFile(ImageFile.ImageFile): self.im.putpalette("RGB", *self._frame_palette.getdata()) else: self._im = None + if not self._prev_im and self._im is not None and self.size != self.im.size: + expanded_im = Image.core.fill(self.im.mode, self.size) + if self._frame_palette: + expanded_im.putpalette("RGB", *self._frame_palette.getdata()) + expanded_im.paste(self.im, (0, 0) + self.im.size) + + self.im = expanded_im self._mode = temp_mode self._frame_palette = None @@ -455,6 +462,17 @@ class GifImageFile(ImageFile.ImageFile): return if not self._prev_im: return + if self.size != self._prev_im.size: + if self._frame_transparency is not None: + expanded_im = Image.core.fill("RGBA", self.size) + else: + expanded_im = Image.core.fill("P", self.size) + expanded_im.putpalette("RGB", "RGB", self.im.getpalette()) + expanded_im = expanded_im.convert("RGB") + expanded_im.paste(self._prev_im, (0, 0) + self._prev_im.size) + + self._prev_im = expanded_im + assert self._prev_im is not None if self._frame_transparency is not None: self.im.putpalettealpha(self._frame_transparency, 0) frame_im = self.im.convert("RGBA") From 0c335d239bb6f73a45795a8d814670f9ddc8aa45 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Mon, 22 Apr 2024 12:38:28 -0500 Subject: [PATCH 300/662] use (void) for empty function parameters --- src/libImaging/JpegDecode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libImaging/JpegDecode.c b/src/libImaging/JpegDecode.c index 30c64f235..2970f56d1 100644 --- a/src/libImaging/JpegDecode.c +++ b/src/libImaging/JpegDecode.c @@ -48,7 +48,7 @@ char *libjpeg_turbo_version = NULL; #endif int -ImagingJpegUseJCSExtensions() { +ImagingJpegUseJCSExtensions(void) { int use_jcs_extensions = 0; #ifdef JCS_EXTENSIONS #if defined(LIBJPEG_TURBO_VERSION_NUMBER) From d92603a0c6ea70d285847ece6fc800048d60646d Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Thu, 29 Aug 2024 10:58:53 +0300 Subject: [PATCH 301/662] Drop support for EOL PyPy3.9 --- .ci/install.sh | 5 +---- .github/workflows/test-windows.yml | 2 +- .github/workflows/test.yml | 1 - .github/workflows/wheels.yml | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.ci/install.sh b/.ci/install.sh index b2d615866..ee92d447a 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -53,10 +53,7 @@ if [[ $(uname) != CYGWIN* ]]; then fi # Pyroma uses non-isolated build and fails with old setuptools - if [[ - $GHA_PYTHON_VERSION == pypy3.9 - || $GHA_PYTHON_VERSION == 3.9 - ]]; then + if [[ $GHA_PYTHON_VERSION == 3.9 ]]; then # To match pyproject.toml python3 -m pip install "setuptools>=67.8" fi diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 2943bbe31..f58e8dae3 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -35,7 +35,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["pypy3.10", "pypy3.9", "3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ["pypy3.10", "3.9", "3.10", "3.11", "3.12", "3.13"] timeout-minutes: 30 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6e63333b0..1b169db91 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,7 +42,6 @@ jobs: ] python-version: [ "pypy3.10", - "pypy3.9", "3.13", "3.12", "3.11", diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 3ed1b5926..f3ed8399b 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -48,7 +48,6 @@ jobs: fail-fast: false matrix: python-version: - - pp39 - pp310 - cp3{9,10,11} - cp3{12,13} @@ -57,7 +56,6 @@ jobs: - manylinux_2_28 - musllinux exclude: - - { python-version: pp39, spec: musllinux } - { python-version: pp310, spec: musllinux } steps: From d00f3656a684825569152ea1d6e74526ffa5d14b Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 29 Aug 2024 22:51:15 +1000 Subject: [PATCH 302/662] Changed im.tile to never be None --- Tests/test_imagefile.py | 24 +++++++++++++++++------- docs/example/DdsImagePlugin.py | 4 +++- src/PIL/BlpImagePlugin.py | 7 +++++-- src/PIL/BmpImagePlugin.py | 2 +- src/PIL/CurImagePlugin.py | 4 ++-- src/PIL/DdsImagePlugin.py | 2 +- src/PIL/FitsImagePlugin.py | 2 +- src/PIL/FliImagePlugin.py | 2 +- src/PIL/FpxImagePlugin.py | 6 +++--- src/PIL/FtexImagePlugin.py | 4 ++-- src/PIL/GdImageFile.py | 2 +- src/PIL/GifImagePlugin.py | 2 +- src/PIL/IcoImagePlugin.py | 2 +- src/PIL/ImImagePlugin.py | 22 ++++++++++++++++------ src/PIL/Image.py | 5 ++++- src/PIL/ImageFile.py | 27 ++++++++++++++++++--------- src/PIL/ImtImagePlugin.py | 2 +- src/PIL/IptcImagePlugin.py | 4 +++- src/PIL/Jpeg2KImagePlugin.py | 5 +++-- src/PIL/JpegImagePlugin.py | 8 ++++++-- src/PIL/McIdasImagePlugin.py | 4 +++- src/PIL/MpoImagePlugin.py | 5 ++++- src/PIL/MspImagePlugin.py | 4 ++-- src/PIL/PcdImagePlugin.py | 2 +- src/PIL/PcxImagePlugin.py | 4 +++- src/PIL/PixarImagePlugin.py | 4 +++- src/PIL/PpmImagePlugin.py | 4 +++- src/PIL/PsdImagePlugin.py | 6 ++---- src/PIL/QoiImagePlugin.py | 2 +- src/PIL/SgiImagePlugin.py | 15 ++++++++++++--- src/PIL/SpiderImagePlugin.py | 4 +++- src/PIL/SunImagePlugin.py | 8 ++++++-- src/PIL/TgaImagePlugin.py | 4 ++-- src/PIL/TiffImagePlugin.py | 15 ++++++++------- src/PIL/WebPImagePlugin.py | 2 +- src/PIL/XVThumbImagePlugin.py | 6 +++++- src/PIL/XbmImagePlugin.py | 2 +- src/PIL/XpmImagePlugin.py | 4 +++- 38 files changed, 153 insertions(+), 78 deletions(-) diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index a8bd798c1..0985dce9c 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -238,7 +238,9 @@ class MockImageFile(ImageFile.ImageFile): self.rawmode = "RGBA" self._mode = "RGBA" self._size = (200, 200) - self.tile = [("MOCK", (xoff, yoff, xoff + xsize, yoff + ysize), 32, None)] + self.tile = [ + ImageFile._Tile("MOCK", (xoff, yoff, xoff + xsize, yoff + ysize), 32, None) + ] class CodecsTest: @@ -268,7 +270,7 @@ class TestPyDecoder(CodecsTest): buf = BytesIO(b"\x00" * 255) im = MockImageFile(buf) - im.tile = [("MOCK", None, 32, None)] + im.tile = [ImageFile._Tile("MOCK", None, 32, None)] im.load() @@ -281,12 +283,12 @@ class TestPyDecoder(CodecsTest): buf = BytesIO(b"\x00" * 255) im = MockImageFile(buf) - im.tile = [("MOCK", (xoff, yoff, -10, yoff + ysize), 32, None)] + im.tile = [ImageFile._Tile("MOCK", (xoff, yoff, -10, yoff + ysize), 32, None)] with pytest.raises(ValueError): im.load() - im.tile = [("MOCK", (xoff, yoff, xoff + xsize, -10), 32, None)] + im.tile = [ImageFile._Tile("MOCK", (xoff, yoff, xoff + xsize, -10), 32, None)] with pytest.raises(ValueError): im.load() @@ -294,12 +296,20 @@ class TestPyDecoder(CodecsTest): buf = BytesIO(b"\x00" * 255) im = MockImageFile(buf) - im.tile = [("MOCK", (xoff, yoff, xoff + xsize + 100, yoff + ysize), 32, None)] + im.tile = [ + ImageFile._Tile( + "MOCK", (xoff, yoff, xoff + xsize + 100, yoff + ysize), 32, None + ) + ] with pytest.raises(ValueError): im.load() - im.tile = [("MOCK", (xoff, yoff, xoff + xsize, yoff + ysize + 100), 32, None)] + im.tile = [ + ImageFile._Tile( + "MOCK", (xoff, yoff, xoff + xsize, yoff + ysize + 100), 32, None + ) + ] with pytest.raises(ValueError): im.load() @@ -336,7 +346,7 @@ class TestPyEncoder(CodecsTest): buf = BytesIO(b"\x00" * 255) im = MockImageFile(buf) - im.tile = [("MOCK", None, 32, None)] + im.tile = [ImageFile._Tile("MOCK", None, 32, None)] fp = BytesIO() ImageFile._save(im, fp, [ImageFile._Tile("MOCK", None, 0, "RGB")]) diff --git a/docs/example/DdsImagePlugin.py b/docs/example/DdsImagePlugin.py index caa852b1f..d8f536076 100644 --- a/docs/example/DdsImagePlugin.py +++ b/docs/example/DdsImagePlugin.py @@ -246,7 +246,9 @@ class DdsImageFile(ImageFile.ImageFile): msg = f"Unimplemented pixel format {repr(fourcc)}" raise NotImplementedError(msg) - self.tile = [(self.decoder, (0, 0) + self.size, 0, (self.mode, 0, 1))] + self.tile = [ + ImageFile._Tile(self.decoder, (0, 0) + self.size, 0, (self.mode, 0, 1)) + ] def load_seek(self, pos: int) -> None: pass diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py index 1112276dc..8e29898df 100644 --- a/src/PIL/BlpImagePlugin.py +++ b/src/PIL/BlpImagePlugin.py @@ -273,7 +273,7 @@ class BlpImageFile(ImageFile.ImageFile): raise BLPFormatError(msg) self._mode = "RGBA" if self._blp_alpha_depth else "RGB" - self.tile = [(decoder, (0, 0) + self.size, 0, (self.mode, 0, 1))] + self.tile = [ImageFile._Tile(decoder, (0, 0) + self.size, 0, (self.mode, 0, 1))] class _BLPBaseDecoder(ImageFile.PyDecoder): @@ -372,7 +372,10 @@ class BLP1Decoder(_BLPBaseDecoder): Image._decompression_bomb_check(image.size) if image.mode == "CMYK": decoder_name, extents, offset, args = image.tile[0] - image.tile = [(decoder_name, extents, offset, (args[0], "CMYK"))] + assert isinstance(args, tuple) + image.tile = [ + ImageFile._Tile(decoder_name, extents, offset, (args[0], "CMYK")) + ] r, g, b = image.convert("RGB").split() reversed_image = Image.merge("RGB", (b, g, r)) self.set_as_raw(reversed_image.tobytes()) diff --git a/src/PIL/BmpImagePlugin.py b/src/PIL/BmpImagePlugin.py index de441c6b5..e70856ffb 100644 --- a/src/PIL/BmpImagePlugin.py +++ b/src/PIL/BmpImagePlugin.py @@ -296,7 +296,7 @@ class BmpImageFile(ImageFile.ImageFile): args.append(((file_info["width"] * file_info["bits"] + 31) >> 3) & (~3)) args.append(file_info["direction"]) self.tile = [ - ( + ImageFile._Tile( decoder_name, (0, 0, file_info["width"], file_info["height"]), offset or self.fp.tell(), diff --git a/src/PIL/CurImagePlugin.py b/src/PIL/CurImagePlugin.py index 85e2145e7..c4be0ceca 100644 --- a/src/PIL/CurImagePlugin.py +++ b/src/PIL/CurImagePlugin.py @@ -17,7 +17,7 @@ # from __future__ import annotations -from . import BmpImagePlugin, Image +from . import BmpImagePlugin, Image, ImageFile from ._binary import i16le as i16 from ._binary import i32le as i32 @@ -64,7 +64,7 @@ class CurImageFile(BmpImagePlugin.BmpImageFile): # patch up the bitmap height self._size = self.size[0], self.size[1] // 2 d, e, o, a = self.tile[0] - self.tile[0] = d, (0, 0) + self.size, o, a + self.tile[0] = ImageFile._Tile(d, (0, 0) + self.size, o, a) # diff --git a/src/PIL/DdsImagePlugin.py b/src/PIL/DdsImagePlugin.py index a57e4aea2..631532470 100644 --- a/src/PIL/DdsImagePlugin.py +++ b/src/PIL/DdsImagePlugin.py @@ -367,7 +367,7 @@ class DdsImageFile(ImageFile.ImageFile): mask_count = 3 masks = struct.unpack(f"<{mask_count}I", header.read(mask_count * 4)) - self.tile = [("dds_rgb", extents, 0, (bitcount, masks))] + self.tile = [ImageFile._Tile("dds_rgb", extents, 0, (bitcount, masks))] return elif pfflags & DDPF.LUMINANCE: if bitcount == 8: diff --git a/src/PIL/FitsImagePlugin.py b/src/PIL/FitsImagePlugin.py index 4846054b1..abacc5e67 100644 --- a/src/PIL/FitsImagePlugin.py +++ b/src/PIL/FitsImagePlugin.py @@ -67,7 +67,7 @@ class FitsImageFile(ImageFile.ImageFile): raise ValueError(msg) offset += self.fp.tell() - 80 - self.tile = [(decoder_name, (0, 0) + self.size, offset, args)] + self.tile = [ImageFile._Tile(decoder_name, (0, 0) + self.size, offset, args)] def _get_size( self, headers: dict[bytes, bytes], prefix: bytes diff --git a/src/PIL/FliImagePlugin.py b/src/PIL/FliImagePlugin.py index 52d1fce31..666390be9 100644 --- a/src/PIL/FliImagePlugin.py +++ b/src/PIL/FliImagePlugin.py @@ -159,7 +159,7 @@ class FliImageFile(ImageFile.ImageFile): framesize = i32(s) self.decodermaxblock = framesize - self.tile = [("fli", (0, 0) + self.size, self.__offset, None)] + self.tile = [ImageFile._Tile("fli", (0, 0) + self.size, self.__offset, None)] self.__offset += framesize diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py index 64d48635e..8fef51076 100644 --- a/src/PIL/FpxImagePlugin.py +++ b/src/PIL/FpxImagePlugin.py @@ -166,7 +166,7 @@ class FpxImageFile(ImageFile.ImageFile): if compression == 0: self.tile.append( - ( + ImageFile._Tile( "raw", (x, y, x1, y1), i32(s, i) + 28, @@ -177,7 +177,7 @@ class FpxImageFile(ImageFile.ImageFile): elif compression == 1: # FIXME: the fill decoder is not implemented self.tile.append( - ( + ImageFile._Tile( "fill", (x, y, x1, y1), i32(s, i) + 28, @@ -205,7 +205,7 @@ class FpxImageFile(ImageFile.ImageFile): jpegmode = rawmode self.tile.append( - ( + ImageFile._Tile( "jpeg", (x, y, x1, y1), i32(s, i) + 28, diff --git a/src/PIL/FtexImagePlugin.py b/src/PIL/FtexImagePlugin.py index 5acbb4912..ddb469bc3 100644 --- a/src/PIL/FtexImagePlugin.py +++ b/src/PIL/FtexImagePlugin.py @@ -93,9 +93,9 @@ class FtexImageFile(ImageFile.ImageFile): if format == Format.DXT1: self._mode = "RGBA" - self.tile = [("bcn", (0, 0) + self.size, 0, 1)] + self.tile = [ImageFile._Tile("bcn", (0, 0) + self.size, 0, (1,))] elif format == Format.UNCOMPRESSED: - self.tile = [("raw", (0, 0) + self.size, 0, ("RGB", 0, 1))] + self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 0, ("RGB", 0, 1))] else: msg = f"Invalid texture compression format: {repr(format)}" raise ValueError(msg) diff --git a/src/PIL/GdImageFile.py b/src/PIL/GdImageFile.py index 88b87a22c..f1b4969f2 100644 --- a/src/PIL/GdImageFile.py +++ b/src/PIL/GdImageFile.py @@ -72,7 +72,7 @@ class GdImageFile(ImageFile.ImageFile): ) self.tile = [ - ( + ImageFile._Tile( "raw", (0, 0) + self.size, 7 + true_color_offset + 4 + 256 * 4, diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index fa8137fb9..22539925f 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -407,7 +407,7 @@ class GifImageFile(ImageFile.ImageFile): elif self.mode not in ("RGB", "RGBA"): transparency = frame_transparency self.tile = [ - ( + ImageFile._Tile( "gif", (x0, y0, x1, y1), self.__offset, diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py index d0605b75a..144fe0b63 100644 --- a/src/PIL/IcoImagePlugin.py +++ b/src/PIL/IcoImagePlugin.py @@ -228,7 +228,7 @@ class IcoFile: # change tile dimension to only encompass XOR image im._size = (im.size[0], int(im.size[1] / 2)) d, e, o, a = im.tile[0] - im.tile[0] = d, (0, 0) + im.size, o, a + im.tile[0] = ImageFile._Tile(d, (0, 0) + im.size, o, a) # figure out where AND mask image starts if header.bpp == 32: diff --git a/src/PIL/ImImagePlugin.py b/src/PIL/ImImagePlugin.py index b94165089..f9f47348c 100644 --- a/src/PIL/ImImagePlugin.py +++ b/src/PIL/ImImagePlugin.py @@ -253,7 +253,11 @@ class ImImageFile(ImageFile.ImageFile): # use bit decoder (if necessary) bits = int(self.rawmode[2:]) if bits not in [8, 16, 32]: - self.tile = [("bit", (0, 0) + self.size, offs, (bits, 8, 3, 0, -1))] + self.tile = [ + ImageFile._Tile( + "bit", (0, 0) + self.size, offs, (bits, 8, 3, 0, -1) + ) + ] return except ValueError: pass @@ -263,13 +267,17 @@ class ImImageFile(ImageFile.ImageFile): # ever stumbled upon such a file ;-) size = self.size[0] * self.size[1] self.tile = [ - ("raw", (0, 0) + self.size, offs, ("G", 0, -1)), - ("raw", (0, 0) + self.size, offs + size, ("R", 0, -1)), - ("raw", (0, 0) + self.size, offs + 2 * size, ("B", 0, -1)), + ImageFile._Tile("raw", (0, 0) + self.size, offs, ("G", 0, -1)), + ImageFile._Tile("raw", (0, 0) + self.size, offs + size, ("R", 0, -1)), + ImageFile._Tile( + "raw", (0, 0) + self.size, offs + 2 * size, ("B", 0, -1) + ), ] else: # LabEye/IFUNC files - self.tile = [("raw", (0, 0) + self.size, offs, (self.rawmode, 0, -1))] + self.tile = [ + ImageFile._Tile("raw", (0, 0) + self.size, offs, (self.rawmode, 0, -1)) + ] @property def n_frames(self) -> int: @@ -295,7 +303,9 @@ class ImImageFile(ImageFile.ImageFile): self.fp = self._fp - self.tile = [("raw", (0, 0) + self.size, offs, (self.rawmode, 0, -1))] + self.tile = [ + ImageFile._Tile("raw", (0, 0) + self.size, offs, (self.rawmode, 0, -1)) + ] def tell(self) -> int: return self.frame diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 95b4c64ee..04f73870a 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -3641,7 +3641,10 @@ def merge(mode: str, bands: Sequence[Image]) -> Image: def register_open( id: str, - factory: Callable[[IO[bytes], str | bytes], ImageFile.ImageFile], + factory: ( + Callable[[IO[bytes], str | bytes], ImageFile.ImageFile] + | type[ImageFile.ImageFile] + ), accept: Callable[[bytes], bool | str] | None = None, ) -> None: """ diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index a1c33f219..fce1591ef 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -34,12 +34,15 @@ import itertools import os import struct import sys -from typing import IO, Any, NamedTuple +from typing import IO, TYPE_CHECKING, Any, NamedTuple from . import Image from ._deprecate import deprecate from ._util import is_path +if TYPE_CHECKING: + from ._typing import StrOrBytesPath + MAXBLOCK = 65536 SAFEBLOCK = 1024 * 1024 @@ -107,32 +110,34 @@ class _Tile(NamedTuple): class ImageFile(Image.Image): """Base class for image file format handlers.""" - def __init__(self, fp=None, filename=None): + def __init__( + self, fp: StrOrBytesPath | IO[bytes] | None = None, filename: str | bytes | None = None + ) -> None: super().__init__() self._min_frame = 0 - self.custom_mimetype = None + self.custom_mimetype: str | None = None - self.tile = None + self.tile: list[_Tile] = [] """ A list of tile descriptors, or ``None`` """ self.readonly = 1 # until we know better - self.decoderconfig = () + self.decoderconfig: tuple[Any, ...] = () self.decodermaxblock = MAXBLOCK if is_path(fp): # filename self.fp = open(fp, "rb") - self.filename = fp + self.filename = os.path.realpath(os.fspath(fp)) self._exclusive_fp = True else: # stream self.fp = fp - self.filename = filename + self.filename = filename if filename is not None else "" # can be overridden - self._exclusive_fp = None + self._exclusive_fp = False try: try: @@ -155,6 +160,9 @@ class ImageFile(Image.Image): self.fp.close() raise + def _open(self) -> None: + pass + def get_format_mimetype(self) -> str | None: if self.custom_mimetype: return self.custom_mimetype @@ -178,7 +186,7 @@ class ImageFile(Image.Image): def load(self) -> Image.core.PixelAccess | None: """Load image data based on tile list""" - if self.tile is None: + if not self.tile and self._im is None: msg = "cannot load this image" raise OSError(msg) @@ -214,6 +222,7 @@ class ImageFile(Image.Image): args = (args, 0, 1) if ( decoder_name == "raw" + and isinstance(args, tuple) and len(args) >= 3 and args[0] == self.mode and args[0] in Image._MAPMODES diff --git a/src/PIL/ImtImagePlugin.py b/src/PIL/ImtImagePlugin.py index abb3fb762..594c56513 100644 --- a/src/PIL/ImtImagePlugin.py +++ b/src/PIL/ImtImagePlugin.py @@ -58,7 +58,7 @@ class ImtImageFile(ImageFile.ImageFile): if s == b"\x0C": # image data begins self.tile = [ - ( + ImageFile._Tile( "raw", (0, 0) + self.size, self.fp.tell() - len(buffer), diff --git a/src/PIL/IptcImagePlugin.py b/src/PIL/IptcImagePlugin.py index a8cd38218..60ab7c83f 100644 --- a/src/PIL/IptcImagePlugin.py +++ b/src/PIL/IptcImagePlugin.py @@ -147,7 +147,9 @@ class IptcImageFile(ImageFile.ImageFile): # tile if tag == (8, 10): - self.tile = [("iptc", (0, 0) + self.size, offset, compression)] + self.tile = [ + ImageFile._Tile("iptc", (0, 0) + self.size, offset, compression) + ] def load(self) -> Image.core.PixelAccess | None: if len(self.tile) != 1 or self.tile[0][0] != "iptc": diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py index 02c2e48cf..cfbf78460 100644 --- a/src/PIL/Jpeg2KImagePlugin.py +++ b/src/PIL/Jpeg2KImagePlugin.py @@ -286,7 +286,7 @@ class Jpeg2KImageFile(ImageFile.ImageFile): length = -1 self.tile = [ - ( + ImageFile._Tile( "jpeg2k", (0, 0) + self.size, 0, @@ -338,8 +338,9 @@ class Jpeg2KImageFile(ImageFile.ImageFile): # Update the reduce and layers settings t = self.tile[0] + assert isinstance(t[3], tuple) t3 = (t[3][0], self._reduce, self.layers, t[3][3], t[3][4]) - self.tile = [(t[0], (0, 0) + self.size, t[2], t3)] + self.tile = [ImageFile._Tile(t[0], (0, 0) + self.size, t[2], t3)] return ImageFile.ImageFile.load(self) diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index bd4539be4..1f54b7e92 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -372,7 +372,9 @@ class JpegImageFile(ImageFile.ImageFile): rawmode = self.mode if self.mode == "CMYK": rawmode = "CMYK;I" # assume adobe conventions - self.tile = [("jpeg", (0, 0) + self.size, 0, (rawmode, ""))] + self.tile = [ + ImageFile._Tile("jpeg", (0, 0) + self.size, 0, (rawmode, "")) + ] # self.__offset = self.fp.tell() break s = self.fp.read(1) @@ -423,6 +425,7 @@ class JpegImageFile(ImageFile.ImageFile): scale = 1 original_size = self.size + assert isinstance(a, tuple) if a[0] == "RGB" and mode in ["L", "YCbCr"]: self._mode = mode a = mode, "" @@ -432,6 +435,7 @@ class JpegImageFile(ImageFile.ImageFile): for s in [8, 4, 2, 1]: if scale >= s: break + assert e is not None e = ( e[0], e[1], @@ -441,7 +445,7 @@ class JpegImageFile(ImageFile.ImageFile): self._size = ((self.size[0] + s - 1) // s, (self.size[1] + s - 1) // s) scale = s - self.tile = [(d, e, o, a)] + self.tile = [ImageFile._Tile(d, e, o, a)] self.decoderconfig = (scale, 0) box = (0, 0, original_size[0] / scale, original_size[1] / scale) diff --git a/src/PIL/McIdasImagePlugin.py b/src/PIL/McIdasImagePlugin.py index 27972236c..5dd031be3 100644 --- a/src/PIL/McIdasImagePlugin.py +++ b/src/PIL/McIdasImagePlugin.py @@ -67,7 +67,9 @@ class McIdasImageFile(ImageFile.ImageFile): offset = w[34] + w[15] stride = w[15] + w[10] * w[11] * w[14] - self.tile = [("raw", (0, 0) + self.size, offset, (rawmode, stride, 1))] + self.tile = [ + ImageFile._Tile("raw", (0, 0) + self.size, offset, (rawmode, stride, 1)) + ] # -------------------------------------------------------------------- diff --git a/src/PIL/MpoImagePlugin.py b/src/PIL/MpoImagePlugin.py index 5ed9f56a1..71f89a09a 100644 --- a/src/PIL/MpoImagePlugin.py +++ b/src/PIL/MpoImagePlugin.py @@ -26,6 +26,7 @@ from typing import IO, Any, cast from . import ( Image, + ImageFile, ImageSequence, JpegImagePlugin, TiffImagePlugin, @@ -145,7 +146,9 @@ class MpoImageFile(JpegImagePlugin.JpegImageFile): if self.info.get("exif") != original_exif: self._reload_exif() - self.tile = [("jpeg", (0, 0) + self.size, self.offset, self.tile[0][-1])] + self.tile = [ + ImageFile._Tile("jpeg", (0, 0) + self.size, self.offset, self.tile[0][-1]) + ] self.__frame = frame def tell(self) -> int: diff --git a/src/PIL/MspImagePlugin.py b/src/PIL/MspImagePlugin.py index 40e5fa435..c92603254 100644 --- a/src/PIL/MspImagePlugin.py +++ b/src/PIL/MspImagePlugin.py @@ -70,9 +70,9 @@ class MspImageFile(ImageFile.ImageFile): self._size = i16(s, 4), i16(s, 6) if s[:4] == b"DanM": - self.tile = [("raw", (0, 0) + self.size, 32, ("1", 0, 1))] + self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 32, ("1", 0, 1))] else: - self.tile = [("MSP", (0, 0) + self.size, 32, None)] + self.tile = [ImageFile._Tile("MSP", (0, 0) + self.size, 32, None)] class MspDecoder(ImageFile.PyDecoder): diff --git a/src/PIL/PcdImagePlugin.py b/src/PIL/PcdImagePlugin.py index d9970405c..e8ea800a4 100644 --- a/src/PIL/PcdImagePlugin.py +++ b/src/PIL/PcdImagePlugin.py @@ -47,7 +47,7 @@ class PcdImageFile(ImageFile.ImageFile): self._mode = "RGB" self._size = 768, 512 # FIXME: not correct for rotated images! - self.tile = [("pcd", (0, 0) + self.size, 96 * 2048, None)] + self.tile = [ImageFile._Tile("pcd", (0, 0) + self.size, 96 * 2048, None)] def load_end(self) -> None: if self.tile_post_rotate: diff --git a/src/PIL/PcxImagePlugin.py b/src/PIL/PcxImagePlugin.py index c3c9dd3f1..8445d5cc7 100644 --- a/src/PIL/PcxImagePlugin.py +++ b/src/PIL/PcxImagePlugin.py @@ -128,7 +128,9 @@ class PcxImageFile(ImageFile.ImageFile): bbox = (0, 0) + self.size logger.debug("size: %sx%s", *self.size) - self.tile = [("pcx", bbox, self.fp.tell(), (rawmode, planes * stride))] + self.tile = [ + ImageFile._Tile("pcx", bbox, self.fp.tell(), (rawmode, planes * stride)) + ] # -------------------------------------------------------------------- diff --git a/src/PIL/PixarImagePlugin.py b/src/PIL/PixarImagePlugin.py index 887b6568b..36f565f1c 100644 --- a/src/PIL/PixarImagePlugin.py +++ b/src/PIL/PixarImagePlugin.py @@ -61,7 +61,9 @@ class PixarImageFile(ImageFile.ImageFile): # FIXME: to be continued... # create tile descriptor (assuming "dumped") - self.tile = [("raw", (0, 0) + self.size, 1024, (self.mode, 0, 1))] + self.tile = [ + ImageFile._Tile("raw", (0, 0) + self.size, 1024, (self.mode, 0, 1)) + ] # diff --git a/src/PIL/PpmImagePlugin.py b/src/PIL/PpmImagePlugin.py index 7bdaa9fe7..e4d745e67 100644 --- a/src/PIL/PpmImagePlugin.py +++ b/src/PIL/PpmImagePlugin.py @@ -151,7 +151,9 @@ class PpmImageFile(ImageFile.ImageFile): decoder_name = "ppm" args = rawmode if decoder_name == "raw" else (rawmode, maxval) - self.tile = [(decoder_name, (0, 0) + self.size, self.fp.tell(), args)] + self.tile = [ + ImageFile._Tile(decoder_name, (0, 0) + self.size, self.fp.tell(), args) + ] # diff --git a/src/PIL/PsdImagePlugin.py b/src/PIL/PsdImagePlugin.py index cc99cd6d8..8ff5e3908 100644 --- a/src/PIL/PsdImagePlugin.py +++ b/src/PIL/PsdImagePlugin.py @@ -277,8 +277,8 @@ def _layerinfo( def _maketile( file: IO[bytes], mode: str, bbox: tuple[int, int, int, int], channels: int -) -> list[ImageFile._Tile] | None: - tiles = None +) -> list[ImageFile._Tile]: + tiles = [] read = file.read compression = i16(read(2)) @@ -291,7 +291,6 @@ def _maketile( if compression == 0: # # raw compression - tiles = [] for channel in range(channels): layer = mode[channel] if mode == "CMYK": @@ -303,7 +302,6 @@ def _maketile( # # packbits compression i = 0 - tiles = [] bytecount = read(channels * ysize * 2) offset = file.tell() for channel in range(channels): diff --git a/src/PIL/QoiImagePlugin.py b/src/PIL/QoiImagePlugin.py index c81d381fb..eaf031402 100644 --- a/src/PIL/QoiImagePlugin.py +++ b/src/PIL/QoiImagePlugin.py @@ -32,7 +32,7 @@ class QoiImageFile(ImageFile.ImageFile): self._mode = "RGB" if channels == 3 else "RGBA" self.fp.seek(1, os.SEEK_CUR) # colorspace - self.tile = [("qoi", (0, 0) + self._size, self.fp.tell(), None)] + self.tile = [ImageFile._Tile("qoi", (0, 0) + self._size, self.fp.tell(), None)] class QoiDecoder(ImageFile.PyDecoder): diff --git a/src/PIL/SgiImagePlugin.py b/src/PIL/SgiImagePlugin.py index 50d979109..2c205a926 100644 --- a/src/PIL/SgiImagePlugin.py +++ b/src/PIL/SgiImagePlugin.py @@ -109,19 +109,28 @@ class SgiImageFile(ImageFile.ImageFile): pagesize = xsize * ysize * bpc if bpc == 2: self.tile = [ - ("SGI16", (0, 0) + self.size, headlen, (self.mode, 0, orientation)) + ImageFile._Tile( + "SGI16", + (0, 0) + self.size, + headlen, + (self.mode, 0, orientation), + ) ] else: self.tile = [] offset = headlen for layer in self.mode: self.tile.append( - ("raw", (0, 0) + self.size, offset, (layer, 0, orientation)) + ImageFile._Tile( + "raw", (0, 0) + self.size, offset, (layer, 0, orientation) + ) ) offset += pagesize elif compression == 1: self.tile = [ - ("sgi_rle", (0, 0) + self.size, headlen, (rawmode, orientation, bpc)) + ImageFile._Tile( + "sgi_rle", (0, 0) + self.size, headlen, (rawmode, orientation, bpc) + ) ] diff --git a/src/PIL/SpiderImagePlugin.py b/src/PIL/SpiderImagePlugin.py index 7045ab566..075073f9f 100644 --- a/src/PIL/SpiderImagePlugin.py +++ b/src/PIL/SpiderImagePlugin.py @@ -154,7 +154,9 @@ class SpiderImageFile(ImageFile.ImageFile): self.rawmode = "F;32F" self._mode = "F" - self.tile = [("raw", (0, 0) + self.size, offset, (self.rawmode, 0, 1))] + self.tile = [ + ImageFile._Tile("raw", (0, 0) + self.size, offset, (self.rawmode, 0, 1)) + ] self._fp = self.fp # FIXME: hack @property diff --git a/src/PIL/SunImagePlugin.py b/src/PIL/SunImagePlugin.py index 4e098474a..8912379ea 100644 --- a/src/PIL/SunImagePlugin.py +++ b/src/PIL/SunImagePlugin.py @@ -124,9 +124,13 @@ class SunImageFile(ImageFile.ImageFile): # (https://www.fileformat.info/format/sunraster/egff.htm) if file_type in (0, 1, 3, 4, 5): - self.tile = [("raw", (0, 0) + self.size, offset, (rawmode, stride))] + self.tile = [ + ImageFile._Tile("raw", (0, 0) + self.size, offset, (rawmode, stride)) + ] elif file_type == 2: - self.tile = [("sun_rle", (0, 0) + self.size, offset, rawmode)] + self.tile = [ + ImageFile._Tile("sun_rle", (0, 0) + self.size, offset, rawmode) + ] else: msg = "Unsupported Sun Raster file type" raise SyntaxError(msg) diff --git a/src/PIL/TgaImagePlugin.py b/src/PIL/TgaImagePlugin.py index 5aea363c0..90d5b5cf4 100644 --- a/src/PIL/TgaImagePlugin.py +++ b/src/PIL/TgaImagePlugin.py @@ -137,7 +137,7 @@ class TgaImageFile(ImageFile.ImageFile): if imagetype & 8: # compressed self.tile = [ - ( + ImageFile._Tile( "tga_rle", (0, 0) + self.size, self.fp.tell(), @@ -146,7 +146,7 @@ class TgaImageFile(ImageFile.ImageFile): ] else: self.tile = [ - ( + ImageFile._Tile( "raw", (0, 0) + self.size, self.fp.tell(), diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index ab23356d4..d05c08489 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1298,7 +1298,7 @@ class TiffImageFile(ImageFile.ImageFile): # (self._compression, (extents tuple), # 0, (rawmode, self._compression, fp)) extents = self.tile[0][1] - args = list(self.tile[0][3]) + args = self.tile[0][3] # To be nice on memory footprint, if there's a # file descriptor, use that instead of reading @@ -1316,11 +1316,12 @@ class TiffImageFile(ImageFile.ImageFile): fp = False if fp: - args[2] = fp + assert isinstance(args, tuple) + args_list = list(args) + args_list[2] = fp + args = tuple(args_list) - decoder = Image._getdecoder( - self.mode, "libtiff", tuple(args), self.decoderconfig - ) + decoder = Image._getdecoder(self.mode, "libtiff", args, self.decoderconfig) try: decoder.setimage(self.im, extents) except ValueError as e: @@ -1538,7 +1539,7 @@ class TiffImageFile(ImageFile.ImageFile): # Offset in the tile tuple is 0, we go from 0,0 to # w,h, and we only do this once -- eds a = (rawmode, self._compression, False, self.tag_v2.offset) - self.tile.append(("libtiff", (0, 0, xsize, ysize), 0, a)) + self.tile.append(ImageFile._Tile("libtiff", (0, 0, xsize, ysize), 0, a)) elif STRIPOFFSETS in self.tag_v2 or TILEOFFSETS in self.tag_v2: # striped image @@ -1571,7 +1572,7 @@ class TiffImageFile(ImageFile.ImageFile): args = (tile_rawmode, int(stride), 1) self.tile.append( - ( + ImageFile._Tile( self._compression, (x, y, min(x + w, xsize), min(y + h, ysize)), offset, diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index fc8f4fc2e..f8d6168ba 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -142,7 +142,7 @@ class WebPImageFile(ImageFile.ImageFile): if self.fp and self._exclusive_fp: self.fp.close() self.fp = BytesIO(data) - self.tile = [("raw", (0, 0) + self.size, 0, self.rawmode)] + self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 0, self.rawmode)] return super().load() diff --git a/src/PIL/XVThumbImagePlugin.py b/src/PIL/XVThumbImagePlugin.py index c84adaca2..5d1f201a4 100644 --- a/src/PIL/XVThumbImagePlugin.py +++ b/src/PIL/XVThumbImagePlugin.py @@ -73,7 +73,11 @@ class XVThumbImageFile(ImageFile.ImageFile): self.palette = ImagePalette.raw("RGB", PALETTE) - self.tile = [("raw", (0, 0) + self.size, self.fp.tell(), (self.mode, 0, 1))] + self.tile = [ + ImageFile._Tile( + "raw", (0, 0) + self.size, self.fp.tell(), (self.mode, 0, 1) + ) + ] # -------------------------------------------------------------------- diff --git a/src/PIL/XbmImagePlugin.py b/src/PIL/XbmImagePlugin.py index 6c2e32804..f3d490a84 100644 --- a/src/PIL/XbmImagePlugin.py +++ b/src/PIL/XbmImagePlugin.py @@ -67,7 +67,7 @@ class XbmImageFile(ImageFile.ImageFile): self._mode = "1" self._size = xsize, ysize - self.tile = [("xbm", (0, 0) + self.size, m.end(), None)] + self.tile = [ImageFile._Tile("xbm", (0, 0) + self.size, m.end(), None)] def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: diff --git a/src/PIL/XpmImagePlugin.py b/src/PIL/XpmImagePlugin.py index 8d56331e6..1fc6c0c39 100644 --- a/src/PIL/XpmImagePlugin.py +++ b/src/PIL/XpmImagePlugin.py @@ -101,7 +101,9 @@ class XpmImageFile(ImageFile.ImageFile): self._mode = "P" self.palette = ImagePalette.raw("RGB", b"".join(palette)) - self.tile = [("raw", (0, 0) + self.size, self.fp.tell(), ("P", 0, 1))] + self.tile = [ + ImageFile._Tile("raw", (0, 0) + self.size, self.fp.tell(), ("P", 0, 1)) + ] def load_read(self, read_bytes: int) -> bytes: # From 8699f13a74f162552fa70644bfdbe9705f87f080 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 29 Aug 2024 22:15:43 +1000 Subject: [PATCH 303/662] Require fp parameter --- src/PIL/ImageFile.py | 6 +++--- src/PIL/JpegImagePlugin.py | 2 +- src/PIL/TiffImagePlugin.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index fce1591ef..69fbafd39 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -34,7 +34,7 @@ import itertools import os import struct import sys -from typing import IO, TYPE_CHECKING, Any, NamedTuple +from typing import IO, TYPE_CHECKING, Any, NamedTuple, cast from . import Image from ._deprecate import deprecate @@ -111,7 +111,7 @@ class ImageFile(Image.Image): """Base class for image file format handlers.""" def __init__( - self, fp: StrOrBytesPath | IO[bytes] | None = None, filename: str | bytes | None = None + self, fp: StrOrBytesPath | IO[bytes], filename: str | bytes | None = None ) -> None: super().__init__() @@ -134,7 +134,7 @@ class ImageFile(Image.Image): self._exclusive_fp = True else: # stream - self.fp = fp + self.fp = cast(IO[bytes], fp) self.filename = filename if filename is not None else "" # can be overridden self._exclusive_fp = False diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 1f54b7e92..e3372a1c2 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -848,7 +848,7 @@ def _save_cjpeg(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: ## # Factory for making JPEG and MPO instances def jpeg_factory( - fp: IO[bytes] | None = None, filename: str | bytes | None = None + fp: IO[bytes], filename: str | bytes | None = None ) -> JpegImageFile | MpoImageFile: im = JpegImageFile(fp, filename) try: diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index d05c08489..ad898dc8e 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1126,7 +1126,7 @@ class TiffImageFile(ImageFile.ImageFile): def __init__( self, - fp: StrOrBytesPath | IO[bytes] | None = None, + fp: StrOrBytesPath | IO[bytes], filename: str | bytes | None = None, ) -> None: self.tag_v2: ImageFileDirectory_v2 From cdadf931e36cb3816096197ce91abfbe6b11df92 Mon Sep 17 00:00:00 2001 From: Yngve Mardal Moe Date: Fri, 30 Aug 2024 20:36:22 +0000 Subject: [PATCH 304/662] Improve error messages --- Tests/test_imagefont.py | 27 +++++++++++++++++++++++++++ src/PIL/ImageFont.py | 19 +++++++++++++++---- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 340cc4742..e2a7b759a 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -460,6 +460,17 @@ def test_free_type_font_get_mask(font: ImageFont.FreeTypeFont) -> None: assert mask.size == (108, 13) +def test_load_raises_if_image_not_found(tmp_path) -> None: + font_path = tmp_path / "file.font" + font_path.write_bytes(b"") + with pytest.raises(OSError) as excinfo: + ImageFont.load(font_path) + + pre = tmp_path / "file" + msg = f"cannot find glyph data file {pre}.{{png|gif|pbm}}" + assert msg in str(excinfo.value) + + def test_load_path_not_found() -> None: # Arrange filename = "somefilenamethatdoesntexist.ttf" @@ -471,6 +482,22 @@ def test_load_path_not_found() -> None: ImageFont.truetype(filename) +def test_load_path_exisitng_path(tmp_path) -> None: + # First, the file doens't exist, so we don't suggest `load` + some_path = tmp_path / "file.ttf" + with pytest.raises(OSError) as excinfo: + ImageFont.load_path(str(some_path)) + assert str(some_path) in str(excinfo.value) + assert "did you mean" not in str(excinfo.value) + + # The file exists, so the error message suggests to use `load` instead + some_path.write_bytes(b"") + with pytest.raises(OSError) as excinfo: + ImageFont.load_path(str(some_path)) + assert str(some_path) in str(excinfo.value) + assert " did you mean" in str(excinfo.value) + + def test_load_non_font_bytes() -> None: with open("Tests/images/hopper.jpg", "rb") as f: with pytest.raises(OSError): diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 2ab65bfef..072acc31f 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -98,11 +98,13 @@ class ImageFont: def _load_pilfont(self, filename: str) -> None: with open(filename, "rb") as fp: image: ImageFile.ImageFile | None = None + filename_body = os.path.splitext(filename)[0] + for ext in (".png", ".gif", ".pbm"): if image: image.close() try: - fullname = os.path.splitext(filename)[0] + ext + fullname = filename_body + ext image = Image.open(fullname) except Exception: pass @@ -112,7 +114,9 @@ class ImageFont: else: if image: image.close() - msg = "cannot find glyph data file" + + pre = filename_body + msg = f"cannot find glyph data file {pre}.{{png|gif|pbm}}" raise OSError(msg) self.file = fullname @@ -224,7 +228,7 @@ class FreeTypeFont: raise core.ex if size <= 0: - msg = "font size must be greater than 0" + msg = f"font size must be greater than 0, not {size}" raise ValueError(msg) self.path = font @@ -774,6 +778,8 @@ def load(filename: str) -> ImageFont: :param filename: Name of font file. :return: A font object. :exception OSError: If the file could not be read. + + .. seealso:: :py:func:`PIL.ImageFont.truetype` """ f = ImageFont() f._load_pilfont(filename) @@ -850,6 +856,8 @@ def truetype( :return: A font object. :exception OSError: If the file could not be read. :exception ValueError: If the font size is not greater than zero. + + .. seealso:: :py:func:`PIL.ImageFont.load` """ def freetype(font: StrOrBytesPath | BinaryIO | None) -> FreeTypeFont: @@ -927,7 +935,10 @@ def load_path(filename: str | bytes) -> ImageFont: return load(os.path.join(directory, filename)) except OSError: pass - msg = "cannot find font file" + msg = f"cannot find font file '{filename}' in `sys.path`" + if os.path.exists(filename): + msg += f" did you mean `ImageFont.load({filename})` instead?" + raise OSError(msg) From e47b1810841be44ca90327259a01ce9d9a71e5ad Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 31 Aug 2024 18:48:16 +1000 Subject: [PATCH 305/662] Added type hints --- .ci/requirements-mypy.txt | 1 + Tests/oss-fuzz/fuzz_font.py | 3 +- Tests/oss-fuzz/fuzz_pillow.py | 3 +- docs/reference/internal_modules.rst | 4 +++ pyproject.toml | 4 --- src/PIL/BmpImagePlugin.py | 2 +- src/PIL/Image.py | 7 ++++- src/PIL/ImageFile.py | 7 +++-- src/PIL/ImageFont.py | 6 ++-- src/PIL/Jpeg2KImagePlugin.py | 10 ++++-- src/PIL/MspImagePlugin.py | 2 +- src/PIL/PngImagePlugin.py | 4 ++- src/PIL/TiffImagePlugin.py | 48 +++++++++++++++++++---------- src/PIL/_typing.py | 4 ++- 14 files changed, 70 insertions(+), 35 deletions(-) diff --git a/.ci/requirements-mypy.txt b/.ci/requirements-mypy.txt index 5b09ef64c..dcb3996e2 100644 --- a/.ci/requirements-mypy.txt +++ b/.ci/requirements-mypy.txt @@ -6,6 +6,7 @@ numpy packaging pytest sphinx +types-atheris types-defusedxml types-olefile types-setuptools diff --git a/Tests/oss-fuzz/fuzz_font.py b/Tests/oss-fuzz/fuzz_font.py index 8788d7021..f4e40ea36 100755 --- a/Tests/oss-fuzz/fuzz_font.py +++ b/Tests/oss-fuzz/fuzz_font.py @@ -16,8 +16,9 @@ import atheris +from atheris.import_hook import instrument_imports -with atheris.instrument_imports(): +with instrument_imports(): import sys import fuzzers diff --git a/Tests/oss-fuzz/fuzz_pillow.py b/Tests/oss-fuzz/fuzz_pillow.py index 9137391b6..d58a6f015 100644 --- a/Tests/oss-fuzz/fuzz_pillow.py +++ b/Tests/oss-fuzz/fuzz_pillow.py @@ -14,8 +14,9 @@ import atheris +from atheris.import_hook import instrument_imports -with atheris.instrument_imports(): +with instrument_imports(): import sys import fuzzers diff --git a/docs/reference/internal_modules.rst b/docs/reference/internal_modules.rst index 2fb4ff8c0..31d60cd83 100644 --- a/docs/reference/internal_modules.rst +++ b/docs/reference/internal_modules.rst @@ -33,6 +33,10 @@ Internal Modules Provides a convenient way to import type hints that are not available on some Python versions. +.. py:class:: IntegralLike + + Typing alias. + .. py:class:: NumpyArray Typing alias. diff --git a/pyproject.toml b/pyproject.toml index e4ae73acf..4042bd9ee 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -163,7 +163,3 @@ follow_imports = "silent" warn_redundant_casts = true warn_unreachable = true warn_unused_ignores = true -exclude = [ - '^Tests/oss-fuzz/fuzz_font.py$', - '^Tests/oss-fuzz/fuzz_pillow.py$', -] diff --git a/src/PIL/BmpImagePlugin.py b/src/PIL/BmpImagePlugin.py index de441c6b5..707fb2192 100644 --- a/src/PIL/BmpImagePlugin.py +++ b/src/PIL/BmpImagePlugin.py @@ -387,7 +387,7 @@ class BmpRleDecoder(ImageFile.PyDecoder): if self.fd.tell() % 2 != 0: self.fd.seek(1, os.SEEK_CUR) rawmode = "L" if self.mode == "L" else "P" - self.set_as_raw(bytes(data), (rawmode, 0, self.args[-1])) + self.set_as_raw(bytes(data), rawmode, (0, self.args[-1])) return -1, 0 diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 95b4c64ee..d27328a83 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -225,6 +225,11 @@ if TYPE_CHECKING: from . import ImageFile, ImageFilter, ImagePalette, ImageQt, TiffImagePlugin from ._typing import NumpyArray, StrOrBytesPath, TypeGuard + + if sys.version_info >= (3, 13): + from types import CapsuleType + else: + CapsuleType = object ID: list[str] = [] OPEN: dict[ str, @@ -1598,7 +1603,7 @@ class Image: self.fp.seek(offset) return child_images - def getim(self): + def getim(self) -> CapsuleType: """ Returns a capsule that points to the internal image memory. diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index a1c33f219..0ecc9053c 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -736,19 +736,22 @@ class PyDecoder(PyCodec): msg = "unavailable in base decoder" raise NotImplementedError(msg) - def set_as_raw(self, data: bytes, rawmode=None) -> None: + def set_as_raw( + self, data: bytes, rawmode: str | None = None, extra: tuple[Any, ...] = () + ) -> None: """ Convenience method to set the internal image from a stream of raw data :param data: Bytes to be set :param rawmode: The rawmode to be used for the decoder. If not specified, it will default to the mode of the image + :param extra: Extra arguments for the decoder. :returns: None """ if not rawmode: rawmode = self.mode - d = Image._getdecoder(self.mode, "raw", rawmode) + d = Image._getdecoder(self.mode, "raw", rawmode, extra) assert self.im is not None d.setimage(self.im, self.state.extents()) s = d.decode(data) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 2ab65bfef..acc7ca1d2 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -34,7 +34,7 @@ import warnings from enum import IntEnum from io import BytesIO from types import ModuleType -from typing import IO, TYPE_CHECKING, Any, BinaryIO, TypedDict +from typing import IO, TYPE_CHECKING, Any, BinaryIO, TypedDict, cast from . import Image from ._typing import StrOrBytesPath @@ -245,7 +245,7 @@ class FreeTypeFont: self.layout_engine = layout_engine - def load_from_bytes(f) -> None: + def load_from_bytes(f: IO[bytes]) -> None: self.font_bytes = f.read() self.font = core.getfont( "", size, index, encoding, self.font_bytes, layout_engine @@ -267,7 +267,7 @@ class FreeTypeFont: font, size, index, encoding, layout_engine=layout_engine ) else: - load_from_bytes(font) + load_from_bytes(cast(IO[bytes], font)) def __getstate__(self) -> list[Any]: return [self.path, self.size, self.index, self.encoding, self.layout_engine] diff --git a/src/PIL/Jpeg2KImagePlugin.py b/src/PIL/Jpeg2KImagePlugin.py index 02c2e48cf..5c88ef0bb 100644 --- a/src/PIL/Jpeg2KImagePlugin.py +++ b/src/PIL/Jpeg2KImagePlugin.py @@ -18,6 +18,7 @@ from __future__ import annotations import io import os import struct +from collections.abc import Callable from typing import IO, cast from . import Image, ImageFile, ImagePalette, _binary @@ -316,8 +317,13 @@ class Jpeg2KImageFile(ImageFile.ImageFile): else: self.fp.seek(length - 2, os.SEEK_CUR) - @property - def reduce(self): + @property # type: ignore[override] + def reduce( + self, + ) -> ( + Callable[[int | tuple[int, int], tuple[int, int, int, int] | None], Image.Image] + | int + ): # https://github.com/python-pillow/Pillow/issues/4343 found that the # new Image 'reduce' method was shadowed by this plugin's 'reduce' # property. This attempts to allow for both scenarios diff --git a/src/PIL/MspImagePlugin.py b/src/PIL/MspImagePlugin.py index 40e5fa435..987d20c13 100644 --- a/src/PIL/MspImagePlugin.py +++ b/src/PIL/MspImagePlugin.py @@ -152,7 +152,7 @@ class MspDecoder(ImageFile.PyDecoder): msg = f"Corrupted MSP file in row {x}" raise OSError(msg) from e - self.set_as_raw(img.getvalue(), ("1", 0, 1)) + self.set_as_raw(img.getvalue(), "1") return -1, 0 diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index dc7face2f..a87e1a625 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -258,7 +258,9 @@ class iTXt(str): tkey: str | bytes | None @staticmethod - def __new__(cls, text, lang=None, tkey=None): + def __new__( + cls, text: str, lang: str | None = None, tkey: str | None = None + ) -> iTXt: """ :param cls: the class to use when creating the instance :param text: value for this key diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index ab23356d4..08d598f77 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -61,6 +61,9 @@ from ._typing import StrOrBytesPath from ._util import is_path from .TiffTags import TYPES +if TYPE_CHECKING: + from ._typing import IntegralLike + logger = logging.getLogger(__name__) # Set these to true to force use of libtiff for reading or writing. @@ -291,22 +294,24 @@ def _accept(prefix: bytes) -> bool: def _limit_rational( val: float | Fraction | IFDRational, max_val: int -) -> tuple[float, float]: +) -> tuple[IntegralLike, IntegralLike]: inv = abs(float(val)) > 1 n_d = IFDRational(1 / val if inv else val).limit_rational(max_val) return n_d[::-1] if inv else n_d -def _limit_signed_rational(val, max_val, min_val): +def _limit_signed_rational( + val: IFDRational, max_val: int, min_val: int +) -> tuple[IntegralLike, IntegralLike]: frac = Fraction(val) - n_d = frac.numerator, frac.denominator + n_d: tuple[IntegralLike, IntegralLike] = frac.numerator, frac.denominator - if min(n_d) < min_val: + if min(float(i) for i in n_d) < min_val: n_d = _limit_rational(val, abs(min_val)) - if max(n_d) > max_val: - val = Fraction(*n_d) - n_d = _limit_rational(val, max_val) + n_d_float = tuple(float(i) for i in n_d) + if max(n_d_float) > max_val: + n_d = _limit_rational(n_d_float[0] / n_d_float[1], max_val) return n_d @@ -318,8 +323,10 @@ _load_dispatch = {} _write_dispatch = {} -def _delegate(op: str): - def delegate(self, *args): +def _delegate(op: str) -> Any: + def delegate( + self: IFDRational, *args: tuple[float, ...] + ) -> bool | float | Fraction: return getattr(self._val, op)(*args) return delegate @@ -358,7 +365,10 @@ class IFDRational(Rational): self._numerator = value.numerator self._denominator = value.denominator else: - self._numerator = value + if TYPE_CHECKING: + self._numerator = cast(IntegralLike, value) + else: + self._numerator = value self._denominator = denominator if denominator == 0: @@ -371,14 +381,14 @@ class IFDRational(Rational): self._val = Fraction(value / denominator) @property - def numerator(self): + def numerator(self) -> IntegralLike: return self._numerator @property def denominator(self) -> int: return self._denominator - def limit_rational(self, max_denominator: int) -> tuple[float, int]: + def limit_rational(self, max_denominator: int) -> tuple[IntegralLike, int]: """ :param max_denominator: Integer, the maximum denominator value @@ -406,14 +416,18 @@ class IFDRational(Rational): val = float(val) return val == other - def __getstate__(self) -> list[float | Fraction]: + def __getstate__(self) -> list[float | Fraction | IntegralLike]: return [self._val, self._numerator, self._denominator] - def __setstate__(self, state: list[float | Fraction]) -> None: + def __setstate__(self, state: list[float | Fraction | IntegralLike]) -> None: IFDRational.__init__(self, 0) _val, _numerator, _denominator = state + assert isinstance(_val, (float, Fraction)) self._val = _val - self._numerator = _numerator + if TYPE_CHECKING: + self._numerator = cast(IntegralLike, _numerator) + else: + self._numerator = _numerator assert isinstance(_denominator, int) self._denominator = _denominator @@ -471,8 +485,8 @@ def _register_loader(idx: int, size: int) -> Callable[[_LoaderFunc], _LoaderFunc return decorator -def _register_writer(idx: int): - def decorator(func): +def _register_writer(idx: int) -> Callable[[Callable[..., Any]], Callable[..., Any]]: + def decorator(func: Callable[..., Any]) -> Callable[..., Any]: _write_dispatch[idx] = func # noqa: F821 return func diff --git a/src/PIL/_typing.py b/src/PIL/_typing.py index b6bb8d89a..093778464 100644 --- a/src/PIL/_typing.py +++ b/src/PIL/_typing.py @@ -6,6 +6,8 @@ from collections.abc import Sequence from typing import TYPE_CHECKING, Any, Protocol, TypeVar, Union if TYPE_CHECKING: + from numbers import _IntegralLike as IntegralLike + try: import numpy.typing as npt @@ -38,4 +40,4 @@ class SupportsRead(Protocol[_T_co]): StrOrBytesPath = Union[str, bytes, "os.PathLike[str]", "os.PathLike[bytes]"] -__all__ = ["TypeGuard", "StrOrBytesPath", "SupportsRead"] +__all__ = ["IntegralLike", "StrOrBytesPath", "SupportsRead", "TypeGuard"] From 95194a2050081169f0b7db02040da91b1994da5a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 31 Aug 2024 20:51:26 +1000 Subject: [PATCH 306/662] Use tempfile.NamedTemporaryFile --- Tests/test_imagefont.py | 43 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index e2a7b759a..80cd0d578 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -5,6 +5,7 @@ import os import re import shutil import sys +import tempfile from io import BytesIO from pathlib import Path from typing import Any, BinaryIO @@ -460,15 +461,15 @@ def test_free_type_font_get_mask(font: ImageFont.FreeTypeFont) -> None: assert mask.size == (108, 13) -def test_load_raises_if_image_not_found(tmp_path) -> None: - font_path = tmp_path / "file.font" - font_path.write_bytes(b"") - with pytest.raises(OSError) as excinfo: - ImageFont.load(font_path) +def test_load_when_image_not_found(tmp_path: Path) -> None: + tmpfile = tmp_path / "file.font" + tmpfile.write_bytes(b"") + tempfile = str(tmpfile) + with pytest.raises(OSError) as e: + ImageFont.load(tempfile) - pre = tmp_path / "file" - msg = f"cannot find glyph data file {pre}.{{png|gif|pbm}}" - assert msg in str(excinfo.value) + root = os.path.splitext(tempfile)[0] + assert str(e.value) == f"cannot find glyph data file {root}.{{png|gif|pbm}}" def test_load_path_not_found() -> None: @@ -476,26 +477,24 @@ def test_load_path_not_found() -> None: filename = "somefilenamethatdoesntexist.ttf" # Act/Assert - with pytest.raises(OSError): + with pytest.raises(OSError) as e: ImageFont.load_path(filename) + + # The file doesn't exist, so don't suggest `load` + assert filename in str(e.value) + assert "did you mean" not in str(e.value) with pytest.raises(OSError): ImageFont.truetype(filename) -def test_load_path_exisitng_path(tmp_path) -> None: - # First, the file doens't exist, so we don't suggest `load` - some_path = tmp_path / "file.ttf" - with pytest.raises(OSError) as excinfo: - ImageFont.load_path(str(some_path)) - assert str(some_path) in str(excinfo.value) - assert "did you mean" not in str(excinfo.value) +def test_load_path_existing_path() -> None: + with tempfile.NamedTemporaryFile() as tmp: + with pytest.raises(OSError) as e: + ImageFont.load_path(tmp.name) - # The file exists, so the error message suggests to use `load` instead - some_path.write_bytes(b"") - with pytest.raises(OSError) as excinfo: - ImageFont.load_path(str(some_path)) - assert str(some_path) in str(excinfo.value) - assert " did you mean" in str(excinfo.value) + # The file exists, so the error message suggests to use `load` instead + assert tmp.name in str(e.value) + assert " did you mean" in str(e.value) def test_load_non_font_bytes() -> None: From e0a75b6d695b7be82c090adb1896022e42d344ff Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 31 Aug 2024 19:43:35 +1000 Subject: [PATCH 307/662] Renamed variable for first part of splitext to root --- src/PIL/ImageFont.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 072acc31f..43e86a7ed 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -98,13 +98,13 @@ class ImageFont: def _load_pilfont(self, filename: str) -> None: with open(filename, "rb") as fp: image: ImageFile.ImageFile | None = None - filename_body = os.path.splitext(filename)[0] + root = os.path.splitext(filename)[0] for ext in (".png", ".gif", ".pbm"): if image: image.close() try: - fullname = filename_body + ext + fullname = root + ext image = Image.open(fullname) except Exception: pass @@ -115,8 +115,7 @@ class ImageFont: if image: image.close() - pre = filename_body - msg = f"cannot find glyph data file {pre}.{{png|gif|pbm}}" + msg = f"cannot find glyph data file {root}.{{png|gif|pbm}}" raise OSError(msg) self.file = fullname @@ -937,7 +936,7 @@ def load_path(filename: str | bytes) -> ImageFont: pass msg = f"cannot find font file '{filename}' in `sys.path`" if os.path.exists(filename): - msg += f" did you mean `ImageFont.load({filename})` instead?" + msg += f", did you mean `ImageFont.load({filename})` instead?" raise OSError(msg) From fcca8a3059f94640dee493164b54ec466c13ff74 Mon Sep 17 00:00:00 2001 From: Yngve Mardal Moe Date: Sat, 31 Aug 2024 19:03:11 +0000 Subject: [PATCH 308/662] Fix accidental indent --- Tests/test_imagefont.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index e2a7b759a..80ec7bd6b 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -487,8 +487,8 @@ def test_load_path_exisitng_path(tmp_path) -> None: some_path = tmp_path / "file.ttf" with pytest.raises(OSError) as excinfo: ImageFont.load_path(str(some_path)) - assert str(some_path) in str(excinfo.value) - assert "did you mean" not in str(excinfo.value) + assert str(some_path) in str(excinfo.value) + assert "did you mean" not in str(excinfo.value) # The file exists, so the error message suggests to use `load` instead some_path.write_bytes(b"") From ef51e7a1c70ae684615724750c32ba3ca6923123 Mon Sep 17 00:00:00 2001 From: Yngve Mardal Moe Date: Sun, 1 Sep 2024 19:49:44 +0000 Subject: [PATCH 309/662] Fix wrong indentation for assert --- Tests/test_imagefont.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 80cd0d578..66e6947c2 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -480,9 +480,9 @@ def test_load_path_not_found() -> None: with pytest.raises(OSError) as e: ImageFont.load_path(filename) - # The file doesn't exist, so don't suggest `load` - assert filename in str(e.value) - assert "did you mean" not in str(e.value) + # The file doesn't exist, so don't suggest `load` + assert filename in str(e.value) + assert "did you mean" not in str(e.value) with pytest.raises(OSError): ImageFont.truetype(filename) From 2303c063cb9660c8fdd4a5d757e1d971cd47dcf8 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 01:24:51 +0400 Subject: [PATCH 310/662] Use PyCapsule in _imagingmath --- src/PIL/ImageMath.py | 4 +- src/_imagingmath.c | 145 +++++++++++++++++++++++++++---------------- 2 files changed, 94 insertions(+), 55 deletions(-) diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py index 191cc2a5f..b32742657 100644 --- a/src/PIL/ImageMath.py +++ b/src/PIL/ImageMath.py @@ -65,7 +65,7 @@ class _Operand: except AttributeError as e: msg = f"bad operand type for '{op}'" raise TypeError(msg) from e - _imagingmath.unop(op, out.im.id, im_1.im.id) + _imagingmath.unop(op, out.im.ptr, im_1.im.ptr) else: # binary operation im_2 = self.__fixup(im2) @@ -93,7 +93,7 @@ class _Operand: except AttributeError as e: msg = f"bad operand type for '{op}'" raise TypeError(msg) from e - _imagingmath.binop(op, out.im.id, im_1.im.id, im_2.im.id) + _imagingmath.binop(op, out.im.ptr, im_1.im.ptr, im_2.im.ptr) return _Operand(out) # unary operators diff --git a/src/_imagingmath.c b/src/_imagingmath.c index 550a10903..eafcf1444 100644 --- a/src/_imagingmath.c +++ b/src/_imagingmath.c @@ -23,6 +23,9 @@ #define MAX_INT32 2147483647.0 #define MIN_INT32 -2147483648.0 +#define MATH_FUNC_UNOP_MAGIC "Pillow Math unary func" +#define MATH_FUNC_BINOP_MAGIC "Pillow Math binary func" + #define UNOP(name, op, type) \ void name(Imaging out, Imaging im1) { \ int x, y; \ @@ -168,15 +171,28 @@ _unop(PyObject *self, PyObject *args) { Imaging im1; void (*unop)(Imaging, Imaging); - Py_ssize_t op, i0, i1; - if (!PyArg_ParseTuple(args, "nnn", &op, &i0, &i1)) { + PyObject *op, *i0, *i1; + if (!PyArg_ParseTuple(args, "OOO", &op, &i0, &i1)) { return NULL; } - out = (Imaging)i0; - im1 = (Imaging)i1; + if (!PyCapsule_IsValid(op, MATH_FUNC_UNOP_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", MATH_FUNC_UNOP_MAGIC + ); + return NULL; + } + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || + !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } - unop = (void *)op; + unop = (void *)PyCapsule_GetPointer(op, MATH_FUNC_UNOP_MAGIC); + out = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); + im1 = (Imaging)PyCapsule_GetPointer(i1, IMAGING_MAGIC); unop(out, im1); @@ -191,16 +207,30 @@ _binop(PyObject *self, PyObject *args) { Imaging im2; void (*binop)(Imaging, Imaging, Imaging); - Py_ssize_t op, i0, i1, i2; - if (!PyArg_ParseTuple(args, "nnnn", &op, &i0, &i1, &i2)) { + PyObject *op, *i0, *i1, *i2; + if (!PyArg_ParseTuple(args, "OOOO", &op, &i0, &i1, &i2)) { return NULL; } - out = (Imaging)i0; - im1 = (Imaging)i1; - im2 = (Imaging)i2; + if (!PyCapsule_IsValid(op, MATH_FUNC_BINOP_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", MATH_FUNC_BINOP_MAGIC + ); + return NULL; + } + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || + !PyCapsule_IsValid(i1, IMAGING_MAGIC) || + !PyCapsule_IsValid(i2, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } - binop = (void *)op; + binop = (void *)PyCapsule_GetPointer(op, MATH_FUNC_BINOP_MAGIC); + out = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); + im1 = (Imaging)PyCapsule_GetPointer(i1, IMAGING_MAGIC); + im2 = (Imaging)PyCapsule_GetPointer(i2, IMAGING_MAGIC); binop(out, im1, im2); @@ -213,8 +243,17 @@ static PyMethodDef _functions[] = { }; static void -install(PyObject *d, char *name, void *value) { - PyObject *v = PyLong_FromSsize_t((Py_ssize_t)value); +install_unary(PyObject *d, char *name, void *func) { + PyObject *v = PyCapsule_New(func, MATH_FUNC_UNOP_MAGIC, NULL); + if (!v || PyDict_SetItemString(d, name, v)) { + PyErr_Clear(); + } + Py_XDECREF(v); +} + +static void +install_binary(PyObject *d, char *name, void *func) { + PyObject *v = PyCapsule_New(func, MATH_FUNC_BINOP_MAGIC, NULL); if (!v || PyDict_SetItemString(d, name, v)) { PyErr_Clear(); } @@ -225,50 +264,50 @@ static int setup_module(PyObject *m) { PyObject *d = PyModule_GetDict(m); - install(d, "abs_I", abs_I); - install(d, "neg_I", neg_I); - install(d, "add_I", add_I); - install(d, "sub_I", sub_I); - install(d, "diff_I", diff_I); - install(d, "mul_I", mul_I); - install(d, "div_I", div_I); - install(d, "mod_I", mod_I); - install(d, "min_I", min_I); - install(d, "max_I", max_I); - install(d, "pow_I", pow_I); + install_unary(d, "abs_I", abs_I); + install_unary(d, "neg_I", neg_I); + install_binary(d, "add_I", add_I); + install_binary(d, "sub_I", sub_I); + install_binary(d, "diff_I", diff_I); + install_binary(d, "mul_I", mul_I); + install_binary(d, "div_I", div_I); + install_binary(d, "mod_I", mod_I); + install_binary(d, "min_I", min_I); + install_binary(d, "max_I", max_I); + install_binary(d, "pow_I", pow_I); - install(d, "invert_I", invert_I); - install(d, "and_I", and_I); - install(d, "or_I", or_I); - install(d, "xor_I", xor_I); - install(d, "lshift_I", lshift_I); - install(d, "rshift_I", rshift_I); + install_unary(d, "invert_I", invert_I); + install_binary(d, "and_I", and_I); + install_binary(d, "or_I", or_I); + install_binary(d, "xor_I", xor_I); + install_binary(d, "lshift_I", lshift_I); + install_binary(d, "rshift_I", rshift_I); - install(d, "eq_I", eq_I); - install(d, "ne_I", ne_I); - install(d, "lt_I", lt_I); - install(d, "le_I", le_I); - install(d, "gt_I", gt_I); - install(d, "ge_I", ge_I); + install_binary(d, "eq_I", eq_I); + install_binary(d, "ne_I", ne_I); + install_binary(d, "lt_I", lt_I); + install_binary(d, "le_I", le_I); + install_binary(d, "gt_I", gt_I); + install_binary(d, "ge_I", ge_I); - install(d, "abs_F", abs_F); - install(d, "neg_F", neg_F); - install(d, "add_F", add_F); - install(d, "sub_F", sub_F); - install(d, "diff_F", diff_F); - install(d, "mul_F", mul_F); - install(d, "div_F", div_F); - install(d, "mod_F", mod_F); - install(d, "min_F", min_F); - install(d, "max_F", max_F); - install(d, "pow_F", pow_F); + install_unary(d, "abs_F", abs_F); + install_unary(d, "neg_F", neg_F); + install_binary(d, "add_F", add_F); + install_binary(d, "sub_F", sub_F); + install_binary(d, "diff_F", diff_F); + install_binary(d, "mul_F", mul_F); + install_binary(d, "div_F", div_F); + install_binary(d, "mod_F", mod_F); + install_binary(d, "min_F", min_F); + install_binary(d, "max_F", max_F); + install_binary(d, "pow_F", pow_F); - install(d, "eq_F", eq_F); - install(d, "ne_F", ne_F); - install(d, "lt_F", lt_F); - install(d, "le_F", le_F); - install(d, "gt_F", gt_F); - install(d, "ge_F", ge_F); + install_binary(d, "eq_F", eq_F); + install_binary(d, "ne_F", ne_F); + install_binary(d, "lt_F", lt_F); + install_binary(d, "le_F", le_F); + install_binary(d, "gt_F", gt_F); + install_binary(d, "ge_F", ge_F); return 0; } From a9798e78af90674d2983c749c2bb63af9a9e5a6f Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 01:32:28 +0400 Subject: [PATCH 311/662] Use PyCapsule in _imagingcms --- src/PIL/ImageCms.py | 4 ++-- src/_imagingcms.c | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/PIL/ImageCms.py b/src/PIL/ImageCms.py index ec10230f1..5e256b0ab 100644 --- a/src/PIL/ImageCms.py +++ b/src/PIL/ImageCms.py @@ -352,7 +352,7 @@ class ImageCmsTransform(Image.ImagePointHandler): im.load() if imOut is None: imOut = Image.new(self.output_mode, im.size, None) - self.transform.apply(im.im.id, imOut.im.id) + self.transform.apply(im.im.ptr, imOut.im.ptr) imOut.info["icc_profile"] = self.output_profile.tobytes() return imOut @@ -361,7 +361,7 @@ class ImageCmsTransform(Image.ImagePointHandler): if im.mode != self.output_mode: msg = "mode mismatch" raise ValueError(msg) # wrong output mode - self.transform.apply(im.im.id, im.im.id) + self.transform.apply(im.im.ptr, im.im.ptr) im.info["icc_profile"] = self.output_profile.tobytes() return im diff --git a/src/_imagingcms.c b/src/_imagingcms.c index bafe787a7..444b6a602 100644 --- a/src/_imagingcms.c +++ b/src/_imagingcms.c @@ -531,23 +531,26 @@ buildProofTransform(PyObject *self, PyObject *args) { static PyObject * cms_transform_apply(CmsTransformObject *self, PyObject *args) { - Py_ssize_t idIn; - Py_ssize_t idOut; + PyObject *i0, *i1; Imaging im; Imaging imOut; - int result; - - if (!PyArg_ParseTuple(args, "nn:apply", &idIn, &idOut)) { + if (!PyArg_ParseTuple(args, "OO:apply", &i0, &i1)) { return NULL; } - im = (Imaging)idIn; - imOut = (Imaging)idOut; + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || + !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } - result = pyCMSdoTransform(im, imOut, self->transform); + im = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); + imOut = (Imaging)PyCapsule_GetPointer(i1, IMAGING_MAGIC); - return Py_BuildValue("i", result); + return Py_BuildValue("i", pyCMSdoTransform(im, imOut, self->transform)); } /* -------------------------------------------------------------------- */ From 2fcab263d3e3aae6156a18a0180e00954f032153 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 01:43:38 +0400 Subject: [PATCH 312/662] Use PyCapsule in _imagingmorph --- Tests/test_imagemorph.py | 8 +++---- src/PIL/ImageMorph.py | 6 ++--- src/_imagingmorph.c | 48 ++++++++++++++++++++++++++++++---------- 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/Tests/test_imagemorph.py b/Tests/test_imagemorph.py index 80d8c3815..04860fd61 100644 --- a/Tests/test_imagemorph.py +++ b/Tests/test_imagemorph.py @@ -328,13 +328,13 @@ def test_wrong_mode() -> None: iml = Image.new("L", (10, 10)) with pytest.raises(RuntimeError): - _imagingmorph.apply(bytes(lut), imrgb.im.id, iml.im.id) + _imagingmorph.apply(bytes(lut), imrgb.im.ptr, iml.im.ptr) with pytest.raises(RuntimeError): - _imagingmorph.apply(bytes(lut), iml.im.id, imrgb.im.id) + _imagingmorph.apply(bytes(lut), iml.im.ptr, imrgb.im.ptr) with pytest.raises(RuntimeError): - _imagingmorph.match(bytes(lut), imrgb.im.id) + _imagingmorph.match(bytes(lut), imrgb.im.ptr) # Should not raise - _imagingmorph.match(bytes(lut), iml.im.id) + _imagingmorph.match(bytes(lut), iml.im.ptr) diff --git a/src/PIL/ImageMorph.py b/src/PIL/ImageMorph.py index 6a43983d3..bc7ed66d3 100644 --- a/src/PIL/ImageMorph.py +++ b/src/PIL/ImageMorph.py @@ -213,7 +213,7 @@ class MorphOp: msg = "Image mode must be L" raise ValueError(msg) outimage = Image.new(image.mode, image.size, None) - count = _imagingmorph.apply(bytes(self.lut), image.im.id, outimage.im.id) + count = _imagingmorph.apply(bytes(self.lut), image.im.ptr, outimage.im.ptr) return count, outimage def match(self, image: Image.Image) -> list[tuple[int, int]]: @@ -229,7 +229,7 @@ class MorphOp: if image.mode != "L": msg = "Image mode must be L" raise ValueError(msg) - return _imagingmorph.match(bytes(self.lut), image.im.id) + return _imagingmorph.match(bytes(self.lut), image.im.ptr) def get_on_pixels(self, image: Image.Image) -> list[tuple[int, int]]: """Get a list of all turned on pixels in a binary image @@ -240,7 +240,7 @@ class MorphOp: if image.mode != "L": msg = "Image mode must be L" raise ValueError(msg) - return _imagingmorph.get_on_pixels(image.im.id) + return _imagingmorph.get_on_pixels(image.im.ptr) def load_lut(self, filename: str) -> None: """Load an operator from an mrl file""" diff --git a/src/_imagingmorph.c b/src/_imagingmorph.c index 614dfbe7f..c7933cc7d 100644 --- a/src/_imagingmorph.c +++ b/src/_imagingmorph.c @@ -30,15 +30,15 @@ static PyObject * apply(PyObject *self, PyObject *args) { const char *lut; - PyObject *py_lut; - Py_ssize_t lut_len, i0, i1; + PyObject *py_lut, *i0, *i1; + Py_ssize_t lut_len; Imaging imgin, imgout; int width, height; int row_idx, col_idx; UINT8 **inrows, **outrows; int num_changed_pixels = 0; - if (!PyArg_ParseTuple(args, "Onn", &py_lut, &i0, &i1)) { + if (!PyArg_ParseTuple(args, "OOO", &py_lut, &i0, &i1)) { PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem"); return NULL; } @@ -57,8 +57,16 @@ apply(PyObject *self, PyObject *args) { lut = PyBytes_AsString(py_lut); - imgin = (Imaging)i0; - imgout = (Imaging)i1; + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || + !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } + + imgin = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); + imgout = (Imaging)PyCapsule_GetPointer(i1, IMAGING_MAGIC); width = imgin->xsize; height = imgin->ysize; @@ -129,8 +137,8 @@ apply(PyObject *self, PyObject *args) { static PyObject * match(PyObject *self, PyObject *args) { const char *lut; - PyObject *py_lut; - Py_ssize_t lut_len, i0; + PyObject *py_lut, *i0; + Py_ssize_t lut_len; Imaging imgin; int width, height; int row_idx, col_idx; @@ -140,7 +148,7 @@ match(PyObject *self, PyObject *args) { return NULL; } - if (!PyArg_ParseTuple(args, "On", &py_lut, &i0)) { + if (!PyArg_ParseTuple(args, "OO", &py_lut, &i0)) { Py_DECREF(ret); PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem"); return NULL; @@ -161,7 +169,15 @@ match(PyObject *self, PyObject *args) { } lut = PyBytes_AsString(py_lut); - imgin = (Imaging)i0; + + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } + + imgin = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); if (imgin->type != IMAGING_TYPE_UINT8 || imgin->bands != 1) { Py_DECREF(ret); @@ -215,7 +231,7 @@ match(PyObject *self, PyObject *args) { */ static PyObject * get_on_pixels(PyObject *self, PyObject *args) { - Py_ssize_t i0; + PyObject *i0; Imaging img; UINT8 **rows; int row_idx, col_idx; @@ -225,12 +241,20 @@ get_on_pixels(PyObject *self, PyObject *args) { return NULL; } - if (!PyArg_ParseTuple(args, "n", &i0)) { + if (!PyArg_ParseTuple(args, "O", &i0)) { Py_DECREF(ret); PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem"); return NULL; } - img = (Imaging)i0; + + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } + + img = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); rows = img->image8; width = img->xsize; height = img->ysize; From f246be7b13867d6c85f01e38b5d14b093ace66c7 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 02:00:07 +0400 Subject: [PATCH 313/662] Use s# in PyArg_ParseTuple --- src/_imagingmorph.c | 55 ++++++++++--------------------------- src/libImaging/ImPlatform.h | 1 + 2 files changed, 16 insertions(+), 40 deletions(-) diff --git a/src/_imagingmorph.c b/src/_imagingmorph.c index c7933cc7d..715cccf51 100644 --- a/src/_imagingmorph.c +++ b/src/_imagingmorph.c @@ -11,7 +11,6 @@ * See the README file for information on usage and redistribution. */ -#include "Python.h" #include "libImaging/Imaging.h" #define LUT_SIZE (1 << 9) @@ -30,7 +29,7 @@ static PyObject * apply(PyObject *self, PyObject *args) { const char *lut; - PyObject *py_lut, *i0, *i1; + PyObject *i0, *i1; Py_ssize_t lut_len; Imaging imgin, imgout; int width, height; @@ -38,25 +37,15 @@ apply(PyObject *self, PyObject *args) { UINT8 **inrows, **outrows; int num_changed_pixels = 0; - if (!PyArg_ParseTuple(args, "OOO", &py_lut, &i0, &i1)) { - PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem"); + if (!PyArg_ParseTuple(args, "s#OO", &lut, &lut_len, &i0, &i1)) { return NULL; } - if (!PyBytes_Check(py_lut)) { - PyErr_SetString(PyExc_RuntimeError, "The morphology LUT is not a bytes object"); - return NULL; - } - - lut_len = PyBytes_Size(py_lut); - if (lut_len < LUT_SIZE) { PyErr_SetString(PyExc_RuntimeError, "The morphology LUT has the wrong size"); return NULL; } - lut = PyBytes_AsString(py_lut); - if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { PyErr_Format( @@ -137,39 +126,22 @@ apply(PyObject *self, PyObject *args) { static PyObject * match(PyObject *self, PyObject *args) { const char *lut; - PyObject *py_lut, *i0; + PyObject *i0; Py_ssize_t lut_len; Imaging imgin; int width, height; int row_idx, col_idx; UINT8 **inrows; - PyObject *ret = PyList_New(0); - if (ret == NULL) { + + if (!PyArg_ParseTuple(args, "s#O", &lut, &lut_len, &i0)) { return NULL; } - if (!PyArg_ParseTuple(args, "OO", &py_lut, &i0)) { - Py_DECREF(ret); - PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem"); - return NULL; - } - - if (!PyBytes_Check(py_lut)) { - Py_DECREF(ret); - PyErr_SetString(PyExc_RuntimeError, "The morphology LUT is not a bytes object"); - return NULL; - } - - lut_len = PyBytes_Size(py_lut); - if (lut_len < LUT_SIZE) { - Py_DECREF(ret); PyErr_SetString(PyExc_RuntimeError, "The morphology LUT has the wrong size"); return NULL; } - lut = PyBytes_AsString(py_lut); - if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) { PyErr_Format( PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC @@ -180,11 +152,15 @@ match(PyObject *self, PyObject *args) { imgin = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); if (imgin->type != IMAGING_TYPE_UINT8 || imgin->bands != 1) { - Py_DECREF(ret); PyErr_SetString(PyExc_RuntimeError, "Unsupported image type"); return NULL; } + PyObject *ret = PyList_New(0); + if (ret == NULL) { + return NULL; + } + inrows = imgin->image8; width = imgin->xsize; height = imgin->ysize; @@ -236,14 +212,8 @@ get_on_pixels(PyObject *self, PyObject *args) { UINT8 **rows; int row_idx, col_idx; int width, height; - PyObject *ret = PyList_New(0); - if (ret == NULL) { - return NULL; - } if (!PyArg_ParseTuple(args, "O", &i0)) { - Py_DECREF(ret); - PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem"); return NULL; } @@ -259,6 +229,11 @@ get_on_pixels(PyObject *self, PyObject *args) { width = img->xsize; height = img->ysize; + PyObject *ret = PyList_New(0); + if (ret == NULL) { + return NULL; + } + for (row_idx = 0; row_idx < height; row_idx++) { UINT8 *row = rows[row_idx]; for (col_idx = 0; col_idx < width; col_idx++) { diff --git a/src/libImaging/ImPlatform.h b/src/libImaging/ImPlatform.h index f6e7fb6b9..c9b7e43b4 100644 --- a/src/libImaging/ImPlatform.h +++ b/src/libImaging/ImPlatform.h @@ -7,6 +7,7 @@ * Copyright (c) Fredrik Lundh 1995-2003. */ +#define PY_SSIZE_T_CLEAN #include "Python.h" /* Check that we have an ANSI compliant compiler */ From 7435a06cbbd0dd98319f8c55752794eb6f11aa17 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 02:19:44 +0400 Subject: [PATCH 314/662] Deprecate ImageCore.id and ImageCore.unsafe_ptrs --- Tests/test_image_getim.py | 12 ++++++++++-- docs/deprecations.rst | 10 ++++++++++ src/_imaging.c | 14 ++++++++++++++ src/libImaging/Imaging.h | 2 +- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Tests/test_image_getim.py b/Tests/test_image_getim.py index 9afa02b0a..75d97cd44 100644 --- a/Tests/test_image_getim.py +++ b/Tests/test_image_getim.py @@ -1,11 +1,19 @@ from __future__ import annotations +import pytest + from .helper import hopper def test_sanity() -> None: im = hopper() - type_repr = repr(type(im.getim())) + type_repr = repr(type(im.getim())) assert "PyCapsule" in type_repr - assert isinstance(im.im.id, int) + + with pytest.warns(DeprecationWarning): + assert isinstance(im.im.id, int) + + with pytest.warns(DeprecationWarning): + ptrs = dict(im.im.unsafe_ptrs) + assert all(k in ptrs for k in ["image8", "image32", "image"]) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index a9498d5ed..5bb0ebf58 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -136,6 +136,16 @@ Specific WebP Feature Checks ``True`` if the WebP module is installed, until they are removed in Pillow 12.0.0 (2025-10-15). +Get Internal Pointers to Objects +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 11.0.0 + +``Image.core.ImageCore.id`` and ``Image.core.ImageCore.unsafe_ptrs`` +have been deprecated and will be removed in Pillow 12 (2025-10-15). +They were used for obtaining raw pointers to ``ImageCore`` internals. To interact with +C code, you can use ``Image.core.ImageCore.ptr``, which returns a ``PyCapsule`` object. + Removed features ---------------- diff --git a/src/_imaging.c b/src/_imaging.c index 07d9a64cc..a455c873b 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -3707,6 +3707,13 @@ _getattr_bands(ImagingObject *self, void *closure) { static PyObject * _getattr_id(ImagingObject *self, void *closure) { + if (PyErr_WarnEx( + PyExc_DeprecationWarning, + "id property is deprecated and will be removed in Pillow 12.0", + 1 + ) < 0) { + return NULL; + } return PyLong_FromSsize_t((Py_ssize_t)self->image); } @@ -3717,6 +3724,13 @@ _getattr_ptr(ImagingObject *self, void *closure) { static PyObject * _getattr_unsafe_ptrs(ImagingObject *self, void *closure) { + if (PyErr_WarnEx( + PyExc_DeprecationWarning, + "unsafe_ptrs property is deprecated and will be removed in Pillow 12.0", + 1 + ) < 0) { + return NULL; + } return Py_BuildValue( "(sn)(sn)(sn)", "image8", diff --git a/src/libImaging/Imaging.h b/src/libImaging/Imaging.h index 321dce988..870f5ed97 100644 --- a/src/libImaging/Imaging.h +++ b/src/libImaging/Imaging.h @@ -61,7 +61,7 @@ typedef struct ImagingOutlineInstance *ImagingOutline; typedef struct ImagingPaletteInstance *ImagingPalette; /* handle magics (used with PyCObject). */ -#define IMAGING_MAGIC "PIL Imaging" +#define IMAGING_MAGIC "Pillow Imaging" /* pixel types */ #define IMAGING_TYPE_UINT8 0 From c69ad03af0216f1cce2d9f1c1653bec6c295e6a6 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 03:45:18 +0400 Subject: [PATCH 315/662] Remove legacy 1-bit api, fix AttributeError PytestUnraisableExceptionWarning: Exception ignored in: AttributeError: 'PhotoImage' object has no attribute '_PhotoImage__photo' --- src/PIL/ImageTk.py | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index a788c9d1f..d546989ee 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -35,20 +35,6 @@ from . import Image, ImageFile # -------------------------------------------------------------------- # Check for Tkinter interface hooks -_pilbitmap_ok = None - - -def _pilbitmap_check() -> int: - global _pilbitmap_ok - if _pilbitmap_ok is None: - try: - im = Image.new("1", (1, 1)) - tkinter.BitmapImage(data=f"PIL:{im.im.id}") - _pilbitmap_ok = 1 - except tkinter.TclError: - _pilbitmap_ok = 0 - return _pilbitmap_ok - def _get_image_from_kw(kw: dict[str, Any]) -> ImageFile.ImageFile | None: source = None @@ -142,6 +128,8 @@ class PhotoImage: self.paste(image) def __del__(self) -> None: + if not hasattr(self, "__photo"): + return name = self.__photo.name self.__photo.name = None try: @@ -225,17 +213,11 @@ class BitmapImage: self.__mode = image.mode self.__size = image.size - if _pilbitmap_check(): - # fast way (requires the pilbitmap booster patch) - image.load() - kw["data"] = f"PIL:{image.im.id}" - self.__im = image # must keep a reference - else: - # slow but safe way - kw["data"] = image.tobitmap() - self.__photo = tkinter.BitmapImage(**kw) + self.__photo = tkinter.BitmapImage(data=image.tobitmap(), **kw) def __del__(self) -> None: + if not hasattr(self, "__photo"): + return name = self.__photo.name self.__photo.name = None try: From 920c4ac4479ee12636f90e281e14e8bfc89b0580 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 04:29:34 +0400 Subject: [PATCH 316/662] Use PyCapsule in _imagingtk --- src/PIL/ImageTk.py | 11 +++++------ src/Tk/tkImaging.c | 35 ++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index d546989ee..279a21716 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -48,18 +48,18 @@ def _get_image_from_kw(kw: dict[str, Any]) -> ImageFile.ImageFile | None: def _pyimagingtkcall( - command: str, photo: PhotoImage | tkinter.PhotoImage, id: int + command: str, photo: PhotoImage | tkinter.PhotoImage, ptr: object ) -> None: tk = photo.tk try: - tk.call(command, photo, id) + tk.call(command, photo, repr(ptr)) except tkinter.TclError: # activate Tkinter hook # may raise an error if it cannot attach to Tkinter from . import _imagingtk _imagingtk.tkinit(tk.interpaddr()) - tk.call(command, photo, id) + tk.call(command, photo, repr(ptr)) # -------------------------------------------------------------------- @@ -181,7 +181,7 @@ class PhotoImage: block = image.new_block(self.__mode, im.size) image.convert2(block, image) # convert directly between buffers - _pyimagingtkcall("PyImagingPhoto", self.__photo, block.id) + _pyimagingtkcall("PyImagingPhoto", self.__photo, block.ptr) # -------------------------------------------------------------------- @@ -255,9 +255,8 @@ class BitmapImage: def getimage(photo: PhotoImage) -> Image.Image: """Copies the contents of a PhotoImage to a PIL image memory.""" im = Image.new("RGBA", (photo.width(), photo.height())) - block = im.im - _pyimagingtkcall("PyImagingPhotoGet", photo, block.id) + _pyimagingtkcall("PyImagingPhotoGet", photo, im.im.ptr) return im diff --git a/src/Tk/tkImaging.c b/src/Tk/tkImaging.c index 727ee6bed..b33a47d30 100644 --- a/src/Tk/tkImaging.c +++ b/src/Tk/tkImaging.c @@ -56,19 +56,36 @@ static Tk_PhotoPutBlock_t TK_PHOTO_PUT_BLOCK; static Imaging ImagingFind(const char *name) { - Py_ssize_t id; + PyObject *capsule; + int direct_pointer = 0; + const char *expected = "capsule object \"" IMAGING_MAGIC "\" at 0x"; - /* FIXME: use CObject instead? */ -#if defined(_WIN64) - id = _atoi64(name); -#else - id = atol(name); -#endif - if (!id) { + if (name[0] == '<') { + name++; + } else { + // Special case for PyPy, where the string representation of a Capsule + // refers directly to the pointer itself, not to the PyCapsule object. + direct_pointer = 1; + } + + if (strncmp(name, expected, strlen(expected))) { return NULL; } - return (Imaging)id; + capsule = (PyObject *)strtoull(name + strlen(expected), NULL, 16); + + if (direct_pointer) { + return (Imaging)capsule; + } + + if (!PyCapsule_IsValid(capsule, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } + + return (Imaging)PyCapsule_GetPointer(capsule, IMAGING_MAGIC); } static int From 147f75ee9376688560942f814a66ea0c2ad03361 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 13:04:57 +0400 Subject: [PATCH 317/662] Use PyCapsule in _imagingft --- src/_imagingft.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/_imagingft.c b/src/_imagingft.c index f8143e0cc..af5d80f87 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -824,7 +824,6 @@ font_render(FontObject *self, PyObject *args) { unsigned char convert_scale; /* scale factor for non-8bpp bitmaps */ PyObject *image; Imaging im; - Py_ssize_t id; int mask = 0; /* is FT_LOAD_TARGET_MONO enabled? */ int color = 0; /* is FT_LOAD_COLOR enabled? */ int stroke_width = 0; @@ -923,10 +922,9 @@ font_render(FontObject *self, PyObject *args) { PyMem_Del(glyph_info); return NULL; } - PyObject *imageId = PyObject_GetAttrString(image, "id"); - id = PyLong_AsSsize_t(imageId); - Py_XDECREF(imageId); - im = (Imaging)id; + PyObject *imagePtr = PyObject_GetAttrString(image, "ptr"); + im = (Imaging)PyCapsule_GetPointer(imagePtr, IMAGING_MAGIC); + Py_XDECREF(imagePtr); x_offset -= stroke_width; y_offset -= stroke_width; From 6b59e3822f202f475b8b5440949a5b673019286b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 17:26:20 +0000 Subject: [PATCH 318/662] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.6.0 → v0.6.3](https://github.com/astral-sh/ruff-pre-commit/compare/v0.6.0...v0.6.3) - [github.com/python-jsonschema/check-jsonschema: 0.29.1 → 0.29.2](https://github.com/python-jsonschema/check-jsonschema/compare/0.29.1...0.29.2) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8ab478e84..14d75c689 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.0 + rev: v0.6.3 hooks: - id: ruff args: [--exit-non-zero-on-fix] @@ -50,7 +50,7 @@ repos: exclude: ^.github/.*TEMPLATE|^Tests/(fonts|images)/ - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.29.1 + rev: 0.29.2 hooks: - id: check-github-workflows - id: check-readthedocs From 55f49393af490fcfc0ef40f4790b53c54395a99f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 3 Sep 2024 09:55:06 +1000 Subject: [PATCH 319/662] Treat unknown colorspace as unspecified --- Tests/test_file_jpeg2k.py | 9 +++++++++ src/libImaging/Jpeg2KDecode.c | 5 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py index 5e11465ca..53a105ca5 100644 --- a/Tests/test_file_jpeg2k.py +++ b/Tests/test_file_jpeg2k.py @@ -182,6 +182,15 @@ def test_restricted_icc_profile() -> None: ImageFile.LOAD_TRUNCATED_IMAGES = False +@pytest.mark.skipif( + not os.path.exists(EXTRA_DIR), reason="Extra image files not installed" +) +def test_unknown_colorspace() -> None: + with Image.open(f"{EXTRA_DIR}/file8.jp2") as im: + im.load() + assert im.mode == "L" + + def test_header_errors() -> None: for path in ( "Tests/images/invalid_header_length.jp2", diff --git a/src/libImaging/Jpeg2KDecode.c b/src/libImaging/Jpeg2KDecode.c index 5b3d7ffc4..a81a14a09 100644 --- a/src/libImaging/Jpeg2KDecode.c +++ b/src/libImaging/Jpeg2KDecode.c @@ -698,8 +698,7 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) { } /* Check that this image is something we can handle */ - if (image->numcomps < 1 || image->numcomps > 4 || - image->color_space == OPJ_CLRSPC_UNKNOWN) { + if (image->numcomps < 1 || image->numcomps > 4) { state->errcode = IMAGING_CODEC_BROKEN; state->state = J2K_STATE_FAILED; goto quick_exit; @@ -744,7 +743,7 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) { /* Find the correct unpacker */ color_space = image->color_space; - if (color_space == OPJ_CLRSPC_UNSPECIFIED) { + if (color_space == OPJ_CLRSPC_UNKNOWN || color_space == OPJ_CLRSPC_UNSPECIFIED) { switch (image->numcomps) { case 1: case 2: From 61dade88e8ad55745c06e72561302bb8c21b490f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 3 Sep 2024 17:00:59 +1000 Subject: [PATCH 320/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 9da76d82a..4958ed701 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Treat unknown JPEG2000 colorspace as unspecified #8343 + [radarhere] + - Updated error message when saving WebP with invalid width or height #8322 [radarhere, hugovk] From bf11639626373bd27a80f790d56101d4b4e2f1c6 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Tue, 3 Sep 2024 11:54:24 +0400 Subject: [PATCH 321/662] rename PyCapsule -> Capsule --- docs/deprecations.rst | 2 +- src/Tk/tkImaging.c | 4 +--- src/_imagingcms.c | 4 +--- src/_imagingmath.c | 16 ++++------------ src/_imagingmorph.c | 12 +++--------- 5 files changed, 10 insertions(+), 28 deletions(-) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index 5bb0ebf58..93bd51ef1 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -144,7 +144,7 @@ Get Internal Pointers to Objects ``Image.core.ImageCore.id`` and ``Image.core.ImageCore.unsafe_ptrs`` have been deprecated and will be removed in Pillow 12 (2025-10-15). They were used for obtaining raw pointers to ``ImageCore`` internals. To interact with -C code, you can use ``Image.core.ImageCore.ptr``, which returns a ``PyCapsule`` object. +C code, you can use ``Image.core.ImageCore.ptr``, which returns a ``Capsule`` object. Removed features ---------------- diff --git a/src/Tk/tkImaging.c b/src/Tk/tkImaging.c index b33a47d30..a36c3e0bd 100644 --- a/src/Tk/tkImaging.c +++ b/src/Tk/tkImaging.c @@ -79,9 +79,7 @@ ImagingFind(const char *name) { } if (!PyCapsule_IsValid(capsule, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } diff --git a/src/_imagingcms.c b/src/_imagingcms.c index 444b6a602..1823bcf03 100644 --- a/src/_imagingcms.c +++ b/src/_imagingcms.c @@ -541,9 +541,7 @@ cms_transform_apply(CmsTransformObject *self, PyObject *args) { if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } diff --git a/src/_imagingmath.c b/src/_imagingmath.c index eafcf1444..dbe636707 100644 --- a/src/_imagingmath.c +++ b/src/_imagingmath.c @@ -177,16 +177,12 @@ _unop(PyObject *self, PyObject *args) { } if (!PyCapsule_IsValid(op, MATH_FUNC_UNOP_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", MATH_FUNC_UNOP_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", MATH_FUNC_UNOP_MAGIC); return NULL; } if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } @@ -213,17 +209,13 @@ _binop(PyObject *self, PyObject *args) { } if (!PyCapsule_IsValid(op, MATH_FUNC_BINOP_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", MATH_FUNC_BINOP_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", MATH_FUNC_BINOP_MAGIC); return NULL; } if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || !PyCapsule_IsValid(i1, IMAGING_MAGIC) || !PyCapsule_IsValid(i2, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } diff --git a/src/_imagingmorph.c b/src/_imagingmorph.c index 715cccf51..637295be7 100644 --- a/src/_imagingmorph.c +++ b/src/_imagingmorph.c @@ -48,9 +48,7 @@ apply(PyObject *self, PyObject *args) { if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } @@ -143,9 +141,7 @@ match(PyObject *self, PyObject *args) { } if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } @@ -218,9 +214,7 @@ get_on_pixels(PyObject *self, PyObject *args) { } if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } From 63b11966228717460e1e4170a009ef958e1704f2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 4 Sep 2024 16:13:19 +1000 Subject: [PATCH 322/662] Updated harfbuzz to 9.0.0 --- winbuild/build_prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 1021e4f22..9216119e8 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -112,7 +112,7 @@ V = { "BROTLI": "1.1.0", "FREETYPE": "2.13.2", "FRIBIDI": "1.0.15", - "HARFBUZZ": "8.5.0", + "HARFBUZZ": "9.0.0", "JPEGTURBO": "3.0.3", "LCMS2": "2.16", "LIBPNG": "1.6.43", From be34a7da4bb25a660d83abee3495626f221e949d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 4 Sep 2024 19:19:39 +1000 Subject: [PATCH 323/662] Save xmp from info --- Tests/test_file_jpeg.py | 6 ++++-- src/PIL/JpegImagePlugin.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index f9c5fbc0b..c8981ce85 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -995,11 +995,13 @@ class TestFileJpeg: f = str(tmp_path / "temp.jpg") im = hopper() im.save(f, xmp=b"XMP test") - with Image.open(f) as reloaded: assert reloaded.info["xmp"] == b"XMP test" - im.save(f, xmp=b"1" * 65504) + im.info["xmp"] = b"1" * 65504 + im.save(f) + with Image.open(f) as reloaded: + assert reloaded.info["xmp"] == b"1" * 65504 with pytest.raises(ValueError): im.save(f, xmp=b"1" * 65505) diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 0cb50e0bf..723165ec4 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -747,7 +747,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: extra = info.get("extra", b"") MAX_BYTES_IN_MARKER = 65533 - xmp = info.get("xmp") + xmp = info.get("xmp", im.info.get("xmp")) if xmp: overhead_len = 29 # b"http://ns.adobe.com/xap/1.0/\x00" max_data_bytes_in_marker = MAX_BYTES_IN_MARKER - overhead_len From 8833548e55977493fcd21b8270ba515e0503a3df Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Thu, 5 Sep 2024 01:04:35 +0400 Subject: [PATCH 324/662] Move new_block to module --- src/PIL/ImageTk.py | 2 +- src/_imaging.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index 279a21716..5bad9b546 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -178,7 +178,7 @@ class PhotoImage: if image.isblock() and im.mode == self.__mode: block = image else: - block = image.new_block(self.__mode, im.size) + block = Image.core.new_block(self.__mode, im.size) image.convert2(block, image) # convert directly between buffers _pyimagingtkcall("PyImagingPhoto", self.__photo, block.ptr) diff --git a/src/_imaging.c b/src/_imaging.c index a455c873b..e227d8efc 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -3674,15 +3674,12 @@ static struct PyMethodDef methods[] = { /* Unsharpmask extension */ {"gaussian_blur", (PyCFunction)_gaussian_blur, METH_VARARGS}, {"unsharp_mask", (PyCFunction)_unsharp_mask, METH_VARARGS}, - {"box_blur", (PyCFunction)_box_blur, METH_VARARGS}, /* Special effects */ {"effect_spread", (PyCFunction)_effect_spread, METH_VARARGS}, /* Misc. */ - {"new_block", (PyCFunction)_new_block, METH_VARARGS}, - {"save_ppm", (PyCFunction)_save_ppm, METH_VARARGS}, {NULL, NULL} /* sentinel */ @@ -4212,6 +4209,7 @@ static PyMethodDef functions[] = { {"blend", (PyCFunction)_blend, METH_VARARGS}, {"fill", (PyCFunction)_fill, METH_VARARGS}, {"new", (PyCFunction)_new, METH_VARARGS}, + {"new_block", (PyCFunction)_new_block, METH_VARARGS}, {"merge", (PyCFunction)_merge, METH_VARARGS}, /* Functions */ From 12700436827a06194e4b63a47c5e60585e52be59 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 5 Sep 2024 15:46:54 +1000 Subject: [PATCH 325/662] Return early if either width or height is zero --- Tests/test_box_blur.py | 5 +++++ src/libImaging/BoxBlur.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/Tests/test_box_blur.py b/Tests/test_box_blur.py index 1f6ed6127..cb267b204 100644 --- a/Tests/test_box_blur.py +++ b/Tests/test_box_blur.py @@ -71,6 +71,11 @@ def test_color_modes() -> None: box_blur(sample.convert("YCbCr")) +@pytest.mark.parametrize("size", ((0, 1), (1, 0))) +def test_zero_dimension(size: tuple[int, int]) -> None: + assert box_blur(Image.new("L", size)).size == size + + def test_radius_0() -> None: assert_blur( sample, diff --git a/src/libImaging/BoxBlur.c b/src/libImaging/BoxBlur.c index 51cb7e102..ed91541fe 100644 --- a/src/libImaging/BoxBlur.c +++ b/src/libImaging/BoxBlur.c @@ -238,6 +238,9 @@ ImagingBoxBlur(Imaging imOut, Imaging imIn, float xradius, float yradius, int n) int i; Imaging imTransposed; + if (imOut->xsize == 0 || imOut->ysize == 0) { + return imOut; + } if (n < 1) { return ImagingError_ValueError("number of passes must be greater than zero"); } From a56ac4faa878fef90a15d716bb57ea2917c9e4a5 Mon Sep 17 00:00:00 2001 From: Aryaz Eghbali Date: Thu, 5 Sep 2024 13:29:19 +0200 Subject: [PATCH 326/662] Canonical type checking --- Tests/test_image_array.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_image_array.py b/Tests/test_image_array.py index bb6064882..c1b09c659 100644 --- a/Tests/test_image_array.py +++ b/Tests/test_image_array.py @@ -24,7 +24,7 @@ def test_toarray() -> None: def test_with_dtype(dtype: npt.DTypeLike) -> None: ai = numpy.array(im, dtype=dtype) - assert ai.dtype == dtype + assert ai.dtype.type is dtype # assert test("1") == ((100, 128), '|b1', 1600)) assert test("L") == ((100, 128), "|u1", 12800) From f7f3af799be98e453d6faafc6bd9b08f3bb18e79 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 5 Sep 2024 22:53:48 +1000 Subject: [PATCH 327/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 4958ed701..b43466833 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,30 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Return early from BoxBlur if either width or height is zero #8347 + [radarhere] + +- Check text is either string or bytes #8308 + [radarhere] + +- Added writing XMP bytes to JPEG #8286 + [radarhere] + +- Support JPEG2000 RGBA palettes #8256 + [radarhere] + +- Expand C image to match GIF frame image size #8237 + [radarhere] + +- Allow saving I;16 images as PPM #8231 + [radarhere] + +- When IFD is missing, connect get_ifd() dictionary to Exif #8230 + [radarhere] + +- Skip truncated ICO mask if LOAD_TRUNCATED_IMAGES is enabled #8180 + [radarhere] + - Treat unknown JPEG2000 colorspace as unspecified #8343 [radarhere] From 31638ee29aae89452adf30acd41620d8c8d91373 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 5 Sep 2024 23:07:40 +1000 Subject: [PATCH 328/662] Added type hints --- Tests/test_file_gif.py | 4 +++- src/PIL/PngImagePlugin.py | 46 ++++++++++++++++++++++----------------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py index 7c332149d..571fe1b9a 100644 --- a/Tests/test_file_gif.py +++ b/Tests/test_file_gif.py @@ -1392,7 +1392,9 @@ def test_lzw_bits() -> None: ), ), ) -def test_extents(test_file, loading_strategy) -> None: +def test_extents( + test_file: str, loading_strategy: GifImagePlugin.LoadingStrategy +) -> None: GifImagePlugin.LOADING_STRATEGY = loading_strategy try: with Image.open("Tests/images/" + test_file) as im: diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index a87e1a625..c268d7b1a 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -370,21 +370,27 @@ class PngInfo: # PNG image stream (IHDR/IEND) +class _RewindState(NamedTuple): + info: dict[str | tuple[int, int], Any] + tile: list[ImageFile._Tile] + seq_num: int | None + + class PngStream(ChunkStream): - def __init__(self, fp): + def __init__(self, fp: IO[bytes]) -> None: super().__init__(fp) # local copies of Image attributes - self.im_info = {} - self.im_text = {} + self.im_info: dict[str | tuple[int, int], Any] = {} + self.im_text: dict[str, str | iTXt] = {} self.im_size = (0, 0) - self.im_mode = None - self.im_tile = None - self.im_palette = None - self.im_custom_mimetype = None - self.im_n_frames = None - self._seq_num = None - self.rewind_state = None + self.im_mode = "" + self.im_tile: list[ImageFile._Tile] = [] + self.im_palette: tuple[str, bytes] | None = None + self.im_custom_mimetype: str | None = None + self.im_n_frames: int | None = None + self._seq_num: int | None = None + self.rewind_state = _RewindState({}, [], None) self.text_memory = 0 @@ -398,16 +404,16 @@ class PngStream(ChunkStream): raise ValueError(msg) def save_rewind(self) -> None: - self.rewind_state = { - "info": self.im_info.copy(), - "tile": self.im_tile, - "seq_num": self._seq_num, - } + self.rewind_state = _RewindState( + self.im_info.copy(), + self.im_tile, + self._seq_num, + ) def rewind(self) -> None: - self.im_info = self.rewind_state["info"].copy() - self.im_tile = self.rewind_state["tile"] - self._seq_num = self.rewind_state["seq_num"] + self.im_info = self.rewind_state.info.copy() + self.im_tile = self.rewind_state.tile + self._seq_num = self.rewind_state.seq_num def chunk_iCCP(self, pos: int, length: int) -> bytes: # ICC profile @@ -461,11 +467,11 @@ class PngStream(ChunkStream): def chunk_IDAT(self, pos: int, length: int) -> NoReturn: # image data if "bbox" in self.im_info: - tile = [("zip", self.im_info["bbox"], pos, self.im_rawmode)] + tile = [ImageFile._Tile("zip", self.im_info["bbox"], pos, self.im_rawmode)] else: if self.im_n_frames is not None: self.im_info["default_image"] = True - tile = [("zip", (0, 0) + self.im_size, pos, self.im_rawmode)] + tile = [ImageFile._Tile("zip", (0, 0) + self.im_size, pos, self.im_rawmode)] self.im_tile = tile self.im_idat = length msg = "image data found" From e625f7311965abd0a88992ca215d8ad61a27715e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 6 Sep 2024 11:37:12 +1000 Subject: [PATCH 329/662] Added scale argument to IcnsImageFile load() --- Tests/test_file_icns.py | 20 +++++++----- docs/handbook/image-file-formats.rst | 12 +++++++ src/PIL/IcnsImagePlugin.py | 47 ++++++++++++++-------------- 3 files changed, 48 insertions(+), 31 deletions(-) diff --git a/Tests/test_file_icns.py b/Tests/test_file_icns.py index 488984aef..f37a6996f 100644 --- a/Tests/test_file_icns.py +++ b/Tests/test_file_icns.py @@ -63,8 +63,8 @@ def test_save_append_images(tmp_path: Path) -> None: assert_image_similar_tofile(im, temp_file, 1) with Image.open(temp_file) as reread: - reread.size = (16, 16, 2) - reread.load() + reread.size = (16, 16) + reread.load(2) assert_image_equal(reread, provided_im) @@ -92,9 +92,15 @@ def test_sizes() -> None: assert im.mode == "RGBA" assert im.size == (wr, hr) + # Test using load() with scale + im.size = (w, h) + im.load(scale=r) + assert im.mode == "RGBA" + assert im.size == (wr, hr) + # Check that we cannot load an incorrect size with pytest.raises(ValueError): - im.size = (1, 1) + im.size = (1, 2) def test_older_icon() -> None: @@ -105,8 +111,8 @@ def test_older_icon() -> None: wr = w * r hr = h * r with Image.open("Tests/images/pillow2.icns") as im2: - im2.size = (w, h, r) - im2.load() + im2.size = (w, h) + im2.load(r) assert im2.mode == "RGBA" assert im2.size == (wr, hr) @@ -122,8 +128,8 @@ def test_jp2_icon() -> None: wr = w * r hr = h * r with Image.open("Tests/images/pillow3.icns") as im2: - im2.size = (w, h, r) - im2.load() + im2.size = (w, h) + im2.load(r) assert im2.mode == "RGBA" assert im2.size == (wr, hr) diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst index ca0e05eb6..a5fbc8053 100644 --- a/docs/handbook/image-file-formats.rst +++ b/docs/handbook/image-file-formats.rst @@ -331,6 +331,18 @@ sets the following :py:attr:`~PIL.Image.Image.info` property: ask for ``(512, 512, 2)``, the final value of :py:attr:`~PIL.Image.Image.size` will be ``(1024, 1024)``). +.. _icns-loading: + +Loading +~~~~~~~ + +You can call the :py:meth:`~PIL.Image.Image.load` method with the following parameter. + +**scale** + Affects the scale of the resultant image. If the size is set to ``(512, 512)``, + after loading at scale 2, the final value of :py:attr:`~PIL.Image.Image.size` will + be ``(1024, 1024)``. + .. _icns-saving: Saving diff --git a/src/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py index ca66aa0fd..e4f486a4f 100644 --- a/src/PIL/IcnsImagePlugin.py +++ b/src/PIL/IcnsImagePlugin.py @@ -281,31 +281,30 @@ class IcnsImageFile(ImageFile.ImageFile): @size.setter def size(self, value) -> None: - info_size = value - if info_size not in self.info["sizes"] and len(info_size) == 2: - info_size = (info_size[0], info_size[1], 1) - if ( - info_size not in self.info["sizes"] - and len(info_size) == 3 - and info_size[2] == 1 - ): - simple_sizes = [ - (size[0] * size[2], size[1] * size[2]) for size in self.info["sizes"] - ] - if value in simple_sizes: - info_size = self.info["sizes"][simple_sizes.index(value)] - if info_size not in self.info["sizes"]: - msg = "This is not one of the allowed sizes of this image" - raise ValueError(msg) - self._size = value + if len(value) == 3: + if value in self.info["sizes"]: + self._size = value + return + else: + # Check that a matching size exists, + # or that there is a scale that would create a size that matches + for size in self.info["sizes"]: + simple_size = size[0] * size[2], size[1] * size[2] + scale = simple_size[0] // value[0] + if simple_size[1] / value[1] == scale: + self._size = value + return + msg = "This is not one of the allowed sizes of this image" + raise ValueError(msg) - def load(self) -> Image.core.PixelAccess | None: - if len(self.size) == 3: - self.best_size = self.size - self.size = ( - self.best_size[0] * self.best_size[2], - self.best_size[1] * self.best_size[2], - ) + def load(self, scale: int | None = None) -> Image.core.PixelAccess | None: + if scale is not None or len(self.size) == 3: + if scale is None and len(self.size) == 3: + scale = self.size[2] + assert scale is not None + width, height = self.size[:2] + self.size = width * scale, height * scale + self.best_size = width, height, scale px = Image.Image.load(self) if self._im is not None and self.im.size == self.size: From a6f5f4dd43c95ded41da5d56c7e9782f54e8dea2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 6 Sep 2024 11:42:56 +1000 Subject: [PATCH 330/662] Deprecate setting size to (width, height, scale) --- Tests/test_file_icns.py | 3 ++- docs/deprecations.rst | 8 ++++++++ docs/handbook/image-file-formats.rst | 7 +------ docs/releasenotes/11.0.0.rst | 13 +++++++++++++ src/PIL/IcnsImagePlugin.py | 10 ++++++---- 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/Tests/test_file_icns.py b/Tests/test_file_icns.py index f37a6996f..16f6b3651 100644 --- a/Tests/test_file_icns.py +++ b/Tests/test_file_icns.py @@ -87,7 +87,8 @@ def test_sizes() -> None: for w, h, r in im.info["sizes"]: wr = w * r hr = h * r - im.size = (w, h, r) + with pytest.warns(DeprecationWarning): + im.size = (w, h, r) im.load() assert im.mode == "RGBA" assert im.size == (wr, hr) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index a9498d5ed..061f579de 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -109,6 +109,14 @@ ImageDraw.getdraw hints parameter The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecated. +ICNS (width, height, scale) sizes +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 11.0.0 + +Setting an ICNS image size to ``(width, height, scale)`` before loading has been +deprecated. Instead, ``load(scale)`` can be used. + ImageMath.lambda_eval and ImageMath.unsafe_eval options parameter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst index a5fbc8053..8183473e4 100644 --- a/docs/handbook/image-file-formats.rst +++ b/docs/handbook/image-file-formats.rst @@ -324,12 +324,7 @@ sets the following :py:attr:`~PIL.Image.Image.info` property: **sizes** A list of supported sizes found in this icon file; these are a 3-tuple, ``(width, height, scale)``, where ``scale`` is 2 for a retina - icon and 1 for a standard icon. You *are* permitted to use this 3-tuple - format for the :py:attr:`~PIL.Image.Image.size` property if you set it - before calling :py:meth:`~PIL.Image.Image.load`; after loading, the size - will be reset to a 2-tuple containing pixel dimensions (so, e.g. if you - ask for ``(512, 512, 2)``, the final value of - :py:attr:`~PIL.Image.Image.size` will be ``(1024, 1024)``). + icon and 1 for a standard icon. .. _icns-loading: diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index ac9237acf..27c1bd308 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -43,9 +43,20 @@ similarly removed. Deprecations ============ + +ICNS (width, height, scale) sizes +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 11.0.0 + +Setting an ICNS image size to ``(width, height, scale)`` before loading has been +deprecated. Instead, ``load(scale)`` can be used. + ImageMath.lambda_eval and ImageMath.unsafe_eval options parameter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.. deprecated:: 11.0.0 + The ``options`` parameter in :py:meth:`~PIL.ImageMath.lambda_eval()` and :py:meth:`~PIL.ImageMath.unsafe_eval()` has been deprecated. One or more keyword arguments can be used instead. @@ -61,6 +72,8 @@ have been deprecated, and will be removed in Pillow 12 (2025-10-15). Specific WebP Feature Checks ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.. deprecated:: 11.0.0 + ``features.check("transp_webp")``, ``features.check("webp_mux")`` and ``features.check("webp_anim")`` are now deprecated. They will always return ``True`` if the WebP module is installed, until they are removed in Pillow diff --git a/src/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py index e4f486a4f..9757b2b14 100644 --- a/src/PIL/IcnsImagePlugin.py +++ b/src/PIL/IcnsImagePlugin.py @@ -25,6 +25,7 @@ import sys from typing import IO from . import Image, ImageFile, PngImagePlugin, features +from ._deprecate import deprecate enable_jpeg2k = features.check_codec("jpg_2000") if enable_jpeg2k: @@ -275,15 +276,16 @@ class IcnsImageFile(ImageFile.ImageFile): self.best_size[1] * self.best_size[2], ) - @property - def size(self): + @property # type: ignore[override] + def size(self) -> tuple[int, int] | tuple[int, int, int]: return self._size @size.setter - def size(self, value) -> None: + def size(self, value: tuple[int, int] | tuple[int, int, int]) -> None: if len(value) == 3: + deprecate("Setting size to (width, height, scale)", 12, "load(scale)") if value in self.info["sizes"]: - self._size = value + self._size = value # type: ignore[assignment] return else: # Check that a matching size exists, From 23c461e431e84fbfb81fca10c5a81c047884559b Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 6 Sep 2024 11:56:06 +1000 Subject: [PATCH 331/662] Handle duplicate exif header Co-authored-by: Jamil Zakirov --- Tests/test_image.py | 8 ++++++++ src/PIL/Image.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Tests/test_image.py b/Tests/test_image.py index b0d719667..97e97acaa 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -775,6 +775,14 @@ class TestImage: exif.load(b"Exif\x00\x00") assert not dict(exif) + def test_duplicate_exif_header(self) -> None: + with Image.open("Tests/images/exif.png") as im: + im.load() + im.info["exif"] = b"Exif\x00\x00" + im.info["exif"] + + exif = im.getexif() + assert exif[274] == 1 + def test_empty_get_ifd(self) -> None: exif = Image.Exif() ifd = exif.get_ifd(0x8769) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 1c0cf2936..2fb677ead 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -3968,7 +3968,7 @@ class Exif(_ExifBase): self._data.clear() self._hidden_data.clear() self._ifds.clear() - if data and data.startswith(b"Exif\x00\x00"): + while data and data.startswith(b"Exif\x00\x00"): data = data[6:] if not data: self._info = None From 06c331af5d85825b7c2595ca3861730d52b22e00 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 6 Sep 2024 15:16:59 +1000 Subject: [PATCH 332/662] Added type hints to frombuffer --- Tests/test_file_jpeg.py | 4 +++- Tests/test_imagefile.py | 2 +- docs/example/DdsImagePlugin.py | 4 ++-- src/PIL/BlpImagePlugin.py | 2 +- src/PIL/BmpImagePlugin.py | 2 +- src/PIL/DdsImagePlugin.py | 2 +- src/PIL/FitsImagePlugin.py | 2 +- src/PIL/Image.py | 13 ++++++++++--- src/PIL/ImageFile.py | 2 +- src/PIL/MspImagePlugin.py | 2 +- src/PIL/PpmImagePlugin.py | 4 ++-- src/PIL/QoiImagePlugin.py | 2 +- src/PIL/SgiImagePlugin.py | 2 +- 13 files changed, 26 insertions(+), 17 deletions(-) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index affc18625..cde951395 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -1011,7 +1011,9 @@ class TestFileJpeg: # Even though this decoder never says that it is finished # the image should still end when there is no new data class InfiniteMockPyDecoder(ImageFile.PyDecoder): - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode( + self, buffer: bytes | Image.SupportsArrayInterface + ) -> tuple[int, int]: return 0, 0 Image.register_decoder("INFINITE", InfiniteMockPyDecoder) diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index 0985dce9c..1ee684926 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -210,7 +210,7 @@ class MockPyDecoder(ImageFile.PyDecoder): super().__init__(mode, *args) - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]: # eof return -1, 0 diff --git a/docs/example/DdsImagePlugin.py b/docs/example/DdsImagePlugin.py index d8f536076..10828bff0 100644 --- a/docs/example/DdsImagePlugin.py +++ b/docs/example/DdsImagePlugin.py @@ -257,7 +257,7 @@ class DdsImageFile(ImageFile.ImageFile): class DXT1Decoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]: assert self.fd is not None try: self.set_as_raw(_dxt1(self.fd, self.state.xsize, self.state.ysize)) @@ -270,7 +270,7 @@ class DXT1Decoder(ImageFile.PyDecoder): class DXT5Decoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]: assert self.fd is not None try: self.set_as_raw(_dxt5(self.fd, self.state.xsize, self.state.ysize)) diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py index 8e29898df..e5605635e 100644 --- a/src/PIL/BlpImagePlugin.py +++ b/src/PIL/BlpImagePlugin.py @@ -279,7 +279,7 @@ class BlpImageFile(ImageFile.ImageFile): class _BLPBaseDecoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]: try: self._read_blp_header() self._load() diff --git a/src/PIL/BmpImagePlugin.py b/src/PIL/BmpImagePlugin.py index 16c8cf6ff..bf8f29577 100644 --- a/src/PIL/BmpImagePlugin.py +++ b/src/PIL/BmpImagePlugin.py @@ -321,7 +321,7 @@ class BmpImageFile(ImageFile.ImageFile): class BmpRleDecoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]: assert self.fd is not None rle4 = self.args[1] data = bytearray() diff --git a/src/PIL/DdsImagePlugin.py b/src/PIL/DdsImagePlugin.py index 631532470..1b6408237 100644 --- a/src/PIL/DdsImagePlugin.py +++ b/src/PIL/DdsImagePlugin.py @@ -481,7 +481,7 @@ class DdsImageFile(ImageFile.ImageFile): class DdsRgbDecoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]: assert self.fd is not None bitcount, masks = self.args diff --git a/src/PIL/FitsImagePlugin.py b/src/PIL/FitsImagePlugin.py index abacc5e67..6bbd2641a 100644 --- a/src/PIL/FitsImagePlugin.py +++ b/src/PIL/FitsImagePlugin.py @@ -126,7 +126,7 @@ class FitsImageFile(ImageFile.ImageFile): class FitsGzipDecoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]: assert self.fd is not None value = gzip.decompress(self.fd.read()) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 1c0cf2936..90d028b9b 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -856,7 +856,10 @@ class Image: ) def frombytes( - self, data: bytes | bytearray, decoder_name: str = "raw", *args: Any + self, + data: bytes | bytearray | SupportsArrayInterface, + decoder_name: str = "raw", + *args: Any, ) -> None: """ Loads this image with pixel data from a bytes object. @@ -3145,7 +3148,7 @@ def new( def frombytes( mode: str, size: tuple[int, int], - data: bytes | bytearray, + data: bytes | bytearray | SupportsArrayInterface, decoder_name: str = "raw", *args: Any, ) -> Image: @@ -3189,7 +3192,11 @@ def frombytes( def frombuffer( - mode: str, size: tuple[int, int], data, decoder_name: str = "raw", *args: Any + mode: str, + size: tuple[int, int], + data: bytes | SupportsArrayInterface, + decoder_name: str = "raw", + *args: Any, ) -> Image: """ Creates an image memory referencing pixel data in a byte buffer. diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 615961ce5..b8bf0b7fe 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -733,7 +733,7 @@ class PyDecoder(PyCodec): def pulls_fd(self) -> bool: return self._pulls_fd - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]: """ Override to perform the decoding process. diff --git a/src/PIL/MspImagePlugin.py b/src/PIL/MspImagePlugin.py index 1363ddd1f..f3460a787 100644 --- a/src/PIL/MspImagePlugin.py +++ b/src/PIL/MspImagePlugin.py @@ -112,7 +112,7 @@ class MspDecoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]: assert self.fd is not None img = io.BytesIO() diff --git a/src/PIL/PpmImagePlugin.py b/src/PIL/PpmImagePlugin.py index 3bda2bf28..4e779df17 100644 --- a/src/PIL/PpmImagePlugin.py +++ b/src/PIL/PpmImagePlugin.py @@ -284,7 +284,7 @@ class PpmPlainDecoder(ImageFile.PyDecoder): break return data - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]: self._comment_spans = False if self.mode == "1": data = self._decode_bitonal() @@ -300,7 +300,7 @@ class PpmPlainDecoder(ImageFile.PyDecoder): class PpmDecoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]: assert self.fd is not None data = bytearray() diff --git a/src/PIL/QoiImagePlugin.py b/src/PIL/QoiImagePlugin.py index eaf031402..010d3f941 100644 --- a/src/PIL/QoiImagePlugin.py +++ b/src/PIL/QoiImagePlugin.py @@ -47,7 +47,7 @@ class QoiDecoder(ImageFile.PyDecoder): hash_value = (r * 3 + g * 5 + b * 7 + a * 11) % 64 self._previously_seen_pixels[hash_value] = value - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]: assert self.fd is not None self._previously_seen_pixels = {} diff --git a/src/PIL/SgiImagePlugin.py b/src/PIL/SgiImagePlugin.py index 2c205a926..44254b7a4 100644 --- a/src/PIL/SgiImagePlugin.py +++ b/src/PIL/SgiImagePlugin.py @@ -214,7 +214,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: class SGI16Decoder(ImageFile.PyDecoder): _pulls_fd = True - def decode(self, buffer: bytes) -> tuple[int, int]: + def decode(self, buffer: bytes | Image.SupportsArrayInterface) -> tuple[int, int]: assert self.fd is not None assert self.im is not None From 94315f87c32d67c097ae8fb6eb8052bba9384af4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 6 Sep 2024 19:13:35 +1000 Subject: [PATCH 333/662] Removed unused IFD_LEGACY_API --- docs/deprecations.rst | 7 +++++++ docs/releasenotes/11.0.0.rst | 5 +++++ src/PIL/TiffImagePlugin.py | 3 +-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index a9498d5ed..cafda3803 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -142,6 +142,13 @@ Removed features Deprecated features are only removed in major releases after an appropriate period of deprecation has passed. +TiffImagePlugin IFD_LEGACY_API +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. versionremoved:: 11.0.0 + +``TiffImagePlugin.IFD_LEGACY_API`` was removed, as it was an unused setting. + PSFile ~~~~~~ diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index ac9237acf..f0d864f6a 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -40,6 +40,11 @@ removed. Pillow's C API will now be used on PyPy instead. ``Image.USE_CFFI_ACCESS``, for switching from the C API to PyAccess, was similarly removed. +TiffImagePlugin IFD_LEGACY_API +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +An unused setting, ``TiffImagePlugin.IFD_LEGACY_API``, has been removed. + Deprecations ============ diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 88f75ce8e..87d9677e0 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -69,7 +69,6 @@ logger = logging.getLogger(__name__) # Set these to true to force use of libtiff for reading or writing. READ_LIBTIFF = False WRITE_LIBTIFF = False -IFD_LEGACY_API = True STRIP_SIZE = 65536 II = b"II" # little-endian (Intel style) @@ -1125,7 +1124,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2): return val -# undone -- switch this pointer when IFD_LEGACY_API == False +# undone -- switch this pointer ImageFileDirectory = ImageFileDirectory_v1 From 93a0bf02760e6b9e1764eb5f15c69a2c12d96e00 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 6 Sep 2024 21:33:30 +1000 Subject: [PATCH 334/662] Added type hints to TiffImagePlugin _save --- docs/conf.py | 2 +- src/PIL/TiffImagePlugin.py | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 41f9c0e38..a0f5867d7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -121,7 +121,7 @@ nitpicky = True # generating warnings in “nitpicky mode”. Note that type should include the domain name # if present. Example entries would be ('py:func', 'int') or # ('envvar', 'LD_LIBRARY_PATH'). -# nitpick_ignore = [] +nitpick_ignore = [("py:class", "_io.BytesIO")] # -- Options for HTML output ---------------------------------------------- diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 88f75ce8e..53f6ae621 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -46,6 +46,7 @@ import logging import math import os import struct +import sys import warnings from collections.abc import Iterator, MutableMapping from fractions import Fraction @@ -1647,7 +1648,7 @@ SAVE_INFO = { } -def _save(im: Image.Image, fp, filename: str | bytes) -> None: +def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: try: rawmode, prefix, photo, format, bits, extra = SAVE_INFO[im.mode] except KeyError as e: @@ -1958,7 +1959,7 @@ def _save(im: Image.Image, fp, filename: str | bytes) -> None: setattr(im, "_debug_multipage", ifd) -class AppendingTiffWriter: +class AppendingTiffWriter(io.BytesIO): fieldSizes = [ 0, # None 1, # byte @@ -2068,6 +2069,12 @@ class AppendingTiffWriter: return self.f.tell() - self.offsetOfNewPage def seek(self, offset: int, whence: int = io.SEEK_SET) -> int: + """ + :param offset: Distance to seek. + :param whence: Whether the distance is relative to the start, + end or current position. + :returns: The resulting position, relative to the start. + """ if whence == os.SEEK_SET: offset += self.offsetOfNewPage @@ -2101,8 +2108,16 @@ class AppendingTiffWriter: num_tags = self.readShort() self.f.seek(num_tags * 12, os.SEEK_CUR) - def write(self, data: bytes) -> int | None: - return self.f.write(data) + if sys.version_info >= (3, 12): + from collections.abc import Buffer + + def write(self, data: Buffer, /) -> int: + return self.f.write(data) + + else: + + def write(self, data: Any, /) -> int: + return self.f.write(data) def readShort(self) -> int: (value,) = struct.unpack(self.shortFmt, self.f.read(2)) @@ -2143,7 +2158,8 @@ class AppendingTiffWriter: def close(self) -> None: self.finalize() - self.f.close() + if self.close_fp: + self.f.close() def fixIFD(self) -> None: num_tags = self.readShort() From d3c1d99d00b3d76d9c3dbdfc629b6278a0e38613 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 6 Sep 2024 14:22:39 +0300 Subject: [PATCH 335/662] Deprecate support for FreeType 2.9.0 --- Tests/test_imagefont.py | 12 ++++++++++++ docs/deprecations.rst | 13 +++++++++++++ docs/releasenotes/11.0.0.rst | 13 +++++++++++++ src/PIL/ImageFont.py | 17 ++++++++++++++++- 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 953706010..cfadc7312 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -1150,3 +1150,15 @@ def test_invalid_truetype_sizes_raise_valueerror( ) -> None: with pytest.raises(ValueError): ImageFont.truetype(FONT_PATH, size, layout_engine=layout_engine) + + +def test_freetype_deprecation(monkeypatch: pytest.MonkeyPatch) -> None: + # Arrange: mock features.version_module to return fake FreeType version + def fake_version_module(module): + return "2.9.0" + + monkeypatch.setattr(features, "version_module", fake_version_module) + + # Act / Assert + with pytest.warns(DeprecationWarning): + ImageFont.truetype(FONT_PATH, FONT_SIZE) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index a9498d5ed..9a2f16cfb 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -12,6 +12,19 @@ Deprecated features Below are features which are considered deprecated. Where appropriate, a :py:exc:`DeprecationWarning` is issued. +FreeType 2.9.0 +~~~~~~~~~~~~~~ + +.. deprecated:: 11.0.0 + +Support for FreeType 2.9.0 is deprecated and will be removed in Pillow 12.0.0 +(2025-10-15), when FreeType 2.9.1 will be the minimum supported. + +We recommend upgrading to at least FreeType `2.10.4`_, which fixed a severe +vulnerability introduced in FreeType 2.6 (:cve:`CVE-2020-15999`). + +.. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ + ImageFile.raise_oserror ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index ac9237acf..99e0a2927 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -43,6 +43,19 @@ similarly removed. Deprecations ============ +FreeType 2.9.0 +^^^^^^^^^^^^^^ + +.. deprecated:: 11.0.0 + +Support for FreeType 2.9.0 is deprecated and will be removed in Pillow 12.0.0 +(2025-10-15), when FreeType 2.9.1 will be the minimum supported. + +We recommend upgrading to at least FreeType `2.10.4`_, which fixed a severe +vulnerability introduced in FreeType 2.6 (:cve:`CVE-2020-15999`). + +.. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ + ImageMath.lambda_eval and ImageMath.unsafe_eval options parameter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index a82c36ba6..50796e132 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -36,7 +36,7 @@ from io import BytesIO from types import ModuleType from typing import IO, TYPE_CHECKING, Any, BinaryIO, TypedDict, cast -from . import Image +from . import Image, features from ._typing import StrOrBytesPath from ._util import DeferredError, is_path @@ -232,6 +232,21 @@ class FreeTypeFont: self.index = index self.encoding = encoding + try: + from packaging.version import parse as parse_version + except ImportError: + pass + else: + if freetype_version := features.version_module("freetype2"): + if parse_version(freetype_version) < parse_version("2.9.1"): + warnings.warn( + "Support for FreeType 2.9.0 is deprecated and will be removed " + "in Pillow 12 (2025-10-15). Please upgrade to FreeType 2.9.1 " + "or newer, preferably FreeType 2.10.4 which fixes " + "CVE-2020-15999.", + DeprecationWarning, + ) + if layout_engine not in (Layout.BASIC, Layout.RAQM): layout_engine = Layout.BASIC if core.HAVE_RAQM: From de3c6fa2957cd237cea024ae558034379129362e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 7 Sep 2024 12:14:30 +1000 Subject: [PATCH 336/662] Support converting more modes to LAB by converting to RGBA first --- Tests/test_imagecms.py | 6 ++++++ src/PIL/Image.py | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Tests/test_imagecms.py b/Tests/test_imagecms.py index 5ee5fcedf..f062651f0 100644 --- a/Tests/test_imagecms.py +++ b/Tests/test_imagecms.py @@ -696,6 +696,12 @@ def test_rgb_lab(mode: str) -> None: assert value[:3] == (0, 255, 255) +def test_cmyk_lab() -> None: + im = Image.new("CMYK", (1, 1)) + converted_im = im.convert("LAB") + assert converted_im.getpixel((0, 0)) == (255, 128, 128) + + def test_deprecation() -> None: with pytest.warns(DeprecationWarning): assert ImageCms.DESCRIPTION.strip().startswith("pyCMS") diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 1c0cf2936..d706d2d33 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1127,17 +1127,23 @@ class Image: return new_im if "LAB" in (self.mode, mode): - other_mode = mode if self.mode == "LAB" else self.mode + im = self + if mode == "LAB": + if im.mode not in ("RGB", "RGBA", "RGBX"): + im = im.convert("RGBA") + other_mode = im.mode + else: + other_mode = mode if other_mode in ("RGB", "RGBA", "RGBX"): from . import ImageCms srgb = ImageCms.createProfile("sRGB") lab = ImageCms.createProfile("LAB") - profiles = [lab, srgb] if self.mode == "LAB" else [srgb, lab] + profiles = [lab, srgb] if im.mode == "LAB" else [srgb, lab] transform = ImageCms.buildTransform( - profiles[0], profiles[1], self.mode, mode + profiles[0], profiles[1], im.mode, mode ) - return transform.apply(self) + return transform.apply(im) # colorspace conversion if dither is None: From 6f9128bfaf4c91a32e075847fa2c629d826c7eaf Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 7 Sep 2024 14:28:36 +1000 Subject: [PATCH 337/662] Updated type hint --- src/PIL/Image.py | 7 +------ src/PIL/ImageTk.py | 5 ++++- src/PIL/_typing.py | 5 +++++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 1c0cf2936..871d38a83 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -224,12 +224,7 @@ if TYPE_CHECKING: from IPython.lib.pretty import PrettyPrinter from . import ImageFile, ImageFilter, ImagePalette, ImageQt, TiffImagePlugin - from ._typing import NumpyArray, StrOrBytesPath, TypeGuard - - if sys.version_info >= (3, 13): - from types import CapsuleType - else: - CapsuleType = object + from ._typing import CapsuleType, NumpyArray, StrOrBytesPath, TypeGuard ID: list[str] = [] OPEN: dict[ str, diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index 5bad9b546..d01af364b 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -32,6 +32,9 @@ from typing import TYPE_CHECKING, Any, cast from . import Image, ImageFile +if TYPE_CHECKING: + from ._typing import CapsuleType + # -------------------------------------------------------------------- # Check for Tkinter interface hooks @@ -48,7 +51,7 @@ def _get_image_from_kw(kw: dict[str, Any]) -> ImageFile.ImageFile | None: def _pyimagingtkcall( - command: str, photo: PhotoImage | tkinter.PhotoImage, ptr: object + command: str, photo: PhotoImage | tkinter.PhotoImage, ptr: CapsuleType ) -> None: tk = photo.tk try: diff --git a/src/PIL/_typing.py b/src/PIL/_typing.py index 093778464..dd08cdd50 100644 --- a/src/PIL/_typing.py +++ b/src/PIL/_typing.py @@ -15,6 +15,11 @@ if TYPE_CHECKING: except (ImportError, AttributeError): pass +if sys.version_info >= (3, 13): + from types import CapsuleType +else: + CapsuleType = object + if sys.version_info >= (3, 10): from typing import TypeGuard else: From a6ca45aea661bd037ad0c46771fd047575ab138a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 7 Sep 2024 14:55:45 +1000 Subject: [PATCH 338/662] Use (void) to indicate no parameters --- src/libImaging/Access.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libImaging/Access.c b/src/libImaging/Access.c index bf7db281e..1c1937105 100644 --- a/src/libImaging/Access.c +++ b/src/libImaging/Access.c @@ -185,7 +185,7 @@ put_pixel_32(Imaging im, int x, int y, const void *color) { } void -ImagingAccessInit() { +ImagingAccessInit(void) { #define ADD(mode_, get_pixel_, put_pixel_) \ { \ ImagingAccess access = add_item(mode_); \ From 1105256f2b5e6817a23b6215a32bcf1d26687d60 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 7 Sep 2024 18:25:44 +1000 Subject: [PATCH 339/662] Added type hints to setup.py --- setup.py | 257 +++++++++++++++++++++++++++++++------------------------ tox.ini | 2 +- 2 files changed, 146 insertions(+), 113 deletions(-) diff --git a/setup.py b/setup.py index 863d102cf..60707083f 100644 --- a/setup.py +++ b/setup.py @@ -15,18 +15,20 @@ import struct import subprocess import sys import warnings +from collections.abc import Iterator +from typing import Any from setuptools import Extension, setup from setuptools.command.build_ext import build_ext -def get_version(): +def get_version() -> str: version_file = "src/PIL/_version.py" with open(version_file, encoding="utf-8") as f: return f.read().split('"')[1] -configuration = {} +configuration: dict[str, list[str]] = {} PILLOW_VERSION = get_version() @@ -143,7 +145,7 @@ class RequiredDependencyException(Exception): PLATFORM_MINGW = os.name == "nt" and "GCC" in sys.version -def _dbg(s, tp=None): +def _dbg(s: str, tp: Any = None) -> None: if DEBUG: if tp: print(s % tp) @@ -151,10 +153,13 @@ def _dbg(s, tp=None): print(s) -def _find_library_dirs_ldconfig(): +def _find_library_dirs_ldconfig() -> list[str]: # Based on ctypes.util from Python 2 ldconfig = "ldconfig" if shutil.which("ldconfig") else "/sbin/ldconfig" + args: list[str] + env: dict[str, str] + expr: str if sys.platform.startswith("linux") or sys.platform.startswith("gnu"): if struct.calcsize("l") == 4: machine = os.uname()[4] + "-32" @@ -184,13 +189,11 @@ def _find_library_dirs_ldconfig(): try: p = subprocess.Popen( - args, stderr=subprocess.DEVNULL, stdout=subprocess.PIPE, env=env + args, stderr=subprocess.DEVNULL, stdout=subprocess.PIPE, env=env, text=True ) except OSError: # E.g. command not found return [] - [data, _] = p.communicate() - if isinstance(data, bytes): - data = data.decode("latin1") + data = p.communicate()[0] dirs = [] for dll in re.findall(expr, data): @@ -200,7 +203,9 @@ def _find_library_dirs_ldconfig(): return dirs -def _add_directory(path, subdir, where=None): +def _add_directory( + path: list[str], subdir: str | None, where: int | None = None +) -> None: if subdir is None: return subdir = os.path.realpath(subdir) @@ -216,7 +221,7 @@ def _add_directory(path, subdir, where=None): path.insert(where, subdir) -def _find_include_file(self, include): +def _find_include_file(self: pil_build_ext, include: str) -> int: for directory in self.compiler.include_dirs: _dbg("Checking for include file %s in %s", (include, directory)) if os.path.isfile(os.path.join(directory, include)): @@ -225,7 +230,7 @@ def _find_include_file(self, include): return 0 -def _find_library_file(self, library): +def _find_library_file(self: pil_build_ext, library: str) -> str | None: ret = self.compiler.find_library_file(self.compiler.library_dirs, library) if ret: _dbg("Found library %s at %s", (library, ret)) @@ -234,7 +239,7 @@ def _find_library_file(self, library): return ret -def _find_include_dir(self, dirname, include): +def _find_include_dir(self: pil_build_ext, dirname: str, include: str) -> bool | str: for directory in self.compiler.include_dirs: _dbg("Checking for include file %s in %s", (include, directory)) if os.path.isfile(os.path.join(directory, include)): @@ -245,6 +250,7 @@ def _find_include_dir(self, dirname, include): if os.path.isfile(os.path.join(subdir, include)): _dbg("Found %s in %s", (include, subdir)) return subdir + return False def _cmd_exists(cmd: str) -> bool: @@ -256,7 +262,7 @@ def _cmd_exists(cmd: str) -> bool: ) -def _pkg_config(name): +def _pkg_config(name: str) -> tuple[list[str], list[str]] | None: command = os.environ.get("PKG_CONFIG", "pkg-config") for keep_system in (True, False): try: @@ -283,10 +289,11 @@ def _pkg_config(name): return libs, cflags except Exception: pass + return None class pil_build_ext(build_ext): - class feature: + class ext_feature: features = [ "zlib", "jpeg", @@ -301,25 +308,32 @@ class pil_build_ext(build_ext): ] required = {"jpeg", "zlib"} - vendor = set() + vendor: set[str] = set() - def __init__(self): + def __init__(self) -> None: + self._settings: dict[str, str | bool | None] = {} for f in self.features: - setattr(self, f, None) + self.set(f, None) - def require(self, feat): + def require(self, feat: str) -> bool: return feat in self.required - def want(self, feat): - return getattr(self, feat) is None + def get(self, feat: str) -> str | bool | None: + return self._settings[feat] - def want_vendor(self, feat): + def set(self, feat: str, value: str | bool | None) -> None: + self._settings[feat] = value + + def want(self, feat: str) -> bool: + return self._settings[feat] is None + + def want_vendor(self, feat: str) -> bool: return feat in self.vendor - def __iter__(self): + def __iter__(self) -> Iterator[str]: yield from self.features - feature = feature() + feature = ext_feature() user_options = ( build_ext.user_options @@ -337,10 +351,10 @@ class pil_build_ext(build_ext): ) @staticmethod - def check_configuration(option, value): + def check_configuration(option: str, value: str) -> bool | None: return True if value in configuration.get(option, []) else None - def initialize_options(self): + def initialize_options(self) -> None: self.disable_platform_guessing = self.check_configuration( "platform-guessing", "disable" ) @@ -355,7 +369,7 @@ class pil_build_ext(build_ext): self.debug = True self.parallel = configuration.get("parallel", [None])[-1] - def finalize_options(self): + def finalize_options(self) -> None: build_ext.finalize_options(self) if self.debug: global DEBUG @@ -363,12 +377,16 @@ class pil_build_ext(build_ext): if not self.parallel: # If --parallel (or -j) wasn't specified, we want to reproduce the same # behavior as before, that is, auto-detect the number of jobs. - try: - self.parallel = int( - os.environ.get("MAX_CONCURRENCY", min(4, os.cpu_count())) - ) - except TypeError: - self.parallel = None + self.parallel = None + + cpu_count = os.cpu_count() + if cpu_count is not None: + try: + self.parallel = int( + os.environ.get("MAX_CONCURRENCY", min(4, cpu_count)) + ) + except TypeError: + pass for x in self.feature: if getattr(self, f"disable_{x}"): setattr(self.feature, x, False) @@ -402,7 +420,13 @@ class pil_build_ext(build_ext): _dbg("Using vendored version of %s", x) self.feature.vendor.add(x) - def _update_extension(self, name, libraries, define_macros=None, sources=None): + def _update_extension( + self, + name: str, + libraries: list[str] | list[str | bool | None], + define_macros: list[tuple[str, str | None]] | None = None, + sources: list[str] | None = None, + ) -> None: for extension in self.extensions: if extension.name == name: extension.libraries += libraries @@ -415,13 +439,13 @@ class pil_build_ext(build_ext): extension.extra_link_args = ["--stdlib=libc++"] break - def _remove_extension(self, name): + def _remove_extension(self, name: str) -> None: for extension in self.extensions: if extension.name == name: self.extensions.remove(extension) break - def get_macos_sdk_path(self): + def get_macos_sdk_path(self) -> str | None: try: sdk_path = ( subprocess.check_output(["xcrun", "--show-sdk-path"]) @@ -442,9 +466,9 @@ class pil_build_ext(build_ext): sdk_path = commandlinetools_sdk_path return sdk_path - def build_extensions(self): - library_dirs = [] - include_dirs = [] + def build_extensions(self) -> None: + library_dirs: list[str] = [] + include_dirs: list[str] = [] pkg_config = None if _cmd_exists(os.environ.get("PKG_CONFIG", "pkg-config")): @@ -468,19 +492,22 @@ class pil_build_ext(build_ext): root = globals()[root_name] if root is None and root_name in os.environ: - prefix = os.environ[root_name] - root = (os.path.join(prefix, "lib"), os.path.join(prefix, "include")) + root_prefix = os.environ[root_name] + root = ( + os.path.join(root_prefix, "lib"), + os.path.join(root_prefix, "include"), + ) if root is None and pkg_config: - if isinstance(lib_name, tuple): + if isinstance(lib_name, str): + _dbg(f"Looking for `{lib_name}` using pkg-config.") + root = pkg_config(lib_name) + else: for lib_name2 in lib_name: _dbg(f"Looking for `{lib_name2}` using pkg-config.") root = pkg_config(lib_name2) if root: break - else: - _dbg(f"Looking for `{lib_name}` using pkg-config.") - root = pkg_config(lib_name) if isinstance(root, tuple): lib_root, include_root = root @@ -660,22 +687,22 @@ class pil_build_ext(build_ext): _dbg("Looking for zlib") if _find_include_file(self, "zlib.h"): if _find_library_file(self, "z"): - feature.zlib = "z" + feature.set("zlib", "z") elif sys.platform == "win32" and _find_library_file(self, "zlib"): - feature.zlib = "zlib" # alternative name + feature.set("zlib", "zlib") # alternative name if feature.want("jpeg"): _dbg("Looking for jpeg") if _find_include_file(self, "jpeglib.h"): if _find_library_file(self, "jpeg"): - feature.jpeg = "jpeg" + feature.set("jpeg", "jpeg") elif sys.platform == "win32" and _find_library_file(self, "libjpeg"): - feature.jpeg = "libjpeg" # alternative name + feature.set("jpeg", "libjpeg") # alternative name - feature.openjpeg_version = None + feature.set("openjpeg_version", None) if feature.want("jpeg2000"): _dbg("Looking for jpeg2000") - best_version = None + best_version: tuple[int, ...] | None = None best_path = None # Find the best version @@ -705,26 +732,26 @@ class pil_build_ext(build_ext): # rather than having to cope with the versioned # include path _add_directory(self.compiler.include_dirs, best_path, 0) - feature.jpeg2000 = "openjp2" - feature.openjpeg_version = ".".join(str(x) for x in best_version) + feature.set("jpeg2000", "openjp2") + feature.set("openjpeg_version", ".".join(str(x) for x in best_version)) if feature.want("imagequant"): _dbg("Looking for imagequant") if _find_include_file(self, "libimagequant.h"): if _find_library_file(self, "imagequant"): - feature.imagequant = "imagequant" + feature.set("imagequant", "imagequant") elif _find_library_file(self, "libimagequant"): - feature.imagequant = "libimagequant" + feature.set("imagequant", "libimagequant") if feature.want("tiff"): _dbg("Looking for tiff") if _find_include_file(self, "tiff.h"): if _find_library_file(self, "tiff"): - feature.tiff = "tiff" + feature.set("tiff", "tiff") if sys.platform in ["win32", "darwin"] and _find_library_file( self, "libtiff" ): - feature.tiff = "libtiff" + feature.set("tiff", "libtiff") if feature.want("freetype"): _dbg("Looking for freetype") @@ -745,31 +772,31 @@ class pil_build_ext(build_ext): freetype_version = 21 break if freetype_version: - feature.freetype = "freetype" + feature.set("freetype", "freetype") if subdir: _add_directory(self.compiler.include_dirs, subdir, 0) - if feature.freetype and feature.want("raqm"): + if feature.get("freetype") and feature.want("raqm"): if not feature.want_vendor("raqm"): # want system Raqm _dbg("Looking for Raqm") if _find_include_file(self, "raqm.h"): if _find_library_file(self, "raqm"): - feature.raqm = "raqm" + feature.set("raqm", "raqm") elif _find_library_file(self, "libraqm"): - feature.raqm = "libraqm" + feature.set("raqm", "libraqm") else: # want to build Raqm from src/thirdparty _dbg("Looking for HarfBuzz") - feature.harfbuzz = None + feature.set("harfbuzz", None) hb_dir = _find_include_dir(self, "harfbuzz", "hb.h") if hb_dir: if isinstance(hb_dir, str): _add_directory(self.compiler.include_dirs, hb_dir, 0) if _find_library_file(self, "harfbuzz"): - feature.harfbuzz = "harfbuzz" - if feature.harfbuzz: + feature.set("harfbuzz", "harfbuzz") + if feature.get("harfbuzz"): if not feature.want_vendor("fribidi"): # want system FriBiDi _dbg("Looking for FriBiDi") - feature.fribidi = None + feature.set("fribidi", None) fribidi_dir = _find_include_dir(self, "fribidi", "fribidi.h") if fribidi_dir: if isinstance(fribidi_dir, str): @@ -777,19 +804,19 @@ class pil_build_ext(build_ext): self.compiler.include_dirs, fribidi_dir, 0 ) if _find_library_file(self, "fribidi"): - feature.fribidi = "fribidi" - feature.raqm = True + feature.set("fribidi", "fribidi") + feature.set("raqm", True) else: # want to build FriBiDi shim from src/thirdparty - feature.raqm = True + feature.set("raqm", True) if feature.want("lcms"): _dbg("Looking for lcms") if _find_include_file(self, "lcms2.h"): if _find_library_file(self, "lcms2"): - feature.lcms = "lcms2" + feature.set("lcms", "lcms2") elif _find_library_file(self, "lcms2_static"): # alternate Windows name. - feature.lcms = "lcms2_static" + feature.set("lcms", "lcms2_static") if feature.want("webp"): _dbg("Looking for webp") @@ -803,17 +830,17 @@ class pil_build_ext(build_ext): _find_library_file(self, prefix + library) for library in ("webp", "webpmux", "webpdemux") ): - feature.webp = prefix + "webp" + feature.set("webp", prefix + "webp") break if feature.want("xcb"): _dbg("Looking for xcb") if _find_include_file(self, "xcb/xcb.h"): if _find_library_file(self, "xcb"): - feature.xcb = "xcb" + feature.set("xcb", "xcb") for f in feature: - if not getattr(feature, f) and feature.require(f): + if not feature.get(f) and feature.require(f): if f in ("jpeg", "zlib"): raise RequiredDependencyException(f) raise DependencyException(f) @@ -821,10 +848,11 @@ class pil_build_ext(build_ext): # # core library - libs = self.add_imaging_libs.split() - defs = [] - if feature.tiff: - libs.append(feature.tiff) + libs: list[str | bool | None] = [] + libs.extend(self.add_imaging_libs.split()) + defs: list[tuple[str, str | None]] = [] + if feature.get("tiff"): + libs.append(feature.get("tiff")) defs.append(("HAVE_LIBTIFF", None)) if sys.platform == "win32": # This define needs to be defined if-and-only-if it was defined @@ -832,22 +860,22 @@ class pil_build_ext(build_ext): # so we have to guess; by default it is defined in all Windows builds. # See #4237, #5243, #5359 for more information. defs.append(("USE_WIN32_FILEIO", None)) - if feature.jpeg: - libs.append(feature.jpeg) + if feature.get("jpeg"): + libs.append(feature.get("jpeg")) defs.append(("HAVE_LIBJPEG", None)) - if feature.jpeg2000: - libs.append(feature.jpeg2000) + if feature.get("jpeg2000"): + libs.append(feature.get("jpeg2000")) defs.append(("HAVE_OPENJPEG", None)) if sys.platform == "win32" and not PLATFORM_MINGW: defs.append(("OPJ_STATIC", None)) - if feature.zlib: - libs.append(feature.zlib) + if feature.get("zlib"): + libs.append(feature.get("zlib")) defs.append(("HAVE_LIBZ", None)) - if feature.imagequant: - libs.append(feature.imagequant) + if feature.get("imagequant"): + libs.append(feature.get("imagequant")) defs.append(("HAVE_LIBIMAGEQUANT", None)) - if feature.xcb: - libs.append(feature.xcb) + if feature.get("xcb"): + libs.append(feature.get("xcb")) defs.append(("HAVE_XCB", None)) if sys.platform == "win32": libs.extend(["kernel32", "user32", "gdi32"]) @@ -861,22 +889,22 @@ class pil_build_ext(build_ext): # # additional libraries - if feature.freetype: + if feature.get("freetype"): srcs = [] libs = ["freetype"] defs = [] - if feature.raqm: + if feature.get("raqm"): if not feature.want_vendor("raqm"): # using system Raqm defs.append(("HAVE_RAQM", None)) defs.append(("HAVE_RAQM_SYSTEM", None)) - libs.append(feature.raqm) + libs.append(feature.get("raqm")) else: # building Raqm from src/thirdparty defs.append(("HAVE_RAQM", None)) srcs.append("src/thirdparty/raqm/raqm.c") - libs.append(feature.harfbuzz) + libs.append(feature.get("harfbuzz")) if not feature.want_vendor("fribidi"): # using system FriBiDi defs.append(("HAVE_FRIBIDI_SYSTEM", None)) - libs.append(feature.fribidi) + libs.append(feature.get("fribidi")) else: # building FriBiDi shim from src/thirdparty srcs.append("src/thirdparty/fribidi-shim/fribidi.c") self._update_extension("PIL._imagingft", libs, defs, srcs) @@ -884,16 +912,17 @@ class pil_build_ext(build_ext): else: self._remove_extension("PIL._imagingft") - if feature.lcms: - extra = [] + if feature.get("lcms"): + libs = [feature.get("lcms")] if sys.platform == "win32": - extra.extend(["user32", "gdi32"]) - self._update_extension("PIL._imagingcms", [feature.lcms] + extra) + libs.extend(["user32", "gdi32"]) + self._update_extension("PIL._imagingcms", libs) else: self._remove_extension("PIL._imagingcms") - if feature.webp: - libs = [feature.webp, feature.webp + "mux", feature.webp + "demux"] + webp = feature.get("webp") + if isinstance(webp, str): + libs = [webp, webp + "mux", webp + "demux"] self._update_extension("PIL._webp", libs) else: self._remove_extension("PIL._webp") @@ -908,14 +937,14 @@ class pil_build_ext(build_ext): self.summary_report(feature) - def summary_report(self, feature): + def summary_report(self, feature: ext_feature) -> None: print("-" * 68) print("PIL SETUP SUMMARY") print("-" * 68) print(f"version Pillow {PILLOW_VERSION}") - v = sys.version.split("[") - print(f"platform {sys.platform} {v[0].strip()}") - for v in v[1:]: + version = sys.version.split("[") + print(f"platform {sys.platform} {version[0].strip()}") + for v in version[1:]: print(f" [{v.strip()}") print("-" * 68) @@ -926,16 +955,20 @@ class pil_build_ext(build_ext): raqm_extra_info += ", FriBiDi shim" options = [ - (feature.jpeg, "JPEG"), - (feature.jpeg2000, "OPENJPEG (JPEG2000)", feature.openjpeg_version), - (feature.zlib, "ZLIB (PNG/ZIP)"), - (feature.imagequant, "LIBIMAGEQUANT"), - (feature.tiff, "LIBTIFF"), - (feature.freetype, "FREETYPE2"), - (feature.raqm, "RAQM (Text shaping)", raqm_extra_info), - (feature.lcms, "LITTLECMS2"), - (feature.webp, "WEBP"), - (feature.xcb, "XCB (X protocol)"), + (feature.get("jpeg"), "JPEG"), + ( + feature.get("jpeg2000"), + "OPENJPEG (JPEG2000)", + feature.get("openjpeg_version"), + ), + (feature.get("zlib"), "ZLIB (PNG/ZIP)"), + (feature.get("imagequant"), "LIBIMAGEQUANT"), + (feature.get("tiff"), "LIBTIFF"), + (feature.get("freetype"), "FREETYPE2"), + (feature.get("raqm"), "RAQM (Text shaping)", raqm_extra_info), + (feature.get("lcms"), "LITTLECMS2"), + (feature.get("webp"), "WEBP"), + (feature.get("xcb"), "XCB (X protocol)"), ] all = 1 @@ -964,7 +997,7 @@ class pil_build_ext(build_ext): print("") -def debug_build(): +def debug_build() -> bool: return hasattr(sys, "gettotalrefcount") or FUZZING_BUILD diff --git a/tox.ini b/tox.ini index 70b8bf145..e79d88500 100644 --- a/tox.ini +++ b/tox.ini @@ -36,4 +36,4 @@ deps = extras = typing commands = - mypy docs src winbuild Tests {posargs} + mypy conftest.py selftest.py setup.py docs src winbuild Tests {posargs} From e14072e9738275ffe2898f32d36cbd2f3c687cf3 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 7 Sep 2024 19:08:07 +1000 Subject: [PATCH 340/662] Added further detail --- src/PIL/ImageFont.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 43e86a7ed..abfa4aa80 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -771,14 +771,13 @@ class TransposedFont: def load(filename: str) -> ImageFont: """ - Load a font file. This function loads a font object from the given - bitmap font file, and returns the corresponding font object. + Load a font file. This function loads a font object from the given + bitmap font file, and returns the corresponding font object. For loading TrueType + or OpenType fonts instead, see :py:func:`~PIL.ImageFont.truetype`. :param filename: Name of font file. :return: A font object. :exception OSError: If the file could not be read. - - .. seealso:: :py:func:`PIL.ImageFont.truetype` """ f = ImageFont() f._load_pilfont(filename) @@ -794,7 +793,8 @@ def truetype( ) -> FreeTypeFont: """ Load a TrueType or OpenType font from a file or file-like object, - and create a font object. + and create a font object. For loading bitmap fonts instead, + see :py:func:`~PIL.ImageFont.load` and :py:func:`~PIL.ImageFont.load_path`. This function loads a font object from the given file or file-like object, and creates a font object for a font of the given size. @@ -855,8 +855,6 @@ def truetype( :return: A font object. :exception OSError: If the file could not be read. :exception ValueError: If the font size is not greater than zero. - - .. seealso:: :py:func:`PIL.ImageFont.load` """ def freetype(font: StrOrBytesPath | BinaryIO | None) -> FreeTypeFont: From dbe979d032afed04b93f9ce1aaa9c7f8e23542b1 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 7 Sep 2024 19:09:01 +1000 Subject: [PATCH 341/662] Sort extensions alphabetically in error message --- Tests/test_imagefont.py | 2 +- src/PIL/ImageFont.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 66e6947c2..32cd1db8a 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -469,7 +469,7 @@ def test_load_when_image_not_found(tmp_path: Path) -> None: ImageFont.load(tempfile) root = os.path.splitext(tempfile)[0] - assert str(e.value) == f"cannot find glyph data file {root}.{{png|gif|pbm}}" + assert str(e.value) == f"cannot find glyph data file {root}.{{gif|pbm|png}}" def test_load_path_not_found() -> None: diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index abfa4aa80..b6d69019d 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -115,7 +115,7 @@ class ImageFont: if image: image.close() - msg = f"cannot find glyph data file {root}.{{png|gif|pbm}}" + msg = f"cannot find glyph data file {root}.{{gif|pbm|png}}" raise OSError(msg) self.file = fullname From 2c02146cf4c745df531be49e6900005d7df486b7 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sat, 7 Sep 2024 12:32:30 +0300 Subject: [PATCH 342/662] Use type hints and fix CVE role Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- Tests/test_imagefont.py | 2 +- docs/deprecations.rst | 2 +- docs/releasenotes/11.0.0.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index cfadc7312..3c916db18 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -1154,7 +1154,7 @@ def test_invalid_truetype_sizes_raise_valueerror( def test_freetype_deprecation(monkeypatch: pytest.MonkeyPatch) -> None: # Arrange: mock features.version_module to return fake FreeType version - def fake_version_module(module): + def fake_version_module(module: str) -> str: return "2.9.0" monkeypatch.setattr(features, "version_module", fake_version_module) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index 9a2f16cfb..8d3032827 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -21,7 +21,7 @@ Support for FreeType 2.9.0 is deprecated and will be removed in Pillow 12.0.0 (2025-10-15), when FreeType 2.9.1 will be the minimum supported. We recommend upgrading to at least FreeType `2.10.4`_, which fixed a severe -vulnerability introduced in FreeType 2.6 (:cve:`CVE-2020-15999`). +vulnerability introduced in FreeType 2.6 (:cve:`2020-15999`). .. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index 99e0a2927..0c637cc65 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -52,7 +52,7 @@ Support for FreeType 2.9.0 is deprecated and will be removed in Pillow 12.0.0 (2025-10-15), when FreeType 2.9.1 will be the minimum supported. We recommend upgrading to at least FreeType `2.10.4`_, which fixed a severe -vulnerability introduced in FreeType 2.6 (:cve:`CVE-2020-15999`). +vulnerability introduced in FreeType 2.6 (:cve:`2020-15999`). .. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ From a3d23165b9414b17aee42239bead5034d6fa97c5 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 7 Sep 2024 19:40:29 +1000 Subject: [PATCH 343/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index b43466833..c5beebeba 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Handle duplicate EXIF header #8350 + [zakajd, radarhere] + - Return early from BoxBlur if either width or height is zero #8347 [radarhere] From 547832fd592ee1392533be5bf935c19c690a665f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 7 Sep 2024 19:49:21 +1000 Subject: [PATCH 344/662] Use tempfile.NamedTemporaryFile --- Tests/test_imagefont.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py index 32cd1db8a..e3d847567 100644 --- a/Tests/test_imagefont.py +++ b/Tests/test_imagefont.py @@ -461,14 +461,15 @@ def test_free_type_font_get_mask(font: ImageFont.FreeTypeFont) -> None: assert mask.size == (108, 13) -def test_load_when_image_not_found(tmp_path: Path) -> None: - tmpfile = tmp_path / "file.font" - tmpfile.write_bytes(b"") - tempfile = str(tmpfile) +def test_load_when_image_not_found() -> None: + with tempfile.NamedTemporaryFile(delete=False) as tmp: + pass with pytest.raises(OSError) as e: - ImageFont.load(tempfile) + ImageFont.load(tmp.name) - root = os.path.splitext(tempfile)[0] + os.unlink(tmp.name) + + root = os.path.splitext(tmp.name)[0] assert str(e.value) == f"cannot find glyph data file {root}.{{gif|pbm|png}}" @@ -492,8 +493,8 @@ def test_load_path_existing_path() -> None: with pytest.raises(OSError) as e: ImageFont.load_path(tmp.name) - # The file exists, so the error message suggests to use `load` instead - assert tmp.name in str(e.value) + # The file exists, so the error message suggests to use `load` instead + assert tmp.name in str(e.value) assert " did you mean" in str(e.value) From 8b3ef3784bc655e346028a72844d5c6e04083f47 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 8 Sep 2024 08:30:30 +1000 Subject: [PATCH 345/662] Moved Buffer into _typing --- docs/reference/internal_modules.rst | 4 ++++ src/PIL/GifImagePlugin.py | 17 ++++------------- src/PIL/TiffImagePlugin.py | 15 +++------------ src/PIL/_typing.py | 7 ++++++- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/docs/reference/internal_modules.rst b/docs/reference/internal_modules.rst index 31d60cd83..93fd82cf9 100644 --- a/docs/reference/internal_modules.rst +++ b/docs/reference/internal_modules.rst @@ -33,6 +33,10 @@ Internal Modules Provides a convenient way to import type hints that are not available on some Python versions. +.. py:class:: Buffer + + Typing alias. + .. py:class:: IntegralLike Typing alias. diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index a27f7aae9..f206fbb9c 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -29,7 +29,6 @@ import itertools import math import os import subprocess -import sys from enum import IntEnum from functools import cached_property from typing import IO, TYPE_CHECKING, Any, Literal, NamedTuple, Union @@ -49,6 +48,7 @@ from ._binary import o16le as o16 if TYPE_CHECKING: from . import _imaging + from ._typing import Buffer class LoadingStrategy(IntEnum): @@ -1157,18 +1157,9 @@ def getdata( class Collector(BytesIO): data = [] - if sys.version_info >= (3, 12): - from collections.abc import Buffer - - def write(self, data: Buffer) -> int: - self.data.append(data) - return len(data) - - else: - - def write(self, data: Any) -> int: - self.data.append(data) - return len(data) + def write(self, data: Buffer) -> int: + self.data.append(data) + return len(data) im.load() # make sure raster data is available diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 53f6ae621..a6b03e171 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -46,7 +46,6 @@ import logging import math import os import struct -import sys import warnings from collections.abc import Iterator, MutableMapping from fractions import Fraction @@ -63,7 +62,7 @@ from ._util import is_path from .TiffTags import TYPES if TYPE_CHECKING: - from ._typing import IntegralLike + from ._typing import Buffer, IntegralLike logger = logging.getLogger(__name__) @@ -2108,16 +2107,8 @@ class AppendingTiffWriter(io.BytesIO): num_tags = self.readShort() self.f.seek(num_tags * 12, os.SEEK_CUR) - if sys.version_info >= (3, 12): - from collections.abc import Buffer - - def write(self, data: Buffer, /) -> int: - return self.f.write(data) - - else: - - def write(self, data: Any, /) -> int: - return self.f.write(data) + def write(self, data: Buffer, /) -> int: + return self.f.write(data) def readShort(self) -> int: (value,) = struct.unpack(self.shortFmt, self.f.read(2)) diff --git a/src/PIL/_typing.py b/src/PIL/_typing.py index 093778464..da49f7c5d 100644 --- a/src/PIL/_typing.py +++ b/src/PIL/_typing.py @@ -15,6 +15,11 @@ if TYPE_CHECKING: except (ImportError, AttributeError): pass +if sys.version_info >= (3, 12): + from collections.abc import Buffer +else: + Buffer = Any + if sys.version_info >= (3, 10): from typing import TypeGuard else: @@ -40,4 +45,4 @@ class SupportsRead(Protocol[_T_co]): StrOrBytesPath = Union[str, bytes, "os.PathLike[str]", "os.PathLike[bytes]"] -__all__ = ["IntegralLike", "StrOrBytesPath", "SupportsRead", "TypeGuard"] +__all__ = ["Buffer", "IntegralLike", "StrOrBytesPath", "SupportsRead", "TypeGuard"] From 89c790f2b03aa44980eaabb6e9b5d312e5002fba Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 8 Sep 2024 21:38:21 +1000 Subject: [PATCH 346/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index c5beebeba..be94594f8 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Removed unused TiffImagePlugin IFD_LEGACY_API #8355 + [radarhere] + - Handle duplicate EXIF header #8350 [zakajd, radarhere] From 6231453895ff9098fde1de8e4be2ddcf0574b1a8 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 8 Sep 2024 21:53:08 +1000 Subject: [PATCH 347/662] Group 11.0.0 deprecations --- docs/deprecations.rst | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index 8d3032827..bf290a9cd 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -12,19 +12,6 @@ Deprecated features Below are features which are considered deprecated. Where appropriate, a :py:exc:`DeprecationWarning` is issued. -FreeType 2.9.0 -~~~~~~~~~~~~~~ - -.. deprecated:: 11.0.0 - -Support for FreeType 2.9.0 is deprecated and will be removed in Pillow 12.0.0 -(2025-10-15), when FreeType 2.9.1 will be the minimum supported. - -We recommend upgrading to at least FreeType `2.10.4`_, which fixed a severe -vulnerability introduced in FreeType 2.6 (:cve:`2020-15999`). - -.. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ - ImageFile.raise_oserror ~~~~~~~~~~~~~~~~~~~~~~~ @@ -122,6 +109,19 @@ ImageDraw.getdraw hints parameter The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecated. +FreeType 2.9.0 +~~~~~~~~~~~~~~ + +.. deprecated:: 11.0.0 + +Support for FreeType 2.9.0 is deprecated and will be removed in Pillow 12.0.0 +(2025-10-15), when FreeType 2.9.1 will be the minimum supported. + +We recommend upgrading to at least FreeType `2.10.4`_, which fixed a severe +vulnerability introduced in FreeType 2.6 (:cve:`2020-15999`). + +.. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ + ImageMath.lambda_eval and ImageMath.unsafe_eval options parameter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ From 8c738f6427c1be395921f5ef3f1e6e4aa86f4eb7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2024 13:00:15 +0000 Subject: [PATCH 348/662] Update deadsnakes/action action to v3.2.0 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1b169db91..e0903f886 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -76,7 +76,7 @@ jobs: "pyproject.toml" - name: Set up Python ${{ matrix.python-version }} (free-threaded) - uses: deadsnakes/action@v3.1.0 + uses: deadsnakes/action@v3.2.0 if: "${{ matrix.disable-gil }}" with: python-version: ${{ matrix.python-version }} From 2f13c4588d6287140a7e94bc8bc6c732610bd31e Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 8 Sep 2024 16:17:13 +0300 Subject: [PATCH 349/662] Fix underline Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- docs/deprecations.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index bf290a9cd..1d2da2381 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -110,7 +110,7 @@ ImageDraw.getdraw hints parameter The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been deprecated. FreeType 2.9.0 -~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^ .. deprecated:: 11.0.0 From fe002a72606ff33279ce798f77154f5bf8dcef17 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 01:24:51 +0400 Subject: [PATCH 350/662] Use PyCapsule in _imagingmath --- src/PIL/ImageMath.py | 4 +- src/_imagingmath.c | 145 +++++++++++++++++++++++++++---------------- 2 files changed, 94 insertions(+), 55 deletions(-) diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py index 191cc2a5f..b32742657 100644 --- a/src/PIL/ImageMath.py +++ b/src/PIL/ImageMath.py @@ -65,7 +65,7 @@ class _Operand: except AttributeError as e: msg = f"bad operand type for '{op}'" raise TypeError(msg) from e - _imagingmath.unop(op, out.im.id, im_1.im.id) + _imagingmath.unop(op, out.im.ptr, im_1.im.ptr) else: # binary operation im_2 = self.__fixup(im2) @@ -93,7 +93,7 @@ class _Operand: except AttributeError as e: msg = f"bad operand type for '{op}'" raise TypeError(msg) from e - _imagingmath.binop(op, out.im.id, im_1.im.id, im_2.im.id) + _imagingmath.binop(op, out.im.ptr, im_1.im.ptr, im_2.im.ptr) return _Operand(out) # unary operators diff --git a/src/_imagingmath.c b/src/_imagingmath.c index 550a10903..eafcf1444 100644 --- a/src/_imagingmath.c +++ b/src/_imagingmath.c @@ -23,6 +23,9 @@ #define MAX_INT32 2147483647.0 #define MIN_INT32 -2147483648.0 +#define MATH_FUNC_UNOP_MAGIC "Pillow Math unary func" +#define MATH_FUNC_BINOP_MAGIC "Pillow Math binary func" + #define UNOP(name, op, type) \ void name(Imaging out, Imaging im1) { \ int x, y; \ @@ -168,15 +171,28 @@ _unop(PyObject *self, PyObject *args) { Imaging im1; void (*unop)(Imaging, Imaging); - Py_ssize_t op, i0, i1; - if (!PyArg_ParseTuple(args, "nnn", &op, &i0, &i1)) { + PyObject *op, *i0, *i1; + if (!PyArg_ParseTuple(args, "OOO", &op, &i0, &i1)) { return NULL; } - out = (Imaging)i0; - im1 = (Imaging)i1; + if (!PyCapsule_IsValid(op, MATH_FUNC_UNOP_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", MATH_FUNC_UNOP_MAGIC + ); + return NULL; + } + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || + !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } - unop = (void *)op; + unop = (void *)PyCapsule_GetPointer(op, MATH_FUNC_UNOP_MAGIC); + out = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); + im1 = (Imaging)PyCapsule_GetPointer(i1, IMAGING_MAGIC); unop(out, im1); @@ -191,16 +207,30 @@ _binop(PyObject *self, PyObject *args) { Imaging im2; void (*binop)(Imaging, Imaging, Imaging); - Py_ssize_t op, i0, i1, i2; - if (!PyArg_ParseTuple(args, "nnnn", &op, &i0, &i1, &i2)) { + PyObject *op, *i0, *i1, *i2; + if (!PyArg_ParseTuple(args, "OOOO", &op, &i0, &i1, &i2)) { return NULL; } - out = (Imaging)i0; - im1 = (Imaging)i1; - im2 = (Imaging)i2; + if (!PyCapsule_IsValid(op, MATH_FUNC_BINOP_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", MATH_FUNC_BINOP_MAGIC + ); + return NULL; + } + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || + !PyCapsule_IsValid(i1, IMAGING_MAGIC) || + !PyCapsule_IsValid(i2, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } - binop = (void *)op; + binop = (void *)PyCapsule_GetPointer(op, MATH_FUNC_BINOP_MAGIC); + out = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); + im1 = (Imaging)PyCapsule_GetPointer(i1, IMAGING_MAGIC); + im2 = (Imaging)PyCapsule_GetPointer(i2, IMAGING_MAGIC); binop(out, im1, im2); @@ -213,8 +243,17 @@ static PyMethodDef _functions[] = { }; static void -install(PyObject *d, char *name, void *value) { - PyObject *v = PyLong_FromSsize_t((Py_ssize_t)value); +install_unary(PyObject *d, char *name, void *func) { + PyObject *v = PyCapsule_New(func, MATH_FUNC_UNOP_MAGIC, NULL); + if (!v || PyDict_SetItemString(d, name, v)) { + PyErr_Clear(); + } + Py_XDECREF(v); +} + +static void +install_binary(PyObject *d, char *name, void *func) { + PyObject *v = PyCapsule_New(func, MATH_FUNC_BINOP_MAGIC, NULL); if (!v || PyDict_SetItemString(d, name, v)) { PyErr_Clear(); } @@ -225,50 +264,50 @@ static int setup_module(PyObject *m) { PyObject *d = PyModule_GetDict(m); - install(d, "abs_I", abs_I); - install(d, "neg_I", neg_I); - install(d, "add_I", add_I); - install(d, "sub_I", sub_I); - install(d, "diff_I", diff_I); - install(d, "mul_I", mul_I); - install(d, "div_I", div_I); - install(d, "mod_I", mod_I); - install(d, "min_I", min_I); - install(d, "max_I", max_I); - install(d, "pow_I", pow_I); + install_unary(d, "abs_I", abs_I); + install_unary(d, "neg_I", neg_I); + install_binary(d, "add_I", add_I); + install_binary(d, "sub_I", sub_I); + install_binary(d, "diff_I", diff_I); + install_binary(d, "mul_I", mul_I); + install_binary(d, "div_I", div_I); + install_binary(d, "mod_I", mod_I); + install_binary(d, "min_I", min_I); + install_binary(d, "max_I", max_I); + install_binary(d, "pow_I", pow_I); - install(d, "invert_I", invert_I); - install(d, "and_I", and_I); - install(d, "or_I", or_I); - install(d, "xor_I", xor_I); - install(d, "lshift_I", lshift_I); - install(d, "rshift_I", rshift_I); + install_unary(d, "invert_I", invert_I); + install_binary(d, "and_I", and_I); + install_binary(d, "or_I", or_I); + install_binary(d, "xor_I", xor_I); + install_binary(d, "lshift_I", lshift_I); + install_binary(d, "rshift_I", rshift_I); - install(d, "eq_I", eq_I); - install(d, "ne_I", ne_I); - install(d, "lt_I", lt_I); - install(d, "le_I", le_I); - install(d, "gt_I", gt_I); - install(d, "ge_I", ge_I); + install_binary(d, "eq_I", eq_I); + install_binary(d, "ne_I", ne_I); + install_binary(d, "lt_I", lt_I); + install_binary(d, "le_I", le_I); + install_binary(d, "gt_I", gt_I); + install_binary(d, "ge_I", ge_I); - install(d, "abs_F", abs_F); - install(d, "neg_F", neg_F); - install(d, "add_F", add_F); - install(d, "sub_F", sub_F); - install(d, "diff_F", diff_F); - install(d, "mul_F", mul_F); - install(d, "div_F", div_F); - install(d, "mod_F", mod_F); - install(d, "min_F", min_F); - install(d, "max_F", max_F); - install(d, "pow_F", pow_F); + install_unary(d, "abs_F", abs_F); + install_unary(d, "neg_F", neg_F); + install_binary(d, "add_F", add_F); + install_binary(d, "sub_F", sub_F); + install_binary(d, "diff_F", diff_F); + install_binary(d, "mul_F", mul_F); + install_binary(d, "div_F", div_F); + install_binary(d, "mod_F", mod_F); + install_binary(d, "min_F", min_F); + install_binary(d, "max_F", max_F); + install_binary(d, "pow_F", pow_F); - install(d, "eq_F", eq_F); - install(d, "ne_F", ne_F); - install(d, "lt_F", lt_F); - install(d, "le_F", le_F); - install(d, "gt_F", gt_F); - install(d, "ge_F", ge_F); + install_binary(d, "eq_F", eq_F); + install_binary(d, "ne_F", ne_F); + install_binary(d, "lt_F", lt_F); + install_binary(d, "le_F", le_F); + install_binary(d, "gt_F", gt_F); + install_binary(d, "ge_F", ge_F); return 0; } From 56bc6a1a71da0d51666689c9d89a21615edfc757 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 01:32:28 +0400 Subject: [PATCH 351/662] Use PyCapsule in _imagingcms --- src/PIL/ImageCms.py | 4 ++-- src/_imagingcms.c | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/PIL/ImageCms.py b/src/PIL/ImageCms.py index ec10230f1..5e256b0ab 100644 --- a/src/PIL/ImageCms.py +++ b/src/PIL/ImageCms.py @@ -352,7 +352,7 @@ class ImageCmsTransform(Image.ImagePointHandler): im.load() if imOut is None: imOut = Image.new(self.output_mode, im.size, None) - self.transform.apply(im.im.id, imOut.im.id) + self.transform.apply(im.im.ptr, imOut.im.ptr) imOut.info["icc_profile"] = self.output_profile.tobytes() return imOut @@ -361,7 +361,7 @@ class ImageCmsTransform(Image.ImagePointHandler): if im.mode != self.output_mode: msg = "mode mismatch" raise ValueError(msg) # wrong output mode - self.transform.apply(im.im.id, im.im.id) + self.transform.apply(im.im.ptr, im.im.ptr) im.info["icc_profile"] = self.output_profile.tobytes() return im diff --git a/src/_imagingcms.c b/src/_imagingcms.c index bafe787a7..444b6a602 100644 --- a/src/_imagingcms.c +++ b/src/_imagingcms.c @@ -531,23 +531,26 @@ buildProofTransform(PyObject *self, PyObject *args) { static PyObject * cms_transform_apply(CmsTransformObject *self, PyObject *args) { - Py_ssize_t idIn; - Py_ssize_t idOut; + PyObject *i0, *i1; Imaging im; Imaging imOut; - int result; - - if (!PyArg_ParseTuple(args, "nn:apply", &idIn, &idOut)) { + if (!PyArg_ParseTuple(args, "OO:apply", &i0, &i1)) { return NULL; } - im = (Imaging)idIn; - imOut = (Imaging)idOut; + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || + !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } - result = pyCMSdoTransform(im, imOut, self->transform); + im = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); + imOut = (Imaging)PyCapsule_GetPointer(i1, IMAGING_MAGIC); - return Py_BuildValue("i", result); + return Py_BuildValue("i", pyCMSdoTransform(im, imOut, self->transform)); } /* -------------------------------------------------------------------- */ From f916b5dc87664b89603f413c179f1ccc6aeab95a Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 01:43:38 +0400 Subject: [PATCH 352/662] Use PyCapsule in _imagingmorph --- Tests/test_imagemorph.py | 8 +++---- src/PIL/ImageMorph.py | 6 ++--- src/_imagingmorph.c | 48 ++++++++++++++++++++++++++++++---------- 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/Tests/test_imagemorph.py b/Tests/test_imagemorph.py index 80d8c3815..04860fd61 100644 --- a/Tests/test_imagemorph.py +++ b/Tests/test_imagemorph.py @@ -328,13 +328,13 @@ def test_wrong_mode() -> None: iml = Image.new("L", (10, 10)) with pytest.raises(RuntimeError): - _imagingmorph.apply(bytes(lut), imrgb.im.id, iml.im.id) + _imagingmorph.apply(bytes(lut), imrgb.im.ptr, iml.im.ptr) with pytest.raises(RuntimeError): - _imagingmorph.apply(bytes(lut), iml.im.id, imrgb.im.id) + _imagingmorph.apply(bytes(lut), iml.im.ptr, imrgb.im.ptr) with pytest.raises(RuntimeError): - _imagingmorph.match(bytes(lut), imrgb.im.id) + _imagingmorph.match(bytes(lut), imrgb.im.ptr) # Should not raise - _imagingmorph.match(bytes(lut), iml.im.id) + _imagingmorph.match(bytes(lut), iml.im.ptr) diff --git a/src/PIL/ImageMorph.py b/src/PIL/ImageMorph.py index 6a43983d3..bc7ed66d3 100644 --- a/src/PIL/ImageMorph.py +++ b/src/PIL/ImageMorph.py @@ -213,7 +213,7 @@ class MorphOp: msg = "Image mode must be L" raise ValueError(msg) outimage = Image.new(image.mode, image.size, None) - count = _imagingmorph.apply(bytes(self.lut), image.im.id, outimage.im.id) + count = _imagingmorph.apply(bytes(self.lut), image.im.ptr, outimage.im.ptr) return count, outimage def match(self, image: Image.Image) -> list[tuple[int, int]]: @@ -229,7 +229,7 @@ class MorphOp: if image.mode != "L": msg = "Image mode must be L" raise ValueError(msg) - return _imagingmorph.match(bytes(self.lut), image.im.id) + return _imagingmorph.match(bytes(self.lut), image.im.ptr) def get_on_pixels(self, image: Image.Image) -> list[tuple[int, int]]: """Get a list of all turned on pixels in a binary image @@ -240,7 +240,7 @@ class MorphOp: if image.mode != "L": msg = "Image mode must be L" raise ValueError(msg) - return _imagingmorph.get_on_pixels(image.im.id) + return _imagingmorph.get_on_pixels(image.im.ptr) def load_lut(self, filename: str) -> None: """Load an operator from an mrl file""" diff --git a/src/_imagingmorph.c b/src/_imagingmorph.c index 614dfbe7f..c7933cc7d 100644 --- a/src/_imagingmorph.c +++ b/src/_imagingmorph.c @@ -30,15 +30,15 @@ static PyObject * apply(PyObject *self, PyObject *args) { const char *lut; - PyObject *py_lut; - Py_ssize_t lut_len, i0, i1; + PyObject *py_lut, *i0, *i1; + Py_ssize_t lut_len; Imaging imgin, imgout; int width, height; int row_idx, col_idx; UINT8 **inrows, **outrows; int num_changed_pixels = 0; - if (!PyArg_ParseTuple(args, "Onn", &py_lut, &i0, &i1)) { + if (!PyArg_ParseTuple(args, "OOO", &py_lut, &i0, &i1)) { PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem"); return NULL; } @@ -57,8 +57,16 @@ apply(PyObject *self, PyObject *args) { lut = PyBytes_AsString(py_lut); - imgin = (Imaging)i0; - imgout = (Imaging)i1; + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || + !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } + + imgin = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); + imgout = (Imaging)PyCapsule_GetPointer(i1, IMAGING_MAGIC); width = imgin->xsize; height = imgin->ysize; @@ -129,8 +137,8 @@ apply(PyObject *self, PyObject *args) { static PyObject * match(PyObject *self, PyObject *args) { const char *lut; - PyObject *py_lut; - Py_ssize_t lut_len, i0; + PyObject *py_lut, *i0; + Py_ssize_t lut_len; Imaging imgin; int width, height; int row_idx, col_idx; @@ -140,7 +148,7 @@ match(PyObject *self, PyObject *args) { return NULL; } - if (!PyArg_ParseTuple(args, "On", &py_lut, &i0)) { + if (!PyArg_ParseTuple(args, "OO", &py_lut, &i0)) { Py_DECREF(ret); PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem"); return NULL; @@ -161,7 +169,15 @@ match(PyObject *self, PyObject *args) { } lut = PyBytes_AsString(py_lut); - imgin = (Imaging)i0; + + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } + + imgin = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); if (imgin->type != IMAGING_TYPE_UINT8 || imgin->bands != 1) { Py_DECREF(ret); @@ -215,7 +231,7 @@ match(PyObject *self, PyObject *args) { */ static PyObject * get_on_pixels(PyObject *self, PyObject *args) { - Py_ssize_t i0; + PyObject *i0; Imaging img; UINT8 **rows; int row_idx, col_idx; @@ -225,12 +241,20 @@ get_on_pixels(PyObject *self, PyObject *args) { return NULL; } - if (!PyArg_ParseTuple(args, "n", &i0)) { + if (!PyArg_ParseTuple(args, "O", &i0)) { Py_DECREF(ret); PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem"); return NULL; } - img = (Imaging)i0; + + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } + + img = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); rows = img->image8; width = img->xsize; height = img->ysize; From 7f48567002a74a9f102dc3b183f872846e2925b3 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 02:00:07 +0400 Subject: [PATCH 353/662] Use s# in PyArg_ParseTuple --- src/_imagingmorph.c | 55 ++++++++++--------------------------- src/libImaging/ImPlatform.h | 1 + 2 files changed, 16 insertions(+), 40 deletions(-) diff --git a/src/_imagingmorph.c b/src/_imagingmorph.c index c7933cc7d..715cccf51 100644 --- a/src/_imagingmorph.c +++ b/src/_imagingmorph.c @@ -11,7 +11,6 @@ * See the README file for information on usage and redistribution. */ -#include "Python.h" #include "libImaging/Imaging.h" #define LUT_SIZE (1 << 9) @@ -30,7 +29,7 @@ static PyObject * apply(PyObject *self, PyObject *args) { const char *lut; - PyObject *py_lut, *i0, *i1; + PyObject *i0, *i1; Py_ssize_t lut_len; Imaging imgin, imgout; int width, height; @@ -38,25 +37,15 @@ apply(PyObject *self, PyObject *args) { UINT8 **inrows, **outrows; int num_changed_pixels = 0; - if (!PyArg_ParseTuple(args, "OOO", &py_lut, &i0, &i1)) { - PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem"); + if (!PyArg_ParseTuple(args, "s#OO", &lut, &lut_len, &i0, &i1)) { return NULL; } - if (!PyBytes_Check(py_lut)) { - PyErr_SetString(PyExc_RuntimeError, "The morphology LUT is not a bytes object"); - return NULL; - } - - lut_len = PyBytes_Size(py_lut); - if (lut_len < LUT_SIZE) { PyErr_SetString(PyExc_RuntimeError, "The morphology LUT has the wrong size"); return NULL; } - lut = PyBytes_AsString(py_lut); - if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { PyErr_Format( @@ -137,39 +126,22 @@ apply(PyObject *self, PyObject *args) { static PyObject * match(PyObject *self, PyObject *args) { const char *lut; - PyObject *py_lut, *i0; + PyObject *i0; Py_ssize_t lut_len; Imaging imgin; int width, height; int row_idx, col_idx; UINT8 **inrows; - PyObject *ret = PyList_New(0); - if (ret == NULL) { + + if (!PyArg_ParseTuple(args, "s#O", &lut, &lut_len, &i0)) { return NULL; } - if (!PyArg_ParseTuple(args, "OO", &py_lut, &i0)) { - Py_DECREF(ret); - PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem"); - return NULL; - } - - if (!PyBytes_Check(py_lut)) { - Py_DECREF(ret); - PyErr_SetString(PyExc_RuntimeError, "The morphology LUT is not a bytes object"); - return NULL; - } - - lut_len = PyBytes_Size(py_lut); - if (lut_len < LUT_SIZE) { - Py_DECREF(ret); PyErr_SetString(PyExc_RuntimeError, "The morphology LUT has the wrong size"); return NULL; } - lut = PyBytes_AsString(py_lut); - if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) { PyErr_Format( PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC @@ -180,11 +152,15 @@ match(PyObject *self, PyObject *args) { imgin = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); if (imgin->type != IMAGING_TYPE_UINT8 || imgin->bands != 1) { - Py_DECREF(ret); PyErr_SetString(PyExc_RuntimeError, "Unsupported image type"); return NULL; } + PyObject *ret = PyList_New(0); + if (ret == NULL) { + return NULL; + } + inrows = imgin->image8; width = imgin->xsize; height = imgin->ysize; @@ -236,14 +212,8 @@ get_on_pixels(PyObject *self, PyObject *args) { UINT8 **rows; int row_idx, col_idx; int width, height; - PyObject *ret = PyList_New(0); - if (ret == NULL) { - return NULL; - } if (!PyArg_ParseTuple(args, "O", &i0)) { - Py_DECREF(ret); - PyErr_SetString(PyExc_RuntimeError, "Argument parsing problem"); return NULL; } @@ -259,6 +229,11 @@ get_on_pixels(PyObject *self, PyObject *args) { width = img->xsize; height = img->ysize; + PyObject *ret = PyList_New(0); + if (ret == NULL) { + return NULL; + } + for (row_idx = 0; row_idx < height; row_idx++) { UINT8 *row = rows[row_idx]; for (col_idx = 0; col_idx < width; col_idx++) { diff --git a/src/libImaging/ImPlatform.h b/src/libImaging/ImPlatform.h index f6e7fb6b9..c9b7e43b4 100644 --- a/src/libImaging/ImPlatform.h +++ b/src/libImaging/ImPlatform.h @@ -7,6 +7,7 @@ * Copyright (c) Fredrik Lundh 1995-2003. */ +#define PY_SSIZE_T_CLEAN #include "Python.h" /* Check that we have an ANSI compliant compiler */ From 5428e3568e09d69241b03827eecb08d7b5dc9ea9 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 02:19:44 +0400 Subject: [PATCH 354/662] Deprecate ImageCore.id and ImageCore.unsafe_ptrs --- Tests/test_image_getim.py | 12 ++++++++++-- docs/deprecations.rst | 10 ++++++++++ src/_imaging.c | 14 ++++++++++++++ src/libImaging/Imaging.h | 2 +- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Tests/test_image_getim.py b/Tests/test_image_getim.py index 9afa02b0a..75d97cd44 100644 --- a/Tests/test_image_getim.py +++ b/Tests/test_image_getim.py @@ -1,11 +1,19 @@ from __future__ import annotations +import pytest + from .helper import hopper def test_sanity() -> None: im = hopper() - type_repr = repr(type(im.getim())) + type_repr = repr(type(im.getim())) assert "PyCapsule" in type_repr - assert isinstance(im.im.id, int) + + with pytest.warns(DeprecationWarning): + assert isinstance(im.im.id, int) + + with pytest.warns(DeprecationWarning): + ptrs = dict(im.im.unsafe_ptrs) + assert all(k in ptrs for k in ["image8", "image32", "image"]) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index cafda3803..abb902c88 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -136,6 +136,16 @@ Specific WebP Feature Checks ``True`` if the WebP module is installed, until they are removed in Pillow 12.0.0 (2025-10-15). +Get Internal Pointers to Objects +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 11.0.0 + +``Image.core.ImageCore.id`` and ``Image.core.ImageCore.unsafe_ptrs`` +have been deprecated and will be removed in Pillow 12 (2025-10-15). +They were used for obtaining raw pointers to ``ImageCore`` internals. To interact with +C code, you can use ``Image.core.ImageCore.ptr``, which returns a ``PyCapsule`` object. + Removed features ---------------- diff --git a/src/_imaging.c b/src/_imaging.c index 07d9a64cc..a455c873b 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -3707,6 +3707,13 @@ _getattr_bands(ImagingObject *self, void *closure) { static PyObject * _getattr_id(ImagingObject *self, void *closure) { + if (PyErr_WarnEx( + PyExc_DeprecationWarning, + "id property is deprecated and will be removed in Pillow 12.0", + 1 + ) < 0) { + return NULL; + } return PyLong_FromSsize_t((Py_ssize_t)self->image); } @@ -3717,6 +3724,13 @@ _getattr_ptr(ImagingObject *self, void *closure) { static PyObject * _getattr_unsafe_ptrs(ImagingObject *self, void *closure) { + if (PyErr_WarnEx( + PyExc_DeprecationWarning, + "unsafe_ptrs property is deprecated and will be removed in Pillow 12.0", + 1 + ) < 0) { + return NULL; + } return Py_BuildValue( "(sn)(sn)(sn)", "image8", diff --git a/src/libImaging/Imaging.h b/src/libImaging/Imaging.h index 321dce988..870f5ed97 100644 --- a/src/libImaging/Imaging.h +++ b/src/libImaging/Imaging.h @@ -61,7 +61,7 @@ typedef struct ImagingOutlineInstance *ImagingOutline; typedef struct ImagingPaletteInstance *ImagingPalette; /* handle magics (used with PyCObject). */ -#define IMAGING_MAGIC "PIL Imaging" +#define IMAGING_MAGIC "Pillow Imaging" /* pixel types */ #define IMAGING_TYPE_UINT8 0 From cb3a4e6a00fd41e42afa78b4289e5e1056fc0e81 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 03:45:18 +0400 Subject: [PATCH 355/662] Remove legacy 1-bit api, fix AttributeError PytestUnraisableExceptionWarning: Exception ignored in: AttributeError: 'PhotoImage' object has no attribute '_PhotoImage__photo' --- src/PIL/ImageTk.py | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index a788c9d1f..d546989ee 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -35,20 +35,6 @@ from . import Image, ImageFile # -------------------------------------------------------------------- # Check for Tkinter interface hooks -_pilbitmap_ok = None - - -def _pilbitmap_check() -> int: - global _pilbitmap_ok - if _pilbitmap_ok is None: - try: - im = Image.new("1", (1, 1)) - tkinter.BitmapImage(data=f"PIL:{im.im.id}") - _pilbitmap_ok = 1 - except tkinter.TclError: - _pilbitmap_ok = 0 - return _pilbitmap_ok - def _get_image_from_kw(kw: dict[str, Any]) -> ImageFile.ImageFile | None: source = None @@ -142,6 +128,8 @@ class PhotoImage: self.paste(image) def __del__(self) -> None: + if not hasattr(self, "__photo"): + return name = self.__photo.name self.__photo.name = None try: @@ -225,17 +213,11 @@ class BitmapImage: self.__mode = image.mode self.__size = image.size - if _pilbitmap_check(): - # fast way (requires the pilbitmap booster patch) - image.load() - kw["data"] = f"PIL:{image.im.id}" - self.__im = image # must keep a reference - else: - # slow but safe way - kw["data"] = image.tobitmap() - self.__photo = tkinter.BitmapImage(**kw) + self.__photo = tkinter.BitmapImage(data=image.tobitmap(), **kw) def __del__(self) -> None: + if not hasattr(self, "__photo"): + return name = self.__photo.name self.__photo.name = None try: From ee65b305b1fd041b679382003b4ce727bb03392d Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 04:29:34 +0400 Subject: [PATCH 356/662] Use PyCapsule in _imagingtk --- src/PIL/ImageTk.py | 11 +++++------ src/Tk/tkImaging.c | 35 ++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index d546989ee..279a21716 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -48,18 +48,18 @@ def _get_image_from_kw(kw: dict[str, Any]) -> ImageFile.ImageFile | None: def _pyimagingtkcall( - command: str, photo: PhotoImage | tkinter.PhotoImage, id: int + command: str, photo: PhotoImage | tkinter.PhotoImage, ptr: object ) -> None: tk = photo.tk try: - tk.call(command, photo, id) + tk.call(command, photo, repr(ptr)) except tkinter.TclError: # activate Tkinter hook # may raise an error if it cannot attach to Tkinter from . import _imagingtk _imagingtk.tkinit(tk.interpaddr()) - tk.call(command, photo, id) + tk.call(command, photo, repr(ptr)) # -------------------------------------------------------------------- @@ -181,7 +181,7 @@ class PhotoImage: block = image.new_block(self.__mode, im.size) image.convert2(block, image) # convert directly between buffers - _pyimagingtkcall("PyImagingPhoto", self.__photo, block.id) + _pyimagingtkcall("PyImagingPhoto", self.__photo, block.ptr) # -------------------------------------------------------------------- @@ -255,9 +255,8 @@ class BitmapImage: def getimage(photo: PhotoImage) -> Image.Image: """Copies the contents of a PhotoImage to a PIL image memory.""" im = Image.new("RGBA", (photo.width(), photo.height())) - block = im.im - _pyimagingtkcall("PyImagingPhotoGet", photo, block.id) + _pyimagingtkcall("PyImagingPhotoGet", photo, im.im.ptr) return im diff --git a/src/Tk/tkImaging.c b/src/Tk/tkImaging.c index 727ee6bed..b33a47d30 100644 --- a/src/Tk/tkImaging.c +++ b/src/Tk/tkImaging.c @@ -56,19 +56,36 @@ static Tk_PhotoPutBlock_t TK_PHOTO_PUT_BLOCK; static Imaging ImagingFind(const char *name) { - Py_ssize_t id; + PyObject *capsule; + int direct_pointer = 0; + const char *expected = "capsule object \"" IMAGING_MAGIC "\" at 0x"; - /* FIXME: use CObject instead? */ -#if defined(_WIN64) - id = _atoi64(name); -#else - id = atol(name); -#endif - if (!id) { + if (name[0] == '<') { + name++; + } else { + // Special case for PyPy, where the string representation of a Capsule + // refers directly to the pointer itself, not to the PyCapsule object. + direct_pointer = 1; + } + + if (strncmp(name, expected, strlen(expected))) { return NULL; } - return (Imaging)id; + capsule = (PyObject *)strtoull(name + strlen(expected), NULL, 16); + + if (direct_pointer) { + return (Imaging)capsule; + } + + if (!PyCapsule_IsValid(capsule, IMAGING_MAGIC)) { + PyErr_Format( + PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC + ); + return NULL; + } + + return (Imaging)PyCapsule_GetPointer(capsule, IMAGING_MAGIC); } static int From 882ac783eb67a13c1ff8afba9369d1603328718e Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 2 Sep 2024 13:04:57 +0400 Subject: [PATCH 357/662] Use PyCapsule in _imagingft --- src/_imagingft.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/_imagingft.c b/src/_imagingft.c index 5c446e641..c539ec267 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -830,7 +830,6 @@ font_render(FontObject *self, PyObject *args) { unsigned char convert_scale; /* scale factor for non-8bpp bitmaps */ PyObject *image; Imaging im; - Py_ssize_t id; int mask = 0; /* is FT_LOAD_TARGET_MONO enabled? */ int color = 0; /* is FT_LOAD_COLOR enabled? */ int stroke_width = 0; @@ -929,10 +928,9 @@ font_render(FontObject *self, PyObject *args) { PyMem_Del(glyph_info); return NULL; } - PyObject *imageId = PyObject_GetAttrString(image, "id"); - id = PyLong_AsSsize_t(imageId); - Py_XDECREF(imageId); - im = (Imaging)id; + PyObject *imagePtr = PyObject_GetAttrString(image, "ptr"); + im = (Imaging)PyCapsule_GetPointer(imagePtr, IMAGING_MAGIC); + Py_XDECREF(imagePtr); x_offset -= stroke_width; y_offset -= stroke_width; From 934ae12ed5e98b7d2ec14d1946fad3bce6a42924 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Tue, 3 Sep 2024 11:54:24 +0400 Subject: [PATCH 358/662] rename PyCapsule -> Capsule --- docs/deprecations.rst | 2 +- src/Tk/tkImaging.c | 4 +--- src/_imagingcms.c | 4 +--- src/_imagingmath.c | 16 ++++------------ src/_imagingmorph.c | 12 +++--------- 5 files changed, 10 insertions(+), 28 deletions(-) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index abb902c88..dd271a97f 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -144,7 +144,7 @@ Get Internal Pointers to Objects ``Image.core.ImageCore.id`` and ``Image.core.ImageCore.unsafe_ptrs`` have been deprecated and will be removed in Pillow 12 (2025-10-15). They were used for obtaining raw pointers to ``ImageCore`` internals. To interact with -C code, you can use ``Image.core.ImageCore.ptr``, which returns a ``PyCapsule`` object. +C code, you can use ``Image.core.ImageCore.ptr``, which returns a ``Capsule`` object. Removed features ---------------- diff --git a/src/Tk/tkImaging.c b/src/Tk/tkImaging.c index b33a47d30..a36c3e0bd 100644 --- a/src/Tk/tkImaging.c +++ b/src/Tk/tkImaging.c @@ -79,9 +79,7 @@ ImagingFind(const char *name) { } if (!PyCapsule_IsValid(capsule, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } diff --git a/src/_imagingcms.c b/src/_imagingcms.c index 444b6a602..1823bcf03 100644 --- a/src/_imagingcms.c +++ b/src/_imagingcms.c @@ -541,9 +541,7 @@ cms_transform_apply(CmsTransformObject *self, PyObject *args) { if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } diff --git a/src/_imagingmath.c b/src/_imagingmath.c index eafcf1444..dbe636707 100644 --- a/src/_imagingmath.c +++ b/src/_imagingmath.c @@ -177,16 +177,12 @@ _unop(PyObject *self, PyObject *args) { } if (!PyCapsule_IsValid(op, MATH_FUNC_UNOP_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", MATH_FUNC_UNOP_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", MATH_FUNC_UNOP_MAGIC); return NULL; } if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } @@ -213,17 +209,13 @@ _binop(PyObject *self, PyObject *args) { } if (!PyCapsule_IsValid(op, MATH_FUNC_BINOP_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", MATH_FUNC_BINOP_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", MATH_FUNC_BINOP_MAGIC); return NULL; } if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || !PyCapsule_IsValid(i1, IMAGING_MAGIC) || !PyCapsule_IsValid(i2, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } diff --git a/src/_imagingmorph.c b/src/_imagingmorph.c index 715cccf51..637295be7 100644 --- a/src/_imagingmorph.c +++ b/src/_imagingmorph.c @@ -48,9 +48,7 @@ apply(PyObject *self, PyObject *args) { if (!PyCapsule_IsValid(i0, IMAGING_MAGIC) || !PyCapsule_IsValid(i1, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } @@ -143,9 +141,7 @@ match(PyObject *self, PyObject *args) { } if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } @@ -218,9 +214,7 @@ get_on_pixels(PyObject *self, PyObject *args) { } if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) { - PyErr_Format( - PyExc_TypeError, "Expected PyCapsule with '%s' name.", IMAGING_MAGIC - ); + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); return NULL; } From d29fa73ea608449f86082dc312eb132a10901fd0 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Thu, 5 Sep 2024 01:04:35 +0400 Subject: [PATCH 359/662] Move new_block to module --- src/PIL/ImageTk.py | 2 +- src/_imaging.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index 279a21716..5bad9b546 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -178,7 +178,7 @@ class PhotoImage: if image.isblock() and im.mode == self.__mode: block = image else: - block = image.new_block(self.__mode, im.size) + block = Image.core.new_block(self.__mode, im.size) image.convert2(block, image) # convert directly between buffers _pyimagingtkcall("PyImagingPhoto", self.__photo, block.ptr) diff --git a/src/_imaging.c b/src/_imaging.c index a455c873b..e227d8efc 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -3674,15 +3674,12 @@ static struct PyMethodDef methods[] = { /* Unsharpmask extension */ {"gaussian_blur", (PyCFunction)_gaussian_blur, METH_VARARGS}, {"unsharp_mask", (PyCFunction)_unsharp_mask, METH_VARARGS}, - {"box_blur", (PyCFunction)_box_blur, METH_VARARGS}, /* Special effects */ {"effect_spread", (PyCFunction)_effect_spread, METH_VARARGS}, /* Misc. */ - {"new_block", (PyCFunction)_new_block, METH_VARARGS}, - {"save_ppm", (PyCFunction)_save_ppm, METH_VARARGS}, {NULL, NULL} /* sentinel */ @@ -4212,6 +4209,7 @@ static PyMethodDef functions[] = { {"blend", (PyCFunction)_blend, METH_VARARGS}, {"fill", (PyCFunction)_fill, METH_VARARGS}, {"new", (PyCFunction)_new, METH_VARARGS}, + {"new_block", (PyCFunction)_new_block, METH_VARARGS}, {"merge", (PyCFunction)_merge, METH_VARARGS}, /* Functions */ From 0a8e6dbedb84b50ca2ca8762ae1279a66c385bad Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Sat, 31 Aug 2024 20:41:37 +0400 Subject: [PATCH 360/662] Use im.has_transparency_data for webp._save_all Also: remove _VALID_WEBP_MODES and _VALID_WEBP_LEGACY_MODES consts RGBX is not faster RGB since demands more bandwidth Do not convert to str paths in tests --- Tests/test_file_webp.py | 27 ++++++++++++--------------- src/PIL/WebPImagePlugin.py | 25 +++++-------------------- 2 files changed, 17 insertions(+), 35 deletions(-) diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index e75e3ddd2..719831db9 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -72,7 +72,7 @@ class TestFileWebp: def _roundtrip( self, tmp_path: Path, mode: str, epsilon: float, args: dict[str, Any] = {} ) -> None: - temp_file = str(tmp_path / "temp.webp") + temp_file = tmp_path / "temp.webp" hopper(mode).save(temp_file, **args) with Image.open(temp_file) as image: @@ -116,7 +116,7 @@ class TestFileWebp: assert buffer_no_args.getbuffer() != buffer_method.getbuffer() def test_save_all(self, tmp_path: Path) -> None: - temp_file = str(tmp_path / "temp.webp") + temp_file = tmp_path / "temp.webp" im = Image.new("RGB", (1, 1)) im2 = Image.new("RGB", (1, 1), "#f00") im.save(temp_file, save_all=True, append_images=[im2]) @@ -151,18 +151,16 @@ class TestFileWebp: @pytest.mark.skipif(sys.maxsize <= 2**32, reason="Requires 64-bit system") def test_write_encoding_error_message(self, tmp_path: Path) -> None: - temp_file = str(tmp_path / "temp.webp") im = Image.new("RGB", (15000, 15000)) with pytest.raises(ValueError) as e: - im.save(temp_file, method=0) + im.save(tmp_path / "temp.webp", method=0) assert str(e.value) == "encoding error 6" @pytest.mark.skipif(sys.maxsize <= 2**32, reason="Requires 64-bit system") def test_write_encoding_error_bad_dimension(self, tmp_path: Path) -> None: - temp_file = str(tmp_path / "temp.webp") im = Image.new("L", (16384, 16384)) with pytest.raises(ValueError) as e: - im.save(temp_file) + im.save(tmp_path / "temp.webp") assert ( str(e.value) == "encoding error 5: Image size exceeds WebP limit of 16383 pixels" @@ -187,9 +185,8 @@ class TestFileWebp: def test_no_resource_warning(self, tmp_path: Path) -> None: file_path = "Tests/images/hopper.webp" with Image.open(file_path) as image: - temp_file = str(tmp_path / "temp.webp") with warnings.catch_warnings(): - image.save(temp_file) + image.save(tmp_path / "temp.webp") def test_file_pointer_could_be_reused(self) -> None: file_path = "Tests/images/hopper.webp" @@ -204,15 +201,16 @@ class TestFileWebp: def test_invalid_background( self, background: int | tuple[int, ...], tmp_path: Path ) -> None: - temp_file = str(tmp_path / "temp.webp") + temp_file = tmp_path / "temp.webp" im = hopper() with pytest.raises(OSError): im.save(temp_file, save_all=True, append_images=[im], background=background) def test_background_from_gif(self, tmp_path: Path) -> None: + out_webp = tmp_path / "temp.webp" + # Save L mode GIF with background with Image.open("Tests/images/no_palette_with_background.gif") as im: - out_webp = str(tmp_path / "temp.webp") im.save(out_webp, save_all=True) # Save P mode GIF with background @@ -220,11 +218,10 @@ class TestFileWebp: original_value = im.convert("RGB").getpixel((1, 1)) # Save as WEBP - out_webp = str(tmp_path / "temp.webp") im.save(out_webp, save_all=True) # Save as GIF - out_gif = str(tmp_path / "temp.gif") + out_gif = tmp_path / "temp.gif" with Image.open(out_webp) as im: im.save(out_gif) @@ -234,10 +231,10 @@ class TestFileWebp: assert difference < 5 def test_duration(self, tmp_path: Path) -> None: + out_webp = tmp_path / "temp.webp" + with Image.open("Tests/images/dispose_bgnd.gif") as im: assert im.info["duration"] == 1000 - - out_webp = str(tmp_path / "temp.webp") im.save(out_webp, save_all=True) with Image.open(out_webp) as reloaded: @@ -245,7 +242,7 @@ class TestFileWebp: assert reloaded.info["duration"] == 1000 def test_roundtrip_rgba_palette(self, tmp_path: Path) -> None: - temp_file = str(tmp_path / "temp.webp") + temp_file = tmp_path / "temp.webp" im = Image.new("RGBA", (1, 1)).convert("P") assert im.mode == "P" assert im.palette is not None diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index f8d6168ba..3754d784a 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -13,10 +13,6 @@ except ImportError: SUPPORTED = False -_VALID_WEBP_MODES = {"RGBX": True, "RGBA": True, "RGB": True} - -_VALID_WEBP_LEGACY_MODES = {"RGB": True, "RGBA": True} - _VP8_MODES_BY_IDENTIFIER = { b"VP8 ": "RGB", b"VP8X": "RGBA", @@ -247,27 +243,16 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: # Make sure image mode is supported frame = ims - rawmode = ims.mode - if ims.mode not in _VALID_WEBP_MODES: - alpha = ( - "A" in ims.mode - or "a" in ims.mode - or (ims.mode == "P" and "A" in ims.im.getpalettemode()) - ) - rawmode = "RGBA" if alpha else "RGB" - frame = ims.convert(rawmode) - - if rawmode == "RGB": - # For faster conversion, use RGBX - rawmode = "RGBX" + if frame.mode not in ("RGBX", "RGBA", "RGB"): + frame = frame.convert("RGBA" if im.has_transparency_data else "RGB") # Append the frame to the animation encoder enc.add( - frame.tobytes("raw", rawmode), + frame.tobytes(), round(timestamp), frame.size[0], frame.size[1], - rawmode, + frame.mode, lossless, quality, alpha_quality, @@ -310,7 +295,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: method = im.encoderinfo.get("method", 4) exact = 1 if im.encoderinfo.get("exact") else 0 - if im.mode not in _VALID_WEBP_LEGACY_MODES: + if im.mode not in ("RGB", "RGBA"): im = im.convert("RGBA" if im.has_transparency_data else "RGB") data = _webp.WebPEncode( From 8bb3134b1d2fa2a13111a6555e09bbc26b96ff7a Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Sun, 1 Sep 2024 19:41:45 +0400 Subject: [PATCH 361/662] call _webp.WebPEncode with ptr --- src/PIL/WebPImagePlugin.py | 7 +--- src/_webp.c | 75 ++++++++++++++++++++++++-------------- 2 files changed, 50 insertions(+), 32 deletions(-) diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index 3754d784a..3eeba9400 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -295,17 +295,14 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: method = im.encoderinfo.get("method", 4) exact = 1 if im.encoderinfo.get("exact") else 0 - if im.mode not in ("RGB", "RGBA"): + if im.mode not in ("RGBX", "RGBA", "RGB"): im = im.convert("RGBA" if im.has_transparency_data else "RGB") data = _webp.WebPEncode( - im.tobytes(), - im.size[0], - im.size[1], + im.im.ptr, lossless, float(quality), float(alpha_quality), - im.mode, icc_profile, method, exact, diff --git a/src/_webp.c b/src/_webp.c index f59ad3036..bfd9de5c0 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -566,32 +566,65 @@ static PyTypeObject WebPAnimDecoder_Type = { 0, /*tp_getset*/ }; +/* -------------------------------------------------------------------- */ +/* Frame import */ +/* -------------------------------------------------------------------- */ + +static int +import_frame_libwebp(WebPPicture *frame, Imaging im) { + UINT32 mask = 0; + + if (strcmp(im->mode, "RGBA") && strcmp(im->mode, "RGB") && strcmp(im->mode, "RGBX")) { + PyErr_SetString(PyExc_ValueError, "unsupported image mode"); + return -1; + } + + if (strcmp(im->mode, "RGBA")) { + mask = MASK_UINT32_CHANNEL_3; + } + + frame->width = im->xsize; + frame->height = im->ysize; + frame->use_argb = 1; // Don't convert RGB pixels to YUV + + if (!WebPPictureAlloc(frame)) { + PyErr_SetString(PyExc_MemoryError, "can't allocate picture frame"); + return -2; + } + + for (int y = 0; y < im->ysize; ++y) { + UINT8 *src = (UINT8 *)im->image32[y]; + UINT32 *dst = frame->argb + frame->argb_stride * y; + for (int x = 0; x < im->xsize; ++x) { + UINT32 pix = MAKE_UINT32(src[x * 4 + 2], src[x * 4 + 1], src[x * 4], src[x * 4 + 3]); + dst[x] = pix | mask; + } + } + + return 0; +} + /* -------------------------------------------------------------------- */ /* Legacy WebP Support */ /* -------------------------------------------------------------------- */ PyObject * WebPEncode_wrapper(PyObject *self, PyObject *args) { - int width; - int height; int lossless; float quality_factor; float alpha_quality_factor; int method; int exact; - uint8_t *rgb; + Imaging im; + PyObject *i0; uint8_t *icc_bytes; uint8_t *exif_bytes; uint8_t *xmp_bytes; uint8_t *output; - char *mode; - Py_ssize_t size; Py_ssize_t icc_size; Py_ssize_t exif_size; Py_ssize_t xmp_size; size_t ret_size; - int rgba_mode; - int channels; int ok; ImagingSectionCookie cookie; WebPConfig config; @@ -600,15 +633,11 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) { if (!PyArg_ParseTuple( args, - "y#iiiffss#iis#s#", - (char **)&rgb, - &size, - &width, - &height, + "Oiffs#iis#s#", + &i0, &lossless, &quality_factor, &alpha_quality_factor, - &mode, &icc_bytes, &icc_size, &method, @@ -621,15 +650,12 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) { return NULL; } - rgba_mode = strcmp(mode, "RGBA") == 0; - if (!rgba_mode && strcmp(mode, "RGB") != 0) { - Py_RETURN_NONE; + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) { + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); + return NULL; } - channels = rgba_mode ? 4 : 3; - if (size < width * height * channels) { - Py_RETURN_NONE; - } + im = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); // Setup config for this frame if (!WebPConfigInit(&config)) { @@ -652,14 +678,9 @@ WebPEncode_wrapper(PyObject *self, PyObject *args) { PyErr_SetString(PyExc_ValueError, "could not initialise picture"); return NULL; } - pic.width = width; - pic.height = height; - pic.use_argb = 1; // Don't convert RGB pixels to YUV - if (rgba_mode) { - WebPPictureImportRGBA(&pic, rgb, channels * width); - } else { - WebPPictureImportRGB(&pic, rgb, channels * width); + if (import_frame_libwebp(&pic, im)) { + return NULL; } WebPMemoryWriterInit(&writer); From 0962b468b71ea9cdb99417d091c75e86c29f768a Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Tue, 3 Sep 2024 13:47:31 +0400 Subject: [PATCH 362/662] ImagingSectionEnter for WebPAnimEncoder --- src/_webp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/_webp.c b/src/_webp.c index bfd9de5c0..ede261df6 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -190,6 +190,7 @@ _anim_encoder_add(PyObject *self, PyObject *args) { float quality_factor; float alpha_quality_factor; int method; + ImagingSectionCookie cookie; WebPConfig config; WebPAnimEncoderObject *encp = (WebPAnimEncoderObject *)self; WebPAnimEncoder *enc = encp->enc; @@ -246,8 +247,11 @@ _anim_encoder_add(PyObject *self, PyObject *args) { WebPPictureImportRGB(frame, rgb, 3 * width); } - // Add the frame to the encoder - if (!WebPAnimEncoderAdd(enc, frame, timestamp, &config)) { + ImagingSectionEnter(&cookie); + int ok = WebPAnimEncoderAdd(enc, frame, timestamp, &config); + ImagingSectionLeave(&cookie); + + if (!ok) { PyErr_SetString(PyExc_RuntimeError, WebPAnimEncoderGetError(enc)); return NULL; } From 4d271c8ec87355962e0345a00d9e4032007a13c5 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Tue, 3 Sep 2024 13:58:40 +0400 Subject: [PATCH 363/662] import_frame for anim_encoder_add --- src/PIL/WebPImagePlugin.py | 7 +-- src/_webp.c | 114 ++++++++++++++++++------------------- 2 files changed, 56 insertions(+), 65 deletions(-) diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index 3eeba9400..8251316d3 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -248,11 +248,8 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: # Append the frame to the animation encoder enc.add( - frame.tobytes(), + frame.im.ptr, round(timestamp), - frame.size[0], - frame.size[1], - frame.mode, lossless, quality, alpha_quality, @@ -270,7 +267,7 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: im.seek(cur_idx) # Force encoder to flush frames - enc.add(None, round(timestamp), 0, 0, "", lossless, quality, alpha_quality, 0) + enc.add(None, round(timestamp), lossless, quality, alpha_quality, 0) # Get the final output from the encoder data = enc.assemble(icc_profile, exif, xmp) diff --git a/src/_webp.c b/src/_webp.c index ede261df6..9717b9bc0 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -83,6 +83,46 @@ HandleMuxError(WebPMuxError err, char *chunk) { return NULL; } +/* -------------------------------------------------------------------- */ +/* Frame import */ +/* -------------------------------------------------------------------- */ + +static int +import_frame_libwebp(WebPPicture *frame, Imaging im) { + UINT32 mask = 0; + + if (strcmp(im->mode, "RGBA") && strcmp(im->mode, "RGB") && + strcmp(im->mode, "RGBX")) { + PyErr_SetString(PyExc_ValueError, "unsupported image mode"); + return -1; + } + + if (strcmp(im->mode, "RGBA")) { + mask = MASK_UINT32_CHANNEL_3; + } + + frame->width = im->xsize; + frame->height = im->ysize; + frame->use_argb = 1; // Don't convert RGB pixels to YUV + + if (!WebPPictureAlloc(frame)) { + PyErr_SetString(PyExc_MemoryError, "can't allocate picture frame"); + return -2; + } + + for (int y = 0; y < im->ysize; ++y) { + UINT8 *src = (UINT8 *)im->image32[y]; + UINT32 *dst = frame->argb + frame->argb_stride * y; + for (int x = 0; x < im->xsize; ++x) { + UINT32 pix = + MAKE_UINT32(src[x * 4 + 2], src[x * 4 + 1], src[x * 4], src[x * 4 + 3]); + dst[x] = pix | mask; + } + } + + return 0; +} + /* -------------------------------------------------------------------- */ /* WebP Animation Support */ /* -------------------------------------------------------------------- */ @@ -180,12 +220,9 @@ _anim_encoder_dealloc(PyObject *self) { PyObject * _anim_encoder_add(PyObject *self, PyObject *args) { - uint8_t *rgb; - Py_ssize_t size; + PyObject *i0; + Imaging im; int timestamp; - int width; - int height; - char *mode; int lossless; float quality_factor; float alpha_quality_factor; @@ -198,13 +235,9 @@ _anim_encoder_add(PyObject *self, PyObject *args) { if (!PyArg_ParseTuple( args, - "z#iiisiffi", - (char **)&rgb, - &size, + "Oiiffi", + &i0, ×tamp, - &width, - &height, - &mode, &lossless, &quality_factor, &alpha_quality_factor, @@ -214,11 +247,18 @@ _anim_encoder_add(PyObject *self, PyObject *args) { } // Check for NULL frame, which sets duration of final frame - if (!rgb) { + if (i0 == Py_None) { WebPAnimEncoderAdd(enc, NULL, timestamp, NULL); Py_RETURN_NONE; } + if (!PyCapsule_IsValid(i0, IMAGING_MAGIC)) { + PyErr_Format(PyExc_TypeError, "Expected '%s' Capsule", IMAGING_MAGIC); + return NULL; + } + + im = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC); + // Setup config for this frame if (!WebPConfigInit(&config)) { PyErr_SetString(PyExc_RuntimeError, "failed to initialize config!"); @@ -235,16 +275,8 @@ _anim_encoder_add(PyObject *self, PyObject *args) { return NULL; } - // Populate the frame with raw bytes passed to us - frame->width = width; - frame->height = height; - frame->use_argb = 1; // Don't convert RGB pixels to YUV - if (strcmp(mode, "RGBA") == 0) { - WebPPictureImportRGBA(frame, rgb, 4 * width); - } else if (strcmp(mode, "RGBX") == 0) { - WebPPictureImportRGBX(frame, rgb, 4 * width); - } else { - WebPPictureImportRGB(frame, rgb, 3 * width); + if (import_frame_libwebp(frame, im)) { + return NULL; } ImagingSectionEnter(&cookie); @@ -570,44 +602,6 @@ static PyTypeObject WebPAnimDecoder_Type = { 0, /*tp_getset*/ }; -/* -------------------------------------------------------------------- */ -/* Frame import */ -/* -------------------------------------------------------------------- */ - -static int -import_frame_libwebp(WebPPicture *frame, Imaging im) { - UINT32 mask = 0; - - if (strcmp(im->mode, "RGBA") && strcmp(im->mode, "RGB") && strcmp(im->mode, "RGBX")) { - PyErr_SetString(PyExc_ValueError, "unsupported image mode"); - return -1; - } - - if (strcmp(im->mode, "RGBA")) { - mask = MASK_UINT32_CHANNEL_3; - } - - frame->width = im->xsize; - frame->height = im->ysize; - frame->use_argb = 1; // Don't convert RGB pixels to YUV - - if (!WebPPictureAlloc(frame)) { - PyErr_SetString(PyExc_MemoryError, "can't allocate picture frame"); - return -2; - } - - for (int y = 0; y < im->ysize; ++y) { - UINT8 *src = (UINT8 *)im->image32[y]; - UINT32 *dst = frame->argb + frame->argb_stride * y; - for (int x = 0; x < im->xsize; ++x) { - UINT32 pix = MAKE_UINT32(src[x * 4 + 2], src[x * 4 + 1], src[x * 4], src[x * 4 + 3]); - dst[x] = pix | mask; - } - } - - return 0; -} - /* -------------------------------------------------------------------- */ /* Legacy WebP Support */ /* -------------------------------------------------------------------- */ From 608a5e83c067baa91e555b24b3cc577c3704153c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 9 Sep 2024 12:56:28 +1000 Subject: [PATCH 364/662] Updated harfbuzz to 9.0.0, except on manylinux2014 --- .github/workflows/wheels-dependencies.sh | 47 +++++++++++++++++------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 97f70ed84..c25e1a27d 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -16,7 +16,11 @@ ARCHIVE_SDIR=pillow-depends-main # Package versions for fresh source builds FREETYPE_VERSION=2.13.2 -HARFBUZZ_VERSION=8.5.0 +if [[ "$MB_ML_VER" != 2014 ]]; then + HARFBUZZ_VERSION=9.0.0 +else + HARFBUZZ_VERSION=8.5.0 +fi LIBPNG_VERSION=1.6.43 JPEGTURBO_VERSION=3.0.3 OPENJPEG_VERSION=2.5.2 @@ -40,7 +44,7 @@ BROTLI_VERSION=1.1.0 if [[ -n "$IS_MACOS" ]] && [[ "$CIBW_ARCHS" == "x86_64" ]]; then function build_openjpeg { - local out_dir=$(fetch_unpack https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz openjpeg-${OPENJPEG_VERSION}.tar.gz) + local out_dir=$(fetch_unpack https://github.com/uclouvain/openjpeg/archive/v$OPENJPEG_VERSION.tar.gz openjpeg-$OPENJPEG_VERSION.tar.gz) (cd $out_dir \ && cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \ && make install) @@ -50,7 +54,7 @@ fi function build_brotli { local cmake=$(get_modern_cmake) - local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-1.1.0.tar.gz) + local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-$BROTLI_VERSION.tar.gz) (cd $out_dir \ && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \ && make install) @@ -60,6 +64,25 @@ function build_brotli { fi } +function build_harfbuzz { + if [[ "$HARFBUZZ_VERSION" == 8.5.0 ]]; then + export FREETYPE_LIBS=-lfreetype + export FREETYPE_CFLAGS=-I/usr/local/include/freetype2/ + build_simple harfbuzz $HARFBUZZ_VERSION https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION tar.xz --with-freetype=yes --with-glib=no + export FREETYPE_LIBS="" + export FREETYPE_CFLAGS="" + else + local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz) + (cd $out_dir \ + && meson setup build --buildtype=release -Dfreetype=enabled -Dglib=disabled) + (cd $out_dir/build \ + && meson install) + if [[ "$MB_ML_LIBC" == "manylinux" ]]; then + cp /usr/local/lib64/libharfbuzz* /usr/local/lib + fi + fi +} + function build { if [[ -n "$IS_MACOS" ]] && [[ "$CIBW_ARCHS" == "arm64" ]]; then sudo chown -R runner /usr/local @@ -109,15 +132,7 @@ function build { build_freetype fi - if [ -z "$IS_MACOS" ]; then - export FREETYPE_LIBS=-lfreetype - export FREETYPE_CFLAGS=-I/usr/local/include/freetype2/ - fi - build_simple harfbuzz $HARFBUZZ_VERSION https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION tar.xz --with-freetype=yes --with-glib=no - if [ -z "$IS_MACOS" ]; then - export FREETYPE_LIBS="" - export FREETYPE_CFLAGS="" - fi + build_harfbuzz } # Any stuff that you need to do before you start building the wheels @@ -140,7 +155,13 @@ if [[ -n "$IS_MACOS" ]]; then brew remove --ignore-dependencies webp fi - brew install pkg-config + brew install meson pkg-config +elif [[ "$MB_ML_LIBC" == "manylinux" ]]; then + if [[ "$HARFBUZZ_VERSION" != 8.5.0 ]]; then + yum install -y meson + fi +else + apk add meson fi wrap_wheel_builder build From c9dc34ae8d90e632d90a685857c80c516b1668f9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 9 Sep 2024 13:19:37 +1000 Subject: [PATCH 365/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index be94594f8..15da95e09 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Deprecate support for FreeType 2.9.0 #8356 + [hugovk, radarhere] + - Removed unused TiffImagePlugin IFD_LEGACY_API #8355 [radarhere] From be01d536c652f2224351ad0803c92067394db1bb Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 9 Sep 2024 15:22:27 +1000 Subject: [PATCH 366/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 15da95e09..e217c9b82 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Support converting more modes to LAB by converting to RGBA first #8358 + [radarhere] + - Deprecate support for FreeType 2.9.0 #8356 [hugovk, radarhere] From d25d12f792c88b3bae881c9090b13d2a9f0e3d84 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 10 Sep 2024 11:29:52 +1000 Subject: [PATCH 367/662] Removed custom build_openjpeg --- .github/workflows/wheels-dependencies.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 97f70ed84..9e92e416e 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -38,16 +38,6 @@ BZIP2_VERSION=1.0.8 LIBXCB_VERSION=1.17.0 BROTLI_VERSION=1.1.0 -if [[ -n "$IS_MACOS" ]] && [[ "$CIBW_ARCHS" == "x86_64" ]]; then - function build_openjpeg { - local out_dir=$(fetch_unpack https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz openjpeg-${OPENJPEG_VERSION}.tar.gz) - (cd $out_dir \ - && cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \ - && make install) - touch openjpeg-stamp - } -fi - function build_brotli { local cmake=$(get_modern_cmake) local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-1.1.0.tar.gz) From e0845f06d8d063fbf78708dd20a692041b60596c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 10 Sep 2024 16:20:52 +1000 Subject: [PATCH 368/662] Deprecate isImageType --- Tests/test_image.py | 4 ++++ docs/deprecations.rst | 8 ++++++++ docs/releasenotes/11.0.0.rst | 8 ++++++++ src/PIL/Image.py | 17 +++++++---------- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/Tests/test_image.py b/Tests/test_image.py index 97e97acaa..cf5b5a710 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -1117,6 +1117,10 @@ class TestImage: assert len(caplog.records) == 0 assert im.fp is None + def test_deprecation(self) -> None: + with pytest.warns(DeprecationWarning): + assert not Image.isImageType(None) + class TestImageBytes: @pytest.mark.parametrize("mode", Image.MODES + ["BGR;15", "BGR;16", "BGR;24"]) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index 8d1537a5d..57f7f5b5c 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -122,6 +122,14 @@ vulnerability introduced in FreeType 2.6 (:cve:`2020-15999`). .. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ +Image isImageType() +^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 11.0.0 + +``Image.isImageType(im)`` has been deprecated. Use ``isinstance(im, Image.Image)`` +instead. + ImageMath.lambda_eval and ImageMath.unsafe_eval options parameter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index dd19c4b7f..e0be11690 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -61,6 +61,14 @@ vulnerability introduced in FreeType 2.6 (:cve:`2020-15999`). .. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ +Image isImageType() +^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 11.0.0 + +``Image.isImageType(im)`` has been deprecated. Use ``isinstance(im, Image.Image)`` +instead. + ImageMath.lambda_eval and ImageMath.unsafe_eval options parameter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/PIL/Image.py b/src/PIL/Image.py index e6d9047f5..8f16eef94 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -133,6 +133,7 @@ def isImageType(t: Any) -> TypeGuard[Image]: :param t: object to check if it's an image :returns: True if the object is an image """ + deprecate("Image.isImageType(im)", 12, "isinstance(im, Image.Image)") return hasattr(t, "im") @@ -1823,23 +1824,22 @@ class Image: :param mask: An optional mask image. """ - if isImageType(box): + if isinstance(box, Image): if mask is not None: msg = "If using second argument as mask, third argument must be None" raise ValueError(msg) # abbreviated paste(im, mask) syntax mask = box box = None - assert not isinstance(box, Image) if box is None: box = (0, 0) if len(box) == 2: # upper left corner given; get size from image or mask - if isImageType(im): + if isinstance(im, Image): size = im.size - elif isImageType(mask): + elif isinstance(mask, Image): size = mask.size else: # FIXME: use self.size here? @@ -1852,17 +1852,15 @@ class Image: from . import ImageColor source = ImageColor.getcolor(im, self.mode) - elif isImageType(im): + elif isinstance(im, Image): im.load() if self.mode != im.mode: if self.mode != "RGB" or im.mode not in ("LA", "RGBA", "RGBa"): # should use an adapter for this! im = im.convert(self.mode) source = im.im - elif isinstance(im, tuple): - source = im else: - source = cast(float, im) + source = im self._ensure_mutable() @@ -2023,7 +2021,7 @@ class Image: else: band = 3 - if isImageType(alpha): + if isinstance(alpha, Image): # alpha layer if alpha.mode not in ("1", "L"): msg = "illegal image mode" @@ -2033,7 +2031,6 @@ class Image: alpha = alpha.convert("L") else: # constant alpha - alpha = cast(int, alpha) # see python/typing#1013 try: self.im.fillband(band, alpha) except (AttributeError, ValueError): From adb691821476eed08bbefe2478794c5dbd94b527 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 10 Sep 2024 11:38:56 +1000 Subject: [PATCH 369/662] Use isinstance to detect Image instances --- src/PIL/ImageMath.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py index 191cc2a5f..191ca8524 100644 --- a/src/PIL/ImageMath.py +++ b/src/PIL/ImageMath.py @@ -268,7 +268,7 @@ def lambda_eval( args.update(options) args.update(kw) for k, v in args.items(): - if hasattr(v, "im"): + if isinstance(v, Image.Image): args[k] = _Operand(v) out = expression(args) @@ -319,7 +319,7 @@ def unsafe_eval( args.update(options) args.update(kw) for k, v in args.items(): - if hasattr(v, "im"): + if isinstance(v, Image.Image): args[k] = _Operand(v) compiled_code = compile(expression, "", "eval") From d522e0a5c03f87b653ab25a23116d9f685aa0c1e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 10 Sep 2024 18:50:06 +1000 Subject: [PATCH 370/662] Improved handling of RGBA palettes when saving GIF images --- Tests/test_file_gif.py | 18 ++++++++++++++++++ src/PIL/GifImagePlugin.py | 17 ++++++++++++++--- src/PIL/Image.py | 5 ++++- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py index 571fe1b9a..16c8466f3 100644 --- a/Tests/test_file_gif.py +++ b/Tests/test_file_gif.py @@ -1429,3 +1429,21 @@ def test_saving_rgba(tmp_path: Path) -> None: with Image.open(out) as reloaded: reloaded_rgba = reloaded.convert("RGBA") assert reloaded_rgba.load()[0, 0][3] == 0 + + +def test_optimizing_p_rgba(tmp_path: Path) -> None: + out = str(tmp_path / "temp.gif") + + im1 = Image.new("P", (100, 100)) + d = ImageDraw.Draw(im1) + d.ellipse([(40, 40), (60, 60)], fill=1) + data = [0, 0, 0, 0, 0, 0, 0, 255] + [0, 0, 0, 0] * 254 + im1.putpalette(data, "RGBA") + + im2 = Image.new("P", (100, 100)) + im2.putpalette(data, "RGBA") + + im1.save(out, save_all=True, append_images=[im2]) + + with Image.open(out) as reloaded: + assert reloaded.n_frames == 2 diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index f206fbb9c..57c291792 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -553,7 +553,9 @@ def _normalize_palette( if im.mode == "P": if not source_palette: - source_palette = im.im.getpalette("RGB")[:768] + im_palette = im.getpalette(None) + assert im_palette is not None + source_palette = bytearray(im_palette) else: # L-mode if not source_palette: source_palette = bytearray(i // 3 for i in range(768)) @@ -629,7 +631,10 @@ def _write_single_frame( def _getbbox( base_im: Image.Image, im_frame: Image.Image ) -> tuple[Image.Image, tuple[int, int, int, int] | None]: - if _get_palette_bytes(im_frame) != _get_palette_bytes(base_im): + palette_bytes = [ + bytes(im.palette.palette) if im.palette else b"" for im in (base_im, im_frame) + ] + if palette_bytes[0] != palette_bytes[1]: im_frame = im_frame.convert("RGBA") base_im = base_im.convert("RGBA") delta = ImageChops.subtract_modulo(im_frame, base_im) @@ -984,7 +989,13 @@ def _get_palette_bytes(im: Image.Image) -> bytes: :param im: Image object :returns: Bytes, len<=768 suitable for inclusion in gif header """ - return bytes(im.palette.palette) if im.palette else b"" + if not im.palette: + return b"" + + palette = bytes(im.palette.palette) + if im.palette.mode == "RGBA": + palette = b"".join(palette[i * 4 : i * 4 + 3] for i in range(len(palette) // 3)) + return palette def _get_background( diff --git a/src/PIL/Image.py b/src/PIL/Image.py index e6d9047f5..a7a158d35 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1066,7 +1066,7 @@ class Image: trns_im = new(self.mode, (1, 1)) if self.mode == "P": assert self.palette is not None - trns_im.putpalette(self.palette) + trns_im.putpalette(self.palette, self.palette.mode) if isinstance(t, tuple): err = "Couldn't allocate a palette color for transparency" assert trns_im.palette is not None @@ -2182,6 +2182,9 @@ class Image: source_palette = self.im.getpalette(palette_mode, palette_mode) else: # L-mode source_palette = bytearray(i // 3 for i in range(768)) + elif len(source_palette) > 768: + bands = 4 + palette_mode = "RGBA" palette_bytes = b"" new_positions = [0] * 256 From 8d508406ad8917919c5da084bf0e543146643522 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 10 Sep 2024 20:55:34 +1000 Subject: [PATCH 371/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index e217c9b82..3e4a99be7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Deprecate isImageType #8364 + [radarhere] + - Support converting more modes to LAB by converting to RGBA first #8358 [radarhere] From 54c5b532c54759d9a66541e8bb6ba0893b3c8cf6 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 10 Sep 2024 21:32:20 +1000 Subject: [PATCH 372/662] Added release notes for #8286 --- docs/releasenotes/11.0.0.rst | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index e0be11690..22dd5313b 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -103,10 +103,18 @@ TODO API Additions ============= -TODO -^^^^ +Writing XMP bytes to JPEG and MPO +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -TODO +XMP data can now be saved to JPEG files using an ``xmp`` argument:: + + im.save("out.jpg", xmp=b"test") + +The data can also be set through :py:attr:`~PIL.Image.Image.info`, for use when saving +either JPEG or MPO images:: + + im.info["xmp"] = b"test" + im.save("out.jpg") Other Changes ============= From fea3e0dd5facd07c9133b1b5dbb7b97452d62411 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 10 Sep 2024 21:22:03 +1000 Subject: [PATCH 373/662] Added release notes for #8213 --- docs/releasenotes/11.0.0.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index 22dd5313b..a83e3f2e9 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -45,6 +45,11 @@ TiffImagePlugin IFD_LEGACY_API An unused setting, ``TiffImagePlugin.IFD_LEGACY_API``, has been removed. +WebP 0.4 +^^^^^^^^ + +Support for WebP 0.4 and earlier has been removed; WebP 0.5 is the minimum supported. + Deprecations ============ From 5c67178c952560c8992c2eaac4d62a5ca278f83d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 10 Sep 2024 21:30:48 +1000 Subject: [PATCH 374/662] Added release notes for #8199 --- docs/releasenotes/11.0.0.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index a83e3f2e9..376130499 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -133,6 +133,8 @@ of 3.13.0 final (2024-10-01, :pep:`719`). Pillow 11.0.0 now officially supports Python 3.13. +Support has also been added for the experimental free-threaded mode of :pep:`703`. + C-level Flags ^^^^^^^^^^^^^ From bc4c57e9ea3089d168ac85b0f8c4e92db48e669d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 10 Sep 2024 22:39:47 +1000 Subject: [PATCH 375/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 3e4a99be7..af292f7a1 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,12 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Deprecate ICNS (width, height, scale) sizes in favour of load(scale) #8352 + [radarhere] + +- Improved handling of RGBA palettes when saving GIF images #8366 + [radarhere] + - Deprecate isImageType #8364 [radarhere] From 6ade6873dec23cb6c411f1b1e8a405ada8b85a35 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 11 Sep 2024 08:13:41 +1000 Subject: [PATCH 376/662] Removed libffi-dev --- .ci/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/install.sh b/.ci/install.sh index ee92d447a..7e3a691e5 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -21,7 +21,7 @@ set -e if [[ $(uname) != CYGWIN* ]]; then sudo apt-get -qq install libfreetype6-dev liblcms2-dev python3-tk\ - ghostscript libffi-dev libjpeg-turbo-progs libopenjp2-7-dev\ + ghostscript libjpeg-turbo-progs libopenjp2-7-dev\ cmake meson imagemagick libharfbuzz-dev libfribidi-dev\ sway wl-clipboard libopenblas-dev fi From d2efd7dd5fcd19b7cb7768fc90ffa51676ff5e7a Mon Sep 17 00:00:00 2001 From: Yngve Mardal Moe Date: Wed, 11 Sep 2024 10:32:42 +0200 Subject: [PATCH 377/662] Update src/PIL/ImageFont.py Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- src/PIL/ImageFont.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index b6d69019d..7ee3aaa55 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -934,7 +934,7 @@ def load_path(filename: str | bytes) -> ImageFont: pass msg = f"cannot find font file '{filename}' in `sys.path`" if os.path.exists(filename): - msg += f", did you mean `ImageFont.load({filename})` instead?" + msg += f", did you mean `ImageFont.load(\"{filename}\")` instead?" raise OSError(msg) From e4f13020e16925f1dcfe738218e4d03a3c3992bb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 08:33:09 +0000 Subject: [PATCH 378/662] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/PIL/ImageFont.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 7ee3aaa55..55ab61951 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -934,7 +934,7 @@ def load_path(filename: str | bytes) -> ImageFont: pass msg = f"cannot find font file '{filename}' in `sys.path`" if os.path.exists(filename): - msg += f", did you mean `ImageFont.load(\"{filename}\")` instead?" + msg += f', did you mean `ImageFont.load("{filename}")` instead?' raise OSError(msg) From 01ba1e2252bb6fab3bdee4ee0b2952746d919270 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 11 Sep 2024 19:53:52 +1000 Subject: [PATCH 379/662] Accept float stroke widths --- Tests/images/imagedraw_stroke_float.png | Bin 0 -> 1509 bytes Tests/test_imagedraw.py | 14 ++++++++++++++ src/_imagingft.c | 18 +++++++++--------- 3 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 Tests/images/imagedraw_stroke_float.png diff --git a/Tests/images/imagedraw_stroke_float.png b/Tests/images/imagedraw_stroke_float.png new file mode 100644 index 0000000000000000000000000000000000000000..a590f8af0b616852c8d54e591d04265dea90447b GIT binary patch literal 1509 zcma)+dpi>f0Eb7mn8{^mF&s3vgt;u2C}ZZ7!A38(GopOnZ9cH6qE+N-r71fmL zkz`~jvY;v-<^-QkdSNMhcV&r?TbN@@SobhJcmaC8Hn=PkN zzerpf&46-HeRZoeb0Q=&%}6(H{ShMi)jeAJ;W`1r96?c`b&i?GQPuT2bk8-7i&xbL zc})(n%PNfw6nfGS&YMc4t4WM1c9{>1{;7m?1pz)45y~$DhnIXbnBNd<_i9^12X8ud zS6^`63@I9FhTqem}l${p+<T znpcwuxCqOwtUi>ATq$DB$4p9Q8&iKO-@|Eg#F1KVFdG7t;4y-aQ+H zI$Rg}OIEQfKCv4f3OXWfhy$F@K5M2!9OWIJ7-t)mQp0RxWAF!CVbi)LEQ!UNKSD1< zx(bXNje3ECbh|viOa1E(SJns_nsoi%f(@$L^PWLW<;VzAhLh>4BHb661WKGTu@PBC z58Z%D+D2}$e;*MBHq6a^+hP}5@4O9yRxI~9b<4q?P1r*SVfI|KW3Gh`Bf#{#cFrvx zz4}4+@7l$AbdO~CTgt4Z@(a1k1I^+B?e$UbzHg44f>Q@jURX_tZIJCCR96r{yH(we?{wxN&{QF6E{s|{Y$s)+q+%7VHj%gK|aq?UPp_x~WsLT&lk%aE6{kzXUYDZ(SkTJG1H zm@fW8XV#|U-jshaiQ67&sXc~G@n#oJOCn?j^ms0mlYQ?M&$(G3U>gP8G= zy;$!r None: ) +@skip_unless_feature("freetype2") +def test_stroke_float() -> None: + # Arrange + im = Image.new("RGB", (120, 130)) + draw = ImageDraw.Draw(im) + font = ImageFont.truetype("Tests/fonts/FreeMono.ttf", 120) + + # Act + draw.text((12, 12), "A", "#f00", font, stroke_width=0.5) + + # Assert + assert_image_similar_tofile(im, "Tests/images/imagedraw_stroke_float.png", 3.1) + + @skip_unless_feature("freetype2") def test_stroke_descender() -> None: # Arrange diff --git a/src/_imagingft.c b/src/_imagingft.c index 5c446e641..8bef45baf 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -833,7 +833,7 @@ font_render(FontObject *self, PyObject *args) { Py_ssize_t id; int mask = 0; /* is FT_LOAD_TARGET_MONO enabled? */ int color = 0; /* is FT_LOAD_COLOR enabled? */ - int stroke_width = 0; + float stroke_width = 0; PY_LONG_LONG foreground_ink_long = 0; unsigned int foreground_ink; const char *mode = NULL; @@ -853,7 +853,7 @@ font_render(FontObject *self, PyObject *args) { if (!PyArg_ParseTuple( args, - "OO|zzOzizLffO:render", + "OO|zzOzfzLffO:render", &string, &fill, &mode, @@ -919,8 +919,8 @@ font_render(FontObject *self, PyObject *args) { return NULL; } - width += stroke_width * 2 + ceil(x_start); - height += stroke_width * 2 + ceil(y_start); + width += ceil(stroke_width * 2 + x_start); + height += ceil(stroke_width * 2 + y_start); image = PyObject_CallFunction(fill, "ii", width, height); if (image == Py_None) { PyMem_Del(glyph_info); @@ -934,8 +934,8 @@ font_render(FontObject *self, PyObject *args) { Py_XDECREF(imageId); im = (Imaging)id; - x_offset -= stroke_width; - y_offset -= stroke_width; + x_offset = round(x_offset - stroke_width); + y_offset = round(y_offset - stroke_width); if (count == 0 || width == 0 || height == 0) { PyMem_Del(glyph_info); return Py_BuildValue("N(ii)", image, x_offset, y_offset); @@ -950,7 +950,7 @@ font_render(FontObject *self, PyObject *args) { FT_Stroker_Set( stroker, - (FT_Fixed)stroke_width * 64, + (FT_Fixed)round(stroke_width * 64), FT_STROKER_LINECAP_ROUND, FT_STROKER_LINEJOIN_ROUND, 0 @@ -988,8 +988,8 @@ font_render(FontObject *self, PyObject *args) { } /* set pen position to text origin */ - x = (-x_min + stroke_width + x_start) * 64; - y = (-y_max + (-stroke_width) - y_start) * 64; + x = round((-x_min + stroke_width + x_start) * 64); + y = round((-y_max + (-stroke_width) - y_start) * 64); if (stroker == NULL) { load_flags |= FT_LOAD_RENDER; From 4a284a78c58e6952f4adc7230a4349defe38dcae Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Sun, 1 Sep 2024 20:40:04 +0400 Subject: [PATCH 380/662] Remove weird comments --- src/encode.c | 7 ------- src/libImaging/Jpeg2K.h | 7 ------- src/libImaging/Jpeg2KDecode.c | 7 ------- src/libImaging/Jpeg2KEncode.c | 7 ------- 4 files changed, 28 deletions(-) diff --git a/src/encode.c b/src/encode.c index 529982dad..1a4cd489d 100644 --- a/src/encode.c +++ b/src/encode.c @@ -1411,10 +1411,3 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) { } #endif - -/* - * Local Variables: - * c-basic-offset: 4 - * End: - * - */ diff --git a/src/libImaging/Jpeg2K.h b/src/libImaging/Jpeg2K.h index e8d92f7b6..6fbbf7311 100644 --- a/src/libImaging/Jpeg2K.h +++ b/src/libImaging/Jpeg2K.h @@ -104,10 +104,3 @@ typedef struct { int plt; } JPEG2KENCODESTATE; - -/* - * Local Variables: - * c-basic-offset: 4 - * End: - * - */ diff --git a/src/libImaging/Jpeg2KDecode.c b/src/libImaging/Jpeg2KDecode.c index a81a14a09..fc927d2f0 100644 --- a/src/libImaging/Jpeg2KDecode.c +++ b/src/libImaging/Jpeg2KDecode.c @@ -979,10 +979,3 @@ ImagingJpeg2KVersion(void) { } #endif /* HAVE_OPENJPEG */ - -/* - * Local Variables: - * c-basic-offset: 4 - * End: - * - */ diff --git a/src/libImaging/Jpeg2KEncode.c b/src/libImaging/Jpeg2KEncode.c index cb21a186c..d30ccde60 100644 --- a/src/libImaging/Jpeg2KEncode.c +++ b/src/libImaging/Jpeg2KEncode.c @@ -652,10 +652,3 @@ ImagingJpeg2KEncodeCleanup(ImagingCodecState state) { } #endif /* HAVE_OPENJPEG */ - -/* - * Local Variables: - * c-basic-offset: 4 - * End: - * - */ From 77503156b17a8314652dcd69941cbdb222dd7bcf Mon Sep 17 00:00:00 2001 From: Yngve Mardal Moe Date: Wed, 11 Sep 2024 14:22:45 +0200 Subject: [PATCH 381/662] Update src/PIL/ImageFont.py Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- src/PIL/ImageFont.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 55ab61951..0fccee32f 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -932,9 +932,9 @@ def load_path(filename: str | bytes) -> ImageFont: return load(os.path.join(directory, filename)) except OSError: pass - msg = f"cannot find font file '{filename}' in `sys.path`" + msg = f"cannot find font file '{filename}' in sys.path" if os.path.exists(filename): - msg += f', did you mean `ImageFont.load("{filename}")` instead?' + msg += f', did you mean ImageFont.load("{filename}") instead?' raise OSError(msg) From 32c514d24ccac400b025c981bb27b48d6e78b2b6 Mon Sep 17 00:00:00 2001 From: Yngve Mardal Moe Date: Wed, 11 Sep 2024 14:54:53 +0200 Subject: [PATCH 382/662] Update src/PIL/ImageFont.py Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- src/PIL/ImageFont.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 0fccee32f..89efe5bd8 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -932,7 +932,7 @@ def load_path(filename: str | bytes) -> ImageFont: return load(os.path.join(directory, filename)) except OSError: pass - msg = f"cannot find font file '{filename}' in sys.path" + msg = f'cannot find font file "{filename}" in sys.path' if os.path.exists(filename): msg += f', did you mean ImageFont.load("{filename}") instead?' From a2988da0d2e0057726687c8030b5f2ea2b007f8f Mon Sep 17 00:00:00 2001 From: Alexander Karpinsky Date: Wed, 11 Sep 2024 19:55:07 +0400 Subject: [PATCH 383/662] =?UTF-8?q?ImageCore=20=E2=86=92=20ImagingCore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- docs/deprecations.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index dd271a97f..af6de2f92 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -141,10 +141,10 @@ Get Internal Pointers to Objects .. deprecated:: 11.0.0 -``Image.core.ImageCore.id`` and ``Image.core.ImageCore.unsafe_ptrs`` -have been deprecated and will be removed in Pillow 12 (2025-10-15). -They were used for obtaining raw pointers to ``ImageCore`` internals. To interact with -C code, you can use ``Image.core.ImageCore.ptr``, which returns a ``Capsule`` object. +``Image.core.ImagingCore.id`` and ``Image.core.ImagingCore.unsafe_ptrs`` have been +deprecated and will be removed in Pillow 12 (2025-10-15). They were used for obtaining +raw pointers to ``ImagingCore`` internals. To interact with C code, you can use +``Image.core.ImagingCore.ptr``, which returns a ``Capsule`` object. Removed features ---------------- From aa7dfe3a56380a4ba98a7b439fbc3085603beae4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 12 Sep 2024 16:16:21 +1000 Subject: [PATCH 384/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index af292f7a1..f23ec609f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Accept float stroke widths #8369 + [radarhere] + - Deprecate ICNS (width, height, scale) sizes in favour of load(scale) #8352 [radarhere] From fab19b0af822128f305f8ffedd0645f33160f5d8 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 12 Sep 2024 16:57:28 +1000 Subject: [PATCH 385/662] Windows wheels are now grouped with the others --- wheels/README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/wheels/README.md b/wheels/README.md index 8b412b7fe..1175616e1 100644 --- a/wheels/README.md +++ b/wheels/README.md @@ -1,11 +1,11 @@ README ------ -[cibuildwheel](https://github.com/pypa/cibuildwheel) is used to build macOS and Linux -wheels for tagged versions of Pillow. +[cibuildwheel](https://github.com/pypa/cibuildwheel) is used to build wheels for tagged +versions of Pillow. This directory contains [multibuild](https://github.com/multi-build/multibuild) to -build dependencies for the wheels, and dependency licenses to be included. +build dependencies for macOS and Linux wheels, and dependency licenses to be included. Archives -------- @@ -30,6 +30,3 @@ Wheels Wheels are [GitHub Actions artifacts created for tags, relevant changes or manual builds](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml). - -Windows wheels are created separately. They are -[GitHub Actions artifacts created on each run of the Windows workflow](https://github.com/python-pillow/Pillow/actions/workflows/test-windows.yml?query=branch%3Amain). From 8336852b610f3a2b83c1d0706c0d76998526c709 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 12 Sep 2024 18:52:07 +1000 Subject: [PATCH 386/662] Install NumPy from PyPI for free threaded job --- .ci/install.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.ci/install.sh b/.ci/install.sh index 7e3a691e5..e85e6bdc5 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -38,12 +38,7 @@ python3 -m pip install -U pytest-timeout python3 -m pip install pyroma if [[ $(uname) != CYGWIN* ]]; then - # TODO Update condition when NumPy supports free-threading - if [[ "$PYTHON_GIL" == "0" ]]; then - python3 -m pip install numpy --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple - else - python3 -m pip install numpy - fi + python3 -m pip install numpy # PyQt6 doesn't support PyPy3 if [[ $GHA_PYTHON_VERSION == 3.* ]]; then From c9f88890a56882ca43a5e00fb6ed1892f706eaa0 Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Thu, 12 Sep 2024 14:52:24 +0300 Subject: [PATCH 387/662] Install numpy from PyPI when testing wheels --- .github/workflows/wheels-test.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh index 023a33824..eebfd5c55 100755 --- a/.github/workflows/wheels-test.sh +++ b/.github/workflows/wheels-test.sh @@ -15,11 +15,7 @@ fi if [ "${AUDITWHEEL_POLICY::9}" != "musllinux" ]; then # TODO Update condition when NumPy supports free-threading - if [ $(python3 -c "import sysconfig;print(sysconfig.get_config_var('Py_GIL_DISABLED'))") == "1" ]; then - python3 -m pip install numpy --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple - else - python3 -m pip install numpy - fi + python3 -m pip install numpy fi if [ ! -d "test-images-main" ]; then From 1ead7791c697d5ea76c299156680a3cdd2fa7f14 Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Thu, 12 Sep 2024 16:34:29 +0300 Subject: [PATCH 388/662] Remove comment --- .github/workflows/wheels-test.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh index eebfd5c55..bdf0caffa 100755 --- a/.github/workflows/wheels-test.sh +++ b/.github/workflows/wheels-test.sh @@ -14,7 +14,6 @@ else fi if [ "${AUDITWHEEL_POLICY::9}" != "musllinux" ]; then - # TODO Update condition when NumPy supports free-threading python3 -m pip install numpy fi From fea929bf10dbf0c77cffd1375a5542d40d24b2f5 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 13 Sep 2024 07:34:56 +1000 Subject: [PATCH 389/662] Test NumPy with musllinux wheels --- .github/workflows/wheels-test.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh index bdf0caffa..b30b1725f 100755 --- a/.github/workflows/wheels-test.sh +++ b/.github/workflows/wheels-test.sh @@ -13,9 +13,7 @@ else yum install -y fribidi fi -if [ "${AUDITWHEEL_POLICY::9}" != "musllinux" ]; then - python3 -m pip install numpy -fi +python3 -m pip install numpy if [ ! -d "test-images-main" ]; then curl -fsSL -o pillow-test-images.zip https://github.com/python-pillow/test-images/archive/main.zip From 5d8e891387cfd2313d021578b9a049a057980726 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 13 Sep 2024 10:52:36 +1000 Subject: [PATCH 390/662] Updated libpng to 1.6.44 --- .github/workflows/wheels-dependencies.sh | 2 +- winbuild/build_prepare.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index c25e1a27d..f87ace4c6 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -21,7 +21,7 @@ if [[ "$MB_ML_VER" != 2014 ]]; then else HARFBUZZ_VERSION=8.5.0 fi -LIBPNG_VERSION=1.6.43 +LIBPNG_VERSION=1.6.44 JPEGTURBO_VERSION=3.0.3 OPENJPEG_VERSION=2.5.2 XZ_VERSION=5.4.5 diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 423aaa966..6d7d5dcdf 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -115,7 +115,7 @@ V = { "HARFBUZZ": "9.0.0", "JPEGTURBO": "3.0.3", "LCMS2": "2.16", - "LIBPNG": "1.6.43", + "LIBPNG": "1.6.44", "LIBWEBP": "1.4.0", "OPENJPEG": "2.5.2", "TIFF": "4.6.0", From 0f67dfc380a460eb2b4d2bcd43e54b59240006b8 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 13 Sep 2024 15:31:37 +1000 Subject: [PATCH 391/662] Change macos-14 to macos-latest --- .github/workflows/test.yml | 4 ++-- .github/workflows/wheels.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e0903f886..6576292b5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,7 +37,7 @@ jobs: fail-fast: false matrix: os: [ - "macos-14", + "macos-latest", "ubuntu-latest", ] python-version: [ @@ -56,7 +56,7 @@ jobs: # M1 only available for 3.10+ - { os: "macos-13", python-version: "3.9" } exclude: - - { os: "macos-14", python-version: "3.9" } + - { os: "macos-latest", python-version: "3.9" } runs-on: ${{ matrix.os }} name: ${{ matrix.os }} Python ${{ matrix.python-version }} ${{ matrix.disable-gil && 'free-threaded' || '' }} diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index f3ed8399b..e208417e1 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -107,7 +107,7 @@ jobs: cibw_arch: x86_64 macosx_deployment_target: "10.10" - name: "macOS arm64" - os: macos-14 + os: macos-latest cibw_arch: arm64 macosx_deployment_target: "11.0" - name: "manylinux2014 and musllinux x86_64" From 1557f7e36f134979ee607e7583185f8b3adc2212 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 13 Sep 2024 23:41:03 +1000 Subject: [PATCH 392/662] Removed unused variable --- src/path.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/path.c b/src/path.c index b96e8b78a..f4f4287f3 100644 --- a/src/path.c +++ b/src/path.c @@ -44,7 +44,6 @@ PyImaging_GetBuffer(PyObject *buffer, Py_buffer *view); typedef struct { PyObject_HEAD Py_ssize_t count; double *xy; - int index; /* temporary use, e.g. in decimate */ } PyPathObject; static PyTypeObject PyPathType; From 6921f83629242d199eaab87af55da6279588a8e0 Mon Sep 17 00:00:00 2001 From: Alexander Karpinsky Date: Fri, 13 Sep 2024 22:54:16 +0200 Subject: [PATCH 393/662] Update docs/deprecations.rst Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- docs/deprecations.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index af6de2f92..bfe9849da 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -144,7 +144,7 @@ Get Internal Pointers to Objects ``Image.core.ImagingCore.id`` and ``Image.core.ImagingCore.unsafe_ptrs`` have been deprecated and will be removed in Pillow 12 (2025-10-15). They were used for obtaining raw pointers to ``ImagingCore`` internals. To interact with C code, you can use -``Image.core.ImagingCore.ptr``, which returns a ``Capsule`` object. +``Image.Image.getim()``, which returns a ``Capsule`` object. Removed features ---------------- From 57131599682b1c6a54748006ccda4abfd0f2615e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 23:52:11 +0000 Subject: [PATCH 394/662] Update dependency cibuildwheel to v2.21.0 --- .ci/requirements-cibw.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-cibw.txt b/.ci/requirements-cibw.txt index b8e6c3947..210f29d3a 100644 --- a/.ci/requirements-cibw.txt +++ b/.ci/requirements-cibw.txt @@ -1 +1 @@ -cibuildwheel==2.20.0 +cibuildwheel==2.21.0 From a3d9529f045af093eb964bf264064b261714b127 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 14 Sep 2024 11:23:09 +1000 Subject: [PATCH 395/662] Updated macOS deployment target for Python >= 3.12 on Intel to 10.13 --- .github/workflows/wheels.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index e208417e1..11564c142 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -102,10 +102,16 @@ jobs: fail-fast: false matrix: include: - - name: "macOS x86_64" + - name: "macOS 10.10 x86_64" os: macos-13 cibw_arch: x86_64 + build: "pp310* cp3{9,10,11}*" macosx_deployment_target: "10.10" + - name: "macOS 10.13 x86_64" + os: macos-13 + cibw_arch: x86_64 + build: "cp3{12,13}*" + macosx_deployment_target: "10.13" - name: "macOS arm64" os: macos-latest cibw_arch: arm64 @@ -145,7 +151,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: dist-${{ matrix.os }}-${{ matrix.cibw_arch }}${{ matrix.manylinux && format('-{0}', matrix.manylinux) }} + name: dist-${{ matrix.os }}${{ matrix.macosx_deployment_target && format('-{0}', matrix.macosx_deployment_target) }}-${{ matrix.cibw_arch }}${{ matrix.manylinux && format('-{0}', matrix.manylinux) }} path: ./wheelhouse/*.whl windows: From 10c118bb5c2dca0343d1e6e733de51e519f0374a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 14 Sep 2024 19:58:57 +1000 Subject: [PATCH 396/662] Added release notes for #8379 --- docs/releasenotes/11.0.0.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index 5f90348ad..1b8407636 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -23,6 +23,13 @@ Python 3.8 Pillow has dropped support for Python 3.8, which reached end-of-life in October 2024. +Python 3.12 on macOS < 10.13 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The latest version of Python 3.12 no longer supports macOS versions earlier than 10.13, +and so Pillow has also updated the deployment target for its prebuilt Python 3.12 +wheels. + PSFile ^^^^^^ @@ -147,6 +154,8 @@ Pillow 11.0.0 now officially supports Python 3.13. Support has also been added for the experimental free-threaded mode of :pep:`703`. +Python 3.13 does not support macOS versions earlier than 10.13. + C-level Flags ^^^^^^^^^^^^^ From ad0091096f4c653c88a98a03e1323d855152bb81 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Sat, 14 Sep 2024 20:52:49 +1000 Subject: [PATCH 397/662] Describe supported OS versions instead of unsupported Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- docs/releasenotes/11.0.0.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index 1b8407636..36334e39f 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -23,10 +23,10 @@ Python 3.8 Pillow has dropped support for Python 3.8, which reached end-of-life in October 2024. -Python 3.12 on macOS < 10.13 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Python 3.12 on macOS <= 10.12 +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The latest version of Python 3.12 no longer supports macOS versions earlier than 10.13, +The latest version of Python 3.12 only supports macOS versions 10.13 and later, and so Pillow has also updated the deployment target for its prebuilt Python 3.12 wheels. @@ -154,7 +154,7 @@ Pillow 11.0.0 now officially supports Python 3.13. Support has also been added for the experimental free-threaded mode of :pep:`703`. -Python 3.13 does not support macOS versions earlier than 10.13. +Python 3.13 only supports macOS versions 10.13 and later. C-level Flags ^^^^^^^^^^^^^ From 88b3265a9cb86ffd8a7c43c1afa8dae1b78cf035 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 14 Sep 2024 20:59:02 +1000 Subject: [PATCH 398/662] Lint: Run PT016 --- Tests/test_image.py | 15 +++++---------- Tests/test_imageshow.py | 2 +- pyproject.toml | 1 - 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Tests/test_image.py b/Tests/test_image.py index cf5b5a710..9b65041f4 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -1086,22 +1086,17 @@ class TestImage: valgrind pytest -qq Tests/test_image.py::TestImage::test_overrun | grep decode.c """ with Image.open(os.path.join("Tests/images", path)) as im: - try: + with pytest.raises(OSError) as e: im.load() - pytest.fail() - except OSError as e: - buffer_overrun = str(e) == "buffer overrun when reading image file" - truncated = "image file is truncated" in str(e) + buffer_overrun = str(e.value) == "buffer overrun when reading image file" + truncated = "image file is truncated" in str(e.value) - assert buffer_overrun or truncated + assert buffer_overrun or truncated def test_fli_overrun2(self) -> None: with Image.open("Tests/images/fli_overrun2.bin") as im: - try: + with pytest.raises(OSError, match="buffer overrun when reading image file"): im.seek(1) - pytest.fail() - except OSError as e: - assert str(e) == "buffer overrun when reading image file" def test_exit_fp(self) -> None: with Image.new("L", (1, 1)) as im: diff --git a/Tests/test_imageshow.py b/Tests/test_imageshow.py index a4f7e5cc5..67c32783f 100644 --- a/Tests/test_imageshow.py +++ b/Tests/test_imageshow.py @@ -115,7 +115,7 @@ def test_ipythonviewer() -> None: test_viewer = viewer break else: - pytest.fail() + pytest.fail("IPythonViewer not found") im = hopper() assert test_viewer.show(im) == 1 diff --git a/pyproject.toml b/pyproject.toml index 4042bd9ee..228c344e8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,7 +125,6 @@ lint.ignore = [ "PT007", # pytest-parametrize-values-wrong-type "PT011", # pytest-raises-too-broad "PT012", # pytest-raises-with-multiple-statements - "PT016", # pytest-fail-without-message "PT017", # pytest-assert-in-except "PYI026", # flake8-pyi: typing.TypeAlias added in Python 3.10 "PYI034", # flake8-pyi: typing.Self added in Python 3.11 From c01d2d05772dd52e316ccd0b868a1c7b560cc391 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 15 Sep 2024 21:57:45 +1000 Subject: [PATCH 399/662] Updated libjpeg-turbo to 3.0.4 --- .github/workflows/wheels-dependencies.sh | 2 +- winbuild/build_prepare.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index d1e87899f..4d40f7fab 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -22,7 +22,7 @@ else HARFBUZZ_VERSION=8.5.0 fi LIBPNG_VERSION=1.6.44 -JPEGTURBO_VERSION=3.0.3 +JPEGTURBO_VERSION=3.0.4 OPENJPEG_VERSION=2.5.2 XZ_VERSION=5.6.2 TIFF_VERSION=4.6.0 diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index b478c1c6b..e2022d283 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -113,7 +113,7 @@ V = { "FREETYPE": "2.13.3", "FRIBIDI": "1.0.15", "HARFBUZZ": "9.0.0", - "JPEGTURBO": "3.0.3", + "JPEGTURBO": "3.0.4", "LCMS2": "2.16", "LIBPNG": "1.6.44", "LIBWEBP": "1.4.0", From 8a086edbe965bff4d89fc3b189e021f0b1a2b322 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 16 Sep 2024 08:22:58 +1000 Subject: [PATCH 400/662] Cast handle to int --- Tests/test_imagewin.py | 12 ++++++++++++ src/PIL/ImageWin.py | 19 +++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Tests/test_imagewin.py b/Tests/test_imagewin.py index a836bb90b..e7af160dd 100644 --- a/Tests/test_imagewin.py +++ b/Tests/test_imagewin.py @@ -60,6 +60,18 @@ class TestImageWinDib: with pytest.raises(ValueError): ImageWin.Dib(mode) + def test_dib_hwnd(self) -> None: + mode = "RGBA" + size = (128, 128) + wnd = 0 + + dib = ImageWin.Dib(mode, size) + hwnd = ImageWin.HWND(wnd) + + dib.expose(hwnd) + dib.draw(hwnd, (0, 0) + size) + assert isinstance(dib.query_palette(hwnd), int) + def test_dib_paste(self) -> None: # Arrange im = hopper() diff --git a/src/PIL/ImageWin.py b/src/PIL/ImageWin.py index 6fc7cfaf5..98c28f29f 100644 --- a/src/PIL/ImageWin.py +++ b/src/PIL/ImageWin.py @@ -98,14 +98,15 @@ class Dib: HDC or HWND instance. In PythonWin, you can use ``CDC.GetHandleAttrib()`` to get a suitable handle. """ + handle_int = int(handle) if isinstance(handle, HWND): - dc = self.image.getdc(handle) + dc = self.image.getdc(handle_int) try: self.image.expose(dc) finally: - self.image.releasedc(handle, dc) + self.image.releasedc(handle_int, dc) else: - self.image.expose(handle) + self.image.expose(handle_int) def draw( self, @@ -124,14 +125,15 @@ class Dib: """ if src is None: src = (0, 0) + self.size + handle_int = int(handle) if isinstance(handle, HWND): - dc = self.image.getdc(handle) + dc = self.image.getdc(handle_int) try: self.image.draw(dc, dst, src) finally: - self.image.releasedc(handle, dc) + self.image.releasedc(handle_int, dc) else: - self.image.draw(handle, dst, src) + self.image.draw(handle_int, dst, src) def query_palette(self, handle: int | HDC | HWND) -> int: """ @@ -148,14 +150,15 @@ class Dib: :return: The number of entries that were changed (if one or more entries, this indicates that the image should be redrawn). """ + handle_int = int(handle) if isinstance(handle, HWND): - handle = self.image.getdc(handle) + handle = self.image.getdc(handle_int) try: result = self.image.query_palette(handle) finally: self.image.releasedc(handle, handle) else: - result = self.image.query_palette(handle) + result = self.image.query_palette(handle_int) return result def paste( From 1f3fe6f73350aa9630b236a9f16370aa0c71258d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 16 Sep 2024 10:21:17 +1000 Subject: [PATCH 401/662] Use getim() --- Tests/test_imagemorph.py | 8 ++++---- src/PIL/ImageCms.py | 4 ++-- src/PIL/ImageMath.py | 5 ++--- src/PIL/ImageMorph.py | 6 +++--- src/PIL/ImageTk.py | 2 +- src/PIL/_imagingcms.pyi | 4 +++- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Tests/test_imagemorph.py b/Tests/test_imagemorph.py index 04860fd61..9da32aa01 100644 --- a/Tests/test_imagemorph.py +++ b/Tests/test_imagemorph.py @@ -328,13 +328,13 @@ def test_wrong_mode() -> None: iml = Image.new("L", (10, 10)) with pytest.raises(RuntimeError): - _imagingmorph.apply(bytes(lut), imrgb.im.ptr, iml.im.ptr) + _imagingmorph.apply(bytes(lut), imrgb.getim(), iml.getim()) with pytest.raises(RuntimeError): - _imagingmorph.apply(bytes(lut), iml.im.ptr, imrgb.im.ptr) + _imagingmorph.apply(bytes(lut), iml.getim(), imrgb.getim()) with pytest.raises(RuntimeError): - _imagingmorph.match(bytes(lut), imrgb.im.ptr) + _imagingmorph.match(bytes(lut), imrgb.getim()) # Should not raise - _imagingmorph.match(bytes(lut), iml.im.ptr) + _imagingmorph.match(bytes(lut), iml.getim()) diff --git a/src/PIL/ImageCms.py b/src/PIL/ImageCms.py index 5e256b0ab..f028f1775 100644 --- a/src/PIL/ImageCms.py +++ b/src/PIL/ImageCms.py @@ -352,7 +352,7 @@ class ImageCmsTransform(Image.ImagePointHandler): im.load() if imOut is None: imOut = Image.new(self.output_mode, im.size, None) - self.transform.apply(im.im.ptr, imOut.im.ptr) + self.transform.apply(im.getim(), imOut.getim()) imOut.info["icc_profile"] = self.output_profile.tobytes() return imOut @@ -361,7 +361,7 @@ class ImageCmsTransform(Image.ImagePointHandler): if im.mode != self.output_mode: msg = "mode mismatch" raise ValueError(msg) # wrong output mode - self.transform.apply(im.im.ptr, im.im.ptr) + self.transform.apply(im.getim(), im.getim()) im.info["icc_profile"] = self.output_profile.tobytes() return im diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py index b32742657..ff3014a8d 100644 --- a/src/PIL/ImageMath.py +++ b/src/PIL/ImageMath.py @@ -65,7 +65,7 @@ class _Operand: except AttributeError as e: msg = f"bad operand type for '{op}'" raise TypeError(msg) from e - _imagingmath.unop(op, out.im.ptr, im_1.im.ptr) + _imagingmath.unop(op, out.getim(), im_1.getim()) else: # binary operation im_2 = self.__fixup(im2) @@ -87,13 +87,12 @@ class _Operand: im_2 = im_2.crop((0, 0) + size) out = Image.new(mode or im_1.mode, im_1.size, None) im_1.load() - im_2.load() try: op = getattr(_imagingmath, f"{op}_{im_1.mode}") except AttributeError as e: msg = f"bad operand type for '{op}'" raise TypeError(msg) from e - _imagingmath.binop(op, out.im.ptr, im_1.im.ptr, im_2.im.ptr) + _imagingmath.binop(op, out.getim(), im_1.getim(), im_2.getim()) return _Operand(out) # unary operators diff --git a/src/PIL/ImageMorph.py b/src/PIL/ImageMorph.py index bc7ed66d3..f0a066b5b 100644 --- a/src/PIL/ImageMorph.py +++ b/src/PIL/ImageMorph.py @@ -213,7 +213,7 @@ class MorphOp: msg = "Image mode must be L" raise ValueError(msg) outimage = Image.new(image.mode, image.size, None) - count = _imagingmorph.apply(bytes(self.lut), image.im.ptr, outimage.im.ptr) + count = _imagingmorph.apply(bytes(self.lut), image.getim(), outimage.getim()) return count, outimage def match(self, image: Image.Image) -> list[tuple[int, int]]: @@ -229,7 +229,7 @@ class MorphOp: if image.mode != "L": msg = "Image mode must be L" raise ValueError(msg) - return _imagingmorph.match(bytes(self.lut), image.im.ptr) + return _imagingmorph.match(bytes(self.lut), image.getim()) def get_on_pixels(self, image: Image.Image) -> list[tuple[int, int]]: """Get a list of all turned on pixels in a binary image @@ -240,7 +240,7 @@ class MorphOp: if image.mode != "L": msg = "Image mode must be L" raise ValueError(msg) - return _imagingmorph.get_on_pixels(image.im.ptr) + return _imagingmorph.get_on_pixels(image.getim()) def load_lut(self, filename: str) -> None: """Load an operator from an mrl file""" diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index d01af364b..c36cf9b84 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -259,7 +259,7 @@ def getimage(photo: PhotoImage) -> Image.Image: """Copies the contents of a PhotoImage to a PIL image memory.""" im = Image.new("RGBA", (photo.width(), photo.height())) - _pyimagingtkcall("PyImagingPhotoGet", photo, im.im.ptr) + _pyimagingtkcall("PyImagingPhotoGet", photo, im.getim()) return im diff --git a/src/PIL/_imagingcms.pyi b/src/PIL/_imagingcms.pyi index 2abd6d0f7..ddcf93ab1 100644 --- a/src/PIL/_imagingcms.pyi +++ b/src/PIL/_imagingcms.pyi @@ -2,6 +2,8 @@ import datetime import sys from typing import Literal, SupportsFloat, TypedDict +from ._typing import CapsuleType + littlecms_version: str | None _Tuple3f = tuple[float, float, float] @@ -108,7 +110,7 @@ class CmsProfile: def is_intent_supported(self, intent: int, direction: int, /) -> int: ... class CmsTransform: - def apply(self, id_in: int, id_out: int) -> int: ... + def apply(self, id_in: CapsuleType, id_out: CapsuleType) -> int: ... def profile_open(profile: str, /) -> CmsProfile: ... def profile_frombytes(profile: bytes, /) -> CmsProfile: ... From d8ef314205ff65e6aeeefe3092414cc45e7349eb Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 16 Sep 2024 10:39:14 +0200 Subject: [PATCH 402/662] Remove extra load() calls --- src/PIL/ImageCms.py | 2 -- src/PIL/ImageMath.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/PIL/ImageCms.py b/src/PIL/ImageCms.py index f028f1775..b6c5de5b3 100644 --- a/src/PIL/ImageCms.py +++ b/src/PIL/ImageCms.py @@ -349,7 +349,6 @@ class ImageCmsTransform(Image.ImagePointHandler): return self.apply(im) def apply(self, im: Image.Image, imOut: Image.Image | None = None) -> Image.Image: - im.load() if imOut is None: imOut = Image.new(self.output_mode, im.size, None) self.transform.apply(im.getim(), imOut.getim()) @@ -357,7 +356,6 @@ class ImageCmsTransform(Image.ImagePointHandler): return imOut def apply_in_place(self, im: Image.Image) -> Image.Image: - im.load() if im.mode != self.output_mode: msg = "mode mismatch" raise ValueError(msg) # wrong output mode diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py index ff3014a8d..773147b53 100644 --- a/src/PIL/ImageMath.py +++ b/src/PIL/ImageMath.py @@ -59,7 +59,6 @@ class _Operand: if im2 is None: # unary operation out = Image.new(mode or im_1.mode, im_1.size, None) - im_1.load() try: op = getattr(_imagingmath, f"{op}_{im_1.mode}") except AttributeError as e: @@ -86,7 +85,6 @@ class _Operand: if im_2.size != size: im_2 = im_2.crop((0, 0) + size) out = Image.new(mode or im_1.mode, im_1.size, None) - im_1.load() try: op = getattr(_imagingmath, f"{op}_{im_1.mode}") except AttributeError as e: From d1f40a94ffe783aceb7050d85fa5c17ecc4961a7 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 16 Sep 2024 10:52:06 +0200 Subject: [PATCH 403/662] Use Image.getim() instead of ImagingCore.ptr --- src/PIL/WebPImagePlugin.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index 8251316d3..ab545563f 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -239,7 +239,6 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: for idx in range(nfr): ims.seek(idx) - ims.load() # Make sure image mode is supported frame = ims @@ -248,7 +247,7 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: # Append the frame to the animation encoder enc.add( - frame.im.ptr, + frame.getim(), round(timestamp), lossless, quality, @@ -296,7 +295,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: im = im.convert("RGBA" if im.has_transparency_data else "RGB") data = _webp.WebPEncode( - im.im.ptr, + im.getim(), lossless, float(quality), float(alpha_quality), From 31d36e6b70e1e835bcc6d70f363cda49d3bc9e98 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 16 Sep 2024 11:04:00 +0200 Subject: [PATCH 404/662] Use current frame for transparency detection --- Tests/test_file_webp.py | 2 +- src/PIL/WebPImagePlugin.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index 719831db9..e7c887279 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -208,7 +208,7 @@ class TestFileWebp: def test_background_from_gif(self, tmp_path: Path) -> None: out_webp = tmp_path / "temp.webp" - + # Save L mode GIF with background with Image.open("Tests/images/no_palette_with_background.gif") as im: im.save(out_webp, save_all=True) diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index ab545563f..1a714d7ea 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -243,7 +243,9 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: # Make sure image mode is supported frame = ims if frame.mode not in ("RGBX", "RGBA", "RGB"): - frame = frame.convert("RGBA" if im.has_transparency_data else "RGB") + frame = frame.convert( + "RGBA" if frame.has_transparency_data else "RGB" + ) # Append the frame to the animation encoder enc.add( From bc973690397a075b94f694ee1cb3f3392fff9cdc Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 16 Sep 2024 15:45:34 +0200 Subject: [PATCH 405/662] Increase reference to the image while capsule is alive --- src/_imaging.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/_imaging.c b/src/_imaging.c index e227d8efc..9422c42bf 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -3714,9 +3714,18 @@ _getattr_id(ImagingObject *self, void *closure) { return PyLong_FromSsize_t((Py_ssize_t)self->image); } +static void +_ptr_destructor(PyObject *capsule) { + PyObject *self = (PyObject *)PyCapsule_GetContext(capsule); + Py_DECREF(self); +} + static PyObject * _getattr_ptr(ImagingObject *self, void *closure) { - return PyCapsule_New(self->image, IMAGING_MAGIC, NULL); + PyObject *capsule = PyCapsule_New(self->image, IMAGING_MAGIC, _ptr_destructor); + Py_INCREF(self); + PyCapsule_SetContext(capsule, self); + return capsule; } static PyObject * From 1d5b330758c1e9210a8c00c457b03a1f19903939 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 16 Sep 2024 15:37:57 +0200 Subject: [PATCH 406/662] Move common conversion in _convert_frame --- src/PIL/WebPImagePlugin.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index 1a714d7ea..64188f28c 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -149,6 +149,13 @@ class WebPImageFile(ImageFile.ImageFile): return self.__logical_frame +def _convert_frame(im: Image.Image) -> Image.Image: + # Make sure image mode is supported + if im.mode not in ("RGBX", "RGBA", "RGB"): + im = im.convert("RGBA" if im.has_transparency_data else "RGB") + return im + + def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: encoderinfo = im.encoderinfo.copy() append_images = list(encoderinfo.get("append_images", [])) @@ -240,12 +247,7 @@ def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: for idx in range(nfr): ims.seek(idx) - # Make sure image mode is supported - frame = ims - if frame.mode not in ("RGBX", "RGBA", "RGB"): - frame = frame.convert( - "RGBA" if frame.has_transparency_data else "RGB" - ) + frame = _convert_frame(ims) # Append the frame to the animation encoder enc.add( @@ -293,8 +295,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: method = im.encoderinfo.get("method", 4) exact = 1 if im.encoderinfo.get("exact") else 0 - if im.mode not in ("RGBX", "RGBA", "RGB"): - im = im.convert("RGBA" if im.has_transparency_data else "RGB") + im = _convert_frame(im) data = _webp.WebPEncode( im.getim(), From a988750595af555e07af0e937ab6f6697a5bb1e1 Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Mon, 16 Sep 2024 16:37:39 +0200 Subject: [PATCH 407/662] Try fix bigendian --- src/_webp.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/_webp.c b/src/_webp.c index 9717b9bc0..92d5c20fe 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -89,7 +89,7 @@ HandleMuxError(WebPMuxError err, char *chunk) { static int import_frame_libwebp(WebPPicture *frame, Imaging im) { - UINT32 mask = 0; + int drop_alpha = strcmp(im->mode, "RGBA"); if (strcmp(im->mode, "RGBA") && strcmp(im->mode, "RGB") && strcmp(im->mode, "RGBX")) { @@ -97,10 +97,6 @@ import_frame_libwebp(WebPPicture *frame, Imaging im) { return -1; } - if (strcmp(im->mode, "RGBA")) { - mask = MASK_UINT32_CHANNEL_3; - } - frame->width = im->xsize; frame->height = im->ysize; frame->use_argb = 1; // Don't convert RGB pixels to YUV @@ -113,10 +109,18 @@ import_frame_libwebp(WebPPicture *frame, Imaging im) { for (int y = 0; y < im->ysize; ++y) { UINT8 *src = (UINT8 *)im->image32[y]; UINT32 *dst = frame->argb + frame->argb_stride * y; - for (int x = 0; x < im->xsize; ++x) { - UINT32 pix = - MAKE_UINT32(src[x * 4 + 2], src[x * 4 + 1], src[x * 4], src[x * 4 + 3]); - dst[x] = pix | mask; + if (drop_alpha) { + for (int x = 0; x < im->xsize; ++x) { + dst[x] = + ((UINT32)(src[x * 4 + 2]) | ((UINT32)(src[x * 4 + 1]) << 8) | + ((UINT32)(src[x * 4]) << 16) | (0xff << 24)); + } + } else { + for (int x = 0; x < im->xsize; ++x) { + dst[x] = + ((UINT32)(src[x * 4 + 2]) | ((UINT32)(src[x * 4 + 1]) << 8) | + ((UINT32)(src[x * 4]) << 16) | ((UINT32)(src[x * 4 + 3]) << 24)); + } } } From 75e4d5a10d171b9f101f09a671826f3f302139cb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 06:12:03 +0000 Subject: [PATCH 408/662] Update dependency cibuildwheel to v2.21.1 --- .ci/requirements-cibw.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-cibw.txt b/.ci/requirements-cibw.txt index 210f29d3a..7dc3a53fe 100644 --- a/.ci/requirements-cibw.txt +++ b/.ci/requirements-cibw.txt @@ -1 +1 @@ -cibuildwheel==2.21.0 +cibuildwheel==2.21.1 From f1e86965f6f791bf1af57f4d202a0c342221190b Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 18 Sep 2024 20:26:06 +1000 Subject: [PATCH 409/662] Use transposed size after opening for TIFF images --- Tests/test_image_copy.py | 2 ++ Tests/test_image_resize.py | 4 +--- Tests/test_image_thumbnail.py | 8 +++----- Tests/test_numpy.py | 4 +++- src/PIL/Image.py | 22 ++++++---------------- src/PIL/ImageFile.py | 2 +- src/PIL/TiffImagePlugin.py | 16 +++++++++++++++- 7 files changed, 31 insertions(+), 27 deletions(-) diff --git a/Tests/test_image_copy.py b/Tests/test_image_copy.py index 027e5338b..a0b829cc5 100644 --- a/Tests/test_image_copy.py +++ b/Tests/test_image_copy.py @@ -49,5 +49,7 @@ def test_copy_zero() -> None: @skip_unless_feature("libtiff") def test_deepcopy() -> None: with Image.open("Tests/images/g4_orientation_5.tif") as im: + assert im.size == (590, 88) + out = copy.deepcopy(im) assert out.size == (590, 88) diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py index c9e304512..d9ddf5009 100644 --- a/Tests/test_image_resize.py +++ b/Tests/test_image_resize.py @@ -300,9 +300,7 @@ class TestImageResize: im.resize((10, 10), "unknown") @skip_unless_feature("libtiff") - def test_load_first(self) -> None: - # load() may change the size of the image - # Test that resize() is calling it before getting the size + def test_transposed(self) -> None: with Image.open("Tests/images/g4_orientation_5.tif") as im: im = im.resize((64, 64)) assert im.size == (64, 64) diff --git a/Tests/test_image_thumbnail.py b/Tests/test_image_thumbnail.py index bdbf09c40..01bd4b1d7 100644 --- a/Tests/test_image_thumbnail.py +++ b/Tests/test_image_thumbnail.py @@ -92,15 +92,13 @@ def test_no_resize() -> None: @skip_unless_feature("libtiff") -def test_load_first() -> None: - # load() may change the size of the image - # Test that thumbnail() is calling it before performing size calculations +def test_transposed() -> None: with Image.open("Tests/images/g4_orientation_5.tif") as im: + assert im.size == (590, 88) + im.thumbnail((64, 64)) assert im.size == (64, 10) - # Test thumbnail(), without draft(), - # on an image that is large enough once load() has changed the size with Image.open("Tests/images/g4_orientation_5.tif") as im: im.thumbnail((590, 88), reducing_gap=None) assert im.size == (590, 88) diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py index 312e32e0c..040472d69 100644 --- a/Tests/test_numpy.py +++ b/Tests/test_numpy.py @@ -238,8 +238,10 @@ def test_zero_size() -> None: @skip_unless_feature("libtiff") -def test_load_first() -> None: +def test_transposed() -> None: with Image.open("Tests/images/g4_orientation_5.tif") as im: + assert im.size == (590, 88) + a = numpy.array(im) assert a.shape == (88, 590) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index f88cdf6e2..3f94cef38 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -2332,7 +2332,6 @@ class Image: msg = "reducing_gap must be 1.0 or greater" raise ValueError(msg) - self.load() if box is None: box = (0, 0) + self.size @@ -2781,27 +2780,18 @@ class Image: ) return x, y - box = None - final_size: tuple[int, int] - if reducing_gap is not None: - preserved_size = preserve_aspect_ratio() - if preserved_size is None: - return - final_size = preserved_size + preserved_size = preserve_aspect_ratio() + if preserved_size is None: + return + final_size = preserved_size + box = None + if reducing_gap is not None: res = self.draft( None, (int(size[0] * reducing_gap), int(size[1] * reducing_gap)) ) if res is not None: box = res[1] - if box is None: - self.load() - - # load() may have changed the size of the image - preserved_size = preserve_aspect_ratio() - if preserved_size is None: - return - final_size = preserved_size if self.size != final_size: im = self.resize(final_size, resample, box=box, reducing_gap=reducing_gap) diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index b8bf0b7fe..721319fd7 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -322,7 +322,7 @@ class ImageFile(Image.Image): def load_prepare(self) -> None: # create image memory if necessary - if self._im is None or self.im.mode != self.mode or self.im.size != self.size: + if self._im is None or self.im.mode != self.mode: self.im = Image.core.new(self.mode, self.size) # create palette (optional) if self.mode == "P": diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index cc16cbfb0..28e504744 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1275,6 +1275,11 @@ class TiffImageFile(ImageFile.ImageFile): return self._load_libtiff() return super().load() + def load_prepare(self) -> None: + if self._im is None and self._will_be_transposed: + self.im = Image.core.new(self.mode, self.size[::-1]) + ImageFile.ImageFile.load_prepare(self) + def load_end(self) -> None: # allow closing if we're on the first frame, there's no next # This is the ImageFile.load path only, libtiff specific below. @@ -1416,7 +1421,16 @@ class TiffImageFile(ImageFile.ImageFile): if not isinstance(xsize, int) or not isinstance(ysize, int): msg = "Invalid dimensions" raise ValueError(msg) - self._size = xsize, ysize + self._will_be_transposed = self.tag_v2.get(ExifTags.Base.Orientation) in ( + 5, + 6, + 7, + 8, + ) + if self._will_be_transposed: + self._size = ysize, xsize + else: + self._size = xsize, ysize logger.debug("- size: %s", self.size) From 84e275d90629bfdf508f81a1142eddd5d5ea46e4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 18 Sep 2024 20:27:35 +1000 Subject: [PATCH 410/662] Loading does not change mode --- src/PIL/ImageFile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 721319fd7..d69d84568 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -322,7 +322,7 @@ class ImageFile(Image.Image): def load_prepare(self) -> None: # create image memory if necessary - if self._im is None or self.im.mode != self.mode: + if self._im is None: self.im = Image.core.new(self.mode, self.size) # create palette (optional) if self.mode == "P": From 9135fd0fb24607510f38b5fa4b1b4d279974363a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 18 Sep 2024 20:56:55 +1000 Subject: [PATCH 411/662] Mention limit in error message --- src/PIL/PngImagePlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index c268d7b1a..28ade293e 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -140,7 +140,7 @@ def _safe_zlib_decompress(s: bytes) -> bytes: dobj = zlib.decompressobj() plaintext = dobj.decompress(s, MAX_TEXT_CHUNK) if dobj.unconsumed_tail: - msg = "Decompressed Data Too Large" + msg = "Decompressed data too large for PngImagePlugin.MAX_TEXT_CHUNK" raise ValueError(msg) return plaintext From a859695d9a0bf9d9dc20ef7c053909658a12df6a Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Wed, 18 Sep 2024 21:17:49 +1000 Subject: [PATCH 412/662] Rearranged code Co-authored-by: Alexander Karpinsky --- src/PIL/TiffImagePlugin.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 28e504744..437f7d98b 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1421,12 +1421,8 @@ class TiffImageFile(ImageFile.ImageFile): if not isinstance(xsize, int) or not isinstance(ysize, int): msg = "Invalid dimensions" raise ValueError(msg) - self._will_be_transposed = self.tag_v2.get(ExifTags.Base.Orientation) in ( - 5, - 6, - 7, - 8, - ) + orientation = self.tag_v2.get(ExifTags.Base.Orientation) + self._will_be_transposed = orientation in (5, 6, 7, 8) if self._will_be_transposed: self._size = ysize, xsize else: From a92dca66bdeb26106447079fcf2d36bc397298c2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 18 Sep 2024 21:22:59 +1000 Subject: [PATCH 413/662] Use raw size for striped tiles --- src/PIL/TiffImagePlugin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 437f7d98b..c024e57fc 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1569,7 +1569,7 @@ class TiffImageFile(ImageFile.ImageFile): if STRIPOFFSETS in self.tag_v2: offsets = self.tag_v2[STRIPOFFSETS] h = self.tag_v2.get(ROWSPERSTRIP, ysize) - w = self.size[0] + w = xsize else: # tiled image offsets = self.tag_v2[TILEOFFSETS] @@ -1603,9 +1603,9 @@ class TiffImageFile(ImageFile.ImageFile): ) ) x = x + w - if x >= self.size[0]: + if x >= xsize: x, y = 0, y + h - if y >= self.size[1]: + if y >= ysize: x = y = 0 layer += 1 else: From 629f5be52eb9043d70b5d5467f10a07ad3a68cdf Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 18 Sep 2024 22:56:29 +1000 Subject: [PATCH 414/662] In seek(), create core image at size needed for loading --- src/PIL/TiffImagePlugin.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index c024e57fc..14e6ea278 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1194,8 +1194,8 @@ class TiffImageFile(ImageFile.ImageFile): # Create a new core image object on second and # subsequent frames in the image. Image may be # different size/mode. - Image._decompression_bomb_check(self.size) - self.im = Image.core.new(self.mode, self.size) + Image._decompression_bomb_check(self._tile_size) + self.im = Image.core.new(self.mode, self._tile_size) def _seek(self, frame: int) -> None: self.fp = self._fp @@ -1276,8 +1276,8 @@ class TiffImageFile(ImageFile.ImageFile): return super().load() def load_prepare(self) -> None: - if self._im is None and self._will_be_transposed: - self.im = Image.core.new(self.mode, self.size[::-1]) + if self._im is None: + self.im = Image.core.new(self.mode, self._tile_size) ImageFile.ImageFile.load_prepare(self) def load_end(self) -> None: @@ -1421,9 +1421,9 @@ class TiffImageFile(ImageFile.ImageFile): if not isinstance(xsize, int) or not isinstance(ysize, int): msg = "Invalid dimensions" raise ValueError(msg) + self._tile_size = xsize, ysize orientation = self.tag_v2.get(ExifTags.Base.Orientation) - self._will_be_transposed = orientation in (5, 6, 7, 8) - if self._will_be_transposed: + if orientation in (5, 6, 7, 8): self._size = ysize, xsize else: self._size = xsize, ysize From 9adb476f37f28cd4a27bb66c6242e4d11925b53b Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Wed, 18 Sep 2024 23:58:23 +1000 Subject: [PATCH 415/662] Rearranged text --- src/PIL/ImageFont.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index 70cd57de7..b694b817e 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -808,10 +808,10 @@ def truetype( ) -> FreeTypeFont: """ Load a TrueType or OpenType font from a file or file-like object, - and create a font object. For loading bitmap fonts instead, - see :py:func:`~PIL.ImageFont.load` and :py:func:`~PIL.ImageFont.load_path`. - This function loads a font object from the given file or file-like - object, and creates a font object for a font of the given size. + and create a font object. This function loads a font object from the given + file or file-like object, and creates a font object for a font of the given + size. For loading bitmap fonts instead, see :py:func:`~PIL.ImageFont.load` + and :py:func:`~PIL.ImageFont.load_path`. Pillow uses FreeType to open font files. On Windows, be aware that FreeType will keep the file open as long as the FreeTypeFont object exists. Windows From e33d8bb32bd04c5b29afa3dca52bce9cb2bbffbd Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 18 Sep 2024 18:19:53 +0300 Subject: [PATCH 416/662] Generate and upload attestations to PyPI --- .github/workflows/wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 11564c142..35ea0496d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -296,3 +296,5 @@ jobs: merge-multiple: true - name: Publish to PyPI uses: pypa/gh-action-pypi-publish@release/v1 + with: + attestations: true From 362ffaf9b7f063609bcd02ef30b1288e16e99cd1 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Sun, 18 Aug 2024 20:39:14 -0500 Subject: [PATCH 417/662] implement tiff exif multistrip support --- Tests/test_file_tiff.py | 3 ++- Tests/test_file_tiff_metadata.py | 22 ++++++++++++++++++++++ src/PIL/TiffImagePlugin.py | 8 +++++--- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 190f83f40..44da25295 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -108,7 +108,8 @@ class TestFileTiff: assert_image_equal_tofile(im, "Tests/images/hopper.tif") with Image.open("Tests/images/hopper_bigtiff.tif") as im: - # multistrip support not yet implemented + # The data type of this file's StripOffsets tag is LONG8, + # which is not yet supported for offset data when saving multiple frames. del im.tag_v2[273] outfile = str(tmp_path / "temp.tif") diff --git a/Tests/test_file_tiff_metadata.py b/Tests/test_file_tiff_metadata.py index 1e0310001..00fe745cf 100644 --- a/Tests/test_file_tiff_metadata.py +++ b/Tests/test_file_tiff_metadata.py @@ -181,6 +181,28 @@ def test_change_stripbytecounts_tag_type(tmp_path: Path) -> None: assert reloaded.tag_v2.tagtype[TiffImagePlugin.STRIPBYTECOUNTS] == TiffTags.LONG +def test_save_multiple_stripoffsets() -> None: + ifd = TiffImagePlugin.ImageFileDirectory_v2() + ifd[TiffImagePlugin.STRIPOFFSETS] = (123, 456) + assert ifd.tagtype[TiffImagePlugin.STRIPOFFSETS] == TiffTags.LONG + + # all values are in little-endian + assert ifd.tobytes() == ( + # number of tags == 1 + b"\x01\x00" + # tag id (2 bytes), type (2 bytes), count (4 bytes), value (4 bytes) + # == 273, 4, 2, 18 + # == TiffImagePlugin.STRIPOFFSETS, TiffTags.LONG, 2, 18 + # the value is the index of the tag data + b"\x11\x01\x04\x00\x02\x00\x00\x00\x12\x00\x00\x00" + # end of tags marker + b"\x00\x00\x00\x00" + # tag data == (149, 482) == (123 + 26, 456 + 26) + # 26 is the number of bytes before this data + b"\x95\x00\x00\x00\xe2\x01\x00\x00" + ) + + def test_no_duplicate_50741_tag() -> None: assert TAG_IDS["MakerNoteSafety"] == 50741 assert TAG_IDS["BestQualityScale"] == 50780 diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 14e6ea278..d4c46a797 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -991,9 +991,11 @@ class ImageFileDirectory_v2(_IFDv2Base): if stripoffsets is not None: tag, typ, count, value, data = entries[stripoffsets] if data: - msg = "multistrip support not yet implemented" - raise NotImplementedError(msg) - value = self._pack("L", self._unpack("L", value)[0] + offset) + size, handler = self._load_dispatch[typ] + values = [val + offset for val in handler(self, data, self.legacy_api)] + data = self._write_dispatch[typ](self, *values) + else: + value = self._pack("L", self._unpack("L", value)[0] + offset) entries[stripoffsets] = tag, typ, count, value, data # pass 2: write entries to file From 1392eab89b9c7e6bbc1fa5a1d3af2434bcb04e5d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 19 Sep 2024 09:21:23 +1000 Subject: [PATCH 418/662] Updated Ghostscript to 10.4.0 --- .appveyor.yml | 4 ++-- .github/workflows/test-windows.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index f490561cd..de5e52742 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -34,8 +34,8 @@ install: - xcopy /S /Y c:\test-images-main\* c:\pillow\tests\images - curl -fsSL -o nasm-win64.zip https://raw.githubusercontent.com/python-pillow/pillow-depends/main/nasm-2.16.03-win64.zip - 7z x nasm-win64.zip -oc:\ -- choco install ghostscript --version=10.3.1 -- path c:\nasm-2.16.03;C:\Program Files\gs\gs10.03.1\bin;%PATH% +- choco install ghostscript --version=10.4.0 +- path c:\nasm-2.16.03;C:\Program Files\gs\gs10.04.0\bin;%PATH% - cd c:\pillow\winbuild\ - ps: | c:\python39\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\ diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index f58e8dae3..13147d86b 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -86,8 +86,8 @@ jobs: choco install nasm --no-progress echo "C:\Program Files\NASM" >> $env:GITHUB_PATH - choco install ghostscript --version=10.3.1 --no-progress - echo "C:\Program Files\gs\gs10.03.1\bin" >> $env:GITHUB_PATH + choco install ghostscript --version=10.4.0 --no-progress + echo "C:\Program Files\gs\gs10.04.0\bin" >> $env:GITHUB_PATH # Install extra test images xcopy /S /Y Tests\test-images\* Tests\images From 0f47ecd4325268156c27fa86799d31829f31fcea Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 19 Sep 2024 15:07:06 +1000 Subject: [PATCH 419/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index f23ec609f..4ab9eaf2b 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,18 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Use transposed size after opening for TIFF images #8390 + [radarhere, homm] + +- Improve ImageFont error messages #8338 + [yngvem, radarhere, hugovk] + +- Mention MAX_TEXT_CHUNK limit in PNG error message #8391 + [radarhere] + +- Cast Dib handle to int #8385 + [radarhere] + - Accept float stroke widths #8369 [radarhere] From 46f2fa17be9768ec2647988b0446dd848b833a5b Mon Sep 17 00:00:00 2001 From: PavlNekrasov <95914807+PavlNekrasov@users.noreply.github.com> Date: Thu, 19 Sep 2024 22:53:45 +0300 Subject: [PATCH 420/662] fix dereference before checking for NULL in the `ImagingTransformAffine` function The `imIn` pointer is checked for `NULL`, but it seems to be dereferenced before this check. You must first make sure that the pointer is not `NULL` before using it. --- src/libImaging/Geometry.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libImaging/Geometry.c b/src/libImaging/Geometry.c index 2bfeed7b6..264c7d169 100644 --- a/src/libImaging/Geometry.c +++ b/src/libImaging/Geometry.c @@ -1035,6 +1035,10 @@ ImagingTransformAffine( double xx, yy; double xo, yo; + if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { + return (Imaging)ImagingError_ModeError(); + } + if (filterid || imIn->type == IMAGING_TYPE_SPECIAL) { return ImagingGenericTransform( imOut, imIn, x0, y0, x1, y1, affine_transform, a, filterid, fill @@ -1046,10 +1050,6 @@ ImagingTransformAffine( return ImagingScaleAffine(imOut, imIn, x0, y0, x1, y1, a, fill); } - if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { - return (Imaging)ImagingError_ModeError(); - } - if (x0 < 0) { x0 = 0; } From 9424b1a8920201b52086c0b06b5148db33255668 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 19:59:08 +0000 Subject: [PATCH 421/662] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/libImaging/Geometry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libImaging/Geometry.c b/src/libImaging/Geometry.c index 264c7d169..84aa442f0 100644 --- a/src/libImaging/Geometry.c +++ b/src/libImaging/Geometry.c @@ -1037,7 +1037,7 @@ ImagingTransformAffine( if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { return (Imaging)ImagingError_ModeError(); - } + } if (filterid || imIn->type == IMAGING_TYPE_SPECIAL) { return ImagingGenericTransform( From 693a68b2bb7fdf01bbafb7070320c16ec57ca78d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 20 Sep 2024 18:46:47 +1000 Subject: [PATCH 422/662] Updated link to OSS Fuzz issues --- README.md | 2 +- docs/index.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b4c6d2987..5bbebaccb 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ As of 2019, Pillow development is Code coverage - Fuzzing Status diff --git a/docs/index.rst b/docs/index.rst index 3a12953f0..18f5c3d13 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -54,7 +54,7 @@ Pillow for enterprise is available via the Tidelift Subscription. `Learn more Date: Fri, 20 Sep 2024 19:20:53 +1000 Subject: [PATCH 423/662] Check image value before use --- src/libImaging/Geometry.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libImaging/Geometry.c b/src/libImaging/Geometry.c index 84aa442f0..1e2abd7e7 100644 --- a/src/libImaging/Geometry.c +++ b/src/libImaging/Geometry.c @@ -791,15 +791,15 @@ ImagingGenericTransform( char *out; double xx, yy; + if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { + return (Imaging)ImagingError_ModeError(); + } + ImagingTransformFilter filter = getfilter(imIn, filterid); if (!filter) { return (Imaging)ImagingError_ValueError("bad filter number"); } - if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0) { - return (Imaging)ImagingError_ModeError(); - } - ImagingCopyPalette(imOut, imIn); ImagingSectionEnter(&cookie); From 8b6fa92cc885cbd1d7b0beb60aaad9ab47298cbf Mon Sep 17 00:00:00 2001 From: Yay295 Date: Fri, 20 Sep 2024 08:39:11 -0500 Subject: [PATCH 424/662] rewrite some comments Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- Tests/test_file_tiff_metadata.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Tests/test_file_tiff_metadata.py b/Tests/test_file_tiff_metadata.py index 00fe745cf..36aabf4f8 100644 --- a/Tests/test_file_tiff_metadata.py +++ b/Tests/test_file_tiff_metadata.py @@ -191,14 +191,15 @@ def test_save_multiple_stripoffsets() -> None: # number of tags == 1 b"\x01\x00" # tag id (2 bytes), type (2 bytes), count (4 bytes), value (4 bytes) - # == 273, 4, 2, 18 - # == TiffImagePlugin.STRIPOFFSETS, TiffTags.LONG, 2, 18 - # the value is the index of the tag data + # TiffImagePlugin.STRIPOFFSETS, TiffTags.LONG, 2, 18 + # where STRIPOFFSETS is 273, LONG is 4 + # and 18 is the offset of the tag data b"\x11\x01\x04\x00\x02\x00\x00\x00\x12\x00\x00\x00" - # end of tags marker + # end of entries b"\x00\x00\x00\x00" - # tag data == (149, 482) == (123 + 26, 456 + 26) - # 26 is the number of bytes before this data + # 26 is the total number of bytes output, + # the offset for any auxiliary strip data that will then be appended + # (123 + 26, 456 + 26) == (149, 482) b"\x95\x00\x00\x00\xe2\x01\x00\x00" ) From 83c7043471df575e446c44a4d384df56cd76538b Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 21 Sep 2024 15:54:27 +1000 Subject: [PATCH 425/662] Rename variable, since alpha channel is not dropped --- src/_webp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/_webp.c b/src/_webp.c index 92d5c20fe..dfda7048d 100644 --- a/src/_webp.c +++ b/src/_webp.c @@ -89,8 +89,6 @@ HandleMuxError(WebPMuxError err, char *chunk) { static int import_frame_libwebp(WebPPicture *frame, Imaging im) { - int drop_alpha = strcmp(im->mode, "RGBA"); - if (strcmp(im->mode, "RGBA") && strcmp(im->mode, "RGB") && strcmp(im->mode, "RGBX")) { PyErr_SetString(PyExc_ValueError, "unsupported image mode"); @@ -106,10 +104,11 @@ import_frame_libwebp(WebPPicture *frame, Imaging im) { return -2; } + int ignore_fourth_channel = strcmp(im->mode, "RGBA"); for (int y = 0; y < im->ysize; ++y) { UINT8 *src = (UINT8 *)im->image32[y]; UINT32 *dst = frame->argb + frame->argb_stride * y; - if (drop_alpha) { + if (ignore_fourth_channel) { for (int x = 0; x < im->xsize; ++x) { dst[x] = ((UINT32)(src[x * 4 + 2]) | ((UINT32)(src[x * 4 + 1]) << 8) | From 75cb1c1b87ae4be028f3e15141c14c28dd0d04a0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 21 Sep 2024 16:02:23 +1000 Subject: [PATCH 426/662] Test unsupported image mode --- Tests/test_file_webp.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index e7c887279..79f6bb4e0 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -127,6 +127,11 @@ class TestFileWebp: reloaded.seek(1) assert_image_similar(im2, reloaded, 1) + def test_unsupported_image_mode(self) -> None: + im = Image.new("1", (1, 1)) + with pytest.raises(ValueError): + _webp.WebPEncode(im.getim(), False, 0, 0, "", 4, 0, b"", "") + def test_icc_profile(self, tmp_path: Path) -> None: self._roundtrip(tmp_path, self.rgb_mode, 12.5, {"icc_profile": None}) self._roundtrip( From aa22b241690e0c0084523bc7e4ea137d3596ee93 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 21 Sep 2024 16:22:50 +1000 Subject: [PATCH 427/662] Load before trying to catch exceptions --- Tests/test_imagemorph.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Tests/test_imagemorph.py b/Tests/test_imagemorph.py index 9da32aa01..6180a7b5d 100644 --- a/Tests/test_imagemorph.py +++ b/Tests/test_imagemorph.py @@ -324,17 +324,17 @@ def test_set_lut() -> None: def test_wrong_mode() -> None: lut = ImageMorph.LutBuilder(op_name="corner").build_lut() - imrgb = Image.new("RGB", (10, 10)) - iml = Image.new("L", (10, 10)) + imrgb_ptr = Image.new("RGB", (10, 10)).getim() + iml_ptr = Image.new("L", (10, 10)).getim() with pytest.raises(RuntimeError): - _imagingmorph.apply(bytes(lut), imrgb.getim(), iml.getim()) + _imagingmorph.apply(bytes(lut), imrgb_ptr, iml_ptr) with pytest.raises(RuntimeError): - _imagingmorph.apply(bytes(lut), iml.getim(), imrgb.getim()) + _imagingmorph.apply(bytes(lut), iml_ptr, imrgb_ptr) with pytest.raises(RuntimeError): - _imagingmorph.match(bytes(lut), imrgb.getim()) + _imagingmorph.match(bytes(lut), imrgb_ptr) # Should not raise - _imagingmorph.match(bytes(lut), iml.getim()) + _imagingmorph.match(bytes(lut), iml_ptr) From 5d430eab25a7695cdba79ddf250c40e1e10832da Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 21 Sep 2024 16:24:54 +1000 Subject: [PATCH 428/662] Added release notes --- docs/releasenotes/11.0.0.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index 36334e39f..3194f1a52 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -73,6 +73,16 @@ vulnerability introduced in FreeType 2.6 (:cve:`2020-15999`). .. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ +Get Internal Pointers to Objects +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 11.0.0 + +``Image.core.ImagingCore.id`` and ``Image.core.ImagingCore.unsafe_ptrs`` have been +deprecated and will be removed in Pillow 12 (2025-10-15). They were used for obtaining +raw pointers to ``ImagingCore`` internals. To interact with C code, you can use +``Image.Image.getim()``, which returns a ``Capsule`` object. + ICNS (width, height, scale) sizes ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ From 9f409e823b0914b18b0a5447e93bb5f40c0e0c4c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 21 Sep 2024 16:44:39 +1000 Subject: [PATCH 429/662] Use getim() --- src/PIL/ImageTk.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index c36cf9b84..72fa798eb 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -176,15 +176,14 @@ class PhotoImage: the bitmap image. """ # convert to blittable - im.load() + ptr = im.getim() image = im.im - if image.isblock() and im.mode == self.__mode: - block = image - else: + if not image.isblock() or im.mode != self.__mode: block = Image.core.new_block(self.__mode, im.size) image.convert2(block, image) # convert directly between buffers + ptr = block.ptr - _pyimagingtkcall("PyImagingPhoto", self.__photo, block.ptr) + _pyimagingtkcall("PyImagingPhoto", self.__photo, ptr) # -------------------------------------------------------------------- From 11bcd5aaa9c35d7f8557b0f5abf899b0adf0cecf Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Sun, 22 Sep 2024 13:39:22 +0400 Subject: [PATCH 430/662] Fix hasattr for ImageTk.PhotoImage.__del__ --- src/PIL/ImageTk.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index 72fa798eb..c817ab09c 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -131,9 +131,10 @@ class PhotoImage: self.paste(image) def __del__(self) -> None: - if not hasattr(self, "__photo"): + try: + name = self.__photo.name + except AttributeError: return - name = self.__photo.name self.__photo.name = None try: self.__photo.tk.call("image", "delete", name) From 8fa5ba844361536135d3d6cb67e3a3f4a1a651f4 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Thu, 19 Sep 2024 11:05:52 -0500 Subject: [PATCH 431/662] add common windows ci test script --- .appveyor.yml | 5 ++--- .ci/test.cmd | 3 +++ .github/workflows/test-windows.yml | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 .ci/test.cmd diff --git a/.appveyor.yml b/.appveyor.yml index f490561cd..7d45e11ee 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -53,9 +53,8 @@ test_script: - cd c:\pillow - '%PYTHON%\%EXECUTABLE% -m pip install pytest pytest-cov pytest-timeout defusedxml ipython numpy olefile pyroma' - c:\"Program Files (x86)"\"Windows Kits"\10\Debuggers\x86\gflags.exe /p /enable %PYTHON%\%EXECUTABLE% -- '%PYTHON%\%EXECUTABLE% -c "from PIL import Image"' -- '%PYTHON%\%EXECUTABLE% -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests' -#- '%PYTHON%\%EXECUTABLE% test-installed.py -v -s %TEST_OPTIONS%' TODO TEST_OPTIONS with pytest? +- path %PYTHON%;%PATH% +- .ci\test.cmd after_test: - curl -Os https://uploader.codecov.io/latest/windows/codecov.exe diff --git a/.ci/test.cmd b/.ci/test.cmd new file mode 100644 index 000000000..aafc9290c --- /dev/null +++ b/.ci/test.cmd @@ -0,0 +1,3 @@ +python.exe -c "from PIL import Image" +IF ERRORLEVEL 1 EXIT /B +python.exe -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index f58e8dae3..e36dc05fd 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -190,8 +190,8 @@ jobs: - name: Test Pillow run: | - path %GITHUB_WORKSPACE%\\winbuild\\build\\bin;%PATH% - python.exe -m pytest -vx -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests + path %GITHUB_WORKSPACE%\winbuild\build\bin;%PATH% + .ci\test.cmd shell: cmd - name: Prepare to upload errors From be3192ecd41581761a78913950ec3fb4be4dd981 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Thu, 19 Sep 2024 12:08:34 -0500 Subject: [PATCH 432/662] use .ci/test.sh in test-mingw.yml --- .ci/test.sh | 2 +- .github/workflows/test-mingw.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.ci/test.sh b/.ci/test.sh index 8ff7c5f64..3f0ddc350 100755 --- a/.ci/test.sh +++ b/.ci/test.sh @@ -4,4 +4,4 @@ set -e python3 -c "from PIL import Image" -python3 -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term Tests $REVERSE +python3 -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests $REVERSE diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml index e5e1ec32e..c7a73439c 100644 --- a/.github/workflows/test-mingw.yml +++ b/.github/workflows/test-mingw.yml @@ -80,8 +80,7 @@ jobs: - name: Test Pillow run: | python3 selftest.py --installed - python3 -c "from PIL import Image" - python3 -m pytest -vx --cov PIL --cov Tests --cov-report term --cov-report xml Tests + .ci/test.sh - name: Upload coverage uses: codecov/codecov-action@v4 From 6081640aa5b68a177ed54cfd03e4ae6a748e8be8 Mon Sep 17 00:00:00 2001 From: Nulano Date: Sun, 22 Sep 2024 22:46:35 +0200 Subject: [PATCH 433/662] winbuild: Build freetype.vcxproj to fix passing in custom parameters. --- winbuild/build_prepare.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index e2022d283..d350e2575 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -292,8 +292,12 @@ DEPS: dict[str, dict[str, Any]] = { }, "build": [ cmd_rmdir("objs"), - cmd_msbuild("MSBuild.sln", "Release Static", "Clean"), - cmd_msbuild("MSBuild.sln", "Release Static", "Build"), + cmd_msbuild( + r"builds\windows\vc2010\freetype.vcxproj", "Release Static", "Clean" + ), + cmd_msbuild( + r"builds\windows\vc2010\freetype.vcxproj", "Release Static", "Build" + ), cmd_xcopy("include", "{inc_dir}"), ], "libs": [r"objs\{msbuild_arch}\Release Static\freetype.lib"], From 8adf15a6ee1bab667a0e7b76d19ea0f26b29ce85 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 23 Sep 2024 09:29:16 +1000 Subject: [PATCH 434/662] Updated raqm to 0.10.2 --- depends/install_raqm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/install_raqm.sh b/depends/install_raqm.sh index 070ba23a1..5d862403e 100755 --- a/depends/install_raqm.sh +++ b/depends/install_raqm.sh @@ -2,7 +2,7 @@ # install raqm -archive=libraqm-0.10.1 +archive=libraqm-0.10.2 ./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz From 9fe014876ab3dbc2a765ae1175659cc0d7bc7e42 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 22 Sep 2024 22:42:39 +1000 Subject: [PATCH 435/662] Shared libraries may be located within usr/lib64 --- depends/install_imagequant.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/depends/install_imagequant.sh b/depends/install_imagequant.sh index 867b31e4d..060d9840e 100755 --- a/depends/install_imagequant.sh +++ b/depends/install_imagequant.sh @@ -23,7 +23,12 @@ else cargo cinstall --prefix=/usr --destdir=. # Copy into place - sudo cp usr/lib/libimagequant.so* /usr/lib/ + if [ -d "usr/lib64" ]; then + lib="lib64" + else + lib="lib" + fi + sudo cp usr/$lib/libimagequant.so* /usr/lib/ sudo cp usr/include/libimagequant.h /usr/include/ if [ -n "$GITHUB_ACTIONS" ]; then From 3f8b496431c3eb2f0cedad35669e725fd3be45e0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 24 Sep 2024 09:54:26 +1000 Subject: [PATCH 436/662] Updated harfbuzz to 10.0.0 --- .github/workflows/wheels-dependencies.sh | 2 +- winbuild/build_prepare.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 4d40f7fab..92e9ad5af 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -17,7 +17,7 @@ ARCHIVE_SDIR=pillow-depends-main # Package versions for fresh source builds FREETYPE_VERSION=2.13.2 if [[ "$MB_ML_VER" != 2014 ]]; then - HARFBUZZ_VERSION=9.0.0 + HARFBUZZ_VERSION=10.0.0 else HARFBUZZ_VERSION=8.5.0 fi diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index d350e2575..db592d23c 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -112,7 +112,7 @@ V = { "BROTLI": "1.1.0", "FREETYPE": "2.13.3", "FRIBIDI": "1.0.15", - "HARFBUZZ": "9.0.0", + "HARFBUZZ": "10.0.0", "JPEGTURBO": "3.0.4", "LCMS2": "2.16", "LIBPNG": "1.6.44", From 61c83a882cc0a1b78f2e8f1e3ce38616f95c6f3e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 25 Sep 2024 00:00:22 +1000 Subject: [PATCH 437/662] Updated macOS version to 10.15 for PyPy x86-64 --- .github/workflows/wheels.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 11564c142..d3c2ac44c 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -105,13 +105,18 @@ jobs: - name: "macOS 10.10 x86_64" os: macos-13 cibw_arch: x86_64 - build: "pp310* cp3{9,10,11}*" + build: "cp3{9,10,11}*" macosx_deployment_target: "10.10" - name: "macOS 10.13 x86_64" os: macos-13 cibw_arch: x86_64 build: "cp3{12,13}*" macosx_deployment_target: "10.13" + - name: "macOS 10.15 x86_64" + os: macos-13 + cibw_arch: x86_64 + build: "pp310*" + macosx_deployment_target: "10.15" - name: "macOS arm64" os: macos-latest cibw_arch: arm64 From 72144ec5300d92bfffd029ccfb52e4d087a0bd95 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 25 Sep 2024 08:33:18 +1000 Subject: [PATCH 438/662] Updated harfbuzz to 10.0.1 --- .github/workflows/wheels-dependencies.sh | 2 +- winbuild/build_prepare.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 92e9ad5af..b5fbdc421 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -17,7 +17,7 @@ ARCHIVE_SDIR=pillow-depends-main # Package versions for fresh source builds FREETYPE_VERSION=2.13.2 if [[ "$MB_ML_VER" != 2014 ]]; then - HARFBUZZ_VERSION=10.0.0 + HARFBUZZ_VERSION=10.0.1 else HARFBUZZ_VERSION=8.5.0 fi diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index db592d23c..84ad6417e 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -112,7 +112,7 @@ V = { "BROTLI": "1.1.0", "FREETYPE": "2.13.3", "FRIBIDI": "1.0.15", - "HARFBUZZ": "10.0.0", + "HARFBUZZ": "10.0.1", "JPEGTURBO": "3.0.4", "LCMS2": "2.16", "LIBPNG": "1.6.44", From 0a99d63028ebcc92d950cd63cd805eb558a5131c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 20 Sep 2024 22:31:00 +1000 Subject: [PATCH 439/662] Use field size in AppendingTiffWriter --- src/PIL/TiffImagePlugin.py | 69 ++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index d4c46a797..0fe55e426 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -2121,13 +2121,24 @@ class AppendingTiffWriter(io.BytesIO): def write(self, data: Buffer, /) -> int: return self.f.write(data) - def readShort(self) -> int: - (value,) = struct.unpack(self.shortFmt, self.f.read(2)) + def _fmt(self, field_size: int) -> str: + try: + return {2: "H", 4: "L"}[field_size] + except KeyError: + msg = "offset is not supported" + raise RuntimeError(msg) + + def _read(self, field_size: int) -> int: + (value,) = struct.unpack( + self.endian + self._fmt(field_size), self.f.read(field_size) + ) return value + def readShort(self) -> int: + return self._read(2) + def readLong(self) -> int: - (value,) = struct.unpack(self.longFmt, self.f.read(4)) - return value + return self._read(4) @staticmethod def _verify_bytes_written(bytes_written: int | None, expected: int) -> None: @@ -2140,15 +2151,18 @@ class AppendingTiffWriter(io.BytesIO): bytes_written = self.f.write(struct.pack(self.longFmt, value)) self._verify_bytes_written(bytes_written, 4) + def _rewriteLast(self, value: int, field_size: int) -> None: + self.f.seek(-field_size, os.SEEK_CUR) + bytes_written = self.f.write( + struct.pack(self.endian + self._fmt(field_size), value) + ) + self._verify_bytes_written(bytes_written, field_size) + def rewriteLastShort(self, value: int) -> None: - self.f.seek(-2, os.SEEK_CUR) - bytes_written = self.f.write(struct.pack(self.shortFmt, value)) - self._verify_bytes_written(bytes_written, 2) + return self._rewriteLast(value, 2) def rewriteLastLong(self, value: int) -> None: - self.f.seek(-4, os.SEEK_CUR) - bytes_written = self.f.write(struct.pack(self.longFmt, value)) - self._verify_bytes_written(bytes_written, 4) + return self._rewriteLast(value, 4) def writeShort(self, value: int) -> None: bytes_written = self.f.write(struct.pack(self.shortFmt, value)) @@ -2180,32 +2194,22 @@ class AppendingTiffWriter(io.BytesIO): cur_pos = self.f.tell() if is_local: - self.fixOffsets( - count, isShort=(field_size == 2), isLong=(field_size == 4) - ) + self._fixOffsets(count, field_size) self.f.seek(cur_pos + 4) else: self.f.seek(offset) - self.fixOffsets( - count, isShort=(field_size == 2), isLong=(field_size == 4) - ) + self._fixOffsets(count, field_size) self.f.seek(cur_pos) elif is_local: # skip the locally stored value that is not an offset self.f.seek(4, os.SEEK_CUR) - def fixOffsets( - self, count: int, isShort: bool = False, isLong: bool = False - ) -> None: - if not isShort and not isLong: - msg = "offset is neither short nor long" - raise RuntimeError(msg) - + def _fixOffsets(self, count: int, field_size: int) -> None: for i in range(count): - offset = self.readShort() if isShort else self.readLong() + offset = self._read(field_size) offset += self.offsetOfNewPage - if isShort and offset >= 65536: + if field_size == 2 and offset >= 65536: # offset is now too large - we must convert shorts to longs if count != 1: msg = "not implemented" @@ -2217,10 +2221,19 @@ class AppendingTiffWriter(io.BytesIO): self.f.seek(-10, os.SEEK_CUR) self.writeShort(TiffTags.LONG) # rewrite the type to LONG self.f.seek(8, os.SEEK_CUR) - elif isShort: - self.rewriteLastShort(offset) else: - self.rewriteLastLong(offset) + self._rewriteLast(offset, field_size) + + def fixOffsets( + self, count: int, isShort: bool = False, isLong: bool = False + ) -> None: + if isShort: + field_size = 2 + elif isLong: + field_size = 4 + else: + field_size = 0 + return self._fixOffsets(count, field_size) def _save_all(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: From 24e9961c4f68bdc676a5e7a2dde02460f8bd62c1 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 25 Sep 2024 18:45:16 +1000 Subject: [PATCH 440/662] Support writing LONG8 offsets --- Tests/test_file_tiff.py | 4 ---- src/PIL/TiffImagePlugin.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 44da25295..6d76ccca6 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -108,10 +108,6 @@ class TestFileTiff: assert_image_equal_tofile(im, "Tests/images/hopper.tif") with Image.open("Tests/images/hopper_bigtiff.tif") as im: - # The data type of this file's StripOffsets tag is LONG8, - # which is not yet supported for offset data when saving multiple frames. - del im.tag_v2[273] - outfile = str(tmp_path / "temp.tif") im.save(outfile, save_all=True, append_images=[im], tiffinfo=im.tag_v2) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 0fe55e426..a655bb741 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -2123,7 +2123,7 @@ class AppendingTiffWriter(io.BytesIO): def _fmt(self, field_size: int) -> str: try: - return {2: "H", 4: "L"}[field_size] + return {2: "H", 4: "L", 8: "Q"}[field_size] except KeyError: msg = "offset is not supported" raise RuntimeError(msg) From 5d16eb73eb658daceb7b0af9f8d29cca96888a48 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 25 Sep 2024 19:07:32 +1000 Subject: [PATCH 441/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 4ab9eaf2b..ae7370a79 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,15 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Fixed writing multiple StripOffsets to TIFF #8317 + [Yay295, radarhere] + +- Shared imagequant libraries may be located within usr/lib64 #8407 + [radarhere] + +- Fix dereference before checking for NULL in ImagingTransformAffine #8398 + [PavlNekrasov] + - Use transposed size after opening for TIFF images #8390 [radarhere, homm] From 7cf351cfc50dcbda82270c80e44e32643688a7a9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 25 Sep 2024 20:37:41 +1000 Subject: [PATCH 442/662] Added additional test --- Tests/test_file_tiff.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index 6d76ccca6..af766022b 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -728,6 +728,20 @@ class TestFileTiff: with Image.open(mp) as reread: assert reread.n_frames == 3 + def test_fixoffsets(self) -> None: + b = BytesIO(b"II\x2a\x00\x00\x00\x00\x00") + with TiffImagePlugin.AppendingTiffWriter(b) as a: + b.seek(0) + a.fixOffsets(1, isShort=True) + + b.seek(0) + a.fixOffsets(1, isLong=True) + + # Neither short nor long + b.seek(0) + with pytest.raises(RuntimeError): + a.fixOffsets(1) + def test_saving_icc_profile(self, tmp_path: Path) -> None: # Tests saving TIFF with icc_profile set. # At the time of writing this will only work for non-compressed tiffs From d8e3572caad2f3dce65db6951909f161a4021687 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 26 Sep 2024 08:52:29 +1000 Subject: [PATCH 443/662] Updated fribidi to 1.0.16 --- winbuild/build_prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 84ad6417e..026d9d306 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -111,7 +111,7 @@ ARCHITECTURES = { V = { "BROTLI": "1.1.0", "FREETYPE": "2.13.3", - "FRIBIDI": "1.0.15", + "FRIBIDI": "1.0.16", "HARFBUZZ": "10.0.1", "JPEGTURBO": "3.0.4", "LCMS2": "2.16", From b9d176856135b581bd503e04ab2407318cbe7689 Mon Sep 17 00:00:00 2001 From: Alexander Karpinsky Date: Thu, 26 Sep 2024 16:27:55 +0400 Subject: [PATCH 444/662] Catch AttributeError for BitmapImage.__photo Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- src/PIL/ImageTk.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/PIL/ImageTk.py b/src/PIL/ImageTk.py index c817ab09c..bf29fdba5 100644 --- a/src/PIL/ImageTk.py +++ b/src/PIL/ImageTk.py @@ -219,9 +219,10 @@ class BitmapImage: self.__photo = tkinter.BitmapImage(data=image.tobitmap(), **kw) def __del__(self) -> None: - if not hasattr(self, "__photo"): + try: + name = self.__photo.name + except AttributeError: return - name = self.__photo.name self.__photo.name = None try: self.__photo.tk.call("image", "delete", name) From 4ca2b92503ed0250d7e48bf4c187c4fd1dbbdc54 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 27 Sep 2024 14:59:27 +1000 Subject: [PATCH 445/662] Use $IS_ALPINE instead of $MB_ML_LIBC --- .github/workflows/wheels-dependencies.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index b5fbdc421..5175a2a92 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -156,12 +156,10 @@ if [[ -n "$IS_MACOS" ]]; then fi brew install meson pkg-config -elif [[ "$MB_ML_LIBC" == "manylinux" ]]; then - if [[ "$HARFBUZZ_VERSION" != 8.5.0 ]]; then - yum install -y meson - fi -else +elif [[ -n "$IS_ALPINE" ]]; then apk add meson +elif [[ "$HARFBUZZ_VERSION" != 8.5.0 ]]; then + yum install -y meson fi wrap_wheel_builder build From 71da6d8952c174fa0a465fa6caf98989d6eff9c9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 27 Sep 2024 16:37:10 +1000 Subject: [PATCH 446/662] Downgrade harfbuzz on OSS Fuzz --- .github/workflows/wheels-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 5175a2a92..4289afdf3 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -16,7 +16,7 @@ ARCHIVE_SDIR=pillow-depends-main # Package versions for fresh source builds FREETYPE_VERSION=2.13.2 -if [[ "$MB_ML_VER" != 2014 ]]; then +if [[ "$MB_ML_VER" != 2014 ]] && [[ -z "$SANITIZER" ]]; then HARFBUZZ_VERSION=10.0.1 else HARFBUZZ_VERSION=8.5.0 From fb8db83122a2f942958fc93103ad7b043cca3a3b Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 27 Sep 2024 17:35:06 +1000 Subject: [PATCH 447/662] Updated harfbuzz to 10.0.1 on macOS --- .github/workflows/wheels-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 4289afdf3..bb0f8a307 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -16,7 +16,7 @@ ARCHIVE_SDIR=pillow-depends-main # Package versions for fresh source builds FREETYPE_VERSION=2.13.2 -if [[ "$MB_ML_VER" != 2014 ]] && [[ -z "$SANITIZER" ]]; then +if [[ -n "$IS_MACOS" ]] || ([[ "$MB_ML_VER" != 2014 ]] && [[ -z "$SANITIZER" ]]); then HARFBUZZ_VERSION=10.0.1 else HARFBUZZ_VERSION=8.5.0 From 485a062010d0942f88686dbf7ece6a765d329e53 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 27 Sep 2024 23:13:03 +1000 Subject: [PATCH 448/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index ae7370a79..6ff35ea4f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Use Capsule for WebP saving #8386 + [homm, radarhere] + - Fixed writing multiple StripOffsets to TIFF #8317 [Yay295, radarhere] From bda62c1ac52f6a843263d2e195025d204a094f78 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 27 Sep 2024 22:11:03 +1000 Subject: [PATCH 449/662] Revert "Temporarily disable cifuzz" This reverts commit 31469407166026ec6d74d2df07196ef2d4e32ab4. --- .github/workflows/cifuzz.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index 033ff98ce..eb73fc6a7 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -24,8 +24,6 @@ concurrency: jobs: Fuzzing: - # Disabled until google/oss-fuzz#11419 upgrades Python to 3.9+ - if: false runs-on: ubuntu-latest steps: - name: Build Fuzzers From 04a00d273c6fe72f8a2f4099950831deb8ad5407 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 28 Sep 2024 14:27:40 +1000 Subject: [PATCH 450/662] Support all resampling filters when resizing I;16* images --- Tests/test_image_resize.py | 16 ++++++-- src/_imaging.c | 10 ++--- src/libImaging/Resample.c | 84 +++++++++++++++++++++++++++++++++++++- 3 files changed, 99 insertions(+), 11 deletions(-) diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py index d9ddf5009..1cd9c3800 100644 --- a/Tests/test_image_resize.py +++ b/Tests/test_image_resize.py @@ -44,9 +44,19 @@ class TestImagingCoreResize: self.resize(hopper("1"), (15, 12), Image.Resampling.BILINEAR) with pytest.raises(ValueError): self.resize(hopper("P"), (15, 12), Image.Resampling.BILINEAR) - with pytest.raises(ValueError): - self.resize(hopper("I;16"), (15, 12), Image.Resampling.BILINEAR) - for mode in ["L", "I", "F", "RGB", "RGBA", "CMYK", "YCbCr"]: + for mode in [ + "L", + "I", + "I;16", + "I;16L", + "I;16B", + "I;16N", + "F", + "RGB", + "RGBA", + "CMYK", + "YCbCr", + ]: im = hopper(mode) r = self.resize(im, (15, 12), Image.Resampling.BILINEAR) assert r.mode == mode diff --git a/src/_imaging.c b/src/_imaging.c index 07d9a64cc..426036335 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -1579,16 +1579,12 @@ _putdata(ImagingObject *self, PyObject *args) { int bigendian = 0; if (image->type == IMAGING_TYPE_SPECIAL) { // I;16* - if (strcmp(image->mode, "I;16N") == 0) { + if (strcmp(image->mode, "I;16B") == 0 #ifdef WORDS_BIGENDIAN - bigendian = 1; -#else - bigendian = 0; + || strcmp(image->mode, "I;16N") == 0 #endif - } else if (strcmp(image->mode, "I;16B") == 0) { + ) { bigendian = 1; - } else { - bigendian = 0; } } for (i = x = y = 0; i < n; i++) { diff --git a/src/libImaging/Resample.c b/src/libImaging/Resample.c index 222d6bca4..f5e386dc2 100644 --- a/src/libImaging/Resample.c +++ b/src/libImaging/Resample.c @@ -460,6 +460,83 @@ ImagingResampleVertical_8bpc( ImagingSectionLeave(&cookie); } +void +ImagingResampleHorizontal_16bpc( + Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk +) { + ImagingSectionCookie cookie; + double ss; + int xx, yy, x, xmin, xmax, ss_int; + double *k; + + int bigendian = 0; + if (strcmp(imIn->mode, "I;16N") == 0 +#ifdef WORDS_BIGENDIAN + || strcmp(imIn->mode, "I;16B") == 0 +#endif + ) { + bigendian = 1; + } + + ImagingSectionEnter(&cookie); + for (yy = 0; yy < imOut->ysize; yy++) { + for (xx = 0; xx < imOut->xsize; xx++) { + xmin = bounds[xx * 2 + 0]; + xmax = bounds[xx * 2 + 1]; + k = &kk[xx * ksize]; + ss = 0.0; + for (x = 0; x < xmax; x++) { + ss += (imIn->image8[yy + offset][(x + xmin) * 2 + (bigendian ? 1 : 0)] + + (imIn->image8[yy + offset][(x + xmin) * 2 + (bigendian ? 0 : 1)] + << 8)) * + k[x]; + } + ss_int = ROUND_UP(ss); + imOut->image8[yy][xx * 2 + (bigendian ? 1 : 0)] = CLIP8(ss_int % 256); + imOut->image8[yy][xx * 2 + (bigendian ? 0 : 1)] = CLIP8(ss_int >> 8); + } + } + ImagingSectionLeave(&cookie); +} + +void +ImagingResampleVertical_16bpc( + Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk +) { + ImagingSectionCookie cookie; + double ss; + int xx, yy, y, ymin, ymax, ss_int; + double *k; + + int bigendian = 0; + if (strcmp(imIn->mode, "I;16N") == 0 +#ifdef WORDS_BIGENDIAN + || strcmp(imIn->mode, "I;16B") == 0 +#endif + ) { + bigendian = 1; + } + + ImagingSectionEnter(&cookie); + for (yy = 0; yy < imOut->ysize; yy++) { + ymin = bounds[yy * 2 + 0]; + ymax = bounds[yy * 2 + 1]; + k = &kk[yy * ksize]; + for (xx = 0; xx < imOut->xsize; xx++) { + ss = 0.0; + for (y = 0; y < ymax; y++) { + ss += (imIn->image8[y + ymin][xx * 2 + (bigendian ? 1 : 0)] + + (imIn->image8[y + ymin][xx * 2 + (bigendian ? 0 : 1)] << 8)) * + k[y]; + } + ss_int = ROUND_UP(ss); + imOut->image8[yy][xx * 2 + (bigendian ? 1 : 0)] = CLIP8(ss_int % 256); + imOut->image8[yy][xx * 2 + (bigendian ? 0 : 1)] = CLIP8(ss_int >> 8); + } + } + ImagingSectionLeave(&cookie); +} + void ImagingResampleHorizontal_32bpc( Imaging imOut, Imaging imIn, int offset, int ksize, int *bounds, double *kk @@ -574,7 +651,12 @@ ImagingResample(Imaging imIn, int xsize, int ysize, int filter, float box[4]) { } if (imIn->type == IMAGING_TYPE_SPECIAL) { - return (Imaging)ImagingError_ModeError(); + if (strncmp(imIn->mode, "I;16", 4) == 0) { + ResampleHorizontal = ImagingResampleHorizontal_16bpc; + ResampleVertical = ImagingResampleVertical_16bpc; + } else { + return (Imaging)ImagingError_ModeError(); + } } else if (imIn->image8) { ResampleHorizontal = ImagingResampleHorizontal_8bpc; ResampleVertical = ImagingResampleVertical_8bpc; From e306546bf18b01c9bfa68ea397f2f5d5690113e0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 28 Sep 2024 15:10:16 +1000 Subject: [PATCH 451/662] Use ruff check --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 94f7565d8..ec4159627 100644 --- a/Makefile +++ b/Makefile @@ -117,7 +117,7 @@ lint-fix: python3 -c "import black" > /dev/null 2>&1 || python3 -m pip install black python3 -m black . python3 -c "import ruff" > /dev/null 2>&1 || python3 -m pip install ruff - python3 -m ruff --fix . + python3 -m ruff check --fix . .PHONY: mypy mypy: From 2e73ffe7034457461b13da71b05645999dd3c0ef Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 28 Sep 2024 15:29:09 +1000 Subject: [PATCH 452/662] Exclude multibuild from black and ruff --- pyproject.toml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 228c344e8..0d0a6f170 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -97,9 +97,13 @@ config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable" test-command = "cd {project} && .github/workflows/wheels-test.sh" test-extras = "tests" -[tool.ruff] -fix = true +[tool.black] +exclude = "wheels/multibuild" +[tool.ruff] +exclude = [ "wheels/multibuild" ] + +fix = true lint.select = [ "C4", # flake8-comprehensions "E", # pycodestyle errors From d33270ab51f6b62710b227394f2dadf913370d96 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 28 Sep 2024 15:35:42 +1000 Subject: [PATCH 453/662] Set default resize sampling for I;16* images to BICUBIC --- Tests/test_image_resize.py | 8 ++++---- docs/releasenotes/11.0.0.rst | 7 ++++--- src/PIL/Image.py | 8 ++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py index 1cd9c3800..8548fb5da 100644 --- a/Tests/test_image_resize.py +++ b/Tests/test_image_resize.py @@ -315,14 +315,14 @@ class TestImageResize: im = im.resize((64, 64)) assert im.size == (64, 64) - @pytest.mark.parametrize("mode", ("L", "RGB", "I", "F")) + @pytest.mark.parametrize( + "mode", ("L", "RGB", "I", "I;16", "I;16L", "I;16B", "I;16N", "F") + ) def test_default_filter_bicubic(self, mode: str) -> None: im = hopper(mode) assert im.resize((20, 20), Image.Resampling.BICUBIC) == im.resize((20, 20)) - @pytest.mark.parametrize( - "mode", ("1", "P", "I;16", "I;16L", "I;16B", "BGR;15", "BGR;16") - ) + @pytest.mark.parametrize("mode", ("1", "P", "BGR;15", "BGR;16")) def test_default_filter_nearest(self, mode: str) -> None: im = hopper(mode) assert im.resize((20, 20), Image.Resampling.NEAREST) == im.resize((20, 20)) diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index 36334e39f..1218c5014 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -119,10 +119,11 @@ Specific WebP Feature Checks API Changes =========== -TODO -^^^^ +Default resampling filter for I;16* image modes +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -TODO +The default resampling filter for I;16, I;16L, I;16B and I;16N has been changed from +``Image.NEAREST`` to ``Image.BICUBIC``, to match the majority of modes. API Additions ============= diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 3f94cef38..bf9079f8b 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -2278,8 +2278,8 @@ class Image: :py:data:`Resampling.BILINEAR`, :py:data:`Resampling.HAMMING`, :py:data:`Resampling.BICUBIC` or :py:data:`Resampling.LANCZOS`. If the image has mode "1" or "P", it is always set to - :py:data:`Resampling.NEAREST`. If the image mode specifies a number - of bits, such as "I;16", then the default filter is + :py:data:`Resampling.NEAREST`. If the image mode is "BGR;15", + "BGR;16" or "BGR;24", then the default filter is :py:data:`Resampling.NEAREST`. Otherwise, the default filter is :py:data:`Resampling.BICUBIC`. See: :ref:`concept-filters`. :param box: An optional 4-tuple of floats providing @@ -2302,8 +2302,8 @@ class Image: """ if resample is None: - type_special = ";" in self.mode - resample = Resampling.NEAREST if type_special else Resampling.BICUBIC + bgr = self.mode.startswith("BGR;") + resample = Resampling.NEAREST if bgr else Resampling.BICUBIC elif resample not in ( Resampling.NEAREST, Resampling.BILINEAR, From 30fca7a1d62a8b41f3536adb35355f5aa81c6a2f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 28 Sep 2024 18:38:45 +1000 Subject: [PATCH 454/662] Install meson through pip --- .github/workflows/wheels-dependencies.sh | 36 ++++++++---------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index bb0f8a307..b3996d5a1 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -16,11 +16,7 @@ ARCHIVE_SDIR=pillow-depends-main # Package versions for fresh source builds FREETYPE_VERSION=2.13.2 -if [[ -n "$IS_MACOS" ]] || ([[ "$MB_ML_VER" != 2014 ]] && [[ -z "$SANITIZER" ]]); then - HARFBUZZ_VERSION=10.0.1 -else - HARFBUZZ_VERSION=8.5.0 -fi +HARFBUZZ_VERSION=10.0.1 LIBPNG_VERSION=1.6.44 JPEGTURBO_VERSION=3.0.4 OPENJPEG_VERSION=2.5.2 @@ -65,21 +61,15 @@ function build_brotli { } function build_harfbuzz { - if [[ "$HARFBUZZ_VERSION" == 8.5.0 ]]; then - export FREETYPE_LIBS=-lfreetype - export FREETYPE_CFLAGS=-I/usr/local/include/freetype2/ - build_simple harfbuzz $HARFBUZZ_VERSION https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION tar.xz --with-freetype=yes --with-glib=no - export FREETYPE_LIBS="" - export FREETYPE_CFLAGS="" - else - local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz) - (cd $out_dir \ - && meson setup build --buildtype=release -Dfreetype=enabled -Dglib=disabled) - (cd $out_dir/build \ - && meson install) - if [[ "$MB_ML_LIBC" == "manylinux" ]]; then - cp /usr/local/lib64/libharfbuzz* /usr/local/lib - fi + python3 -m pip install meson ninja + + local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz) + (cd $out_dir \ + && meson setup build --buildtype=release -Dfreetype=enabled -Dglib=disabled) + (cd $out_dir/build \ + && meson install) + if [[ "$MB_ML_LIBC" == "manylinux" ]]; then + cp /usr/local/lib64/libharfbuzz* /usr/local/lib fi } @@ -155,11 +145,7 @@ if [[ -n "$IS_MACOS" ]]; then brew remove --ignore-dependencies webp fi - brew install meson pkg-config -elif [[ -n "$IS_ALPINE" ]]; then - apk add meson -elif [[ "$HARFBUZZ_VERSION" != 8.5.0 ]]; then - yum install -y meson + brew install pkg-config fi wrap_wheel_builder build From e976096c2eda0a41c49e0f06e6f84f6b3d0c99b0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 28 Sep 2024 20:39:04 +1000 Subject: [PATCH 455/662] Allow libimagequant shared library path to change --- depends/install_imagequant.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/depends/install_imagequant.sh b/depends/install_imagequant.sh index 060d9840e..8d62d5ac7 100755 --- a/depends/install_imagequant.sh +++ b/depends/install_imagequant.sh @@ -23,19 +23,14 @@ else cargo cinstall --prefix=/usr --destdir=. # Copy into place - if [ -d "usr/lib64" ]; then - lib="lib64" - else - lib="lib" - fi - sudo cp usr/$lib/libimagequant.so* /usr/lib/ + sudo find usr -name libimagequant.so* -exec cp {} /usr/lib/ \; sudo cp usr/include/libimagequant.h /usr/include/ if [ -n "$GITHUB_ACTIONS" ]; then # Copy to cache rm -rf ~/cache-$archive_name mkdir ~/cache-$archive_name - cp usr/lib/libimagequant.so* ~/cache-$archive_name/ + find usr -name libimagequant.so* -exec cp {} ~/cache-$archive_name/ \; cp usr/include/libimagequant.h ~/cache-$archive_name/ fi From ed143f5fec816c7164ff2d8a76deef6a8abfaf77 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 29 Sep 2024 06:40:50 +1000 Subject: [PATCH 456/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 6ff35ea4f..b4644c541 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,15 +5,15 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Improved copying imagequant libraries #8420 + [radarhere] + - Use Capsule for WebP saving #8386 [homm, radarhere] - Fixed writing multiple StripOffsets to TIFF #8317 [Yay295, radarhere] -- Shared imagequant libraries may be located within usr/lib64 #8407 - [radarhere] - - Fix dereference before checking for NULL in ImagingTransformAffine #8398 [PavlNekrasov] From 3a734b5d4b2ee9d602e4d7d3e89530498bac5e68 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Sep 2024 05:19:39 +0000 Subject: [PATCH 457/662] Update scientific-python/upload-nightly-action action to v0.6.0 --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index d3c2ac44c..ee0c33166 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -278,7 +278,7 @@ jobs: path: dist merge-multiple: true - name: Upload wheels to scientific-python-nightly-wheels - uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0 + uses: scientific-python/upload-nightly-action@ccf29c805b5d0c1dc31fa97fcdb962be074cade3 # 0.6.0 with: artifacts_path: dist anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} From 21ab53e0c0f81427c45e4b4205d5d6d07008ee81 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 30 Sep 2024 12:38:13 +1000 Subject: [PATCH 458/662] Updated test environment documentation --- docs/installation/platform-support.rst | 2 +- winbuild/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index f2ef9cacb..9216248a0 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -48,7 +48,7 @@ These platforms are built and tested for every change. | Ubuntu Linux 24.04 LTS (Noble) | 3.12 | x86-64, ppc64le, | | | | s390x | +----------------------------------+----------------------------+---------------------+ -| Windows Server 2016 | 3.9 | x86-64 | +| Windows Server 2019 | 3.9 | x86-64 | +----------------------------------+----------------------------+---------------------+ | Windows Server 2022 | 3.9, 3.10, 3.11, | x86-64 | | | 3.12, 3.13, PyPy3 | | diff --git a/winbuild/README.md b/winbuild/README.md index c8048bcc9..f6111c79b 100644 --- a/winbuild/README.md +++ b/winbuild/README.md @@ -11,7 +11,7 @@ For more extensive info, see the [Windows build instructions](build.rst). * Requires Microsoft Visual Studio 2017 or newer with C++ component. * Requires NASM for libjpeg-turbo, a required dependency when using this script. * Requires CMake 3.15 or newer (available as Visual Studio component). -* Tested on Windows Server 2016 with Visual Studio 2017 Community, and Windows Server 2019 with Visual Studio 2022 Community (AppVeyor). +* Tested on Windows Server 2019 with Visual Studio 2019 Community and Visual Studio 2022 Community (AppVeyor). * Tested on Windows Server 2022 with Visual Studio 2022 Enterprise (GitHub Actions). The following is a simplified version of the script used on AppVeyor: From 7a62c788edb77e6c0c11f31a180018411d3955f6 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 30 Sep 2024 12:42:39 +1000 Subject: [PATCH 459/662] Updated tested Python versions --- docs/installation/platform-support.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index 9216248a0..4cd3f2814 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -17,13 +17,13 @@ These platforms are built and tested for every change. +----------------------------------+----------------------------+---------------------+ | Operating system | Tested Python versions | Tested architecture | +==================================+============================+=====================+ -| Alpine | 3.9 | x86-64 | +| Alpine | 3.12 | x86-64 | +----------------------------------+----------------------------+---------------------+ | Amazon Linux 2 | 3.9 | x86-64 | +----------------------------------+----------------------------+---------------------+ | Amazon Linux 2023 | 3.9 | x86-64 | +----------------------------------+----------------------------+---------------------+ -| Arch | 3.9 | x86-64 | +| Arch | 3.12 | x86-64 | +----------------------------------+----------------------------+---------------------+ | CentOS Stream 9 | 3.9 | x86-64 | +----------------------------------+----------------------------+---------------------+ @@ -33,7 +33,7 @@ These platforms are built and tested for every change. +----------------------------------+----------------------------+---------------------+ | Fedora 40 | 3.12 | x86-64 | +----------------------------------+----------------------------+---------------------+ -| Gentoo | 3.9 | x86-64 | +| Gentoo | 3.12 | x86-64 | +----------------------------------+----------------------------+---------------------+ | macOS 13 Ventura | 3.9 | x86-64 | +----------------------------------+----------------------------+---------------------+ From b94c5c5e3474f915e817d77cd984f62f8fd4399b Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 30 Sep 2024 19:32:21 +1000 Subject: [PATCH 460/662] Updated macOS tested Pillow versions --- docs/installation/platform-support.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index f2ef9cacb..28f749867 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -75,6 +75,8 @@ These platforms have been reported to work at the versions mentioned. | Operating system | | Tested Python | | Latest tested | | Tested | | | | versions | | Pillow version | | processors | +==================================+============================+==================+==============+ +| macOS 15 Sequoia | 3.8, 3.9, 3.10, 3.11, 3.12 | 10.4.0 |arm | ++----------------------------------+----------------------------+------------------+--------------+ | macOS 14 Sonoma | 3.8, 3.9, 3.10, 3.11, 3.12 | 10.4.0 |arm | +----------------------------------+----------------------------+------------------+--------------+ | macOS 13 Ventura | 3.8, 3.9, 3.10, 3.11 | 10.0.1 |arm | From cc0b6b9de94e7c632efb0a10cf985dd7aab74e2a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 24 Sep 2024 07:56:45 +1000 Subject: [PATCH 461/662] Cast int before potentially exceeding INT_MAX --- src/libImaging/SgiRleDecode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libImaging/SgiRleDecode.c b/src/libImaging/SgiRleDecode.c index a8db11740..a4ee2e10d 100644 --- a/src/libImaging/SgiRleDecode.c +++ b/src/libImaging/SgiRleDecode.c @@ -183,7 +183,7 @@ ImagingSgiRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t each with 4 bytes per element of tablen Check here before we allocate any memory */ - if (c->bufsize < 8 * c->tablen) { + if (c->bufsize < 8 * (int64_t)c->tablen) { state->errcode = IMAGING_CODEC_OVERRUN; return -1; } From fc65e437cfc6ccc381792ca1f35c6afb44c66ec3 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 23 Sep 2024 23:25:42 +1000 Subject: [PATCH 462/662] Prevent division by zero --- src/libImaging/FliDecode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libImaging/FliDecode.c b/src/libImaging/FliDecode.c index 6b2518d35..130ecb7f7 100644 --- a/src/libImaging/FliDecode.c +++ b/src/libImaging/FliDecode.c @@ -224,7 +224,7 @@ ImagingFliDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt break; case 16: /* COPY chunk */ - if (INT32_MAX / state->xsize < state->ysize) { + if (INT32_MAX < (uint64_t)state->xsize * state->ysize) { /* Integer overflow, bail */ state->errcode = IMAGING_CODEC_OVERRUN; return -1; From 851449edfc1746a3ad63260db825ab3a2b23d331 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 24 Sep 2024 19:14:26 +1000 Subject: [PATCH 463/662] Free memory on early return --- src/libImaging/SgiRleDecode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libImaging/SgiRleDecode.c b/src/libImaging/SgiRleDecode.c index a8db11740..c285637dd 100644 --- a/src/libImaging/SgiRleDecode.c +++ b/src/libImaging/SgiRleDecode.c @@ -195,6 +195,7 @@ ImagingSgiRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t } _imaging_seek_pyFd(state->fd, SGI_HEADER_SIZE, SEEK_SET); if (_imaging_read_pyFd(state->fd, (char *)ptr, c->bufsize) != c->bufsize) { + free(ptr); state->errcode = IMAGING_CODEC_UNKNOWN; return -1; } From a99361a38f4c0830205ccbe5d58f1f0ba6c7312c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 13 Sep 2024 23:21:35 +1000 Subject: [PATCH 464/662] Raise an error if path is compacted during mapping --- Tests/test_imagepath.py | 11 +++++++++++ src/path.c | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/Tests/test_imagepath.py b/Tests/test_imagepath.py index cda2584e7..76bdf1e5f 100644 --- a/Tests/test_imagepath.py +++ b/Tests/test_imagepath.py @@ -204,6 +204,17 @@ def test_overflow_segfault() -> None: x[i] = b"0" * 16 +def test_compact_within_map() -> None: + p = ImagePath.Path([0, 1]) + + def map_func(x: float, y: float) -> tuple[float, float]: + p.compact() + return 0, 0 + + with pytest.raises(ValueError): + p.map(map_func) + + class Evil: def __init__(self) -> None: self.corrupt = Image.core.path(0x4000000000000000) diff --git a/src/path.c b/src/path.c index f4f4287f3..067f42f62 100644 --- a/src/path.c +++ b/src/path.c @@ -44,6 +44,7 @@ PyImaging_GetBuffer(PyObject *buffer, Py_buffer *view); typedef struct { PyObject_HEAD Py_ssize_t count; double *xy; + int mapping; } PyPathObject; static PyTypeObject PyPathType; @@ -91,6 +92,7 @@ path_new(Py_ssize_t count, double *xy, int duplicate) { path->count = count; path->xy = xy; + path->mapping = 0; return path; } @@ -276,6 +278,10 @@ path_compact(PyPathObject *self, PyObject *args) { double cityblock = 2.0; + if (self->mapping) { + PyErr_SetString(PyExc_ValueError, "Path compacted during mapping"); + return NULL; + } if (!PyArg_ParseTuple(args, "|d:compact", &cityblock)) { return NULL; } @@ -393,11 +399,13 @@ path_map(PyPathObject *self, PyObject *args) { xy = self->xy; /* apply function to coordinate set */ + self->mapping = 1; for (i = 0; i < self->count; i++) { double x = xy[i + i]; double y = xy[i + i + 1]; PyObject *item = PyObject_CallFunction(function, "dd", x, y); if (!item || !PyArg_ParseTuple(item, "dd", &x, &y)) { + self->mapping = 0; Py_XDECREF(item); return NULL; } @@ -405,6 +413,7 @@ path_map(PyPathObject *self, PyObject *args) { xy[i + i + 1] = y; Py_DECREF(item); } + self->mapping = 0; Py_INCREF(Py_None); return Py_None; From c6b08ef32c39dc6517e9140c92dde7e10999da5e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 30 Sep 2024 22:13:24 +1000 Subject: [PATCH 465/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index b4644c541..08c2f26bc 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Check image value before use #8400 + [radarhere] + - Improved copying imagequant libraries #8420 [radarhere] From 6fe4375f28015f0c1a7c3cb6fbc9ea3c4f405679 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Sat, 3 Aug 2024 11:13:38 -0500 Subject: [PATCH 466/662] move eps test images to their own folder Co-authored-by: Andrew Murray --- Tests/images/{ => eps}/1.eps | Bin Tests/images/{ => eps}/binary_preview_map.eps | Bin Tests/images/{ => eps}/create_eps.gnuplot | 0 Tests/images/{ => eps}/illu10_no_preview.eps | Bin Tests/images/{ => eps}/illu10_preview.eps | Bin Tests/images/{ => eps}/illuCS6_no_preview.eps | Bin Tests/images/{ => eps}/illuCS6_preview.eps | Bin Tests/images/{ => eps}/non_zero_bb.eps | Bin Tests/images/{ => eps}/non_zero_bb.png | Bin Tests/images/{ => eps}/non_zero_bb_scale2.png | Bin Tests/images/{ => eps}/pil_sample_cmyk.eps | Bin Tests/images/{ => eps}/reqd_showpage.eps | Bin Tests/images/{ => eps}/reqd_showpage.png | Bin .../{ => eps}/reqd_showpage_transparency.png | Bin ...75703545fee17acab56e5fec644c19979175de.eps | Bin Tests/images/{ => eps}/zero_bb.eps | Bin Tests/images/{ => eps}/zero_bb.png | Bin Tests/images/{ => eps}/zero_bb_emptyline.eps | Bin .../zero_bb_eof_before_boundingbox.eps | Bin Tests/images/{ => eps}/zero_bb_scale2.png | Bin Tests/images/{ => eps}/zero_bb_trailer.eps | Bin Tests/test_file_eps.py | 48 +++++++++--------- Tests/test_pickle.py | 8 +-- 23 files changed, 29 insertions(+), 27 deletions(-) rename Tests/images/{ => eps}/1.eps (100%) rename Tests/images/{ => eps}/binary_preview_map.eps (100%) rename Tests/images/{ => eps}/create_eps.gnuplot (100%) rename Tests/images/{ => eps}/illu10_no_preview.eps (100%) rename Tests/images/{ => eps}/illu10_preview.eps (100%) rename Tests/images/{ => eps}/illuCS6_no_preview.eps (100%) rename Tests/images/{ => eps}/illuCS6_preview.eps (100%) rename Tests/images/{ => eps}/non_zero_bb.eps (100%) rename Tests/images/{ => eps}/non_zero_bb.png (100%) rename Tests/images/{ => eps}/non_zero_bb_scale2.png (100%) rename Tests/images/{ => eps}/pil_sample_cmyk.eps (100%) rename Tests/images/{ => eps}/reqd_showpage.eps (100%) rename Tests/images/{ => eps}/reqd_showpage.png (100%) rename Tests/images/{ => eps}/reqd_showpage_transparency.png (100%) rename Tests/images/{ => eps}/timeout-d675703545fee17acab56e5fec644c19979175de.eps (100%) rename Tests/images/{ => eps}/zero_bb.eps (100%) rename Tests/images/{ => eps}/zero_bb.png (100%) rename Tests/images/{ => eps}/zero_bb_emptyline.eps (100%) rename Tests/images/{ => eps}/zero_bb_eof_before_boundingbox.eps (100%) rename Tests/images/{ => eps}/zero_bb_scale2.png (100%) rename Tests/images/{ => eps}/zero_bb_trailer.eps (100%) diff --git a/Tests/images/1.eps b/Tests/images/eps/1.eps similarity index 100% rename from Tests/images/1.eps rename to Tests/images/eps/1.eps diff --git a/Tests/images/binary_preview_map.eps b/Tests/images/eps/binary_preview_map.eps similarity index 100% rename from Tests/images/binary_preview_map.eps rename to Tests/images/eps/binary_preview_map.eps diff --git a/Tests/images/create_eps.gnuplot b/Tests/images/eps/create_eps.gnuplot similarity index 100% rename from Tests/images/create_eps.gnuplot rename to Tests/images/eps/create_eps.gnuplot diff --git a/Tests/images/illu10_no_preview.eps b/Tests/images/eps/illu10_no_preview.eps similarity index 100% rename from Tests/images/illu10_no_preview.eps rename to Tests/images/eps/illu10_no_preview.eps diff --git a/Tests/images/illu10_preview.eps b/Tests/images/eps/illu10_preview.eps similarity index 100% rename from Tests/images/illu10_preview.eps rename to Tests/images/eps/illu10_preview.eps diff --git a/Tests/images/illuCS6_no_preview.eps b/Tests/images/eps/illuCS6_no_preview.eps similarity index 100% rename from Tests/images/illuCS6_no_preview.eps rename to Tests/images/eps/illuCS6_no_preview.eps diff --git a/Tests/images/illuCS6_preview.eps b/Tests/images/eps/illuCS6_preview.eps similarity index 100% rename from Tests/images/illuCS6_preview.eps rename to Tests/images/eps/illuCS6_preview.eps diff --git a/Tests/images/non_zero_bb.eps b/Tests/images/eps/non_zero_bb.eps similarity index 100% rename from Tests/images/non_zero_bb.eps rename to Tests/images/eps/non_zero_bb.eps diff --git a/Tests/images/non_zero_bb.png b/Tests/images/eps/non_zero_bb.png similarity index 100% rename from Tests/images/non_zero_bb.png rename to Tests/images/eps/non_zero_bb.png diff --git a/Tests/images/non_zero_bb_scale2.png b/Tests/images/eps/non_zero_bb_scale2.png similarity index 100% rename from Tests/images/non_zero_bb_scale2.png rename to Tests/images/eps/non_zero_bb_scale2.png diff --git a/Tests/images/pil_sample_cmyk.eps b/Tests/images/eps/pil_sample_cmyk.eps similarity index 100% rename from Tests/images/pil_sample_cmyk.eps rename to Tests/images/eps/pil_sample_cmyk.eps diff --git a/Tests/images/reqd_showpage.eps b/Tests/images/eps/reqd_showpage.eps similarity index 100% rename from Tests/images/reqd_showpage.eps rename to Tests/images/eps/reqd_showpage.eps diff --git a/Tests/images/reqd_showpage.png b/Tests/images/eps/reqd_showpage.png similarity index 100% rename from Tests/images/reqd_showpage.png rename to Tests/images/eps/reqd_showpage.png diff --git a/Tests/images/reqd_showpage_transparency.png b/Tests/images/eps/reqd_showpage_transparency.png similarity index 100% rename from Tests/images/reqd_showpage_transparency.png rename to Tests/images/eps/reqd_showpage_transparency.png diff --git a/Tests/images/timeout-d675703545fee17acab56e5fec644c19979175de.eps b/Tests/images/eps/timeout-d675703545fee17acab56e5fec644c19979175de.eps similarity index 100% rename from Tests/images/timeout-d675703545fee17acab56e5fec644c19979175de.eps rename to Tests/images/eps/timeout-d675703545fee17acab56e5fec644c19979175de.eps diff --git a/Tests/images/zero_bb.eps b/Tests/images/eps/zero_bb.eps similarity index 100% rename from Tests/images/zero_bb.eps rename to Tests/images/eps/zero_bb.eps diff --git a/Tests/images/zero_bb.png b/Tests/images/eps/zero_bb.png similarity index 100% rename from Tests/images/zero_bb.png rename to Tests/images/eps/zero_bb.png diff --git a/Tests/images/zero_bb_emptyline.eps b/Tests/images/eps/zero_bb_emptyline.eps similarity index 100% rename from Tests/images/zero_bb_emptyline.eps rename to Tests/images/eps/zero_bb_emptyline.eps diff --git a/Tests/images/zero_bb_eof_before_boundingbox.eps b/Tests/images/eps/zero_bb_eof_before_boundingbox.eps similarity index 100% rename from Tests/images/zero_bb_eof_before_boundingbox.eps rename to Tests/images/eps/zero_bb_eof_before_boundingbox.eps diff --git a/Tests/images/zero_bb_scale2.png b/Tests/images/eps/zero_bb_scale2.png similarity index 100% rename from Tests/images/zero_bb_scale2.png rename to Tests/images/eps/zero_bb_scale2.png diff --git a/Tests/images/zero_bb_trailer.eps b/Tests/images/eps/zero_bb_trailer.eps similarity index 100% rename from Tests/images/zero_bb_trailer.eps rename to Tests/images/eps/zero_bb_trailer.eps diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py index d54deb515..89471fb5a 100644 --- a/Tests/test_file_eps.py +++ b/Tests/test_file_eps.py @@ -19,18 +19,18 @@ from .helper import ( HAS_GHOSTSCRIPT = EpsImagePlugin.has_ghostscript() # Our two EPS test files (they are identical except for their bounding boxes) -FILE1 = "Tests/images/zero_bb.eps" -FILE2 = "Tests/images/non_zero_bb.eps" +FILE1 = "Tests/images/eps/zero_bb.eps" +FILE2 = "Tests/images/eps/non_zero_bb.eps" # Due to palletization, we'll need to convert these to RGB after load -FILE1_COMPARE = "Tests/images/zero_bb.png" -FILE1_COMPARE_SCALE2 = "Tests/images/zero_bb_scale2.png" +FILE1_COMPARE = "Tests/images/eps/zero_bb.png" +FILE1_COMPARE_SCALE2 = "Tests/images/eps/zero_bb_scale2.png" -FILE2_COMPARE = "Tests/images/non_zero_bb.png" -FILE2_COMPARE_SCALE2 = "Tests/images/non_zero_bb_scale2.png" +FILE2_COMPARE = "Tests/images/eps/non_zero_bb.png" +FILE2_COMPARE_SCALE2 = "Tests/images/eps/non_zero_bb_scale2.png" # EPS test files with binary preview -FILE3 = "Tests/images/binary_preview_map.eps" +FILE3 = "Tests/images/eps/binary_preview_map.eps" # Three unsigned 32bit little-endian values: # 0xC6D3D0C5 magic number @@ -187,7 +187,7 @@ def test_load_long_binary_data(prefix: bytes) -> None: ) @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available") def test_cmyk() -> None: - with Image.open("Tests/images/pil_sample_cmyk.eps") as cmyk_image: + with Image.open("Tests/images/eps/pil_sample_cmyk.eps") as cmyk_image: assert cmyk_image.mode == "CMYK" assert cmyk_image.size == (100, 100) assert cmyk_image.format == "EPS" @@ -204,8 +204,8 @@ def test_cmyk() -> None: @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available") def test_showpage() -> None: # See https://github.com/python-pillow/Pillow/issues/2615 - with Image.open("Tests/images/reqd_showpage.eps") as plot_image: - with Image.open("Tests/images/reqd_showpage.png") as target: + with Image.open("Tests/images/eps/reqd_showpage.eps") as plot_image: + with Image.open("Tests/images/eps/reqd_showpage.png") as target: # should not crash/hang plot_image.load() # fonts could be slightly different @@ -214,11 +214,11 @@ def test_showpage() -> None: @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available") def test_transparency() -> None: - with Image.open("Tests/images/reqd_showpage.eps") as plot_image: + with Image.open("Tests/images/eps/reqd_showpage.eps") as plot_image: plot_image.load(transparency=True) assert plot_image.mode == "RGBA" - with Image.open("Tests/images/reqd_showpage_transparency.png") as target: + with Image.open("Tests/images/eps/reqd_showpage_transparency.png") as target: # fonts could be slightly different assert_image_similar(plot_image, target, 6) @@ -246,7 +246,7 @@ def test_bytesio_object() -> None: def test_1_mode() -> None: - with Image.open("Tests/images/1.eps") as im: + with Image.open("Tests/images/eps/1.eps") as im: assert im.mode == "1" @@ -302,7 +302,9 @@ def test_render_scale2() -> None: @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available") -@pytest.mark.parametrize("filename", (FILE1, FILE2, "Tests/images/illu10_preview.eps")) +@pytest.mark.parametrize( + "filename", (FILE1, FILE2, "Tests/images/eps/illu10_preview.eps") +) def test_resize(filename: str) -> None: with Image.open(filename) as im: new_size = (100, 100) @@ -344,10 +346,10 @@ def test_readline(prefix: bytes, line_ending: bytes) -> None: @pytest.mark.parametrize( "filename", ( - "Tests/images/illu10_no_preview.eps", - "Tests/images/illu10_preview.eps", - "Tests/images/illuCS6_no_preview.eps", - "Tests/images/illuCS6_preview.eps", + "Tests/images/eps/illu10_no_preview.eps", + "Tests/images/eps/illu10_preview.eps", + "Tests/images/eps/illuCS6_no_preview.eps", + "Tests/images/eps/illuCS6_preview.eps", ), ) def test_open_eps(filename: str) -> None: @@ -359,7 +361,7 @@ def test_open_eps(filename: str) -> None: @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available") def test_emptyline() -> None: # Test file includes an empty line in the header data - emptyline_file = "Tests/images/zero_bb_emptyline.eps" + emptyline_file = "Tests/images/eps/zero_bb_emptyline.eps" with Image.open(emptyline_file) as image: image.load() @@ -371,7 +373,7 @@ def test_emptyline() -> None: @pytest.mark.timeout(timeout=5) @pytest.mark.parametrize( "test_file", - ["Tests/images/timeout-d675703545fee17acab56e5fec644c19979175de.eps"], + ["Tests/images/eps/timeout-d675703545fee17acab56e5fec644c19979175de.eps"], ) def test_timeout(test_file: str) -> None: with open(test_file, "rb") as f: @@ -384,7 +386,7 @@ def test_bounding_box_in_trailer() -> None: # Check bounding boxes are parsed in the same way # when specified in the header and the trailer with ( - Image.open("Tests/images/zero_bb_trailer.eps") as trailer_image, + Image.open("Tests/images/eps/zero_bb_trailer.eps") as trailer_image, Image.open(FILE1) as header_image, ): assert trailer_image.size == header_image.size @@ -392,12 +394,12 @@ def test_bounding_box_in_trailer() -> None: def test_eof_before_bounding_box() -> None: with pytest.raises(OSError): - with Image.open("Tests/images/zero_bb_eof_before_boundingbox.eps"): + with Image.open("Tests/images/eps/zero_bb_eof_before_boundingbox.eps"): pass def test_invalid_data_after_eof() -> None: - with open("Tests/images/illuCS6_preview.eps", "rb") as f: + with open("Tests/images/eps/illuCS6_preview.eps", "rb") as f: img_bytes = io.BytesIO(f.read() + b"\r\n%" + (b" " * 255)) with Image.open(img_bytes) as img: diff --git a/Tests/test_pickle.py b/Tests/test_pickle.py index be143e9c6..d250ba369 100644 --- a/Tests/test_pickle.py +++ b/Tests/test_pickle.py @@ -56,10 +56,10 @@ def helper_pickle_string(protocol: int, test_file: str, mode: str | None) -> Non ), ("Tests/images/hopper.tif", None), ("Tests/images/test-card.png", None), - ("Tests/images/zero_bb.png", None), - ("Tests/images/zero_bb_scale2.png", None), - ("Tests/images/non_zero_bb.png", None), - ("Tests/images/non_zero_bb_scale2.png", None), + ("Tests/images/eps/zero_bb.png", None), + ("Tests/images/eps/zero_bb_scale2.png", None), + ("Tests/images/eps/non_zero_bb.png", None), + ("Tests/images/eps/non_zero_bb_scale2.png", None), ("Tests/images/p_trns_single.png", None), ("Tests/images/pil123p.png", None), ("Tests/images/itxt_chunks.png", None), From 283b41afa033c64ce5baf9643356599240ff6367 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Sat, 3 Aug 2024 11:47:34 -0500 Subject: [PATCH 467/662] test 1.eps size and data --- Tests/images/eps/1.bmp | Bin 0 -> 1202 bytes Tests/test_file_eps.py | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 Tests/images/eps/1.bmp diff --git a/Tests/images/eps/1.bmp b/Tests/images/eps/1.bmp new file mode 100644 index 0000000000000000000000000000000000000000..194c85784c51ac3e30ea62381102eeca429fe63e GIT binary patch literal 1202 zcmZ|PZERCj7zgnGIlJA?O3~Y{V_O;Vu5@!VzEn35gb%0fWo&GkZt!8mC3a&%L`cAw z1RcgpH?TFE>7*Jn&33my7z%Mgqr{h_4ieBQ8H?zQi7CbpMh&1W;e#yoIc59k={>jS z_dL(ZxjpBm;m6Nt$hSD%_fYSl9-+?Yqgrq=uf}|_1G%M3g>&J}?a!;hVv|b)`u@Lh zz9g5+AzgDm72)2kpOgz`P;_7dVXhsT9<6leYq;=)k=*&2tGlEmND;rgC2p1%Ze9D* zRH-TmYa(_)9A05`1VXA5z^^6B(}_LI(p%m zVoCNl6^sjC`zujrc9qK8kPfYR;$)yQtB4Fu=`8rwbK`hwmn1tehLNB%J+=N#wH+w7 zMTy?A{~9Z<>etENz$n8bT6*l(I>RP2Lqy82W$O9#Ss3IM7CX&fJ$i{HSBHr3OIWe% zK41G;bD6RWiDZq-SND41zGKQCjk&uj%zrM*i9~}kEWNAh#d|LItgL-sQB={bbM5ua zTW^S{vd+ZkBJxFlKtv@OhHhMCqq!a2UOLJCHul72(i!K6KPQHs%PIr9Bf>{-ub1y;2om(3L|qHsOC@$nWg&jA+QaVd?4R8m z%^Tb4AfE31VECZQOK5V9zIs>oPxRVkhPr_r=6!$s_)~~alEHY&m(Wk$FhhO8yftC| z((=TW-%c`18C-taQuJ?8Vrax73A#K7!w&^MKKGy?1Of`JKlZN2vRbA$`Tu<0-`3Evk+i91Sz` zEkRiIMCf)wlbvC$63naCqw{gKkF9Z9IA+;oX&_W~YFRbqYKe$LIDGFF_{q9*Y@i!; z&fzXX-jYGzkKu%bNaq6(JORy1rFlB&kKw7{Dvj(=^Mlmm=$Fz$g>n|bBNpv4H9bEe z8L|Z4F-2Ij3<_rG5d}w;VX3nK+73sxIiP{!w3R@Y1-%1(l~Jmb None: assert_image_similar(img, image1_scale1_compare, 5) -def test_1_mode() -> None: +@pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available") +def test_1() -> None: with Image.open("Tests/images/eps/1.eps") as im: - assert im.mode == "1" + assert_image_equal_tofile(im, "Tests/images/eps/1.bmp") def test_image_mode_not_supported(tmp_path: Path) -> None: From 3ccecd91cea6625612ef7e05d485058a7783bf07 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Sat, 3 Aug 2024 18:04:05 -0500 Subject: [PATCH 468/662] convert eps using pnmraw instead of ppmraw This lets Ghostscript choose the best device to use (pbmraw, pgmraw, ppmraw) based on the image data. --- Tests/test_file_eps.py | 2 +- src/PIL/EpsImagePlugin.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py index f0f235f81..bca516a78 100644 --- a/Tests/test_file_eps.py +++ b/Tests/test_file_eps.py @@ -178,7 +178,7 @@ def test_load_long_binary_data(prefix: bytes) -> None: data = io.BytesIO(prefix + b"\n".join(simple_eps_file_with_long_binary_data)) with Image.open(data) as img: img.load() - assert img.mode == "RGB" + assert img.mode == "1" assert img.size == (100, 100) assert img.format == "EPS" diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index dd6ae4a77..f6c1ea2a5 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -121,7 +121,13 @@ def Ghostscript( lengthfile -= len(s) f.write(s) - device = "pngalpha" if transparency else "ppmraw" + if transparency: + # "RGBA" + device = "pngalpha" + else: + # "pnmraw" automatically chooses between + # PBM ("1"), PGM ("L"), and PPM ("RGB"). + device = "pnmraw" # Build Ghostscript command command = [ From 00bbd4a5b99447aad9def172a05ab768fe428dd6 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Sun, 4 Aug 2024 00:48:12 -0500 Subject: [PATCH 469/662] use "with Image" instead of closing manually --- src/PIL/EpsImagePlugin.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index f6c1ea2a5..cbf48de18 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -157,8 +157,9 @@ def Ghostscript( startupinfo = subprocess.STARTUPINFO() startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW subprocess.check_call(command, startupinfo=startupinfo) - out_im = Image.open(outfile) - out_im.load() + with Image.open(outfile) as out_im: + out_im.load() + return out_im.im.copy() finally: try: os.unlink(outfile) @@ -167,10 +168,6 @@ def Ghostscript( except OSError: pass - im = out_im.im.copy() - out_im.close() - return im - def _accept(prefix: bytes) -> bool: return prefix[:4] == b"%!PS" or (len(prefix) >= 4 and i32(prefix) == 0xC6D3D0C5) From 6b168a3e2bafe1c957de8e9705ec9a17dd62fd84 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Tue, 6 Aug 2024 21:02:46 -0500 Subject: [PATCH 470/662] add EPS test for image with ImageData and BoundingBox (atend) --- Tests/images/eps/1_atend.eps | Bin 0 -> 45867 bytes Tests/test_file_eps.py | 40 +++++++++++++-------- src/PIL/EpsImagePlugin.py | 65 ++++++++++++++++++++++------------- 3 files changed, 66 insertions(+), 39 deletions(-) create mode 100644 Tests/images/eps/1_atend.eps diff --git a/Tests/images/eps/1_atend.eps b/Tests/images/eps/1_atend.eps new file mode 100644 index 0000000000000000000000000000000000000000..08f8c4681a90908a2ca3d7695d19f150a5787816 GIT binary patch literal 45867 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 None: EpsImagePlugin.EpsImageFile(data) +@pytest.mark.parametrize("prefix", (b"", simple_binary_header)) +def test_simple_eps_file(prefix: bytes) -> None: + data = io.BytesIO(prefix + b"\n".join(simple_eps_file)) + with Image.open(data) as img: + assert img.mode == "RGB" + assert img.size == (100, 100) + assert img.format == "EPS" + + @pytest.mark.parametrize("prefix", (b"", simple_binary_header)) def test_missing_version_comment(prefix: bytes) -> None: data = io.BytesIO(prefix + b"\n".join(simple_eps_file_without_version)) @@ -142,23 +151,19 @@ def test_missing_boundingbox_comment(prefix: bytes) -> None: @pytest.mark.parametrize("prefix", (b"", simple_binary_header)) -def test_invalid_boundingbox_comment(prefix: bytes) -> None: - data = io.BytesIO(prefix + b"\n".join(simple_eps_file_with_invalid_boundingbox)) +@pytest.mark.parametrize( + "file_lines", + ( + simple_eps_file_with_invalid_boundingbox, + simple_eps_file_with_invalid_boundingbox_valid_imagedata, + ), +) +def test_invalid_boundingbox_comment(prefix: bytes, file_lines: list[bytes]) -> None: + data = io.BytesIO(prefix + b"\n".join(file_lines)) with pytest.raises(OSError, match="cannot determine EPS bounding box"): EpsImagePlugin.EpsImageFile(data) -@pytest.mark.parametrize("prefix", (b"", simple_binary_header)) -def test_invalid_boundingbox_comment_valid_imagedata_comment(prefix: bytes) -> None: - data = io.BytesIO( - prefix + b"\n".join(simple_eps_file_with_invalid_boundingbox_valid_imagedata) - ) - with Image.open(data) as img: - assert img.mode == "RGB" - assert img.size == (100, 100) - assert img.format == "EPS" - - @pytest.mark.parametrize("prefix", (b"", simple_binary_header)) def test_ascii_comment_too_long(prefix: bytes) -> None: data = io.BytesIO(prefix + b"\n".join(simple_eps_file_with_long_ascii_comment)) @@ -247,8 +252,13 @@ def test_bytesio_object() -> None: @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available") -def test_1() -> None: - with Image.open("Tests/images/eps/1.eps") as im: +@pytest.mark.parametrize( + # These images have an "ImageData" descriptor. + "filename", + ("Tests/images/eps/1.eps", "Tests/images/eps/1_atend.eps"), +) +def test_1(filename: str) -> None: + with Image.open(filename) as im: assert_image_equal_tofile(im, "Tests/images/eps/1.bmp") diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index cbf48de18..ce8e54908 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -194,6 +194,11 @@ class EpsImageFile(ImageFile.ImageFile): self._mode = "RGB" + # When reading header comments, the first comment is used. + # When reading trailer comments, the last comment is used. + bounding_box: list[int] | None = None + imagedata_size: tuple[int, int] | None = None + byte_arr = bytearray(255) bytes_mv = memoryview(byte_arr) bytes_read = 0 @@ -214,8 +219,8 @@ class EpsImageFile(ImageFile.ImageFile): msg = 'EPS header missing "%%BoundingBox" comment' raise SyntaxError(msg) - def _read_comment(s: str) -> bool: - nonlocal reading_trailer_comments + def read_comment(s: str) -> bool: + nonlocal bounding_box, reading_trailer_comments try: m = split.match(s) except re.error as e: @@ -230,18 +235,12 @@ class EpsImageFile(ImageFile.ImageFile): if k == "BoundingBox": if v == "(atend)": reading_trailer_comments = True - elif not self.tile or (trailer_reached and reading_trailer_comments): + elif not bounding_box or (trailer_reached and reading_trailer_comments): try: # Note: The DSC spec says that BoundingBox # fields should be integers, but some drivers # put floating point values there anyway. - box = [int(float(i)) for i in v.split()] - self._size = box[2] - box[0], box[3] - box[1] - self.tile = [ - ImageFile._Tile( - "eps", (0, 0) + self.size, offset, (length, box) - ) - ] + bounding_box = [int(float(i)) for i in v.split()] except Exception: pass return True @@ -292,7 +291,7 @@ class EpsImageFile(ImageFile.ImageFile): continue s = str(bytes_mv[:bytes_read], "latin-1") - if not _read_comment(s): + if not read_comment(s): m = field.match(s) if m: k = m.group(1) @@ -326,32 +325,50 @@ class EpsImageFile(ImageFile.ImageFile): int(value) for value in image_data_values[:4] ) - if bit_depth == 1: - self._mode = "1" - elif bit_depth == 8: - try: - self._mode = self.mode_map[mode_id] - except ValueError: - break - else: - break + if not imagedata_size: + imagedata_size = columns, rows - self._size = columns, rows - return + if bit_depth == 1: + self._mode = "1" + elif bit_depth == 8: + try: + self._mode = self.mode_map[mode_id] + except ValueError: + pass elif bytes_mv[:5] == b"%%EOF": break elif trailer_reached and reading_trailer_comments: # Load EPS trailer s = str(bytes_mv[:bytes_read], "latin-1") - _read_comment(s) + read_comment(s) elif bytes_mv[:9] == b"%%Trailer": trailer_reached = True bytes_read = 0 - if not self.tile: + # A "BoundingBox" is always required, + # even if an "ImageData" descriptor size exists. + if not bounding_box: msg = "cannot determine EPS bounding box" raise OSError(msg) + # An "ImageData" size takes precedence over the "BoundingBox". + if imagedata_size: + self._size = imagedata_size + else: + self._size = ( + bounding_box[2] - bounding_box[0], + bounding_box[3] - bounding_box[1], + ) + + self.tile = [ + ImageFile._Tile( + codec_name="eps", + extents=(0, 0) + self._size, + offset=offset, + args=(length, bounding_box), + ) + ] + def _find_offset(self, fp: IO[bytes]) -> tuple[int, int]: s = fp.read(4) From 56e4ad0dea6bcfcfa5ce8e0af07a512fd7f5a392 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Mon, 19 Aug 2024 19:24:30 -0500 Subject: [PATCH 471/662] don't name positional arguments --- src/PIL/EpsImagePlugin.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index ce8e54908..44391fcb1 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -361,12 +361,7 @@ class EpsImageFile(ImageFile.ImageFile): ) self.tile = [ - ImageFile._Tile( - codec_name="eps", - extents=(0, 0) + self._size, - offset=offset, - args=(length, bounding_box), - ) + ImageFile._Tile("eps", (0, 0) + self._size, offset, (length, bounding_box)) ] def _find_offset(self, fp: IO[bytes]) -> tuple[int, int]: From f3fe22d2f2345ed0e3eed9dc89a0cd1df728af9e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 3 Sep 2024 23:22:35 +1000 Subject: [PATCH 472/662] Break if the bit depth or mode id are unknown --- src/PIL/EpsImagePlugin.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index 44391fcb1..c7b1f2164 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -320,21 +320,26 @@ class EpsImageFile(ImageFile.ImageFile): # binary/ascii (1: binary, 2: ascii) # data start identifier (the image data follows after a single line # consisting only of this quoted value) + if imagedata_size: + bytes_read = 0 + continue + image_data_values = byte_arr[11:bytes_read].split(None, 7) columns, rows, bit_depth, mode_id = ( int(value) for value in image_data_values[:4] ) - if not imagedata_size: - imagedata_size = columns, rows + if bit_depth == 1: + self._mode = "1" + elif bit_depth == 8: + try: + self._mode = self.mode_map[mode_id] + except ValueError: + break + else: + break - if bit_depth == 1: - self._mode = "1" - elif bit_depth == 8: - try: - self._mode = self.mode_map[mode_id] - except ValueError: - pass + imagedata_size = columns, rows elif bytes_mv[:5] == b"%%EOF": break elif trailer_reached and reading_trailer_comments: From 75286a4e408f363ee8befc36d0ba082fa25fbd32 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Tue, 3 Sep 2024 09:03:37 -0500 Subject: [PATCH 473/662] add some comments --- src/PIL/EpsImagePlugin.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index c7b1f2164..da0bf3153 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -310,6 +310,12 @@ class EpsImageFile(ImageFile.ImageFile): # Check for an "ImageData" descriptor # https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/#50577413_pgfId-1035096 + # If we've already read an "ImageData" descriptor, + # don't read another one. + if imagedata_size: + bytes_read = 0 + continue + # Values: # columns # rows @@ -320,10 +326,6 @@ class EpsImageFile(ImageFile.ImageFile): # binary/ascii (1: binary, 2: ascii) # data start identifier (the image data follows after a single line # consisting only of this quoted value) - if imagedata_size: - bytes_read = 0 - continue - image_data_values = byte_arr[11:bytes_read].split(None, 7) columns, rows, bit_depth, mode_id = ( int(value) for value in image_data_values[:4] @@ -339,6 +341,8 @@ class EpsImageFile(ImageFile.ImageFile): else: break + # Read the columns and rows after checking the bit depth and mode + # in case the bit depth and/or mode are invalid. imagedata_size = columns, rows elif bytes_mv[:5] == b"%%EOF": break From 782f0e8a5a8e61073ea2686e722e0575bbe09b6b Mon Sep 17 00:00:00 2001 From: Yay295 Date: Tue, 10 Sep 2024 08:31:01 -0500 Subject: [PATCH 474/662] change "Read" to "Parse" in comment Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- src/PIL/EpsImagePlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index da0bf3153..1c1b6e0b5 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -341,7 +341,7 @@ class EpsImageFile(ImageFile.ImageFile): else: break - # Read the columns and rows after checking the bit depth and mode + # Parse the columns and rows after checking the bit depth and mode # in case the bit depth and/or mode are invalid. imagedata_size = columns, rows elif bytes_mv[:5] == b"%%EOF": From 4bfc77a1b12198d1f8b688fc2037e26059f80ab3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 20:19:02 +0000 Subject: [PATCH 475/662] Update scientific-python/upload-nightly-action action to v0.6.1 --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index ee0c33166..1f5265bf5 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -278,7 +278,7 @@ jobs: path: dist merge-multiple: true - name: Upload wheels to scientific-python-nightly-wheels - uses: scientific-python/upload-nightly-action@ccf29c805b5d0c1dc31fa97fcdb962be074cade3 # 0.6.0 + uses: scientific-python/upload-nightly-action@82396a2ed4269ba06c6b2988bb4fd568ef3c3d6b # 0.6.1 with: artifacts_path: dist anaconda_nightly_upload_token: ${{ secrets.ANACONDA_ORG_UPLOAD_TOKEN }} From 749bec097ca48bb70f12bf3b5a78cd4d64e91fc9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 1 Oct 2024 07:11:24 +1000 Subject: [PATCH 476/662] Do not convert image unnecessarily --- src/PIL/ImageEnhance.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/PIL/ImageEnhance.py b/src/PIL/ImageEnhance.py index d7e99a968..0e7e6dd8a 100644 --- a/src/PIL/ImageEnhance.py +++ b/src/PIL/ImageEnhance.py @@ -55,7 +55,9 @@ class Color(_Enhance): if "A" in image.getbands(): self.intermediate_mode = "LA" - self.degenerate = image.convert(self.intermediate_mode).convert(image.mode) + if self.intermediate_mode != image.mode: + image = image.convert(self.intermediate_mode).convert(image.mode) + self.degenerate = image class Contrast(_Enhance): @@ -68,11 +70,15 @@ class Contrast(_Enhance): def __init__(self, image: Image.Image) -> None: self.image = image - mean = int(ImageStat.Stat(image.convert("L")).mean[0] + 0.5) - self.degenerate = Image.new("L", image.size, mean).convert(image.mode) + if image.mode != "L": + image = image.convert("L") + mean = int(ImageStat.Stat(image).mean[0] + 0.5) + self.degenerate = Image.new("L", image.size, mean) + if self.degenerate.mode != self.image.mode: + self.degenerate = self.degenerate.convert(self.image.mode) - if "A" in image.getbands(): - self.degenerate.putalpha(image.getchannel("A")) + if "A" in self.image.getbands(): + self.degenerate.putalpha(self.image.getchannel("A")) class Brightness(_Enhance): From 84b167dfd53fe726a61953040ddbfa0e4e3e3359 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 1 Oct 2024 21:11:56 +1000 Subject: [PATCH 477/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 08c2f26bc..36266421a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,15 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Support all resampling filters when resizing I;16* images #8422 + [radarhere] + +- Free memory on early return #8413 + [radarhere] + +- Cast int before potentially exceeding INT_MAX #8402 + [radarhere] + - Check image value before use #8400 [radarhere] From c0d04e8b34f759797e45bccac74f49bddfaa7a41 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Tue, 1 Oct 2024 09:33:33 -0500 Subject: [PATCH 478/662] use .size instead of ._size Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- src/PIL/EpsImagePlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index 1c1b6e0b5..27582f2a8 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -370,7 +370,7 @@ class EpsImageFile(ImageFile.ImageFile): ) self.tile = [ - ImageFile._Tile("eps", (0, 0) + self._size, offset, (length, bounding_box)) + ImageFile._Tile("eps", (0, 0) + self.size, offset, (length, bounding_box)) ] def _find_offset(self, fp: IO[bytes]) -> tuple[int, int]: From f9c69deaae2e029601dddba48268fadf630a18eb Mon Sep 17 00:00:00 2001 From: Yay295 Date: Tue, 1 Oct 2024 09:35:22 -0500 Subject: [PATCH 479/662] simplify setting self._size Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- src/PIL/EpsImagePlugin.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index 27582f2a8..fb1e301c0 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -361,13 +361,10 @@ class EpsImageFile(ImageFile.ImageFile): raise OSError(msg) # An "ImageData" size takes precedence over the "BoundingBox". - if imagedata_size: - self._size = imagedata_size - else: - self._size = ( - bounding_box[2] - bounding_box[0], - bounding_box[3] - bounding_box[1], - ) + self._size = imagedata_size or ( + bounding_box[2] - bounding_box[0], + bounding_box[3] - bounding_box[1], + ) self.tile = [ ImageFile._Tile("eps", (0, 0) + self.size, offset, (length, bounding_box)) From baf2d8160a5c1ec0c1ce1c64ea70ded2e5581495 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 2 Oct 2024 09:48:09 +1000 Subject: [PATCH 480/662] Updated xz to 5.6.3 --- .github/workflows/wheels-dependencies.sh | 2 +- winbuild/build_prepare.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index b3996d5a1..19eb91cbb 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -20,7 +20,7 @@ HARFBUZZ_VERSION=10.0.1 LIBPNG_VERSION=1.6.44 JPEGTURBO_VERSION=3.0.4 OPENJPEG_VERSION=2.5.2 -XZ_VERSION=5.6.2 +XZ_VERSION=5.6.3 TIFF_VERSION=4.6.0 LCMS2_VERSION=2.16 if [[ -n "$IS_MACOS" ]]; then diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 026d9d306..a21fbef91 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -119,7 +119,7 @@ V = { "LIBWEBP": "1.4.0", "OPENJPEG": "2.5.2", "TIFF": "4.6.0", - "XZ": "5.6.2", + "XZ": "5.6.3", "ZLIB": "1.3.1", } V["LIBPNG_DOTLESS"] = V["LIBPNG"].replace(".", "") @@ -185,7 +185,7 @@ DEPS: dict[str, dict[str, Any]] = { cmd_copy(r"src\liblzma\api\lzma\*.h", r"{inc_dir}\lzma"), ], "headers": [r"src\liblzma\api\lzma.h"], - "libs": [r"liblzma.lib"], + "libs": [r"lzma.lib"], }, "libwebp": { "url": f"http://downloads.webmproject.org/releases/webp/libwebp-{V['LIBWEBP']}.tar.gz", @@ -216,8 +216,8 @@ DEPS: dict[str, dict[str, Any]] = { "license": "LICENSE.md", "patch": { r"libtiff\tif_lzma.c": { - # link against liblzma.lib - "#ifdef LZMA_SUPPORT": '#ifdef LZMA_SUPPORT\n#pragma comment(lib, "liblzma.lib")', # noqa: E501 + # link against lzma.lib + "#ifdef LZMA_SUPPORT": '#ifdef LZMA_SUPPORT\n#pragma comment(lib, "lzma.lib")', # noqa: E501 }, r"libtiff\tif_webp.c": { # link against libwebp.lib From 547e7dcc5df0e9bbd05119c9accc9295bfaa0cec Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 2 Oct 2024 19:17:13 +1000 Subject: [PATCH 481/662] Test cifuzz when wheel dependencies change --- .github/workflows/cifuzz.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index eb73fc6a7..0456bbaba 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -6,11 +6,13 @@ on: - "**" paths: - ".github/workflows/cifuzz.yml" + - ".github/workflows/wheels-dependencies.sh" - "**.c" - "**.h" pull_request: paths: - ".github/workflows/cifuzz.yml" + - ".github/workflows/wheels-dependencies.sh" - "**.c" - "**.h" workflow_dispatch: From 33f065eb5e458724cdd76dc6074445b4fad9fd7f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 00:41:31 +0000 Subject: [PATCH 482/662] Update dependency cibuildwheel to v2.21.2 --- .ci/requirements-cibw.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-cibw.txt b/.ci/requirements-cibw.txt index 7dc3a53fe..a1424ecc0 100644 --- a/.ci/requirements-cibw.txt +++ b/.ci/requirements-cibw.txt @@ -1 +1 @@ -cibuildwheel==2.21.1 +cibuildwheel==2.21.2 From 07be6fca17fc31b3df87bc8b577822ed5b1de51c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 4 Oct 2024 23:26:54 +1000 Subject: [PATCH 483/662] Corrected check for BuiltinFilter --- Tests/test_image_filter.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Tests/test_image_filter.py b/Tests/test_image_filter.py index 412ab44c3..5a22738a9 100644 --- a/Tests/test_image_filter.py +++ b/Tests/test_image_filter.py @@ -36,9 +36,14 @@ from .helper import assert_image_equal, hopper ), ) @pytest.mark.parametrize("mode", ("L", "I", "RGB", "CMYK")) -def test_sanity(filter_to_apply: ImageFilter.Filter, mode: str) -> None: +def test_sanity( + filter_to_apply: ImageFilter.Filter | type[ImageFilter.Filter], mode: str +) -> None: im = hopper(mode) - if mode != "I" or isinstance(filter_to_apply, ImageFilter.BuiltinFilter): + if mode != "I" or ( + callable(filter_to_apply) + and issubclass(filter_to_apply, ImageFilter.BuiltinFilter) + ): out = im.filter(filter_to_apply) assert out.mode == im.mode assert out.size == im.size From 418ae7caa28d3ecb88f6cfaf1fb1a27b544794a8 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 5 Oct 2024 01:12:51 +1000 Subject: [PATCH 484/662] Support BuiltinFilter for I;16* images --- Tests/test_image_filter.py | 18 +++++-- src/libImaging/Filter.c | 106 ++++++++++++++++++++++++++++++++----- 2 files changed, 105 insertions(+), 19 deletions(-) diff --git a/Tests/test_image_filter.py b/Tests/test_image_filter.py index 5a22738a9..e566cd055 100644 --- a/Tests/test_image_filter.py +++ b/Tests/test_image_filter.py @@ -35,12 +35,14 @@ from .helper import assert_image_equal, hopper ImageFilter.UnsharpMask(10), ), ) -@pytest.mark.parametrize("mode", ("L", "I", "RGB", "CMYK")) +@pytest.mark.parametrize( + "mode", ("L", "I", "I;16", "I;16L", "I;16B", "I;16N", "RGB", "CMYK") +) def test_sanity( filter_to_apply: ImageFilter.Filter | type[ImageFilter.Filter], mode: str ) -> None: im = hopper(mode) - if mode != "I" or ( + if mode[0] != "I" or ( callable(filter_to_apply) and issubclass(filter_to_apply, ImageFilter.BuiltinFilter) ): @@ -49,7 +51,9 @@ def test_sanity( assert out.size == im.size -@pytest.mark.parametrize("mode", ("L", "I", "RGB", "CMYK")) +@pytest.mark.parametrize( + "mode", ("L", "I", "I;16", "I;16L", "I;16B", "I;16N", "RGB", "CMYK") +) def test_sanity_error(mode: str) -> None: im = hopper(mode) with pytest.raises(TypeError): @@ -150,7 +154,9 @@ def test_kernel_not_enough_coefficients() -> None: ImageFilter.Kernel((3, 3), (0, 0)) -@pytest.mark.parametrize("mode", ("L", "LA", "I", "RGB", "CMYK")) +@pytest.mark.parametrize( + "mode", ("L", "LA", "I", "I;16", "I;16L", "I;16B", "I;16N", "RGB", "CMYK") +) def test_consistency_3x3(mode: str) -> None: with Image.open("Tests/images/hopper.bmp") as source: with Image.open("Tests/images/hopper_emboss.bmp") as reference: @@ -166,7 +172,9 @@ def test_consistency_3x3(mode: str) -> None: assert_image_equal(source.filter(kernel), reference) -@pytest.mark.parametrize("mode", ("L", "LA", "I", "RGB", "CMYK")) +@pytest.mark.parametrize( + "mode", ("L", "LA", "I", "I;16", "I;16L", "I;16B", "I;16N", "RGB", "CMYK") +) def test_consistency_5x5(mode: str) -> None: with Image.open("Tests/images/hopper.bmp") as source: with Image.open("Tests/images/hopper_emboss_more.bmp") as reference: diff --git a/src/libImaging/Filter.c b/src/libImaging/Filter.c index fbd6b425f..7b7b2e429 100644 --- a/src/libImaging/Filter.c +++ b/src/libImaging/Filter.c @@ -26,6 +26,8 @@ #include "Imaging.h" +#define ROUND_UP(f) ((int)((f) >= 0.0 ? (f) + 0.5F : (f) - 0.5F)) + static inline UINT8 clip8(float in) { if (in <= 0.0) { @@ -105,6 +107,22 @@ ImagingExpand(Imaging imIn, int xmargin, int ymargin) { return imOut; } +float +kernel_i16(int size, UINT8 *in0, int x, const float *kernel, int bigendian) { + int i; + float result = 0; + int half_size = (size - 1) / 2; + for (i = 0; i < size; i++) { + int x1 = x + i - half_size; + result += _i2f( + in0[x1 * 2 + (bigendian ? 1 : 0)] + + (in0[x1 * 2 + (bigendian ? 0 : 1)] >> 8) + ) * + kernel[i]; + } + return result; +} + void ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) { #define KERNEL1x3(in0, x, kernel, d) \ @@ -135,6 +153,16 @@ ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) { out[x] = in0[x]; } } else { + int bigendian = 0; + if (im->type == IMAGING_TYPE_SPECIAL) { + if (strcmp(im->mode, "I;16B") == 0 +#ifdef WORDS_BIGENDIAN + || strcmp(im->mode, "I;16N") == 0 +#endif + ) { + bigendian = 1; + } + } for (y = 1; y < im->ysize - 1; y++) { UINT8 *in_1 = (UINT8 *)im->image[y - 1]; UINT8 *in0 = (UINT8 *)im->image[y]; @@ -142,14 +170,31 @@ ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) { UINT8 *out = (UINT8 *)imOut->image[y]; out[0] = in0[0]; + if (im->type == IMAGING_TYPE_SPECIAL) { + out[1] = in0[1]; + } for (x = 1; x < im->xsize - 1; x++) { float ss = offset; - ss += KERNEL1x3(in1, x, &kernel[0], 1); - ss += KERNEL1x3(in0, x, &kernel[3], 1); - ss += KERNEL1x3(in_1, x, &kernel[6], 1); - out[x] = clip8(ss); + if (im->type == IMAGING_TYPE_SPECIAL) { + ss += kernel_i16(3, in1, x, &kernel[0], bigendian); + ss += kernel_i16(3, in0, x, &kernel[3], bigendian); + ss += kernel_i16(3, in_1, x, &kernel[6], bigendian); + int ss_int = ROUND_UP(ss); + out[x * 2 + (bigendian ? 1 : 0)] = clip8(ss_int % 256); + out[x * 2 + (bigendian ? 0 : 1)] = clip8(ss_int >> 8); + } else { + ss += KERNEL1x3(in1, x, &kernel[0], 1); + ss += KERNEL1x3(in0, x, &kernel[3], 1); + ss += KERNEL1x3(in_1, x, &kernel[6], 1); + out[x] = clip8(ss); + } + } + if (im->type == IMAGING_TYPE_SPECIAL) { + out[x * 2] = in0[x * 2]; + out[x * 2 + 1] = in0[x * 2 + 1]; + } else { + out[x] = in0[x]; } - out[x] = in0[x]; } } } else { @@ -261,6 +306,16 @@ ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) { out[x + 1] = in0[x + 1]; } } else { + int bigendian = 0; + if (im->type == IMAGING_TYPE_SPECIAL) { + if (strcmp(im->mode, "I;16B") == 0 +#ifdef WORDS_BIGENDIAN + || strcmp(im->mode, "I;16N") == 0 +#endif + ) { + bigendian = 1; + } + } for (y = 2; y < im->ysize - 2; y++) { UINT8 *in_2 = (UINT8 *)im->image[y - 2]; UINT8 *in_1 = (UINT8 *)im->image[y - 1]; @@ -271,17 +326,39 @@ ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) { out[0] = in0[0]; out[1] = in0[1]; + if (im->type == IMAGING_TYPE_SPECIAL) { + out[2] = in0[2]; + out[3] = in0[3]; + } for (x = 2; x < im->xsize - 2; x++) { float ss = offset; - ss += KERNEL1x5(in2, x, &kernel[0], 1); - ss += KERNEL1x5(in1, x, &kernel[5], 1); - ss += KERNEL1x5(in0, x, &kernel[10], 1); - ss += KERNEL1x5(in_1, x, &kernel[15], 1); - ss += KERNEL1x5(in_2, x, &kernel[20], 1); - out[x] = clip8(ss); + if (im->type == IMAGING_TYPE_SPECIAL) { + ss += kernel_i16(5, in2, x, &kernel[0], bigendian); + ss += kernel_i16(5, in1, x, &kernel[5], bigendian); + ss += kernel_i16(5, in0, x, &kernel[10], bigendian); + ss += kernel_i16(5, in_1, x, &kernel[15], bigendian); + ss += kernel_i16(5, in_2, x, &kernel[20], bigendian); + int ss_int = ROUND_UP(ss); + out[x * 2 + (bigendian ? 1 : 0)] = clip8(ss_int % 256); + out[x * 2 + (bigendian ? 0 : 1)] = clip8(ss_int >> 8); + } else { + ss += KERNEL1x5(in2, x, &kernel[0], 1); + ss += KERNEL1x5(in1, x, &kernel[5], 1); + ss += KERNEL1x5(in0, x, &kernel[10], 1); + ss += KERNEL1x5(in_1, x, &kernel[15], 1); + ss += KERNEL1x5(in_2, x, &kernel[20], 1); + out[x] = clip8(ss); + } + } + if (im->type == IMAGING_TYPE_SPECIAL) { + out[x * 2 + 0] = in0[x * 2 + 0]; + out[x * 2 + 1] = in0[x * 2 + 1]; + out[x * 2 + 2] = in0[x * 2 + 2]; + out[x * 2 + 3] = in0[x * 2 + 3]; + } else { + out[x + 0] = in0[x + 0]; + out[x + 1] = in0[x + 1]; } - out[x + 0] = in0[x + 0]; - out[x + 1] = in0[x + 1]; } } } else { @@ -383,7 +460,8 @@ ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32 *kernel, FLOAT32 o Imaging imOut; ImagingSectionCookie cookie; - if (im->type != IMAGING_TYPE_UINT8 && im->type != IMAGING_TYPE_INT32) { + if (im->type == IMAGING_TYPE_FLOAT32 || + (im->type == IMAGING_TYPE_SPECIAL && im->bands != 1)) { return (Imaging)ImagingError_ModeError(); } From 8e6d518ea89035077fb4a855f61f3b5bab26a9c4 Mon Sep 17 00:00:00 2001 From: Yay295 Date: Sat, 5 Oct 2024 08:05:00 -0500 Subject: [PATCH 485/662] change parameter type from list to tuple Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- Tests/test_file_eps.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py index 94ab5d327..7ae0900fd 100644 --- a/Tests/test_file_eps.py +++ b/Tests/test_file_eps.py @@ -158,7 +158,9 @@ def test_missing_boundingbox_comment(prefix: bytes) -> None: simple_eps_file_with_invalid_boundingbox_valid_imagedata, ), ) -def test_invalid_boundingbox_comment(prefix: bytes, file_lines: list[bytes]) -> None: +def test_invalid_boundingbox_comment( + prefix: bytes, file_lines: tuple[bytes, ...] +) -> None: data = io.BytesIO(prefix + b"\n".join(file_lines)) with pytest.raises(OSError, match="cannot determine EPS bounding box"): EpsImagePlugin.EpsImageFile(data) From d4fedc852c2a78b9dc93b67f93d6211f7337ca43 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 5 Oct 2024 15:21:42 +1000 Subject: [PATCH 486/662] Rename test image --- ..._atend.eps => 1_boundingbox_after_imagedata.eps} | Bin Tests/test_file_eps.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename Tests/images/eps/{1_atend.eps => 1_boundingbox_after_imagedata.eps} (100%) diff --git a/Tests/images/eps/1_atend.eps b/Tests/images/eps/1_boundingbox_after_imagedata.eps similarity index 100% rename from Tests/images/eps/1_atend.eps rename to Tests/images/eps/1_boundingbox_after_imagedata.eps diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py index 7ae0900fd..0a69ee6e5 100644 --- a/Tests/test_file_eps.py +++ b/Tests/test_file_eps.py @@ -257,7 +257,7 @@ def test_bytesio_object() -> None: @pytest.mark.parametrize( # These images have an "ImageData" descriptor. "filename", - ("Tests/images/eps/1.eps", "Tests/images/eps/1_atend.eps"), + ("Tests/images/eps/1.eps", "Tests/images/eps/1_boundingbox_after_imagedata.eps"), ) def test_1(filename: str) -> None: with Image.open(filename) as im: From a9cbf6d5a71013124305f05d09b344e3698f2c0c Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 18 Aug 2024 20:41:01 +0300 Subject: [PATCH 487/662] Test Python 3.13 on AppVeyor --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 41a5725b2..781ad4a4b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -18,7 +18,7 @@ environment: TEST_OPTIONS: DEPLOY: YES matrix: - - PYTHON: C:/Python312 + - PYTHON: C:/Python313 ARCHITECTURE: x86 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 - PYTHON: C:/Python39-x64 From 1b57b32caf99f7fb5b9c6b83e439832f5a55dc83 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 6 Oct 2024 08:02:17 +1100 Subject: [PATCH 488/662] Test ignoring second ImageData --- Tests/images/eps/1_second_imagedata.eps | Bin 0 -> 45834 bytes Tests/test_file_eps.py | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Tests/images/eps/1_second_imagedata.eps diff --git a/Tests/images/eps/1_second_imagedata.eps b/Tests/images/eps/1_second_imagedata.eps new file mode 100644 index 0000000000000000000000000000000000000000..e6309a3b4ede316d83a2bb84388f1d29140b433f GIT binary patch literal 45834 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 None: @pytest.mark.parametrize( # These images have an "ImageData" descriptor. "filename", - ("Tests/images/eps/1.eps", "Tests/images/eps/1_boundingbox_after_imagedata.eps"), + ( + "Tests/images/eps/1.eps", + "Tests/images/eps/1_boundingbox_after_imagedata.eps", + "Tests/images/eps/1_second_imagedata.eps", + ), ) def test_1(filename: str) -> None: with Image.open(filename) as im: From e2f996e2bd9b933a7a88b9ed47e6065a6d5a28b8 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 6 Oct 2024 08:55:15 +1100 Subject: [PATCH 489/662] Updated CI target --- docs/installation/platform-support.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index 0e46ef0c7..00dec41d1 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -53,7 +53,7 @@ These platforms are built and tested for every change. | Windows Server 2022 | 3.9, 3.10, 3.11, | x86-64 | | | 3.12, 3.13, PyPy3 | | | +----------------------------+---------------------+ -| | 3.12 | x86 | +| | 3.13 | x86 | | +----------------------------+---------------------+ | | 3.9 (MinGW) | x86-64 | | +----------------------------+---------------------+ From b77cd009e210cefae9424206f80ed5dc65b53fdf Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 6 Oct 2024 11:30:27 +1100 Subject: [PATCH 490/662] Use transparency when combining P frames --- Tests/test_file_apng.py | 4 ++-- src/PIL/PngImagePlugin.py | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Tests/test_file_apng.py b/Tests/test_file_apng.py index e95850212..ee6c867c3 100644 --- a/Tests/test_file_apng.py +++ b/Tests/test_file_apng.py @@ -258,8 +258,8 @@ def test_apng_mode() -> None: assert im.mode == "P" im.seek(im.n_frames - 1) im = im.convert("RGBA") - assert im.getpixel((0, 0)) == (255, 0, 0, 0) - assert im.getpixel((64, 32)) == (255, 0, 0, 0) + assert im.getpixel((0, 0)) == (0, 255, 0, 255) + assert im.getpixel((64, 32)) == (0, 255, 0, 255) with Image.open("Tests/images/apng/mode_palette_1bit_alpha.png") as im: assert im.mode == "P" diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 28ade293e..4e1227204 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -1063,6 +1063,12 @@ class PngImageFile(ImageFile.ImageFile): "RGBA", self.info["transparency"] ) else: + if self.im.mode == "P" and "transparency" in self.info: + t = self.info["transparency"] + if isinstance(t, bytes): + updated.putpalettealphas(t) + elif isinstance(t, int): + updated.putpalettealpha(t) mask = updated.convert("RGBA") self._prev_im.paste(updated, self.dispose_extent, mask) self.im = self._prev_im From 27c1bb265432cb5a1138e39165f0610e2d8a4e94 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 7 Oct 2024 07:48:32 +1100 Subject: [PATCH 491/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 36266421a..cc891ed1d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,12 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Updated EPS mode when opening images without transparency #8281 + [Yay295, radarhere] + +- Use transparency when combining P frames from APNGs #8443 + [radarhere] + - Support all resampling filters when resizing I;16* images #8422 [radarhere] From feeceb9ae629199b69361d698154076734e3902a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 7 Oct 2024 15:34:28 +1100 Subject: [PATCH 492/662] Simplified code --- src/_imagingmorph.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/_imagingmorph.c b/src/_imagingmorph.c index 614dfbe7f..fc35107b5 100644 --- a/src/_imagingmorph.c +++ b/src/_imagingmorph.c @@ -62,11 +62,8 @@ apply(PyObject *self, PyObject *args) { width = imgin->xsize; height = imgin->ysize; - if (imgin->type != IMAGING_TYPE_UINT8 || imgin->bands != 1) { - PyErr_SetString(PyExc_RuntimeError, "Unsupported image type"); - return NULL; - } - if (imgout->type != IMAGING_TYPE_UINT8 || imgout->bands != 1) { + if (imgin->type != IMAGING_TYPE_UINT8 || imgin->bands != 1 || + imgout->type != IMAGING_TYPE_UINT8 || imgout->bands != 1) { PyErr_SetString(PyExc_RuntimeError, "Unsupported image type"); return NULL; } From 76dd669e6bbe186f7362917b004ad2560d8b5368 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 7 Oct 2024 16:50:05 +1100 Subject: [PATCH 493/662] Fixed unclosed file warning --- Tests/test_imageshow.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/test_imageshow.py b/Tests/test_imageshow.py index 67c32783f..7a2f58767 100644 --- a/Tests/test_imageshow.py +++ b/Tests/test_imageshow.py @@ -117,5 +117,5 @@ def test_ipythonviewer() -> None: else: pytest.fail("IPythonViewer not found") - im = hopper() - assert test_viewer.show(im) == 1 + with hopper() as im: + assert test_viewer.show(im) == 1 From 8de66597f967baab1d4e4eaf487b0fdb4949abbb Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 7 Oct 2024 19:17:59 +1100 Subject: [PATCH 494/662] Removed unused code --- src/_imagingft.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/_imagingft.c b/src/_imagingft.c index 8bef45baf..3b30e268b 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -922,10 +922,7 @@ font_render(FontObject *self, PyObject *args) { width += ceil(stroke_width * 2 + x_start); height += ceil(stroke_width * 2 + y_start); image = PyObject_CallFunction(fill, "ii", width, height); - if (image == Py_None) { - PyMem_Del(glyph_info); - return Py_BuildValue("N(ii)", image, 0, 0); - } else if (image == NULL) { + if (image == NULL) { PyMem_Del(glyph_info); return NULL; } From 8e332eb3b06812adaa497463f0de97f9ec84d1cb Mon Sep 17 00:00:00 2001 From: Alexander Karpinsky Date: Mon, 7 Oct 2024 12:51:44 +0400 Subject: [PATCH 495/662] Apply suggestions from code review Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- Tests/test_image_getim.py | 2 +- src/_imaging.c | 5 +++-- src/_imagingmorph.c | 4 ++-- src/libImaging/Imaging.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Tests/test_image_getim.py b/Tests/test_image_getim.py index 75d97cd44..fa58492fc 100644 --- a/Tests/test_image_getim.py +++ b/Tests/test_image_getim.py @@ -16,4 +16,4 @@ def test_sanity() -> None: with pytest.warns(DeprecationWarning): ptrs = dict(im.im.unsafe_ptrs) - assert all(k in ptrs for k in ["image8", "image32", "image"]) + assert ptrs.keys() == {"image8", "image32", "image"} diff --git a/src/_imaging.c b/src/_imaging.c index 9422c42bf..d5eb69314 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -3706,7 +3706,7 @@ static PyObject * _getattr_id(ImagingObject *self, void *closure) { if (PyErr_WarnEx( PyExc_DeprecationWarning, - "id property is deprecated and will be removed in Pillow 12.0", + "id property is deprecated and will be removed in Pillow 12 (2025-10-15)", 1 ) < 0) { return NULL; @@ -3732,7 +3732,8 @@ static PyObject * _getattr_unsafe_ptrs(ImagingObject *self, void *closure) { if (PyErr_WarnEx( PyExc_DeprecationWarning, - "unsafe_ptrs property is deprecated and will be removed in Pillow 12.0", + "unsafe_ptrs property is deprecated and will be removed in Pillow 12 " + "(2025-10-15)", 1 ) < 0) { return NULL; diff --git a/src/_imagingmorph.c b/src/_imagingmorph.c index 637295be7..b4da47b77 100644 --- a/src/_imagingmorph.c +++ b/src/_imagingmorph.c @@ -29,8 +29,8 @@ static PyObject * apply(PyObject *self, PyObject *args) { const char *lut; - PyObject *i0, *i1; Py_ssize_t lut_len; + PyObject *i0, *i1; Imaging imgin, imgout; int width, height; int row_idx, col_idx; @@ -124,8 +124,8 @@ apply(PyObject *self, PyObject *args) { static PyObject * match(PyObject *self, PyObject *args) { const char *lut; - PyObject *i0; Py_ssize_t lut_len; + PyObject *i0; Imaging imgin; int width, height; int row_idx, col_idx; diff --git a/src/libImaging/Imaging.h b/src/libImaging/Imaging.h index 870f5ed97..31052c68a 100644 --- a/src/libImaging/Imaging.h +++ b/src/libImaging/Imaging.h @@ -60,7 +60,7 @@ typedef struct ImagingHistogramInstance *ImagingHistogram; typedef struct ImagingOutlineInstance *ImagingOutline; typedef struct ImagingPaletteInstance *ImagingPalette; -/* handle magics (used with PyCObject). */ +/* handle magics (used with PyCapsule). */ #define IMAGING_MAGIC "Pillow Imaging" /* pixel types */ From a227f22fd979c86d8d2ae8b9bdb0a393fb2e386c Mon Sep 17 00:00:00 2001 From: Alexander Karpinsky Date: Mon, 7 Oct 2024 14:35:25 +0400 Subject: [PATCH 496/662] Apply suggestions from code review [ci skip] Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- docs/deprecations.rst | 2 +- docs/releasenotes/11.0.0.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index 3934f059d..25607e27c 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -165,7 +165,7 @@ Specific WebP Feature Checks ``True`` if the WebP module is installed, until they are removed in Pillow 12.0.0 (2025-10-15). -Get Internal Pointers to Objects +Get internal pointers to objects ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. deprecated:: 11.0.0 diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index 3194f1a52..fde11662e 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -73,7 +73,7 @@ vulnerability introduced in FreeType 2.6 (:cve:`2020-15999`). .. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ -Get Internal Pointers to Objects +Get internal pointers to objects ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. deprecated:: 11.0.0 From 7097a9a3b869f2cf8d335aeb1a6a77c1b31378dc Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 7 Oct 2024 22:12:41 +1100 Subject: [PATCH 497/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index cc891ed1d..4e940d7ff 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Use ImagingCore.ptr instead of ImagingCore.id #8341 + [homm, radarhere, hugovk] + - Updated EPS mode when opening images without transparency #8281 [Yay295, radarhere] From ef47d6e5e53c68c0018755d0dc23924d0e03c8ba Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 17:55:54 +0000 Subject: [PATCH 498/662] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.6.3 → v0.6.9](https://github.com/astral-sh/ruff-pre-commit/compare/v0.6.3...v0.6.9) - [github.com/PyCQA/bandit: 1.7.9 → 1.7.10](https://github.com/PyCQA/bandit/compare/1.7.9...1.7.10) - [github.com/pre-commit/mirrors-clang-format: v18.1.8 → v19.1.1](https://github.com/pre-commit/mirrors-clang-format/compare/v18.1.8...v19.1.1) - [github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.6.0...v5.0.0) - [github.com/python-jsonschema/check-jsonschema: 0.29.2 → 0.29.3](https://github.com/python-jsonschema/check-jsonschema/compare/0.29.2...0.29.3) - [github.com/sphinx-contrib/sphinx-lint: v0.9.1 → v1.0.0](https://github.com/sphinx-contrib/sphinx-lint/compare/v0.9.1...v1.0.0) - [github.com/tox-dev/pyproject-fmt: 2.2.1 → 2.2.4](https://github.com/tox-dev/pyproject-fmt/compare/2.2.1...2.2.4) - [github.com/abravalheri/validate-pyproject: v0.19 → v0.20.2](https://github.com/abravalheri/validate-pyproject/compare/v0.19...v0.20.2) - [github.com/tox-dev/tox-ini-fmt: 1.3.1 → 1.4.1](https://github.com/tox-dev/tox-ini-fmt/compare/1.3.1...1.4.1) --- .pre-commit-config.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 14d75c689..bdc335f32 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.3 + rev: v0.6.9 hooks: - id: ruff args: [--exit-non-zero-on-fix] @@ -11,7 +11,7 @@ repos: - id: black - repo: https://github.com/PyCQA/bandit - rev: 1.7.9 + rev: 1.7.10 hooks: - id: bandit args: [--severity-level=high] @@ -24,7 +24,7 @@ repos: exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.gd$|\.opt$) - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v18.1.8 + rev: v19.1.1 hooks: - id: clang-format types: [c] @@ -36,7 +36,7 @@ repos: - id: rst-backticks - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-executables-have-shebangs - id: check-shebang-scripts-are-executable @@ -50,29 +50,29 @@ repos: exclude: ^.github/.*TEMPLATE|^Tests/(fonts|images)/ - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.29.2 + rev: 0.29.3 hooks: - id: check-github-workflows - id: check-readthedocs - id: check-renovate - repo: https://github.com/sphinx-contrib/sphinx-lint - rev: v0.9.1 + rev: v1.0.0 hooks: - id: sphinx-lint - repo: https://github.com/tox-dev/pyproject-fmt - rev: 2.2.1 + rev: 2.2.4 hooks: - id: pyproject-fmt - repo: https://github.com/abravalheri/validate-pyproject - rev: v0.19 + rev: v0.20.2 hooks: - id: validate-pyproject - repo: https://github.com/tox-dev/tox-ini-fmt - rev: 1.3.1 + rev: 1.4.1 hooks: - id: tox-ini-fmt From a609d65b33b659d5bbdd7ff09c6464d7b1028754 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 17:56:20 +0000 Subject: [PATCH 499/662] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/libImaging/QuantOctree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libImaging/QuantOctree.c b/src/libImaging/QuantOctree.c index 7e02ebf65..ec60b214e 100644 --- a/src/libImaging/QuantOctree.c +++ b/src/libImaging/QuantOctree.c @@ -188,7 +188,7 @@ create_sorted_color_palette(const ColorCube cube) { buckets, cube->size, sizeof(struct _ColorBucket), - (int (*)(void const *, void const *)) & compare_bucket_count + (int (*)(void const *, void const *))&compare_bucket_count ); return buckets; From a9b9a63614c7838be9efe421062252c1c8c0546a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 8 Oct 2024 20:48:32 +1100 Subject: [PATCH 500/662] Do not create core image in seek(), when load() might not run --- src/PIL/TiffImagePlugin.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index d4c46a797..f3571fda3 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1193,11 +1193,11 @@ class TiffImageFile(ImageFile.ImageFile): if not self._seek_check(frame): return self._seek(frame) - # Create a new core image object on second and - # subsequent frames in the image. Image may be - # different size/mode. - Image._decompression_bomb_check(self._tile_size) - self.im = Image.core.new(self.mode, self._tile_size) + if self._im is not None and ( + self.im.size != self._tile_size or self.im.mode != self.mode + ): + # The core image will no longer be used + self._im = None def _seek(self, frame: int) -> None: self.fp = self._fp @@ -1279,6 +1279,7 @@ class TiffImageFile(ImageFile.ImageFile): def load_prepare(self) -> None: if self._im is None: + Image._decompression_bomb_check(self._tile_size) self.im = Image.core.new(self.mode, self._tile_size) ImageFile.ImageFile.load_prepare(self) From e37209ace5bc9aaf3683dfaf25b6c6c75a23ba0f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 09:11:46 +0000 Subject: [PATCH 501/662] Update dependency cibuildwheel to v2.21.3 --- .ci/requirements-cibw.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-cibw.txt b/.ci/requirements-cibw.txt index a1424ecc0..c4511439c 100644 --- a/.ci/requirements-cibw.txt +++ b/.ci/requirements-cibw.txt @@ -1 +1 @@ -cibuildwheel==2.21.2 +cibuildwheel==2.21.3 From ff245fcb4084a0bb61c14e0c416c048c63da78cf Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 10 Oct 2024 19:43:11 +1100 Subject: [PATCH 502/662] Revert "Skip QEMU-emulated wheels on workflow dispatch event" This reverts commit f39ca5db5a39c2c82e62fbee1ebf95d5b61bdfba. --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 2a4c86cd7..837e5ea91 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -41,7 +41,7 @@ env: jobs: build-1-QEMU-emulated-wheels: - if: github.event_name != 'schedule' && github.event_name != 'workflow_dispatch' + if: github.event_name != 'schedule' name: aarch64 ${{ matrix.python-version }} ${{ matrix.spec }} runs-on: ubuntu-latest strategy: From 97438cb8fd51f016117953072a7a68c2f74ccc74 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 10 Oct 2024 22:50:26 +1100 Subject: [PATCH 503/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 4e940d7ff..277a57f0c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Support ImageFilter.BuiltinFilter for I;16* images #8438 + [radarhere] + - Use ImagingCore.ptr instead of ImagingCore.id #8341 [homm, radarhere, hugovk] From fdd5d0c0fba5864d914044a8046e9916e2f0e1eb Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Thu, 10 Oct 2024 21:35:48 +0300 Subject: [PATCH 504/662] Use CVE and CWE roles from Sphinx 8.1 --- Makefile | 2 -- docs/Makefile | 2 +- docs/conf.py | 4 +--- pyproject.toml | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index ec4159627..53164b08a 100644 --- a/Makefile +++ b/Makefile @@ -17,12 +17,10 @@ coverage: .PHONY: doc .PHONY: html doc html: - python3 -c "import PIL" > /dev/null 2>&1 || python3 -m pip install . $(MAKE) -C docs html .PHONY: htmlview htmlview: - python3 -c "import PIL" > /dev/null 2>&1 || python3 -m pip install . $(MAKE) -C docs htmlview .PHONY: doccheck diff --git a/docs/Makefile b/docs/Makefile index 8f13f1aea..e90af0519 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -46,7 +46,7 @@ clean: -rm -rf $(BUILDDIR)/* install-sphinx: - $(PYTHON) -m pip install --quiet furo olefile sphinx sphinx-copybutton sphinx-inline-tabs sphinxext-opengraph + $(PYTHON) -m pip install -e ..[docs] .PHONY: html html: diff --git a/docs/conf.py b/docs/conf.py index a0f5867d7..bcdc18b20 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,7 +22,7 @@ import PIL # -- General configuration ------------------------------------------------ # If your documentation needs a minimal Sphinx version, state it here. -needs_sphinx = "7.3" +needs_sphinx = "8.1" # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom @@ -338,8 +338,6 @@ linkcheck_allowed_redirects = { # https://www.sphinx-doc.org/en/master/usage/extensions/extlinks.html _repo = "https://github.com/python-pillow/Pillow/" extlinks = { - "cve": ("https://www.cve.org/CVERecord?id=CVE-%s", "CVE-%s"), - "cwe": ("https://cwe.mitre.org/data/definitions/%s.html", "CWE-%s"), "issue": (_repo + "issues/%s", "#%s"), "pr": (_repo + "pull/%s", "#%s"), "pypi": ("https://pypi.org/project/%s/", "%s"), diff --git a/pyproject.toml b/pyproject.toml index 0d0a6f170..132030c99 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -43,7 +43,7 @@ dynamic = [ optional-dependencies.docs = [ "furo", "olefile", - "sphinx>=7.3", + "sphinx>=8.1", "sphinx-copybutton", "sphinx-inline-tabs", "sphinxext-opengraph", From 7edf9528328f64bf7b299babe2fc3d9e79afdc18 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 11 Oct 2024 19:37:56 +1100 Subject: [PATCH 505/662] Do not close provided file handles with libtiff --- src/PIL/TiffImagePlugin.py | 7 +------ src/libImaging/TiffDecode.c | 26 ++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index d4c46a797..2dbd3c601 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1864,7 +1864,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if hasattr(fp, "fileno"): try: fp.seek(0) - _fp = os.dup(fp.fileno()) + _fp = fp.fileno() except io.UnsupportedOperation: pass @@ -1943,11 +1943,6 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: fp.write(data) if errcode: break - if _fp: - try: - os.close(_fp) - except OSError: - pass if errcode < 0: msg = f"encoder error {errcode} when writing image file" raise OSError(msg) diff --git a/src/libImaging/TiffDecode.c b/src/libImaging/TiffDecode.c index 18a54f633..e4da9162d 100644 --- a/src/libImaging/TiffDecode.c +++ b/src/libImaging/TiffDecode.c @@ -780,7 +780,7 @@ ImagingLibTiffDecode( decode_err: // TIFFClose in libtiff calls tif_closeproc and TIFFCleanup if (clientstate->fp) { - // Pillow will manage the closing of the file rather than libtiff + // Python will manage the closing of the file rather than libtiff // So only call TIFFCleanup TIFFCleanup(tiff); } else { @@ -1008,7 +1008,17 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt ) == -1) { TRACE(("Encode Error, row %d\n", state->y)); state->errcode = IMAGING_CODEC_BROKEN; - TIFFClose(tiff); + + // TIFFClose in libtiff calls tif_closeproc and TIFFCleanup + if (clientstate->fp) { + // Python will manage the closing of the file rather than libtiff + // So only call TIFFCleanup + TIFFCleanup(tiff); + } else { + // When tif_closeproc refers to our custom _tiffCloseProc though, + // that is fine, as it does not close the file + TIFFClose(tiff); + } if (!clientstate->fp) { free(clientstate->data); } @@ -1025,14 +1035,22 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt TRACE(("Error flushing the tiff")); // likely reason is memory. state->errcode = IMAGING_CODEC_MEMORY; - TIFFClose(tiff); + if (clientstate->fp) { + TIFFCleanup(tiff); + } else { + TIFFClose(tiff); + } if (!clientstate->fp) { free(clientstate->data); } return -1; } TRACE(("Closing \n")); - TIFFClose(tiff); + if (clientstate->fp) { + TIFFCleanup(tiff); + } else { + TIFFClose(tiff); + } // reset the clientstate metadata to use it to read out the buffer. clientstate->loc = 0; clientstate->size = clientstate->eof; // redundant? From afbf45055a8e938aacb28cb412cad125a1e29a4f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 11 Oct 2024 20:59:15 +1100 Subject: [PATCH 506/662] Always raise warnings for deprecated feature checks --- Tests/test_features.py | 6 +++--- src/PIL/features.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Tests/test_features.py b/Tests/test_features.py index 807782847..ed7929973 100644 --- a/Tests/test_features.py +++ b/Tests/test_features.py @@ -56,17 +56,17 @@ def test_version() -> None: def test_webp_transparency() -> None: with pytest.warns(DeprecationWarning): - assert features.check("transp_webp") == features.check_module("webp") + assert (features.check("transp_webp") or False) == features.check_module("webp") def test_webp_mux() -> None: with pytest.warns(DeprecationWarning): - assert features.check("webp_mux") == features.check_module("webp") + assert (features.check("webp_mux") or False) == features.check_module("webp") def test_webp_anim() -> None: with pytest.warns(DeprecationWarning): - assert features.check("webp_anim") == features.check_module("webp") + assert (features.check("webp_anim") or False) == features.check_module("webp") @skip_unless_feature("libjpeg_turbo") diff --git a/src/PIL/features.py b/src/PIL/features.py index 24c5ee978..75d59e01c 100644 --- a/src/PIL/features.py +++ b/src/PIL/features.py @@ -146,10 +146,11 @@ def check_feature(feature: str) -> bool | None: module, flag, ver = features[feature] + if isinstance(flag, bool): + deprecate(f'check_feature("{feature}")', 12) try: imported_module = __import__(module, fromlist=["PIL"]) if isinstance(flag, bool): - deprecate(f'check_feature("{feature}")', 12) return flag return getattr(imported_module, flag) except ModuleNotFoundError: From e93dcc15780d29af45fa64cf54ff6b11c2c27c46 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 11 Oct 2024 21:09:52 +1100 Subject: [PATCH 507/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 277a57f0c..c965d60a6 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Do not close provided file handles with libtiff when saving #8458 + [radarhere] + - Support ImageFilter.BuiltinFilter for I;16* images #8438 [radarhere] From 00c5989d4ed963f9d39568c6212969bafe84e4d2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 12 Oct 2024 13:44:48 +1100 Subject: [PATCH 508/662] Use MAXBLOCK --- src/PIL/TiffImagePlugin.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 2dbd3c601..a05cd0f17 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1937,8 +1937,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: encoder = Image._getencoder(im.mode, "libtiff", a, encoderconfig) encoder.setimage(im.im, (0, 0) + im.size) while True: - # undone, change to self.decodermaxblock: - errcode, data = encoder.encode(16 * 1024)[1:] + errcode, data = encoder.encode(ImageFile.MAXBLOCK)[1:] if not _fp: fp.write(data) if errcode: From b5e1115bf2646f7ce5eb1b9409e4540fee3b9f49 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 12 Oct 2024 21:10:47 +1100 Subject: [PATCH 509/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index c965d60a6..0a1703668 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,15 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Conditionally define ImageCms type hint to avoid requiring core #8197 + [radarhere] + +- Support writing LONG8 offsets in AppendingTiffWriter #8417 + [radarhere] + +- Use ImageFile.MAXBLOCK when saving TIFF images #8461 + [radarhere] + - Do not close provided file handles with libtiff when saving #8458 [radarhere] From e74994ed370a668c8f3e6045278de5a5eb3f47ab Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 11 Oct 2024 16:28:41 +0300 Subject: [PATCH 510/662] Update licence to MIT-CMU --- .pre-commit-config.yaml | 1 + pyproject.toml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bdc335f32..6254b8941 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -70,6 +70,7 @@ repos: rev: v0.20.2 hooks: - id: validate-pyproject + additional_dependencies: [trove-classifiers>=2024.10.12] - repo: https://github.com/tox-dev/tox-ini-fmt rev: 1.4.1 diff --git a/pyproject.toml b/pyproject.toml index 132030c99..c55be7693 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,14 +14,14 @@ readme = "README.md" keywords = [ "Imaging", ] -license = { text = "HPND" } +license = { text = "MIT-CMU" } authors = [ { name = "Jeffrey A. Clark", email = "aclark@aclark.net" }, ] requires-python = ">=3.9" classifiers = [ "Development Status :: 6 - Mature", - "License :: OSI Approved :: Historical Permission Notice and Disclaimer (HPND)", + "License :: OSI Approved :: CMU License (MIT-CMU)", "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", From a60610c93f1a7fb2738156470d613793e5fa7a89 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 13 Oct 2024 07:42:17 +1100 Subject: [PATCH 511/662] Added type hints --- src/PIL/ImageMath.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py index 15464947d..484797f91 100644 --- a/src/PIL/ImageMath.py +++ b/src/PIL/ImageMath.py @@ -173,10 +173,10 @@ class _Operand: return self.apply("rshift", self, other) # logical - def __eq__(self, other): + def __eq__(self, other: _Operand | float) -> _Operand: # type: ignore[override] return self.apply("eq", self, other) - def __ne__(self, other): + def __ne__(self, other: _Operand | float) -> _Operand: # type: ignore[override] return self.apply("ne", self, other) def __lt__(self, other: _Operand | float) -> _Operand: From c3d81d6375d2d78301a40d0e55ece746cf41502f Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sat, 12 Oct 2024 23:52:57 +0300 Subject: [PATCH 512/662] Update Python 3.13 release date --- docs/releasenotes/11.0.0.rst | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/docs/releasenotes/11.0.0.rst b/docs/releasenotes/11.0.0.rst index d5f5934f4..c3f18140f 100644 --- a/docs/releasenotes/11.0.0.rst +++ b/docs/releasenotes/11.0.0.rst @@ -1,19 +1,6 @@ 11.0.0 ------ -Security -======== - -TODO -^^^^ - -TODO - -:cve:`YYYY-XXXXX`: TODO -^^^^^^^^^^^^^^^^^^^^^^^ - -TODO - Backwards Incompatible Changes ============================== @@ -159,7 +146,7 @@ Python 3.13 Pillow 10.4.0 had wheels built against Python 3.13 beta, available as a preview to help others prepare for 3.13, and to ensure Pillow could be used immediately at the release -of 3.13.0 final (2024-10-01, :pep:`719`). +of 3.13.0 final (2024-10-07, :pep:`719`). Pillow 11.0.0 now officially supports Python 3.13. From f2cc87b1f0627dfce07ab2867e29ba07e5055f33 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 13 Oct 2024 11:19:41 +1100 Subject: [PATCH 513/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 0a1703668..fcc8c324f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.0.0 (unreleased) ------------------- +- Update licence to MIT-CMU #8460 + [hugovk] + - Conditionally define ImageCms type hint to avoid requiring core #8197 [radarhere] From 3911afbc97f5b3195609800f471794f6b3e349dc Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 14 Oct 2024 16:56:48 +1100 Subject: [PATCH 514/662] Removed Fedora 39 --- .github/workflows/test-docker.yml | 1 - docs/installation/platform-support.rst | 2 -- 2 files changed, 3 deletions(-) diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index 21e1275e7..880fe3eea 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -46,7 +46,6 @@ jobs: centos-stream-9-amd64, debian-12-bookworm-x86, debian-12-bookworm-amd64, - fedora-39-amd64, fedora-40-amd64, gentoo, ubuntu-22.04-jammy-amd64, diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index 00dec41d1..21ebd1ad5 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -29,8 +29,6 @@ These platforms are built and tested for every change. +----------------------------------+----------------------------+---------------------+ | Debian 12 Bookworm | 3.11 | x86, x86-64 | +----------------------------------+----------------------------+---------------------+ -| Fedora 39 | 3.12 | x86-64 | -+----------------------------------+----------------------------+---------------------+ | Fedora 40 | 3.12 | x86-64 | +----------------------------------+----------------------------+---------------------+ | Gentoo | 3.12 | x86-64 | From 204aae6682fc936f5350b3fe70335776f81480a7 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 15 Oct 2024 08:55:00 +0300 Subject: [PATCH 515/662] 11.0.0 version bump --- CHANGES.rst | 2 +- src/PIL/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index fcc8c324f..8a20fe16a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,7 +2,7 @@ Changelog (Pillow) ================== -11.0.0 (unreleased) +11.0.0 (2024-10-15) ------------------- - Update licence to MIT-CMU #8460 diff --git a/src/PIL/_version.py b/src/PIL/_version.py index c4a72ad7e..963d8c906 100644 --- a/src/PIL/_version.py +++ b/src/PIL/_version.py @@ -1,4 +1,4 @@ # Master version for Pillow from __future__ import annotations -__version__ = "11.0.0.dev0" +__version__ = "11.0.0" From a433f24f0bf5a9df98bbfe3c076a060131e92854 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 15 Oct 2024 22:14:26 +1100 Subject: [PATCH 516/662] tile is already an empty list --- src/PIL/GifImagePlugin.py | 1 - src/PIL/WebPImagePlugin.py | 1 - 2 files changed, 2 deletions(-) diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index 57c291792..a7c4f8b2c 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -103,7 +103,6 @@ class GifImageFile(ImageFile.ImageFile): self.info["version"] = s[:6] self._size = i16(s, 6), i16(s, 8) - self.tile = [] flags = s[10] bits = (flags & 7) + 1 diff --git a/src/PIL/WebPImagePlugin.py b/src/PIL/WebPImagePlugin.py index 64188f28c..c7f855527 100644 --- a/src/PIL/WebPImagePlugin.py +++ b/src/PIL/WebPImagePlugin.py @@ -60,7 +60,6 @@ class WebPImageFile(ImageFile.ImageFile): self.is_animated = self.n_frames > 1 self._mode = "RGB" if mode == "RGBX" else mode self.rawmode = mode - self.tile = [] # Attempt to read ICC / EXIF / XMP chunks from file icc_profile = self._decoder.get_chunk("ICCP") From 455e6da119ac01ffc3aeb68486cef47e1f3f8dcb Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 15 Oct 2024 17:30:25 +0300 Subject: [PATCH 517/662] 11.1.0.dev0 version bump --- src/PIL/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/_version.py b/src/PIL/_version.py index 963d8c906..0807f949c 100644 --- a/src/PIL/_version.py +++ b/src/PIL/_version.py @@ -1,4 +1,4 @@ # Master version for Pillow from __future__ import annotations -__version__ = "11.0.0" +__version__ = "11.1.0.dev0" From 8393972c3540cf7bba737b0687d79c5d8ebca3ef Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 16 Oct 2024 09:56:33 +1100 Subject: [PATCH 518/662] Skip PyPy3.9 wheels --- .github/workflows/wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 837e5ea91..34452fa56 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -152,6 +152,7 @@ jobs: CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }} CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }} CIBW_PRERELEASE_PYTHONS: True + CIBW_SKIP: pp39-* MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }} - uses: actions/upload-artifact@v4 @@ -224,6 +225,7 @@ jobs: CIBW_CACHE_PATH: "C:\\cibw" CIBW_FREE_THREADED_SUPPORT: True CIBW_PRERELEASE_PYTHONS: True + CIBW_SKIP: pp39-* CIBW_TEST_SKIP: "*-win_arm64" CIBW_TEST_COMMAND: 'docker run --rm -v {project}:C:\pillow From 7c194b54ef3e7a04c5b669353622687075b5ebb4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 16 Oct 2024 21:37:14 +1100 Subject: [PATCH 519/662] Fixed disabling a feature --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 60707083f..def341784 100644 --- a/setup.py +++ b/setup.py @@ -389,7 +389,7 @@ class pil_build_ext(build_ext): pass for x in self.feature: if getattr(self, f"disable_{x}"): - setattr(self.feature, x, False) + self.feature.set(x, False) self.feature.required.discard(x) _dbg("Disabling %s", x) if getattr(self, f"enable_{x}"): From 11c654c187ffbede40c54e6344ddec49f495d4a7 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 16 Oct 2024 23:07:35 +1100 Subject: [PATCH 520/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 8a20fe16a..ff126c611 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,12 @@ Changelog (Pillow) ================== +11.1.0 (unreleased) +------------------- + +- Fixed disabling a feature during install #8469 + [radarhere] + 11.0.0 (2024-10-15) ------------------- From c252b708ee7f90dbc3b6a86056f390b7b4712f52 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 21:41:38 +0000 Subject: [PATCH 521/662] Update dependency mypy to v1.12.0 --- .ci/requirements-mypy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-mypy.txt b/.ci/requirements-mypy.txt index dcb3996e2..852444d37 100644 --- a/.ci/requirements-mypy.txt +++ b/.ci/requirements-mypy.txt @@ -1,4 +1,4 @@ -mypy==1.11.2 +mypy==1.12.0 IceSpringPySideStubs-PyQt6 IceSpringPySideStubs-PySide6 ipython From 5ff20273d90c1be49a9662cf6d4c53c9bd53aadb Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 17 Oct 2024 10:46:26 +1100 Subject: [PATCH 522/662] Updated type hints --- src/PIL/TiffImagePlugin.py | 46 +++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index ff5a6f9e9..198bd422e 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -685,22 +685,33 @@ class ImageFileDirectory_v2(_IFDv2Base): else: self.tagtype[tag] = TiffTags.UNDEFINED if all(isinstance(v, IFDRational) for v in values): - self.tagtype[tag] = ( - TiffTags.RATIONAL - if all(v >= 0 for v in values) - else TiffTags.SIGNED_RATIONAL - ) - elif all(isinstance(v, int) for v in values): - if all(0 <= v < 2**16 for v in values): - self.tagtype[tag] = TiffTags.SHORT - elif all(-(2**15) < v < 2**15 for v in values): - self.tagtype[tag] = TiffTags.SIGNED_SHORT + for v in values: + assert isinstance(v, IFDRational) + if v < 0: + self.tagtype[tag] = TiffTags.SIGNED_RATIONAL + break else: - self.tagtype[tag] = ( - TiffTags.LONG - if all(v >= 0 for v in values) - else TiffTags.SIGNED_LONG - ) + self.tagtype[tag] = TiffTags.RATIONAL + elif all(isinstance(v, int) for v in values): + short = True + signed_short = True + long = True + for v in values: + assert isinstance(v, int) + if short and not (0 <= v < 2**16): + short = False + if signed_short and not (-(2**15) < v < 2**15): + signed_short = False + if long and v < 0: + long = False + if short: + self.tagtype[tag] = TiffTags.SHORT + elif signed_short: + self.tagtype[tag] = TiffTags.SIGNED_SHORT + elif long: + self.tagtype[tag] = TiffTags.LONG + else: + self.tagtype[tag] = TiffTags.SIGNED_LONG elif all(isinstance(v, float) for v in values): self.tagtype[tag] = TiffTags.DOUBLE elif all(isinstance(v, str) for v in values): @@ -718,7 +729,10 @@ class ImageFileDirectory_v2(_IFDv2Base): is_ifd = self.tagtype[tag] == TiffTags.LONG and isinstance(values, dict) if not is_ifd: - values = tuple(info.cvt_enum(value) for value in values) + values = tuple( + info.cvt_enum(value) if isinstance(value, str) else value + for value in values + ) dest = self._tags_v1 if legacy_api else self._tags_v2 From 4611a246618b1b3e09efc829e36205184376dc75 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 17 Oct 2024 10:58:48 +1100 Subject: [PATCH 523/662] Fix IFDRational with a zero denominator --- src/PIL/TiffImagePlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 198bd422e..6bf39b75a 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -294,7 +294,7 @@ def _accept(prefix: bytes) -> bool: def _limit_rational( val: float | Fraction | IFDRational, max_val: int ) -> tuple[IntegralLike, IntegralLike]: - inv = abs(float(val)) > 1 + inv = abs(val) > 1 n_d = IFDRational(1 / val if inv else val).limit_rational(max_val) return n_d[::-1] if inv else n_d From 0beb2228f9adb387a87c6b944cda2e427f5f264a Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 17 Oct 2024 12:44:25 +1100 Subject: [PATCH 524/662] Include JpegImageFile layers in state --- Tests/test_pickle.py | 11 +++++++++++ src/PIL/Image.py | 2 +- src/PIL/JpegImagePlugin.py | 7 +++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Tests/test_pickle.py b/Tests/test_pickle.py index d250ba369..c4f8de013 100644 --- a/Tests/test_pickle.py +++ b/Tests/test_pickle.py @@ -74,6 +74,17 @@ def test_pickle_image( helper_pickle_file(tmp_path, protocol, test_file, test_mode) +def test_pickle_jpeg() -> None: + # Arrange + with Image.open("Tests/images/hopper.jpg") as image: + # Act: roundtrip + unpickled_image = pickle.loads(pickle.dumps(image)) + + # Assert + assert len(unpickled_image.layer) == 3 + assert unpickled_image.layers == 3 + + def test_pickle_la_mode_with_palette(tmp_path: Path) -> None: # Arrange filename = str(tmp_path / "temp.pkl") diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 44270392c..ec5ce6cb1 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -763,7 +763,7 @@ class Image: def __setstate__(self, state: list[Any]) -> None: Image.__init__(self) - info, mode, size, palette, data = state + info, mode, size, palette, data = state[:5] self.info = info self._mode = mode self._size = size diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 6510e072e..7dec75218 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -395,6 +395,13 @@ class JpegImageFile(ImageFile.ImageFile): return getattr(self, "_" + name) raise AttributeError(name) + def __getstate__(self) -> list[Any]: + return super().__getstate__() + [self.layers, self.layer] + + def __setstate__(self, state: list[Any]) -> None: + super().__setstate__(state) + self.layers, self.layer = state[5:] + def load_read(self, read_bytes: int) -> bytes: """ internal: read more image data From d59b169ed257ca14d86c90dbf3384b8b3999fc5c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 17 Oct 2024 23:10:48 +1100 Subject: [PATCH 525/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index ff126c611..ae3841569 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.1.0 (unreleased) ------------------- +- Fix IFDRational with a zero denominator #8474 + [radarhere] + - Fixed disabling a feature during install #8469 [radarhere] From a337138f92d88d56488e5150d7ce8a3e0f0a91f8 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 18 Oct 2024 08:32:14 +1100 Subject: [PATCH 526/662] Updated type hint --- Tests/test_image_resize.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Tests/test_image_resize.py b/Tests/test_image_resize.py index 8548fb5da..57fcf9a34 100644 --- a/Tests/test_image_resize.py +++ b/Tests/test_image_resize.py @@ -10,7 +10,7 @@ from pathlib import Path import pytest -from PIL import Image +from PIL import Image, ImageFile from .helper import ( assert_image_equal, @@ -179,7 +179,7 @@ class TestImagingCoreResize: @pytest.fixture -def gradients_image() -> Generator[Image.Image, None, None]: +def gradients_image() -> Generator[ImageFile.ImageFile, None, None]: with Image.open("Tests/images/radial_gradients.png") as im: im.load() try: @@ -189,7 +189,7 @@ def gradients_image() -> Generator[Image.Image, None, None]: class TestReducingGapResize: - def test_reducing_gap_values(self, gradients_image: Image.Image) -> None: + def test_reducing_gap_values(self, gradients_image: ImageFile.ImageFile) -> None: ref = gradients_image.resize( (52, 34), Image.Resampling.BICUBIC, reducing_gap=None ) @@ -210,7 +210,7 @@ class TestReducingGapResize: ) def test_reducing_gap_1( self, - gradients_image: Image.Image, + gradients_image: ImageFile.ImageFile, box: tuple[float, float, float, float], epsilon: float, ) -> None: @@ -230,7 +230,7 @@ class TestReducingGapResize: ) def test_reducing_gap_2( self, - gradients_image: Image.Image, + gradients_image: ImageFile.ImageFile, box: tuple[float, float, float, float], epsilon: float, ) -> None: @@ -250,7 +250,7 @@ class TestReducingGapResize: ) def test_reducing_gap_3( self, - gradients_image: Image.Image, + gradients_image: ImageFile.ImageFile, box: tuple[float, float, float, float], epsilon: float, ) -> None: @@ -266,7 +266,9 @@ class TestReducingGapResize: @pytest.mark.parametrize("box", (None, (1.1, 2.2, 510.8, 510.9), (3, 10, 410, 256))) def test_reducing_gap_8( - self, gradients_image: Image.Image, box: tuple[float, float, float, float] + self, + gradients_image: ImageFile.ImageFile, + box: tuple[float, float, float, float], ) -> None: ref = gradients_image.resize((52, 34), Image.Resampling.BICUBIC, box=box) im = gradients_image.resize( @@ -281,7 +283,7 @@ class TestReducingGapResize: ) def test_box_filter( self, - gradients_image: Image.Image, + gradients_image: ImageFile.ImageFile, box: tuple[float, float, float, float], epsilon: float, ) -> None: From 98f975dbbe6ae0ef521522cdea6e00fdc81449c0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 18 Oct 2024 18:56:23 +1100 Subject: [PATCH 527/662] Do not save XMP from info --- Tests/test_file_jpeg.py | 9 +++++++-- src/PIL/JpegImagePlugin.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index cde951395..1b889eb40 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -998,8 +998,13 @@ class TestFileJpeg: with Image.open(f) as reloaded: assert reloaded.info["xmp"] == b"XMP test" - im.info["xmp"] = b"1" * 65504 - im.save(f) + # Check that XMP is not saved from image info + reloaded.save(f) + + with Image.open(f) as reloaded: + assert "xmp" not in reloaded.info + + im.save(f, xmp=b"1" * 65504) with Image.open(f) as reloaded: assert reloaded.info["xmp"] == b"1" * 65504 diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 6510e072e..6937f2650 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -751,7 +751,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: extra = info.get("extra", b"") MAX_BYTES_IN_MARKER = 65533 - xmp = info.get("xmp", im.info.get("xmp")) + xmp = info.get("xmp") if xmp: overhead_len = 29 # b"http://ns.adobe.com/xap/1.0/\x00" max_data_bytes_in_marker = MAX_BYTES_IN_MARKER - overhead_len From 203ca12626b22d185b59199b60ceb55081f6c3b2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 18 Oct 2024 19:09:22 +1100 Subject: [PATCH 528/662] Allow encoderinfo to be set for appended images --- Tests/test_file_mpo.py | 12 ++++++++++++ src/PIL/Image.py | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Tests/test_file_mpo.py b/Tests/test_file_mpo.py index e0f42a266..39aaa1613 100644 --- a/Tests/test_file_mpo.py +++ b/Tests/test_file_mpo.py @@ -293,3 +293,15 @@ def test_save_all() -> None: # Test that a single frame image will not be saved as an MPO jpg = roundtrip(im, save_all=True) assert "mp" not in jpg.info + + +def test_save_xmp() -> None: + im = Image.new("RGB", (1, 1)) + im2 = Image.new("RGB", (1, 1), "#f00") + im2.encoderinfo = {"xmp": b"Second frame"} + im_reloaded = roundtrip(im, xmp=b"First frame", save_all=True, append_images=[im2]) + + assert im_reloaded.info["xmp"] == b"First frame" + + im_reloaded.seek(1) + assert im_reloaded.info["xmp"] == b"Second frame" diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 44270392c..586da7d3d 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -2565,7 +2565,7 @@ class Image: self._ensure_mutable() save_all = params.pop("save_all", False) - self.encoderinfo = params + self.encoderinfo = {**getattr(self, "encoderinfo", {}), **params} self.encoderconfig: tuple[Any, ...] = () preinit() @@ -2612,6 +2612,11 @@ class Image: except PermissionError: pass raise + finally: + try: + del self.encoderinfo + except AttributeError: + pass if open_fp: fp.close() From 5b065970753d464c0d283f9e0c2f4a0971800ed1 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 18 Oct 2024 19:29:22 +1100 Subject: [PATCH 529/662] Use fixture to re-open image for each test --- Tests/test_file_jpeg2k.py | 57 +++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py index 26b085601..79f53e211 100644 --- a/Tests/test_file_jpeg2k.py +++ b/Tests/test_file_jpeg2k.py @@ -2,6 +2,7 @@ from __future__ import annotations import os import re +from collections.abc import Generator from io import BytesIO from pathlib import Path from typing import Any @@ -29,8 +30,16 @@ EXTRA_DIR = "Tests/images/jpeg2000" pytestmark = skip_unless_feature("jpg_2000") -test_card = Image.open("Tests/images/test-card.png") -test_card.load() + +@pytest.fixture +def test_card() -> Generator[ImageFile.ImageFile, None, None]: + with Image.open("Tests/images/test-card.png") as im: + im.load() + try: + yield im + finally: + im.close() + # OpenJPEG 2.0.0 outputs this debugging message sometimes; we should # ignore it---it doesn't represent a test failure. @@ -74,7 +83,7 @@ def test_invalid_file() -> None: Jpeg2KImagePlugin.Jpeg2KImageFile(invalid_file) -def test_bytesio() -> None: +def test_bytesio(test_card: ImageFile.ImageFile) -> None: with open("Tests/images/test-card-lossless.jp2", "rb") as f: data = BytesIO(f.read()) with Image.open(data) as im: @@ -86,7 +95,7 @@ def test_bytesio() -> None: # PIL (they were made using Adobe Photoshop) -def test_lossless(tmp_path: Path) -> None: +def test_lossless(test_card: ImageFile.ImageFile, tmp_path: Path) -> None: with Image.open("Tests/images/test-card-lossless.jp2") as im: im.load() outfile = str(tmp_path / "temp_test-card.png") @@ -94,54 +103,56 @@ def test_lossless(tmp_path: Path) -> None: assert_image_similar(im, test_card, 1.0e-3) -def test_lossy_tiled() -> None: +def test_lossy_tiled(test_card: ImageFile.ImageFile) -> None: assert_image_similar_tofile( test_card, "Tests/images/test-card-lossy-tiled.jp2", 2.0 ) -def test_lossless_rt() -> None: +def test_lossless_rt(test_card: ImageFile.ImageFile) -> None: im = roundtrip(test_card) assert_image_equal(im, test_card) -def test_lossy_rt() -> None: +def test_lossy_rt(test_card: ImageFile.ImageFile) -> None: im = roundtrip(test_card, quality_layers=[20]) assert_image_similar(im, test_card, 2.0) -def test_tiled_rt() -> None: +def test_tiled_rt(test_card: ImageFile.ImageFile) -> None: im = roundtrip(test_card, tile_size=(128, 128)) assert_image_equal(im, test_card) -def test_tiled_offset_rt() -> None: +def test_tiled_offset_rt(test_card: ImageFile.ImageFile) -> None: im = roundtrip(test_card, tile_size=(128, 128), tile_offset=(0, 0), offset=(32, 32)) assert_image_equal(im, test_card) -def test_tiled_offset_too_small() -> None: +def test_tiled_offset_too_small(test_card: ImageFile.ImageFile) -> None: with pytest.raises(ValueError): roundtrip(test_card, tile_size=(128, 128), tile_offset=(0, 0), offset=(128, 32)) -def test_irreversible_rt() -> None: +def test_irreversible_rt(test_card: ImageFile.ImageFile) -> None: im = roundtrip(test_card, irreversible=True, quality_layers=[20]) assert_image_similar(im, test_card, 2.0) -def test_prog_qual_rt() -> None: +def test_prog_qual_rt(test_card: ImageFile.ImageFile) -> None: im = roundtrip(test_card, quality_layers=[60, 40, 20], progression="LRCP") assert_image_similar(im, test_card, 2.0) -def test_prog_res_rt() -> None: +def test_prog_res_rt(test_card: ImageFile.ImageFile) -> None: im = roundtrip(test_card, num_resolutions=8, progression="RLCP") assert_image_equal(im, test_card) @pytest.mark.parametrize("num_resolutions", range(2, 6)) -def test_default_num_resolutions(num_resolutions: int) -> None: +def test_default_num_resolutions( + test_card: ImageFile.ImageFile, num_resolutions: int +) -> None: d = 1 << (num_resolutions - 1) im = test_card.resize((d - 1, d - 1)) with pytest.raises(OSError): @@ -205,7 +216,7 @@ def test_header_errors() -> None: pass -def test_layers_type(tmp_path: Path) -> None: +def test_layers_type(test_card: ImageFile.ImageFile, tmp_path: Path) -> None: outfile = str(tmp_path / "temp_layers.jp2") for quality_layers in [[100, 50, 10], (100, 50, 10), None]: test_card.save(outfile, quality_layers=quality_layers) @@ -215,7 +226,7 @@ def test_layers_type(tmp_path: Path) -> None: test_card.save(outfile, quality_layers=quality_layers_str) -def test_layers() -> None: +def test_layers(test_card: ImageFile.ImageFile) -> None: out = BytesIO() test_card.save(out, "JPEG2000", quality_layers=[100, 50, 10], progression="LRCP") out.seek(0) @@ -245,7 +256,13 @@ def test_layers() -> None: (None, {"no_jp2": False}, 4, b"jP"), ), ) -def test_no_jp2(name: str, args: dict[str, bool], offset: int, data: bytes) -> None: +def test_no_jp2( + test_card: ImageFile.ImageFile, + name: str, + args: dict[str, bool], + offset: int, + data: bytes, +) -> None: out = BytesIO() if name: out.name = name @@ -254,7 +271,7 @@ def test_no_jp2(name: str, args: dict[str, bool], offset: int, data: bytes) -> N assert out.read(2) == data -def test_mct() -> None: +def test_mct(test_card: ImageFile.ImageFile) -> None: # Three component for val in (0, 1): out = BytesIO() @@ -419,7 +436,7 @@ def test_comment() -> None: pass -def test_save_comment() -> None: +def test_save_comment(test_card: ImageFile.ImageFile) -> None: for comment in ("Created by Pillow", b"Created by Pillow"): out = BytesIO() test_card.save(out, "JPEG2000", comment=comment) @@ -457,7 +474,7 @@ def test_crashes(test_file: str) -> None: @skip_unless_feature_version("jpg_2000", "2.4.0") -def test_plt_marker() -> None: +def test_plt_marker(test_card: ImageFile.ImageFile) -> None: # Search the start of the codesteam for PLT out = BytesIO() test_card.save(out, "JPEG2000", no_jp2=True, plt=True) From 55579084cd57461517dfe77d7804dfa24219a9f6 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 19 Oct 2024 20:40:13 +1100 Subject: [PATCH 530/662] Corrected EMF DPI --- Tests/test_file_wmf.py | 7 +++++++ src/PIL/WmfImagePlugin.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Tests/test_file_wmf.py b/Tests/test_file_wmf.py index 79e707263..424640d7b 100644 --- a/Tests/test_file_wmf.py +++ b/Tests/test_file_wmf.py @@ -1,5 +1,6 @@ from __future__ import annotations +from io import BytesIO from pathlib import Path from typing import IO @@ -61,6 +62,12 @@ def test_load_float_dpi() -> None: with Image.open("Tests/images/drawing.emf") as im: assert im.info["dpi"] == 1423.7668161434979 + with open("Tests/images/drawing.emf", "rb") as fp: + data = fp.read() + b = BytesIO(data[:8] + b"\x06\xFA" + data[10:]) + with Image.open(b) as im: + assert im.info["dpi"][0] == 2540 + def test_load_set_dpi() -> None: with Image.open("Tests/images/drawing.wmf") as im: diff --git a/src/PIL/WmfImagePlugin.py b/src/PIL/WmfImagePlugin.py index 68f8a74f5..cad6c98d5 100644 --- a/src/PIL/WmfImagePlugin.py +++ b/src/PIL/WmfImagePlugin.py @@ -128,7 +128,7 @@ class WmfStubImageFile(ImageFile.StubImageFile): size = x1 - x0, y1 - y0 # calculate dots per inch from bbox and frame - xdpi = 2540.0 * (x1 - y0) / (frame[2] - frame[0]) + xdpi = 2540.0 * (x1 - x0) / (frame[2] - frame[0]) ydpi = 2540.0 * (y1 - y0) / (frame[3] - frame[1]) self.info["wmf_bbox"] = x0, y0, x1, y1 From beb32bbb1f9bb713a840421e3e9f5191d5f51944 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 00:18:00 +0000 Subject: [PATCH 531/662] Update dependency mypy to v1.12.1 --- .ci/requirements-mypy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-mypy.txt b/.ci/requirements-mypy.txt index 852444d37..047307bb5 100644 --- a/.ci/requirements-mypy.txt +++ b/.ci/requirements-mypy.txt @@ -1,4 +1,4 @@ -mypy==1.12.0 +mypy==1.12.1 IceSpringPySideStubs-PyQt6 IceSpringPySideStubs-PySide6 ipython From 22c05e232c67343b193b9fdeca9e7b683d470bc6 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 22 Oct 2024 17:56:02 +1100 Subject: [PATCH 532/662] Update license to MIT-CMU --- LICENSE | 2 +- docs/about.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 7990a6e57..8837c290c 100644 --- a/LICENSE +++ b/LICENSE @@ -7,7 +7,7 @@ Pillow is the friendly PIL fork. It is Copyright © 2010-2024 by Jeffrey A. Clark and contributors -Like PIL, Pillow is licensed under the open source HPND License: +Like PIL, Pillow is licensed under the open source MIT-CMU License: By obtaining, using, and/or copying this software and/or its associated documentation, you agree that you have read, understood, and will comply diff --git a/docs/about.rst b/docs/about.rst index 98cdd8e5a..c51ddebd0 100644 --- a/docs/about.rst +++ b/docs/about.rst @@ -18,7 +18,7 @@ The fork author's goal is to foster and support active development of PIL throug License ------- -Like PIL, Pillow is `licensed under the open source HPND License `_ +Like PIL, Pillow is `licensed under the open source MIT-CMU License `_ Why a fork? ----------- From 6a55f2df0346e3d97515ee46e4dbb966886fdc94 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 02:36:15 +0000 Subject: [PATCH 533/662] Update dependency mypy to v1.13.0 --- .ci/requirements-mypy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-mypy.txt b/.ci/requirements-mypy.txt index 047307bb5..c84a3533b 100644 --- a/.ci/requirements-mypy.txt +++ b/.ci/requirements-mypy.txt @@ -1,4 +1,4 @@ -mypy==1.12.1 +mypy==1.13.0 IceSpringPySideStubs-PyQt6 IceSpringPySideStubs-PySide6 ipython From 8af2d7640ead3ddeba9fdc598dc8e72d580dfdfb Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 24 Oct 2024 23:26:13 +1100 Subject: [PATCH 534/662] Pass palette mode to putpalette --- Tests/test_file_gif.py | 6 ++++-- src/PIL/GifImagePlugin.py | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py index 16c8466f3..4eb8c0d02 100644 --- a/Tests/test_file_gif.py +++ b/Tests/test_file_gif.py @@ -4,6 +4,7 @@ import warnings from collections.abc import Generator from io import BytesIO from pathlib import Path +from typing import Any import pytest @@ -1431,7 +1432,8 @@ def test_saving_rgba(tmp_path: Path) -> None: assert reloaded_rgba.load()[0, 0][3] == 0 -def test_optimizing_p_rgba(tmp_path: Path) -> None: +@pytest.mark.parametrize("params", ({}, {"disposal": 2, "optimize": False})) +def test_p_rgba(tmp_path: Path, params: dict[str, Any]) -> None: out = str(tmp_path / "temp.gif") im1 = Image.new("P", (100, 100)) @@ -1443,7 +1445,7 @@ def test_optimizing_p_rgba(tmp_path: Path) -> None: im2 = Image.new("P", (100, 100)) im2.putpalette(data, "RGBA") - im1.save(out, save_all=True, append_images=[im2]) + im1.save(out, save_all=True, append_images=[im2], **params) with Image.open(out) as reloaded: assert reloaded.n_frames == 2 diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py index a7c4f8b2c..47022d584 100644 --- a/src/PIL/GifImagePlugin.py +++ b/src/PIL/GifImagePlugin.py @@ -695,8 +695,9 @@ def _write_multiple_frames( ) background = _get_background(im_frame, color) background_im = Image.new("P", im_frame.size, background) - assert im_frames[0].im.palette is not None - background_im.putpalette(im_frames[0].im.palette) + first_palette = im_frames[0].im.palette + assert first_palette is not None + background_im.putpalette(first_palette, first_palette.mode) bbox = _getbbox(background_im, im_frame)[1] elif encoderinfo.get("optimize") and im_frame.mode != "1": if "transparency" not in encoderinfo: From c8e301c47456114f245261fccd316b4fd8964f3e Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Thu, 24 Oct 2024 15:52:59 +0200 Subject: [PATCH 535/662] Fix SEGFAULT from calling FT_New_Face/FT_Done_Face in multiple threads --- src/_imagingft.c | 12 +- src/thirdparty/pythoncapi_compat.h | 341 ++++++++++++++++++++++++++++- 2 files changed, 351 insertions(+), 2 deletions(-) diff --git a/src/_imagingft.c b/src/_imagingft.c index 7f2464124..6fed821bc 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -81,7 +81,10 @@ struct { /* -------------------------------------------------------------------- */ /* font objects */ - static FT_Library library; +static FT_Library library; +#ifdef Py_GIL_DISABLED +PyMutex ft_library_mutex; +#endif typedef struct { PyObject_HEAD FT_Face face; @@ -187,7 +190,9 @@ getfont(PyObject *self_, PyObject *args, PyObject *kw) { if (filename && font_bytes_size <= 0) { self->font_bytes = NULL; + MUTEX_LOCK(&ft_library_mutex); error = FT_New_Face(library, filename, index, &self->face); + MUTEX_UNLOCK(&ft_library_mutex); } else { /* need to have allocated storage for font_bytes for the life of the object.*/ /* Don't free this before FT_Done_Face */ @@ -197,6 +202,7 @@ getfont(PyObject *self_, PyObject *args, PyObject *kw) { } if (!error) { memcpy(self->font_bytes, font_bytes, (size_t)font_bytes_size); + MUTEX_LOCK(&ft_library_mutex); error = FT_New_Memory_Face( library, (FT_Byte *)self->font_bytes, @@ -204,6 +210,7 @@ getfont(PyObject *self_, PyObject *args, PyObject *kw) { index, &self->face ); + MUTEX_UNLOCK(&ft_library_mutex); } } @@ -1433,7 +1440,9 @@ font_setvaraxes(FontObject *self, PyObject *args) { static void font_dealloc(FontObject *self) { if (self->face) { + MUTEX_LOCK(&ft_library_mutex); FT_Done_Face(self->face); + MUTEX_UNLOCK(&ft_library_mutex); } if (self->font_bytes) { PyMem_Free(self->font_bytes); @@ -1639,6 +1648,7 @@ PyInit__imagingft(void) { } #ifdef Py_GIL_DISABLED + ft_library_mutex = (PyMutex) {0}; PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED); #endif diff --git a/src/thirdparty/pythoncapi_compat.h b/src/thirdparty/pythoncapi_compat.h index 51e8c0de7..ca23d5ffa 100644 --- a/src/thirdparty/pythoncapi_compat.h +++ b/src/thirdparty/pythoncapi_compat.h @@ -7,7 +7,10 @@ // https://github.com/python/pythoncapi_compat // // Latest version: -// https://raw.githubusercontent.com/python/pythoncapi_compat/master/pythoncapi_compat.h +// https://raw.githubusercontent.com/python/pythoncapi-compat/main/pythoncapi_compat.h +// +// This file was vendored from the following commit: +// https://github.com/python/pythoncapi-compat/commit/0041177c4f348c8952b4c8980b2c90856e61c7c7 // // SPDX-License-Identifier: 0BSD @@ -45,6 +48,13 @@ extern "C" { # define _PyObject_CAST(op) _Py_CAST(PyObject*, op) #endif +#ifndef Py_BUILD_ASSERT +# define Py_BUILD_ASSERT(cond) \ + do { \ + (void)sizeof(char [1 - 2 * !(cond)]); \ + } while(0) +#endif + // bpo-42262 added Py_NewRef() to Python 3.10.0a3 #if PY_VERSION_HEX < 0x030A00A3 && !defined(Py_NewRef) @@ -1338,6 +1348,166 @@ PyDict_SetDefaultRef(PyObject *d, PyObject *key, PyObject *default_value, } #endif +#if PY_VERSION_HEX < 0x030D00B3 +# define Py_BEGIN_CRITICAL_SECTION(op) { +# define Py_END_CRITICAL_SECTION() } +# define Py_BEGIN_CRITICAL_SECTION2(a, b) { +# define Py_END_CRITICAL_SECTION2() } +#endif + +#if PY_VERSION_HEX < 0x030E0000 && PY_VERSION_HEX >= 0x03060000 && !defined(PYPY_VERSION) +typedef struct PyUnicodeWriter PyUnicodeWriter; + +static inline void PyUnicodeWriter_Discard(PyUnicodeWriter *writer) +{ + _PyUnicodeWriter_Dealloc((_PyUnicodeWriter*)writer); + PyMem_Free(writer); +} + +static inline PyUnicodeWriter* PyUnicodeWriter_Create(Py_ssize_t length) +{ + if (length < 0) { + PyErr_SetString(PyExc_ValueError, + "length must be positive"); + return NULL; + } + + const size_t size = sizeof(_PyUnicodeWriter); + PyUnicodeWriter *pub_writer = (PyUnicodeWriter *)PyMem_Malloc(size); + if (pub_writer == _Py_NULL) { + PyErr_NoMemory(); + return _Py_NULL; + } + _PyUnicodeWriter *writer = (_PyUnicodeWriter *)pub_writer; + + _PyUnicodeWriter_Init(writer); + if (_PyUnicodeWriter_Prepare(writer, length, 127) < 0) { + PyUnicodeWriter_Discard(pub_writer); + return NULL; + } + writer->overallocate = 1; + return pub_writer; +} + +static inline PyObject* PyUnicodeWriter_Finish(PyUnicodeWriter *writer) +{ + PyObject *str = _PyUnicodeWriter_Finish((_PyUnicodeWriter*)writer); + assert(((_PyUnicodeWriter*)writer)->buffer == NULL); + PyMem_Free(writer); + return str; +} + +static inline int +PyUnicodeWriter_WriteChar(PyUnicodeWriter *writer, Py_UCS4 ch) +{ + if (ch > 0x10ffff) { + PyErr_SetString(PyExc_ValueError, + "character must be in range(0x110000)"); + return -1; + } + + return _PyUnicodeWriter_WriteChar((_PyUnicodeWriter*)writer, ch); +} + +static inline int +PyUnicodeWriter_WriteStr(PyUnicodeWriter *writer, PyObject *obj) +{ + PyObject *str = PyObject_Str(obj); + if (str == NULL) { + return -1; + } + + int res = _PyUnicodeWriter_WriteStr((_PyUnicodeWriter*)writer, str); + Py_DECREF(str); + return res; +} + +static inline int +PyUnicodeWriter_WriteRepr(PyUnicodeWriter *writer, PyObject *obj) +{ + PyObject *str = PyObject_Repr(obj); + if (str == NULL) { + return -1; + } + + int res = _PyUnicodeWriter_WriteStr((_PyUnicodeWriter*)writer, str); + Py_DECREF(str); + return res; +} + +static inline int +PyUnicodeWriter_WriteUTF8(PyUnicodeWriter *writer, + const char *str, Py_ssize_t size) +{ + if (size < 0) { + size = (Py_ssize_t)strlen(str); + } + + PyObject *str_obj = PyUnicode_FromStringAndSize(str, size); + if (str_obj == _Py_NULL) { + return -1; + } + + int res = _PyUnicodeWriter_WriteStr((_PyUnicodeWriter*)writer, str_obj); + Py_DECREF(str_obj); + return res; +} + +static inline int +PyUnicodeWriter_WriteWideChar(PyUnicodeWriter *writer, + const wchar_t *str, Py_ssize_t size) +{ + if (size < 0) { + size = (Py_ssize_t)wcslen(str); + } + + PyObject *str_obj = PyUnicode_FromWideChar(str, size); + if (str_obj == _Py_NULL) { + return -1; + } + + int res = _PyUnicodeWriter_WriteStr((_PyUnicodeWriter*)writer, str_obj); + Py_DECREF(str_obj); + return res; +} + +static inline int +PyUnicodeWriter_WriteSubstring(PyUnicodeWriter *writer, PyObject *str, + Py_ssize_t start, Py_ssize_t end) +{ + if (!PyUnicode_Check(str)) { + PyErr_Format(PyExc_TypeError, "expect str, not %T", str); + return -1; + } + if (start < 0 || start > end) { + PyErr_Format(PyExc_ValueError, "invalid start argument"); + return -1; + } + if (end > PyUnicode_GET_LENGTH(str)) { + PyErr_Format(PyExc_ValueError, "invalid end argument"); + return -1; + } + + return _PyUnicodeWriter_WriteSubstring((_PyUnicodeWriter*)writer, str, + start, end); +} + +static inline int +PyUnicodeWriter_Format(PyUnicodeWriter *writer, const char *format, ...) +{ + va_list vargs; + va_start(vargs, format); + PyObject *str = PyUnicode_FromFormatV(format, vargs); + va_end(vargs); + if (str == _Py_NULL) { + return -1; + } + + int res = _PyUnicodeWriter_WriteStr((_PyUnicodeWriter*)writer, str); + Py_DECREF(str); + return res; +} +#endif // PY_VERSION_HEX < 0x030E0000 // gh-116560 added PyLong_GetSign() to Python 3.14.0a0 #if PY_VERSION_HEX < 0x030E00A0 @@ -1354,6 +1524,175 @@ static inline int PyLong_GetSign(PyObject *obj, int *sign) #endif +// gh-124502 added PyUnicode_Equal() to Python 3.14.0a0 +#if PY_VERSION_HEX < 0x030E00A0 +static inline int PyUnicode_Equal(PyObject *str1, PyObject *str2) +{ + if (!PyUnicode_Check(str1)) { + PyErr_Format(PyExc_TypeError, "first argument must be str, not %s", + Py_TYPE(str1)->tp_name); + return -1; + } + if (!PyUnicode_Check(str2)) { + PyErr_Format(PyExc_TypeError, "second argument must be str, not %s", + Py_TYPE(str2)->tp_name); + return -1; + } + +#if PY_VERSION_HEX >= 0x030d0000 && !defined(PYPY_VERSION) + PyAPI_FUNC(int) _PyUnicode_Equal(PyObject *str1, PyObject *str2); + + return _PyUnicode_Equal(str1, str2); +#elif PY_VERSION_HEX >= 0x03060000 && !defined(PYPY_VERSION) + return _PyUnicode_EQ(str1, str2); +#elif PY_VERSION_HEX >= 0x03090000 && defined(PYPY_VERSION) + return _PyUnicode_EQ(str1, str2); +#else + return (PyUnicode_Compare(str1, str2) == 0); +#endif +} +#endif + + +// gh-121645 added PyBytes_Join() to Python 3.14.0a0 +#if PY_VERSION_HEX < 0x030E00A0 +static inline PyObject* PyBytes_Join(PyObject *sep, PyObject *iterable) +{ + return _PyBytes_Join(sep, iterable); +} +#endif + + +#if PY_VERSION_HEX < 0x030E00A0 +static inline Py_hash_t Py_HashBuffer(const void *ptr, Py_ssize_t len) +{ +#if PY_VERSION_HEX >= 0x03000000 && !defined(PYPY_VERSION) + PyAPI_FUNC(Py_hash_t) _Py_HashBytes(const void *src, Py_ssize_t len); + + return _Py_HashBytes(ptr, len); +#else + Py_hash_t hash; + PyObject *bytes = PyBytes_FromStringAndSize((const char*)ptr, len); + if (bytes == NULL) { + return -1; + } + hash = PyObject_Hash(bytes); + Py_DECREF(bytes); + return hash; +#endif +} +#endif + + +#if PY_VERSION_HEX < 0x030E00A0 +static inline int PyIter_NextItem(PyObject *iter, PyObject **item) +{ + iternextfunc tp_iternext; + + assert(iter != NULL); + assert(item != NULL); + + tp_iternext = Py_TYPE(iter)->tp_iternext; + if (tp_iternext == NULL) { + *item = NULL; + PyErr_Format(PyExc_TypeError, "expected an iterator, got '%s'", + Py_TYPE(iter)->tp_name); + return -1; + } + + if ((*item = tp_iternext(iter))) { + return 1; + } + if (!PyErr_Occurred()) { + return 0; + } + if (PyErr_ExceptionMatches(PyExc_StopIteration)) { + PyErr_Clear(); + return 0; + } + return -1; +} +#endif + + +#if PY_VERSION_HEX < 0x030E00A0 +static inline PyObject* PyLong_FromInt32(int32_t value) +{ + Py_BUILD_ASSERT(sizeof(long) >= 4); + return PyLong_FromLong(value); +} + +static inline PyObject* PyLong_FromInt64(int64_t value) +{ + Py_BUILD_ASSERT(sizeof(long long) >= 8); + return PyLong_FromLongLong(value); +} + +static inline PyObject* PyLong_FromUInt32(uint32_t value) +{ + Py_BUILD_ASSERT(sizeof(unsigned long) >= 4); + return PyLong_FromUnsignedLong(value); +} + +static inline PyObject* PyLong_FromUInt64(uint64_t value) +{ + Py_BUILD_ASSERT(sizeof(unsigned long long) >= 8); + return PyLong_FromUnsignedLongLong(value); +} + +static inline int PyLong_AsInt32(PyObject *obj, int32_t *pvalue) +{ + Py_BUILD_ASSERT(sizeof(int) == 4); + int value = PyLong_AsInt(obj); + if (value == -1 && PyErr_Occurred()) { + return -1; + } + *pvalue = (int32_t)value; + return 0; +} + +static inline int PyLong_AsInt64(PyObject *obj, int64_t *pvalue) +{ + Py_BUILD_ASSERT(sizeof(long long) == 8); + long long value = PyLong_AsLongLong(obj); + if (value == -1 && PyErr_Occurred()) { + return -1; + } + *pvalue = (int64_t)value; + return 0; +} + +static inline int PyLong_AsUInt32(PyObject *obj, uint32_t *pvalue) +{ + Py_BUILD_ASSERT(sizeof(long) >= 4); + unsigned long value = PyLong_AsUnsignedLong(obj); + if (value == (unsigned long)-1 && PyErr_Occurred()) { + return -1; + } +#if SIZEOF_LONG > 4 + if ((unsigned long)UINT32_MAX < value) { + PyErr_SetString(PyExc_OverflowError, + "Python int too large to convert to C uint32_t"); + return -1; + } +#endif + *pvalue = (uint32_t)value; + return 0; +} + +static inline int PyLong_AsUInt64(PyObject *obj, uint64_t *pvalue) +{ + Py_BUILD_ASSERT(sizeof(long long) == 8); + unsigned long long value = PyLong_AsUnsignedLongLong(obj); + if (value == (unsigned long long)-1 && PyErr_Occurred()) { + return -1; + } + *pvalue = (uint64_t)value; + return 0; +} +#endif + + #ifdef __cplusplus } #endif From 7999da38a7ff5aa359aa6ae3a7f88b835c7f7f06 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:07:43 +0000 Subject: [PATCH 536/662] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/_imagingft.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/_imagingft.c b/src/_imagingft.c index 6fed821bc..884b8f96c 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -81,7 +81,7 @@ struct { /* -------------------------------------------------------------------- */ /* font objects */ -static FT_Library library; + static FT_Library library; #ifdef Py_GIL_DISABLED PyMutex ft_library_mutex; #endif @@ -1648,7 +1648,7 @@ PyInit__imagingft(void) { } #ifdef Py_GIL_DISABLED - ft_library_mutex = (PyMutex) {0}; + ft_library_mutex = (PyMutex){0}; PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED); #endif From 0fe55d611505fefaaa0d4b7b3a87b803714762de Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 25 Oct 2024 09:23:13 +0800 Subject: [PATCH 537/662] Isolate macOS build from Homebrew. --- .github/workflows/wheels-dependencies.sh | 96 ++++++++++++++++++------ .github/workflows/wheels-test.sh | 15 ++-- .gitignore | 1 + pyproject.toml | 7 ++ setup.py | 94 +++++++++++++---------- wheels/multibuild | 2 +- 6 files changed, 140 insertions(+), 75 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 97c1adf09..35b04c6d6 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -23,6 +23,8 @@ OPENJPEG_VERSION=2.5.2 XZ_VERSION=5.6.3 TIFF_VERSION=4.6.0 LCMS2_VERSION=2.16 +RAQM_VERSION=0.7.1 +FRIBIDI_VERSION=1.0.16 if [[ -n "$IS_MACOS" ]]; then GIFLIB_VERSION=5.2.2 else @@ -38,7 +40,23 @@ BZIP2_VERSION=1.0.8 LIBXCB_VERSION=1.17.0 BROTLI_VERSION=1.1.0 +function build_pkg_config { + if [ -e pkg-config-stamp ]; then return; fi + # This essentially duplicates the Homebrew recipe: + # https://github.com/Homebrew/homebrew-core/blob/master/Formula/p/pkg-config.rb + ORIGINAL_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -Wno-int-conversion" + build_simple pkg-config 0.29.2 https://pkg-config.freedesktop.org/releases tar.gz \ + --disable-debug --disable-host-tool --with-internal-glib \ + --with-pc-path=$BUILD_PREFIX/share/pkgconfig:$BUILD_PREFIX/lib/pkgconfig \ + --with-system-include-path=$(xcrun --show-sdk-path --sdk macosx)/usr/include + CFLAGS=$ORIGINAL_CFLAGS + export PKG_CONFIG=$BUILD_PREFIX/bin/pkg-config + touch pkg-config-stamp +} + function build_brotli { + if [ -e brotli-stamp ]; then return; fi local cmake=$(get_modern_cmake) local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-$BROTLI_VERSION.tar.gz) (cd $out_dir \ @@ -48,25 +66,25 @@ function build_brotli { cp /usr/local/lib64/libbrotli* /usr/local/lib cp /usr/local/lib64/pkgconfig/libbrotli* /usr/local/lib/pkgconfig fi + touch brotli-stamp } function build_harfbuzz { - python3 -m pip install meson ninja + if [ -e harfbuzz-stamp ]; then return; fi + python -m pip install meson ninja local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz) (cd $out_dir \ - && meson setup build --buildtype=release -Dfreetype=enabled -Dglib=disabled) + && meson setup build --prefix=$BUILD_PREFIX --buildtype=release -Dfreetype=enabled -Dglib=disabled) (cd $out_dir/build \ && meson install) if [[ "$MB_ML_LIBC" == "manylinux" ]]; then cp /usr/local/lib64/libharfbuzz* /usr/local/lib fi + touch harfbuzz-stamp } function build { - if [[ -n "$IS_MACOS" ]] && [[ "$CIBW_ARCHS" == "arm64" ]]; then - sudo chown -R runner /usr/local - fi build_xz if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then yum remove -y zlib-devel @@ -77,17 +95,23 @@ function build { if [ -n "$IS_MACOS" ]; then build_simple xorgproto 2024.1 https://www.x.org/pub/individual/proto build_simple libXau 1.0.11 https://www.x.org/pub/individual/lib + build_simple libXdmcp 1.1.5 https://www.x.org/pub/individual/lib build_simple libpthread-stubs 0.5 https://xcb.freedesktop.org/dist - if [[ "$CIBW_ARCHS" == "arm64" ]]; then - cp /usr/local/share/pkgconfig/xcb-proto.pc /usr/local/lib/pkgconfig - fi else sed s/\${pc_sysrootdir\}// /usr/local/share/pkgconfig/xcb-proto.pc > /usr/local/lib/pkgconfig/xcb-proto.pc fi build_simple libxcb $LIBXCB_VERSION https://www.x.org/releases/individual/lib build_libjpeg_turbo - build_tiff + if [ -n "$IS_MACOS" ]; then + # Custom tiff build to include jpeg; by default, configure won't include + # headers/libs in the custom macOS prefix + build_simple tiff $TIFF_VERSION https://download.osgeo.org/libtiff tar.gz \ + --with-jpeg-include-dir=$BUILD_PREFIX/include --with-jpeg-lib-dir=$BUILD_PREFIX/lib + else + build_tiff + fi + build_libpng build_lcms2 build_openjpeg @@ -113,33 +137,55 @@ function build { fi build_harfbuzz + + if [ -n "$IS_MACOS" ]; then + build_simple fribidi $FRIBIDI_VERSION https://github.com/fribidi/fribidi/releases/download/v$FRIBIDI_VERSION tar.xz --enable-shared + build_simple raqm $RAQM_VERSION https://github.com/Host_Oman/libraqm/releases/download/v$RAQM_VERSION tar.gz --enable-shared + fi } +# Perform all dependency builds in the build subfolder. +mkdir -p build +pushd build > /dev/null + # Any stuff that you need to do before you start building the wheels # Runs in the root directory of this repository. -curl -fsSL -o pillow-depends-main.zip https://github.com/python-pillow/pillow-depends/archive/main.zip -untar pillow-depends-main.zip +if [[ ! -d pillow-depends-main ]]; then + if [[ ! -f pillow-depends-main.zip ]]; then + echo "Download pillow dependency sources..." + curl -fSL -o pillow-depends-main.zip https://github.com/python-pillow/pillow-depends/archive/main.zip + fi + untar pillow-depends-main.zip +fi if [[ -n "$IS_MACOS" ]]; then - # libtiff and libxcb cause a conflict with building libtiff and libxcb - # libxau and libxdmcp cause an issue on macOS < 11 - # remove cairo to fix building harfbuzz on arm64 - # remove lcms2 and libpng to fix building openjpeg on arm64 - # remove jpeg-turbo to avoid inclusion on arm64 - # remove webp and zstd to avoid inclusion on x86_64 - # curl from brew requires zstd, use system curl - brew remove --ignore-dependencies libpng libtiff libxcb libxau libxdmcp curl cairo lcms2 zstd - if [[ "$CIBW_ARCHS" == "arm64" ]]; then - brew remove --ignore-dependencies jpeg-turbo - else - brew remove --ignore-dependencies webp - fi + # Build and install into the `deps` folder. + BUILD_PREFIX=$(pwd)/deps - brew install pkg-config + # Homebrew (or similar packaging environments) install can contain some of + # the libraries that we're going to build. However, they may be compiled + # with a MACOSX_DEPLOYMENT_TARGET that doesn't match what we want to use, + # and they may bring in other dependencies that we don't want. The same will + # be true of any other locations on the path. To avoid conflicts, strip the + # path down to the bare mimimum (which, on macOS, won't include any + # development dependencies). + export PATH="$BUILD_PREFIX/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:$(dirname $(which python))" + export CMAKE_PREFIX_PATH=$BUILD_PREFIX + + # Link the brew command into our isolated build directory. + mkdir -p "$BUILD_PREFIX/bin" + mkdir -p "$BUILD_PREFIX/lib" + + # Ensure pkg-confg and cmake are available + build_pkg_config + python -m pip install cmake fi wrap_wheel_builder build +# Return to the project root to finish the build +popd > /dev/null + # Append licenses for filename in wheels/dependency_licenses/*; do echo -e "\n\n----\n\n$(basename $filename | cut -f 1 -d '.')\n" | cat >> LICENSE diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh index b30b1725f..05f5162c7 100755 --- a/.github/workflows/wheels-test.sh +++ b/.github/workflows/wheels-test.sh @@ -1,16 +1,13 @@ #!/bin/bash set -e -if [[ "$OSTYPE" == "darwin"* ]]; then - brew install fribidi - export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig" - if [ -f /opt/homebrew/lib/libfribidi.dylib ]; then - sudo cp /opt/homebrew/lib/libfribidi.dylib /usr/local/lib +# For Unix, Ensure fibidi is installed by the system. +if [[ "$OSTYPE" != "darwin"* ]]; then + if [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then + apk add curl fribidi + else + yum install -y fribidi fi -elif [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then - apk add curl fribidi -else - yum install -y fribidi fi python3 -m pip install numpy diff --git a/.gitignore b/.gitignore index 1dd6c9175..9b5773257 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ lib64/ parts/ sdist/ var/ +wheelhouse/ *.egg-info/ .installed.cfg *.egg diff --git a/pyproject.toml b/pyproject.toml index c55be7693..53546f0ab 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -93,10 +93,17 @@ version = { attr = "PIL.__version__" } [tool.cibuildwheel] before-all = ".github/workflows/wheels-dependencies.sh" build-verbosity = 1 + config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable" +# Add an explicit dependencies prefix for macOS, and don't request vendored libraries. +macos.config-settings = "raqm=enable imagequant=disable dependencies-prefix=./build/deps" + test-command = "cd {project} && .github/workflows/wheels-test.sh" test-extras = "tests" +[tool.cibuildwheel.macos.environment] +PATH = "$(pwd)/build/deps/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:$(dirname $(which python))" + [tool.black] exclude = "wheels/multibuild" diff --git a/setup.py b/setup.py index 60707083f..cb1da7c73 100644 --- a/setup.py +++ b/setup.py @@ -344,6 +344,11 @@ class pil_build_ext(build_ext): for x in ("raqm", "fribidi") ] + [ + ( + "dependencies-prefix", + None, + "The prefix where build dependencies are located.", + ), ("disable-platform-guessing", None, "Disable platform guessing on Linux"), ("debug", None, "Debug logging"), ] @@ -355,6 +360,7 @@ class pil_build_ext(build_ext): return True if value in configuration.get(option, []) else None def initialize_options(self) -> None: + self.dependencies_prefix = configuration.get("dependencies-prefix", []) self.disable_platform_guessing = self.check_configuration( "platform-guessing", "disable" ) @@ -564,48 +570,56 @@ class pil_build_ext(build_ext): ) elif sys.platform == "darwin": - # attempt to make sure we pick freetype2 over other versions - _add_directory(include_dirs, "/sw/include/freetype2") - _add_directory(include_dirs, "/sw/lib/freetype2/include") - # fink installation directories - _add_directory(library_dirs, "/sw/lib") - _add_directory(include_dirs, "/sw/include") - # darwin ports installation directories - _add_directory(library_dirs, "/opt/local/lib") - _add_directory(include_dirs, "/opt/local/include") - - # if Homebrew is installed, use its lib and include directories - try: - prefix = ( - subprocess.check_output(["brew", "--prefix"]) - .strip() - .decode("latin1") - ) - except Exception: - # Homebrew not installed - prefix = None - - ft_prefix = None - - if prefix: - # add Homebrew's include and lib directories - _add_directory(library_dirs, os.path.join(prefix, "lib")) - _add_directory(include_dirs, os.path.join(prefix, "include")) - _add_directory( - include_dirs, os.path.join(prefix, "opt", "zlib", "include") - ) - ft_prefix = os.path.join(prefix, "opt", "freetype") - - if ft_prefix and os.path.isdir(ft_prefix): - # freetype might not be linked into Homebrew's prefix - _add_directory(library_dirs, os.path.join(ft_prefix, "lib")) - _add_directory(include_dirs, os.path.join(ft_prefix, "include")) + if self.dependencies_prefix: + # Use the explicitly provided prefixes for dependencies. + for prefix in self.dependencies_prefix: + _add_directory(library_dirs, os.path.join(prefix, "lib")) + _add_directory(include_dirs, os.path.join(prefix, "include")) else: - # fall back to freetype from XQuartz if - # Homebrew's freetype is missing - _add_directory(library_dirs, "/usr/X11/lib") - _add_directory(include_dirs, "/usr/X11/include") + # Guess the dependency locations based on homebrew/fink/macports + # attempt to make sure we pick freetype2 over other versions + _add_directory(include_dirs, "/sw/include/freetype2") + _add_directory(include_dirs, "/sw/lib/freetype2/include") + # fink installation directories + _add_directory(library_dirs, "/sw/lib") + _add_directory(include_dirs, "/sw/include") + # darwin ports installation directories + _add_directory(library_dirs, "/opt/local/lib") + _add_directory(include_dirs, "/opt/local/include") + # if Homebrew is installed, use its lib and include directories + try: + prefix = ( + subprocess.check_output(["brew", "--prefix"]) + .strip() + .decode("latin1") + ) + except Exception: + # Homebrew not installed + prefix = None + + ft_prefix = None + + if prefix: + # add Homebrew's include and lib directories + _add_directory(library_dirs, os.path.join(prefix, "lib")) + _add_directory(include_dirs, os.path.join(prefix, "include")) + _add_directory( + include_dirs, os.path.join(prefix, "opt", "zlib", "include") + ) + ft_prefix = os.path.join(prefix, "opt", "freetype") + + if ft_prefix and os.path.isdir(ft_prefix): + # freetype might not be linked into Homebrew's prefix + _add_directory(library_dirs, os.path.join(ft_prefix, "lib")) + _add_directory(include_dirs, os.path.join(ft_prefix, "include")) + else: + # fall back to freetype from XQuartz if + # Homebrew's freetype is missing + _add_directory(library_dirs, "/usr/X11/lib") + _add_directory(include_dirs, "/usr/X11/include") + + # Add the macOS SDK path. sdk_path = self.get_macos_sdk_path() if sdk_path: _add_directory(library_dirs, os.path.join(sdk_path, "usr", "lib")) diff --git a/wheels/multibuild b/wheels/multibuild index 452dd2d17..8a9333e30 160000 --- a/wheels/multibuild +++ b/wheels/multibuild @@ -1 +1 @@ -Subproject commit 452dd2d1705f6b2375369a6570c415beb3163f70 +Subproject commit 8a9333e307fa3f24db2089a66f25e38a8272c261 From fc35fcc5ea844cd0184af6e999d0f35835a4254a Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 25 Oct 2024 10:55:30 +0800 Subject: [PATCH 538/662] Cleanups and typos identified by code review. --- .github/workflows/wheels-dependencies.sh | 8 ++++---- .github/workflows/wheels-test.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 35b04c6d6..2c0835e7e 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -23,7 +23,7 @@ OPENJPEG_VERSION=2.5.2 XZ_VERSION=5.6.3 TIFF_VERSION=4.6.0 LCMS2_VERSION=2.16 -RAQM_VERSION=0.7.1 +RAQM_VERSION=0.10.2 FRIBIDI_VERSION=1.0.16 if [[ -n "$IS_MACOS" ]]; then GIFLIB_VERSION=5.2.2 @@ -71,7 +71,7 @@ function build_brotli { function build_harfbuzz { if [ -e harfbuzz-stamp ]; then return; fi - python -m pip install meson ninja + python3 -m pip install meson ninja local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz) (cd $out_dir \ @@ -176,9 +176,9 @@ if [[ -n "$IS_MACOS" ]]; then mkdir -p "$BUILD_PREFIX/bin" mkdir -p "$BUILD_PREFIX/lib" - # Ensure pkg-confg and cmake are available + # Ensure pkg-config and cmake are available build_pkg_config - python -m pip install cmake + python3 -m pip install cmake fi wrap_wheel_builder build diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh index 05f5162c7..3a8fc87ba 100755 --- a/.github/workflows/wheels-test.sh +++ b/.github/workflows/wheels-test.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -# For Unix, Ensure fibidi is installed by the system. +# For Unix, ensure fribidi is installed by the system. if [[ "$OSTYPE" != "darwin"* ]]; then if [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then apk add curl fribidi From 00809a25516e1396e3e3ee38a760733efffbd1a9 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 25 Oct 2024 13:42:46 +0800 Subject: [PATCH 539/662] Tweaks to ensure isolation from Homebrew on x86_64. --- .github/workflows/wheels-dependencies.sh | 34 +++++++++++++++++------- pyproject.toml | 2 +- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 2c0835e7e..dbabd4aef 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -4,6 +4,9 @@ if [ -z "$IS_MACOS" ]; then export MB_ML_LIBC=${AUDITWHEEL_POLICY::9} export MB_ML_VER=${AUDITWHEEL_POLICY:9} + + # Build and install into the `build/deps` folder. + BUILD_PREFIX=$(pwd)/build/deps fi export PLAT=$CIBW_ARCHS source wheels/multibuild/common_utils.sh @@ -84,6 +87,18 @@ function build_harfbuzz { touch harfbuzz-stamp } +function build_raqm { + if [ -e raqm-stamp ]; then return; fi + python3 -m pip install meson ninja + + local out_dir=$(fetch_unpack https://github.com/HOST-Oman/libraqm/releases/download/v$RAQM_VERSION/raqm-$RAQM_VERSION.tar.xz raqm-$RAQM_VERSION.tar.xz) + (cd $out_dir \ + && meson setup build --prefix=$BUILD_PREFIX) + (cd $out_dir/build \ + && meson install) + touch raqm-stamp +} + function build { build_xz if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then @@ -105,9 +120,12 @@ function build { build_libjpeg_turbo if [ -n "$IS_MACOS" ]; then # Custom tiff build to include jpeg; by default, configure won't include - # headers/libs in the custom macOS prefix + # headers/libs in the custom macOS prefix. Explicitly disable webp and + # zstd, because on x86_64 macs, it will pick up the Homebrew versions of + # webp and zstd from /usr/local. build_simple tiff $TIFF_VERSION https://download.osgeo.org/libtiff tar.gz \ - --with-jpeg-include-dir=$BUILD_PREFIX/include --with-jpeg-lib-dir=$BUILD_PREFIX/lib + --with-jpeg-include-dir=$BUILD_PREFIX/include --with-jpeg-lib-dir=$BUILD_PREFIX/lib \ + --disable-webp --disable-zstd else build_tiff fi @@ -140,7 +158,7 @@ function build { if [ -n "$IS_MACOS" ]; then build_simple fribidi $FRIBIDI_VERSION https://github.com/fribidi/fribidi/releases/download/v$FRIBIDI_VERSION tar.xz --enable-shared - build_simple raqm $RAQM_VERSION https://github.com/Host_Oman/libraqm/releases/download/v$RAQM_VERSION tar.gz --enable-shared + build_raqm fi } @@ -159,9 +177,6 @@ if [[ ! -d pillow-depends-main ]]; then fi if [[ -n "$IS_MACOS" ]]; then - # Build and install into the `deps` folder. - BUILD_PREFIX=$(pwd)/deps - # Homebrew (or similar packaging environments) install can contain some of # the libraries that we're going to build. However, they may be compiled # with a MACOSX_DEPLOYMENT_TARGET that doesn't match what we want to use, @@ -169,16 +184,17 @@ if [[ -n "$IS_MACOS" ]]; then # be true of any other locations on the path. To avoid conflicts, strip the # path down to the bare mimimum (which, on macOS, won't include any # development dependencies). - export PATH="$BUILD_PREFIX/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:$(dirname $(which python))" + export PATH="$BUILD_PREFIX/bin:$(dirname $(which python3)):/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin" export CMAKE_PREFIX_PATH=$BUILD_PREFIX # Link the brew command into our isolated build directory. mkdir -p "$BUILD_PREFIX/bin" mkdir -p "$BUILD_PREFIX/lib" - # Ensure pkg-config and cmake are available + # Ensure pkg-config is available build_pkg_config - python3 -m pip install cmake + # Ensure cmake is available + python3 -m pip cmake fi wrap_wheel_builder build diff --git a/pyproject.toml b/pyproject.toml index 53546f0ab..3839cf840 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -102,7 +102,7 @@ test-command = "cd {project} && .github/workflows/wheels-test.sh" test-extras = "tests" [tool.cibuildwheel.macos.environment] -PATH = "$(pwd)/build/deps/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:$(dirname $(which python))" +PATH = "$(pwd)/build/deps/bin:$(dirname $(which python3)):/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin" [tool.black] exclude = "wheels/multibuild" From 06dbfedb0fbfcf38f6d6298ac4979e82fb653956 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 25 Oct 2024 13:51:37 +0800 Subject: [PATCH 540/662] Bump the multibuild version to fix jpeg-turbo issue. --- wheels/multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wheels/multibuild b/wheels/multibuild index 8a9333e30..22e8ad0c6 160000 --- a/wheels/multibuild +++ b/wheels/multibuild @@ -1 +1 @@ -Subproject commit 8a9333e307fa3f24db2089a66f25e38a8272c261 +Subproject commit 22e8ad0c69acdb0c94abab74da6e09f2810d50d5 From 5a8373e527bbea93cb9c3be87c206683f488ad8e Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 25 Oct 2024 14:47:51 +0800 Subject: [PATCH 541/662] Correct a dumb pip invocation error. --- .github/workflows/wheels-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index dbabd4aef..0990943d3 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -194,7 +194,7 @@ if [[ -n "$IS_MACOS" ]]; then # Ensure pkg-config is available build_pkg_config # Ensure cmake is available - python3 -m pip cmake + python3 -m pip install cmake fi wrap_wheel_builder build From 140a06e0fda60b7474dbdfde53b2ad2f1d344603 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 25 Oct 2024 16:04:56 +0800 Subject: [PATCH 542/662] Explicitly disable libdeflate on libtiff. --- .github/workflows/wheels-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 0990943d3..c6f57200f 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -125,7 +125,7 @@ function build { # webp and zstd from /usr/local. build_simple tiff $TIFF_VERSION https://download.osgeo.org/libtiff tar.gz \ --with-jpeg-include-dir=$BUILD_PREFIX/include --with-jpeg-lib-dir=$BUILD_PREFIX/lib \ - --disable-webp --disable-zstd + --disable-webp --disable-zstd --disable-libdeflate else build_tiff fi From 0961d3d22bc966f19f68ce01db6d07373dfbe6bc Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 25 Oct 2024 16:10:29 +0800 Subject: [PATCH 543/662] Possible fix for linux build failures. --- .github/workflows/wheels-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index c6f57200f..4d58bee90 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -113,7 +113,7 @@ function build { build_simple libXdmcp 1.1.5 https://www.x.org/pub/individual/lib build_simple libpthread-stubs 0.5 https://xcb.freedesktop.org/dist else - sed s/\${pc_sysrootdir\}// /usr/local/share/pkgconfig/xcb-proto.pc > /usr/local/lib/pkgconfig/xcb-proto.pc + sed s/\${pc_sysrootdir\}// $BUILD_PREFIX/share/pkgconfig/xcb-proto.pc > /usr/local/lib/pkgconfig/xcb-proto.pc fi build_simple libxcb $LIBXCB_VERSION https://www.x.org/releases/individual/lib From c46946f3a4c89a52637cc8e0c0f67d8e85d18a16 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 25 Oct 2024 19:13:39 +1100 Subject: [PATCH 544/662] Added filename placeholder in URL --- winbuild/build_prepare.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index a21fbef91..b106eb7de 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -131,7 +131,7 @@ V["ZLIB_DOTLESS"] = V["ZLIB"].replace(".", "") DEPS: dict[str, dict[str, Any]] = { "libjpeg": { "url": f"{SF_PROJECTS}/libjpeg-turbo/files/{V['JPEGTURBO']}/" - f"libjpeg-turbo-{V['JPEGTURBO']}.tar.gz/download", + "FILENAME/download", "filename": f"libjpeg-turbo-{V['JPEGTURBO']}.tar.gz", "dir": f"libjpeg-turbo-{V['JPEGTURBO']}", "license": ["README.ijg", "LICENSE.md"], @@ -161,7 +161,7 @@ DEPS: dict[str, dict[str, Any]] = { "bins": ["cjpeg.exe", "djpeg.exe"], }, "zlib": { - "url": f"https://zlib.net/zlib{V['ZLIB_DOTLESS']}.zip", + "url": "https://zlib.net/FILENAME", "filename": f"zlib{V['ZLIB_DOTLESS']}.zip", "dir": f"zlib-{V['ZLIB']}", "license": "README", @@ -175,7 +175,7 @@ DEPS: dict[str, dict[str, Any]] = { "libs": [r"*.lib"], }, "xz": { - "url": f"https://github.com/tukaani-project/xz/releases/download/v{V['XZ']}/xz-{V['XZ']}.tar.gz", + "url": f"https://github.com/tukaani-project/xz/releases/download/v{V['XZ']}/FILENAME", "filename": f"xz-{V['XZ']}.tar.gz", "dir": f"xz-{V['XZ']}", "license": "COPYING", @@ -188,7 +188,7 @@ DEPS: dict[str, dict[str, Any]] = { "libs": [r"lzma.lib"], }, "libwebp": { - "url": f"http://downloads.webmproject.org/releases/webp/libwebp-{V['LIBWEBP']}.tar.gz", + "url": "http://downloads.webmproject.org/releases/webp/FILENAME", "filename": f"libwebp-{V['LIBWEBP']}.tar.gz", "dir": f"libwebp-{V['LIBWEBP']}", "license": "COPYING", @@ -210,7 +210,7 @@ DEPS: dict[str, dict[str, Any]] = { "libs": [r"libsharpyuv.lib", r"libwebp*.lib"], }, "libtiff": { - "url": f"https://download.osgeo.org/libtiff/tiff-{V['TIFF']}.tar.gz", + "url": "https://download.osgeo.org/libtiff/FILENAME", "filename": f"tiff-{V['TIFF']}.tar.gz", "dir": f"tiff-{V['TIFF']}", "license": "LICENSE.md", @@ -268,7 +268,7 @@ DEPS: dict[str, dict[str, Any]] = { "libs": ["*.lib"], }, "freetype": { - "url": f"https://download.savannah.gnu.org/releases/freetype/freetype-{V['FREETYPE']}.tar.gz", + "url": "https://download.savannah.gnu.org/releases/freetype/FILENAME", "filename": f"freetype-{V['FREETYPE']}.tar.gz", "dir": f"freetype-{V['FREETYPE']}", "license": ["LICENSE.TXT", r"docs\FTL.TXT", r"docs\GPLv2.TXT"], @@ -303,7 +303,7 @@ DEPS: dict[str, dict[str, Any]] = { "libs": [r"objs\{msbuild_arch}\Release Static\freetype.lib"], }, "lcms2": { - "url": f"{SF_PROJECTS}/lcms/files/lcms/{V['LCMS2']}/lcms2-{V['LCMS2']}.tar.gz/download", # noqa: E501 + "url": f"{SF_PROJECTS}/lcms/files/lcms/{V['LCMS2']}/FILENAME/download", "filename": f"lcms2-{V['LCMS2']}.tar.gz", "dir": f"lcms2-{V['LCMS2']}", "license": "LICENSE", @@ -497,7 +497,7 @@ def extract_dep(url: str, filename: str, prefs: dict[str, str]) -> None: except RuntimeError as exc: # Otherwise try upstream print(exc) - download_dep(url, file) + download_dep(url.replace("FILENAME", filename), file) print("Extracting " + filename) sources_dir_abs = os.path.abspath(sources_dir) From fa7678987e034599344304dbfac5d533c30f7820 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 25 Oct 2024 19:56:36 +1100 Subject: [PATCH 545/662] Simplified code --- winbuild/build_prepare.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index b106eb7de..c8332d11c 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -130,8 +130,7 @@ V["ZLIB_DOTLESS"] = V["ZLIB"].replace(".", "") # dependencies, listed in order of compilation DEPS: dict[str, dict[str, Any]] = { "libjpeg": { - "url": f"{SF_PROJECTS}/libjpeg-turbo/files/{V['JPEGTURBO']}/" - "FILENAME/download", + "url": f"{SF_PROJECTS}/libjpeg-turbo/files/{V['JPEGTURBO']}/FILENAME/download", "filename": f"libjpeg-turbo-{V['JPEGTURBO']}.tar.gz", "dir": f"libjpeg-turbo-{V['JPEGTURBO']}", "license": ["README.ijg", "LICENSE.md"], From 43c34fc0a5c22b1c00152a246fd39fe02925043d Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 25 Oct 2024 17:20:34 +0800 Subject: [PATCH 546/662] Copy manylinux lib64 files from the correct built prefix. --- .github/workflows/wheels-dependencies.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 4d58bee90..9dae28717 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -66,8 +66,8 @@ function build_brotli { && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \ && make install) if [[ "$MB_ML_LIBC" == "manylinux" ]]; then - cp /usr/local/lib64/libbrotli* /usr/local/lib - cp /usr/local/lib64/pkgconfig/libbrotli* /usr/local/lib/pkgconfig + cp $BUILD_PREFIX/lib64/libbrotli* $BUILD_PREFIX/lib + cp $BUILD_PREFIX/lib64/pkgconfig/libbrotli* $BUILD_PREFIX/lib/pkgconfig fi touch brotli-stamp } @@ -82,7 +82,7 @@ function build_harfbuzz { (cd $out_dir/build \ && meson install) if [[ "$MB_ML_LIBC" == "manylinux" ]]; then - cp /usr/local/lib64/libharfbuzz* /usr/local/lib + cp $BUILD_PREFIX/lib64/libharfbuzz* $BUILD_PREFIX/lib fi touch harfbuzz-stamp } @@ -113,7 +113,7 @@ function build { build_simple libXdmcp 1.1.5 https://www.x.org/pub/individual/lib build_simple libpthread-stubs 0.5 https://xcb.freedesktop.org/dist else - sed s/\${pc_sysrootdir\}// $BUILD_PREFIX/share/pkgconfig/xcb-proto.pc > /usr/local/lib/pkgconfig/xcb-proto.pc + sed s/\${pc_sysrootdir\}// $BUILD_PREFIX/share/pkgconfig/xcb-proto.pc > $BUILD_PREFIX/lib/pkgconfig/xcb-proto.pc fi build_simple libxcb $LIBXCB_VERSION https://www.x.org/releases/individual/lib @@ -133,8 +133,8 @@ function build { build_libpng build_lcms2 build_openjpeg - if [ -f /usr/local/lib64/libopenjp2.so ]; then - cp /usr/local/lib64/libopenjp2.so /usr/local/lib + if [ -f $BUILD_PREFIX/lib64/libopenjp2.so ]; then + cp $BUILD_PREFIX/lib64/libopenjp2.so $BUILD_PREFIX/lib fi ORIGINAL_CFLAGS=$CFLAGS From 4b9399f8bfb08d4ed1a1113ed6fd4b6137f7c2aa Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 25 Oct 2024 22:00:45 +1100 Subject: [PATCH 547/662] Use register_handler --- Tests/test_file_bufrstub.py | 2 +- Tests/test_file_gribstub.py | 2 +- Tests/test_file_hdf5stub.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/test_file_bufrstub.py b/Tests/test_file_bufrstub.py index 77ee5b0ea..fc8920317 100644 --- a/Tests/test_file_bufrstub.py +++ b/Tests/test_file_bufrstub.py @@ -83,4 +83,4 @@ def test_handler(tmp_path: Path) -> None: im.save(temp_file) assert handler.saved - BufrStubImagePlugin._handler = None + BufrStubImagePlugin.register_handler(None) diff --git a/Tests/test_file_gribstub.py b/Tests/test_file_gribstub.py index aba473d24..02e464ff1 100644 --- a/Tests/test_file_gribstub.py +++ b/Tests/test_file_gribstub.py @@ -83,4 +83,4 @@ def test_handler(tmp_path: Path) -> None: im.save(temp_file) assert handler.saved - GribStubImagePlugin._handler = None + GribStubImagePlugin.register_handler(None) diff --git a/Tests/test_file_hdf5stub.py b/Tests/test_file_hdf5stub.py index 8275bd0d8..024be9e80 100644 --- a/Tests/test_file_hdf5stub.py +++ b/Tests/test_file_hdf5stub.py @@ -85,4 +85,4 @@ def test_handler(tmp_path: Path) -> None: im.save(temp_file) assert handler.saved - Hdf5StubImagePlugin._handler = None + Hdf5StubImagePlugin.register_handler(None) From bb3515d649cda179037161ee3bea264a4d289b32 Mon Sep 17 00:00:00 2001 From: Lysandros Nikolaou Date: Fri, 25 Oct 2024 17:32:29 +0200 Subject: [PATCH 548/662] Make PyMutex static and get rid of initialization --- src/_imagingft.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/_imagingft.c b/src/_imagingft.c index 884b8f96c..d38279f3e 100644 --- a/src/_imagingft.c +++ b/src/_imagingft.c @@ -83,7 +83,7 @@ struct { static FT_Library library; #ifdef Py_GIL_DISABLED -PyMutex ft_library_mutex; +static PyMutex ft_library_mutex; #endif typedef struct { @@ -1648,7 +1648,6 @@ PyInit__imagingft(void) { } #ifdef Py_GIL_DISABLED - ft_library_mutex = (PyMutex){0}; PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED); #endif From 3e0849bfb56f6fa8c73ff1bde044551ed72ac2d3 Mon Sep 17 00:00:00 2001 From: Nulano Date: Fri, 25 Oct 2024 20:35:17 +0200 Subject: [PATCH 549/662] winbuild: Replace zlib with zlib-ng built with CMake --- winbuild/build_prepare.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index a21fbef91..2065e41a9 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -120,11 +120,10 @@ V = { "OPENJPEG": "2.5.2", "TIFF": "4.6.0", "XZ": "5.6.3", - "ZLIB": "1.3.1", + "ZLIBNG": "2.2.2", } V["LIBPNG_DOTLESS"] = V["LIBPNG"].replace(".", "") V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2]) -V["ZLIB_DOTLESS"] = V["ZLIB"].replace(".", "") # dependencies, listed in order of compilation @@ -161,18 +160,22 @@ DEPS: dict[str, dict[str, Any]] = { "bins": ["cjpeg.exe", "djpeg.exe"], }, "zlib": { - "url": f"https://zlib.net/zlib{V['ZLIB_DOTLESS']}.zip", - "filename": f"zlib{V['ZLIB_DOTLESS']}.zip", - "dir": f"zlib-{V['ZLIB']}", - "license": "README", - "license_pattern": "Copyright notice:\n\n(.+)$", + "url": f"https://github.com/zlib-ng/zlib-ng/archive/refs/tags/{V['ZLIBNG']}.zip", + "filename": f"zlib-ng-{V['ZLIBNG']}.zip", + "dir": f"zlib-ng-{V['ZLIBNG']}", + "license": "LICENSE.md", + "patch": { + r"CMakeLists.txt": { + "set_target_properties(zlib PROPERTIES OUTPUT_NAME zlibstatic${{SUFFIX}})": "set_target_properties(zlib PROPERTIES OUTPUT_NAME zlib)", # noqa: E501 + }, + }, "build": [ - cmd_nmake(r"win32\Makefile.msc", "clean"), - cmd_nmake(r"win32\Makefile.msc", "zlib.lib"), - cmd_copy("zlib.lib", "z.lib"), + *cmds_cmake( + "zlib", "-DBUILD_SHARED_LIBS:BOOL=OFF", "-DZLIB_COMPAT:BOOL=ON" + ), ], "headers": [r"z*.h"], - "libs": [r"*.lib"], + "libs": [r"zlib.lib"], }, "xz": { "url": f"https://github.com/tukaani-project/xz/releases/download/v{V['XZ']}/xz-{V['XZ']}.tar.gz", From 7885066e5fc6ae56db0bef18eb2c188a6aa9a181 Mon Sep 17 00:00:00 2001 From: Nulano Date: Fri, 25 Oct 2024 20:37:21 +0200 Subject: [PATCH 550/662] PIL.features: Add a compile-time zlib-ng feature flag and version number --- Tests/check_wheel.py | 3 +++ docs/reference/features.rst | 1 + src/PIL/features.py | 7 ++++++- src/_imaging.c | 14 ++++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Tests/check_wheel.py b/Tests/check_wheel.py index 4b91984f5..374e48e8a 100644 --- a/Tests/check_wheel.py +++ b/Tests/check_wheel.py @@ -34,10 +34,13 @@ def test_wheel_features() -> None: "fribidi", "harfbuzz", "libjpeg_turbo", + "zlib_ng", "xcb", } if sys.platform == "win32": expected_features.remove("xcb") + else: + expected_features.remove("zlib_ng") assert set(features.get_supported_features()) == expected_features diff --git a/docs/reference/features.rst b/docs/reference/features.rst index fcff96735..427c0f606 100644 --- a/docs/reference/features.rst +++ b/docs/reference/features.rst @@ -54,6 +54,7 @@ Feature version numbers are available only where stated. Support for the following features can be checked: * ``libjpeg_turbo``: (compile time) Whether Pillow was compiled against the libjpeg-turbo version of libjpeg. Compile-time version number is available. +* ``zlib_ng``: (compile time) Whether Pillow was compiled against the zlib-ng version of zlib. Compile-time version number is available. * ``raqm``: Raqm library, required for ``ImageFont.Layout.RAQM`` in :py:func:`PIL.ImageFont.truetype`. Run-time version number is available for Raqm 0.7.0 or newer. * ``libimagequant``: (compile time) ImageQuant quantization support in :py:func:`PIL.Image.Image.quantize`. Run-time version number is available. * ``xcb``: (compile time) Support for X11 in :py:func:`PIL.ImageGrab.grab` via the XCB library. diff --git a/src/PIL/features.py b/src/PIL/features.py index 75d59e01c..3645e3def 100644 --- a/src/PIL/features.py +++ b/src/PIL/features.py @@ -127,6 +127,7 @@ features: dict[str, tuple[str, str | bool, str | None]] = { "fribidi": ("PIL._imagingft", "HAVE_FRIBIDI", "fribidi_version"), "harfbuzz": ("PIL._imagingft", "HAVE_HARFBUZZ", "harfbuzz_version"), "libjpeg_turbo": ("PIL._imaging", "HAVE_LIBJPEGTURBO", "libjpeg_turbo_version"), + "zlib_ng": ("PIL._imaging", "HAVE_ZLIBNG", "zlib_ng_version"), "libimagequant": ("PIL._imaging", "HAVE_LIBIMAGEQUANT", "imagequant_version"), "xcb": ("PIL._imaging", "HAVE_XCB", None), } @@ -308,7 +309,11 @@ def pilinfo(out: IO[str] | None = None, supported_formats: bool = True) -> None: # this check is also in src/_imagingcms.c:setup_module() version_static = tuple(int(x) for x in v.split(".")) < (2, 7) t = "compiled for" if version_static else "loaded" - if name == "raqm": + if name == "zlib": + zlib_ng_version = version_feature("zlib_ng") + if zlib_ng_version is not None: + v += ", compiled for zlib-ng " + zlib_ng_version + elif name == "raqm": for f in ("fribidi", "harfbuzz"): v2 = version_feature(f) if v2 is not None: diff --git a/src/_imaging.c b/src/_imaging.c index 2db4486b2..5d6d97bed 100644 --- a/src/_imaging.c +++ b/src/_imaging.c @@ -4397,6 +4397,20 @@ setup_module(PyObject *m) { } #endif + PyObject *have_zlibng; +#ifdef ZLIBNG_VERSION + have_zlibng = Py_True; + { + PyObject *v = PyUnicode_FromString(ZLIBNG_VERSION); + PyDict_SetItemString(d, "zlib_ng_version", v ? v : Py_None); + Py_XDECREF(v); + } +#else + have_zlibng = Py_False; +#endif + Py_INCREF(have_zlibng); + PyModule_AddObject(m, "HAVE_ZLIBNG", have_zlibng); + #ifdef HAVE_LIBTIFF { extern const char *ImagingTiffVersion(void); From a43e5bb7354006766a67a353aa21d9a0198cdcab Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 26 Oct 2024 14:26:47 +1100 Subject: [PATCH 551/662] brew remove libdeflate --- .github/workflows/wheels-dependencies.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 97c1adf09..7970d4d15 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -121,6 +121,7 @@ curl -fsSL -o pillow-depends-main.zip https://github.com/python-pillow/pillow-de untar pillow-depends-main.zip if [[ -n "$IS_MACOS" ]]; then + # libdeflate may cause a minimum target error when repairing the wheel # libtiff and libxcb cause a conflict with building libtiff and libxcb # libxau and libxdmcp cause an issue on macOS < 11 # remove cairo to fix building harfbuzz on arm64 @@ -132,7 +133,7 @@ if [[ -n "$IS_MACOS" ]]; then if [[ "$CIBW_ARCHS" == "arm64" ]]; then brew remove --ignore-dependencies jpeg-turbo else - brew remove --ignore-dependencies webp + brew remove --ignore-dependencies libdeflate webp fi brew install pkg-config From e1f4b5a68fa783126f5a81ccba5fac4526f6ab00 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 26 Oct 2024 15:10:41 +1100 Subject: [PATCH 552/662] Move MPO into "Fully supported formats" --- docs/handbook/image-file-formats.rst | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst index 8183473e4..bf3087f6f 100644 --- a/docs/handbook/image-file-formats.rst +++ b/docs/handbook/image-file-formats.rst @@ -692,6 +692,30 @@ The :py:meth:`~PIL.Image.Image.save` method supports the following options: you fail to do this, you will get errors about not being able to load the ``_imaging`` DLL). +MPO +^^^ + +Pillow reads and writes Multi Picture Object (MPO) files. When first opened, it loads +the primary image. The :py:meth:`~PIL.Image.Image.seek` and +:py:meth:`~PIL.Image.Image.tell` methods may be used to read other pictures from the +file. The pictures are zero-indexed and random access is supported. + +.. _mpo-saving: + +Saving +~~~~~~ + +When calling :py:meth:`~PIL.Image.Image.save` to write an MPO file, by default +only the first frame of a multiframe image will be saved. If the ``save_all`` +argument is present and true, then all frames will be saved, and the following +option will also be available. + +**append_images** + A list of images to append as additional pictures. Each of the + images in the list can be single or multiframe images. + + .. versionadded:: 9.3.0 + MSP ^^^ @@ -1435,30 +1459,6 @@ Note that there may be an embedded gamma of 2.2 in MIC files. To enable MIC support, you must install :pypi:`olefile`. -MPO -^^^ - -Pillow identifies and reads Multi Picture Object (MPO) files, loading the primary -image when first opened. The :py:meth:`~PIL.Image.Image.seek` and :py:meth:`~PIL.Image.Image.tell` -methods may be used to read other pictures from the file. The pictures are -zero-indexed and random access is supported. - -.. _mpo-saving: - -Saving -~~~~~~ - -When calling :py:meth:`~PIL.Image.Image.save` to write an MPO file, by default -only the first frame of a multiframe image will be saved. If the ``save_all`` -argument is present and true, then all frames will be saved, and the following -option will also be available. - -**append_images** - A list of images to append as additional pictures. Each of the - images in the list can be single or multiframe images. - - .. versionadded:: 9.3.0 - PCD ^^^ From 413bbb31c959a3e2a6929d4a12861a79d82f8e80 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 26 Oct 2024 16:15:46 +1100 Subject: [PATCH 553/662] Fixed catching warnings --- Tests/test_bmp_reference.py | 2 ++ Tests/test_file_dcx.py | 4 ++++ Tests/test_file_fli.py | 4 ++++ Tests/test_file_gif.py | 4 ++++ Tests/test_file_icns.py | 2 ++ Tests/test_file_im.py | 4 ++++ Tests/test_file_jpeg.py | 2 ++ Tests/test_file_mpo.py | 4 ++++ Tests/test_file_png.py | 2 ++ Tests/test_file_psd.py | 4 ++++ Tests/test_file_spider.py | 4 ++++ Tests/test_file_tar.py | 4 ++++ Tests/test_file_tiff.py | 4 ++++ Tests/test_file_webp.py | 2 ++ Tests/test_image.py | 2 ++ Tests/test_imageqt.py | 2 ++ Tests/test_numpy.py | 2 ++ 17 files changed, 52 insertions(+) diff --git a/Tests/test_bmp_reference.py b/Tests/test_bmp_reference.py index 7f8487921..82cab39c6 100644 --- a/Tests/test_bmp_reference.py +++ b/Tests/test_bmp_reference.py @@ -22,6 +22,8 @@ def test_bad() -> None: for f in get_files("b"): # Assert that there is no unclosed file warning with warnings.catch_warnings(): + warnings.simplefilter("error") + try: with Image.open(f) as im: im.load() diff --git a/Tests/test_file_dcx.py b/Tests/test_file_dcx.py index 65337cad9..5deacd878 100644 --- a/Tests/test_file_dcx.py +++ b/Tests/test_file_dcx.py @@ -36,6 +36,8 @@ def test_unclosed_file() -> None: def test_closed_file() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + im = Image.open(TEST_FILE) im.load() im.close() @@ -43,6 +45,8 @@ def test_closed_file() -> None: def test_context_manager() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + with Image.open(TEST_FILE) as im: im.load() diff --git a/Tests/test_file_fli.py b/Tests/test_file_fli.py index f86fb8d09..0a7740cc8 100644 --- a/Tests/test_file_fli.py +++ b/Tests/test_file_fli.py @@ -65,6 +65,8 @@ def test_unclosed_file() -> None: def test_closed_file() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + im = Image.open(static_test_file) im.load() im.close() @@ -81,6 +83,8 @@ def test_seek_after_close() -> None: def test_context_manager() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + with Image.open(static_test_file) as im: im.load() diff --git a/Tests/test_file_gif.py b/Tests/test_file_gif.py index 16c8466f3..248347d5b 100644 --- a/Tests/test_file_gif.py +++ b/Tests/test_file_gif.py @@ -46,6 +46,8 @@ def test_unclosed_file() -> None: def test_closed_file() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + im = Image.open(TEST_GIF) im.load() im.close() @@ -67,6 +69,8 @@ def test_seek_after_close() -> None: def test_context_manager() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + with Image.open(TEST_GIF) as im: im.load() diff --git a/Tests/test_file_icns.py b/Tests/test_file_icns.py index 16f6b3651..141b88dfa 100644 --- a/Tests/test_file_icns.py +++ b/Tests/test_file_icns.py @@ -21,6 +21,8 @@ def test_sanity() -> None: with Image.open(TEST_FILE) as im: # Assert that there is no unclosed file warning with warnings.catch_warnings(): + warnings.simplefilter("error") + im.load() assert im.mode == "RGBA" diff --git a/Tests/test_file_im.py b/Tests/test_file_im.py index 036965bf5..1d3fa485f 100644 --- a/Tests/test_file_im.py +++ b/Tests/test_file_im.py @@ -41,6 +41,8 @@ def test_unclosed_file() -> None: def test_closed_file() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + im = Image.open(TEST_IM) im.load() im.close() @@ -48,6 +50,8 @@ def test_closed_file() -> None: def test_context_manager() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + with Image.open(TEST_IM) as im: im.load() diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index cde951395..2c66652e5 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -850,6 +850,8 @@ class TestFileJpeg: out = str(tmp_path / "out.jpg") with warnings.catch_warnings(): + warnings.simplefilter("error") + im.save(out, exif=exif) with Image.open(out) as reloaded: diff --git a/Tests/test_file_mpo.py b/Tests/test_file_mpo.py index e0f42a266..949583185 100644 --- a/Tests/test_file_mpo.py +++ b/Tests/test_file_mpo.py @@ -48,6 +48,8 @@ def test_unclosed_file() -> None: def test_closed_file() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + im = Image.open(test_files[0]) im.load() im.close() @@ -63,6 +65,8 @@ def test_seek_after_close() -> None: def test_context_manager() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + with Image.open(test_files[0]) as im: im.load() diff --git a/Tests/test_file_png.py b/Tests/test_file_png.py index 0abf9866f..ffafc3c58 100644 --- a/Tests/test_file_png.py +++ b/Tests/test_file_png.py @@ -338,6 +338,8 @@ class TestFilePng: with Image.open(TEST_PNG_FILE) as im: # Assert that there is no unclosed file warning with warnings.catch_warnings(): + warnings.simplefilter("error") + im.verify() with Image.open(TEST_PNG_FILE) as im: diff --git a/Tests/test_file_psd.py b/Tests/test_file_psd.py index e6c79e40b..5f22001f3 100644 --- a/Tests/test_file_psd.py +++ b/Tests/test_file_psd.py @@ -35,6 +35,8 @@ def test_unclosed_file() -> None: def test_closed_file() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + im = Image.open(test_file) im.load() im.close() @@ -42,6 +44,8 @@ def test_closed_file() -> None: def test_context_manager() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + with Image.open(test_file) as im: im.load() diff --git a/Tests/test_file_spider.py b/Tests/test_file_spider.py index 66c88e9d8..4cafda865 100644 --- a/Tests/test_file_spider.py +++ b/Tests/test_file_spider.py @@ -34,6 +34,8 @@ def test_unclosed_file() -> None: def test_closed_file() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + im = Image.open(TEST_FILE) im.load() im.close() @@ -41,6 +43,8 @@ def test_closed_file() -> None: def test_context_manager() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + with Image.open(TEST_FILE) as im: im.load() diff --git a/Tests/test_file_tar.py b/Tests/test_file_tar.py index 6217ebedd..49220a8b6 100644 --- a/Tests/test_file_tar.py +++ b/Tests/test_file_tar.py @@ -37,11 +37,15 @@ def test_unclosed_file() -> None: def test_close() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + tar = TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg") tar.close() def test_contextmanager() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + with TarIO.TarIO(TEST_TAR_FILE, "hopper.jpg"): pass diff --git a/Tests/test_file_tiff.py b/Tests/test_file_tiff.py index af766022b..6f51d4651 100644 --- a/Tests/test_file_tiff.py +++ b/Tests/test_file_tiff.py @@ -72,6 +72,8 @@ class TestFileTiff: def test_closed_file(self) -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + im = Image.open("Tests/images/multipage.tiff") im.load() im.close() @@ -88,6 +90,8 @@ class TestFileTiff: def test_context_manager(self) -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + with Image.open("Tests/images/multipage.tiff") as im: im.load() diff --git a/Tests/test_file_webp.py b/Tests/test_file_webp.py index 79f6bb4e0..ad5aa9ed6 100644 --- a/Tests/test_file_webp.py +++ b/Tests/test_file_webp.py @@ -191,6 +191,8 @@ class TestFileWebp: file_path = "Tests/images/hopper.webp" with Image.open(file_path) as image: with warnings.catch_warnings(): + warnings.simplefilter("error") + image.save(tmp_path / "temp.webp") def test_file_pointer_could_be_reused(self) -> None: diff --git a/Tests/test_image.py b/Tests/test_image.py index 9b65041f4..c8df474f4 100644 --- a/Tests/test_image.py +++ b/Tests/test_image.py @@ -737,6 +737,8 @@ class TestImage: # Act/Assert with Image.open(test_file) as im: with warnings.catch_warnings(): + warnings.simplefilter("error") + im.save(temp_file) def test_no_new_file_on_error(self, tmp_path: Path) -> None: diff --git a/Tests/test_imageqt.py b/Tests/test_imageqt.py index 22cd674ce..2d7ca0ae0 100644 --- a/Tests/test_imageqt.py +++ b/Tests/test_imageqt.py @@ -52,4 +52,6 @@ def test_image(mode: str) -> None: def test_closed_file() -> None: with warnings.catch_warnings(): + warnings.simplefilter("error") + ImageQt.ImageQt("Tests/images/hopper.gif") diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py index 040472d69..79cd14b66 100644 --- a/Tests/test_numpy.py +++ b/Tests/test_numpy.py @@ -264,4 +264,6 @@ def test_no_resource_warning_for_numpy_array() -> None: with Image.open(test_file) as im: # Act/Assert with warnings.catch_warnings(): + warnings.simplefilter("error") + array(im) From f92599aa9394d9b1f59a503a796bc0fb6ddb8cda Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 26 Oct 2024 19:05:16 +1100 Subject: [PATCH 554/662] Renamed fixture --- Tests/test_file_jpeg2k.py | 102 +++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/Tests/test_file_jpeg2k.py b/Tests/test_file_jpeg2k.py index 79f53e211..fbf72ae05 100644 --- a/Tests/test_file_jpeg2k.py +++ b/Tests/test_file_jpeg2k.py @@ -32,7 +32,7 @@ pytestmark = skip_unless_feature("jpg_2000") @pytest.fixture -def test_card() -> Generator[ImageFile.ImageFile, None, None]: +def card() -> Generator[ImageFile.ImageFile, None, None]: with Image.open("Tests/images/test-card.png") as im: im.load() try: @@ -83,78 +83,76 @@ def test_invalid_file() -> None: Jpeg2KImagePlugin.Jpeg2KImageFile(invalid_file) -def test_bytesio(test_card: ImageFile.ImageFile) -> None: +def test_bytesio(card: ImageFile.ImageFile) -> None: with open("Tests/images/test-card-lossless.jp2", "rb") as f: data = BytesIO(f.read()) with Image.open(data) as im: im.load() - assert_image_similar(im, test_card, 1.0e-3) + assert_image_similar(im, card, 1.0e-3) # These two test pre-written JPEG 2000 files that were not written with # PIL (they were made using Adobe Photoshop) -def test_lossless(test_card: ImageFile.ImageFile, tmp_path: Path) -> None: +def test_lossless(card: ImageFile.ImageFile, tmp_path: Path) -> None: with Image.open("Tests/images/test-card-lossless.jp2") as im: im.load() outfile = str(tmp_path / "temp_test-card.png") im.save(outfile) - assert_image_similar(im, test_card, 1.0e-3) + assert_image_similar(im, card, 1.0e-3) -def test_lossy_tiled(test_card: ImageFile.ImageFile) -> None: - assert_image_similar_tofile( - test_card, "Tests/images/test-card-lossy-tiled.jp2", 2.0 - ) +def test_lossy_tiled(card: ImageFile.ImageFile) -> None: + assert_image_similar_tofile(card, "Tests/images/test-card-lossy-tiled.jp2", 2.0) -def test_lossless_rt(test_card: ImageFile.ImageFile) -> None: - im = roundtrip(test_card) - assert_image_equal(im, test_card) +def test_lossless_rt(card: ImageFile.ImageFile) -> None: + im = roundtrip(card) + assert_image_equal(im, card) -def test_lossy_rt(test_card: ImageFile.ImageFile) -> None: - im = roundtrip(test_card, quality_layers=[20]) - assert_image_similar(im, test_card, 2.0) +def test_lossy_rt(card: ImageFile.ImageFile) -> None: + im = roundtrip(card, quality_layers=[20]) + assert_image_similar(im, card, 2.0) -def test_tiled_rt(test_card: ImageFile.ImageFile) -> None: - im = roundtrip(test_card, tile_size=(128, 128)) - assert_image_equal(im, test_card) +def test_tiled_rt(card: ImageFile.ImageFile) -> None: + im = roundtrip(card, tile_size=(128, 128)) + assert_image_equal(im, card) -def test_tiled_offset_rt(test_card: ImageFile.ImageFile) -> None: - im = roundtrip(test_card, tile_size=(128, 128), tile_offset=(0, 0), offset=(32, 32)) - assert_image_equal(im, test_card) +def test_tiled_offset_rt(card: ImageFile.ImageFile) -> None: + im = roundtrip(card, tile_size=(128, 128), tile_offset=(0, 0), offset=(32, 32)) + assert_image_equal(im, card) -def test_tiled_offset_too_small(test_card: ImageFile.ImageFile) -> None: +def test_tiled_offset_too_small(card: ImageFile.ImageFile) -> None: with pytest.raises(ValueError): - roundtrip(test_card, tile_size=(128, 128), tile_offset=(0, 0), offset=(128, 32)) + roundtrip(card, tile_size=(128, 128), tile_offset=(0, 0), offset=(128, 32)) -def test_irreversible_rt(test_card: ImageFile.ImageFile) -> None: - im = roundtrip(test_card, irreversible=True, quality_layers=[20]) - assert_image_similar(im, test_card, 2.0) +def test_irreversible_rt(card: ImageFile.ImageFile) -> None: + im = roundtrip(card, irreversible=True, quality_layers=[20]) + assert_image_similar(im, card, 2.0) -def test_prog_qual_rt(test_card: ImageFile.ImageFile) -> None: - im = roundtrip(test_card, quality_layers=[60, 40, 20], progression="LRCP") - assert_image_similar(im, test_card, 2.0) +def test_prog_qual_rt(card: ImageFile.ImageFile) -> None: + im = roundtrip(card, quality_layers=[60, 40, 20], progression="LRCP") + assert_image_similar(im, card, 2.0) -def test_prog_res_rt(test_card: ImageFile.ImageFile) -> None: - im = roundtrip(test_card, num_resolutions=8, progression="RLCP") - assert_image_equal(im, test_card) +def test_prog_res_rt(card: ImageFile.ImageFile) -> None: + im = roundtrip(card, num_resolutions=8, progression="RLCP") + assert_image_equal(im, card) @pytest.mark.parametrize("num_resolutions", range(2, 6)) def test_default_num_resolutions( - test_card: ImageFile.ImageFile, num_resolutions: int + card: ImageFile.ImageFile, num_resolutions: int ) -> None: d = 1 << (num_resolutions - 1) - im = test_card.resize((d - 1, d - 1)) + im = card.resize((d - 1, d - 1)) with pytest.raises(OSError): roundtrip(im, num_resolutions=num_resolutions) reloaded = roundtrip(im) @@ -216,31 +214,31 @@ def test_header_errors() -> None: pass -def test_layers_type(test_card: ImageFile.ImageFile, tmp_path: Path) -> None: +def test_layers_type(card: ImageFile.ImageFile, tmp_path: Path) -> None: outfile = str(tmp_path / "temp_layers.jp2") for quality_layers in [[100, 50, 10], (100, 50, 10), None]: - test_card.save(outfile, quality_layers=quality_layers) + card.save(outfile, quality_layers=quality_layers) for quality_layers_str in ["quality_layers", ("100", "50", "10")]: with pytest.raises(ValueError): - test_card.save(outfile, quality_layers=quality_layers_str) + card.save(outfile, quality_layers=quality_layers_str) -def test_layers(test_card: ImageFile.ImageFile) -> None: +def test_layers(card: ImageFile.ImageFile) -> None: out = BytesIO() - test_card.save(out, "JPEG2000", quality_layers=[100, 50, 10], progression="LRCP") + card.save(out, "JPEG2000", quality_layers=[100, 50, 10], progression="LRCP") out.seek(0) with Image.open(out) as im: im.layers = 1 im.load() - assert_image_similar(im, test_card, 13) + assert_image_similar(im, card, 13) out.seek(0) with Image.open(out) as im: im.layers = 3 im.load() - assert_image_similar(im, test_card, 0.4) + assert_image_similar(im, card, 0.4) @pytest.mark.parametrize( @@ -257,7 +255,7 @@ def test_layers(test_card: ImageFile.ImageFile) -> None: ), ) def test_no_jp2( - test_card: ImageFile.ImageFile, + card: ImageFile.ImageFile, name: str, args: dict[str, bool], offset: int, @@ -266,20 +264,20 @@ def test_no_jp2( out = BytesIO() if name: out.name = name - test_card.save(out, "JPEG2000", **args) + card.save(out, "JPEG2000", **args) out.seek(offset) assert out.read(2) == data -def test_mct(test_card: ImageFile.ImageFile) -> None: +def test_mct(card: ImageFile.ImageFile) -> None: # Three component for val in (0, 1): out = BytesIO() - test_card.save(out, "JPEG2000", mct=val, no_jp2=True) + card.save(out, "JPEG2000", mct=val, no_jp2=True) assert out.getvalue()[59] == val with Image.open(out) as im: - assert_image_similar(im, test_card, 1.0e-3) + assert_image_similar(im, card, 1.0e-3) # Single component should have MCT disabled for val in (0, 1): @@ -436,22 +434,22 @@ def test_comment() -> None: pass -def test_save_comment(test_card: ImageFile.ImageFile) -> None: +def test_save_comment(card: ImageFile.ImageFile) -> None: for comment in ("Created by Pillow", b"Created by Pillow"): out = BytesIO() - test_card.save(out, "JPEG2000", comment=comment) + card.save(out, "JPEG2000", comment=comment) with Image.open(out) as im: assert im.info["comment"] == b"Created by Pillow" out = BytesIO() long_comment = b" " * 65531 - test_card.save(out, "JPEG2000", comment=long_comment) + card.save(out, "JPEG2000", comment=long_comment) with Image.open(out) as im: assert im.info["comment"] == long_comment with pytest.raises(ValueError): - test_card.save(out, "JPEG2000", comment=long_comment + b" ") + card.save(out, "JPEG2000", comment=long_comment + b" ") @pytest.mark.parametrize( @@ -474,10 +472,10 @@ def test_crashes(test_file: str) -> None: @skip_unless_feature_version("jpg_2000", "2.4.0") -def test_plt_marker(test_card: ImageFile.ImageFile) -> None: +def test_plt_marker(card: ImageFile.ImageFile) -> None: # Search the start of the codesteam for PLT out = BytesIO() - test_card.save(out, "JPEG2000", no_jp2=True, plt=True) + card.save(out, "JPEG2000", no_jp2=True, plt=True) out.seek(0) while True: marker = out.read(2) From ed910a68d637661ccb4c4a7c1245769176fec93d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 26 Oct 2024 11:42:35 +1100 Subject: [PATCH 555/662] Only replace version suffix if zlib-ng is present --- Tests/test_features.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Tests/test_features.py b/Tests/test_features.py index ed7929973..f8f7f6eec 100644 --- a/Tests/test_features.py +++ b/Tests/test_features.py @@ -36,10 +36,11 @@ def test_version() -> None: else: assert function(name) == version if name != "PIL": - if name == "zlib" and version is not None: - version = re.sub(".zlib-ng$", "", version) - elif name == "libtiff" and version is not None: - version = re.sub("t$", "", version) + if version is not None: + if name == "zlib" and features.check_feature("zlib_ng"): + version = re.sub(".zlib-ng$", "", version) + elif name == "libtiff": + version = re.sub("t$", "", version) assert version is None or re.search(r"\d+(\.\d+)*$", version) for module in features.modules: From 29cdbce39e1d3860486319b46ea829e0c3566279 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 26 Oct 2024 21:13:01 +1100 Subject: [PATCH 556/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index ae3841569..87945bc84 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.1.0 (unreleased) ------------------- +- Corrected EMF DPI #8485 + [radarhere] + - Fix IFDRational with a zero denominator #8474 [radarhere] From 73600eea94bfb695c52f7746c3523b5ce332d567 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 29 Oct 2024 00:34:24 +1100 Subject: [PATCH 557/662] Detach PyQt6 QPixmap instance before returning --- .github/workflows/test-windows.yml | 6 ++++++ src/PIL/ImageQt.py | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index c8842e37b..f6d0aeb1d 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -80,6 +80,12 @@ jobs: pytest-cov pytest-timeout + - name: Install CPython dependencies + if: "!contains(matrix.python-version, 'pypy')" + run: > + python3 -m pip install + PyQt6 + - name: Install dependencies id: install run: | diff --git a/src/PIL/ImageQt.py b/src/PIL/ImageQt.py index a3d647138..2cc40f855 100644 --- a/src/PIL/ImageQt.py +++ b/src/PIL/ImageQt.py @@ -213,4 +213,7 @@ def toqimage(im: Image.Image | str | QByteArray) -> ImageQt: def toqpixmap(im: Image.Image | str | QByteArray) -> QPixmap: qimage = toqimage(im) - return getattr(QPixmap, "fromImage")(qimage) + pixmap = getattr(QPixmap, "fromImage")(qimage) + if qt_version == "6": + pixmap.detach() + return pixmap From e5706a590b16fcfc2b826de19addc2e33d3c3508 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 29 Oct 2024 09:04:06 +1100 Subject: [PATCH 558/662] Upgraded multibuild to remove openjpeg lib64 copy --- .github/workflows/wheels-dependencies.sh | 3 --- wheels/multibuild | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 7970d4d15..3a80a7e74 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -91,9 +91,6 @@ function build { build_libpng build_lcms2 build_openjpeg - if [ -f /usr/local/lib64/libopenjp2.so ]; then - cp /usr/local/lib64/libopenjp2.so /usr/local/lib - fi ORIGINAL_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -O3 -DNDEBUG" diff --git a/wheels/multibuild b/wheels/multibuild index 452dd2d17..9a9d1275f 160000 --- a/wheels/multibuild +++ b/wheels/multibuild @@ -1 +1 @@ -Subproject commit 452dd2d1705f6b2375369a6570c415beb3163f70 +Subproject commit 9a9d1275f025f737cdaa3c451ba07129dd95f361 From 08554684b3f382f3d729db5e6cd1fe94126dab66 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 29 Oct 2024 07:46:59 +0800 Subject: [PATCH 559/662] Revert fribidi/raqm changes for macOS builds. --- .github/workflows/wheels-dependencies.sh | 5 ----- .github/workflows/wheels-test.sh | 21 ++++++++++++++++----- pyproject.toml | 4 ++-- setup.py | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 9dae28717..220842371 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -155,11 +155,6 @@ function build { fi build_harfbuzz - - if [ -n "$IS_MACOS" ]; then - build_simple fribidi $FRIBIDI_VERSION https://github.com/fribidi/fribidi/releases/download/v$FRIBIDI_VERSION tar.xz --enable-shared - build_raqm - fi } # Perform all dependency builds in the build subfolder. diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh index 3a8fc87ba..e671c8d45 100755 --- a/.github/workflows/wheels-test.sh +++ b/.github/workflows/wheels-test.sh @@ -1,13 +1,24 @@ #!/bin/bash set -e -# For Unix, ensure fribidi is installed by the system. -if [[ "$OSTYPE" != "darwin"* ]]; then - if [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then - apk add curl fribidi +# Ensure fribidi is installed by the system. +if [[ "$OSTYPE" == "darwin"* ]]; then + # If Homebrew is on the path during the build, it may leak into the wheels. + # However, we need a *do* need Homebrew to provide a copy of fribidi for + # testing purposes so that we can verify the fribidi shim works as expected. + if [[ "$(uname -m)" == "x86_64" ]]; then + HOMEBREW_HOME=/usr/local/homebrew else - yum install -y fribidi + HOMEBREW_HOME=/opt/homebrew fi + $HOMEBREW_HOME/bin/brew install fribidi + + # Add the Homebrew lib folder so that vendored libraries can be found. + export DYLD_LIBRARY_PATH=$HOMEBREW_HOME/lib +elif [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then + apk add curl fribidi +else + yum install -y fribidi fi python3 -m pip install numpy diff --git a/pyproject.toml b/pyproject.toml index 3839cf840..da8548dcb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -95,8 +95,8 @@ before-all = ".github/workflows/wheels-dependencies.sh" build-verbosity = 1 config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable" -# Add an explicit dependencies prefix for macOS, and don't request vendored libraries. -macos.config-settings = "raqm=enable imagequant=disable dependencies-prefix=./build/deps" +# Add an explicit dependencies prefix for macOS. +macos.config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable dependencies-prefix=./build/deps" test-command = "cd {project} && .github/workflows/wheels-test.sh" test-extras = "tests" diff --git a/setup.py b/setup.py index 16c25cbda..38d793b14 100644 --- a/setup.py +++ b/setup.py @@ -454,7 +454,7 @@ class pil_build_ext(build_ext): def get_macos_sdk_path(self) -> str | None: try: sdk_path = ( - subprocess.check_output(["xcrun", "--show-sdk-path"]) + subprocess.check_output(["xcrun", "--show-sdk-path", "--sdk", "macosx"]) .strip() .decode("latin1") ) From 8308bf361e7d4bac39b1710e4c3c0725c7ad07ac Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 29 Oct 2024 07:47:30 +0800 Subject: [PATCH 560/662] Bump multibuild to include more cmake changes. --- wheels/multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wheels/multibuild b/wheels/multibuild index 22e8ad0c6..9a9d1275f 160000 --- a/wheels/multibuild +++ b/wheels/multibuild @@ -1 +1 @@ -Subproject commit 22e8ad0c69acdb0c94abab74da6e09f2810d50d5 +Subproject commit 9a9d1275f025f737cdaa3c451ba07129dd95f361 From c74a5bdd85c3314fbdbbe2a72d17adad85fae5f0 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 29 Oct 2024 09:02:05 +0800 Subject: [PATCH 561/662] Correct paths used for Linux build. --- .github/workflows/wheels-dependencies.sh | 31 ++++-------------------- pyproject.toml | 4 +++ setup.py | 3 +-- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 220842371..0eb15d553 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -26,8 +26,6 @@ OPENJPEG_VERSION=2.5.2 XZ_VERSION=5.6.3 TIFF_VERSION=4.6.0 LCMS2_VERSION=2.16 -RAQM_VERSION=0.10.2 -FRIBIDI_VERSION=1.0.16 if [[ -n "$IS_MACOS" ]]; then GIFLIB_VERSION=5.2.2 else @@ -63,12 +61,8 @@ function build_brotli { local cmake=$(get_modern_cmake) local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-$BROTLI_VERSION.tar.gz) (cd $out_dir \ - && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \ + && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \ && make install) - if [[ "$MB_ML_LIBC" == "manylinux" ]]; then - cp $BUILD_PREFIX/lib64/libbrotli* $BUILD_PREFIX/lib - cp $BUILD_PREFIX/lib64/pkgconfig/libbrotli* $BUILD_PREFIX/lib/pkgconfig - fi touch brotli-stamp } @@ -78,27 +72,12 @@ function build_harfbuzz { local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz) (cd $out_dir \ - && meson setup build --prefix=$BUILD_PREFIX --buildtype=release -Dfreetype=enabled -Dglib=disabled) + && meson setup build --prefix=$BUILD_PREFIX --libdir=$BUILD_PREFIX/lib --buildtype=release -Dfreetype=enabled -Dglib=disabled) (cd $out_dir/build \ && meson install) - if [[ "$MB_ML_LIBC" == "manylinux" ]]; then - cp $BUILD_PREFIX/lib64/libharfbuzz* $BUILD_PREFIX/lib - fi touch harfbuzz-stamp } -function build_raqm { - if [ -e raqm-stamp ]; then return; fi - python3 -m pip install meson ninja - - local out_dir=$(fetch_unpack https://github.com/HOST-Oman/libraqm/releases/download/v$RAQM_VERSION/raqm-$RAQM_VERSION.tar.xz raqm-$RAQM_VERSION.tar.xz) - (cd $out_dir \ - && meson setup build --prefix=$BUILD_PREFIX) - (cd $out_dir/build \ - && meson install) - touch raqm-stamp -} - function build { build_xz if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then @@ -133,9 +112,6 @@ function build { build_libpng build_lcms2 build_openjpeg - if [ -f $BUILD_PREFIX/lib64/libopenjp2.so ]; then - cp $BUILD_PREFIX/lib64/libopenjp2.so $BUILD_PREFIX/lib - fi ORIGINAL_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -O3 -DNDEBUG" @@ -190,6 +166,9 @@ if [[ -n "$IS_MACOS" ]]; then build_pkg_config # Ensure cmake is available python3 -m pip install cmake +else + # Ensure that any built libraries are on the linker path. + export LD_LIBRARY_PATH=$BUILD_PREFIX/lib fi wrap_wheel_builder build diff --git a/pyproject.toml b/pyproject.toml index da8548dcb..af3d04757 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -104,6 +104,10 @@ test-extras = "tests" [tool.cibuildwheel.macos.environment] PATH = "$(pwd)/build/deps/bin:$(dirname $(which python3)):/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin" +[tool.cibuildwheel.linux.environment] +LD_LIBRARY_PATH = "$(pwd)/build/deps/lib" +PKG_CONFIG_PATH = "$(pwd)/build/deps/lib/pkgconfig:$(pwd)/build/deps/share/pkgconfig" + [tool.black] exclude = "wheels/multibuild" diff --git a/setup.py b/setup.py index 38d793b14..d7e305fc0 100644 --- a/setup.py +++ b/setup.py @@ -131,7 +131,7 @@ _LIB_IMAGING = ( "codec_fd", ) -DEBUG = False +DEBUG = True class DependencyException(Exception): @@ -479,7 +479,6 @@ class pil_build_ext(build_ext): pkg_config = None if _cmd_exists(os.environ.get("PKG_CONFIG", "pkg-config")): pkg_config = _pkg_config - # # add configured kits for root_name, lib_name in { From 72d81e24a81e6e765f21e5794218f080e7718ec7 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 29 Oct 2024 09:25:47 +0800 Subject: [PATCH 562/662] Simplify Linux config by correcting a logic error in macOS config. --- .github/workflows/wheels-dependencies.sh | 7 ++----- pyproject.toml | 4 ---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 0eb15d553..2e915364a 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -4,8 +4,8 @@ if [ -z "$IS_MACOS" ]; then export MB_ML_LIBC=${AUDITWHEEL_POLICY::9} export MB_ML_VER=${AUDITWHEEL_POLICY:9} - - # Build and install into the `build/deps` folder. +else + # Build and install macOS builds into the `build/deps` folder. BUILD_PREFIX=$(pwd)/build/deps fi export PLAT=$CIBW_ARCHS @@ -166,9 +166,6 @@ if [[ -n "$IS_MACOS" ]]; then build_pkg_config # Ensure cmake is available python3 -m pip install cmake -else - # Ensure that any built libraries are on the linker path. - export LD_LIBRARY_PATH=$BUILD_PREFIX/lib fi wrap_wheel_builder build diff --git a/pyproject.toml b/pyproject.toml index af3d04757..da8548dcb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -104,10 +104,6 @@ test-extras = "tests" [tool.cibuildwheel.macos.environment] PATH = "$(pwd)/build/deps/bin:$(dirname $(which python3)):/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin" -[tool.cibuildwheel.linux.environment] -LD_LIBRARY_PATH = "$(pwd)/build/deps/lib" -PKG_CONFIG_PATH = "$(pwd)/build/deps/lib/pkgconfig:$(pwd)/build/deps/share/pkgconfig" - [tool.black] exclude = "wheels/multibuild" From ec214e4d7caa471c087e0d690b20d75b6dd929fc Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 29 Oct 2024 09:39:58 +0800 Subject: [PATCH 563/662] Can't check IS_MACOS until common_utils is invoked. --- .github/workflows/wheels-dependencies.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 2e915364a..9ce851f0f 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -1,13 +1,5 @@ #!/bin/bash # Define custom utilities -# Test for macOS with [ -n "$IS_MACOS" ] -if [ -z "$IS_MACOS" ]; then - export MB_ML_LIBC=${AUDITWHEEL_POLICY::9} - export MB_ML_VER=${AUDITWHEEL_POLICY:9} -else - # Build and install macOS builds into the `build/deps` folder. - BUILD_PREFIX=$(pwd)/build/deps -fi export PLAT=$CIBW_ARCHS source wheels/multibuild/common_utils.sh source wheels/multibuild/library_builders.sh @@ -15,6 +7,16 @@ if [ -z "$IS_MACOS" ]; then source wheels/multibuild/manylinux_utils.sh fi +# Test for macOS with [ -n "$IS_MACOS" ] +echo "IS MACOS: $IS_MACOS" +if [ -z "$IS_MACOS" ]; then + export MB_ML_LIBC=${AUDITWHEEL_POLICY::9} + export MB_ML_VER=${AUDITWHEEL_POLICY:9} +elseac + # Build and install macOS builds into the `build/deps` folder. + BUILD_PREFIX=$(pwd)/build/deps +fi + ARCHIVE_SDIR=pillow-depends-main # Package versions for fresh source builds From d1a4f8029b2d89f19e4652c96e3b1909b90aa5df Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 29 Oct 2024 09:54:15 +0800 Subject: [PATCH 564/662] Don't use multibuild variables before invoking multibuild. --- .github/workflows/wheels-dependencies.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 9ce851f0f..fd13930db 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -1,4 +1,14 @@ #!/bin/bash + +# Setup that needs to be done before multibuild utils are invoked +if [[ "$(uname -s)" == "Darwin" ]]; then + # Build and install macOS builds into the `build/deps` folder. + BUILD_PREFIX=$(pwd)/build/deps +else + export MB_ML_LIBC=${AUDITWHEEL_POLICY::9} + export MB_ML_VER=${AUDITWHEEL_POLICY:9} +fi + # Define custom utilities export PLAT=$CIBW_ARCHS source wheels/multibuild/common_utils.sh @@ -7,16 +17,6 @@ if [ -z "$IS_MACOS" ]; then source wheels/multibuild/manylinux_utils.sh fi -# Test for macOS with [ -n "$IS_MACOS" ] -echo "IS MACOS: $IS_MACOS" -if [ -z "$IS_MACOS" ]; then - export MB_ML_LIBC=${AUDITWHEEL_POLICY::9} - export MB_ML_VER=${AUDITWHEEL_POLICY:9} -elseac - # Build and install macOS builds into the `build/deps` folder. - BUILD_PREFIX=$(pwd)/build/deps -fi - ARCHIVE_SDIR=pillow-depends-main # Package versions for fresh source builds From 6d137043f712d6790eba835a8ec727e0a4fbb603 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 29 Oct 2024 10:01:46 +0800 Subject: [PATCH 565/662] Remove stray debug. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d7e305fc0..38d793b14 100644 --- a/setup.py +++ b/setup.py @@ -131,7 +131,7 @@ _LIB_IMAGING = ( "codec_fd", ) -DEBUG = True +DEBUG = False class DependencyException(Exception): @@ -479,6 +479,7 @@ class pil_build_ext(build_ext): pkg_config = None if _cmd_exists(os.environ.get("PKG_CONFIG", "pkg-config")): pkg_config = _pkg_config + # # add configured kits for root_name, lib_name in { From 2d1d801ec032bfb760bede88da6dcaab5ff3c75e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 29 Oct 2024 22:15:56 +1100 Subject: [PATCH 566/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 87945bc84..9d45e2214 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.1.0 (unreleased) ------------------- +- Detach PyQt6 QPixmap instance before returning #8509 + [radarhere] + - Corrected EMF DPI #8485 [radarhere] From 624848ff97e438e5ae7bd239254edceaa2751af1 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 29 Oct 2024 22:21:53 +1100 Subject: [PATCH 567/662] Do not repeatedly save to the same path --- Tests/test_file_jpeg.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index 2c66652e5..c41a61f4b 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -543,10 +543,10 @@ class TestFileJpeg: ) def test_qtables(self, tmp_path: Path) -> None: def _n_qtables_helper(n: int, test_file: str) -> None: + b = BytesIO() with Image.open(test_file) as im: - f = str(tmp_path / "temp.jpg") - im.save(f, qtables=[[n] * 64] * n) - with Image.open(f) as im: + im.save(b, "JPEG", qtables=[[n] * 64] * n) + with Image.open(b) as im: assert len(im.quantization) == n reloaded = self.roundtrip(im, qtables="keep") assert im.quantization == reloaded.quantization From 80cf74030d533a5ebc8e921ae8094316123b6837 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Tue, 29 Oct 2024 23:13:01 +1100 Subject: [PATCH 568/662] Removed fixture Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- Tests/test_file_jpeg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_file_jpeg.py b/Tests/test_file_jpeg.py index c41a61f4b..347a162a5 100644 --- a/Tests/test_file_jpeg.py +++ b/Tests/test_file_jpeg.py @@ -541,7 +541,7 @@ class TestFileJpeg: @mark_if_feature_version( pytest.mark.valgrind_known_error, "libjpeg_turbo", "2.0", reason="Known Failing" ) - def test_qtables(self, tmp_path: Path) -> None: + def test_qtables(self) -> None: def _n_qtables_helper(n: int, test_file: str) -> None: b = BytesIO() with Image.open(test_file) as im: From c6912f81ff20211c2638be64bc198024aa9a5b40 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Wed, 30 Oct 2024 05:43:23 +0800 Subject: [PATCH 569/662] Corrected typo in code comment. Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- .github/workflows/wheels-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh index e671c8d45..9bcf42458 100755 --- a/.github/workflows/wheels-test.sh +++ b/.github/workflows/wheels-test.sh @@ -4,7 +4,7 @@ set -e # Ensure fribidi is installed by the system. if [[ "$OSTYPE" == "darwin"* ]]; then # If Homebrew is on the path during the build, it may leak into the wheels. - # However, we need a *do* need Homebrew to provide a copy of fribidi for + # However, we *do* need Homebrew to provide a copy of fribidi for # testing purposes so that we can verify the fribidi shim works as expected. if [[ "$(uname -m)" == "x86_64" ]]; then HOMEBREW_HOME=/usr/local/homebrew From 67c2e04f706f9f7f8efa6bd6437632ab8e546cae Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 30 Oct 2024 08:37:19 +0200 Subject: [PATCH 570/662] Add trove-classifiers>=2024.10.12 to 'tests' extra and use for Windows CI --- .github/workflows/test-windows.yml | 13 +------------ pyproject.toml | 1 + 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index f6d0aeb1d..4ac6f8769 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -69,17 +69,6 @@ jobs: - name: Print build system information run: python3 .github/workflows/system-info.py - - name: Install Python dependencies - run: > - python3 -m pip install - coverage>=7.4.2 - defusedxml - olefile - pyroma - pytest - pytest-cov - pytest-timeout - - name: Install CPython dependencies if: "!contains(matrix.python-version, 'pypy')" run: > @@ -184,7 +173,7 @@ jobs: - name: Build Pillow run: | $FLAGS="-C raqm=vendor -C fribidi=vendor" - cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v $FLAGS ." + cmd /c "winbuild\build\build_env.cmd && $env:pythonLocation\python.exe -m pip install -v $FLAGS .[tests]" & $env:pythonLocation\python.exe selftest.py --installed shell: pwsh diff --git a/pyproject.toml b/pyproject.toml index c55be7693..45d5c2692 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,6 +65,7 @@ optional-dependencies.tests = [ "pytest", "pytest-cov", "pytest-timeout", + "trove-classifiers>=2024.10.12", ] optional-dependencies.typing = [ "typing-extensions; python_version<'3.10'", From 0bf15f0f2a856907bf925fc797a107a33069b734 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 30 Oct 2024 22:24:37 +0200 Subject: [PATCH 571/662] Upgrade pip --- .github/workflows/test-windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 4ac6f8769..728182b1e 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -71,9 +71,9 @@ jobs: - name: Install CPython dependencies if: "!contains(matrix.python-version, 'pypy')" - run: > - python3 -m pip install - PyQt6 + run: | + python3 -m pip install --upgrade pip + python3 -m pip install PyQt6 - name: Install dependencies id: install From 01270b5859800355b12fa4403c7684d9bf72c6f5 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Thu, 31 Oct 2024 06:27:54 +0800 Subject: [PATCH 572/662] Use the intended entry point for the x86_64 brew binary. Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- .github/workflows/wheels-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh index 9bcf42458..e2ef33711 100755 --- a/.github/workflows/wheels-test.sh +++ b/.github/workflows/wheels-test.sh @@ -7,7 +7,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then # However, we *do* need Homebrew to provide a copy of fribidi for # testing purposes so that we can verify the fribidi shim works as expected. if [[ "$(uname -m)" == "x86_64" ]]; then - HOMEBREW_HOME=/usr/local/homebrew + HOMEBREW_HOME=/usr/local else HOMEBREW_HOME=/opt/homebrew fi From 51e36230660667df38c68379314b652b34da47e5 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Thu, 31 Oct 2024 09:50:38 +0800 Subject: [PATCH 573/662] Revert x86_64 homebrew location change (with explanation). --- .github/workflows/wheels-test.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh index e2ef33711..b697b740e 100755 --- a/.github/workflows/wheels-test.sh +++ b/.github/workflows/wheels-test.sh @@ -7,7 +7,10 @@ if [[ "$OSTYPE" == "darwin"* ]]; then # However, we *do* need Homebrew to provide a copy of fribidi for # testing purposes so that we can verify the fribidi shim works as expected. if [[ "$(uname -m)" == "x86_64" ]]; then - HOMEBREW_HOME=/usr/local + # Use the "installed" location, rather than /usr/local, for two reasons: + # firstly, Homebrew allows libraries to be *installed*, but not linked; + # and secondly, we don't want any *other* leakage from /usr/local. + HOMEBREW_HOME=/usr/local/Homebrew else HOMEBREW_HOME=/opt/homebrew fi From aae90c3c016ee36b838d1ca5d522301d98731261 Mon Sep 17 00:00:00 2001 From: "Pietro F. Fontana" Date: Fri, 1 Nov 2024 15:42:08 +0100 Subject: [PATCH 574/662] Allow linking to shared zlib If compiled as shared library zlib produces `zlib1.dll` and `zdll.lib`. --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index def341784..48863c397 100644 --- a/setup.py +++ b/setup.py @@ -690,6 +690,8 @@ class pil_build_ext(build_ext): feature.set("zlib", "z") elif sys.platform == "win32" and _find_library_file(self, "zlib"): feature.set("zlib", "zlib") # alternative name + elif sys.platform == "win32" and _find_library_file(self, "zdll"): + feature.set("zlib", "zdll") # different name if shared if feature.want("jpeg"): _dbg("Looking for jpeg") From 71016f23b4b441536a5c713d3cad53e2870655fb Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 2 Nov 2024 17:51:01 +1100 Subject: [PATCH 575/662] Added Fedora 41 --- .github/workflows/test-docker.yml | 1 + docs/installation/platform-support.rst | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index 880fe3eea..5bfbe1bdb 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -47,6 +47,7 @@ jobs: debian-12-bookworm-x86, debian-12-bookworm-amd64, fedora-40-amd64, + fedora-41-amd64, gentoo, ubuntu-22.04-jammy-amd64, ubuntu-24.04-noble-amd64, diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index 21ebd1ad5..da6763736 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -31,6 +31,8 @@ These platforms are built and tested for every change. +----------------------------------+----------------------------+---------------------+ | Fedora 40 | 3.12 | x86-64 | +----------------------------------+----------------------------+---------------------+ +| Fedora 41 | 3.13 | x86-64 | ++----------------------------------+----------------------------+---------------------+ | Gentoo | 3.12 | x86-64 | +----------------------------------+----------------------------+---------------------+ | macOS 13 Ventura | 3.9 | x86-64 | From 141e8d25462cfaa56e6d707b704c832b950b86bf Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sat, 2 Nov 2024 12:08:23 +0200 Subject: [PATCH 576/662] Remove unused 'gcov: true' for codecov-action@v4 --- .github/workflows/test-docker.yml | 1 - .github/workflows/test.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index 5bfbe1bdb..101807745 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -102,7 +102,6 @@ jobs: with: flags: GHA_Docker name: ${{ matrix.docker }} - gcov: true token: ${{ secrets.CODECOV_ORG_TOKEN }} success: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6576292b5..29949f4e0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -158,7 +158,6 @@ jobs: with: flags: ${{ matrix.os == 'ubuntu-latest' && 'GHA_Ubuntu' || 'GHA_macOS' }} name: ${{ matrix.os }} Python ${{ matrix.python-version }} - gcov: true token: ${{ secrets.CODECOV_ORG_TOKEN }} success: From 6fe7160cb97f13a93735a365ff33b5f388d8067d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondrej=20Baranovi=C4=8D?= Date: Sat, 2 Nov 2024 14:03:53 +0100 Subject: [PATCH 577/662] Update Windows 11 Arm64 tested versions --- docs/installation/platform-support.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index 21ebd1ad5..d8671ee14 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -146,7 +146,7 @@ These platforms have been reported to work at the versions mentioned. +----------------------------------+----------------------------+------------------+--------------+ | FreeBSD 10.2 | 2.7, 3.4 | 3.1.0 |x86-64 | +----------------------------------+----------------------------+------------------+--------------+ -| Windows 11 | 3.9, 3.10, 3.11, 3.12 | 10.2.0 |arm64 | +| Windows 11 23H2 | 3.9, 3.10, 3.11, 3.12, 3.13| 11.0.0 |arm64 | +----------------------------------+----------------------------+------------------+--------------+ | Windows 11 Pro | 3.11, 3.12 | 10.2.0 |x86-64 | +----------------------------------+----------------------------+------------------+--------------+ From 9faf598c890ced5828ba13ac7f5445b4310fff0c Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sat, 2 Nov 2024 23:29:56 +0200 Subject: [PATCH 578/662] Fix warning[artipacked]: credential persistence through GitHub Actions artifacts --- .github/workflows/docs.yml | 2 ++ .github/workflows/lint.yml | 2 ++ .github/workflows/test-cygwin.yml | 2 ++ .github/workflows/test-docker.yml | 2 ++ .github/workflows/test-mingw.yml | 2 ++ .github/workflows/test-valgrind.yml | 2 ++ .github/workflows/test-windows.yml | 4 ++++ .github/workflows/test.yml | 2 ++ .github/workflows/wheels.yml | 7 +++++++ 9 files changed, 25 insertions(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 92e860cb5..626824f38 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -33,6 +33,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + persist-credentials: false - name: Set up Python uses: actions/setup-python@v5 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cc4760288..8e789a734 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -21,6 +21,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + persist-credentials: false - name: pre-commit cache uses: actions/cache@v4 diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml index 0aa79e423..656054e89 100644 --- a/.github/workflows/test-cygwin.yml +++ b/.github/workflows/test-cygwin.yml @@ -48,6 +48,8 @@ jobs: - name: Checkout Pillow uses: actions/checkout@v4 + with: + persist-credentials: false - name: Install Cygwin uses: cygwin/cygwin-install-action@v4 diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index 101807745..03608319a 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -65,6 +65,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + persist-credentials: false - name: Build system information run: python3 .github/workflows/system-info.py diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml index c7a73439c..bfd393db5 100644 --- a/.github/workflows/test-mingw.yml +++ b/.github/workflows/test-mingw.yml @@ -46,6 +46,8 @@ jobs: steps: - name: Checkout Pillow uses: actions/checkout@v4 + with: + persist-credentials: false - name: Set up shell run: echo "C:\msys64\usr\bin\" >> $env:GITHUB_PATH diff --git a/.github/workflows/test-valgrind.yml b/.github/workflows/test-valgrind.yml index 63aec586b..8818b3b23 100644 --- a/.github/workflows/test-valgrind.yml +++ b/.github/workflows/test-valgrind.yml @@ -40,6 +40,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + persist-credentials: false - name: Build system information run: python3 .github/workflows/system-info.py diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index f6d0aeb1d..c1ba52719 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -44,16 +44,20 @@ jobs: steps: - name: Checkout Pillow uses: actions/checkout@v4 + with: + persist-credentials: false - name: Checkout cached dependencies uses: actions/checkout@v4 with: + persist-credentials: false repository: python-pillow/pillow-depends path: winbuild\depends - name: Checkout extra test images uses: actions/checkout@v4 with: + persist-credentials: false repository: python-pillow/test-images path: Tests\test-images diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 29949f4e0..87acd7ddb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,6 +63,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + persist-credentials: false - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 34452fa56..45f186341 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -61,6 +61,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + persist-credentials: false submodules: true - uses: actions/setup-python@v5 @@ -132,6 +133,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + persist-credentials: false submodules: true - uses: actions/setup-python@v5 @@ -173,10 +175,13 @@ jobs: - cibw_arch: ARM64 steps: - uses: actions/checkout@v4 + with: + persist-credentials: false - name: Checkout extra test images uses: actions/checkout@v4 with: + persist-credentials: false repository: python-pillow/test-images path: Tests\test-images @@ -253,6 +258,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + persist-credentials: false - name: Set up Python uses: actions/setup-python@v5 From d3db931f21bcaa723071c7b4d669eead0fbdabab Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sat, 2 Nov 2024 23:31:21 +0200 Subject: [PATCH 579/662] Fix error[excessive-permissions]: overly broad workflow or job-level permissions --- .github/workflows/stale.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 545c2e364..61ccf58e2 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: permissions: - issues: write + contents: read concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -15,6 +15,8 @@ concurrency: jobs: stale: if: github.repository_owner == 'python-pillow' + permissions: + issues: write runs-on: ubuntu-latest From 924df0ac5c44815b397f375c7bed7a69ba02b956 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 3 Nov 2024 23:22:57 +0000 Subject: [PATCH 580/662] Migrate config .github/renovate.json --- .github/renovate.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index d1d824335..f48b670ec 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,7 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:base" + "config:recommended" ], "labels": [ "Dependency" @@ -9,9 +9,13 @@ "packageRules": [ { "groupName": "github-actions", - "matchManagers": ["github-actions"], - "separateMajorMinor": "false" + "matchManagers": [ + "github-actions" + ], + "separateMajorMinor": false } ], - "schedule": ["on the 3rd day of the month"] + "schedule": [ + "on the 3rd day of the month" + ] } From 37679c8673e44f31be060ff7bc6772c7f178bee7 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 4 Nov 2024 20:55:00 +1100 Subject: [PATCH 581/662] Pass IFDs to libtiff as TIFF_LONG8 --- src/PIL/TiffImagePlugin.py | 4 +++- src/encode.c | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 6bf39b75a..c95b65b8e 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1915,7 +1915,9 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: if not getattr(Image.core, "libtiff_support_custom_tags", False): continue - if tag in ifd.tagtype: + if tag in TiffTags.TAGS_V2_GROUPS: + types[tag] = TiffTags.LONG8 + elif tag in ifd.tagtype: types[tag] = ifd.tagtype[tag] elif not (isinstance(value, (int, float, str, bytes))): continue diff --git a/src/encode.c b/src/encode.c index 1a4cd489d..09a86a715 100644 --- a/src/encode.c +++ b/src/encode.c @@ -736,7 +736,7 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { } if (tag_type) { int type_int = PyLong_AsLong(tag_type); - if (type_int >= TIFF_BYTE && type_int <= TIFF_DOUBLE) { + if (type_int >= TIFF_BYTE && type_int <= TIFF_LONG8) { type = (TIFFDataType)type_int; } } @@ -929,7 +929,7 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { ); } else if (type == TIFF_LONG) { status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, PyLong_AsLongLong(value) + &encoder->state, (ttag_t)key_int, (UINT32)PyLong_AsLong(value) ); } else if (type == TIFF_SSHORT) { status = ImagingLibTiffSetField( @@ -959,6 +959,10 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { status = ImagingLibTiffSetField( &encoder->state, (ttag_t)key_int, (FLOAT64)PyFloat_AsDouble(value) ); + } else if (type == TIFF_LONG8) { + status = ImagingLibTiffSetField( + &encoder->state, (ttag_t)key_int, PyLong_AsLongLong(value) + ); } else { TRACE( ("Unhandled type for key %d : %s \n", From 4b7f6a6eb083b3c112f4713cd1fb74bd93ee3e7c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 17:35:35 +0000 Subject: [PATCH 582/662] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.6.9 → v0.7.2](https://github.com/astral-sh/ruff-pre-commit/compare/v0.6.9...v0.7.2) - [github.com/psf/black-pre-commit-mirror: 24.8.0 → 24.10.0](https://github.com/psf/black-pre-commit-mirror/compare/24.8.0...24.10.0) - [github.com/pre-commit/mirrors-clang-format: v19.1.1 → v19.1.3](https://github.com/pre-commit/mirrors-clang-format/compare/v19.1.1...v19.1.3) - [github.com/python-jsonschema/check-jsonschema: 0.29.3 → 0.29.4](https://github.com/python-jsonschema/check-jsonschema/compare/0.29.3...0.29.4) - [github.com/tox-dev/pyproject-fmt: 2.2.4 → v2.5.0](https://github.com/tox-dev/pyproject-fmt/compare/2.2.4...v2.5.0) - [github.com/abravalheri/validate-pyproject: v0.20.2 → v0.22](https://github.com/abravalheri/validate-pyproject/compare/v0.20.2...v0.22) --- .pre-commit-config.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6254b8941..ddc98fdc3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,12 +1,12 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.6.9 + rev: v0.7.2 hooks: - id: ruff args: [--exit-non-zero-on-fix] - repo: https://github.com/psf/black-pre-commit-mirror - rev: 24.8.0 + rev: 24.10.0 hooks: - id: black @@ -24,7 +24,7 @@ repos: exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.gd$|\.opt$) - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v19.1.1 + rev: v19.1.3 hooks: - id: clang-format types: [c] @@ -50,7 +50,7 @@ repos: exclude: ^.github/.*TEMPLATE|^Tests/(fonts|images)/ - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.29.3 + rev: 0.29.4 hooks: - id: check-github-workflows - id: check-readthedocs @@ -62,12 +62,12 @@ repos: - id: sphinx-lint - repo: https://github.com/tox-dev/pyproject-fmt - rev: 2.2.4 + rev: v2.5.0 hooks: - id: pyproject-fmt - repo: https://github.com/abravalheri/validate-pyproject - rev: v0.20.2 + rev: v0.22 hooks: - id: validate-pyproject additional_dependencies: [trove-classifiers>=2024.10.12] From 5628213ab03b59e2a70087c65cf4f05aa8de8cdf Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Mon, 4 Nov 2024 21:17:47 +0200 Subject: [PATCH 583/662] Upgrade pip for all --- .github/workflows/test-windows.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 728182b1e..9fcb8cb94 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -69,10 +69,13 @@ jobs: - name: Print build system information run: python3 .github/workflows/system-info.py + - name: Upgrade pip + run: | + python3 -m pip install --upgrade pip + - name: Install CPython dependencies if: "!contains(matrix.python-version, 'pypy')" run: | - python3 -m pip install --upgrade pip python3 -m pip install PyQt6 - name: Install dependencies From b6413cd58818c6518ede6638a391bac15d812db0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 5 Nov 2024 07:16:49 +1100 Subject: [PATCH 584/662] Cast to uint64_t --- src/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/encode.c b/src/encode.c index 09a86a715..d369a1b45 100644 --- a/src/encode.c +++ b/src/encode.c @@ -961,7 +961,7 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { ); } else if (type == TIFF_LONG8) { status = ImagingLibTiffSetField( - &encoder->state, (ttag_t)key_int, PyLong_AsLongLong(value) + &encoder->state, (ttag_t)key_int, (uint64_t)PyLong_AsLongLong(value) ); } else { TRACE( From 2d23a84049eb22f62107eb5f4cbe7c421b074d12 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 5 Nov 2024 17:18:46 +1100 Subject: [PATCH 585/662] Fixed type hint --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index def341784..1a8c03eb3 100644 --- a/setup.py +++ b/setup.py @@ -1001,7 +1001,7 @@ def debug_build() -> bool: return hasattr(sys, "gettotalrefcount") or FUZZING_BUILD -files = ["src/_imaging.c"] +files: list[str | os.PathLike[str]] = ["src/_imaging.c"] for src_file in _IMAGING: files.append("src/" + src_file + ".c") for src_file in _LIB_IMAGING: From 48db4a1d4d1baec7fdd77474db00029f24c2cef1 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 5 Nov 2024 19:40:03 +1100 Subject: [PATCH 586/662] Use test image filename --- docs/reference/ImageFile.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/ImageFile.rst b/docs/reference/ImageFile.rst index fdfeb60f9..64abd71d1 100644 --- a/docs/reference/ImageFile.rst +++ b/docs/reference/ImageFile.rst @@ -19,7 +19,7 @@ Example: Parse an image from PIL import ImageFile - fp = open("hopper.pgm", "rb") + fp = open("hopper.ppm", "rb") p = ImageFile.Parser() From 3cdaee45f50a1a4c020c382b516299a2bb531ec7 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 5 Nov 2024 20:15:23 +1100 Subject: [PATCH 587/662] Raise UnidentifiedImageError when opening TIFF without dimensions --- Tests/test_imagefile.py | 13 +++++++++++++ src/PIL/TiffImagePlugin.py | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Tests/test_imagefile.py b/Tests/test_imagefile.py index 1ee684926..8bef90ce4 100644 --- a/Tests/test_imagefile.py +++ b/Tests/test_imagefile.py @@ -93,6 +93,19 @@ class TestImageFile: assert p.image is not None assert (48, 48) == p.image.size + @pytest.mark.filterwarnings("ignore:Corrupt EXIF data") + def test_incremental_tiff(self) -> None: + with ImageFile.Parser() as p: + with open("Tests/images/hopper.tif", "rb") as f: + p.feed(f.read(1024)) + + # Check that insufficient data was given in the first feed + assert not p.image + + p.feed(f.read()) + assert p.image is not None + assert (128, 128) == p.image.size + @skip_unless_feature("webp") def test_incremental_webp(self) -> None: with ImageFile.Parser() as p: diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 6bf39b75a..d4dcab286 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1433,8 +1433,12 @@ class TiffImageFile(ImageFile.ImageFile): logger.debug("- YCbCr subsampling: %s", self.tag_v2.get(YCBCRSUBSAMPLING)) # size - xsize = self.tag_v2.get(IMAGEWIDTH) - ysize = self.tag_v2.get(IMAGELENGTH) + try: + xsize = self.tag_v2[IMAGEWIDTH] + ysize = self.tag_v2[IMAGELENGTH] + except KeyError as e: + msg = "Missing dimensions" + raise TypeError(msg) from e if not isinstance(xsize, int) or not isinstance(ysize, int): msg = "Invalid dimensions" raise ValueError(msg) From a1d862f1d67e621213e0239d3e45838abeab363e Mon Sep 17 00:00:00 2001 From: "Pietro F. Fontana" Date: Tue, 5 Nov 2024 15:39:03 +0100 Subject: [PATCH 588/662] Be more specific in comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ondrej Baranovič --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 48863c397..68252f3a9 100644 --- a/setup.py +++ b/setup.py @@ -691,7 +691,7 @@ class pil_build_ext(build_ext): elif sys.platform == "win32" and _find_library_file(self, "zlib"): feature.set("zlib", "zlib") # alternative name elif sys.platform == "win32" and _find_library_file(self, "zdll"): - feature.set("zlib", "zdll") # different name if shared + feature.set("zlib", "zdll") # dll import library if feature.want("jpeg"): _dbg("Looking for jpeg") From e82b5398e750c5dd37dfcc2edaf6b947371b53ef Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Wed, 6 Nov 2024 14:12:07 +0800 Subject: [PATCH 589/662] Correct handling of vendored fribidi. --- .github/workflows/wheels-dependencies.sh | 46 ++++++++++++++++-------- .github/workflows/wheels-test.sh | 8 +++-- .gitignore | 4 +++ pyproject.toml | 4 +-- 4 files changed, 43 insertions(+), 19 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index fd13930db..ff06e99d2 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -1,16 +1,34 @@ #!/bin/bash # Setup that needs to be done before multibuild utils are invoked +PROJECTDIR=$(pwd) if [[ "$(uname -s)" == "Darwin" ]]; then - # Build and install macOS builds into the `build/deps` folder. - BUILD_PREFIX=$(pwd)/build/deps + # Safety check - macOS builds require that CIBW_ARCHS is set, and that it + # only contains a single value (even though cwbuildwheel) allows multiple + # values in CIBW_ARCHS. + if [[ -z "$CIBW_ARCHS" ]]; then + echo "ERROR: Pillow macOS builds require CIBW_ARCHS be defined." + exit 1 + fi + if [[ "$CIBW_ARCHS" == *" "* ]]; then + echo "ERROR: Pillow macOS builds only support a single architecture in CIBW_ARCHS." + exit 1 + fi + + # Build macOS dependencies in `build/darwin` + # Install them into `build/deps/darwin` + WORKDIR=$(pwd)/build/darwin + BUILD_PREFIX=$(pwd)/build/deps/darwin + PLAT=$CIBW_ARCHS else - export MB_ML_LIBC=${AUDITWHEEL_POLICY::9} - export MB_ML_VER=${AUDITWHEEL_POLICY:9} + # Build prefix will default to /usr/local + WORKDIR=$(pwd)/build + PLAT=$CIBW_ARCHS + MB_ML_LIBC=${AUDITWHEEL_POLICY::9} + MB_ML_VER=${AUDITWHEEL_POLICY:9} fi # Define custom utilities -export PLAT=$CIBW_ARCHS source wheels/multibuild/common_utils.sh source wheels/multibuild/library_builders.sh if [ -z "$IS_MACOS" ]; then @@ -117,9 +135,6 @@ function build { ORIGINAL_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -O3 -DNDEBUG" - if [[ -n "$IS_MACOS" ]]; then - CFLAGS="$CFLAGS -Wl,-headerpad_max_install_names" - fi build_libwebp CFLAGS=$ORIGINAL_CFLAGS @@ -127,7 +142,7 @@ function build { if [ -n "$IS_MACOS" ]; then # Custom freetype build - build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --with-harfbuzz=no + build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --without-harfbuzz else build_freetype fi @@ -136,17 +151,18 @@ function build { } # Perform all dependency builds in the build subfolder. -mkdir -p build -pushd build > /dev/null +mkdir -p $WORKDIR +pushd $WORKDIR > /dev/null # Any stuff that you need to do before you start building the wheels # Runs in the root directory of this repository. -if [[ ! -d pillow-depends-main ]]; then - if [[ ! -f pillow-depends-main.zip ]]; then +if [[ ! -d $WORKDIR/pillow-depends-main ]]; then + if [[ ! -f $PROJECTDIR/pillow-depends-main.zip ]]; then echo "Download pillow dependency sources..." - curl -fSL -o pillow-depends-main.zip https://github.com/python-pillow/pillow-depends/archive/main.zip + curl -fSL -o $PROJECTDIR/pillow-depends-main.zip https://github.com/python-pillow/pillow-depends/archive/main.zip fi - untar pillow-depends-main.zip + echo "Unpacking pillow dependency sources..." + untar $PROJECTDIR/pillow-depends-main.zip fi if [[ -n "$IS_MACOS" ]]; then diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh index b697b740e..d1db8e8a5 100755 --- a/.github/workflows/wheels-test.sh +++ b/.github/workflows/wheels-test.sh @@ -16,8 +16,12 @@ if [[ "$OSTYPE" == "darwin"* ]]; then fi $HOMEBREW_HOME/bin/brew install fribidi - # Add the Homebrew lib folder so that vendored libraries can be found. - export DYLD_LIBRARY_PATH=$HOMEBREW_HOME/lib + # Add the lib folder for fribidi so that the vendored library can be found. + # Don't use /opt/homebrew/lib directly - use the lib folder where the + # installed copy of fribidi is cellared. This ensures we don't pick up the + # Homebrew version of any other library that we're dependent on (most notably, + # freetype). + export DYLD_LIBRARY_PATH=$(dirname $(realpath $HOMEBREW_HOME/lib/libfribidi.dylib)) elif [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then apk add curl fribidi else diff --git a/.gitignore b/.gitignore index 9b5773257..3033c2ea7 100644 --- a/.gitignore +++ b/.gitignore @@ -91,5 +91,9 @@ Tests/images/msp Tests/images/picins Tests/images/sunraster +# Test and dependency downloads +pillow-depends-main.zip +pillow-test-images.zip + # pyinstaller *.spec diff --git a/pyproject.toml b/pyproject.toml index da8548dcb..26fa45817 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -96,13 +96,13 @@ build-verbosity = 1 config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable" # Add an explicit dependencies prefix for macOS. -macos.config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable dependencies-prefix=./build/deps" +macos.config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable dependencies-prefix=./build/deps/darwin" test-command = "cd {project} && .github/workflows/wheels-test.sh" test-extras = "tests" [tool.cibuildwheel.macos.environment] -PATH = "$(pwd)/build/deps/bin:$(dirname $(which python3)):/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin" +PATH = "$(pwd)/build/deps/darwin/bin:$(dirname $(which python3)):/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin" [tool.black] exclude = "wheels/multibuild" From b0345c1c7b7605063064118563e8068fde5f9343 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 6 Nov 2024 22:08:22 +1100 Subject: [PATCH 590/662] Updated macOS tested Pillow versions --- docs/installation/platform-support.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index a0bada7b4..b9d633142 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -75,7 +75,9 @@ These platforms have been reported to work at the versions mentioned. | Operating system | | Tested Python | | Latest tested | | Tested | | | | versions | | Pillow version | | processors | +==================================+============================+==================+==============+ -| macOS 15 Sequoia | 3.8, 3.9, 3.10, 3.11, 3.12 | 10.4.0 |arm | +| macOS 15 Sequoia | 3.9, 3.10, 3.11, 3.12, 3.13| 11.0.0 |arm | +| +----------------------------+------------------+ | +| | 3.8 | 10.4.0 | | +----------------------------------+----------------------------+------------------+--------------+ | macOS 14 Sonoma | 3.8, 3.9, 3.10, 3.11, 3.12 | 10.4.0 |arm | +----------------------------------+----------------------------+------------------+--------------+ From 042f3ff083d98d211c2035dd45e511a63800d06e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 7 Nov 2024 07:52:18 +1100 Subject: [PATCH 591/662] Require coverage>=7.4.2 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 45d5c2692..bff295bc6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,7 +56,7 @@ optional-dependencies.mic = [ ] optional-dependencies.tests = [ "check-manifest", - "coverage", + "coverage>=7.4.2", "defusedxml", "markdown2", "olefile", From 4e35852ccc97f3e455f5130f1cd22f2f10292955 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 8 Nov 2024 05:34:35 +0800 Subject: [PATCH 592/662] Correct typo in comment. Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- .github/workflows/wheels-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index ff06e99d2..2dea8c62a 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -4,7 +4,7 @@ PROJECTDIR=$(pwd) if [[ "$(uname -s)" == "Darwin" ]]; then # Safety check - macOS builds require that CIBW_ARCHS is set, and that it - # only contains a single value (even though cwbuildwheel) allows multiple + # only contains a single value (even though cibuildwheel) allows multiple # values in CIBW_ARCHS. if [[ -z "$CIBW_ARCHS" ]]; then echo "ERROR: Pillow macOS builds require CIBW_ARCHS be defined." From 0a5b0f29e58cf9763b886e3ce300a79b5f4bac63 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 9 Nov 2024 00:18:59 +1100 Subject: [PATCH 593/662] Run gcc problem matcher on Python 3.13 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 87acd7ddb..c33309bbf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -116,7 +116,7 @@ jobs: GHA_PYTHON_VERSION: ${{ matrix.python-version }} - name: Register gcc problem matcher - if: "matrix.os == 'ubuntu-latest' && matrix.python-version == '3.12'" + if: "matrix.os == 'ubuntu-latest' && matrix.python-version == '3.13'" run: echo "::add-matcher::.github/problem-matchers/gcc.json" - name: Build From 681a03b1c38b26a36cddda812ead882b4af24eb4 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sat, 9 Nov 2024 10:29:29 +0800 Subject: [PATCH 594/662] Apply suggestions from code review Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- .github/workflows/wheels-dependencies.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 2dea8c62a..f4106429d 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -4,8 +4,8 @@ PROJECTDIR=$(pwd) if [[ "$(uname -s)" == "Darwin" ]]; then # Safety check - macOS builds require that CIBW_ARCHS is set, and that it - # only contains a single value (even though cibuildwheel) allows multiple - # values in CIBW_ARCHS. + # only contains a single value (even though cibuildwheel allows multiple + # values in CIBW_ARCHS). if [[ -z "$CIBW_ARCHS" ]]; then echo "ERROR: Pillow macOS builds require CIBW_ARCHS be defined." exit 1 @@ -171,7 +171,7 @@ if [[ -n "$IS_MACOS" ]]; then # with a MACOSX_DEPLOYMENT_TARGET that doesn't match what we want to use, # and they may bring in other dependencies that we don't want. The same will # be true of any other locations on the path. To avoid conflicts, strip the - # path down to the bare mimimum (which, on macOS, won't include any + # path down to the bare minimum (which, on macOS, won't include any # development dependencies). export PATH="$BUILD_PREFIX/bin:$(dirname $(which python3)):/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin" export CMAKE_PREFIX_PATH=$BUILD_PREFIX From 9f09d48f3710409725beef1ca1be66da33855922 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 9 Nov 2024 18:20:52 +1100 Subject: [PATCH 595/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 9d45e2214..7e8e94ed9 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.1.0 (unreleased) ------------------- +- Allow linking to zlib import library on Windows #8519 + [cubanpit, nulano] + - Detach PyQt6 QPixmap instance before returning #8509 [radarhere] From 7674b1a07a1dfdf1c0944aea1fefb95c4f62f5b4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 9 Nov 2024 18:43:12 +1100 Subject: [PATCH 596/662] Removed quotes after dropping support for Python 3.8 --- src/PIL/_typing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/_typing.py b/src/PIL/_typing.py index 0a7d87cc2..335804b79 100644 --- a/src/PIL/_typing.py +++ b/src/PIL/_typing.py @@ -47,7 +47,7 @@ class SupportsRead(Protocol[_T_co]): def read(self, __length: int = ...) -> _T_co: ... -StrOrBytesPath = Union[str, bytes, "os.PathLike[str]", "os.PathLike[bytes]"] +StrOrBytesPath = Union[str, bytes, os.PathLike[str], os.PathLike[bytes]] __all__ = ["Buffer", "IntegralLike", "StrOrBytesPath", "SupportsRead", "TypeGuard"] From 2303018ebf751b7d6bc9d0e3d830cdd5f529a5b4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 9 Nov 2024 20:06:33 +1100 Subject: [PATCH 597/662] Removed use of os.path.realpath --- src/PIL/Image.py | 6 +++--- src/PIL/ImageFile.py | 2 +- src/PIL/ImageFont.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 44270392c..9b76ce8bd 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -2550,7 +2550,7 @@ class Image: filename: str | bytes = "" open_fp = False if is_path(fp): - filename = os.path.realpath(os.fspath(fp)) + filename = os.fspath(fp) open_fp = True elif fp == sys.stdout: try: @@ -2559,7 +2559,7 @@ class Image: pass if not filename and hasattr(fp, "name") and is_path(fp.name): # only set the name for metadata purposes - filename = os.path.realpath(os.fspath(fp.name)) + filename = os.fspath(fp.name) # may mutate self! self._ensure_mutable() @@ -3463,7 +3463,7 @@ def open( exclusive_fp = False filename: str | bytes = "" if is_path(fp): - filename = os.path.realpath(os.fspath(fp)) + filename = os.fspath(fp) if filename: fp = builtins.open(filename, "rb") diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index d69d84568..7f27d54dc 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -130,7 +130,7 @@ class ImageFile(Image.Image): if is_path(fp): # filename self.fp = open(fp, "rb") - self.filename = os.path.realpath(os.fspath(fp)) + self.filename = os.fspath(fp) self._exclusive_fp = True else: # stream diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py index b694b817e..d8c265560 100644 --- a/src/PIL/ImageFont.py +++ b/src/PIL/ImageFont.py @@ -270,7 +270,7 @@ class FreeTypeFont: ) if is_path(font): - font = os.path.realpath(os.fspath(font)) + font = os.fspath(font) if sys.platform == "win32": font_bytes_path = font if isinstance(font, bytes) else font.encode() try: From 5bff2f3b2894ec6923c590d0c37b18177d0634bd Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 10 Nov 2024 21:32:54 +1100 Subject: [PATCH 598/662] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 7e8e94ed9..f6ed5eb82 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 11.1.0 (unreleased) ------------------- +- Removed use of os.path.realpath #8545 + [radarhere] + - Allow linking to zlib import library on Windows #8519 [cubanpit, nulano] From 378df7a5b22e47a0652619bd2f3218674c579d91 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 12 Nov 2024 22:41:57 +1100 Subject: [PATCH 599/662] Disable platform guessing instead of adding dependencies-prefix --- pyproject.toml | 4 +-- setup.py | 93 ++++++++++++++++++++++---------------------------- 2 files changed, 42 insertions(+), 55 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 26fa45817..abb7be645 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -95,8 +95,8 @@ before-all = ".github/workflows/wheels-dependencies.sh" build-verbosity = 1 config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable" -# Add an explicit dependencies prefix for macOS. -macos.config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable dependencies-prefix=./build/deps/darwin" +# Disable platform guessing on macOS +macos.config-settings = "raqm=enable raqm=vendor fribidi=vendor imagequant=disable platform-guessing=disable" test-command = "cd {project} && .github/workflows/wheels-test.sh" test-extras = "tests" diff --git a/setup.py b/setup.py index e4ce04883..4770c5eb7 100644 --- a/setup.py +++ b/setup.py @@ -344,11 +344,6 @@ class pil_build_ext(build_ext): for x in ("raqm", "fribidi") ] + [ - ( - "dependencies-prefix", - None, - "The prefix where build dependencies are located.", - ), ("disable-platform-guessing", None, "Disable platform guessing on Linux"), ("debug", None, "Debug logging"), ] @@ -360,7 +355,6 @@ class pil_build_ext(build_ext): return True if value in configuration.get(option, []) else None def initialize_options(self) -> None: - self.dependencies_prefix = configuration.get("dependencies-prefix", []) self.disable_platform_guessing = self.check_configuration( "platform-guessing", "disable" ) @@ -570,54 +564,47 @@ class pil_build_ext(build_ext): ) elif sys.platform == "darwin": - if self.dependencies_prefix: - # Use the explicitly provided prefixes for dependencies. - for prefix in self.dependencies_prefix: - _add_directory(library_dirs, os.path.join(prefix, "lib")) - _add_directory(include_dirs, os.path.join(prefix, "include")) + # attempt to make sure we pick freetype2 over other versions + _add_directory(include_dirs, "/sw/include/freetype2") + _add_directory(include_dirs, "/sw/lib/freetype2/include") + # fink installation directories + _add_directory(library_dirs, "/sw/lib") + _add_directory(include_dirs, "/sw/include") + # darwin ports installation directories + _add_directory(library_dirs, "/opt/local/lib") + _add_directory(include_dirs, "/opt/local/include") + + # if Homebrew is installed, use its lib and include directories + try: + prefix = ( + subprocess.check_output(["brew", "--prefix"]) + .strip() + .decode("latin1") + ) + except Exception: + # Homebrew not installed + prefix = None + + ft_prefix = None + + if prefix: + # add Homebrew's include and lib directories + _add_directory(library_dirs, os.path.join(prefix, "lib")) + _add_directory(include_dirs, os.path.join(prefix, "include")) + _add_directory( + include_dirs, os.path.join(prefix, "opt", "zlib", "include") + ) + ft_prefix = os.path.join(prefix, "opt", "freetype") + + if ft_prefix and os.path.isdir(ft_prefix): + # freetype might not be linked into Homebrew's prefix + _add_directory(library_dirs, os.path.join(ft_prefix, "lib")) + _add_directory(include_dirs, os.path.join(ft_prefix, "include")) else: - # Guess the dependency locations based on homebrew/fink/macports - # attempt to make sure we pick freetype2 over other versions - _add_directory(include_dirs, "/sw/include/freetype2") - _add_directory(include_dirs, "/sw/lib/freetype2/include") - # fink installation directories - _add_directory(library_dirs, "/sw/lib") - _add_directory(include_dirs, "/sw/include") - # darwin ports installation directories - _add_directory(library_dirs, "/opt/local/lib") - _add_directory(include_dirs, "/opt/local/include") - - # if Homebrew is installed, use its lib and include directories - try: - prefix = ( - subprocess.check_output(["brew", "--prefix"]) - .strip() - .decode("latin1") - ) - except Exception: - # Homebrew not installed - prefix = None - - ft_prefix = None - - if prefix: - # add Homebrew's include and lib directories - _add_directory(library_dirs, os.path.join(prefix, "lib")) - _add_directory(include_dirs, os.path.join(prefix, "include")) - _add_directory( - include_dirs, os.path.join(prefix, "opt", "zlib", "include") - ) - ft_prefix = os.path.join(prefix, "opt", "freetype") - - if ft_prefix and os.path.isdir(ft_prefix): - # freetype might not be linked into Homebrew's prefix - _add_directory(library_dirs, os.path.join(ft_prefix, "lib")) - _add_directory(include_dirs, os.path.join(ft_prefix, "include")) - else: - # fall back to freetype from XQuartz if - # Homebrew's freetype is missing - _add_directory(library_dirs, "/usr/X11/lib") - _add_directory(include_dirs, "/usr/X11/include") + # fall back to freetype from XQuartz if + # Homebrew's freetype is missing + _add_directory(library_dirs, "/usr/X11/lib") + _add_directory(include_dirs, "/usr/X11/include") # Add the macOS SDK path. sdk_path = self.get_macos_sdk_path() From 6fa775e324a27dac54ff8a9249553e06e1928051 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 12 Nov 2024 22:46:24 +1100 Subject: [PATCH 600/662] Platform guessing affects more than just Linux --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e78f87fe9..fea21ee3f 100644 --- a/setup.py +++ b/setup.py @@ -344,7 +344,7 @@ class pil_build_ext(build_ext): for x in ("raqm", "fribidi") ] + [ - ("disable-platform-guessing", None, "Disable platform guessing on Linux"), + ("disable-platform-guessing", None, "Disable platform guessing"), ("debug", None, "Debug logging"), ] + [("add-imaging-libs=", None, "Add libs to _imaging build")] From 9dc690427f009f898ef74b8799569346eb0b3fd5 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Wed, 13 Nov 2024 11:03:26 +0800 Subject: [PATCH 601/662] Correct the lookup of libfribidi on x86 macOS installs. --- .github/workflows/wheels-test.sh | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/wheels-test.sh b/.github/workflows/wheels-test.sh index d1db8e8a5..ce83a4278 100755 --- a/.github/workflows/wheels-test.sh +++ b/.github/workflows/wheels-test.sh @@ -7,21 +7,18 @@ if [[ "$OSTYPE" == "darwin"* ]]; then # However, we *do* need Homebrew to provide a copy of fribidi for # testing purposes so that we can verify the fribidi shim works as expected. if [[ "$(uname -m)" == "x86_64" ]]; then - # Use the "installed" location, rather than /usr/local, for two reasons: - # firstly, Homebrew allows libraries to be *installed*, but not linked; - # and secondly, we don't want any *other* leakage from /usr/local. - HOMEBREW_HOME=/usr/local/Homebrew + HOMEBREW_PREFIX=/usr/local else - HOMEBREW_HOME=/opt/homebrew + HOMEBREW_PREFIX=/opt/homebrew fi - $HOMEBREW_HOME/bin/brew install fribidi + $HOMEBREW_PREFIX/bin/brew install fribidi # Add the lib folder for fribidi so that the vendored library can be found. - # Don't use /opt/homebrew/lib directly - use the lib folder where the + # Don't use $HOMEWBREW_PREFIX/lib directly - use the lib folder where the # installed copy of fribidi is cellared. This ensures we don't pick up the # Homebrew version of any other library that we're dependent on (most notably, # freetype). - export DYLD_LIBRARY_PATH=$(dirname $(realpath $HOMEBREW_HOME/lib/libfribidi.dylib)) + export DYLD_LIBRARY_PATH=$(dirname $(realpath $HOMEBREW_PREFIX/lib/libfribidi.dylib)) elif [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then apk add curl fribidi else From 48c7eb22c0aeba649892dcb4766600f6dcfb6bdc Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 13 Nov 2024 22:45:52 +1100 Subject: [PATCH 602/662] Added default value for _Tile args --- src/PIL/EpsImagePlugin.py | 2 +- src/PIL/FliImagePlugin.py | 2 +- src/PIL/ImageFile.py | 2 +- src/PIL/MspImagePlugin.py | 2 +- src/PIL/PcdImagePlugin.py | 2 +- src/PIL/QoiImagePlugin.py | 2 +- src/PIL/XbmImagePlugin.py | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index fb1e301c0..35cc623e7 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -454,7 +454,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes, eps: int = 1) - if hasattr(fp, "flush"): fp.flush() - ImageFile._save(im, fp, [ImageFile._Tile("eps", (0, 0) + im.size, 0, None)]) + ImageFile._save(im, fp, [ImageFile._Tile("eps", (0, 0) + im.size, 0)]) fp.write(b"\n%%%%EndBinary\n") fp.write(b"grestore end\n") diff --git a/src/PIL/FliImagePlugin.py b/src/PIL/FliImagePlugin.py index 666390be9..b534b30ab 100644 --- a/src/PIL/FliImagePlugin.py +++ b/src/PIL/FliImagePlugin.py @@ -159,7 +159,7 @@ class FliImageFile(ImageFile.ImageFile): framesize = i32(s) self.decodermaxblock = framesize - self.tile = [ImageFile._Tile("fli", (0, 0) + self.size, self.__offset, None)] + self.tile = [ImageFile._Tile("fli", (0, 0) + self.size, self.__offset)] self.__offset += framesize diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 7f27d54dc..6c07c85e7 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -99,7 +99,7 @@ class _Tile(NamedTuple): codec_name: str extents: tuple[int, int, int, int] | None offset: int - args: tuple[Any, ...] | str | None + args: tuple[Any, ...] | str | None = None # diff --git a/src/PIL/MspImagePlugin.py b/src/PIL/MspImagePlugin.py index f3460a787..50fb6a2d9 100644 --- a/src/PIL/MspImagePlugin.py +++ b/src/PIL/MspImagePlugin.py @@ -72,7 +72,7 @@ class MspImageFile(ImageFile.ImageFile): if s[:4] == b"DanM": self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 32, ("1", 0, 1))] else: - self.tile = [ImageFile._Tile("MSP", (0, 0) + self.size, 32, None)] + self.tile = [ImageFile._Tile("MSP", (0, 0) + self.size, 32)] class MspDecoder(ImageFile.PyDecoder): diff --git a/src/PIL/PcdImagePlugin.py b/src/PIL/PcdImagePlugin.py index e8ea800a4..ac40383f9 100644 --- a/src/PIL/PcdImagePlugin.py +++ b/src/PIL/PcdImagePlugin.py @@ -47,7 +47,7 @@ class PcdImageFile(ImageFile.ImageFile): self._mode = "RGB" self._size = 768, 512 # FIXME: not correct for rotated images! - self.tile = [ImageFile._Tile("pcd", (0, 0) + self.size, 96 * 2048, None)] + self.tile = [ImageFile._Tile("pcd", (0, 0) + self.size, 96 * 2048)] def load_end(self) -> None: if self.tile_post_rotate: diff --git a/src/PIL/QoiImagePlugin.py b/src/PIL/QoiImagePlugin.py index 010d3f941..01cc868b2 100644 --- a/src/PIL/QoiImagePlugin.py +++ b/src/PIL/QoiImagePlugin.py @@ -32,7 +32,7 @@ class QoiImageFile(ImageFile.ImageFile): self._mode = "RGB" if channels == 3 else "RGBA" self.fp.seek(1, os.SEEK_CUR) # colorspace - self.tile = [ImageFile._Tile("qoi", (0, 0) + self._size, self.fp.tell(), None)] + self.tile = [ImageFile._Tile("qoi", (0, 0) + self._size, self.fp.tell())] class QoiDecoder(ImageFile.PyDecoder): diff --git a/src/PIL/XbmImagePlugin.py b/src/PIL/XbmImagePlugin.py index f3d490a84..cf1a8b9f5 100644 --- a/src/PIL/XbmImagePlugin.py +++ b/src/PIL/XbmImagePlugin.py @@ -67,7 +67,7 @@ class XbmImageFile(ImageFile.ImageFile): self._mode = "1" self._size = xsize, ysize - self.tile = [ImageFile._Tile("xbm", (0, 0) + self.size, m.end(), None)] + self.tile = [ImageFile._Tile("xbm", (0, 0) + self.size, m.end())] def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: @@ -85,7 +85,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: fp.write(b"static char im_bits[] = {\n") - ImageFile._save(im, fp, [ImageFile._Tile("xbm", (0, 0) + im.size, 0, None)]) + ImageFile._save(im, fp, [ImageFile._Tile("xbm", (0, 0) + im.size, 0)]) fp.write(b"};\n") From 871963b8ddab57fec9050135a5b58bceedce23db Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 13 Nov 2024 22:53:18 +1100 Subject: [PATCH 603/662] Replaced tuple args with mode string where equivalent --- src/PIL/BlpImagePlugin.py | 2 +- src/PIL/DdsImagePlugin.py | 4 +--- src/PIL/FpxImagePlugin.py | 2 +- src/PIL/FtexImagePlugin.py | 2 +- src/PIL/GdImageFile.py | 2 +- src/PIL/ImtImagePlugin.py | 2 +- src/PIL/MspImagePlugin.py | 4 ++-- src/PIL/PixarImagePlugin.py | 4 +--- src/PIL/SpiderImagePlugin.py | 8 ++------ src/PIL/XVThumbImagePlugin.py | 4 +--- src/PIL/XpmImagePlugin.py | 4 +--- 11 files changed, 13 insertions(+), 25 deletions(-) diff --git a/src/PIL/BlpImagePlugin.py b/src/PIL/BlpImagePlugin.py index e5605635e..2d03af9d7 100644 --- a/src/PIL/BlpImagePlugin.py +++ b/src/PIL/BlpImagePlugin.py @@ -273,7 +273,7 @@ class BlpImageFile(ImageFile.ImageFile): raise BLPFormatError(msg) self._mode = "RGBA" if self._blp_alpha_depth else "RGB" - self.tile = [ImageFile._Tile(decoder, (0, 0) + self.size, 0, (self.mode, 0, 1))] + self.tile = [ImageFile._Tile(decoder, (0, 0) + self.size, 0, self.mode)] class _BLPBaseDecoder(ImageFile.PyDecoder): diff --git a/src/PIL/DdsImagePlugin.py b/src/PIL/DdsImagePlugin.py index 1b6408237..9349e2841 100644 --- a/src/PIL/DdsImagePlugin.py +++ b/src/PIL/DdsImagePlugin.py @@ -560,9 +560,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: + struct.pack("<4I", *rgba_mask) # dwRGBABitMask + struct.pack("<5I", DDSCAPS.TEXTURE, 0, 0, 0, 0) ) - ImageFile._save( - im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))] - ) + ImageFile._save(im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, rawmode)]) def _accept(prefix: bytes) -> bool: diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py index 8fef51076..4cfcb067d 100644 --- a/src/PIL/FpxImagePlugin.py +++ b/src/PIL/FpxImagePlugin.py @@ -170,7 +170,7 @@ class FpxImageFile(ImageFile.ImageFile): "raw", (x, y, x1, y1), i32(s, i) + 28, - (self.rawmode,), + self.rawmode, ) ) diff --git a/src/PIL/FtexImagePlugin.py b/src/PIL/FtexImagePlugin.py index ddb469bc3..0516b760c 100644 --- a/src/PIL/FtexImagePlugin.py +++ b/src/PIL/FtexImagePlugin.py @@ -95,7 +95,7 @@ class FtexImageFile(ImageFile.ImageFile): self._mode = "RGBA" self.tile = [ImageFile._Tile("bcn", (0, 0) + self.size, 0, (1,))] elif format == Format.UNCOMPRESSED: - self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 0, ("RGB", 0, 1))] + self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 0, "RGB")] else: msg = f"Invalid texture compression format: {repr(format)}" raise ValueError(msg) diff --git a/src/PIL/GdImageFile.py b/src/PIL/GdImageFile.py index f1b4969f2..fc4801e9d 100644 --- a/src/PIL/GdImageFile.py +++ b/src/PIL/GdImageFile.py @@ -76,7 +76,7 @@ class GdImageFile(ImageFile.ImageFile): "raw", (0, 0) + self.size, 7 + true_color_offset + 4 + 256 * 4, - ("L", 0, 1), + "L", ) ] diff --git a/src/PIL/ImtImagePlugin.py b/src/PIL/ImtImagePlugin.py index 594c56513..068cd5c33 100644 --- a/src/PIL/ImtImagePlugin.py +++ b/src/PIL/ImtImagePlugin.py @@ -62,7 +62,7 @@ class ImtImageFile(ImageFile.ImageFile): "raw", (0, 0) + self.size, self.fp.tell() - len(buffer), - (self.mode, 0, 1), + self.mode, ) ] diff --git a/src/PIL/MspImagePlugin.py b/src/PIL/MspImagePlugin.py index 50fb6a2d9..ef6ae87f8 100644 --- a/src/PIL/MspImagePlugin.py +++ b/src/PIL/MspImagePlugin.py @@ -70,7 +70,7 @@ class MspImageFile(ImageFile.ImageFile): self._size = i16(s, 4), i16(s, 6) if s[:4] == b"DanM": - self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 32, ("1", 0, 1))] + self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 32, "1")] else: self.tile = [ImageFile._Tile("MSP", (0, 0) + self.size, 32)] @@ -188,7 +188,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: fp.write(o16(h)) # image body - ImageFile._save(im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 32, ("1", 0, 1))]) + ImageFile._save(im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 32, "1")]) # diff --git a/src/PIL/PixarImagePlugin.py b/src/PIL/PixarImagePlugin.py index 36f565f1c..5c465bbdc 100644 --- a/src/PIL/PixarImagePlugin.py +++ b/src/PIL/PixarImagePlugin.py @@ -61,9 +61,7 @@ class PixarImageFile(ImageFile.ImageFile): # FIXME: to be continued... # create tile descriptor (assuming "dumped") - self.tile = [ - ImageFile._Tile("raw", (0, 0) + self.size, 1024, (self.mode, 0, 1)) - ] + self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, 1024, self.mode)] # diff --git a/src/PIL/SpiderImagePlugin.py b/src/PIL/SpiderImagePlugin.py index 075073f9f..d7f457ae7 100644 --- a/src/PIL/SpiderImagePlugin.py +++ b/src/PIL/SpiderImagePlugin.py @@ -154,9 +154,7 @@ class SpiderImageFile(ImageFile.ImageFile): self.rawmode = "F;32F" self._mode = "F" - self.tile = [ - ImageFile._Tile("raw", (0, 0) + self.size, offset, (self.rawmode, 0, 1)) - ] + self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, offset, self.rawmode)] self._fp = self.fp # FIXME: hack @property @@ -280,9 +278,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: fp.writelines(hdr) rawmode = "F;32NF" # 32-bit native floating point - ImageFile._save( - im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))] - ) + ImageFile._save(im, fp, [ImageFile._Tile("raw", (0, 0) + im.size, 0, rawmode)]) def _save_spider(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: diff --git a/src/PIL/XVThumbImagePlugin.py b/src/PIL/XVThumbImagePlugin.py index 5d1f201a4..75333354d 100644 --- a/src/PIL/XVThumbImagePlugin.py +++ b/src/PIL/XVThumbImagePlugin.py @@ -74,9 +74,7 @@ class XVThumbImageFile(ImageFile.ImageFile): self.palette = ImagePalette.raw("RGB", PALETTE) self.tile = [ - ImageFile._Tile( - "raw", (0, 0) + self.size, self.fp.tell(), (self.mode, 0, 1) - ) + ImageFile._Tile("raw", (0, 0) + self.size, self.fp.tell(), self.mode) ] diff --git a/src/PIL/XpmImagePlugin.py b/src/PIL/XpmImagePlugin.py index 1fc6c0c39..b985aa5dc 100644 --- a/src/PIL/XpmImagePlugin.py +++ b/src/PIL/XpmImagePlugin.py @@ -101,9 +101,7 @@ class XpmImageFile(ImageFile.ImageFile): self._mode = "P" self.palette = ImagePalette.raw("RGB", b"".join(palette)) - self.tile = [ - ImageFile._Tile("raw", (0, 0) + self.size, self.fp.tell(), ("P", 0, 1)) - ] + self.tile = [ImageFile._Tile("raw", (0, 0) + self.size, self.fp.tell(), "P")] def load_read(self, read_bytes: int) -> bytes: # From 84f5c7e5ba51afbeda6c4aaf42a31cea9ee8b082 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 13 Nov 2024 22:52:36 +1100 Subject: [PATCH 604/662] Added default value for _Tile offset --- src/PIL/EpsImagePlugin.py | 2 +- src/PIL/ImageFile.py | 2 +- src/PIL/XbmImagePlugin.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py index 35cc623e7..36ba15ec5 100644 --- a/src/PIL/EpsImagePlugin.py +++ b/src/PIL/EpsImagePlugin.py @@ -454,7 +454,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes, eps: int = 1) - if hasattr(fp, "flush"): fp.flush() - ImageFile._save(im, fp, [ImageFile._Tile("eps", (0, 0) + im.size, 0)]) + ImageFile._save(im, fp, [ImageFile._Tile("eps", (0, 0) + im.size)]) fp.write(b"\n%%%%EndBinary\n") fp.write(b"grestore end\n") diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 6c07c85e7..bd0e92eb6 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -98,7 +98,7 @@ def _tilesort(t: _Tile) -> int: class _Tile(NamedTuple): codec_name: str extents: tuple[int, int, int, int] | None - offset: int + offset: int = 0 args: tuple[Any, ...] | str | None = None diff --git a/src/PIL/XbmImagePlugin.py b/src/PIL/XbmImagePlugin.py index cf1a8b9f5..943a04470 100644 --- a/src/PIL/XbmImagePlugin.py +++ b/src/PIL/XbmImagePlugin.py @@ -85,7 +85,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: fp.write(b"static char im_bits[] = {\n") - ImageFile._save(im, fp, [ImageFile._Tile("xbm", (0, 0) + im.size, 0)]) + ImageFile._save(im, fp, [ImageFile._Tile("xbm", (0, 0) + im.size)]) fp.write(b"};\n") From 185a03f1a25ba56ae11d655c04645e0a50710dae Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 16 Nov 2024 12:05:06 +1100 Subject: [PATCH 605/662] Do not create new image when exif_transpose() is used in place --- src/PIL/ImageOps.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/PIL/ImageOps.py b/src/PIL/ImageOps.py index 44aad0c3c..bb29cc0d3 100644 --- a/src/PIL/ImageOps.py +++ b/src/PIL/ImageOps.py @@ -698,10 +698,11 @@ def exif_transpose(image: Image.Image, *, in_place: bool = False) -> Image.Image 8: Image.Transpose.ROTATE_90, }.get(orientation) if method is not None: - transposed_image = image.transpose(method) if in_place: - image.im = transposed_image.im - image._size = transposed_image._size + image.im = image.im.transpose(method) + image._size = image.im.size + else: + transposed_image = image.transpose(method) exif_image = image if in_place else transposed_image exif = exif_image.getexif() From 54f23345d2fd1894c7cf89475e385fcbb3d3f16d Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sat, 16 Nov 2024 09:58:29 +0800 Subject: [PATCH 606/662] More tweaks from code review. --- .github/workflows/wheels-dependencies.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index f4106429d..ce2e40103 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -19,14 +19,13 @@ if [[ "$(uname -s)" == "Darwin" ]]; then # Install them into `build/deps/darwin` WORKDIR=$(pwd)/build/darwin BUILD_PREFIX=$(pwd)/build/deps/darwin - PLAT=$CIBW_ARCHS else # Build prefix will default to /usr/local WORKDIR=$(pwd)/build - PLAT=$CIBW_ARCHS MB_ML_LIBC=${AUDITWHEEL_POLICY::9} MB_ML_VER=${AUDITWHEEL_POLICY:9} fi +PLAT=$CIBW_ARCHS # Define custom utilities source wheels/multibuild/common_utils.sh @@ -119,9 +118,9 @@ function build { build_libjpeg_turbo if [ -n "$IS_MACOS" ]; then # Custom tiff build to include jpeg; by default, configure won't include - # headers/libs in the custom macOS prefix. Explicitly disable webp and - # zstd, because on x86_64 macs, it will pick up the Homebrew versions of - # webp and zstd from /usr/local. + # headers/libs in the custom macOS prefix. Explicitly disable webp, + # libdeflate and zstd, because on x86_64 macs, it will pick up the + # Homebrew versions of those libraries from /usr/local. build_simple tiff $TIFF_VERSION https://download.osgeo.org/libtiff tar.gz \ --with-jpeg-include-dir=$BUILD_PREFIX/include --with-jpeg-lib-dir=$BUILD_PREFIX/lib \ --disable-webp --disable-zstd --disable-libdeflate From 6136a92d061e77e622c974c35aa0605f96eb05e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 09:48:28 +0000 Subject: [PATCH 607/662] Update codecov/codecov-action action to v5 --- .github/workflows/test-cygwin.yml | 2 +- .github/workflows/test-docker.yml | 2 +- .github/workflows/test-mingw.yml | 2 +- .github/workflows/test-windows.yml | 2 +- .github/workflows/test.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml index 656054e89..b906ada92 100644 --- a/.github/workflows/test-cygwin.yml +++ b/.github/workflows/test-cygwin.yml @@ -135,7 +135,7 @@ jobs: bash.exe .ci/after_success.sh - name: Upload coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: file: ./coverage.xml flags: GHA_Cygwin diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index 03608319a..cc5f9d4a5 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -100,7 +100,7 @@ jobs: MATRIX_DOCKER: ${{ matrix.docker }} - name: Upload coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: flags: GHA_Docker name: ${{ matrix.docker }} diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml index bfd393db5..a14e7e1ed 100644 --- a/.github/workflows/test-mingw.yml +++ b/.github/workflows/test-mingw.yml @@ -85,7 +85,7 @@ jobs: .ci/test.sh - name: Upload coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: file: ./coverage.xml flags: GHA_Windows diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 9b5da137d..d1924eb20 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -215,7 +215,7 @@ jobs: shell: pwsh - name: Upload coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: file: ./coverage.xml flags: GHA_Windows diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c33309bbf..1405c64f9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -156,7 +156,7 @@ jobs: .ci/after_success.sh - name: Upload coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: flags: ${{ matrix.os == 'ubuntu-latest' && 'GHA_Ubuntu' || 'GHA_macOS' }} name: ${{ matrix.os }} Python ${{ matrix.python-version }} From c70dacff62c07341c4bb9d9c28e26e4e703ab5ae Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 16 Nov 2024 21:44:00 +1100 Subject: [PATCH 608/662] Updated from deprecated "file" to "files" --- .github/workflows/test-cygwin.yml | 2 +- .github/workflows/test-mingw.yml | 2 +- .github/workflows/test-windows.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml index b906ada92..2076cad7a 100644 --- a/.github/workflows/test-cygwin.yml +++ b/.github/workflows/test-cygwin.yml @@ -137,7 +137,7 @@ jobs: - name: Upload coverage uses: codecov/codecov-action@v5 with: - file: ./coverage.xml + files: ./coverage.xml flags: GHA_Cygwin name: Cygwin Python 3.${{ matrix.python-minor-version }} token: ${{ secrets.CODECOV_ORG_TOKEN }} diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml index a14e7e1ed..cca25edba 100644 --- a/.github/workflows/test-mingw.yml +++ b/.github/workflows/test-mingw.yml @@ -87,7 +87,7 @@ jobs: - name: Upload coverage uses: codecov/codecov-action@v5 with: - file: ./coverage.xml + files: ./coverage.xml flags: GHA_Windows name: "MSYS2 MinGW" token: ${{ secrets.CODECOV_ORG_TOKEN }} diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index d1924eb20..d905a3925 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -217,7 +217,7 @@ jobs: - name: Upload coverage uses: codecov/codecov-action@v5 with: - file: ./coverage.xml + files: ./coverage.xml flags: GHA_Windows name: ${{ runner.os }} Python ${{ matrix.python-version }} token: ${{ secrets.CODECOV_ORG_TOKEN }} From 96b898c826982c5b99f2a9387e0d2011a73fe20a Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 18 Nov 2024 09:56:45 +0800 Subject: [PATCH 609/662] A couple more cleanups from code review. --- .github/workflows/wheels-dependencies.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index ce2e40103..f86099af1 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -62,8 +62,7 @@ BROTLI_VERSION=1.1.0 function build_pkg_config { if [ -e pkg-config-stamp ]; then return; fi - # This essentially duplicates the Homebrew recipe: - # https://github.com/Homebrew/homebrew-core/blob/master/Formula/p/pkg-config.rb + # This essentially duplicates the Homebrew recipe ORIGINAL_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Wno-int-conversion" build_simple pkg-config 0.29.2 https://pkg-config.freedesktop.org/releases tar.gz \ @@ -108,7 +107,6 @@ function build { if [ -n "$IS_MACOS" ]; then build_simple xorgproto 2024.1 https://www.x.org/pub/individual/proto build_simple libXau 1.0.11 https://www.x.org/pub/individual/lib - build_simple libXdmcp 1.1.5 https://www.x.org/pub/individual/lib build_simple libpthread-stubs 0.5 https://xcb.freedesktop.org/dist else sed s/\${pc_sysrootdir\}// $BUILD_PREFIX/share/pkgconfig/xcb-proto.pc > $BUILD_PREFIX/lib/pkgconfig/xcb-proto.pc @@ -123,7 +121,7 @@ function build { # Homebrew versions of those libraries from /usr/local. build_simple tiff $TIFF_VERSION https://download.osgeo.org/libtiff tar.gz \ --with-jpeg-include-dir=$BUILD_PREFIX/include --with-jpeg-lib-dir=$BUILD_PREFIX/lib \ - --disable-webp --disable-zstd --disable-libdeflate + --disable-webp --disable-libdeflate --disable-zstd else build_tiff fi @@ -134,6 +132,9 @@ function build { ORIGINAL_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -O3 -DNDEBUG" + if [[ -n "$IS_MACOS" ]]; then + CFLAGS="$CFLAGS -Wl,-headerpad_max_install_names" + fi build_libwebp CFLAGS=$ORIGINAL_CFLAGS @@ -141,7 +142,7 @@ function build { if [ -n "$IS_MACOS" ]; then # Custom freetype build - build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --without-harfbuzz + build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --with-harfbuzz=no else build_freetype fi @@ -175,7 +176,7 @@ if [[ -n "$IS_MACOS" ]]; then export PATH="$BUILD_PREFIX/bin:$(dirname $(which python3)):/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin" export CMAKE_PREFIX_PATH=$BUILD_PREFIX - # Link the brew command into our isolated build directory. + # Ensure the basic structure of the build prefix directory exists. mkdir -p "$BUILD_PREFIX/bin" mkdir -p "$BUILD_PREFIX/lib" From e02e4aaf1de9503e6e88a60f292998d174d23034 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 5 Nov 2024 19:31:54 +1100 Subject: [PATCH 610/662] Updated harfbuzz to 10.1.0 --- .github/workflows/wheels-dependencies.sh | 2 +- winbuild/build_prepare.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index f86099af1..89226810a 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -38,7 +38,7 @@ ARCHIVE_SDIR=pillow-depends-main # Package versions for fresh source builds FREETYPE_VERSION=2.13.2 -HARFBUZZ_VERSION=10.0.1 +HARFBUZZ_VERSION=10.1.0 LIBPNG_VERSION=1.6.44 JPEGTURBO_VERSION=3.0.4 OPENJPEG_VERSION=2.5.2 diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index c8332d11c..5606ac7f7 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -112,7 +112,7 @@ V = { "BROTLI": "1.1.0", "FREETYPE": "2.13.3", "FRIBIDI": "1.0.16", - "HARFBUZZ": "10.0.1", + "HARFBUZZ": "10.1.0", "JPEGTURBO": "3.0.4", "LCMS2": "2.16", "LIBPNG": "1.6.44", From c7a9582eab34bc46b74c245aa137424b9cfaee74 Mon Sep 17 00:00:00 2001 From: Tom Flanagan Date: Tue, 19 Nov 2024 20:40:14 -0800 Subject: [PATCH 611/662] Fix file position desync when calling into libtiff --- Tests/test_libtiff_file_position.py | 23 +++++++++++++++++++++++ src/PIL/TiffImagePlugin.py | 17 +++++++++-------- 2 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 Tests/test_libtiff_file_position.py diff --git a/Tests/test_libtiff_file_position.py b/Tests/test_libtiff_file_position.py new file mode 100644 index 000000000..d614ea8ec --- /dev/null +++ b/Tests/test_libtiff_file_position.py @@ -0,0 +1,23 @@ +from __future__ import annotations + + +import pytest + +from PIL import Image + + +@pytest.mark.parametrize('test_file', [ + 'Tests/images/old-style-jpeg-compression-no-samplesperpixel.tif', + 'Tests/images/old-style-jpeg-compression.tif', +]) +def test_libtiff_exif_loading(test_file) -> None: + # loading image before exif + im1 = Image.open(open(test_file, 'rb', buffering=1048576)) + im1.load() + exif1 = dict(im1.getexif()) + + # loading exif before image + im2 = Image.open(open(test_file, 'rb', buffering=1048576)) + exif2 = dict(im2.getexif()) + + assert exif1 == exif2 diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 6bf39b75a..726286772 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1216,10 +1216,6 @@ class TiffImageFile(ImageFile.ImageFile): def _seek(self, frame: int) -> None: self.fp = self._fp - # reset buffered io handle in case fp - # was passed to libtiff, invalidating the buffer - self.fp.tell() - while len(self._frame_pos) <= frame: if not self.__next: msg = "no more images in TIFF file" @@ -1303,10 +1299,6 @@ class TiffImageFile(ImageFile.ImageFile): if not self.is_animated: self._close_exclusive_fp_after_loading = True - # reset buffered io handle in case fp - # was passed to libtiff, invalidating the buffer - self.fp.tell() - # load IFD data from fp before it is closed exif = self.getexif() for key in TiffTags.TAGS_V2_GROUPS: @@ -1381,8 +1373,17 @@ class TiffImageFile(ImageFile.ImageFile): logger.debug("have fileno, calling fileno version of the decoder.") if not close_self_fp: self.fp.seek(0) + # Save and restore the file position, because libtiff will move it + # outside of the python runtime, and that will confuse + # io.BufferedReader and possible others. + # NOTE: This must use os.lseek(), and not fp.tell()/fp.seek(), + # because the buffer read head already may not equal the actual + # file position, and fp.seek() may just adjust it's internal + # pointer and not actually seek the OS file handle. + pos = os.lseek(fp, 0, os.SEEK_CUR) # 4 bytes, otherwise the trace might error out n, err = decoder.decode(b"fpfp") + os.lseek(fp, pos, os.SEEK_SET) else: # we have something else. logger.debug("don't have fileno or getvalue. just reading") From 44cc0bebb8998897f03d77479df750f208d9d00e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 05:52:50 +0000 Subject: [PATCH 612/662] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- Tests/test_libtiff_file_position.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Tests/test_libtiff_file_position.py b/Tests/test_libtiff_file_position.py index d614ea8ec..43ed82c30 100644 --- a/Tests/test_libtiff_file_position.py +++ b/Tests/test_libtiff_file_position.py @@ -1,23 +1,25 @@ from __future__ import annotations - import pytest from PIL import Image -@pytest.mark.parametrize('test_file', [ - 'Tests/images/old-style-jpeg-compression-no-samplesperpixel.tif', - 'Tests/images/old-style-jpeg-compression.tif', -]) +@pytest.mark.parametrize( + "test_file", + [ + "Tests/images/old-style-jpeg-compression-no-samplesperpixel.tif", + "Tests/images/old-style-jpeg-compression.tif", + ], +) def test_libtiff_exif_loading(test_file) -> None: # loading image before exif - im1 = Image.open(open(test_file, 'rb', buffering=1048576)) + im1 = Image.open(open(test_file, "rb", buffering=1048576)) im1.load() exif1 = dict(im1.getexif()) # loading exif before image - im2 = Image.open(open(test_file, 'rb', buffering=1048576)) + im2 = Image.open(open(test_file, "rb", buffering=1048576)) exif2 = dict(im2.getexif()) assert exif1 == exif2 From cb1653f6272ebc543530ae03cd7cf8577ed13231 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 20 Nov 2024 22:33:23 +1100 Subject: [PATCH 613/662] Updated comment --- src/PIL/TiffImagePlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 726286772..08bb78915 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1374,7 +1374,7 @@ class TiffImageFile(ImageFile.ImageFile): if not close_self_fp: self.fp.seek(0) # Save and restore the file position, because libtiff will move it - # outside of the python runtime, and that will confuse + # outside of the Python runtime, and that will confuse # io.BufferedReader and possible others. # NOTE: This must use os.lseek(), and not fp.tell()/fp.seek(), # because the buffer read head already may not equal the actual From 925db4552658ac0d8c037b0ac0b39bd7eb96f8f9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 20 Nov 2024 22:40:29 +1100 Subject: [PATCH 614/662] Moved test --- Tests/test_file_libtiff.py | 19 +++++++++++++++++++ Tests/test_libtiff_file_position.py | 25 ------------------------- 2 files changed, 19 insertions(+), 25 deletions(-) delete mode 100644 Tests/test_libtiff_file_position.py diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py index 62f8719af..9c49b1534 100644 --- a/Tests/test_file_libtiff.py +++ b/Tests/test_file_libtiff.py @@ -1098,6 +1098,25 @@ class TestFileLibTiff(LibTiffTestCase): assert_image_similar(base_im, im, 0.7) + @pytest.mark.parametrize( + "test_file", + [ + "Tests/images/old-style-jpeg-compression-no-samplesperpixel.tif", + "Tests/images/old-style-jpeg-compression.tif", + ], + ) + def test_buffering(self, test_file: str) -> None: + # load exif first + with Image.open(open(test_file, "rb", buffering=1048576)) as im: + exif = dict(im.getexif()) + + # load image before exif + with Image.open(open(test_file, "rb", buffering=1048576)) as im2: + im2.load() + exif_after_load = dict(im2.getexif()) + + assert exif == exif_after_load + @pytest.mark.valgrind_known_error(reason="Backtrace in Python Core") def test_sampleformat_not_corrupted(self) -> None: # Assert that a TIFF image with SampleFormat=UINT tag is not corrupted diff --git a/Tests/test_libtiff_file_position.py b/Tests/test_libtiff_file_position.py deleted file mode 100644 index 43ed82c30..000000000 --- a/Tests/test_libtiff_file_position.py +++ /dev/null @@ -1,25 +0,0 @@ -from __future__ import annotations - -import pytest - -from PIL import Image - - -@pytest.mark.parametrize( - "test_file", - [ - "Tests/images/old-style-jpeg-compression-no-samplesperpixel.tif", - "Tests/images/old-style-jpeg-compression.tif", - ], -) -def test_libtiff_exif_loading(test_file) -> None: - # loading image before exif - im1 = Image.open(open(test_file, "rb", buffering=1048576)) - im1.load() - exif1 = dict(im1.getexif()) - - # loading exif before image - im2 = Image.open(open(test_file, "rb", buffering=1048576)) - exif2 = dict(im2.getexif()) - - assert exif1 == exif2 From 82dfbc35b190a818a1cbdbee6524eaf31605b7bd Mon Sep 17 00:00:00 2001 From: Tom Flanagan Date: Wed, 20 Nov 2024 05:21:14 -0800 Subject: [PATCH 615/662] Update src/PIL/TiffImagePlugin.py Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- src/PIL/TiffImagePlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 726286772..08bb78915 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -1374,7 +1374,7 @@ class TiffImageFile(ImageFile.ImageFile): if not close_self_fp: self.fp.seek(0) # Save and restore the file position, because libtiff will move it - # outside of the python runtime, and that will confuse + # outside of the Python runtime, and that will confuse # io.BufferedReader and possible others. # NOTE: This must use os.lseek(), and not fp.tell()/fp.seek(), # because the buffer read head already may not equal the actual From bfe40b5129e9250243b1d425172c18f7c4e15e10 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 21 Nov 2024 19:22:39 +1100 Subject: [PATCH 616/662] Prevent Cygwin bash from being used by codecov-action --- .github/workflows/test-cygwin.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml index 2076cad7a..5b0a03946 100644 --- a/.github/workflows/test-cygwin.yml +++ b/.github/workflows/test-cygwin.yml @@ -133,6 +133,7 @@ jobs: - name: After success run: | bash.exe .ci/after_success.sh + rm C:\cygwin\bin\bash.EXE - name: Upload coverage uses: codecov/codecov-action@v5 From 69c9a7ffcfd42b0486f02f17119c6d05f1d04969 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 20 Nov 2024 20:03:15 +1100 Subject: [PATCH 617/662] Use zlib-ng on Linux --- .github/workflows/wheels-dependencies.sh | 20 +++++++++++++++++--- Tests/check_wheel.py | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index f86099af1..5d23fc036 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -50,10 +50,10 @@ if [[ -n "$IS_MACOS" ]]; then else GIFLIB_VERSION=5.2.1 fi -if [[ -n "$IS_MACOS" ]] || [[ "$MB_ML_VER" != 2014 ]]; then +if [[ -n "$IS_MACOS" ]]; then ZLIB_VERSION=1.3.1 else - ZLIB_VERSION=1.2.8 + ZLIB_NG_VERSION=2.2.2 fi LIBWEBP_VERSION=1.4.0 BZIP2_VERSION=1.0.8 @@ -74,6 +74,16 @@ function build_pkg_config { touch pkg-config-stamp } +function build_zlib_ng { + if [ -e zlib-stamp ]; then return; fi + fetch_unpack https://github.com/zlib-ng/zlib-ng/archive/$ZLIB_NG_VERSION.tar.gz zlib-ng-$ZLIB_NG_VERSION.tar.gz + (cd zlib-ng-$ZLIB_NG_VERSION \ + && ./configure --prefix=$BUILD_PREFIX --zlib-compat \ + && make -j4 \ + && make install) + touch zlib-stamp +} + function build_brotli { if [ -e brotli-stamp ]; then return; fi local cmake=$(get_modern_cmake) @@ -101,7 +111,11 @@ function build { if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then yum remove -y zlib-devel fi - build_new_zlib + if [ -n "$IS_MACOS" ]; then + build_new_zlib + else + build_zlib_ng + fi build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto if [ -n "$IS_MACOS" ]; then diff --git a/Tests/check_wheel.py b/Tests/check_wheel.py index 374e48e8a..787d4f743 100644 --- a/Tests/check_wheel.py +++ b/Tests/check_wheel.py @@ -40,7 +40,7 @@ def test_wheel_features() -> None: if sys.platform == "win32": expected_features.remove("xcb") - else: + elif sys.platform == "darwin": expected_features.remove("zlib_ng") assert set(features.get_supported_features()) == expected_features From 9c3d8fb581cab18abb60117f08358b51b18a44b0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 22 Nov 2024 11:02:50 +1100 Subject: [PATCH 618/662] Do not install Pyroma, to use only system packages --- .github/workflows/test-mingw.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml index bfd393db5..fd8faba71 100644 --- a/.github/workflows/test-mingw.yml +++ b/.github/workflows/test-mingw.yml @@ -68,12 +68,13 @@ jobs: mingw-w64-x86_64-openjpeg2 \ mingw-w64-x86_64-python3-numpy \ mingw-w64-x86_64-python3-olefile \ + mingw-w64-x86_64-python3-pip \ mingw-w64-x86_64-python3-setuptools \ + mingw-w64-x86_64-python-pytest \ + mingw-w64-x86_64-python-pytest-cov \ + mingw-w64-x86_64-python-pytest-timeout \ mingw-w64-x86_64-python-pyqt6 - python3 -m ensurepip - python3 -m pip install pyroma pytest pytest-cov pytest-timeout - pushd depends && ./install_extra_test_images.sh && popd - name: Build Pillow From 30f03b2bff689af1f395c183cf991bc34f8b0bab Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 22 Nov 2024 11:05:33 +1100 Subject: [PATCH 619/662] Removed SETUPTOOLS_USE_DISTUTILS="stdlib" --- .github/workflows/test-mingw.yml | 3 +-- docs/installation/building-from-source.rst | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml index fd8faba71..93fe8a064 100644 --- a/.github/workflows/test-mingw.yml +++ b/.github/workflows/test-mingw.yml @@ -69,7 +69,6 @@ jobs: mingw-w64-x86_64-python3-numpy \ mingw-w64-x86_64-python3-olefile \ mingw-w64-x86_64-python3-pip \ - mingw-w64-x86_64-python3-setuptools \ mingw-w64-x86_64-python-pytest \ mingw-w64-x86_64-python-pytest-cov \ mingw-w64-x86_64-python-pytest-timeout \ @@ -78,7 +77,7 @@ jobs: pushd depends && ./install_extra_test_images.sh && popd - name: Build Pillow - run: SETUPTOOLS_USE_DISTUTILS="stdlib" CFLAGS="-coverage" python3 -m pip install . + run: CFLAGS="-coverage" python3 -m pip install . - name: Test Pillow run: | diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst index 4b5175827..19294f72c 100644 --- a/docs/installation/building-from-source.rst +++ b/docs/installation/building-from-source.rst @@ -195,11 +195,6 @@ Many of Pillow's features require external libraries: mingw-w64-x86_64-libimagequant \ mingw-w64-x86_64-libraqm - https://www.msys2.org/docs/python/ states that setuptools >= 60 does not work with - MSYS2. To workaround this, before installing Pillow you must run:: - - export SETUPTOOLS_USE_DISTUTILS=stdlib - .. tab:: FreeBSD .. Note:: Only FreeBSD 10 and 11 tested From 16e409a8d28fecbf83cd67409224e65ebb371a93 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 24 Nov 2024 13:46:28 +0200 Subject: [PATCH 620/662] Test 3.13t (free-threaded) from Quansight-Labs/setup-python on Linux/macOS --- .github/workflows/test.yml | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1405c64f9..83a696f5f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,6 +42,7 @@ jobs: ] python-version: [ "pypy3.10", + "3.13t", "3.13", "3.12", "3.11", @@ -52,14 +53,14 @@ jobs: - { python-version: "3.11", PYTHONOPTIMIZE: 1, REVERSE: "--reverse" } - { python-version: "3.10", PYTHONOPTIMIZE: 2 } # Free-threaded - - { os: "ubuntu-latest", python-version: "3.13-dev", disable-gil: true } + - { python-version: "3.13t", disable-gil: true } # M1 only available for 3.10+ - { os: "macos-13", python-version: "3.9" } exclude: - { os: "macos-latest", python-version: "3.9" } runs-on: ${{ matrix.os }} - name: ${{ matrix.os }} Python ${{ matrix.python-version }} ${{ matrix.disable-gil && 'free-threaded' || '' }} + name: ${{ matrix.os }} Python ${{ matrix.python-version }} steps: - uses: actions/checkout@v4 @@ -67,8 +68,7 @@ jobs: persist-credentials: false - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - if: "${{ !matrix.disable-gil }}" + uses: Quansight-Labs/setup-python@v5 with: python-version: ${{ matrix.python-version }} allow-prereleases: true @@ -77,13 +77,6 @@ jobs: ".ci/*.sh" "pyproject.toml" - - name: Set up Python ${{ matrix.python-version }} (free-threaded) - uses: deadsnakes/action@v3.2.0 - if: "${{ matrix.disable-gil }}" - with: - python-version: ${{ matrix.python-version }} - nogil: ${{ matrix.disable-gil }} - - name: Set PYTHON_GIL if: "${{ matrix.disable-gil }}" run: | From 540a0b73a7ebb3ec5571e3ea027c73cbe95b2fc6 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 23 Nov 2024 00:20:40 +1100 Subject: [PATCH 621/662] Use installed cmake --- .github/workflows/wheels-dependencies.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index f86099af1..ddda43423 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -76,10 +76,9 @@ function build_pkg_config { function build_brotli { if [ -e brotli-stamp ]; then return; fi - local cmake=$(get_modern_cmake) local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-$BROTLI_VERSION.tar.gz) (cd $out_dir \ - && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \ + && cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \ && make install) touch brotli-stamp } From 5174c596ca6c78725efdb2cda8ace39f11d8e215 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Tue, 26 Nov 2024 22:06:47 +0200 Subject: [PATCH 622/662] Release drafter: move removals, deprecations, documentation up, and uncategorised changes last --- .github/release-drafter.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 3711d91f0..de0ab4805 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -3,18 +3,19 @@ tag-template: "$NEXT_MINOR_VERSION" change-template: '- $TITLE #$NUMBER [@$AUTHOR]' categories: - - title: "Dependencies" - label: "Dependency" + - title: "Removals" + label: "Removal" - title: "Deprecations" label: "Deprecation" - title: "Documentation" label: "Documentation" - - title: "Removals" - label: "Removal" + - title: "Dependencies" + label: "Dependency" - title: "Testing" label: "Testing" - title: "Type hints" label: "Type hints" + - title: "Other changes" exclude-labels: - "changelog: skip" @@ -23,6 +24,4 @@ template: | https://pillow.readthedocs.io/en/stable/releasenotes/$NEXT_MINOR_VERSION.html - ## Changes - $CHANGES From 02250e81b729ddb32952f96e57bf9d952ed70cf8 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 28 Nov 2024 07:58:10 +1100 Subject: [PATCH 623/662] Added link to GitHub releases --- CHANGES.rst | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index f6ed5eb82..dfbbd24b3 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,26 +2,12 @@ Changelog (Pillow) ================== -11.1.0 (unreleased) -------------------- +11.1.0 and newer +---------------- -- Removed use of os.path.realpath #8545 - [radarhere] +See GitHub Releases: -- Allow linking to zlib import library on Windows #8519 - [cubanpit, nulano] - -- Detach PyQt6 QPixmap instance before returning #8509 - [radarhere] - -- Corrected EMF DPI #8485 - [radarhere] - -- Fix IFDRational with a zero denominator #8474 - [radarhere] - -- Fixed disabling a feature during install #8469 - [radarhere] +- https://github.com/python-pillow/Pillow/releases 11.0.0 (2024-10-15) ------------------- From c36a5b669b225fdcb6b4b3a41fc5b5e647a651c1 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Thu, 28 Nov 2024 10:29:05 +0200 Subject: [PATCH 624/662] Update/remove references to CHANGES.rst --- .github/CONTRIBUTING.md | 1 - README.md | 2 +- RELEASING.md | 2 -- codecov.yml | 2 +- pyproject.toml | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index d03fcf0d9..ba2b7d8ed 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -19,7 +19,6 @@ Please send a pull request to the `main` branch. Please include [documentation]( - Follow PEP 8. - When committing only documentation changes please include `[ci skip]` in the commit message to avoid running tests on AppVeyor. - Include [release notes](https://github.com/python-pillow/Pillow/tree/main/docs/releasenotes) as needed or appropriate with your bug fixes, feature additions and tests. -- Do not add to the [changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) for proposed changes, as that is updated after changes are merged. ## Reporting Issues diff --git a/README.md b/README.md index 5bbebaccb..057d0acf0 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ The core image library is designed for fast access to data stored in a few basic - [Issues](https://github.com/python-pillow/Pillow/issues) - [Pull requests](https://github.com/python-pillow/Pillow/pulls) - [Release notes](https://pillow.readthedocs.io/en/stable/releasenotes/index.html) -- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) +- [Changelog](https://github.com/python-pillow/Pillow/releases) - [Pre-fork](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst#pre-fork) ## Report a Vulnerability diff --git a/RELEASING.md b/RELEASING.md index 9e6ec5dd4..ebdbb6406 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -12,7 +12,6 @@ Released quarterly on January 2nd, April 1st, July 1st and October 15th. * [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in `main` branch. * [ ] Check that all the wheel builds pass the tests in the [GitHub Actions "Wheels" workflow](https://github.com/python-pillow/Pillow/actions/workflows/wheels.yml) jobs by manually triggering them. * [ ] In compliance with [PEP 440](https://peps.python.org/pep-0440/), update version identifier in `src/PIL/_version.py` -* [ ] Update `CHANGES.rst`. * [ ] Run pre-release check via `make release-test` in a freshly cloned repo. * [ ] Create branch and tag for release e.g.: ```bash @@ -34,7 +33,6 @@ Released quarterly on January 2nd, April 1st, July 1st and October 15th. Released as needed for security, installation or critical bug fixes. * [ ] Make necessary changes in `main` branch. -* [ ] Update `CHANGES.rst`. * [ ] Check out release branch e.g.: ```bash git checkout -t remotes/origin/5.2.x diff --git a/codecov.yml b/codecov.yml index 8646576bb..84920238f 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,7 +1,7 @@ # Documentation: https://docs.codecov.com/docs/codecov-yaml codecov: - # Avoid "Missing base report" due to committing CHANGES.rst with "[CI skip]" + # Avoid "Missing base report" due to committing with "[CI skip]" # https://github.com/codecov/support/issues/363 # https://docs.codecov.com/docs/comparing-commits allow_coverage_offsets: true diff --git a/pyproject.toml b/pyproject.toml index c6d95f2ab..1c7b2c4b2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -73,7 +73,7 @@ optional-dependencies.typing = [ optional-dependencies.xmp = [ "defusedxml", ] -urls.Changelog = "https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst" +urls.Changelog = "https://github.com/python-pillow/Pillow/releases" urls.Documentation = "https://pillow.readthedocs.io" urls.Funding = "https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=pypi" urls.Homepage = "https://python-pillow.org" From 4986609938c6fd38af6efd8501fe157b0443e5bc Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 22 Nov 2024 23:44:32 +1100 Subject: [PATCH 625/662] Use zlib-ng on macOS --- .github/workflows/wheels-dependencies.sh | 12 ++---------- Tests/check_wheel.py | 2 -- pyproject.toml | 1 + 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 5d23fc036..a2aec07c3 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -50,11 +50,7 @@ if [[ -n "$IS_MACOS" ]]; then else GIFLIB_VERSION=5.2.1 fi -if [[ -n "$IS_MACOS" ]]; then - ZLIB_VERSION=1.3.1 -else - ZLIB_NG_VERSION=2.2.2 -fi +ZLIB_NG_VERSION=2.2.2 LIBWEBP_VERSION=1.4.0 BZIP2_VERSION=1.0.8 LIBXCB_VERSION=1.17.0 @@ -111,11 +107,7 @@ function build { if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then yum remove -y zlib-devel fi - if [ -n "$IS_MACOS" ]; then - build_new_zlib - else - build_zlib_ng - fi + build_zlib_ng build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto if [ -n "$IS_MACOS" ]; then diff --git a/Tests/check_wheel.py b/Tests/check_wheel.py index 787d4f743..563be0b74 100644 --- a/Tests/check_wheel.py +++ b/Tests/check_wheel.py @@ -40,7 +40,5 @@ def test_wheel_features() -> None: if sys.platform == "win32": expected_features.remove("xcb") - elif sys.platform == "darwin": - expected_features.remove("zlib_ng") assert set(features.get_supported_features()) == expected_features diff --git a/pyproject.toml b/pyproject.toml index c6d95f2ab..af09ccbc1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -104,6 +104,7 @@ test-extras = "tests" [tool.cibuildwheel.macos.environment] PATH = "$(pwd)/build/deps/darwin/bin:$(dirname $(which python3)):/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin" +DYLD_LIBRARY_PATH = "$(pwd)/build/deps/darwin/lib" [tool.black] exclude = "wheels/multibuild" From 10527918e3570f1e6772ac90db42d2288cce7ae4 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 29 Nov 2024 17:13:07 +1100 Subject: [PATCH 626/662] Use brew formula to install libraqm --- docs/installation/building-from-source.rst | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst index 19294f72c..ff60120ae 100644 --- a/docs/installation/building-from-source.rst +++ b/docs/installation/building-from-source.rst @@ -148,13 +148,7 @@ Many of Pillow's features require external libraries: The easiest way to install external libraries is via `Homebrew `_. After you install Homebrew, run:: - brew install libjpeg libtiff little-cms2 openjpeg webp - - To install libraqm on macOS use Homebrew to install its dependencies:: - - brew install freetype harfbuzz fribidi - - Then see ``depends/install_raqm_cmake.sh`` to install libraqm. + brew install libjpeg libraqm libtiff little-cms2 openjpeg webp .. tab:: Windows From 1fab591f42fa5a9502fade7873481b567c033849 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 30 Nov 2024 21:17:31 +1100 Subject: [PATCH 627/662] Python 3.12 is tested on MinGW --- docs/installation/platform-support.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/platform-support.rst b/docs/installation/platform-support.rst index b9d633142..35f863374 100644 --- a/docs/installation/platform-support.rst +++ b/docs/installation/platform-support.rst @@ -55,7 +55,7 @@ These platforms are built and tested for every change. | +----------------------------+---------------------+ | | 3.13 | x86 | | +----------------------------+---------------------+ -| | 3.9 (MinGW) | x86-64 | +| | 3.12 (MinGW) | x86-64 | | +----------------------------+---------------------+ | | 3.9 (Cygwin) | x86-64 | +----------------------------------+----------------------------+---------------------+ From 1d15ce8c494075f521600c21b9efb0d5eaa9aa03 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 30 Nov 2024 23:17:42 +1100 Subject: [PATCH 628/662] Updated build option error messages --- setup.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index fbd23a568..eea21fa34 100644 --- a/setup.py +++ b/setup.py @@ -393,13 +393,14 @@ class pil_build_ext(build_ext): self.feature.required.discard(x) _dbg("Disabling %s", x) if getattr(self, f"enable_{x}"): - msg = f"Conflicting options: --enable-{x} and --disable-{x}" + msg = f"Conflicting options: '-C {x}=enable' and '-C {x}=disable'" raise ValueError(msg) if x == "freetype": - _dbg("--disable-freetype implies --disable-raqm") + _dbg("'-C freetype=disable' implies '-C raqm=disable'") if getattr(self, "enable_raqm"): msg = ( - "Conflicting options: --enable-raqm and --disable-freetype" + "Conflicting options: " + "'-C raqm=enable' and '-C freetype=disable'" ) raise ValueError(msg) setattr(self, "disable_raqm", True) @@ -407,15 +408,17 @@ class pil_build_ext(build_ext): _dbg("Requiring %s", x) self.feature.required.add(x) if x == "raqm": - _dbg("--enable-raqm implies --enable-freetype") + _dbg("'-C raqm=enable' implies '-C freetype=enable'") self.feature.required.add("freetype") for x in ("raqm", "fribidi"): if getattr(self, f"vendor_{x}"): if getattr(self, "disable_raqm"): - msg = f"Conflicting options: --vendor-{x} and --disable-raqm" + msg = f"Conflicting options: '-C {x}=vendor' and '-C raqm=disable'" raise ValueError(msg) if x == "fribidi" and not getattr(self, "vendor_raqm"): - msg = f"Conflicting options: --vendor-{x} and not --vendor-raqm" + msg = ( + f"Conflicting options: '-C {x}=vendor' and not '-C raqm=vendor'" + ) raise ValueError(msg) _dbg("Using vendored version of %s", x) self.feature.vendor.add(x) @@ -1047,7 +1050,7 @@ except DependencyException as err: msg = f""" The headers or library files could not be found for {str(err)}, -which was requested by the option flag --enable-{str(err)} +which was requested by the option flag '-C {str(err)}=enable' """ sys.stderr.write(msg) From 513fe2ca2d23c7f1685b089fc6087ab02b2828df Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Sun, 1 Dec 2024 23:15:54 +0200 Subject: [PATCH 629/662] Only use start year in copyright, remove end years --- LICENSE | 2 +- docs/COPYING | 2 +- docs/conf.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 8837c290c..10dd42d9e 100644 --- a/LICENSE +++ b/LICENSE @@ -5,7 +5,7 @@ The Python Imaging Library (PIL) is Pillow is the friendly PIL fork. It is - Copyright © 2010-2024 by Jeffrey A. Clark and contributors + Copyright © 2010 by Jeffrey A. Clark and contributors Like PIL, Pillow is licensed under the open source MIT-CMU License: diff --git a/docs/COPYING b/docs/COPYING index d5ee19f81..17fba5b87 100644 --- a/docs/COPYING +++ b/docs/COPYING @@ -5,7 +5,7 @@ The Python Imaging Library (PIL) is Pillow is the friendly PIL fork. It is - Copyright © 2010-2024 by Jeffrey A. Clark and contributors + Copyright © 2010 by Jeffrey A. Clark and contributors Like PIL, Pillow is licensed under the open source PIL Software License: diff --git a/docs/conf.py b/docs/conf.py index b81d86c6c..e1e3f1b8f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -55,7 +55,7 @@ master_doc = "index" project = "Pillow (PIL Fork)" copyright = ( "1995-2011 Fredrik Lundh and contributors, " - "2010-2024 Jeffrey A. Clark and contributors." + "2010 Jeffrey A. Clark and contributors." ) author = "Fredrik Lundh (PIL), Jeffrey A. Clark (Pillow)" From 0000729f2a79da62ba64332484103ffacf1700a1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 17:34:54 +0000 Subject: [PATCH 630/662] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.7.2 → v0.8.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.7.2...v0.8.1) - [github.com/PyCQA/bandit: 1.7.10 → 1.8.0](https://github.com/PyCQA/bandit/compare/1.7.10...1.8.0) - [github.com/pre-commit/mirrors-clang-format: v19.1.3 → v19.1.4](https://github.com/pre-commit/mirrors-clang-format/compare/v19.1.3...v19.1.4) - [github.com/python-jsonschema/check-jsonschema: 0.29.4 → 0.30.0](https://github.com/python-jsonschema/check-jsonschema/compare/0.29.4...0.30.0) - [github.com/abravalheri/validate-pyproject: v0.22 → v0.23](https://github.com/abravalheri/validate-pyproject/compare/v0.22...v0.23) --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ddc98fdc3..f91260c72 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.7.2 + rev: v0.8.1 hooks: - id: ruff args: [--exit-non-zero-on-fix] @@ -11,7 +11,7 @@ repos: - id: black - repo: https://github.com/PyCQA/bandit - rev: 1.7.10 + rev: 1.8.0 hooks: - id: bandit args: [--severity-level=high] @@ -24,7 +24,7 @@ repos: exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.gd$|\.opt$) - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v19.1.3 + rev: v19.1.4 hooks: - id: clang-format types: [c] @@ -50,7 +50,7 @@ repos: exclude: ^.github/.*TEMPLATE|^Tests/(fonts|images)/ - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.29.4 + rev: 0.30.0 hooks: - id: check-github-workflows - id: check-readthedocs @@ -67,7 +67,7 @@ repos: - id: pyproject-fmt - repo: https://github.com/abravalheri/validate-pyproject - rev: v0.22 + rev: v0.23 hooks: - id: validate-pyproject additional_dependencies: [trove-classifiers>=2024.10.12] From 0ab21dff1ed0b16944a5458ab73dfa3a5c060b88 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Mon, 2 Dec 2024 20:29:38 +0200 Subject: [PATCH 631/662] Fix new Ruff errors --- src/PIL/ImImagePlugin.py | 2 +- src/PIL/Image.py | 21 ++++++--------------- src/PIL/JpegImagePlugin.py | 2 +- src/PIL/PcxImagePlugin.py | 2 +- src/PIL/PngImagePlugin.py | 2 +- src/PIL/TiffImagePlugin.py | 13 +++++++------ src/PIL/_typing.py | 2 +- 7 files changed, 18 insertions(+), 26 deletions(-) diff --git a/src/PIL/ImImagePlugin.py b/src/PIL/ImImagePlugin.py index f9f47348c..b4215a0b1 100644 --- a/src/PIL/ImImagePlugin.py +++ b/src/PIL/ImImagePlugin.py @@ -357,7 +357,7 @@ def _save(im: Image.Image, fp: IO[bytes], filename: str | bytes) -> None: name = "".join([name[: 92 - len(ext)], ext]) fp.write(f"Name: {name}\r\n".encode("ascii")) - fp.write(("Image size (x*y): %d*%d\r\n" % im.size).encode("ascii")) + fp.write(f"Image size (x*y): {im.size[0]}*{im.size[1]}\r\n".encode("ascii")) fp.write(f"File size (no of images): {frames}\r\n".encode("ascii")) if im.mode in ["P", "PA"]: fp.write(b"Lut: 1\r\n") diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 9b76ce8bd..1e289b6c3 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -692,13 +692,10 @@ class Image: ) def __repr__(self) -> str: - return "<%s.%s image mode=%s size=%dx%d at 0x%X>" % ( - self.__class__.__module__, - self.__class__.__name__, - self.mode, - self.size[0], - self.size[1], - id(self), + return ( + f"<{self.__class__.__module__}.{self.__class__.__name__} " + f"image mode={self.mode} size={self.size[0]}x{self.size[1]} " + f"at 0x{id(self):X}>" ) def _repr_pretty_(self, p: PrettyPrinter, cycle: bool) -> None: @@ -707,14 +704,8 @@ class Image: # Same as __repr__ but without unpredictable id(self), # to keep Jupyter notebook `text/plain` output stable. p.text( - "<%s.%s image mode=%s size=%dx%d>" - % ( - self.__class__.__module__, - self.__class__.__name__, - self.mode, - self.size[0], - self.size[1], - ) + f"<{self.__class__.__module__}.{self.__class__.__name__} " + f"image mode={self.mode} size={self.size[0]}x{self.size[1]}>" ) def _repr_image(self, image_format: str, **kwargs: Any) -> bytes | None: diff --git a/src/PIL/JpegImagePlugin.py b/src/PIL/JpegImagePlugin.py index 6510e072e..ab6a2f497 100644 --- a/src/PIL/JpegImagePlugin.py +++ b/src/PIL/JpegImagePlugin.py @@ -72,7 +72,7 @@ def APP(self: JpegImageFile, marker: int) -> None: n = i16(self.fp.read(2)) - 2 s = ImageFile._safe_read(self.fp, n) - app = "APP%d" % (marker & 15) + app = f"APP{marker & 15}" self.app[app] = s # compatibility self.applist.append((app, s)) diff --git a/src/PIL/PcxImagePlugin.py b/src/PIL/PcxImagePlugin.py index 8445d5cc7..32436cea3 100644 --- a/src/PIL/PcxImagePlugin.py +++ b/src/PIL/PcxImagePlugin.py @@ -86,7 +86,7 @@ class PcxImageFile(ImageFile.ImageFile): elif bits == 1 and planes in (2, 4): mode = "P" - rawmode = "P;%dL" % planes + rawmode = f"P;{planes}L" self.palette = ImagePalette.raw("RGB", s[16:64]) elif version == 5 and bits == 8 and planes == 1: diff --git a/src/PIL/PngImagePlugin.py b/src/PIL/PngImagePlugin.py index 4e1227204..4b97992a3 100644 --- a/src/PIL/PngImagePlugin.py +++ b/src/PIL/PngImagePlugin.py @@ -523,7 +523,7 @@ class PngStream(ChunkStream): assert self.fp is not None s = ImageFile._safe_read(self.fp, length) - raw_vals = struct.unpack(">%dI" % (len(s) // 4), s) + raw_vals = struct.unpack(f">{len(s) // 4}I", s) self.im_info["chromaticity"] = tuple(elt / 100000.0 for elt in raw_vals) return s diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 08bb78915..9ee55347a 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -935,9 +935,9 @@ class ImageFileDirectory_v2(_IFDv2Base): self._tagdata[tag] = data self.tagtype[tag] = typ - msg += " - value: " + ( - "" % size if size > 32 else repr(data) - ) + bytes_value = size if size > 32 else repr(data) + msg += f" - value: " + logger.debug(msg) (self.next,) = ( @@ -981,9 +981,10 @@ class ImageFileDirectory_v2(_IFDv2Base): tagname = TiffTags.lookup(tag, self.group).name typname = "ifd" if is_ifd else TYPES.get(typ, "unknown") - msg = f"save: {tagname} ({tag}) - type: {typname} ({typ})" - msg += " - value: " + ( - "" % len(data) if len(data) >= 16 else str(values) + bytes_value = len(data) if len(data) >= 16 else str(values) + msg = ( + f"save: {tagname} ({tag}) - type: {typname} ({typ})" + f" - value: " ) logger.debug(msg) diff --git a/src/PIL/_typing.py b/src/PIL/_typing.py index 335804b79..34a9a81e1 100644 --- a/src/PIL/_typing.py +++ b/src/PIL/_typing.py @@ -44,7 +44,7 @@ _T_co = TypeVar("_T_co", covariant=True) class SupportsRead(Protocol[_T_co]): - def read(self, __length: int = ...) -> _T_co: ... + def read(self, length: int = ..., /) -> _T_co: ... StrOrBytesPath = Union[str, bytes, os.PathLike[str], os.PathLike[bytes]] From c16ae6fefa6cb939d274c95d1969889dced9dd15 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 3 Dec 2024 09:19:26 +1100 Subject: [PATCH 632/662] Do not describe raw data as a table --- src/PIL/TiffImagePlugin.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index 9ee55347a..be4a57b74 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -935,8 +935,8 @@ class ImageFileDirectory_v2(_IFDv2Base): self._tagdata[tag] = data self.tagtype[tag] = typ - bytes_value = size if size > 32 else repr(data) - msg += f" - value: " + msg += " - value: " + msg += f"" if size > 32 else repr(data) logger.debug(msg) @@ -981,11 +981,8 @@ class ImageFileDirectory_v2(_IFDv2Base): tagname = TiffTags.lookup(tag, self.group).name typname = "ifd" if is_ifd else TYPES.get(typ, "unknown") - bytes_value = len(data) if len(data) >= 16 else str(values) - msg = ( - f"save: {tagname} ({tag}) - type: {typname} ({typ})" - f" - value: " - ) + msg = f"save: {tagname} ({tag}) - type: {typname} ({typ}) - value: " + msg += f"" if len(data) >= 16 else str(values) logger.debug(msg) # count is sum of lengths for string and arbitrary data From 80c562573a4b5723b1094fb9b07a582912e3d62b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 02:28:52 +0000 Subject: [PATCH 633/662] Update dependency cibuildwheel to v2.22.0 --- .ci/requirements-cibw.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-cibw.txt b/.ci/requirements-cibw.txt index c4511439c..833aca23d 100644 --- a/.ci/requirements-cibw.txt +++ b/.ci/requirements-cibw.txt @@ -1 +1 @@ -cibuildwheel==2.21.3 +cibuildwheel==2.22.0 From f4a9304bb358f45a088d3c237ada88703e0e0d8e Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 3 Dec 2024 13:35:00 +1100 Subject: [PATCH 634/662] Use CIBW_ENABLE --- .github/workflows/wheels.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 45f186341..c5e55aa62 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -85,7 +85,7 @@ jobs: CIBW_ARCHS: "aarch64" # Likewise, select only one Python version per job to speed this up. CIBW_BUILD: "${{ matrix.python-version }}-${{ matrix.spec == 'musllinux' && 'musllinux' || 'manylinux' }}*" - CIBW_PRERELEASE_PYTHONS: True + CIBW_ENABLE: cpython-prerelease # Extra options for manylinux. CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.spec }} CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ${{ matrix.spec }} @@ -150,10 +150,9 @@ jobs: env: CIBW_ARCHS: ${{ matrix.cibw_arch }} CIBW_BUILD: ${{ matrix.build }} - CIBW_FREE_THREADED_SUPPORT: True + CIBW_ENABLE: cpython-prerelease cpython-freethreading CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }} CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }} - CIBW_PRERELEASE_PYTHONS: True CIBW_SKIP: pp39-* MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }} @@ -228,8 +227,7 @@ jobs: CIBW_ARCHS: ${{ matrix.cibw_arch }} CIBW_BEFORE_ALL: "{package}\\winbuild\\build\\build_dep_all.cmd" CIBW_CACHE_PATH: "C:\\cibw" - CIBW_FREE_THREADED_SUPPORT: True - CIBW_PRERELEASE_PYTHONS: True + CIBW_ENABLE: cpython-prerelease cpython-freethreading CIBW_SKIP: pp39-* CIBW_TEST_SKIP: "*-win_arm64" CIBW_TEST_COMMAND: 'docker run --rm From 3ce33a253a1bd76fdde6eb557cf271b3b2f01553 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 3 Dec 2024 20:14:03 +1100 Subject: [PATCH 635/662] self.tile is not None --- src/PIL/ImageFile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 7f27d54dc..9836cd688 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -120,7 +120,7 @@ class ImageFile(Image.Image): self.custom_mimetype: str | None = None self.tile: list[_Tile] = [] - """ A list of tile descriptors, or ``None`` """ + """ A list of tile descriptors """ self.readonly = 1 # until we know better From c5474ed43363e24602c92e5ca7b37899ce37b9a5 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Fri, 6 Dec 2024 20:26:07 +0200 Subject: [PATCH 636/662] Replace python-pillow.org with python-pillow.github.io --- docs/handbook/tutorial.rst | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/handbook/tutorial.rst b/docs/handbook/tutorial.rst index 3df8e0d20..f771ae7ae 100644 --- a/docs/handbook/tutorial.rst +++ b/docs/handbook/tutorial.rst @@ -678,7 +678,7 @@ Reading from URL from PIL import Image from urllib.request import urlopen - url = "https://python-pillow.org/assets/images/pillow-logo.png" + url = "https://python-pillow.github.io/assets/images/pillow-logo.png" img = Image.open(urlopen(url)) diff --git a/pyproject.toml b/pyproject.toml index 1c7b2c4b2..aaaba0032 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -76,7 +76,7 @@ optional-dependencies.xmp = [ urls.Changelog = "https://github.com/python-pillow/Pillow/releases" urls.Documentation = "https://pillow.readthedocs.io" urls.Funding = "https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=pypi" -urls.Homepage = "https://python-pillow.org" +urls.Homepage = "https://python-pillow.github.io" urls.Mastodon = "https://fosstodon.org/@pillow" urls."Release notes" = "https://pillow.readthedocs.io/en/stable/releasenotes/index.html" urls.Source = "https://github.com/python-pillow/Pillow" From 2215eaf21d8e9096fdd13c34225c67c0893d82db Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 10 Dec 2024 06:25:48 +1100 Subject: [PATCH 637/662] Updated openjpeg to 2.5.3 --- .github/workflows/wheels-dependencies.sh | 2 +- depends/install_openjpeg.sh | 2 +- docs/installation/building-from-source.rst | 2 +- winbuild/build_prepare.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index ddda43423..e88a010ef 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -41,7 +41,7 @@ FREETYPE_VERSION=2.13.2 HARFBUZZ_VERSION=10.0.1 LIBPNG_VERSION=1.6.44 JPEGTURBO_VERSION=3.0.4 -OPENJPEG_VERSION=2.5.2 +OPENJPEG_VERSION=2.5.3 XZ_VERSION=5.6.3 TIFF_VERSION=4.6.0 LCMS2_VERSION=2.16 diff --git a/depends/install_openjpeg.sh b/depends/install_openjpeg.sh index 8c2967bc2..1f8d78193 100755 --- a/depends/install_openjpeg.sh +++ b/depends/install_openjpeg.sh @@ -1,7 +1,7 @@ #!/bin/bash # install openjpeg -archive=openjpeg-2.5.2 +archive=openjpeg-2.5.3 ./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst index ff60120ae..03359de31 100644 --- a/docs/installation/building-from-source.rst +++ b/docs/installation/building-from-source.rst @@ -58,7 +58,7 @@ Many of Pillow's features require external libraries: * **openjpeg** provides JPEG 2000 functionality. * Pillow has been tested with openjpeg **2.0.0**, **2.1.0**, **2.3.1**, - **2.4.0**, **2.5.0** and **2.5.2**. + **2.4.0**, **2.5.0**, **2.5.2** and **2.5.3**. * Pillow does **not** support the earlier **1.5** series which ships with Debian Jessie. diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index c8332d11c..dc802a3e5 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -117,7 +117,7 @@ V = { "LCMS2": "2.16", "LIBPNG": "1.6.44", "LIBWEBP": "1.4.0", - "OPENJPEG": "2.5.2", + "OPENJPEG": "2.5.3", "TIFF": "4.6.0", "XZ": "5.6.3", "ZLIB": "1.3.1", From 9ed96704d3788fa58d9682d293c4190e5da07c2d Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 13 Dec 2024 07:28:48 +1100 Subject: [PATCH 638/662] Do not attempt to install cmake if it is already present --- wheels/multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wheels/multibuild b/wheels/multibuild index 9a9d1275f..74a9795bc 160000 --- a/wheels/multibuild +++ b/wheels/multibuild @@ -1 +1 @@ -Subproject commit 9a9d1275f025f737cdaa3c451ba07129dd95f361 +Subproject commit 74a9795bc64ff786b7e7d33bdec2843cf17e512e From e361930936cd1208beeb292654a3af7548d863b3 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 13 Dec 2024 18:56:59 +1100 Subject: [PATCH 639/662] Updated libjpeg-turbo to 3.1.0 --- .github/workflows/wheels-dependencies.sh | 2 +- winbuild/build_prepare.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 5f8a4cf78..86f51a586 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -40,7 +40,7 @@ ARCHIVE_SDIR=pillow-depends-main FREETYPE_VERSION=2.13.2 HARFBUZZ_VERSION=10.1.0 LIBPNG_VERSION=1.6.44 -JPEGTURBO_VERSION=3.0.4 +JPEGTURBO_VERSION=3.1.0 OPENJPEG_VERSION=2.5.3 XZ_VERSION=5.6.3 TIFF_VERSION=4.6.0 diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 1efe0dcac..fd104eb23 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -113,7 +113,7 @@ V = { "FREETYPE": "2.13.3", "FRIBIDI": "1.0.16", "HARFBUZZ": "10.1.0", - "JPEGTURBO": "3.0.4", + "JPEGTURBO": "3.1.0", "LCMS2": "2.16", "LIBPNG": "1.6.44", "LIBWEBP": "1.4.0", @@ -155,7 +155,7 @@ DEPS: dict[str, dict[str, Any]] = { cmd_copy("cjpeg-static.exe", "cjpeg.exe"), cmd_copy("djpeg-static.exe", "djpeg.exe"), ], - "headers": ["j*.h"], + "headers": ["jconfig.h", r"src\j*.h"], "libs": ["libjpeg.lib"], "bins": ["cjpeg.exe", "djpeg.exe"], }, From 642b44c3159077d0863c29181c8c6fbe60039e5b Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 14 Dec 2024 01:25:28 +1100 Subject: [PATCH 640/662] Test libjpeg-turbo on macOS --- .github/workflows/macos-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh index ddb421230..2301a3a7e 100755 --- a/.github/workflows/macos-install.sh +++ b/.github/workflows/macos-install.sh @@ -8,8 +8,8 @@ fi brew install \ freetype \ ghostscript \ + jpeg-turbo \ libimagequant \ - libjpeg \ libtiff \ little-cms2 \ openjpeg \ From 0e5f5fcb297b1e08ec83773562663b8ad9e53aee Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 14 Dec 2024 16:33:20 +1100 Subject: [PATCH 641/662] Updated libXau to 1.0.12 --- .github/workflows/wheels-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 86f51a586..36036ff26 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -105,7 +105,7 @@ function build { build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto if [ -n "$IS_MACOS" ]; then build_simple xorgproto 2024.1 https://www.x.org/pub/individual/proto - build_simple libXau 1.0.11 https://www.x.org/pub/individual/lib + build_simple libXau 1.0.12 https://www.x.org/pub/individual/lib build_simple libpthread-stubs 0.5 https://xcb.freedesktop.org/dist else sed s/\${pc_sysrootdir\}// $BUILD_PREFIX/share/pkgconfig/xcb-proto.pc > $BUILD_PREFIX/lib/pkgconfig/xcb-proto.pc From 62d8ccc015d68a9bb3da555f9800786652de4962 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 15 Dec 2024 12:11:41 +1100 Subject: [PATCH 642/662] Derive dir from filename if root is the same --- winbuild/build_prepare.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 5bdb5fafe..2d804d557 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -131,7 +131,6 @@ DEPS: dict[str, dict[str, Any]] = { "libjpeg": { "url": f"{SF_PROJECTS}/libjpeg-turbo/files/{V['JPEGTURBO']}/FILENAME/download", "filename": f"libjpeg-turbo-{V['JPEGTURBO']}.tar.gz", - "dir": f"libjpeg-turbo-{V['JPEGTURBO']}", "license": ["README.ijg", "LICENSE.md"], "license_pattern": ( "(LEGAL ISSUES\n============\n\n.+?)\n\nREFERENCES\n==========" @@ -161,7 +160,6 @@ DEPS: dict[str, dict[str, Any]] = { "zlib": { "url": f"https://github.com/zlib-ng/zlib-ng/archive/refs/tags/{V['ZLIBNG']}.zip", "filename": f"zlib-ng-{V['ZLIBNG']}.zip", - "dir": f"zlib-ng-{V['ZLIBNG']}", "license": "LICENSE.md", "patch": { r"CMakeLists.txt": { @@ -179,7 +177,6 @@ DEPS: dict[str, dict[str, Any]] = { "xz": { "url": f"https://github.com/tukaani-project/xz/releases/download/v{V['XZ']}/FILENAME", "filename": f"xz-{V['XZ']}.tar.gz", - "dir": f"xz-{V['XZ']}", "license": "COPYING", "build": [ *cmds_cmake("liblzma", "-DBUILD_SHARED_LIBS:BOOL=OFF"), @@ -192,7 +189,6 @@ DEPS: dict[str, dict[str, Any]] = { "libwebp": { "url": "http://downloads.webmproject.org/releases/webp/FILENAME", "filename": f"libwebp-{V['LIBWEBP']}.tar.gz", - "dir": f"libwebp-{V['LIBWEBP']}", "license": "COPYING", "patch": { r"src\enc\picture_csp_enc.c": { @@ -214,7 +210,6 @@ DEPS: dict[str, dict[str, Any]] = { "libtiff": { "url": "https://download.osgeo.org/libtiff/FILENAME", "filename": f"tiff-{V['TIFF']}.tar.gz", - "dir": f"tiff-{V['TIFF']}", "license": "LICENSE.md", "patch": { r"libtiff\tif_lzma.c": { @@ -247,7 +242,6 @@ DEPS: dict[str, dict[str, Any]] = { "url": f"{SF_PROJECTS}/libpng/files/libpng{V['LIBPNG_XY']}/{V['LIBPNG']}/" f"lpng{V['LIBPNG_DOTLESS']}.zip/download", "filename": f"lpng{V['LIBPNG_DOTLESS']}.zip", - "dir": f"lpng{V['LIBPNG_DOTLESS']}", "license": "LICENSE", "build": [ *cmds_cmake("png_static", "-DPNG_SHARED:BOOL=OFF", "-DPNG_TESTS:BOOL=OFF"), @@ -261,7 +255,6 @@ DEPS: dict[str, dict[str, Any]] = { "brotli": { "url": f"https://github.com/google/brotli/archive/refs/tags/v{V['BROTLI']}.tar.gz", "filename": f"brotli-{V['BROTLI']}.tar.gz", - "dir": f"brotli-{V['BROTLI']}", "license": "LICENSE", "build": [ *cmds_cmake(("brotlicommon", "brotlidec"), "-DBUILD_SHARED_LIBS:BOOL=OFF"), @@ -272,7 +265,6 @@ DEPS: dict[str, dict[str, Any]] = { "freetype": { "url": "https://download.savannah.gnu.org/releases/freetype/FILENAME", "filename": f"freetype-{V['FREETYPE']}.tar.gz", - "dir": f"freetype-{V['FREETYPE']}", "license": ["LICENSE.TXT", r"docs\FTL.TXT", r"docs\GPLv2.TXT"], "patch": { r"builds\windows\vc2010\freetype.vcxproj": { @@ -307,7 +299,6 @@ DEPS: dict[str, dict[str, Any]] = { "lcms2": { "url": f"{SF_PROJECTS}/lcms/files/lcms/{V['LCMS2']}/FILENAME/download", "filename": f"lcms2-{V['LCMS2']}.tar.gz", - "dir": f"lcms2-{V['LCMS2']}", "license": "LICENSE", "patch": { r"Projects\VC2022\lcms2_static\lcms2_static.vcxproj": { @@ -333,7 +324,6 @@ DEPS: dict[str, dict[str, Any]] = { "openjpeg": { "url": f"https://github.com/uclouvain/openjpeg/archive/v{V['OPENJPEG']}.tar.gz", "filename": f"openjpeg-{V['OPENJPEG']}.tar.gz", - "dir": f"openjpeg-{V['OPENJPEG']}", "license": "LICENSE", "build": [ *cmds_cmake( @@ -348,7 +338,6 @@ DEPS: dict[str, dict[str, Any]] = { # commit: Merge branch 'master' into msvc (matches 2.17.0 tag) "url": "https://github.com/ImageOptim/libimagequant/archive/e4c1334be0eff290af5e2b4155057c2953a313ab.zip", "filename": "libimagequant-e4c1334be0eff290af5e2b4155057c2953a313ab.zip", - "dir": "libimagequant-e4c1334be0eff290af5e2b4155057c2953a313ab", "license": "COPYRIGHT", "patch": { "CMakeLists.txt": { @@ -368,7 +357,6 @@ DEPS: dict[str, dict[str, Any]] = { "harfbuzz": { "url": f"https://github.com/harfbuzz/harfbuzz/archive/{V['HARFBUZZ']}.zip", "filename": f"harfbuzz-{V['HARFBUZZ']}.zip", - "dir": f"harfbuzz-{V['HARFBUZZ']}", "license": "COPYING", "build": [ *cmds_cmake( @@ -383,7 +371,6 @@ DEPS: dict[str, dict[str, Any]] = { "fribidi": { "url": f"https://github.com/fribidi/fribidi/archive/v{V['FRIBIDI']}.zip", "filename": f"fribidi-{V['FRIBIDI']}.zip", - "dir": f"fribidi-{V['FRIBIDI']}", "license": "COPYING", "build": [ cmd_copy(r"COPYING", rf"{{bin_dir}}\fribidi-{V['FRIBIDI']}-COPYING"), @@ -763,6 +750,8 @@ def main() -> None: } for k, v in DEPS.items(): + if "dir" not in v: + v["dir"] = re.sub(r"\.(tar\.gz|zip)", "", v["filename"]) prefs[f"dir_{k}"] = os.path.join(sources_dir, v["dir"]) print() From 6373e8bcc470ffa8849a17fa8e90e1146e0c3c6c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 15 Dec 2024 22:58:35 +1100 Subject: [PATCH 643/662] Use .tar.gz zlib to match macOS and Linux --- winbuild/build_prepare.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 5bdb5fafe..a68a0b132 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -159,8 +159,8 @@ DEPS: dict[str, dict[str, Any]] = { "bins": ["cjpeg.exe", "djpeg.exe"], }, "zlib": { - "url": f"https://github.com/zlib-ng/zlib-ng/archive/refs/tags/{V['ZLIBNG']}.zip", - "filename": f"zlib-ng-{V['ZLIBNG']}.zip", + "url": f"https://github.com/zlib-ng/zlib-ng/archive/refs/tags/{V['ZLIBNG']}.tar.gz", + "filename": f"zlib-ng-{V['ZLIBNG']}.tar.gz", "dir": f"zlib-ng-{V['ZLIBNG']}", "license": "LICENSE.md", "patch": { From 7f6ebfb8c597d8d1a074993f463992b6dac34c41 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 15 Dec 2024 23:40:38 +1100 Subject: [PATCH 644/662] Added release notes for #8500 --- docs/releasenotes/11.1.0.rst | 59 ++++++++++++++++++++++++++++++++++++ docs/releasenotes/index.rst | 1 + 2 files changed, 60 insertions(+) create mode 100644 docs/releasenotes/11.1.0.rst diff --git a/docs/releasenotes/11.1.0.rst b/docs/releasenotes/11.1.0.rst new file mode 100644 index 000000000..c5d0afd58 --- /dev/null +++ b/docs/releasenotes/11.1.0.rst @@ -0,0 +1,59 @@ +11.1.0 +------ + +Security +======== + +TODO +^^^^ + +TODO + +:cve:`YYYY-XXXXX`: TODO +^^^^^^^^^^^^^^^^^^^^^^^ + +TODO + +Backwards Incompatible Changes +============================== + +TODO +^^^^ + +Deprecations +============ + +TODO +^^^^ + +TODO + +API Changes +=========== + +TODO +^^^^ + +TODO + +API Additions +============= + +Check for zlib-ng +^^^^^^^^^^^^^^^^^ + +You can check if Pillow has been built against the zlib-ng version of the +zlib library, and what version of zlib-ng is being used:: + + from PIL import features + features.check_feature("zlib_ng") # True or False + features.version_feature("zlib_ng") # "2.2.2" for example, or None + +Other Changes +============= + +zlib-ng in wheels +^^^^^^^^^^^^^^^^^ + +Wheels are now built against zlib-ng for improved speed. In tests, saving a PNG +was found to be more than twice as fast at higher compression levels. diff --git a/docs/releasenotes/index.rst b/docs/releasenotes/index.rst index 641cda4ef..bd8e5536f 100644 --- a/docs/releasenotes/index.rst +++ b/docs/releasenotes/index.rst @@ -14,6 +14,7 @@ expected to be backported to earlier versions. .. toctree:: :maxdepth: 2 + 11.1.0 11.0.0 10.4.0 10.3.0 From 5e35ca359c4182af07c0c02e61ebd8d270bb34b3 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 16 Dec 2024 20:17:36 +1100 Subject: [PATCH 645/662] Updated libjpeg-turbo URL --- winbuild/build_prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index a68a0b132..e702c7014 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -129,7 +129,7 @@ V["LIBPNG_XY"] = "".join(V["LIBPNG"].split(".")[:2]) # dependencies, listed in order of compilation DEPS: dict[str, dict[str, Any]] = { "libjpeg": { - "url": f"{SF_PROJECTS}/libjpeg-turbo/files/{V['JPEGTURBO']}/FILENAME/download", + "url": f"https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/{V['JPEGTURBO']}/libjpeg-turbo-{V['JPEGTURBO']}.tar.gz", "filename": f"libjpeg-turbo-{V['JPEGTURBO']}.tar.gz", "dir": f"libjpeg-turbo-{V['JPEGTURBO']}", "license": ["README.ijg", "LICENSE.md"], From 095811452172bc4efd4be172f850c2f564e35cba Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 16 Dec 2024 21:03:33 +1100 Subject: [PATCH 646/662] Corrected harfbuzz URL --- .github/workflows/wheels-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index de2471c3f..3e2a14462 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -93,7 +93,7 @@ function build_harfbuzz { if [ -e harfbuzz-stamp ]; then return; fi python3 -m pip install meson ninja - local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz) + local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/harfbuzz-$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz) (cd $out_dir \ && meson setup build --prefix=$BUILD_PREFIX --libdir=$BUILD_PREFIX/lib --buildtype=release -Dfreetype=enabled -Dglib=disabled) (cd $out_dir/build \ From 962bfc6fd5e949cfdf8c0d18877acc2b8f82a78c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 18 Dec 2024 10:39:52 +1100 Subject: [PATCH 647/662] Updated libjpeg-turbo URL --- wheels/multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wheels/multibuild b/wheels/multibuild index 74a9795bc..42d761728 160000 --- a/wheels/multibuild +++ b/wheels/multibuild @@ -1 +1 @@ -Subproject commit 74a9795bc64ff786b7e7d33bdec2843cf17e512e +Subproject commit 42d761728d141d8462cd9943f4329f12fe62b155 From de8335ba8fe121cf1f1b7b1565f535fb066094bf Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Wed, 18 Dec 2024 17:07:34 +1100 Subject: [PATCH 648/662] Extract tar files with "data" filter in Windows build scripts (#8606) Co-authored-by: Andrew Murray Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- winbuild/build_prepare.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 607f672ba..188872dfc 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -7,6 +7,7 @@ import re import shutil import struct import subprocess +import sys from typing import Any @@ -507,7 +508,10 @@ def extract_dep(url: str, filename: str, prefs: dict[str, str]) -> None: if sources_dir_abs != member_prefix: msg = "Attempted Path Traversal in Tar File" raise RuntimeError(msg) - tgz.extractall(sources_dir) + if sys.version_info >= (3, 12): + tgz.extractall(sources_dir, filter="data") + else: + tgz.extractall(sources_dir) else: msg = "Unknown archive type: " + filename raise RuntimeError(msg) From cbc55c4621b79176702bf14f188e5a439c7804a4 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Wed, 18 Dec 2024 17:08:51 +1100 Subject: [PATCH 649/662] Raise ValueError when WMF inch is zero (#8600) Co-authored-by: Andrew Murray --- Tests/test_file_wmf.py | 7 +++++++ src/PIL/WmfImagePlugin.py | 3 +++ 2 files changed, 10 insertions(+) diff --git a/Tests/test_file_wmf.py b/Tests/test_file_wmf.py index 424640d7b..2f1f8cdbc 100644 --- a/Tests/test_file_wmf.py +++ b/Tests/test_file_wmf.py @@ -35,6 +35,13 @@ def test_load() -> None: assert im.load()[0, 0] == (255, 255, 255) +def test_load_zero_inch() -> None: + b = BytesIO(b"\xd7\xcd\xc6\x9a\x00\x00" + b"\x00" * 10) + with pytest.raises(ValueError): + with Image.open(b): + pass + + def test_register_handler(tmp_path: Path) -> None: class TestHandler(ImageFile.StubHandler): methodCalled = False diff --git a/src/PIL/WmfImagePlugin.py b/src/PIL/WmfImagePlugin.py index cad6c98d5..48e9823e8 100644 --- a/src/PIL/WmfImagePlugin.py +++ b/src/PIL/WmfImagePlugin.py @@ -92,6 +92,9 @@ class WmfStubImageFile(ImageFile.StubImageFile): # get units per inch self._inch = word(s, 14) + if self._inch == 0: + msg = "Invalid inch" + raise ValueError(msg) # get bounding box x0 = short(s, 6) From c6f42cb6a59aaaf29acf8831ef5865a688139480 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 20 Dec 2024 14:46:01 +1100 Subject: [PATCH 650/662] Updated libwebp to 1.5.0 --- .github/workflows/wheels-dependencies.sh | 2 +- depends/install_webp.sh | 2 +- winbuild/build_prepare.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 3e2a14462..4e0fad79f 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -51,7 +51,7 @@ else GIFLIB_VERSION=5.2.1 fi ZLIB_NG_VERSION=2.2.2 -LIBWEBP_VERSION=1.4.0 +LIBWEBP_VERSION=1.5.0 BZIP2_VERSION=1.0.8 LIBXCB_VERSION=1.17.0 BROTLI_VERSION=1.1.0 diff --git a/depends/install_webp.sh b/depends/install_webp.sh index c47fb35f1..9d2977715 100755 --- a/depends/install_webp.sh +++ b/depends/install_webp.sh @@ -1,7 +1,7 @@ #!/bin/bash # install webp -archive=libwebp-1.4.0 +archive=libwebp-1.5.0 ./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py index 188872dfc..0674a9a15 100644 --- a/winbuild/build_prepare.py +++ b/winbuild/build_prepare.py @@ -117,7 +117,7 @@ V = { "JPEGTURBO": "3.1.0", "LCMS2": "2.16", "LIBPNG": "1.6.44", - "LIBWEBP": "1.4.0", + "LIBWEBP": "1.5.0", "OPENJPEG": "2.5.3", "TIFF": "4.6.0", "XZ": "5.6.3", From 5bd2f489fa7ed1ca4097cf15634d37723919434d Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Fri, 20 Dec 2024 18:44:50 +1100 Subject: [PATCH 651/662] Install libjpeg-turbo8-dev (#8610) Co-authored-by: Andrew Murray --- .ci/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/install.sh b/.ci/install.sh index e85e6bdc5..5c20e7f37 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -21,7 +21,7 @@ set -e if [[ $(uname) != CYGWIN* ]]; then sudo apt-get -qq install libfreetype6-dev liblcms2-dev python3-tk\ - ghostscript libjpeg-turbo-progs libopenjp2-7-dev\ + ghostscript libjpeg-turbo8-dev libopenjp2-7-dev\ cmake meson imagemagick libharfbuzz-dev libfribidi-dev\ sway wl-clipboard libopenblas-dev fi From cf4110ff06b4d4e0ec43b4a9ca13a28b7d3b11d2 Mon Sep 17 00:00:00 2001 From: Andrew Murray <3112309+radarhere@users.noreply.github.com> Date: Sat, 21 Dec 2024 00:55:44 +1100 Subject: [PATCH 652/662] Replace constants with enums (#8611) Co-authored-by: Andrew Murray --- src/PIL/Image.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 1e289b6c3..440728b08 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -1565,7 +1565,7 @@ class Image: for subifd_offset in subifd_offsets: ifds.append((exif._get_ifd_dict(subifd_offset), subifd_offset)) ifd1 = exif.get_ifd(ExifTags.IFD.IFD1) - if ifd1 and ifd1.get(513): + if ifd1 and ifd1.get(ExifTags.Base.JpegIFOffset): assert exif._info is not None ifds.append((ifd1, exif._info.next)) @@ -1577,11 +1577,11 @@ class Image: fp = self.fp if ifd is not None: - thumbnail_offset = ifd.get(513) + thumbnail_offset = ifd.get(ExifTags.Base.JpegIFOffset) if thumbnail_offset is not None: thumbnail_offset += getattr(self, "_exif_offset", 0) self.fp.seek(thumbnail_offset) - data = self.fp.read(ifd.get(514)) + data = self.fp.read(ifd.get(ExifTags.Base.JpegIFByteCount)) fp = io.BytesIO(data) with open(fp) as im: From 3d0f4389499314ca793f6244d13e00cd3ad44de0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 21 Dec 2024 01:38:05 +0000 Subject: [PATCH 653/662] Update dependency mypy to v1.14.0 --- .ci/requirements-mypy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/requirements-mypy.txt b/.ci/requirements-mypy.txt index c84a3533b..cd1b1a1a1 100644 --- a/.ci/requirements-mypy.txt +++ b/.ci/requirements-mypy.txt @@ -1,4 +1,4 @@ -mypy==1.13.0 +mypy==1.14.0 IceSpringPySideStubs-PyQt6 IceSpringPySideStubs-PySide6 ipython From 08e1f9ebc11285c94a2706dd02146f685b10aec0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 21 Dec 2024 13:04:17 +1100 Subject: [PATCH 654/662] Lint fixes --- Tests/test_color_lut.py | 2 ++ src/PIL/ImageFilter.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Tests/test_color_lut.py b/Tests/test_color_lut.py index 36ab187f2..baa899df5 100644 --- a/Tests/test_color_lut.py +++ b/Tests/test_color_lut.py @@ -388,10 +388,12 @@ class TestColorLut3DFilter: table = numpy.ones((7 * 6 * 5, 3), dtype=numpy.float16) lut = ImageFilter.Color3DLUT((5, 6, 7), table) + assert isinstance(lut.table, numpy.ndarray) assert lut.table.shape == (table.size,) table = numpy.ones((7 * 6 * 5 * 3), dtype=numpy.float16) lut = ImageFilter.Color3DLUT((5, 6, 7), table) + assert isinstance(lut.table, numpy.ndarray) assert lut.table.shape == (table.size,) # Check application diff --git a/src/PIL/ImageFilter.py b/src/PIL/ImageFilter.py index 8b0974b2c..b350e56f4 100644 --- a/src/PIL/ImageFilter.py +++ b/src/PIL/ImageFilter.py @@ -553,7 +553,7 @@ class Color3DLUT(MultibandFilter): ch_out = channels or ch_in size_1d, size_2d, size_3d = self.size - table = [0] * (size_1d * size_2d * size_3d * ch_out) + table: list[float] = [0] * (size_1d * size_2d * size_3d * ch_out) idx_in = 0 idx_out = 0 for b in range(size_3d): From b99a00f44f8e34c18b89395eaf67e796ecdf1bf0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 22 Dec 2024 07:24:08 +1100 Subject: [PATCH 655/662] Updated MakerNote IFD capitalization --- src/PIL/ExifTags.py | 2 +- src/PIL/Image.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PIL/ExifTags.py b/src/PIL/ExifTags.py index 39b4aa552..231e80f40 100644 --- a/src/PIL/ExifTags.py +++ b/src/PIL/ExifTags.py @@ -352,7 +352,7 @@ class Interop(IntEnum): class IFD(IntEnum): Exif = 34665 GPSInfo = 34853 - Makernote = 37500 + MakerNote = 37500 Interop = 40965 IFD1 = -1 diff --git a/src/PIL/Image.py b/src/PIL/Image.py index 1e289b6c3..fb3f01fc8 100644 --- a/src/PIL/Image.py +++ b/src/PIL/Image.py @@ -3884,7 +3884,7 @@ class Exif(_ExifBase): gps_ifd = exif.get_ifd(ExifTags.IFD.GPSInfo) print(gps_ifd) - Other IFDs include ``ExifTags.IFD.Exif``, ``ExifTags.IFD.Makernote``, + Other IFDs include ``ExifTags.IFD.Exif``, ``ExifTags.IFD.MakerNote``, ``ExifTags.IFD.Interop`` and ``ExifTags.IFD.IFD1``. :py:mod:`~PIL.ExifTags` also has enum classes to provide names for data:: @@ -4047,11 +4047,11 @@ class Exif(_ExifBase): ifd = self._get_ifd_dict(offset, tag) if ifd is not None: self._ifds[tag] = ifd - elif tag in [ExifTags.IFD.Interop, ExifTags.IFD.Makernote]: + elif tag in [ExifTags.IFD.Interop, ExifTags.IFD.MakerNote]: if ExifTags.IFD.Exif not in self._ifds: self.get_ifd(ExifTags.IFD.Exif) tag_data = self._ifds[ExifTags.IFD.Exif][tag] - if tag == ExifTags.IFD.Makernote: + if tag == ExifTags.IFD.MakerNote: from .TiffImagePlugin import ImageFileDirectory_v2 if tag_data[:8] == b"FUJIFILM": @@ -4138,7 +4138,7 @@ class Exif(_ExifBase): ifd = { k: v for (k, v) in ifd.items() - if k not in (ExifTags.IFD.Interop, ExifTags.IFD.Makernote) + if k not in (ExifTags.IFD.Interop, ExifTags.IFD.MakerNote) } return ifd From 5fe80e1c48eff0b74a14377107895c3e2d2f91b6 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 22 Dec 2024 07:30:59 +1100 Subject: [PATCH 656/662] Use hex values more consistently --- src/PIL/ExifTags.py | 124 ++++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/src/PIL/ExifTags.py b/src/PIL/ExifTags.py index 231e80f40..207d4de4e 100644 --- a/src/PIL/ExifTags.py +++ b/src/PIL/ExifTags.py @@ -303,38 +303,38 @@ TAGS = { class GPS(IntEnum): - GPSVersionID = 0 - GPSLatitudeRef = 1 - GPSLatitude = 2 - GPSLongitudeRef = 3 - GPSLongitude = 4 - GPSAltitudeRef = 5 - GPSAltitude = 6 - GPSTimeStamp = 7 - GPSSatellites = 8 - GPSStatus = 9 - GPSMeasureMode = 10 - GPSDOP = 11 - GPSSpeedRef = 12 - GPSSpeed = 13 - GPSTrackRef = 14 - GPSTrack = 15 - GPSImgDirectionRef = 16 - GPSImgDirection = 17 - GPSMapDatum = 18 - GPSDestLatitudeRef = 19 - GPSDestLatitude = 20 - GPSDestLongitudeRef = 21 - GPSDestLongitude = 22 - GPSDestBearingRef = 23 - GPSDestBearing = 24 - GPSDestDistanceRef = 25 - GPSDestDistance = 26 - GPSProcessingMethod = 27 - GPSAreaInformation = 28 - GPSDateStamp = 29 - GPSDifferential = 30 - GPSHPositioningError = 31 + GPSVersionID = 0x00 + GPSLatitudeRef = 0x01 + GPSLatitude = 0x02 + GPSLongitudeRef = 0x03 + GPSLongitude = 0x04 + GPSAltitudeRef = 0x05 + GPSAltitude = 0x06 + GPSTimeStamp = 0x07 + GPSSatellites = 0x08 + GPSStatus = 0x09 + GPSMeasureMode = 0x0A + GPSDOP = 0x0B + GPSSpeedRef = 0x0C + GPSSpeed = 0x0D + GPSTrackRef = 0x0E + GPSTrack = 0x0F + GPSImgDirectionRef = 0x10 + GPSImgDirection = 0x11 + GPSMapDatum = 0x12 + GPSDestLatitudeRef = 0x13 + GPSDestLatitude = 0x14 + GPSDestLongitudeRef = 0x15 + GPSDestLongitude = 0x16 + GPSDestBearingRef = 0x17 + GPSDestBearing = 0x18 + GPSDestDistanceRef = 0x19 + GPSDestDistance = 0x1A + GPSProcessingMethod = 0x1B + GPSAreaInformation = 0x1C + GPSDateStamp = 0x1D + GPSDifferential = 0x1E + GPSHPositioningError = 0x1F """Maps EXIF GPS tags to tag names.""" @@ -342,40 +342,40 @@ GPSTAGS = {i.value: i.name for i in GPS} class Interop(IntEnum): - InteropIndex = 1 - InteropVersion = 2 - RelatedImageFileFormat = 4096 - RelatedImageWidth = 4097 - RelatedImageHeight = 4098 + InteropIndex = 0x0001 + InteropVersion = 0x0002 + RelatedImageFileFormat = 0x1000 + RelatedImageWidth = 0x1001 + RelatedImageHeight = 0x1002 class IFD(IntEnum): - Exif = 34665 - GPSInfo = 34853 - MakerNote = 37500 - Interop = 40965 + Exif = 0x8769 + GPSInfo = 0x8825 + MakerNote = 0x927C + Interop = 0xA005 IFD1 = -1 class LightSource(IntEnum): - Unknown = 0 - Daylight = 1 - Fluorescent = 2 - Tungsten = 3 - Flash = 4 - Fine = 9 - Cloudy = 10 - Shade = 11 - DaylightFluorescent = 12 - DayWhiteFluorescent = 13 - CoolWhiteFluorescent = 14 - WhiteFluorescent = 15 - StandardLightA = 17 - StandardLightB = 18 - StandardLightC = 19 - D55 = 20 - D65 = 21 - D75 = 22 - D50 = 23 - ISO = 24 - Other = 255 + Unknown = 0x00 + Daylight = 0x01 + Fluorescent = 0x02 + Tungsten = 0x03 + Flash = 0x04 + Fine = 0x09 + Cloudy = 0x0A + Shade = 0x0B + DaylightFluorescent = 0x0C + DayWhiteFluorescent = 0x0D + CoolWhiteFluorescent = 0x0E + WhiteFluorescent = 0x0F + StandardLightA = 0x11 + StandardLightB = 0x12 + StandardLightC = 0x13 + D55 = 0x14 + D65 = 0x15 + D75 = 0x16 + D50 = 0x17 + ISO = 0x18 + Other = 0xFF From fb3d80e390b8ed3111a4658755b035f5e20eb5e0 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 24 Dec 2024 00:41:27 +1100 Subject: [PATCH 657/662] Fixed connecting discontiguous corners --- .../imagedraw/discontiguous_corners_polygon.png | Bin 486 -> 533 bytes Tests/test_imagedraw.py | 3 +++ src/libImaging/Draw.c | 9 ++++----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Tests/images/imagedraw/discontiguous_corners_polygon.png b/Tests/images/imagedraw/discontiguous_corners_polygon.png index 509c42b26e0cbc5e01853915b083d367c1587579..1b58889c8f3ae45243a7509c907f1928534bcbde 100644 GIT binary patch delta 507 zcmV$=WdTX_c%swU!U485w>wyG`7FR7NL{=~F7gqE=@exLJl^>&(VxOp^oSf8ia zhL}fVLnf5pHi+D7J^>rS>@}Z&jbnD1M`NRzjpotVIm~MFXn*Xdtc%T~u_cKYm`7u4 zb5Aml#`f$rpm{%7q?w2WMdmZ9Jmv$tYM1zlSN+e25z{{|T< xlUzDe$vZP-&cnLR`Fl4@D(PjuQYa0yf8_cULF8KV4%i50t$7D*9J9(i8XL_lG>^viVP>00V}E-xGt8s0{h7DSqp_oy z7v|B}vCOaL^=6`p{ zx-yW@%sX@;oL`>6ss&}tQP{jy7s{L0??ngmnl7|5FWZZ5 z<^^5oX`ZzgZGX-0ccHoYoxSL9e%Xan%un{>AoFjtaGZJeq=YAkoRJ&<-`JdWJ^yZh zPW{aTo}5yhZ}4mL8Pdz|GqL&VQ?P{M?R+?oa?YPd*|&W-o5uFwQh3{kbINRgm&E+= z{-We$^*vu@&WF;P59Bw=Z25$j-}aE!{@K0+IYFQ86GhJXGa>d@T{hc8HjiI*d2A1< zc9ZEp%#(a~rkpp^WX{df`g}hP-I2X&ex`d$_dGxT#Oc95ub{>N0000 None: def test_discontiguous_corners_polygon() -> None: img, draw = create_base_image_draw((84, 68)) draw.polygon(((1, 21), (34, 4), (71, 1), (38, 18)), BLACK) + draw.polygon( + ((82, 29), (82, 26), (82, 24), (67, 22), (52, 29), (52, 15), (67, 22)), BLACK + ) draw.polygon(((71, 44), (38, 27), (1, 24)), BLACK) draw.polygon( ((38, 66), (5, 49), (77, 49), (47, 66), (82, 63), (82, 47), (1, 47), (1, 63)), diff --git a/src/libImaging/Draw.c b/src/libImaging/Draw.c index f1c8ffcff..ea6f8805e 100644 --- a/src/libImaging/Draw.c +++ b/src/libImaging/Draw.c @@ -501,7 +501,8 @@ polygon_generic( // Needed to draw consistent polygons xx[j] = xx[j - 1]; j++; - } else if (current->dx != 0 && roundf(xx[j - 1]) == xx[j - 1]) { + } else if (current->dx != 0 && j % 2 == 1 && + roundf(xx[j - 1]) == xx[j - 1]) { // Connect discontiguous corners for (k = 0; k < i; k++) { Edge *other_edge = edge_table[k]; @@ -510,10 +511,8 @@ polygon_generic( continue; } // Check if the two edges join to make a corner - if (((ymin == current->ymin && ymin == other_edge->ymin) || - (ymin == current->ymax && ymin == other_edge->ymax)) && - xx[j - 1] == (ymin - other_edge->y0) * other_edge->dx + - other_edge->x0) { + if (xx[j - 1] == + (ymin - other_edge->y0) * other_edge->dx + other_edge->x0) { // Determine points from the edges on the next row // Or if this is the last row, check the previous row int offset = ymin == ymax ? -1 : 1; From 62b7cb62f4ee339677170b0d0fa5943e490ddab7 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 26 Dec 2024 19:06:23 +1100 Subject: [PATCH 658/662] Fixed indentation --- src/_imagingcms.c | 54 +++++++++++++++++++++++------------------------ src/display.c | 14 ++++++------ 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/src/_imagingcms.c b/src/_imagingcms.c index 1823bcf03..1805ebde1 100644 --- a/src/_imagingcms.c +++ b/src/_imagingcms.c @@ -346,10 +346,10 @@ pyCMSdoTransform(Imaging im, Imaging imOut, cmsHTRANSFORM hTransform) { return -1; } - Py_BEGIN_ALLOW_THREADS + Py_BEGIN_ALLOW_THREADS; - // transform color channels only - for (i = 0; i < im->ysize; i++) { + // transform color channels only + for (i = 0; i < im->ysize; i++) { cmsDoTransform(hTransform, im->image[i], imOut->image[i], im->xsize); } @@ -362,9 +362,9 @@ pyCMSdoTransform(Imaging im, Imaging imOut, cmsHTRANSFORM hTransform) { // enough available on all platforms, so we polyfill it here for now. pyCMScopyAux(hTransform, imOut, im); - Py_END_ALLOW_THREADS + Py_END_ALLOW_THREADS; - return 0; + return 0; } static cmsHTRANSFORM @@ -378,17 +378,17 @@ _buildTransform( ) { cmsHTRANSFORM hTransform; - Py_BEGIN_ALLOW_THREADS + Py_BEGIN_ALLOW_THREADS; - /* create the transform */ - hTransform = cmsCreateTransform( - hInputProfile, - findLCMStype(sInMode), - hOutputProfile, - findLCMStype(sOutMode), - iRenderingIntent, - cmsFLAGS - ); + /* create the transform */ + hTransform = cmsCreateTransform( + hInputProfile, + findLCMStype(sInMode), + hOutputProfile, + findLCMStype(sOutMode), + iRenderingIntent, + cmsFLAGS + ); Py_END_ALLOW_THREADS; @@ -412,19 +412,19 @@ _buildProofTransform( ) { cmsHTRANSFORM hTransform; - Py_BEGIN_ALLOW_THREADS + Py_BEGIN_ALLOW_THREADS; - /* create the transform */ - hTransform = cmsCreateProofingTransform( - hInputProfile, - findLCMStype(sInMode), - hOutputProfile, - findLCMStype(sOutMode), - hProofProfile, - iRenderingIntent, - iProofIntent, - cmsFLAGS - ); + /* create the transform */ + hTransform = cmsCreateProofingTransform( + hInputProfile, + findLCMStype(sInMode), + hOutputProfile, + findLCMStype(sOutMode), + hProofProfile, + iRenderingIntent, + iProofIntent, + cmsFLAGS + ); Py_END_ALLOW_THREADS; diff --git a/src/display.c b/src/display.c index b4e2e3899..eed75975d 100644 --- a/src/display.c +++ b/src/display.c @@ -690,24 +690,26 @@ PyImaging_CreateWindowWin32(PyObject *self, PyObject *args) { SetWindowLongPtr(wnd, 0, (LONG_PTR)callback); SetWindowLongPtr(wnd, sizeof(callback), (LONG_PTR)PyThreadState_Get()); - Py_BEGIN_ALLOW_THREADS ShowWindow(wnd, SW_SHOWNORMAL); + Py_BEGIN_ALLOW_THREADS; + ShowWindow(wnd, SW_SHOWNORMAL); SetForegroundWindow(wnd); /* to make sure it's visible */ - Py_END_ALLOW_THREADS + Py_END_ALLOW_THREADS; - return Py_BuildValue(F_HANDLE, wnd); + return Py_BuildValue(F_HANDLE, wnd); } PyObject * PyImaging_EventLoopWin32(PyObject *self, PyObject *args) { MSG msg; - Py_BEGIN_ALLOW_THREADS while (mainloop && GetMessage(&msg, NULL, 0, 0)) { + Py_BEGIN_ALLOW_THREADS; + while (mainloop && GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); } - Py_END_ALLOW_THREADS + Py_END_ALLOW_THREADS; - Py_INCREF(Py_None); + Py_INCREF(Py_None); return Py_None; } From 622722f295ab137ea6bf54ede8efb8f376d1194b Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 26 Dec 2024 20:04:27 +1100 Subject: [PATCH 659/662] Corrected loadImageSeries type hint --- src/PIL/SpiderImagePlugin.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/PIL/SpiderImagePlugin.py b/src/PIL/SpiderImagePlugin.py index 075073f9f..c83d02885 100644 --- a/src/PIL/SpiderImagePlugin.py +++ b/src/PIL/SpiderImagePlugin.py @@ -211,26 +211,27 @@ class SpiderImageFile(ImageFile.ImageFile): # given a list of filenames, return a list of images -def loadImageSeries(filelist: list[str] | None = None) -> list[SpiderImageFile] | None: +def loadImageSeries(filelist: list[str] | None = None) -> list[Image.Image] | None: """create a list of :py:class:`~PIL.Image.Image` objects for use in a montage""" if filelist is None or len(filelist) < 1: return None - imglist = [] + byte_imgs = [] for img in filelist: if not os.path.exists(img): print(f"unable to find {img}") continue try: with Image.open(img) as im: - im = im.convert2byte() + assert isinstance(im, SpiderImageFile) + byte_im = im.convert2byte() except Exception: if not isSpiderImage(img): print(f"{img} is not a Spider image file") continue - im.info["filename"] = img - imglist.append(im) - return imglist + byte_im.info["filename"] = img + byte_imgs.append(byte_im) + return byte_imgs # -------------------------------------------------------------------- From aef3aa2ab35fdf847aa13017c5b4b315562a1f77 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 27 Dec 2024 11:26:07 +1100 Subject: [PATCH 660/662] Pass file handle to ContainerIO --- Tests/test_file_container.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Tests/test_file_container.py b/Tests/test_file_container.py index 237045acc..597ab5083 100644 --- a/Tests/test_file_container.py +++ b/Tests/test_file_container.py @@ -4,8 +4,6 @@ import pytest from PIL import ContainerIO, Image -from .helper import hopper - TEST_FILE = "Tests/images/dummy.container" @@ -15,15 +13,15 @@ def test_sanity() -> None: def test_isatty() -> None: - with hopper() as im: - container = ContainerIO.ContainerIO(im, 0, 0) + with open(TEST_FILE, "rb") as fh: + container = ContainerIO.ContainerIO(fh, 0, 0) assert container.isatty() is False def test_seekable() -> None: - with hopper() as im: - container = ContainerIO.ContainerIO(im, 0, 0) + with open(TEST_FILE, "rb") as fh: + container = ContainerIO.ContainerIO(fh, 0, 0) assert container.seekable() is True From 0148684c2412cc69b9606e7e2b6d5d581030e41c Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 27 Dec 2024 11:29:47 +1100 Subject: [PATCH 661/662] Use monkeypatch --- Tests/test_image_thumbnail.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Tests/test_image_thumbnail.py b/Tests/test_image_thumbnail.py index 01bd4b1d7..aa625f229 100644 --- a/Tests/test_image_thumbnail.py +++ b/Tests/test_image_thumbnail.py @@ -104,20 +104,20 @@ def test_transposed() -> None: assert im.size == (590, 88) -def test_load_first_unless_jpeg() -> None: +def test_load_first_unless_jpeg(monkeypatch: pytest.MonkeyPatch) -> None: # Test that thumbnail() still uses draft() for JPEG with Image.open("Tests/images/hopper.jpg") as im: - draft = im.draft + original_draft = im.draft def im_draft( mode: str, size: tuple[int, int] ) -> tuple[str, tuple[int, int, float, float]] | None: - result = draft(mode, size) + result = original_draft(mode, size) assert result is not None return result - im.draft = im_draft + monkeypatch.setattr(im, "draft", im_draft) im.thumbnail((64, 64)) From 89f1498796be0053bc40ef757680c9f7bc49e7ce Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 27 Dec 2024 11:38:47 +1100 Subject: [PATCH 662/662] Updated argument types to match Image draft --- Tests/test_image_thumbnail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/test_image_thumbnail.py b/Tests/test_image_thumbnail.py index aa625f229..1181f6fca 100644 --- a/Tests/test_image_thumbnail.py +++ b/Tests/test_image_thumbnail.py @@ -110,7 +110,7 @@ def test_load_first_unless_jpeg(monkeypatch: pytest.MonkeyPatch) -> None: original_draft = im.draft def im_draft( - mode: str, size: tuple[int, int] + mode: str | None, size: tuple[int, int] | None ) -> tuple[str, tuple[int, int, float, float]] | None: result = original_draft(mode, size) assert result is not None