Skip to content
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.

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

Fixed big-endian saving #2

Merged
merged 5 commits into from May 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion docs/handbook/image-file-formats.rst
Expand Up @@ -200,12 +200,16 @@ attributes before loading the file::
ICNS
^^^^

Pillow reads and (macOS only) writes macOS ``.icns`` files. By default, the
Pillow reads and writes macOS ``.icns`` files. By default, the
largest available icon is read, though you can override this by setting the
:py:attr:`~PIL.Image.Image.size` property before calling
:py:meth:`~PIL.Image.Image.load`. The :py:meth:`~PIL.Image.Image.open` method
sets the following :py:attr:`~PIL.Image.Image.info` property:

.. note::

Prior to version 7.2.0, Pillow could only write ICNS files on macOS.

**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
Expand Down
31 changes: 16 additions & 15 deletions src/PIL/IcnsImagePlugin.py
Expand Up @@ -300,13 +300,12 @@ def load(self):
self.load_end()


def to_int(s):
def _to_int(s):
b = s.encode("ascii")
return (b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3]


MAGIC = to_int("icns")
HEADER_SIZE = 8
MAGIC = _to_int("icns")
TOC = "TOC "


Expand All @@ -326,32 +325,34 @@ def _save(im, fp, filename):
file_size = 0
entries = []
provided_images = {im.width: im for im in im.encoderinfo.get("append_images", [])}
for index, s in enumerate(sizes):
temp = io.BytesIO()
temp_sizes = {s: io.BytesIO() for s in set(sizes)}
for s, temp in temp_sizes.items():
nb = provided_images[s] if s in provided_images else im.resize((s, s))
nb.save(temp, "png")
for index, s in enumerate(sizes):
temp = temp_sizes[s]
file_size += len(temp.getvalue())
entries.append(
{"type": size_str[index], "size": len(temp.getvalue()), "stream": temp}
)

# Header
fp.write(struct.pack("i", MAGIC)[::-1])
fp.write(struct.pack("i", file_size)[::-1])
fp.write(struct.pack("<i", MAGIC)[::-1])
fp.write(struct.pack("<i", file_size)[::-1])

# TOC
toc_size = HEADER_SIZE + (len(entries) * HEADER_SIZE)
fp.write(struct.pack("i", to_int(TOC))[::-1])
fp.write(struct.pack("i", toc_size)[::-1])
toc_size = HEADERSIZE + (len(entries) * HEADERSIZE)
fp.write(struct.pack("<i", _to_int(TOC))[::-1])
fp.write(struct.pack("<i", toc_size)[::-1])
for e in entries:
fp.write(struct.pack("i", to_int(e.get("type")))[::-1])
fp.write(struct.pack("i", HEADER_SIZE + e.get("size"))[::-1])
fp.write(struct.pack("<i", _to_int(e["type"]))[::-1])
fp.write(struct.pack("<i", HEADERSIZE + e["size"])[::-1])

# Data
for index, e in enumerate(entries):
fp.write(struct.pack("i", to_int(e.get("type")))[::-1])
fp.write(struct.pack("i", HEADER_SIZE + e.get("size"))[::-1])
fp.write(e.get("stream").getvalue())
fp.write(struct.pack("<i", _to_int(e["type"]))[::-1])
fp.write(struct.pack("<i", HEADERSIZE + e["size"])[::-1])
fp.write(e["stream"].getvalue())

fp.flush()

Expand Down