Skip to content

Fix PICT pixel decoding for 32-bit planar and cicn icons #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grub-basket wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix PICT pixel decoding for 32-bit planar and cicn icons #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions rsrcdump/pict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,10 +467,10 @@ def unpack4(u: Unpacker, w: int, h: int, rowbytes: int, numplanes: int) -> bytes
else:
for y in range(h):
for x in range(w):
a = unpacked[y*w*3 + x + w*0]
r = unpacked[y*w*3 + x + w*1]
g = unpacked[y*w*3 + x + w*2]
b = unpacked[y*w*3 + x + w*3]
a = unpacked[y*w*4 + x + w*0]
r = unpacked[y*w*4 + x + w*1]
g = unpacked[y*w*4 + x + w*2]
b = unpacked[y*w*4 + x + w*3]
dst.write(struct.pack(">BBBB", b,g,r,a))
return dst.getvalue()

Expand Down Expand Up @@ -903,7 +903,7 @@ def convert_cicn_to_image(data: bytes) -> tuple[int, int, bytes]:
assert isinstance(maskbm, Bitmap)
assert isinstance(bwiconbm, Bitmap)
maskbits = u.read(maskbm.rowbytes * maskbm.height)
bwiconbits = u.read(bwiconbm.rowbytes * maskbm.height)
bwiconbits = u.read(bwiconbm.rowbytes * bwiconbm.height)

mask8 = convert_to_8bit(maskbits, 1)
bwicon8 = convert_to_8bit(bwiconbits, 1)
Expand Down