python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-04 21:50:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use existing variable names from ImageFile

Browse Source
This commit is contained in:
Andrew Murray 2023-02-25 13:40:44 +11:00 committed by Aarni Koskela
parent 8e18415cc5
commit fcc59a4001
4 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/PIL/Image.py
View File

@ -765,17 +765,17 @@ class Image:
bufsize = max(65536, self.size[0] * 4) # see RawEncode.c bufsize = max(65536, self.size[0] * 4) # see RawEncode.c
data = [] output = []
while True: while True:
length, error_code, chunk = e.encode(bufsize) bytes_consumed, errcode, data = e.encode(bufsize)
data.append(chunk) output.append(data)
if error_code: if errcode:
break break
if error_code < 0: if errcode < 0:
msg = f"encoder error {error_code} in tobytes" msg = f"encoder error {errcode} in tobytes"
raise RuntimeError(msg) raise RuntimeError(msg)
return b"".join(data) return b"".join(output)
def tobitmap(self, name="image"): def tobitmap(self, name="image"):
""" """

14
src/PIL/ImageFile.py
View File

@ -530,20 +530,20 @@ def _encode_tile(im, fp, tile, bufsize, fh, exc=None):
encoder.setimage(im.im, b) encoder.setimage(im.im, b)
if encoder.pushes_fd: if encoder.pushes_fd:
encoder.setfd(fp) encoder.setfd(fp)
length, error_code = encoder.encode_to_pyfd() errcode = encoder.encode_to_pyfd()[1]
else: else:
if exc: if exc:
# compress to Python file-compatible object # compress to Python file-compatible object
while True: while True:
length, error_code, chunk = encoder.encode(bufsize) errcode, data = encoder.encode(bufsize)[1:]
fp.write(chunk) fp.write(data)
if error_code: if errcode:
break break
else: else:
# slight speedup: compress to real file object # slight speedup: compress to real file object
error_code = encoder.encode_to_file(fh, bufsize) errcode = encoder.encode_to_file(fh, bufsize)
if error_code < 0: if errcode < 0:
msg = f"encoder error {error_code} when writing image file" msg = f"encoder error {errcode} when writing image file"
raise OSError(msg) from exc raise OSError(msg) from exc
finally: finally:
encoder.cleanup() encoder.cleanup()

11
src/PIL/PcfFontFile.py
View File

@ -86,7 +86,6 @@ class PcfFontFile(FontFile.FontFile):
for ch, ix in enumerate(encoding): for ch, ix in enumerate(encoding):
if ix is not None: if ix is not None:
ix_metrics = metrics[ix]
( (
xsize, xsize,
ysize, ysize,
@ -96,7 +95,7 @@ class PcfFontFile(FontFile.FontFile):
ascent, ascent,
descent, descent,
attributes, attributes,
) = ix_metrics ) = metrics[ix]
self.glyph[ch] = ( self.glyph[ch] = (
(width, 0), (width, 0),
(left, descent - ysize, xsize + left, descent), (left, descent - ysize, xsize + left, descent),
@ -220,9 +219,11 @@ class PcfFontFile(FontFile.FontFile):
mode = "1" mode = "1"
for i in range(nbitmaps): for i in range(nbitmaps):
x, y = metrics[i][0], metrics[i][1] left, right = metrics[i][:2]
b, e = offsets[i], offsets[i + 1] b, e = offsets[i : i + 2]
bitmaps.append(Image.frombytes("1", (x, y), data[b:e], "raw", mode, pad(x))) bitmaps.append(
Image.frombytes("1", (left, right), data[b:e], "raw", mode, pad(left))
)
return bitmaps return bitmaps

10
src/PIL/TiffImagePlugin.py
View File

@ -1845,13 +1845,13 @@ def _save(im, fp, filename):
e.setimage(im.im, (0, 0) + im.size) e.setimage(im.im, (0, 0) + im.size)
while True: while True:
# undone, change to self.decodermaxblock: # undone, change to self.decodermaxblock:
length, error_code, chunk = e.encode(16 * 1024) errcode, data = e.encode(16 * 1024)[1:]
if not _fp: if not _fp:
fp.write(chunk) fp.write(data)
if error_code: if errcode:
break break
if error_code < 0: if errcode < 0:
msg = f"encoder error {error_code} when writing image file" msg = f"encoder error {errcode} when writing image file"
raise OSError(msg) raise OSError(msg)
else: else: