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

Derive bit count from number of modes

Browse Source
This commit is contained in:
Andrew Murray 2023-10-21 17:33:04 +11:00
parent 4a4a1ee6ad
commit 8fbb610378
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/PIL/DdsImagePlugin.py
View File

@ -403,7 +403,7 @@ class DdsImageFile(ImageFile.ImageFile):
self._mode = "RGBA" self._mode = "RGBA"
self.pixel_format = "DXT5" self.pixel_format = "DXT5"
n = 3 n = 3
elif fourcc == D3DFMT.ATI1 or fourcc == D3DFMT.BC4U: elif fourcc in (D3DFMT.BC4U, D3DFMT.ATI1):
self._mode = "L" self._mode = "L"
self.pixel_format = "BC4" self.pixel_format = "BC4"
n = 4 n = 4
@ -411,11 +411,7 @@ class DdsImageFile(ImageFile.ImageFile):
self._mode = "RGB" self._mode = "RGB"
self.pixel_format = "BC5S" self.pixel_format = "BC5S"
n = 5 n = 5
elif fourcc == D3DFMT.BC5U: elif fourcc in (D3DFMT.BC5U, D3DFMT.ATI2):
self._mode = "RGB"
self.pixel_format = "BC5U"
n = 5
elif fourcc == D3DFMT.ATI2:
self._mode = "RGB" self._mode = "RGB"
self.pixel_format = "BC5" self.pixel_format = "BC5"
n = 5 n = 5
@ -488,32 +484,30 @@ def _save(im, fp, filename):
msg = f"cannot write mode {im.mode} as DDS" msg = f"cannot write mode {im.mode} as DDS"
raise OSError(msg) raise OSError(msg)
pixel_flags = DDPF.RGB if im.mode == "RGBA":
if im.mode == "RGB": pixel_flags = DDPF.RGB | DDPF.ALPHAPIXELS
rgba_mask = struct.pack("<4I", 0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000) rgba_mask = (0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000)
bit_count = 24
elif im.mode == "RGBA":
pixel_flags |= DDPF.ALPHAPIXELS
rgba_mask = struct.pack("<4I", 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000)
bit_count = 32
r, g, b, a = im.split() r, g, b, a = im.split()
im = Image.merge("RGBA", (a, r, g, b)) im = Image.merge("RGBA", (a, r, g, b))
elif im.mode == "RGB":
pixel_flags = DDPF.RGB
rgba_mask = (0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000)
elif im.mode == "LA": elif im.mode == "LA":
pixel_flags = DDPF.LUMINANCE | DDPF.ALPHAPIXELS pixel_flags = DDPF.LUMINANCE | DDPF.ALPHAPIXELS
rgba_mask = struct.pack("<4I", 0x000000FF, 0x000000FF, 0x000000FF, 0x0000FF00) rgba_mask = (0x000000FF, 0x000000FF, 0x000000FF, 0x0000FF00)
bit_count = 16
else: # im.mode == "L" else: # im.mode == "L"
pixel_flags = DDPF.LUMINANCE pixel_flags = DDPF.LUMINANCE
rgba_mask = struct.pack("<4I", 0xFF000000, 0xFF000000, 0xFF000000, 0x00000000) rgba_mask = (0xFF000000, 0xFF000000, 0xFF000000, 0x00000000)
bit_count = 8
flags = DDSD.CAPS | DDSD.HEIGHT | DDSD.WIDTH | DDSD.PITCH | DDSD.PIXELFORMAT flags = DDSD.CAPS | DDSD.HEIGHT | DDSD.WIDTH | DDSD.PITCH | DDSD.PIXELFORMAT
bit_count = len(im.getbands()) * 8
stride = (im.width * bit_count + 7) // 8 stride = (im.width * bit_count + 7) // 8
fp.write( fp.write(
o32(DDS_MAGIC) o32(DDS_MAGIC)
+ struct.pack( + struct.pack(
"<IIIIIII", "<7I",
124, # header size 124, # header size
flags, # flags flags, # flags
im.height, im.height,
@ -524,12 +518,12 @@ def _save(im, fp, filename):
) )
+ struct.pack("11I", *((0,) * 11)) # reserved + struct.pack("11I", *((0,) * 11)) # reserved
# pfsize, pfflags, fourcc, bitcount # pfsize, pfflags, fourcc, bitcount
+ struct.pack("<IIII", 32, pixel_flags, 0, bit_count) + struct.pack("<4I", 32, pixel_flags, 0, bit_count)
+ rgba_mask # dwRGBABitMask + struct.pack("<4I", *rgba_mask) # dwRGBABitMask
+ struct.pack("<IIIII", DDSCAPS.TEXTURE, 0, 0, 0, 0) + struct.pack("<5I", DDSCAPS.TEXTURE, 0, 0, 0, 0)
) )
mode = "LA" if im.mode == "LA" else im.mode[::-1] rawmode = "LA" if im.mode == "LA" else im.mode[::-1]
ImageFile._save(im, fp, [Image._Tile("raw", (0, 0) + im.size, 0, (mode, 0, 1))]) ImageFile._save(im, fp, [Image._Tile("raw", (0, 0) + im.size, 0, (rawmode, 0, 1))])
def _accept(prefix): def _accept(prefix):