python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-10-28 14:41:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed BytesIO

Browse Source
This commit is contained in:
Andrew Murray 2025-10-21 23:35:17 +11:00
parent 76f04b46c5
commit 7d6f2ce90b
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/PIL/DdsImagePlugin.py
View File

@ -12,7 +12,6 @@ https://creativecommons.org/publicdomain/zero/1.0/
from __future__ import annotations from __future__ import annotations
import io
import struct import struct
import sys import sys
from enum import IntEnum, IntFlag from enum import IntEnum, IntFlag
@ -340,21 +339,20 @@ class DdsImageFile(ImageFile.ImageFile):
if header_size != 124: if header_size != 124:
msg = f"Unsupported header size {repr(header_size)}" msg = f"Unsupported header size {repr(header_size)}"
raise OSError(msg) raise OSError(msg)
header_bytes = self.fp.read(header_size - 4) header = self.fp.read(header_size - 4)
if len(header_bytes) != 120: if len(header) != 120:
msg = f"Incomplete header: {len(header_bytes)} bytes" msg = f"Incomplete header: {len(header)} bytes"
raise OSError(msg) raise OSError(msg)
header = io.BytesIO(header_bytes)
flags, height, width = struct.unpack("<3I", header.read(12)) flags, height, width = struct.unpack("<3I", header[:12])
self._size = (width, height) self._size = (width, height)
extents = (0, 0) + self.size extents = (0, 0) + self.size
pitch, depth, mipmaps = struct.unpack("<3I", header.read(12)) pitch, depth, mipmaps = struct.unpack("<3I", header[12:24])
struct.unpack("<11I", header.read(44)) # reserved struct.unpack("<11I", header[24:68]) # reserved
# pixel format # pixel format
pfsize, pfflags, fourcc, bitcount = struct.unpack("<4I", header.read(16)) pfsize, pfflags, fourcc, bitcount = struct.unpack("<4I", header[68:84])
n = 0 n = 0
rawmode = None rawmode = None
if pfflags & DDPF.RGB: if pfflags & DDPF.RGB:
@ -366,7 +364,7 @@ class DdsImageFile(ImageFile.ImageFile):
self._mode = "RGB" self._mode = "RGB"
mask_count = 3 mask_count = 3
masks = struct.unpack(f"<{mask_count}I", header.read(mask_count * 4)) masks = struct.unpack(f"<{mask_count}I", header[84 : 84 + mask_count * 4])
self.tile = [ImageFile._Tile("dds_rgb", extents, 0, (bitcount, masks))] self.tile = [ImageFile._Tile("dds_rgb", extents, 0, (bitcount, masks))]
return return
elif pfflags & DDPF.LUMINANCE: elif pfflags & DDPF.LUMINANCE: