mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-24 17:06:16 +03:00
Merge branch 'main' into harfbuzz
This commit is contained in:
commit
676a0dd188
|
@ -1 +1 @@
|
|||
cibuildwheel==2.18.0
|
||||
cibuildwheel==2.18.1
|
||||
|
|
|
@ -9,6 +9,7 @@ BinPackParameters: false
|
|||
BreakBeforeBraces: Attach
|
||||
ColumnLimit: 88
|
||||
DerivePointerAlignment: false
|
||||
IndentGotoLabels: false
|
||||
IndentWidth: 4
|
||||
Language: Cpp
|
||||
PointerAlignment: Right
|
||||
|
|
|
@ -23,6 +23,13 @@ repos:
|
|||
- id: remove-tabs
|
||||
exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.gd$|\.opt$)
|
||||
|
||||
- repo: https://github.com/pre-commit/mirrors-clang-format
|
||||
rev: v18.1.4
|
||||
hooks:
|
||||
- id: clang-format
|
||||
types: [c]
|
||||
exclude: ^src/thirdparty/
|
||||
|
||||
- repo: https://github.com/pre-commit/pygrep-hooks
|
||||
rev: v1.10.0
|
||||
hooks:
|
||||
|
|
|
@ -29,33 +29,6 @@ elif "GITHUB_ACTIONS" in os.environ:
|
|||
uploader = "github_actions"
|
||||
|
||||
|
||||
modes = (
|
||||
"1",
|
||||
"L",
|
||||
"LA",
|
||||
"La",
|
||||
"P",
|
||||
"PA",
|
||||
"F",
|
||||
"I",
|
||||
"I;16",
|
||||
"I;16L",
|
||||
"I;16B",
|
||||
"I;16N",
|
||||
"RGB",
|
||||
"RGBA",
|
||||
"RGBa",
|
||||
"RGBX",
|
||||
"BGR;15",
|
||||
"BGR;16",
|
||||
"BGR;24",
|
||||
"CMYK",
|
||||
"YCbCr",
|
||||
"HSV",
|
||||
"LAB",
|
||||
)
|
||||
|
||||
|
||||
def upload(a: Image.Image, b: Image.Image) -> str | None:
|
||||
if uploader == "show":
|
||||
# local img.show for errors.
|
||||
|
|
|
@ -31,7 +31,6 @@ from .helper import (
|
|||
is_big_endian,
|
||||
is_win32,
|
||||
mark_if_feature_version,
|
||||
modes,
|
||||
skip_unless_feature,
|
||||
)
|
||||
|
||||
|
@ -46,7 +45,7 @@ def helper_image_new(mode: str, size: tuple[int, int]) -> Image.Image:
|
|||
|
||||
|
||||
class TestImage:
|
||||
@pytest.mark.parametrize("mode", modes)
|
||||
@pytest.mark.parametrize("mode", Image.MODES + ["BGR;15", "BGR;16", "BGR;24"])
|
||||
def test_image_modes_success(self, mode: str) -> None:
|
||||
helper_image_new(mode, (1, 1))
|
||||
|
||||
|
@ -1027,7 +1026,7 @@ class TestImage:
|
|||
|
||||
|
||||
class TestImageBytes:
|
||||
@pytest.mark.parametrize("mode", modes)
|
||||
@pytest.mark.parametrize("mode", Image.MODES + ["BGR;15", "BGR;16", "BGR;24"])
|
||||
def test_roundtrip_bytes_constructor(self, mode: str) -> None:
|
||||
im = hopper(mode)
|
||||
source_bytes = im.tobytes()
|
||||
|
@ -1039,7 +1038,7 @@ class TestImageBytes:
|
|||
reloaded = Image.frombytes(mode, im.size, source_bytes)
|
||||
assert reloaded.tobytes() == source_bytes
|
||||
|
||||
@pytest.mark.parametrize("mode", modes)
|
||||
@pytest.mark.parametrize("mode", Image.MODES + ["BGR;15", "BGR;16", "BGR;24"])
|
||||
def test_roundtrip_bytes_method(self, mode: str) -> None:
|
||||
im = hopper(mode)
|
||||
source_bytes = im.tobytes()
|
||||
|
@ -1048,7 +1047,7 @@ class TestImageBytes:
|
|||
reloaded.frombytes(source_bytes)
|
||||
assert reloaded.tobytes() == source_bytes
|
||||
|
||||
@pytest.mark.parametrize("mode", modes)
|
||||
@pytest.mark.parametrize("mode", Image.MODES + ["BGR;15", "BGR;16", "BGR;24"])
|
||||
def test_getdata_putdata(self, mode: str) -> None:
|
||||
if is_big_endian() and mode == "BGR;15":
|
||||
pytest.xfail("Known failure of BGR;15 on big-endian")
|
||||
|
|
|
@ -10,7 +10,7 @@ import pytest
|
|||
|
||||
from PIL import Image
|
||||
|
||||
from .helper import assert_image_equal, hopper, is_win32, modes
|
||||
from .helper import assert_image_equal, hopper, is_win32
|
||||
|
||||
# CFFI imports pycparser which doesn't support PYTHONOPTIMIZE=2
|
||||
# https://github.com/eliben/pycparser/pull/198#issuecomment-317001670
|
||||
|
@ -205,12 +205,13 @@ class TestImageGetPixel(AccessTest):
|
|||
with pytest.raises(error):
|
||||
im.getpixel((-1, -1))
|
||||
|
||||
@pytest.mark.parametrize("mode", modes)
|
||||
@pytest.mark.parametrize("mode", Image.MODES)
|
||||
def test_basic(self, mode: str) -> None:
|
||||
if mode.startswith("BGR;"):
|
||||
with pytest.warns(DeprecationWarning):
|
||||
self.check(mode)
|
||||
else:
|
||||
self.check(mode)
|
||||
|
||||
@pytest.mark.parametrize("mode", ("BGR;15", "BGR;16", "BGR;24"))
|
||||
def test_deprecated(self, mode: str) -> None:
|
||||
with pytest.warns(DeprecationWarning):
|
||||
self.check(mode)
|
||||
|
||||
def test_list(self) -> None:
|
||||
|
|
3
setup.py
3
setup.py
|
@ -23,8 +23,7 @@ from setuptools.command.build_ext import build_ext
|
|||
def get_version():
|
||||
version_file = "src/PIL/_version.py"
|
||||
with open(version_file, encoding="utf-8") as f:
|
||||
exec(compile(f.read(), version_file, "exec"))
|
||||
return locals()["__version__"]
|
||||
return f.read().split('"')[1]
|
||||
|
||||
|
||||
configuration = {}
|
||||
|
|
|
@ -472,7 +472,7 @@ class DdsImageFile(ImageFile.ImageFile):
|
|||
else:
|
||||
self.tile = [ImageFile._Tile("raw", extents, 0, rawmode or self.mode)]
|
||||
|
||||
def load_seek(self, pos):
|
||||
def load_seek(self, pos: int) -> None:
|
||||
pass
|
||||
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@ gs_binary: str | bool | None = None
|
|||
gs_windows_binary = None
|
||||
|
||||
|
||||
def has_ghostscript():
|
||||
def has_ghostscript() -> bool:
|
||||
global gs_binary, gs_windows_binary
|
||||
if gs_binary is None:
|
||||
if sys.platform.startswith("win"):
|
||||
|
@ -404,7 +404,7 @@ class EpsImageFile(ImageFile.ImageFile):
|
|||
self.tile = []
|
||||
return Image.Image.load(self)
|
||||
|
||||
def load_seek(self, pos):
|
||||
def load_seek(self, pos: int) -> None:
|
||||
# we can't incrementally load, so force ImageFile.parser to
|
||||
# use our custom load method by defining this method.
|
||||
pass
|
||||
|
|
|
@ -132,7 +132,7 @@ class FliImageFile(ImageFile.ImageFile):
|
|||
for f in range(self.__frame + 1, frame + 1):
|
||||
self._seek(f)
|
||||
|
||||
def _seek(self, frame):
|
||||
def _seek(self, frame: int) -> None:
|
||||
if frame == 0:
|
||||
self.__frame = -1
|
||||
self._fp.seek(self.__rewind)
|
||||
|
|
|
@ -103,7 +103,7 @@ class FtexImageFile(ImageFile.ImageFile):
|
|||
self.fp.close()
|
||||
self.fp = BytesIO(data)
|
||||
|
||||
def load_seek(self, pos):
|
||||
def load_seek(self, pos: int) -> None:
|
||||
pass
|
||||
|
||||
|
||||
|
|
|
@ -82,7 +82,7 @@ class GifImageFile(ImageFile.ImageFile):
|
|||
return self.fp.read(s[0])
|
||||
return None
|
||||
|
||||
def _is_palette_needed(self, p):
|
||||
def _is_palette_needed(self, p: bytes) -> bool:
|
||||
for i in range(0, len(p), 3):
|
||||
if not (i // 3 == p[i] == p[i + 1] == p[i + 2]):
|
||||
return True
|
||||
|
@ -474,7 +474,7 @@ class GifImageFile(ImageFile.ImageFile):
|
|||
RAWMODE = {"1": "L", "L": "L", "P": "P"}
|
||||
|
||||
|
||||
def _normalize_mode(im):
|
||||
def _normalize_mode(im: Image.Image) -> Image.Image:
|
||||
"""
|
||||
Takes an image (or frame), returns an image in a mode that is appropriate
|
||||
for saving in a Gif.
|
||||
|
@ -887,7 +887,7 @@ def _get_optimize(im, info):
|
|||
return used_palette_colors
|
||||
|
||||
|
||||
def _get_color_table_size(palette_bytes):
|
||||
def _get_color_table_size(palette_bytes: bytes) -> int:
|
||||
# calculate the palette size for the header
|
||||
if not palette_bytes:
|
||||
return 0
|
||||
|
@ -897,7 +897,7 @@ def _get_color_table_size(palette_bytes):
|
|||
return math.ceil(math.log(len(palette_bytes) // 3, 2)) - 1
|
||||
|
||||
|
||||
def _get_header_palette(palette_bytes):
|
||||
def _get_header_palette(palette_bytes: bytes) -> bytes:
|
||||
"""
|
||||
Returns the palette, null padded to the next power of 2 (*3) bytes
|
||||
suitable for direct inclusion in the GIF header
|
||||
|
@ -915,7 +915,7 @@ def _get_header_palette(palette_bytes):
|
|||
return palette_bytes
|
||||
|
||||
|
||||
def _get_palette_bytes(im):
|
||||
def _get_palette_bytes(im: Image.Image) -> bytes:
|
||||
"""
|
||||
Gets the palette for inclusion in the gif header
|
||||
|
||||
|
|
|
@ -53,5 +53,5 @@ class GimpPaletteFile:
|
|||
|
||||
self.palette = b"".join(self.palette)
|
||||
|
||||
def getpalette(self):
|
||||
def getpalette(self) -> tuple[bytes, str]:
|
||||
return self.palette, self.rawmode
|
||||
|
|
|
@ -341,7 +341,7 @@ class IcoImageFile(ImageFile.ImageFile):
|
|||
|
||||
self.size = im.size
|
||||
|
||||
def load_seek(self, pos):
|
||||
def load_seek(self, pos: int) -> None:
|
||||
# Flag the ImageFile.Parser so that it
|
||||
# just does all the decode at the end.
|
||||
pass
|
||||
|
|
|
@ -271,11 +271,11 @@ class ImImageFile(ImageFile.ImageFile):
|
|||
self.tile = [("raw", (0, 0) + self.size, offs, (self.rawmode, 0, -1))]
|
||||
|
||||
@property
|
||||
def n_frames(self):
|
||||
def n_frames(self) -> int:
|
||||
return self.info[FRAMES]
|
||||
|
||||
@property
|
||||
def is_animated(self):
|
||||
def is_animated(self) -> bool:
|
||||
return self.info[FRAMES] > 1
|
||||
|
||||
def seek(self, frame: int) -> None:
|
||||
|
|
|
@ -34,7 +34,7 @@ from __future__ import annotations
|
|||
import math
|
||||
import numbers
|
||||
import struct
|
||||
from typing import Sequence, cast
|
||||
from typing import TYPE_CHECKING, Sequence, cast
|
||||
|
||||
from . import Image, ImageColor
|
||||
from ._typing import Coords
|
||||
|
@ -92,7 +92,10 @@ class ImageDraw:
|
|||
self.fontmode = "L" # aliasing is okay for other modes
|
||||
self.fill = False
|
||||
|
||||
def getfont(self):
|
||||
if TYPE_CHECKING:
|
||||
from . import ImageFont
|
||||
|
||||
def getfont(self) -> ImageFont.FreeTypeFont | ImageFont.ImageFont:
|
||||
"""
|
||||
Get the current default font.
|
||||
|
||||
|
|
|
@ -324,11 +324,11 @@ class ImageFile(Image.Image):
|
|||
pass
|
||||
|
||||
# may be defined for contained formats
|
||||
# def load_seek(self, pos):
|
||||
# def load_seek(self, pos: int) -> None:
|
||||
# pass
|
||||
|
||||
# may be defined for blocked formats (e.g. PNG)
|
||||
# def load_read(self, read_bytes):
|
||||
# def load_read(self, read_bytes: int) -> bytes:
|
||||
# pass
|
||||
|
||||
def _seek_check(self, frame):
|
||||
|
|
|
@ -544,7 +544,7 @@ class Color3DLUT(MultibandFilter):
|
|||
_copy_table=False,
|
||||
)
|
||||
|
||||
def __repr__(self):
|
||||
def __repr__(self) -> str:
|
||||
r = [
|
||||
f"{self.__class__.__name__} from {self.table.__class__.__name__}",
|
||||
"size={:d}x{:d}x{:d}".format(*self.size),
|
||||
|
|
|
@ -66,7 +66,7 @@ class ImagePalette:
|
|||
def colors(self, colors):
|
||||
self._colors = colors
|
||||
|
||||
def copy(self):
|
||||
def copy(self) -> ImagePalette:
|
||||
new = ImagePalette()
|
||||
|
||||
new.mode = self.mode
|
||||
|
@ -77,7 +77,7 @@ class ImagePalette:
|
|||
|
||||
return new
|
||||
|
||||
def getdata(self):
|
||||
def getdata(self) -> tuple[str, bytes]:
|
||||
"""
|
||||
Get palette contents in format suitable for the low-level
|
||||
``im.putpalette`` primitive.
|
||||
|
@ -88,7 +88,7 @@ class ImagePalette:
|
|||
return self.rawmode, self.palette
|
||||
return self.mode, self.tobytes()
|
||||
|
||||
def tobytes(self):
|
||||
def tobytes(self) -> bytes:
|
||||
"""Convert palette to bytes.
|
||||
|
||||
.. warning:: This method is experimental.
|
||||
|
|
|
@ -136,7 +136,7 @@ class PhotoImage:
|
|||
except Exception:
|
||||
pass # ignore internal errors
|
||||
|
||||
def __str__(self):
|
||||
def __str__(self) -> str:
|
||||
"""
|
||||
Get the Tkinter photo image identifier. This method is automatically
|
||||
called by Tkinter whenever a PhotoImage object is passed to a Tkinter
|
||||
|
@ -146,7 +146,7 @@ class PhotoImage:
|
|||
"""
|
||||
return str(self.__photo)
|
||||
|
||||
def width(self):
|
||||
def width(self) -> int:
|
||||
"""
|
||||
Get the width of the image.
|
||||
|
||||
|
@ -154,7 +154,7 @@ class PhotoImage:
|
|||
"""
|
||||
return self.__size[0]
|
||||
|
||||
def height(self):
|
||||
def height(self) -> int:
|
||||
"""
|
||||
Get the height of the image.
|
||||
|
||||
|
@ -227,7 +227,7 @@ class BitmapImage:
|
|||
except Exception:
|
||||
pass # ignore internal errors
|
||||
|
||||
def width(self):
|
||||
def width(self) -> int:
|
||||
"""
|
||||
Get the width of the image.
|
||||
|
||||
|
@ -235,7 +235,7 @@ class BitmapImage:
|
|||
"""
|
||||
return self.__size[0]
|
||||
|
||||
def height(self):
|
||||
def height(self) -> int:
|
||||
"""
|
||||
Get the height of the image.
|
||||
|
||||
|
@ -243,7 +243,7 @@ class BitmapImage:
|
|||
"""
|
||||
return self.__size[1]
|
||||
|
||||
def __str__(self):
|
||||
def __str__(self) -> str:
|
||||
"""
|
||||
Get the Tkinter bitmap image identifier. This method is automatically
|
||||
called by Tkinter whenever a BitmapImage object is passed to a Tkinter
|
||||
|
|
|
@ -63,12 +63,12 @@ class BoxReader:
|
|||
data = self._read_bytes(size)
|
||||
return struct.unpack(field_format, data)
|
||||
|
||||
def read_boxes(self):
|
||||
def read_boxes(self) -> BoxReader:
|
||||
size = self.remaining_in_box
|
||||
data = self._read_bytes(size)
|
||||
return BoxReader(io.BytesIO(data), size)
|
||||
|
||||
def has_next_box(self):
|
||||
def has_next_box(self) -> bool:
|
||||
if self.has_length:
|
||||
return self.fp.tell() + self.remaining_in_box < self.length
|
||||
else:
|
||||
|
|
|
@ -408,7 +408,7 @@ class JpegImageFile(ImageFile.ImageFile):
|
|||
msg = "no marker found"
|
||||
raise SyntaxError(msg)
|
||||
|
||||
def load_read(self, read_bytes):
|
||||
def load_read(self, read_bytes: int) -> bytes:
|
||||
"""
|
||||
internal: read more image data
|
||||
For premature EOF and LOAD_TRUNCATED_IMAGES adds EOI marker
|
||||
|
|
|
@ -124,7 +124,7 @@ class MpoImageFile(JpegImagePlugin.JpegImageFile):
|
|||
# for now we can only handle reading and individual frame extraction
|
||||
self.readonly = 1
|
||||
|
||||
def load_seek(self, pos):
|
||||
def load_seek(self, pos: int) -> None:
|
||||
self._fp.seek(pos)
|
||||
|
||||
def seek(self, frame: int) -> None:
|
||||
|
|
|
@ -87,10 +87,10 @@ class IndirectReferenceTuple(NamedTuple):
|
|||
|
||||
|
||||
class IndirectReference(IndirectReferenceTuple):
|
||||
def __str__(self):
|
||||
def __str__(self) -> str:
|
||||
return f"{self.object_id} {self.generation} R"
|
||||
|
||||
def __bytes__(self):
|
||||
def __bytes__(self) -> bytes:
|
||||
return self.__str__().encode("us-ascii")
|
||||
|
||||
def __eq__(self, other):
|
||||
|
@ -108,7 +108,7 @@ class IndirectReference(IndirectReferenceTuple):
|
|||
|
||||
|
||||
class IndirectObjectDef(IndirectReference):
|
||||
def __str__(self):
|
||||
def __str__(self) -> str:
|
||||
return f"{self.object_id} {self.generation} obj"
|
||||
|
||||
|
||||
|
@ -150,7 +150,7 @@ class XrefTable:
|
|||
def __contains__(self, key):
|
||||
return key in self.existing_entries or key in self.new_entries
|
||||
|
||||
def __len__(self):
|
||||
def __len__(self) -> int:
|
||||
return len(
|
||||
set(self.existing_entries.keys())
|
||||
| set(self.new_entries.keys())
|
||||
|
@ -211,7 +211,7 @@ class PdfName:
|
|||
else:
|
||||
self.name = name.encode("us-ascii")
|
||||
|
||||
def name_as_str(self):
|
||||
def name_as_str(self) -> str:
|
||||
return self.name.decode("us-ascii")
|
||||
|
||||
def __eq__(self, other):
|
||||
|
@ -222,7 +222,7 @@ class PdfName:
|
|||
def __hash__(self):
|
||||
return hash(self.name)
|
||||
|
||||
def __repr__(self):
|
||||
def __repr__(self) -> str:
|
||||
return f"{self.__class__.__name__}({repr(self.name)})"
|
||||
|
||||
@classmethod
|
||||
|
@ -231,7 +231,7 @@ class PdfName:
|
|||
|
||||
allowed_chars = set(range(33, 127)) - {ord(c) for c in "#%/()<>[]{}"}
|
||||
|
||||
def __bytes__(self):
|
||||
def __bytes__(self) -> bytes:
|
||||
result = bytearray(b"/")
|
||||
for b in self.name:
|
||||
if b in self.allowed_chars:
|
||||
|
@ -242,7 +242,7 @@ class PdfName:
|
|||
|
||||
|
||||
class PdfArray(List[Any]):
|
||||
def __bytes__(self):
|
||||
def __bytes__(self) -> bytes:
|
||||
return b"[ " + b" ".join(pdf_repr(x) for x in self) + b" ]"
|
||||
|
||||
|
||||
|
@ -286,7 +286,7 @@ class PdfDict(_DictBase):
|
|||
value = time.gmtime(calendar.timegm(value) + offset)
|
||||
return value
|
||||
|
||||
def __bytes__(self):
|
||||
def __bytes__(self) -> bytes:
|
||||
out = bytearray(b"<<")
|
||||
for key, value in self.items():
|
||||
if value is None:
|
||||
|
@ -304,7 +304,7 @@ class PdfBinary:
|
|||
def __init__(self, data):
|
||||
self.data = data
|
||||
|
||||
def __bytes__(self):
|
||||
def __bytes__(self) -> bytes:
|
||||
return b"<%s>" % b"".join(b"%02X" % b for b in self.data)
|
||||
|
||||
|
||||
|
|
|
@ -39,6 +39,7 @@ import struct
|
|||
import warnings
|
||||
import zlib
|
||||
from enum import IntEnum
|
||||
from typing import IO
|
||||
|
||||
from . import Image, ImageChops, ImageFile, ImagePalette, ImageSequence
|
||||
from ._binary import i16be as i16
|
||||
|
@ -149,14 +150,15 @@ def _crc32(data, seed=0):
|
|||
|
||||
|
||||
class ChunkStream:
|
||||
def __init__(self, fp):
|
||||
self.fp = fp
|
||||
self.queue = []
|
||||
def __init__(self, fp: IO[bytes]) -> None:
|
||||
self.fp: IO[bytes] | None = fp
|
||||
self.queue: list[tuple[bytes, int, int]] | None = []
|
||||
|
||||
def read(self):
|
||||
def read(self) -> tuple[bytes, int, int]:
|
||||
"""Fetch a new chunk. Returns header information."""
|
||||
cid = None
|
||||
|
||||
assert self.fp is not None
|
||||
if self.queue:
|
||||
cid, pos, length = self.queue.pop()
|
||||
self.fp.seek(pos)
|
||||
|
@ -173,7 +175,7 @@ class ChunkStream:
|
|||
|
||||
return cid, pos, length
|
||||
|
||||
def __enter__(self):
|
||||
def __enter__(self) -> ChunkStream:
|
||||
return self
|
||||
|
||||
def __exit__(self, *args):
|
||||
|
@ -182,7 +184,8 @@ class ChunkStream:
|
|||
def close(self) -> None:
|
||||
self.queue = self.fp = None
|
||||
|
||||
def push(self, cid, pos, length):
|
||||
def push(self, cid: bytes, pos: int, length: int) -> None:
|
||||
assert self.queue is not None
|
||||
self.queue.append((cid, pos, length))
|
||||
|
||||
def call(self, cid, pos, length):
|
||||
|
@ -191,7 +194,7 @@ class ChunkStream:
|
|||
logger.debug("STREAM %r %s %s", cid, pos, length)
|
||||
return getattr(self, f"chunk_{cid.decode('ascii')}")(pos, length)
|
||||
|
||||
def crc(self, cid, data):
|
||||
def crc(self, cid: bytes, data: bytes) -> None:
|
||||
"""Read and verify checksum"""
|
||||
|
||||
# Skip CRC checks for ancillary chunks if allowed to load truncated
|
||||
|
@ -201,6 +204,7 @@ class ChunkStream:
|
|||
self.crc_skip(cid, data)
|
||||
return
|
||||
|
||||
assert self.fp is not None
|
||||
try:
|
||||
crc1 = _crc32(data, _crc32(cid))
|
||||
crc2 = i32(self.fp.read(4))
|
||||
|
@ -211,12 +215,13 @@ class ChunkStream:
|
|||
msg = f"broken PNG file (incomplete checksum in {repr(cid)})"
|
||||
raise SyntaxError(msg) from e
|
||||
|
||||
def crc_skip(self, cid, data):
|
||||
def crc_skip(self, cid: bytes, data: bytes) -> None:
|
||||
"""Read checksum"""
|
||||
|
||||
assert self.fp is not None
|
||||
self.fp.read(4)
|
||||
|
||||
def verify(self, endchunk=b"IEND"):
|
||||
def verify(self, endchunk: bytes = b"IEND") -> list[bytes]:
|
||||
# Simple approach; just calculate checksum for all remaining
|
||||
# blocks. Must be called directly after open.
|
||||
|
||||
|
@ -361,7 +366,7 @@ class PngStream(ChunkStream):
|
|||
|
||||
self.text_memory = 0
|
||||
|
||||
def check_text_memory(self, chunklen):
|
||||
def check_text_memory(self, chunklen: int) -> None:
|
||||
self.text_memory += chunklen
|
||||
if self.text_memory > MAX_TEXT_MEMORY:
|
||||
msg = (
|
||||
|
@ -382,7 +387,7 @@ class PngStream(ChunkStream):
|
|||
self.im_tile = self.rewind_state["tile"]
|
||||
self._seq_num = self.rewind_state["seq_num"]
|
||||
|
||||
def chunk_iCCP(self, pos, length):
|
||||
def chunk_iCCP(self, pos: int, length: int) -> bytes:
|
||||
# ICC profile
|
||||
s = ImageFile._safe_read(self.fp, length)
|
||||
# according to PNG spec, the iCCP chunk contains:
|
||||
|
@ -409,7 +414,7 @@ class PngStream(ChunkStream):
|
|||
self.im_info["icc_profile"] = icc_profile
|
||||
return s
|
||||
|
||||
def chunk_IHDR(self, pos, length):
|
||||
def chunk_IHDR(self, pos: int, length: int) -> bytes:
|
||||
# image header
|
||||
s = ImageFile._safe_read(self.fp, length)
|
||||
if length < 13:
|
||||
|
@ -446,14 +451,14 @@ class PngStream(ChunkStream):
|
|||
msg = "end of PNG image"
|
||||
raise EOFError(msg)
|
||||
|
||||
def chunk_PLTE(self, pos, length):
|
||||
def chunk_PLTE(self, pos: int, length: int) -> bytes:
|
||||
# palette
|
||||
s = ImageFile._safe_read(self.fp, length)
|
||||
if self.im_mode == "P":
|
||||
self.im_palette = "RGB", s
|
||||
return s
|
||||
|
||||
def chunk_tRNS(self, pos, length):
|
||||
def chunk_tRNS(self, pos: int, length: int) -> bytes:
|
||||
# transparency
|
||||
s = ImageFile._safe_read(self.fp, length)
|
||||
if self.im_mode == "P":
|
||||
|
@ -473,13 +478,13 @@ class PngStream(ChunkStream):
|
|||
self.im_info["transparency"] = i16(s), i16(s, 2), i16(s, 4)
|
||||
return s
|
||||
|
||||
def chunk_gAMA(self, pos, length):
|
||||
def chunk_gAMA(self, pos: int, length: int) -> bytes:
|
||||
# gamma setting
|
||||
s = ImageFile._safe_read(self.fp, length)
|
||||
self.im_info["gamma"] = i32(s) / 100000.0
|
||||
return s
|
||||
|
||||
def chunk_cHRM(self, pos, length):
|
||||
def chunk_cHRM(self, pos: int, length: int) -> bytes:
|
||||
# chromaticity, 8 unsigned ints, actual value is scaled by 100,000
|
||||
# WP x,y, Red x,y, Green x,y Blue x,y
|
||||
|
||||
|
@ -488,7 +493,7 @@ class PngStream(ChunkStream):
|
|||
self.im_info["chromaticity"] = tuple(elt / 100000.0 for elt in raw_vals)
|
||||
return s
|
||||
|
||||
def chunk_sRGB(self, pos, length):
|
||||
def chunk_sRGB(self, pos: int, length: int) -> bytes:
|
||||
# srgb rendering intent, 1 byte
|
||||
# 0 perceptual
|
||||
# 1 relative colorimetric
|
||||
|
@ -504,7 +509,7 @@ class PngStream(ChunkStream):
|
|||
self.im_info["srgb"] = s[0]
|
||||
return s
|
||||
|
||||
def chunk_pHYs(self, pos, length):
|
||||
def chunk_pHYs(self, pos: int, length: int) -> bytes:
|
||||
# pixels per unit
|
||||
s = ImageFile._safe_read(self.fp, length)
|
||||
if length < 9:
|
||||
|
@ -521,7 +526,7 @@ class PngStream(ChunkStream):
|
|||
self.im_info["aspect"] = px, py
|
||||
return s
|
||||
|
||||
def chunk_tEXt(self, pos, length):
|
||||
def chunk_tEXt(self, pos: int, length: int) -> bytes:
|
||||
# text
|
||||
s = ImageFile._safe_read(self.fp, length)
|
||||
try:
|
||||
|
@ -540,7 +545,7 @@ class PngStream(ChunkStream):
|
|||
|
||||
return s
|
||||
|
||||
def chunk_zTXt(self, pos, length):
|
||||
def chunk_zTXt(self, pos: int, length: int) -> bytes:
|
||||
# compressed text
|
||||
s = ImageFile._safe_read(self.fp, length)
|
||||
try:
|
||||
|
@ -574,7 +579,7 @@ class PngStream(ChunkStream):
|
|||
|
||||
return s
|
||||
|
||||
def chunk_iTXt(self, pos, length):
|
||||
def chunk_iTXt(self, pos: int, length: int) -> bytes:
|
||||
# international text
|
||||
r = s = ImageFile._safe_read(self.fp, length)
|
||||
try:
|
||||
|
@ -614,13 +619,13 @@ class PngStream(ChunkStream):
|
|||
|
||||
return s
|
||||
|
||||
def chunk_eXIf(self, pos, length):
|
||||
def chunk_eXIf(self, pos: int, length: int) -> bytes:
|
||||
s = ImageFile._safe_read(self.fp, length)
|
||||
self.im_info["exif"] = b"Exif\x00\x00" + s
|
||||
return s
|
||||
|
||||
# APNG chunks
|
||||
def chunk_acTL(self, pos, length):
|
||||
def chunk_acTL(self, pos: int, length: int) -> bytes:
|
||||
s = ImageFile._safe_read(self.fp, length)
|
||||
if length < 8:
|
||||
if ImageFile.LOAD_TRUNCATED_IMAGES:
|
||||
|
@ -640,7 +645,7 @@ class PngStream(ChunkStream):
|
|||
self.im_custom_mimetype = "image/apng"
|
||||
return s
|
||||
|
||||
def chunk_fcTL(self, pos, length):
|
||||
def chunk_fcTL(self, pos: int, length: int) -> bytes:
|
||||
s = ImageFile._safe_read(self.fp, length)
|
||||
if length < 26:
|
||||
if ImageFile.LOAD_TRUNCATED_IMAGES:
|
||||
|
@ -669,7 +674,7 @@ class PngStream(ChunkStream):
|
|||
self.im_info["blend"] = s[25]
|
||||
return s
|
||||
|
||||
def chunk_fdAT(self, pos, length):
|
||||
def chunk_fdAT(self, pos: int, length: int) -> bytes:
|
||||
if length < 4:
|
||||
if ImageFile.LOAD_TRUNCATED_IMAGES:
|
||||
s = ImageFile._safe_read(self.fp, length)
|
||||
|
@ -701,7 +706,7 @@ class PngImageFile(ImageFile.ImageFile):
|
|||
format = "PNG"
|
||||
format_description = "Portable network graphics"
|
||||
|
||||
def _open(self):
|
||||
def _open(self) -> None:
|
||||
if not _accept(self.fp.read(8)):
|
||||
msg = "not a PNG file"
|
||||
raise SyntaxError(msg)
|
||||
|
@ -711,8 +716,8 @@ class PngImageFile(ImageFile.ImageFile):
|
|||
#
|
||||
# Parse headers up to the first IDAT or fDAT chunk
|
||||
|
||||
self.private_chunks = []
|
||||
self.png = PngStream(self.fp)
|
||||
self.private_chunks: list[tuple[bytes, bytes] | tuple[bytes, bytes, bool]] = []
|
||||
self.png: PngStream | None = PngStream(self.fp)
|
||||
|
||||
while True:
|
||||
#
|
||||
|
@ -793,6 +798,7 @@ class PngImageFile(ImageFile.ImageFile):
|
|||
# back up to beginning of IDAT block
|
||||
self.fp.seek(self.tile[0][2] - 8)
|
||||
|
||||
assert self.png is not None
|
||||
self.png.verify()
|
||||
self.png.close()
|
||||
|
||||
|
@ -921,9 +927,10 @@ class PngImageFile(ImageFile.ImageFile):
|
|||
self.__idat = self.__prepare_idat # used by load_read()
|
||||
ImageFile.ImageFile.load_prepare(self)
|
||||
|
||||
def load_read(self, read_bytes):
|
||||
def load_read(self, read_bytes: int) -> bytes:
|
||||
"""internal: read more image data"""
|
||||
|
||||
assert self.png is not None
|
||||
while self.__idat == 0:
|
||||
# end of chunk, skip forward to next one
|
||||
|
||||
|
@ -956,6 +963,7 @@ class PngImageFile(ImageFile.ImageFile):
|
|||
|
||||
def load_end(self) -> None:
|
||||
"""internal: finished reading image data"""
|
||||
assert self.png is not None
|
||||
if self.__idat != 0:
|
||||
self.fp.read(self.__idat)
|
||||
while True:
|
||||
|
@ -1079,7 +1087,7 @@ class _idat:
|
|||
self.fp = fp
|
||||
self.chunk = chunk
|
||||
|
||||
def write(self, data):
|
||||
def write(self, data: bytes) -> None:
|
||||
self.chunk(self.fp, b"IDAT", data)
|
||||
|
||||
|
||||
|
@ -1091,7 +1099,7 @@ class _fdat:
|
|||
self.chunk = chunk
|
||||
self.seq_num = seq_num
|
||||
|
||||
def write(self, data):
|
||||
def write(self, data: bytes) -> None:
|
||||
self.chunk(self.fp, b"fdAT", o32(self.seq_num), data)
|
||||
self.seq_num += 1
|
||||
|
||||
|
@ -1436,10 +1444,10 @@ def getchunks(im, **params):
|
|||
class collector:
|
||||
data = []
|
||||
|
||||
def write(self, data):
|
||||
def write(self, data: bytes) -> None:
|
||||
pass
|
||||
|
||||
def append(self, chunk):
|
||||
def append(self, chunk: bytes) -> None:
|
||||
self.data.append(chunk)
|
||||
|
||||
def append(fp, cid, *data):
|
||||
|
|
|
@ -37,6 +37,7 @@ from __future__ import annotations
|
|||
import os
|
||||
import struct
|
||||
import sys
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
from . import Image, ImageFile
|
||||
|
||||
|
@ -157,11 +158,11 @@ class SpiderImageFile(ImageFile.ImageFile):
|
|||
self._fp = self.fp # FIXME: hack
|
||||
|
||||
@property
|
||||
def n_frames(self):
|
||||
def n_frames(self) -> int:
|
||||
return self._nimages
|
||||
|
||||
@property
|
||||
def is_animated(self):
|
||||
def is_animated(self) -> bool:
|
||||
return self._nimages > 1
|
||||
|
||||
# 1st image index is zero (although SPIDER imgnumber starts at 1)
|
||||
|
@ -191,8 +192,11 @@ class SpiderImageFile(ImageFile.ImageFile):
|
|||
b = -m * minimum
|
||||
return self.point(lambda i, m=m, b=b: i * m + b).convert("L")
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from . import ImageTk
|
||||
|
||||
# returns a ImageTk.PhotoImage object, after rescaling to 0..255
|
||||
def tkPhotoImage(self):
|
||||
def tkPhotoImage(self) -> ImageTk.PhotoImage:
|
||||
from . import ImageTk
|
||||
|
||||
return ImageTk.PhotoImage(self.convert2byte(), palette=256)
|
||||
|
|
|
@ -381,7 +381,7 @@ class IFDRational(Rational):
|
|||
f = self._val.limit_denominator(max_denominator)
|
||||
return f.numerator, f.denominator
|
||||
|
||||
def __repr__(self):
|
||||
def __repr__(self) -> str:
|
||||
return str(float(self._val))
|
||||
|
||||
def __hash__(self):
|
||||
|
@ -603,7 +603,7 @@ class ImageFileDirectory_v2(_IFDv2Base):
|
|||
self._next = None
|
||||
self._offset = None
|
||||
|
||||
def __str__(self):
|
||||
def __str__(self) -> str:
|
||||
return str(dict(self))
|
||||
|
||||
def named(self):
|
||||
|
@ -617,7 +617,7 @@ class ImageFileDirectory_v2(_IFDv2Base):
|
|||
for code, value in self.items()
|
||||
}
|
||||
|
||||
def __len__(self):
|
||||
def __len__(self) -> int:
|
||||
return len(set(self._tagdata) | set(self._tags_v2))
|
||||
|
||||
def __getitem__(self, tag):
|
||||
|
@ -1041,7 +1041,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2):
|
|||
ifd.next = original.next # an indicator for multipage tiffs
|
||||
return ifd
|
||||
|
||||
def to_v2(self):
|
||||
def to_v2(self) -> ImageFileDirectory_v2:
|
||||
"""Returns an
|
||||
:py:class:`~PIL.TiffImagePlugin.ImageFileDirectory_v2`
|
||||
instance with the same data as is contained in the original
|
||||
|
@ -1061,7 +1061,7 @@ class ImageFileDirectory_v1(ImageFileDirectory_v2):
|
|||
def __contains__(self, tag):
|
||||
return tag in self._tags_v1 or tag in self._tagdata
|
||||
|
||||
def __len__(self):
|
||||
def __len__(self) -> int:
|
||||
return len(set(self._tagdata) | set(self._tags_v1))
|
||||
|
||||
def __iter__(self):
|
||||
|
@ -1154,7 +1154,7 @@ class TiffImageFile(ImageFile.ImageFile):
|
|||
Image._decompression_bomb_check(self.size)
|
||||
self.im = Image.core.new(self.mode, self.size)
|
||||
|
||||
def _seek(self, frame):
|
||||
def _seek(self, frame: int) -> None:
|
||||
self.fp = self._fp
|
||||
|
||||
# reset buffered io handle in case fp
|
||||
|
@ -2003,7 +2003,7 @@ class AppendingTiffWriter:
|
|||
self.close()
|
||||
return False
|
||||
|
||||
def tell(self):
|
||||
def tell(self) -> int:
|
||||
return self.f.tell() - self.offsetOfNewPage
|
||||
|
||||
def seek(self, offset, whence=io.SEEK_SET):
|
||||
|
|
|
@ -144,7 +144,7 @@ class WebPImageFile(ImageFile.ImageFile):
|
|||
timestamp -= duration
|
||||
return data, timestamp, duration
|
||||
|
||||
def _seek(self, frame):
|
||||
def _seek(self, frame: int) -> None:
|
||||
if self.__physical_frame == frame:
|
||||
return # Nothing to do
|
||||
if frame < self.__physical_frame:
|
||||
|
@ -171,7 +171,7 @@ class WebPImageFile(ImageFile.ImageFile):
|
|||
|
||||
return super().load()
|
||||
|
||||
def load_seek(self, pos):
|
||||
def load_seek(self, pos: int) -> None:
|
||||
pass
|
||||
|
||||
def tell(self) -> int:
|
||||
|
|
|
@ -103,16 +103,13 @@ class XpmImageFile(ImageFile.ImageFile):
|
|||
|
||||
self.tile = [("raw", (0, 0) + self.size, self.fp.tell(), ("P", 0, 1))]
|
||||
|
||||
def load_read(self, read_bytes):
|
||||
def load_read(self, read_bytes: int) -> bytes:
|
||||
#
|
||||
# load all image data in one chunk
|
||||
|
||||
xsize, ysize = self.size
|
||||
|
||||
s = [None] * ysize
|
||||
|
||||
for i in range(ysize):
|
||||
s[i] = self.fp.readline()[1 : xsize + 1].ljust(xsize)
|
||||
s = [self.fp.readline()[1 : xsize + 1].ljust(xsize) for i in range(ysize)]
|
||||
|
||||
return b"".join(s)
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ modules = {
|
|||
}
|
||||
|
||||
|
||||
def check_module(feature):
|
||||
def check_module(feature: str) -> bool:
|
||||
"""
|
||||
Checks if a module is available.
|
||||
|
||||
|
@ -42,7 +42,7 @@ def check_module(feature):
|
|||
return False
|
||||
|
||||
|
||||
def version_module(feature):
|
||||
def version_module(feature: str) -> str | None:
|
||||
"""
|
||||
:param feature: The module to check for.
|
||||
:returns:
|
||||
|
@ -54,13 +54,10 @@ def version_module(feature):
|
|||
|
||||
module, ver = modules[feature]
|
||||
|
||||
if ver is None:
|
||||
return None
|
||||
|
||||
return getattr(__import__(module, fromlist=[ver]), ver)
|
||||
|
||||
|
||||
def get_supported_modules():
|
||||
def get_supported_modules() -> list[str]:
|
||||
"""
|
||||
:returns: A list of all supported modules.
|
||||
"""
|
||||
|
@ -75,7 +72,7 @@ codecs = {
|
|||
}
|
||||
|
||||
|
||||
def check_codec(feature):
|
||||
def check_codec(feature: str) -> bool:
|
||||
"""
|
||||
Checks if a codec is available.
|
||||
|
||||
|
@ -92,7 +89,7 @@ def check_codec(feature):
|
|||
return f"{codec}_encoder" in dir(Image.core)
|
||||
|
||||
|
||||
def version_codec(feature):
|
||||
def version_codec(feature: str) -> str | None:
|
||||
"""
|
||||
:param feature: The codec to check for.
|
||||
:returns:
|
||||
|
@ -113,7 +110,7 @@ def version_codec(feature):
|
|||
return version
|
||||
|
||||
|
||||
def get_supported_codecs():
|
||||
def get_supported_codecs() -> list[str]:
|
||||
"""
|
||||
:returns: A list of all supported codecs.
|
||||
"""
|
||||
|
@ -133,7 +130,7 @@ features = {
|
|||
}
|
||||
|
||||
|
||||
def check_feature(feature):
|
||||
def check_feature(feature: str) -> bool | None:
|
||||
"""
|
||||
Checks if a feature is available.
|
||||
|
||||
|
@ -157,7 +154,7 @@ def check_feature(feature):
|
|||
return None
|
||||
|
||||
|
||||
def version_feature(feature):
|
||||
def version_feature(feature: str) -> str | None:
|
||||
"""
|
||||
:param feature: The feature to check for.
|
||||
:returns: The version number as a string, or ``None`` if not available.
|
||||
|
@ -174,14 +171,14 @@ def version_feature(feature):
|
|||
return getattr(__import__(module, fromlist=[ver]), ver)
|
||||
|
||||
|
||||
def get_supported_features():
|
||||
def get_supported_features() -> list[str]:
|
||||
"""
|
||||
:returns: A list of all supported features.
|
||||
"""
|
||||
return [f for f in features if check_feature(f)]
|
||||
|
||||
|
||||
def check(feature):
|
||||
def check(feature: str) -> bool | None:
|
||||
"""
|
||||
:param feature: A module, codec, or feature name.
|
||||
:returns:
|
||||
|
@ -199,7 +196,7 @@ def check(feature):
|
|||
return False
|
||||
|
||||
|
||||
def version(feature):
|
||||
def version(feature: str) -> str | None:
|
||||
"""
|
||||
:param feature:
|
||||
The module, codec, or feature to check for.
|
||||
|
@ -215,7 +212,7 @@ def version(feature):
|
|||
return None
|
||||
|
||||
|
||||
def get_supported():
|
||||
def get_supported() -> list[str]:
|
||||
"""
|
||||
:returns: A list of all supported modules, features, and codecs.
|
||||
"""
|
||||
|
|
|
@ -128,14 +128,7 @@ PyImagingPhotoPut(
|
|||
block.pixelPtr = (unsigned char *)im->block;
|
||||
|
||||
TK_PHOTO_PUT_BLOCK(
|
||||
interp,
|
||||
photo,
|
||||
&block,
|
||||
0,
|
||||
0,
|
||||
block.width,
|
||||
block.height,
|
||||
TK_PHOTO_COMPOSITE_SET);
|
||||
interp, photo, &block, 0, 0, block.width, block.height, TK_PHOTO_COMPOSITE_SET);
|
||||
|
||||
return TCL_OK;
|
||||
}
|
||||
|
@ -287,7 +280,7 @@ load_tkinter_funcs(void) {
|
|||
* Return 0 for success, non-zero for failure.
|
||||
*/
|
||||
|
||||
HMODULE* hMods = NULL;
|
||||
HMODULE *hMods = NULL;
|
||||
HANDLE hProcess;
|
||||
DWORD cbNeeded;
|
||||
unsigned int i;
|
||||
|
@ -313,7 +306,7 @@ load_tkinter_funcs(void) {
|
|||
#endif
|
||||
return 1;
|
||||
}
|
||||
if (!(hMods = (HMODULE*) malloc(cbNeeded))) {
|
||||
if (!(hMods = (HMODULE *)malloc(cbNeeded))) {
|
||||
PyErr_NoMemory();
|
||||
return 1;
|
||||
}
|
||||
|
@ -345,7 +338,7 @@ load_tkinter_funcs(void) {
|
|||
} else if (found_tk == 0) {
|
||||
PyErr_SetString(PyExc_RuntimeError, "Could not find Tk routines");
|
||||
}
|
||||
return (int) ((found_tcl != 1) || (found_tk != 1));
|
||||
return (int)((found_tcl != 1) || (found_tk != 1));
|
||||
}
|
||||
|
||||
#else /* not Windows */
|
||||
|
@ -400,8 +393,8 @@ _func_loader(void *lib) {
|
|||
return 1;
|
||||
}
|
||||
return (
|
||||
(TK_PHOTO_PUT_BLOCK =
|
||||
(Tk_PhotoPutBlock_t)_dfunc(lib, "Tk_PhotoPutBlock")) == NULL);
|
||||
(TK_PHOTO_PUT_BLOCK = (Tk_PhotoPutBlock_t)_dfunc(lib, "Tk_PhotoPutBlock")) ==
|
||||
NULL);
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
@ -110,7 +110,7 @@
|
|||
|
||||
#define B16(p, i) ((((int)p[(i)]) << 8) + p[(i) + 1])
|
||||
#define L16(p, i) ((((int)p[(i) + 1]) << 8) + p[(i)])
|
||||
#define S16(v) ((v) < 32768 ? (v) : ((v)-65536))
|
||||
#define S16(v) ((v) < 32768 ? (v) : ((v) - 65536))
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/* OBJECT ADMINISTRATION */
|
||||
|
@ -533,7 +533,9 @@ getink(PyObject *color, Imaging im, char *ink) {
|
|||
/* unsigned integer, single layer */
|
||||
if (rIsInt != 1) {
|
||||
if (tupleSize != 1) {
|
||||
PyErr_SetString(PyExc_TypeError, "color must be int or single-element tuple");
|
||||
PyErr_SetString(
|
||||
PyExc_TypeError,
|
||||
"color must be int or single-element tuple");
|
||||
return NULL;
|
||||
} else if (!PyArg_ParseTuple(color, "L", &r)) {
|
||||
return NULL;
|
||||
|
@ -552,7 +554,9 @@ getink(PyObject *color, Imaging im, char *ink) {
|
|||
a = 255;
|
||||
if (im->bands == 2) {
|
||||
if (tupleSize != 1 && tupleSize != 2) {
|
||||
PyErr_SetString(PyExc_TypeError, "color must be int, or tuple of one or two elements");
|
||||
PyErr_SetString(
|
||||
PyExc_TypeError,
|
||||
"color must be int, or tuple of one or two elements");
|
||||
return NULL;
|
||||
} else if (!PyArg_ParseTuple(color, "L|i", &r, &a)) {
|
||||
return NULL;
|
||||
|
@ -560,7 +564,10 @@ getink(PyObject *color, Imaging im, char *ink) {
|
|||
g = b = r;
|
||||
} else {
|
||||
if (tupleSize != 3 && tupleSize != 4) {
|
||||
PyErr_SetString(PyExc_TypeError, "color must be int, or tuple of one, three or four elements");
|
||||
PyErr_SetString(
|
||||
PyExc_TypeError,
|
||||
"color must be int, or tuple of one, three or four "
|
||||
"elements");
|
||||
return NULL;
|
||||
} else if (!PyArg_ParseTuple(color, "Lii|i", &r, &g, &b, &a)) {
|
||||
return NULL;
|
||||
|
@ -599,7 +606,9 @@ getink(PyObject *color, Imaging im, char *ink) {
|
|||
g = (UINT8)(r >> 8);
|
||||
r = (UINT8)r;
|
||||
} else if (tupleSize != 3) {
|
||||
PyErr_SetString(PyExc_TypeError, "color must be int, or tuple of one or three elements");
|
||||
PyErr_SetString(
|
||||
PyExc_TypeError,
|
||||
"color must be int, or tuple of one or three elements");
|
||||
return NULL;
|
||||
} else if (!PyArg_ParseTuple(color, "iiL", &b, &g, &r)) {
|
||||
return NULL;
|
||||
|
@ -1537,14 +1546,14 @@ _putdata(ImagingObject *self, PyObject *args) {
|
|||
return NULL;
|
||||
}
|
||||
|
||||
#define set_value_to_item(seq, i) \
|
||||
op = PySequence_Fast_GET_ITEM(seq, i); \
|
||||
if (PySequence_Check(op)) { \
|
||||
PyErr_SetString(PyExc_TypeError, "sequence must be flattened"); \
|
||||
return NULL; \
|
||||
} else { \
|
||||
value = PyFloat_AsDouble(op); \
|
||||
}
|
||||
#define set_value_to_item(seq, i) \
|
||||
op = PySequence_Fast_GET_ITEM(seq, i); \
|
||||
if (PySequence_Check(op)) { \
|
||||
PyErr_SetString(PyExc_TypeError, "sequence must be flattened"); \
|
||||
return NULL; \
|
||||
} else { \
|
||||
value = PyFloat_AsDouble(op); \
|
||||
}
|
||||
if (image->image8) {
|
||||
if (PyBytes_Check(data)) {
|
||||
unsigned char *p;
|
||||
|
@ -1596,8 +1605,10 @@ if (PySequence_Check(op)) { \
|
|||
value = value * scale + offset;
|
||||
}
|
||||
if (image->type == IMAGING_TYPE_SPECIAL) {
|
||||
image->image8[y][x * 2 + (bigendian ? 1 : 0)] = CLIP8((int)value % 256);
|
||||
image->image8[y][x * 2 + (bigendian ? 0 : 1)] = CLIP8((int)value >> 8);
|
||||
image->image8[y][x * 2 + (bigendian ? 1 : 0)] =
|
||||
CLIP8((int)value % 256);
|
||||
image->image8[y][x * 2 + (bigendian ? 0 : 1)] =
|
||||
CLIP8((int)value >> 8);
|
||||
} else {
|
||||
image->image8[y][x] = (UINT8)CLIP8(value);
|
||||
}
|
||||
|
@ -1639,8 +1650,7 @@ if (PySequence_Check(op)) { \
|
|||
for (i = x = y = 0; i < n; i++) {
|
||||
double value;
|
||||
set_value_to_item(seq, i);
|
||||
IMAGING_PIXEL_INT32(image, x, y) =
|
||||
(INT32)(value * scale + offset);
|
||||
IMAGING_PIXEL_INT32(image, x, y) = (INT32)(value * scale + offset);
|
||||
if (++x >= (int)image->xsize) {
|
||||
x = 0, y++;
|
||||
}
|
||||
|
@ -2785,8 +2795,8 @@ _font_getmask(ImagingFontObject *self, PyObject *args) {
|
|||
glyph = &self->glyphs[text[i]];
|
||||
if (i == 0 || text[i] != text[i - 1]) {
|
||||
ImagingDelete(bitmap);
|
||||
bitmap =
|
||||
ImagingCrop(self->bitmap, glyph->sx0, glyph->sy0, glyph->sx1, glyph->sy1);
|
||||
bitmap = ImagingCrop(
|
||||
self->bitmap, glyph->sx0, glyph->sy0, glyph->sx1, glyph->sy1);
|
||||
if (!bitmap) {
|
||||
goto failed;
|
||||
}
|
||||
|
@ -3315,7 +3325,8 @@ _draw_polygon(ImagingDrawObject *self, PyObject *args) {
|
|||
|
||||
free(xy);
|
||||
|
||||
if (ImagingDrawPolygon(self->image->image, n, ixy, &ink, fill, width, self->blend) < 0) {
|
||||
if (ImagingDrawPolygon(self->image->image, n, ixy, &ink, fill, width, self->blend) <
|
||||
0) {
|
||||
free(ixy);
|
||||
return NULL;
|
||||
}
|
||||
|
@ -4411,7 +4422,8 @@ setup_module(PyObject *m) {
|
|||
PyModule_AddObject(m, "HAVE_XCB", have_xcb);
|
||||
|
||||
PyObject *pillow_version = PyUnicode_FromString(version);
|
||||
PyDict_SetItemString(d, "PILLOW_VERSION", pillow_version ? pillow_version : Py_None);
|
||||
PyDict_SetItemString(
|
||||
d, "PILLOW_VERSION", pillow_version ? pillow_version : Py_None);
|
||||
Py_XDECREF(pillow_version);
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -213,11 +213,8 @@ cms_transform_dealloc(CmsTransformObject *self) {
|
|||
|
||||
static cmsUInt32Number
|
||||
findLCMStype(char *PILmode) {
|
||||
if (
|
||||
strcmp(PILmode, "RGB") == 0 ||
|
||||
strcmp(PILmode, "RGBA") == 0 ||
|
||||
strcmp(PILmode, "RGBX") == 0
|
||||
) {
|
||||
if (strcmp(PILmode, "RGB") == 0 || strcmp(PILmode, "RGBA") == 0 ||
|
||||
strcmp(PILmode, "RGBX") == 0) {
|
||||
return TYPE_RGBA_8;
|
||||
}
|
||||
if (strcmp(PILmode, "RGBA;16B") == 0) {
|
||||
|
@ -232,10 +229,7 @@ findLCMStype(char *PILmode) {
|
|||
if (strcmp(PILmode, "L;16B") == 0) {
|
||||
return TYPE_GRAY_16_SE;
|
||||
}
|
||||
if (
|
||||
strcmp(PILmode, "YCCA") == 0 ||
|
||||
strcmp(PILmode, "YCC") == 0
|
||||
) {
|
||||
if (strcmp(PILmode, "YCCA") == 0 || strcmp(PILmode, "YCC") == 0) {
|
||||
return TYPE_YCbCr_8;
|
||||
}
|
||||
if (strcmp(PILmode, "LAB") == 0) {
|
||||
|
@ -391,7 +385,7 @@ _buildTransform(
|
|||
iRenderingIntent,
|
||||
cmsFLAGS);
|
||||
|
||||
Py_END_ALLOW_THREADS
|
||||
Py_END_ALLOW_THREADS;
|
||||
|
||||
if (!hTransform) {
|
||||
PyErr_SetString(PyExc_ValueError, "cannot build transform");
|
||||
|
@ -425,7 +419,7 @@ _buildProofTransform(
|
|||
iProofIntent,
|
||||
cmsFLAGS);
|
||||
|
||||
Py_END_ALLOW_THREADS
|
||||
Py_END_ALLOW_THREADS;
|
||||
|
||||
if (!hTransform) {
|
||||
PyErr_SetString(PyExc_ValueError, "cannot build proof transform");
|
||||
|
@ -622,7 +616,7 @@ cms_profile_is_intent_supported(CmsProfileObject *self, PyObject *args) {
|
|||
static PyObject *
|
||||
cms_get_display_profile_win32(PyObject *self, PyObject *args) {
|
||||
char filename[MAX_PATH];
|
||||
cmsUInt32Number filename_size;
|
||||
DWORD filename_size;
|
||||
BOOL ok;
|
||||
|
||||
HANDLE handle = 0;
|
||||
|
|
127
src/_imagingft.c
127
src/_imagingft.c
|
@ -47,17 +47,17 @@
|
|||
;
|
||||
|
||||
#ifdef HAVE_RAQM
|
||||
# ifdef HAVE_RAQM_SYSTEM
|
||||
# include <raqm.h>
|
||||
# else
|
||||
# include "thirdparty/raqm/raqm.h"
|
||||
# ifdef HAVE_FRIBIDI_SYSTEM
|
||||
# include <fribidi.h>
|
||||
# else
|
||||
# include "thirdparty/fribidi-shim/fribidi.h"
|
||||
# include <hb.h>
|
||||
# endif
|
||||
# endif
|
||||
#ifdef HAVE_RAQM_SYSTEM
|
||||
#include <raqm.h>
|
||||
#else
|
||||
#include "thirdparty/raqm/raqm.h"
|
||||
#ifdef HAVE_FRIBIDI_SYSTEM
|
||||
#include <fribidi.h>
|
||||
#else
|
||||
#include "thirdparty/fribidi-shim/fribidi.h"
|
||||
#include <hb.h>
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
static int have_raqm = 0;
|
||||
|
@ -490,8 +490,7 @@ text_layout(
|
|||
size_t count;
|
||||
#ifdef HAVE_RAQM
|
||||
if (have_raqm && self->layout_engine == LAYOUT_RAQM) {
|
||||
count = text_layout_raqm(
|
||||
string, self, dir, features, lang, glyph_info);
|
||||
count = text_layout_raqm(string, self, dir, features, lang, glyph_info);
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
|
@ -550,7 +549,17 @@ font_getlength(FontObject *self, PyObject *args) {
|
|||
}
|
||||
|
||||
static int
|
||||
bounding_box_and_anchors(FT_Face face, const char *anchor, int horizontal_dir, GlyphInfo *glyph_info, size_t count, int load_flags, int *width, int *height, int *x_offset, int *y_offset) {
|
||||
bounding_box_and_anchors(
|
||||
FT_Face face,
|
||||
const char *anchor,
|
||||
int horizontal_dir,
|
||||
GlyphInfo *glyph_info,
|
||||
size_t count,
|
||||
int load_flags,
|
||||
int *width,
|
||||
int *height,
|
||||
int *x_offset,
|
||||
int *y_offset) {
|
||||
int position; /* pen position along primary axis, in 26.6 precision */
|
||||
int advanced; /* pen position along primary axis, in pixels */
|
||||
int px, py; /* position of current glyph, in pixels */
|
||||
|
@ -558,8 +567,8 @@ bounding_box_and_anchors(FT_Face face, const char *anchor, int horizontal_dir, G
|
|||
int x_anchor, y_anchor; /* offset of point drawn at (0, 0), in pixels */
|
||||
int error;
|
||||
FT_Glyph glyph;
|
||||
FT_BBox bbox; /* glyph bounding box */
|
||||
size_t i; /* glyph_info index */
|
||||
FT_BBox bbox; /* glyph bounding box */
|
||||
size_t i; /* glyph_info index */
|
||||
/*
|
||||
* text bounds are given by:
|
||||
* - bounding boxes of individual glyphs
|
||||
|
@ -654,8 +663,7 @@ bounding_box_and_anchors(FT_Face face, const char *anchor, int horizontal_dir, G
|
|||
break;
|
||||
case 'm': // middle (ascender + descender) / 2
|
||||
y_anchor = PIXEL(
|
||||
(face->size->metrics.ascender +
|
||||
face->size->metrics.descender) /
|
||||
(face->size->metrics.ascender + face->size->metrics.descender) /
|
||||
2);
|
||||
break;
|
||||
case 's': // horizontal baseline
|
||||
|
@ -719,7 +727,7 @@ bad_anchor:
|
|||
static PyObject *
|
||||
font_getsize(FontObject *self, PyObject *args) {
|
||||
int width, height, x_offset, y_offset;
|
||||
int load_flags; /* FreeType load_flags parameter */
|
||||
int load_flags; /* FreeType load_flags parameter */
|
||||
int error;
|
||||
GlyphInfo *glyph_info = NULL; /* computed text layout */
|
||||
size_t count; /* glyph_info length */
|
||||
|
@ -758,7 +766,17 @@ font_getsize(FontObject *self, PyObject *args) {
|
|||
load_flags |= FT_LOAD_COLOR;
|
||||
}
|
||||
|
||||
error = bounding_box_and_anchors(self->face, anchor, horizontal_dir, glyph_info, count, load_flags, &width, &height, &x_offset, &y_offset);
|
||||
error = bounding_box_and_anchors(
|
||||
self->face,
|
||||
anchor,
|
||||
horizontal_dir,
|
||||
glyph_info,
|
||||
count,
|
||||
load_flags,
|
||||
&width,
|
||||
&height,
|
||||
&x_offset,
|
||||
&y_offset);
|
||||
if (glyph_info) {
|
||||
PyMem_Free(glyph_info);
|
||||
glyph_info = NULL;
|
||||
|
@ -767,12 +785,7 @@ font_getsize(FontObject *self, PyObject *args) {
|
|||
return NULL;
|
||||
}
|
||||
|
||||
return Py_BuildValue(
|
||||
"(ii)(ii)",
|
||||
width,
|
||||
height,
|
||||
x_offset,
|
||||
y_offset);
|
||||
return Py_BuildValue("(ii)(ii)", width, height, x_offset, y_offset);
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
|
@ -869,7 +882,17 @@ font_render(FontObject *self, PyObject *args) {
|
|||
|
||||
horizontal_dir = dir && strcmp(dir, "ttb") == 0 ? 0 : 1;
|
||||
|
||||
error = bounding_box_and_anchors(self->face, anchor, horizontal_dir, glyph_info, count, load_flags, &width, &height, &x_offset, &y_offset);
|
||||
error = bounding_box_and_anchors(
|
||||
self->face,
|
||||
anchor,
|
||||
horizontal_dir,
|
||||
glyph_info,
|
||||
count,
|
||||
load_flags,
|
||||
&width,
|
||||
&height,
|
||||
&x_offset,
|
||||
&y_offset);
|
||||
if (error) {
|
||||
PyMem_Del(glyph_info);
|
||||
return NULL;
|
||||
|
@ -1066,17 +1089,26 @@ font_render(FontObject *self, PyObject *args) {
|
|||
/* paste only if source has data */
|
||||
if (src_alpha > 0) {
|
||||
/* unpremultiply BGRa */
|
||||
int src_red = CLIP8((255 * (int)source[k * 4 + 2]) / src_alpha);
|
||||
int src_green = CLIP8((255 * (int)source[k * 4 + 1]) / src_alpha);
|
||||
int src_blue = CLIP8((255 * (int)source[k * 4 + 0]) / src_alpha);
|
||||
int src_red =
|
||||
CLIP8((255 * (int)source[k * 4 + 2]) / src_alpha);
|
||||
int src_green =
|
||||
CLIP8((255 * (int)source[k * 4 + 1]) / src_alpha);
|
||||
int src_blue =
|
||||
CLIP8((255 * (int)source[k * 4 + 0]) / src_alpha);
|
||||
|
||||
/* blend required if target has data */
|
||||
if (target[k * 4 + 3] > 0) {
|
||||
/* blend RGBA colors */
|
||||
target[k * 4 + 0] = BLEND(src_alpha, target[k * 4 + 0], src_red, tmp);
|
||||
target[k * 4 + 1] = BLEND(src_alpha, target[k * 4 + 1], src_green, tmp);
|
||||
target[k * 4 + 2] = BLEND(src_alpha, target[k * 4 + 2], src_blue, tmp);
|
||||
target[k * 4 + 3] = CLIP8(src_alpha + MULDIV255(target[k * 4 + 3], (255 - src_alpha), tmp));
|
||||
target[k * 4 + 0] =
|
||||
BLEND(src_alpha, target[k * 4 + 0], src_red, tmp);
|
||||
target[k * 4 + 1] =
|
||||
BLEND(src_alpha, target[k * 4 + 1], src_green, tmp);
|
||||
target[k * 4 + 2] =
|
||||
BLEND(src_alpha, target[k * 4 + 2], src_blue, tmp);
|
||||
target[k * 4 + 3] = CLIP8(
|
||||
src_alpha +
|
||||
MULDIV255(
|
||||
target[k * 4 + 3], (255 - src_alpha), tmp));
|
||||
} else {
|
||||
/* paste unpremultiplied RGBA values */
|
||||
target[k * 4 + 0] = src_red;
|
||||
|
@ -1093,10 +1125,16 @@ font_render(FontObject *self, PyObject *args) {
|
|||
unsigned int src_alpha = source[k] * convert_scale;
|
||||
if (src_alpha > 0) {
|
||||
if (target[k * 4 + 3] > 0) {
|
||||
target[k * 4 + 0] = BLEND(src_alpha, target[k * 4 + 0], ink[0], tmp);
|
||||
target[k * 4 + 1] = BLEND(src_alpha, target[k * 4 + 1], ink[1], tmp);
|
||||
target[k * 4 + 2] = BLEND(src_alpha, target[k * 4 + 2], ink[2], tmp);
|
||||
target[k * 4 + 3] = CLIP8(src_alpha + MULDIV255(target[k * 4 + 3], (255 - src_alpha), tmp));
|
||||
target[k * 4 + 0] = BLEND(
|
||||
src_alpha, target[k * 4 + 0], ink[0], tmp);
|
||||
target[k * 4 + 1] = BLEND(
|
||||
src_alpha, target[k * 4 + 1], ink[1], tmp);
|
||||
target[k * 4 + 2] = BLEND(
|
||||
src_alpha, target[k * 4 + 2], ink[2], tmp);
|
||||
target[k * 4 + 3] = CLIP8(
|
||||
src_alpha +
|
||||
MULDIV255(
|
||||
target[k * 4 + 3], (255 - src_alpha), tmp));
|
||||
} else {
|
||||
target[k * 4 + 0] = ink[0];
|
||||
target[k * 4 + 1] = ink[1];
|
||||
|
@ -1109,7 +1147,13 @@ font_render(FontObject *self, PyObject *args) {
|
|||
for (k = x0; k < x1; k++) {
|
||||
unsigned int src_alpha = source[k] * convert_scale;
|
||||
if (src_alpha > 0) {
|
||||
target[k] = target[k] > 0 ? CLIP8(src_alpha + MULDIV255(target[k], (255 - src_alpha), tmp)) : src_alpha;
|
||||
target[k] =
|
||||
target[k] > 0
|
||||
? CLIP8(
|
||||
src_alpha +
|
||||
MULDIV255(
|
||||
target[k], (255 - src_alpha), tmp))
|
||||
: src_alpha;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1249,7 +1293,8 @@ font_getvaraxes(FontObject *self) {
|
|||
|
||||
if (name.name_id == axis.strid) {
|
||||
axis_name = Py_BuildValue("y#", name.string, name.string_len);
|
||||
PyDict_SetItemString(list_axis, "name", axis_name ? axis_name : Py_None);
|
||||
PyDict_SetItemString(
|
||||
list_axis, "name", axis_name ? axis_name : Py_None);
|
||||
Py_XDECREF(axis_name);
|
||||
break;
|
||||
}
|
||||
|
@ -1299,7 +1344,7 @@ font_setvaraxes(FontObject *self, PyObject *args) {
|
|||
}
|
||||
|
||||
num_coords = PyObject_Length(axes);
|
||||
coords = (FT_Fixed*)malloc(num_coords * sizeof(FT_Fixed));
|
||||
coords = (FT_Fixed *)malloc(num_coords * sizeof(FT_Fixed));
|
||||
if (coords == NULL) {
|
||||
return PyErr_NoMemory();
|
||||
}
|
||||
|
|
|
@ -716,7 +716,7 @@ PyImaging_DrawWmf(PyObject *self, PyObject *args) {
|
|||
HDC dc;
|
||||
RECT rect;
|
||||
PyObject *buffer = NULL;
|
||||
char *ptr;
|
||||
void *ptr;
|
||||
|
||||
char *data;
|
||||
Py_ssize_t datasize;
|
||||
|
|
10
src/encode.c
10
src/encode.c
|
@ -1163,8 +1163,10 @@ PyImaging_JpegEncoderNew(PyObject *self, PyObject *args) {
|
|||
((JPEGENCODERSTATE *)encoder->state.context)->streamtype = streamtype;
|
||||
((JPEGENCODERSTATE *)encoder->state.context)->xdpi = xdpi;
|
||||
((JPEGENCODERSTATE *)encoder->state.context)->ydpi = ydpi;
|
||||
((JPEGENCODERSTATE *)encoder->state.context)->restart_marker_blocks = restart_marker_blocks;
|
||||
((JPEGENCODERSTATE *)encoder->state.context)->restart_marker_rows = restart_marker_rows;
|
||||
((JPEGENCODERSTATE *)encoder->state.context)->restart_marker_blocks =
|
||||
restart_marker_blocks;
|
||||
((JPEGENCODERSTATE *)encoder->state.context)->restart_marker_rows =
|
||||
restart_marker_rows;
|
||||
((JPEGENCODERSTATE *)encoder->state.context)->comment = comment;
|
||||
((JPEGENCODERSTATE *)encoder->state.context)->comment_size = comment_size;
|
||||
((JPEGENCODERSTATE *)encoder->state.context)->extra = extra;
|
||||
|
@ -1333,9 +1335,7 @@ PyImaging_Jpeg2KEncoderNew(PyObject *self, PyObject *args) {
|
|||
if (comment && comment_size > 0) {
|
||||
/* Size is stored as as an uint16, subtract 4 bytes for the header */
|
||||
if (comment_size >= 65532) {
|
||||
PyErr_SetString(
|
||||
PyExc_ValueError,
|
||||
"JPEG 2000 comment is too long");
|
||||
PyErr_SetString(PyExc_ValueError, "JPEG 2000 comment is too long");
|
||||
Py_DECREF(encoder);
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -185,11 +185,11 @@ put_pixel_32(Imaging im, int x, int y, const void *color) {
|
|||
|
||||
void
|
||||
ImagingAccessInit() {
|
||||
#define ADD(mode_, get_pixel_, put_pixel_) \
|
||||
{ \
|
||||
ImagingAccess access = add_item(mode_); \
|
||||
access->get_pixel = get_pixel_; \
|
||||
access->put_pixel = put_pixel_; \
|
||||
#define ADD(mode_, get_pixel_, put_pixel_) \
|
||||
{ \
|
||||
ImagingAccess access = add_item(mode_); \
|
||||
access->get_pixel = get_pixel_; \
|
||||
access->put_pixel = put_pixel_; \
|
||||
}
|
||||
|
||||
/* populate access table */
|
||||
|
|
|
@ -83,7 +83,6 @@ decode_bc1_color(rgba *dst, const UINT8 *src, int separate_alpha) {
|
|||
g1 = p[1].g;
|
||||
b1 = p[1].b;
|
||||
|
||||
|
||||
/* NOTE: BC2 and BC3 reuse BC1 color blocks but always act like c0 > c1 */
|
||||
if (col.c0 > col.c1 || separate_alpha) {
|
||||
p[2].r = (2 * r0 + 1 * r1) / 3;
|
||||
|
@ -354,8 +353,7 @@ decode_bc7_block(rgba *col, const UINT8 *src) {
|
|||
}
|
||||
return;
|
||||
}
|
||||
while (!(mode & (1 << bit++)))
|
||||
;
|
||||
while (!(mode & (1 << bit++)));
|
||||
mode = bit - 1;
|
||||
info = &bc7_modes[mode];
|
||||
/* color selection bits: {subset}{endpoint} */
|
||||
|
@ -546,7 +544,7 @@ static const UINT8 bc6_bit_packings[][75] = {
|
|||
21, 22, 23, 24, 25, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
48, 49, 50, 51, 52, 10, 112, 113, 114, 115, 64, 65, 66, 67, 26,
|
||||
176, 160, 161, 162, 163, 80, 81, 82, 83, 42, 177, 128, 129, 130, 131,
|
||||
96, 97, 98, 99, 100, 178, 144, 145, 146, 147, 148, 179},
|
||||
96, 97, 98, 99, 100, 178, 144, 145, 146, 147, 148, 179},
|
||||
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20,
|
||||
21, 22, 23, 24, 25, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
|
||||
48, 49, 50, 51, 10, 164, 112, 113, 114, 115, 64, 65, 66, 67, 68,
|
||||
|
@ -684,7 +682,7 @@ bc6_clamp(float value) {
|
|||
} else if (value > 1.0f) {
|
||||
return 255;
|
||||
} else {
|
||||
return (UINT8) (value * 255.0f);
|
||||
return (UINT8)(value * 255.0f);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -826,7 +824,13 @@ put_block(Imaging im, ImagingCodecState state, const char *col, int sz, int C) {
|
|||
|
||||
static int
|
||||
decode_bcn(
|
||||
Imaging im, ImagingCodecState state, const UINT8 *src, int bytes, int N, int C, char *pixel_format) {
|
||||
Imaging im,
|
||||
ImagingCodecState state,
|
||||
const UINT8 *src,
|
||||
int bytes,
|
||||
int N,
|
||||
int C,
|
||||
char *pixel_format) {
|
||||
int ymax = state->ysize + state->yoff;
|
||||
const UINT8 *ptr = src;
|
||||
switch (N) {
|
||||
|
@ -849,8 +853,7 @@ decode_bcn(
|
|||
DECODE_LOOP(2, 16, rgba);
|
||||
DECODE_LOOP(3, 16, rgba);
|
||||
DECODE_LOOP(4, 8, lum);
|
||||
case 5:
|
||||
{
|
||||
case 5: {
|
||||
int sign = strcmp(pixel_format, "BC5S") == 0 ? 1 : 0;
|
||||
while (bytes >= 16) {
|
||||
rgba col[16];
|
||||
|
@ -865,8 +868,7 @@ decode_bcn(
|
|||
}
|
||||
break;
|
||||
}
|
||||
case 6:
|
||||
{
|
||||
case 6: {
|
||||
int sign = strcmp(pixel_format, "BC6HS") == 0 ? 1 : 0;
|
||||
while (bytes >= 16) {
|
||||
rgba col[16];
|
||||
|
@ -880,7 +882,7 @@ decode_bcn(
|
|||
}
|
||||
break;
|
||||
}
|
||||
DECODE_LOOP(7, 16, rgba);
|
||||
DECODE_LOOP(7, 16, rgba);
|
||||
#undef DECODE_LOOP
|
||||
}
|
||||
return (int)(ptr - src);
|
||||
|
|
|
@ -313,12 +313,12 @@ _gaussian_blur_radius(float radius, int passes) {
|
|||
}
|
||||
|
||||
Imaging
|
||||
ImagingGaussianBlur(Imaging imOut, Imaging imIn, float xradius, float yradius, int passes) {
|
||||
ImagingGaussianBlur(
|
||||
Imaging imOut, Imaging imIn, float xradius, float yradius, int passes) {
|
||||
return ImagingBoxBlur(
|
||||
imOut,
|
||||
imIn,
|
||||
_gaussian_blur_radius(xradius, passes),
|
||||
_gaussian_blur_radius(yradius, passes),
|
||||
passes
|
||||
);
|
||||
imOut,
|
||||
imIn,
|
||||
_gaussian_blur_radius(xradius, passes),
|
||||
_gaussian_blur_radius(yradius, passes),
|
||||
passes);
|
||||
}
|
||||
|
|
|
@ -518,8 +518,8 @@ rgba2rgb_(UINT8 *out, const UINT8 *in, int xsize) {
|
|||
|
||||
/*
|
||||
* Conversion of RGB + single transparent color either to
|
||||
* RGBA or LA, where any pixel matching the color will have the alpha channel set to 0, or
|
||||
* RGBa or La, where any pixel matching the color will have all channels set to 0
|
||||
* RGBA or LA, where any pixel matching the color will have the alpha channel set to 0,
|
||||
* or RGBa or La, where any pixel matching the color will have all channels set to 0
|
||||
*/
|
||||
|
||||
static void
|
||||
|
@ -1676,7 +1676,8 @@ convert(
|
|||
return (Imaging)ImagingError_ValueError("conversion not supported");
|
||||
#else
|
||||
static char buf[100];
|
||||
snprintf(buf, 100, "conversion from %.10s to %.10s not supported", imIn->mode, mode);
|
||||
snprintf(
|
||||
buf, 100, "conversion from %.10s to %.10s not supported", imIn->mode, mode);
|
||||
return (Imaging)ImagingError_ValueError(buf);
|
||||
#endif
|
||||
}
|
||||
|
@ -1720,25 +1721,24 @@ ImagingConvertTransparent(Imaging imIn, const char *mode, int r, int g, int b) {
|
|||
return (Imaging)ImagingError_ModeError();
|
||||
}
|
||||
|
||||
if (strcmp(imIn->mode, "RGB") == 0 && (strcmp(mode, "RGBA") == 0 || strcmp(mode, "RGBa") == 0)) {
|
||||
if (strcmp(imIn->mode, "RGB") == 0 &&
|
||||
(strcmp(mode, "RGBA") == 0 || strcmp(mode, "RGBa") == 0)) {
|
||||
convert = rgb2rgba;
|
||||
if (strcmp(mode, "RGBa") == 0) {
|
||||
premultiplied = 1;
|
||||
}
|
||||
} else if (strcmp(imIn->mode, "RGB") == 0 && (strcmp(mode, "LA") == 0 || strcmp(mode, "La") == 0)) {
|
||||
} else if (
|
||||
strcmp(imIn->mode, "RGB") == 0 &&
|
||||
(strcmp(mode, "LA") == 0 || strcmp(mode, "La") == 0)) {
|
||||
convert = rgb2la;
|
||||
source_transparency = 1;
|
||||
if (strcmp(mode, "La") == 0) {
|
||||
premultiplied = 1;
|
||||
}
|
||||
} else if ((strcmp(imIn->mode, "1") == 0 ||
|
||||
strcmp(imIn->mode, "I") == 0 ||
|
||||
strcmp(imIn->mode, "I;16") == 0 ||
|
||||
strcmp(imIn->mode, "L") == 0
|
||||
) && (
|
||||
strcmp(mode, "RGBA") == 0 ||
|
||||
strcmp(mode, "LA") == 0
|
||||
)) {
|
||||
} else if (
|
||||
(strcmp(imIn->mode, "1") == 0 || strcmp(imIn->mode, "I") == 0 ||
|
||||
strcmp(imIn->mode, "I;16") == 0 || strcmp(imIn->mode, "L") == 0) &&
|
||||
(strcmp(mode, "RGBA") == 0 || strcmp(mode, "LA") == 0)) {
|
||||
if (strcmp(imIn->mode, "1") == 0) {
|
||||
convert = bit2rgb;
|
||||
} else if (strcmp(imIn->mode, "I") == 0) {
|
||||
|
|
|
@ -94,8 +94,8 @@ ImagingNewDIB(const char *mode, int xsize, int ysize) {
|
|||
return (ImagingDIB)ImagingError_MemoryError();
|
||||
}
|
||||
|
||||
dib->bitmap =
|
||||
CreateDIBSection(dib->dc, dib->info, DIB_RGB_COLORS, &dib->bits, NULL, 0);
|
||||
dib->bitmap = CreateDIBSection(
|
||||
dib->dc, dib->info, DIB_RGB_COLORS, (void **)&dib->bits, NULL, 0);
|
||||
if (!dib->bitmap) {
|
||||
free(dib->info);
|
||||
free(dib);
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
* This guarantees that ROUND_UP|DOWN(f) == -ROUND_UP|DOWN(-f)
|
||||
*/
|
||||
#define ROUND_UP(f) ((int)((f) >= 0.0 ? floor((f) + 0.5F) : -floor(fabs(f) + 0.5F)))
|
||||
#define ROUND_DOWN(f) ((int)((f) >= 0.0 ? ceil((f)-0.5F) : -ceil(fabs(f) - 0.5F)))
|
||||
#define ROUND_DOWN(f) ((int)((f) >= 0.0 ? ceil((f) - 0.5F) : -ceil(fabs(f) - 0.5F)))
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
/* Primitives */
|
||||
|
@ -439,7 +439,14 @@ draw_horizontal_lines(
|
|||
* Filled polygon draw function using scan line algorithm.
|
||||
*/
|
||||
static inline int
|
||||
polygon_generic(Imaging im, int n, Edge *e, int ink, int eofill, hline_handler hline, int hasAlpha) {
|
||||
polygon_generic(
|
||||
Imaging im,
|
||||
int n,
|
||||
Edge *e,
|
||||
int ink,
|
||||
int eofill,
|
||||
hline_handler hline,
|
||||
int hasAlpha) {
|
||||
Edge **edge_table;
|
||||
float *xx;
|
||||
int edge_count = 0;
|
||||
|
@ -499,7 +506,7 @@ polygon_generic(Imaging im, int n, Edge *e, int ink, int eofill, hline_handler h
|
|||
// Needed to draw consistent polygons
|
||||
xx[j] = xx[j - 1];
|
||||
j++;
|
||||
} else if (current->dx != 0 && roundf(xx[j-1]) == xx[j-1]) {
|
||||
} else if (current->dx != 0 && roundf(xx[j - 1]) == xx[j - 1]) {
|
||||
// Connect discontiguous corners
|
||||
for (k = 0; k < i; k++) {
|
||||
Edge *other_edge = edge_table[k];
|
||||
|
@ -510,23 +517,38 @@ polygon_generic(Imaging im, int n, Edge *e, int ink, int eofill, hline_handler h
|
|||
// Check if the two edges join to make a corner
|
||||
if (((ymin == current->ymin && ymin == other_edge->ymin) ||
|
||||
(ymin == current->ymax && ymin == other_edge->ymax)) &&
|
||||
xx[j-1] == (ymin - other_edge->y0) * other_edge->dx + other_edge->x0) {
|
||||
xx[j - 1] == (ymin - other_edge->y0) * other_edge->dx +
|
||||
other_edge->x0) {
|
||||
// Determine points from the edges on the next row
|
||||
// Or if this is the last row, check the previous row
|
||||
int offset = ymin == ymax ? -1 : 1;
|
||||
adjacent_line_x = (ymin + offset - current->y0) * current->dx + current->x0;
|
||||
adjacent_line_x_other_edge = (ymin + offset - other_edge->y0) * other_edge->dx + other_edge->x0;
|
||||
adjacent_line_x =
|
||||
(ymin + offset - current->y0) * current->dx +
|
||||
current->x0;
|
||||
adjacent_line_x_other_edge =
|
||||
(ymin + offset - other_edge->y0) * other_edge->dx +
|
||||
other_edge->x0;
|
||||
if (ymin == current->ymax) {
|
||||
if (current->dx > 0) {
|
||||
xx[k] = fmax(adjacent_line_x, adjacent_line_x_other_edge) + 1;
|
||||
xx[k] = fmax(
|
||||
adjacent_line_x,
|
||||
adjacent_line_x_other_edge) +
|
||||
1;
|
||||
} else {
|
||||
xx[k] = fmin(adjacent_line_x, adjacent_line_x_other_edge) - 1;
|
||||
xx[k] = fmin(
|
||||
adjacent_line_x,
|
||||
adjacent_line_x_other_edge) -
|
||||
1;
|
||||
}
|
||||
} else {
|
||||
if (current->dx > 0) {
|
||||
xx[k] = fmin(adjacent_line_x, adjacent_line_x_other_edge);
|
||||
xx[k] = fmin(
|
||||
adjacent_line_x, adjacent_line_x_other_edge);
|
||||
} else {
|
||||
xx[k] = fmax(adjacent_line_x, adjacent_line_x_other_edge) + 1;
|
||||
xx[k] = fmax(
|
||||
adjacent_line_x,
|
||||
adjacent_line_x_other_edge) +
|
||||
1;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -552,7 +574,8 @@ polygon_generic(Imaging im, int n, Edge *e, int ink, int eofill, hline_handler h
|
|||
|
||||
int x_start = ROUND_UP(xx[i - 1]);
|
||||
if (x_pos > x_start) {
|
||||
// Line would be partway through x_pos, so increase the starting point
|
||||
// Line would be partway through x_pos, so increase the starting
|
||||
// point
|
||||
x_start = x_pos;
|
||||
if (x_end < x_start) {
|
||||
// Line would now end before it started
|
||||
|
@ -776,7 +799,8 @@ ImagingDrawRectangle(
|
|||
}
|
||||
|
||||
int
|
||||
ImagingDrawPolygon(Imaging im, int count, int *xy, const void *ink_, int fill, int width, int op) {
|
||||
ImagingDrawPolygon(
|
||||
Imaging im, int count, int *xy, const void *ink_, int fill, int width, int op) {
|
||||
int i, n, x0, y0, x1, y1;
|
||||
DRAW *draw;
|
||||
INT32 ink;
|
||||
|
@ -803,7 +827,7 @@ ImagingDrawPolygon(Imaging im, int count, int *xy, const void *ink_, int fill, i
|
|||
if (y0 == y1 && i != 0 && y0 == xy[i * 2 - 1]) {
|
||||
// This is a horizontal line,
|
||||
// that immediately follows another horizontal line
|
||||
Edge *last_e = &e[n-1];
|
||||
Edge *last_e = &e[n - 1];
|
||||
if (x1 > x0 && x0 > xy[i * 2 - 2]) {
|
||||
// They are both increasing in x
|
||||
last_e->xmax = x1;
|
||||
|
@ -826,14 +850,24 @@ ImagingDrawPolygon(Imaging im, int count, int *xy, const void *ink_, int fill, i
|
|||
/* Outline */
|
||||
if (width == 1) {
|
||||
for (i = 0; i < count - 1; i++) {
|
||||
draw->line(im, xy[i * 2], xy[i * 2 + 1], xy[i * 2 + 2], xy[i * 2 + 3], ink);
|
||||
draw->line(
|
||||
im, xy[i * 2], xy[i * 2 + 1], xy[i * 2 + 2], xy[i * 2 + 3], ink);
|
||||
}
|
||||
draw->line(im, xy[i * 2], xy[i * 2 + 1], xy[0], xy[1], ink);
|
||||
} else {
|
||||
for (i = 0; i < count - 1; i++) {
|
||||
ImagingDrawWideLine(im, xy[i * 2], xy[i * 2 + 1], xy[i * 2 + 2], xy[i * 2 + 3], ink_, width, op);
|
||||
ImagingDrawWideLine(
|
||||
im,
|
||||
xy[i * 2],
|
||||
xy[i * 2 + 1],
|
||||
xy[i * 2 + 2],
|
||||
xy[i * 2 + 3],
|
||||
ink_,
|
||||
width,
|
||||
op);
|
||||
}
|
||||
ImagingDrawWideLine(im, xy[i * 2], xy[i * 2 + 1], xy[0], xy[1], ink_, width, op);
|
||||
ImagingDrawWideLine(
|
||||
im, xy[i * 2], xy[i * 2 + 1], xy[0], xy[1], ink_, width, op);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -106,7 +106,7 @@ ImagingExpand(Imaging imIn, int xmargin, int ymargin) {
|
|||
|
||||
void
|
||||
ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) {
|
||||
#define KERNEL1x3(in0, x, kernel, d) \
|
||||
#define KERNEL1x3(in0, x, kernel, d) \
|
||||
(_i2f(in0[x - d]) * (kernel)[0] + _i2f(in0[x]) * (kernel)[1] + \
|
||||
_i2f(in0[x + d]) * (kernel)[2])
|
||||
|
||||
|
@ -224,10 +224,9 @@ ImagingFilter3x3(Imaging imOut, Imaging im, const float *kernel, float offset) {
|
|||
|
||||
void
|
||||
ImagingFilter5x5(Imaging imOut, Imaging im, const float *kernel, float offset) {
|
||||
#define KERNEL1x5(in0, x, kernel, d) \
|
||||
(_i2f(in0[x - d - d]) * (kernel)[0] + \
|
||||
_i2f(in0[x - d]) * (kernel)[1] + _i2f(in0[x]) * (kernel)[2] + \
|
||||
_i2f(in0[x + d]) * (kernel)[3] + \
|
||||
#define KERNEL1x5(in0, x, kernel, d) \
|
||||
(_i2f(in0[x - d - d]) * (kernel)[0] + _i2f(in0[x - d]) * (kernel)[1] + \
|
||||
_i2f(in0[x]) * (kernel)[2] + _i2f(in0[x + d]) * (kernel)[3] + \
|
||||
_i2f(in0[x + d + d]) * (kernel)[4])
|
||||
|
||||
int x = 0, y = 0;
|
||||
|
|
|
@ -231,8 +231,9 @@ ImagingFliDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
|
|||
}
|
||||
/* Note, have to check Data + size, not just ptr + size) */
|
||||
if (data + (state->xsize * state->ysize) > ptr + bytes) {
|
||||
/* not enough data for frame */
|
||||
/* UNDONE Unclear that we're actually going to leave the buffer at the right place. */
|
||||
// not enough data for frame
|
||||
// UNDONE Unclear that we're actually going to leave the buffer at
|
||||
// the right place.
|
||||
return ptr - buf; /* bytes consumed */
|
||||
}
|
||||
for (y = 0; y < state->ysize; y++) {
|
||||
|
@ -251,7 +252,7 @@ ImagingFliDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t byt
|
|||
return -1;
|
||||
}
|
||||
advance = I32(ptr);
|
||||
if (advance == 0 ) {
|
||||
if (advance == 0) {
|
||||
// If there's no advance, we're in an infinite loop
|
||||
state->errcode = IMAGING_CODEC_BROKEN;
|
||||
return -1;
|
||||
|
|
|
@ -565,13 +565,13 @@ bilinear_filter32RGB(void *out, Imaging im, double xin, double yin) {
|
|||
#undef BILINEAR_HEAD
|
||||
#undef BILINEAR_BODY
|
||||
|
||||
#define BICUBIC(v, v1, v2, v3, v4, d) \
|
||||
{ \
|
||||
double p1 = v2; \
|
||||
double p2 = -v1 + v3; \
|
||||
double p3 = 2 * (v1 - v2) + v3 - v4; \
|
||||
double p4 = -v1 + v2 - v3 + v4; \
|
||||
v = p1 + (d) * (p2 + (d) * (p3 + (d)*p4)); \
|
||||
#define BICUBIC(v, v1, v2, v3, v4, d) \
|
||||
{ \
|
||||
double p1 = v2; \
|
||||
double p2 = -v1 + v3; \
|
||||
double p3 = 2 * (v1 - v2) + v3 - v4; \
|
||||
double p4 = -v1 + v2 - v3 + v4; \
|
||||
v = p1 + (d) * (p2 + (d) * (p3 + (d) * p4)); \
|
||||
}
|
||||
|
||||
#define BICUBIC_HEAD(type) \
|
||||
|
@ -966,7 +966,7 @@ affine_fixed(
|
|||
ysize = (int)imIn->ysize;
|
||||
|
||||
/* use 16.16 fixed point arithmetics */
|
||||
#define FIX(v) FLOOR((v)*65536.0 + 0.5)
|
||||
#define FIX(v) FLOOR((v) * 65536.0 + 0.5)
|
||||
|
||||
a0 = FIX(a[0]);
|
||||
a1 = FIX(a[1]);
|
||||
|
|
|
@ -58,11 +58,11 @@ ImagingGetBBox(Imaging im, int bbox[4], int alpha_only) {
|
|||
INT32 mask = 0xffffffff;
|
||||
if (im->bands == 3) {
|
||||
((UINT8 *)&mask)[3] = 0;
|
||||
} else if (alpha_only && (
|
||||
strcmp(im->mode, "RGBa") == 0 || strcmp(im->mode, "RGBA") == 0 ||
|
||||
strcmp(im->mode, "La") == 0 || strcmp(im->mode, "LA") == 0 ||
|
||||
strcmp(im->mode, "PA") == 0
|
||||
)) {
|
||||
} else if (
|
||||
alpha_only &&
|
||||
(strcmp(im->mode, "RGBa") == 0 || strcmp(im->mode, "RGBA") == 0 ||
|
||||
strcmp(im->mode, "La") == 0 || strcmp(im->mode, "LA") == 0 ||
|
||||
strcmp(im->mode, "PA") == 0)) {
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
mask = 0x000000ff;
|
||||
#else
|
||||
|
|
|
@ -9,10 +9,10 @@
|
|||
|
||||
/* Max size for a LZW code word. */
|
||||
|
||||
#define GIFBITS 12
|
||||
#define GIFBITS 12
|
||||
|
||||
#define GIFTABLE (1<<GIFBITS)
|
||||
#define GIFBUFFER (1<<GIFBITS)
|
||||
#define GIFTABLE (1 << GIFBITS)
|
||||
#define GIFBUFFER (1 << GIFBITS)
|
||||
|
||||
typedef struct {
|
||||
/* CONFIGURATION */
|
||||
|
@ -66,7 +66,7 @@ typedef struct {
|
|||
} GIFDECODERSTATE;
|
||||
|
||||
/* For GIF LZW encoder. */
|
||||
#define TABLE_SIZE 8192
|
||||
#define TABLE_SIZE 8192
|
||||
|
||||
typedef struct {
|
||||
/* CONFIGURATION */
|
||||
|
|
|
@ -34,28 +34,36 @@ enum { INIT, ENCODE, FINISH };
|
|||
*/
|
||||
|
||||
/* Return values */
|
||||
#define GLZW_OK 0
|
||||
#define GLZW_NO_INPUT_AVAIL 1
|
||||
#define GLZW_NO_OUTPUT_AVAIL 2
|
||||
#define GLZW_INTERNAL_ERROR 3
|
||||
#define GLZW_OK 0
|
||||
#define GLZW_NO_INPUT_AVAIL 1
|
||||
#define GLZW_NO_OUTPUT_AVAIL 2
|
||||
#define GLZW_INTERNAL_ERROR 3
|
||||
|
||||
#define CODE_LIMIT 4096
|
||||
#define CODE_LIMIT 4096
|
||||
|
||||
/* Values of entry_state */
|
||||
enum { LZW_INITIAL, LZW_TRY_IN1, LZW_TRY_IN2, LZW_TRY_OUT1, LZW_TRY_OUT2,
|
||||
LZW_FINISHED };
|
||||
enum {
|
||||
LZW_INITIAL,
|
||||
LZW_TRY_IN1,
|
||||
LZW_TRY_IN2,
|
||||
LZW_TRY_OUT1,
|
||||
LZW_TRY_OUT2,
|
||||
LZW_FINISHED
|
||||
};
|
||||
|
||||
/* Values of control_state */
|
||||
enum { PUT_HEAD, PUT_INIT_CLEAR, PUT_CLEAR, PUT_LAST_HEAD, PUT_END };
|
||||
|
||||
static void glzwe_reset(GIFENCODERSTATE *st) {
|
||||
static void
|
||||
glzwe_reset(GIFENCODERSTATE *st) {
|
||||
st->next_code = st->end_code + 1;
|
||||
st->max_code = 2 * st->clear_code - 1;
|
||||
st->code_width = st->bits + 1;
|
||||
memset(st->codes, 0, sizeof(st->codes));
|
||||
}
|
||||
|
||||
static void glzwe_init(GIFENCODERSTATE *st) {
|
||||
static void
|
||||
glzwe_init(GIFENCODERSTATE *st) {
|
||||
st->clear_code = 1 << st->bits;
|
||||
st->end_code = st->clear_code + 1;
|
||||
glzwe_reset(st);
|
||||
|
@ -64,156 +72,157 @@ static void glzwe_init(GIFENCODERSTATE *st) {
|
|||
st->code_buffer = 0;
|
||||
}
|
||||
|
||||
static int glzwe(GIFENCODERSTATE *st, const UINT8 *in_ptr, UINT8 *out_ptr,
|
||||
UINT32 *in_avail, UINT32 *out_avail,
|
||||
UINT32 end_of_data) {
|
||||
static int
|
||||
glzwe(
|
||||
GIFENCODERSTATE *st,
|
||||
const UINT8 *in_ptr,
|
||||
UINT8 *out_ptr,
|
||||
UINT32 *in_avail,
|
||||
UINT32 *out_avail,
|
||||
UINT32 end_of_data) {
|
||||
switch (st->entry_state) {
|
||||
|
||||
case LZW_TRY_IN1:
|
||||
case LZW_TRY_IN1:
|
||||
get_first_byte:
|
||||
if (!*in_avail) {
|
||||
if (end_of_data) {
|
||||
goto end_of_data;
|
||||
if (!*in_avail) {
|
||||
if (end_of_data) {
|
||||
goto end_of_data;
|
||||
}
|
||||
st->entry_state = LZW_TRY_IN1;
|
||||
return GLZW_NO_INPUT_AVAIL;
|
||||
}
|
||||
st->entry_state = LZW_TRY_IN1;
|
||||
return GLZW_NO_INPUT_AVAIL;
|
||||
}
|
||||
st->head = *in_ptr++;
|
||||
(*in_avail)--;
|
||||
st->head = *in_ptr++;
|
||||
(*in_avail)--;
|
||||
|
||||
case LZW_TRY_IN2:
|
||||
case LZW_TRY_IN2:
|
||||
encode_loop:
|
||||
if (!*in_avail) {
|
||||
if (end_of_data) {
|
||||
st->code = st->head;
|
||||
st->put_state = PUT_LAST_HEAD;
|
||||
goto put_code;
|
||||
if (!*in_avail) {
|
||||
if (end_of_data) {
|
||||
st->code = st->head;
|
||||
st->put_state = PUT_LAST_HEAD;
|
||||
goto put_code;
|
||||
}
|
||||
st->entry_state = LZW_TRY_IN2;
|
||||
return GLZW_NO_INPUT_AVAIL;
|
||||
}
|
||||
st->entry_state = LZW_TRY_IN2;
|
||||
return GLZW_NO_INPUT_AVAIL;
|
||||
}
|
||||
st->tail = *in_ptr++;
|
||||
(*in_avail)--;
|
||||
st->tail = *in_ptr++;
|
||||
(*in_avail)--;
|
||||
|
||||
/* Knuth TAOCP vol 3 sec. 6.4 algorithm D. */
|
||||
/* Hash found experimentally to be pretty good. */
|
||||
/* This works ONLY with TABLE_SIZE a power of 2. */
|
||||
st->probe = ((st->head ^ (st->tail << 6)) * 31) & (TABLE_SIZE - 1);
|
||||
while (st->codes[st->probe]) {
|
||||
if ((st->codes[st->probe] & 0xFFFFF) ==
|
||||
((st->head << 8) | st->tail)) {
|
||||
st->head = st->codes[st->probe] >> 20;
|
||||
goto encode_loop;
|
||||
} else {
|
||||
/* Reprobe decrement must be non-zero and relatively prime to table
|
||||
* size. So, any odd positive number for power-of-2 size. */
|
||||
if ((st->probe -= ((st->tail << 2) | 1)) < 0) {
|
||||
st->probe += TABLE_SIZE;
|
||||
/* Knuth TAOCP vol 3 sec. 6.4 algorithm D. */
|
||||
/* Hash found experimentally to be pretty good. */
|
||||
/* This works ONLY with TABLE_SIZE a power of 2. */
|
||||
st->probe = ((st->head ^ (st->tail << 6)) * 31) & (TABLE_SIZE - 1);
|
||||
while (st->codes[st->probe]) {
|
||||
if ((st->codes[st->probe] & 0xFFFFF) == ((st->head << 8) | st->tail)) {
|
||||
st->head = st->codes[st->probe] >> 20;
|
||||
goto encode_loop;
|
||||
} else {
|
||||
// Reprobe decrement must be non-zero and relatively prime to table
|
||||
// size. So, any odd positive number for power-of-2 size.
|
||||
if ((st->probe -= ((st->tail << 2) | 1)) < 0) {
|
||||
st->probe += TABLE_SIZE;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/* Key not found, probe is at empty slot. */
|
||||
st->code = st->head;
|
||||
st->put_state = PUT_HEAD;
|
||||
goto put_code;
|
||||
insert_code_or_clear: /* jump here after put_code */
|
||||
if (st->next_code < CODE_LIMIT) {
|
||||
st->codes[st->probe] = (st->next_code << 20) |
|
||||
(st->head << 8) | st->tail;
|
||||
if (st->next_code > st->max_code) {
|
||||
st->max_code = st->max_code * 2 + 1;
|
||||
st->code_width++;
|
||||
}
|
||||
st->next_code++;
|
||||
} else {
|
||||
st->code = st->clear_code;
|
||||
st->put_state = PUT_CLEAR;
|
||||
/* Key not found, probe is at empty slot. */
|
||||
st->code = st->head;
|
||||
st->put_state = PUT_HEAD;
|
||||
goto put_code;
|
||||
insert_code_or_clear: /* jump here after put_code */
|
||||
if (st->next_code < CODE_LIMIT) {
|
||||
st->codes[st->probe] =
|
||||
(st->next_code << 20) | (st->head << 8) | st->tail;
|
||||
if (st->next_code > st->max_code) {
|
||||
st->max_code = st->max_code * 2 + 1;
|
||||
st->code_width++;
|
||||
}
|
||||
st->next_code++;
|
||||
} else {
|
||||
st->code = st->clear_code;
|
||||
st->put_state = PUT_CLEAR;
|
||||
goto put_code;
|
||||
reset_after_clear: /* jump here after put_code */
|
||||
glzwe_reset(st);
|
||||
}
|
||||
st->head = st->tail;
|
||||
goto encode_loop;
|
||||
|
||||
case LZW_INITIAL:
|
||||
glzwe_reset(st);
|
||||
st->code = st->clear_code;
|
||||
st->put_state = PUT_INIT_CLEAR;
|
||||
put_code:
|
||||
st->code_bits_left = st->code_width;
|
||||
check_buf_bits:
|
||||
if (!st->buf_bits_left) { /* out buffer full */
|
||||
|
||||
case LZW_TRY_OUT1:
|
||||
if (!*out_avail) {
|
||||
st->entry_state = LZW_TRY_OUT1;
|
||||
return GLZW_NO_OUTPUT_AVAIL;
|
||||
glzwe_reset(st);
|
||||
}
|
||||
st->head = st->tail;
|
||||
goto encode_loop;
|
||||
|
||||
case LZW_INITIAL:
|
||||
glzwe_reset(st);
|
||||
st->code = st->clear_code;
|
||||
st->put_state = PUT_INIT_CLEAR;
|
||||
put_code:
|
||||
st->code_bits_left = st->code_width;
|
||||
check_buf_bits:
|
||||
if (!st->buf_bits_left) { /* out buffer full */
|
||||
|
||||
case LZW_TRY_OUT1:
|
||||
if (!*out_avail) {
|
||||
st->entry_state = LZW_TRY_OUT1;
|
||||
return GLZW_NO_OUTPUT_AVAIL;
|
||||
}
|
||||
*out_ptr++ = st->code_buffer;
|
||||
(*out_avail)--;
|
||||
st->code_buffer = 0;
|
||||
st->buf_bits_left = 8;
|
||||
}
|
||||
/* code bits to pack */
|
||||
UINT32 n = st->buf_bits_left < st->code_bits_left ? st->buf_bits_left
|
||||
: st->code_bits_left;
|
||||
st->code_buffer |= (st->code & ((1 << n) - 1)) << (8 - st->buf_bits_left);
|
||||
st->code >>= n;
|
||||
st->buf_bits_left -= n;
|
||||
st->code_bits_left -= n;
|
||||
if (st->code_bits_left) {
|
||||
goto check_buf_bits;
|
||||
}
|
||||
switch (st->put_state) {
|
||||
case PUT_INIT_CLEAR:
|
||||
goto get_first_byte;
|
||||
case PUT_HEAD:
|
||||
goto insert_code_or_clear;
|
||||
case PUT_CLEAR:
|
||||
goto reset_after_clear;
|
||||
case PUT_LAST_HEAD:
|
||||
goto end_of_data;
|
||||
case PUT_END:
|
||||
goto flush_code_buffer;
|
||||
default:
|
||||
return GLZW_INTERNAL_ERROR;
|
||||
}
|
||||
*out_ptr++ = st->code_buffer;
|
||||
(*out_avail)--;
|
||||
st->code_buffer = 0;
|
||||
st->buf_bits_left = 8;
|
||||
}
|
||||
/* code bits to pack */
|
||||
UINT32 n = st->buf_bits_left < st->code_bits_left
|
||||
? st->buf_bits_left : st->code_bits_left;
|
||||
st->code_buffer |=
|
||||
(st->code & ((1 << n) - 1)) << (8 - st->buf_bits_left);
|
||||
st->code >>= n;
|
||||
st->buf_bits_left -= n;
|
||||
st->code_bits_left -= n;
|
||||
if (st->code_bits_left) {
|
||||
goto check_buf_bits;
|
||||
}
|
||||
switch (st->put_state) {
|
||||
case PUT_INIT_CLEAR:
|
||||
goto get_first_byte;
|
||||
case PUT_HEAD:
|
||||
goto insert_code_or_clear;
|
||||
case PUT_CLEAR:
|
||||
goto reset_after_clear;
|
||||
case PUT_LAST_HEAD:
|
||||
goto end_of_data;
|
||||
case PUT_END:
|
||||
goto flush_code_buffer;
|
||||
default:
|
||||
return GLZW_INTERNAL_ERROR;
|
||||
}
|
||||
|
||||
end_of_data:
|
||||
st->code = st->end_code;
|
||||
st->put_state = PUT_END;
|
||||
goto put_code;
|
||||
st->code = st->end_code;
|
||||
st->put_state = PUT_END;
|
||||
goto put_code;
|
||||
flush_code_buffer: /* jump here after put_code */
|
||||
if (st->buf_bits_left < 8) {
|
||||
|
||||
case LZW_TRY_OUT2:
|
||||
if (!*out_avail) {
|
||||
st->entry_state = LZW_TRY_OUT2;
|
||||
return GLZW_NO_OUTPUT_AVAIL;
|
||||
if (st->buf_bits_left < 8) {
|
||||
case LZW_TRY_OUT2:
|
||||
if (!*out_avail) {
|
||||
st->entry_state = LZW_TRY_OUT2;
|
||||
return GLZW_NO_OUTPUT_AVAIL;
|
||||
}
|
||||
*out_ptr++ = st->code_buffer;
|
||||
(*out_avail)--;
|
||||
}
|
||||
*out_ptr++ = st->code_buffer;
|
||||
(*out_avail)--;
|
||||
}
|
||||
st->entry_state = LZW_FINISHED;
|
||||
return GLZW_OK;
|
||||
st->entry_state = LZW_FINISHED;
|
||||
return GLZW_OK;
|
||||
|
||||
case LZW_FINISHED:
|
||||
return GLZW_OK;
|
||||
case LZW_FINISHED:
|
||||
return GLZW_OK;
|
||||
|
||||
default:
|
||||
return GLZW_INTERNAL_ERROR;
|
||||
default:
|
||||
return GLZW_INTERNAL_ERROR;
|
||||
}
|
||||
}
|
||||
/* -END- GIF LZW encoder. */
|
||||
|
||||
int
|
||||
ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes) {
|
||||
UINT8* ptr;
|
||||
UINT8* sub_block_ptr;
|
||||
UINT8* sub_block_limit;
|
||||
UINT8* buf_limit;
|
||||
GIFENCODERSTATE *context = (GIFENCODERSTATE*) state->context;
|
||||
ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
|
||||
UINT8 *ptr;
|
||||
UINT8 *sub_block_ptr;
|
||||
UINT8 *sub_block_limit;
|
||||
UINT8 *buf_limit;
|
||||
GIFENCODERSTATE *context = (GIFENCODERSTATE *)state->context;
|
||||
int r;
|
||||
|
||||
UINT32 in_avail, in_used;
|
||||
|
@ -278,9 +287,9 @@ ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes) {
|
|||
return ptr - buf;
|
||||
}
|
||||
sub_block_ptr = ptr;
|
||||
sub_block_limit = sub_block_ptr +
|
||||
(256 < buf_limit - sub_block_ptr ?
|
||||
256 : buf_limit - sub_block_ptr);
|
||||
sub_block_limit =
|
||||
sub_block_ptr +
|
||||
(256 < buf_limit - sub_block_ptr ? 256 : buf_limit - sub_block_ptr);
|
||||
*ptr++ = 0;
|
||||
}
|
||||
|
||||
|
@ -301,9 +310,9 @@ ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes) {
|
|||
/* get another line of data */
|
||||
state->shuffle(
|
||||
state->buffer,
|
||||
(UINT8*) im->image[state->y + state->yoff] +
|
||||
state->xoff * im->pixelsize, state->xsize
|
||||
);
|
||||
(UINT8 *)im->image[state->y + state->yoff] +
|
||||
state->xoff * im->pixelsize,
|
||||
state->xsize);
|
||||
state->x = 0;
|
||||
|
||||
/* step forward, according to the interlace settings */
|
||||
|
@ -331,10 +340,15 @@ ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes) {
|
|||
}
|
||||
}
|
||||
|
||||
in_avail = state->xsize - state->x; /* bytes left in line */
|
||||
in_avail = state->xsize - state->x; /* bytes left in line */
|
||||
out_avail = sub_block_limit - ptr; /* bytes left in sub-block */
|
||||
r = glzwe(context, &state->buffer[state->x], ptr, &in_avail,
|
||||
&out_avail, state->state == FINISH);
|
||||
r = glzwe(
|
||||
context,
|
||||
&state->buffer[state->x],
|
||||
ptr,
|
||||
&in_avail,
|
||||
&out_avail,
|
||||
state->state == FINISH);
|
||||
out_used = sub_block_limit - ptr - out_avail;
|
||||
*sub_block_ptr += out_used;
|
||||
ptr += out_used;
|
||||
|
|
|
@ -108,15 +108,15 @@ struct ImagingMemoryInstance {
|
|||
|
||||
#define IMAGING_PIXEL_1(im, x, y) ((im)->image8[(y)][(x)])
|
||||
#define IMAGING_PIXEL_L(im, x, y) ((im)->image8[(y)][(x)])
|
||||
#define IMAGING_PIXEL_LA(im, x, y) ((im)->image[(y)][(x)*4])
|
||||
#define IMAGING_PIXEL_LA(im, x, y) ((im)->image[(y)][(x) * 4])
|
||||
#define IMAGING_PIXEL_P(im, x, y) ((im)->image8[(y)][(x)])
|
||||
#define IMAGING_PIXEL_PA(im, x, y) ((im)->image[(y)][(x)*4])
|
||||
#define IMAGING_PIXEL_PA(im, x, y) ((im)->image[(y)][(x) * 4])
|
||||
#define IMAGING_PIXEL_I(im, x, y) ((im)->image32[(y)][(x)])
|
||||
#define IMAGING_PIXEL_F(im, x, y) (((FLOAT32 *)(im)->image32[y])[x])
|
||||
#define IMAGING_PIXEL_RGB(im, x, y) ((im)->image[(y)][(x)*4])
|
||||
#define IMAGING_PIXEL_RGBA(im, x, y) ((im)->image[(y)][(x)*4])
|
||||
#define IMAGING_PIXEL_CMYK(im, x, y) ((im)->image[(y)][(x)*4])
|
||||
#define IMAGING_PIXEL_YCbCr(im, x, y) ((im)->image[(y)][(x)*4])
|
||||
#define IMAGING_PIXEL_RGB(im, x, y) ((im)->image[(y)][(x) * 4])
|
||||
#define IMAGING_PIXEL_RGBA(im, x, y) ((im)->image[(y)][(x) * 4])
|
||||
#define IMAGING_PIXEL_CMYK(im, x, y) ((im)->image[(y)][(x) * 4])
|
||||
#define IMAGING_PIXEL_YCbCr(im, x, y) ((im)->image[(y)][(x) * 4])
|
||||
|
||||
#define IMAGING_PIXEL_UINT8(im, x, y) ((im)->image8[(y)][(x)])
|
||||
#define IMAGING_PIXEL_INT32(im, x, y) ((im)->image32[(y)][(x)])
|
||||
|
@ -161,7 +161,7 @@ typedef struct ImagingMemoryArena {
|
|||
int stats_reallocated_blocks; /* Number of blocks which were actually reallocated
|
||||
after retrieving */
|
||||
int stats_freed_blocks; /* Number of freed blocks */
|
||||
} * ImagingMemoryArena;
|
||||
} *ImagingMemoryArena;
|
||||
|
||||
/* Objects */
|
||||
/* ------- */
|
||||
|
@ -309,7 +309,8 @@ ImagingFlipLeftRight(Imaging imOut, Imaging imIn);
|
|||
extern Imaging
|
||||
ImagingFlipTopBottom(Imaging imOut, Imaging imIn);
|
||||
extern Imaging
|
||||
ImagingGaussianBlur(Imaging imOut, Imaging imIn, float xradius, float yradius, int passes);
|
||||
ImagingGaussianBlur(
|
||||
Imaging imOut, Imaging imIn, float xradius, float yradius, int passes);
|
||||
extern Imaging
|
||||
ImagingGetBand(Imaging im, int band);
|
||||
extern Imaging
|
||||
|
@ -487,7 +488,8 @@ ImagingDrawPieslice(
|
|||
extern int
|
||||
ImagingDrawPoint(Imaging im, int x, int y, const void *ink, int op);
|
||||
extern int
|
||||
ImagingDrawPolygon(Imaging im, int points, int *xy, const void *ink, int fill, int width, int op);
|
||||
ImagingDrawPolygon(
|
||||
Imaging im, int points, int *xy, const void *ink, int fill, int width, int op);
|
||||
extern int
|
||||
ImagingDrawRectangle(
|
||||
Imaging im,
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#define DIV255(a, tmp) (tmp = (a) + 128, SHIFTFORDIV255(tmp))
|
||||
|
||||
#define BLEND(mask, in1, in2, tmp1) DIV255(in1 *(255 - mask) + in2 * mask, tmp1)
|
||||
#define BLEND(mask, in1, in2, tmp1) DIV255(in1 * (255 - mask) + in2 * mask, tmp1)
|
||||
|
||||
#define PREBLEND(mask, in1, in2, tmp1) (MULDIV255(in1, (255 - mask), tmp1) + in2)
|
||||
|
||||
|
|
|
@ -183,9 +183,9 @@ j2ku_gray_i(
|
|||
UINT16 *row = (UINT16 *)im->image[y0 + y] + x0;
|
||||
for (x = 0; x < w; ++x) {
|
||||
UINT16 pixel = j2ku_shift(offset + *data++, shift);
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
pixel = (pixel >> 8) | (pixel << 8);
|
||||
#endif
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
pixel = (pixel >> 8) | (pixel << 8);
|
||||
#endif
|
||||
*row++ = pixel;
|
||||
}
|
||||
}
|
||||
|
@ -778,7 +778,7 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
|
|||
color_space = OPJ_CLRSPC_SYCC;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -864,7 +864,7 @@ j2k_decode_entry(Imaging im, ImagingCodecState state) {
|
|||
a, and then a malicious file could have a smaller tile_bytes
|
||||
*/
|
||||
|
||||
for (n=0; n < tile_info.nb_comps; n++) {
|
||||
for (n = 0; n < tile_info.nb_comps; n++) {
|
||||
// see csize /acsize calcs
|
||||
int csize = (image->comps[n].prec + 7) >> 3;
|
||||
csize = (csize == 3) ? 4 : csize;
|
||||
|
|
|
@ -383,8 +383,7 @@ j2k_encode_entry(Imaging im, ImagingCodecState state) {
|
|||
float *pq;
|
||||
|
||||
if (len > 0) {
|
||||
if ((size_t)len >
|
||||
sizeof(params.tcp_rates) / sizeof(params.tcp_rates[0])) {
|
||||
if ((size_t)len > sizeof(params.tcp_rates) / sizeof(params.tcp_rates[0])) {
|
||||
len = sizeof(params.tcp_rates) / sizeof(params.tcp_rates[0]);
|
||||
}
|
||||
|
||||
|
@ -464,7 +463,8 @@ j2k_encode_entry(Imaging im, ImagingCodecState state) {
|
|||
}
|
||||
|
||||
if (!context->num_resolutions) {
|
||||
while (tile_width < (1U << (params.numresolution - 1U)) || tile_height < (1U << (params.numresolution - 1U))) {
|
||||
while (tile_width < (1U << (params.numresolution - 1U)) ||
|
||||
tile_height < (1U << (params.numresolution - 1U))) {
|
||||
params.numresolution -= 1;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -145,8 +145,8 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
|
|||
case JCS_EXT_RGBX:
|
||||
#endif
|
||||
switch (context->subsampling) {
|
||||
case -1: /* Default */
|
||||
case 0: /* No subsampling */
|
||||
case -1: /* Default */
|
||||
case 0: /* No subsampling */
|
||||
break;
|
||||
default:
|
||||
/* Would subsample the green and blue
|
||||
|
@ -305,7 +305,11 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
|
|||
case 4:
|
||||
|
||||
if (context->comment) {
|
||||
jpeg_write_marker(&context->cinfo, JPEG_COM, (unsigned char *)context->comment, context->comment_size);
|
||||
jpeg_write_marker(
|
||||
&context->cinfo,
|
||||
JPEG_COM,
|
||||
(unsigned char *)context->comment,
|
||||
context->comment_size);
|
||||
}
|
||||
state->state++;
|
||||
|
||||
|
|
|
@ -432,11 +432,10 @@ fill_mask_L(
|
|||
}
|
||||
|
||||
} else {
|
||||
int alpha_channel = strcmp(imOut->mode, "RGBa") == 0 ||
|
||||
strcmp(imOut->mode, "RGBA") == 0 ||
|
||||
strcmp(imOut->mode, "La") == 0 ||
|
||||
strcmp(imOut->mode, "LA") == 0 ||
|
||||
strcmp(imOut->mode, "PA") == 0;
|
||||
int alpha_channel =
|
||||
strcmp(imOut->mode, "RGBa") == 0 || strcmp(imOut->mode, "RGBA") == 0 ||
|
||||
strcmp(imOut->mode, "La") == 0 || strcmp(imOut->mode, "LA") == 0 ||
|
||||
strcmp(imOut->mode, "PA") == 0;
|
||||
for (y = 0; y < ysize; y++) {
|
||||
UINT8 *out = (UINT8 *)imOut->image[y + dy] + dx * pixelsize;
|
||||
UINT8 *mask = (UINT8 *)imMask->image[y + sy] + sx;
|
||||
|
|
|
@ -134,7 +134,7 @@ ImagingPoint(Imaging imIn, const char *mode, const void *table) {
|
|||
ImagingSectionCookie cookie;
|
||||
Imaging imOut;
|
||||
im_point_context context;
|
||||
void (*point)(Imaging imIn, Imaging imOut, im_point_context * context);
|
||||
void (*point)(Imaging imIn, Imaging imOut, im_point_context *context);
|
||||
|
||||
if (!imIn) {
|
||||
return (Imaging)ImagingError_ModeError();
|
||||
|
|
|
@ -260,8 +260,7 @@ mergesort_pixels(PixelList *head, int i) {
|
|||
return head;
|
||||
}
|
||||
for (c = t = head; c && t;
|
||||
c = c->next[i], t = (t->next[i]) ? t->next[i]->next[i] : NULL)
|
||||
;
|
||||
c = c->next[i], t = (t->next[i]) ? t->next[i]->next[i] : NULL);
|
||||
if (c) {
|
||||
if (c->prev[i]) {
|
||||
c->prev[i]->next[i] = NULL;
|
||||
|
@ -354,12 +353,10 @@ splitlists(
|
|||
for (_i = 0; _i < 3; _i++) {
|
||||
for (_nextCount[_i] = 0, _nextTest = h[_i];
|
||||
_nextTest && _nextTest->next[_i];
|
||||
_nextTest = _nextTest->next[_i], _nextCount[_i]++)
|
||||
;
|
||||
_nextTest = _nextTest->next[_i], _nextCount[_i]++);
|
||||
for (_prevCount[_i] = 0, _prevTest = t[_i];
|
||||
_prevTest && _prevTest->prev[_i];
|
||||
_prevTest = _prevTest->prev[_i], _prevCount[_i]++)
|
||||
;
|
||||
_prevTest = _prevTest->prev[_i], _prevCount[_i]++);
|
||||
if (_nextTest != t[_i]) {
|
||||
printf("next-list of axis %d does not end at tail\n", _i);
|
||||
exit(1);
|
||||
|
@ -368,10 +365,8 @@ splitlists(
|
|||
printf("prev-list of axis %d does not end at head\n", _i);
|
||||
exit(1);
|
||||
}
|
||||
for (; _nextTest && _nextTest->prev[_i]; _nextTest = _nextTest->prev[_i])
|
||||
;
|
||||
for (; _prevTest && _prevTest->next[_i]; _prevTest = _prevTest->next[_i])
|
||||
;
|
||||
for (; _nextTest && _nextTest->prev[_i]; _nextTest = _nextTest->prev[_i]);
|
||||
for (; _prevTest && _prevTest->next[_i]; _prevTest = _prevTest->next[_i]);
|
||||
if (_nextTest != h[_i]) {
|
||||
printf("next-list of axis %d does not loop back to head\n", _i);
|
||||
exit(1);
|
||||
|
@ -548,22 +543,18 @@ split(BoxNode *node) {
|
|||
for (_i = 0; _i < 3; _i++) {
|
||||
for (_nextCount[_i] = 0, _nextTest = node->head[_i];
|
||||
_nextTest && _nextTest->next[_i];
|
||||
_nextTest = _nextTest->next[_i], _nextCount[_i]++)
|
||||
;
|
||||
_nextTest = _nextTest->next[_i], _nextCount[_i]++);
|
||||
for (_prevCount[_i] = 0, _prevTest = node->tail[_i];
|
||||
_prevTest && _prevTest->prev[_i];
|
||||
_prevTest = _prevTest->prev[_i], _prevCount[_i]++)
|
||||
;
|
||||
_prevTest = _prevTest->prev[_i], _prevCount[_i]++);
|
||||
if (_nextTest != node->tail[_i]) {
|
||||
printf("next-list of axis %d does not end at tail\n", _i);
|
||||
}
|
||||
if (_prevTest != node->head[_i]) {
|
||||
printf("prev-list of axis %d does not end at head\n", _i);
|
||||
}
|
||||
for (; _nextTest && _nextTest->prev[_i]; _nextTest = _nextTest->prev[_i])
|
||||
;
|
||||
for (; _prevTest && _prevTest->next[_i]; _prevTest = _prevTest->next[_i])
|
||||
;
|
||||
for (; _nextTest && _nextTest->prev[_i]; _nextTest = _nextTest->prev[_i]);
|
||||
for (; _prevTest && _prevTest->next[_i]; _prevTest = _prevTest->next[_i]);
|
||||
if (_nextTest != node->head[_i]) {
|
||||
printf("next-list of axis %d does not loop back to head\n", _i);
|
||||
}
|
||||
|
@ -668,8 +659,7 @@ median_cut(PixelList *hl[3], uint32_t imPixelCount, int nPixels) {
|
|||
return NULL;
|
||||
}
|
||||
for (i = 0; i < 3; i++) {
|
||||
for (tl[i] = hl[i]; tl[i] && tl[i]->next[i]; tl[i] = tl[i]->next[i])
|
||||
;
|
||||
for (tl[i] = hl[i]; tl[i] && tl[i]->next[i]; tl[i] = tl[i]->next[i]);
|
||||
root->head[i] = hl[i];
|
||||
root->tail[i] = tl[i];
|
||||
}
|
||||
|
@ -832,16 +822,9 @@ build_distance_tables(
|
|||
}
|
||||
for (i = 0; i < nEntries; i++) {
|
||||
for (j = 0; j < nEntries; j++) {
|
||||
dwi[j] = (DistanceWithIndex){
|
||||
&(avgDist[i * nEntries + j]),
|
||||
j
|
||||
};
|
||||
dwi[j] = (DistanceWithIndex){&(avgDist[i * nEntries + j]), j};
|
||||
}
|
||||
qsort(
|
||||
dwi,
|
||||
nEntries,
|
||||
sizeof(DistanceWithIndex),
|
||||
_distance_index_cmp);
|
||||
qsort(dwi, nEntries, sizeof(DistanceWithIndex), _distance_index_cmp);
|
||||
for (j = 0; j < nEntries; j++) {
|
||||
avgDistSortKey[i * nEntries + j] = dwi[j].distance;
|
||||
}
|
||||
|
@ -1213,7 +1196,7 @@ k_means(
|
|||
compute_palette_from_quantized_pixels(
|
||||
pixelData, nPixels, paletteData, nPaletteEntries, avg, count, qp);
|
||||
if (!build_distance_tables(
|
||||
avgDist, avgDistSortKey, paletteData, nPaletteEntries)) {
|
||||
avgDist, avgDistSortKey, paletteData, nPaletteEntries)) {
|
||||
goto error_3;
|
||||
}
|
||||
built = 1;
|
||||
|
@ -1452,15 +1435,17 @@ quantize(
|
|||
hashtable_insert(h2, pixelData[i], bestmatch);
|
||||
}
|
||||
if (qp[i] != bestmatch) {
|
||||
printf ("discrepancy in matching algorithms pixel %d [%d %d] %f %f\n",
|
||||
i,qp[i],bestmatch,
|
||||
sqrt((double)(_SQR(pixelData[i].c.r-p[qp[i]].c.r)+
|
||||
_SQR(pixelData[i].c.g-p[qp[i]].c.g)+
|
||||
_SQR(pixelData[i].c.b-p[qp[i]].c.b))),
|
||||
sqrt((double)(_SQR(pixelData[i].c.r-p[bestmatch].c.r)+
|
||||
_SQR(pixelData[i].c.g-p[bestmatch].c.g)+
|
||||
_SQR(pixelData[i].c.b-p[bestmatch].c.b)))
|
||||
);
|
||||
printf(
|
||||
"discrepancy in matching algorithms pixel %d [%d %d] %f %f\n",
|
||||
i,
|
||||
qp[i],
|
||||
bestmatch,
|
||||
sqrt((double)(_SQR(pixelData[i].c.r - p[qp[i]].c.r) +
|
||||
_SQR(pixelData[i].c.g - p[qp[i]].c.g) +
|
||||
_SQR(pixelData[i].c.b - p[qp[i]].c.b))),
|
||||
sqrt((double)(_SQR(pixelData[i].c.r - p[bestmatch].c.r) +
|
||||
_SQR(pixelData[i].c.g - p[bestmatch].c.g) +
|
||||
_SQR(pixelData[i].c.b - p[bestmatch].c.b))));
|
||||
}
|
||||
}
|
||||
hashtable_free(h2);
|
||||
|
|
|
@ -38,7 +38,7 @@ typedef struct _ColorBucket {
|
|||
uint64_t g;
|
||||
uint64_t b;
|
||||
uint64_t a;
|
||||
} * ColorBucket;
|
||||
} *ColorBucket;
|
||||
|
||||
typedef struct _ColorCube {
|
||||
unsigned int rBits, gBits, bBits, aBits;
|
||||
|
@ -47,7 +47,7 @@ typedef struct _ColorCube {
|
|||
|
||||
unsigned long size;
|
||||
ColorBucket buckets;
|
||||
} * ColorCube;
|
||||
} *ColorCube;
|
||||
|
||||
#define MAX(a, b) (a) > (b) ? (a) : (b)
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <math.h>
|
||||
|
||||
#define ROUND_UP(f) ((int)((f) >= 0.0 ? (f) + 0.5F : (f)-0.5F))
|
||||
#define ROUND_UP(f) ((int)((f) >= 0.0 ? (f) + 0.5F : (f) - 0.5F))
|
||||
|
||||
UINT32
|
||||
division_UINT32(int divider, int result_bits) {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <math.h>
|
||||
|
||||
#define ROUND_UP(f) ((int)((f) >= 0.0 ? (f) + 0.5F : (f)-0.5F))
|
||||
#define ROUND_UP(f) ((int)((f) >= 0.0 ? (f) + 0.5F : (f) - 0.5F))
|
||||
|
||||
struct filter {
|
||||
double (*filter)(double x);
|
||||
|
|
|
@ -113,7 +113,8 @@ expandrow(UINT8 *dest, UINT8 *src, int n, int z, int xsize, UINT8 *end_of_buffer
|
|||
}
|
||||
|
||||
static int
|
||||
expandrow2(UINT8 *dest, const UINT8 *src, int n, int z, int xsize, UINT8 *end_of_buffer) {
|
||||
expandrow2(
|
||||
UINT8 *dest, const UINT8 *src, int n, int z, int xsize, UINT8 *end_of_buffer) {
|
||||
UINT8 pixel, count;
|
||||
int x = 0;
|
||||
|
||||
|
@ -197,7 +198,6 @@ ImagingSgiRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t
|
|||
return -1;
|
||||
}
|
||||
|
||||
|
||||
/* decoder initialization */
|
||||
state->count = 0;
|
||||
state->y = 0;
|
||||
|
@ -252,7 +252,7 @@ ImagingSgiRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t
|
|||
c->rlelength,
|
||||
im->bands,
|
||||
im->xsize,
|
||||
&ptr[c->bufsize-1]);
|
||||
&ptr[c->bufsize - 1]);
|
||||
} else {
|
||||
status = expandrow2(
|
||||
&state->buffer[c->channo * 2],
|
||||
|
@ -260,7 +260,7 @@ ImagingSgiRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t
|
|||
c->rlelength,
|
||||
im->bands,
|
||||
im->xsize,
|
||||
&ptr[c->bufsize-1]);
|
||||
&ptr[c->bufsize - 1]);
|
||||
}
|
||||
if (status == -1) {
|
||||
state->errcode = IMAGING_CODEC_OVERRUN;
|
||||
|
@ -268,7 +268,6 @@ ImagingSgiRleDecode(Imaging im, ImagingCodecState state, UINT8 *buf, Py_ssize_t
|
|||
} else if (status == 1) {
|
||||
goto sgi_finish_decode;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* store decompressed data in image */
|
||||
|
|
|
@ -418,9 +418,8 @@ ImagingAllocateArray(Imaging im, int dirty, int block_size) {
|
|||
}
|
||||
im->blocks[current_block] = block;
|
||||
/* Bulletproof code from libc _int_memalign */
|
||||
aligned_ptr = (char *)(
|
||||
((size_t) (block.ptr + arena->alignment - 1)) &
|
||||
-((Py_ssize_t) arena->alignment));
|
||||
aligned_ptr = (char *)(((size_t)(block.ptr + arena->alignment - 1)) &
|
||||
-((Py_ssize_t)arena->alignment));
|
||||
}
|
||||
|
||||
im->image[y] = aligned_ptr + aligned_linesize * line_in_block;
|
||||
|
|
|
@ -60,7 +60,11 @@ _tiffReadProc(thandle_t hdata, tdata_t buf, tsize_t size) {
|
|||
dump_state(state);
|
||||
|
||||
if (state->loc > state->eof) {
|
||||
TIFFError("_tiffReadProc", "Invalid Read at loc %" PRIu64 ", eof: %" PRIu64, state->loc, state->eof);
|
||||
TIFFError(
|
||||
"_tiffReadProc",
|
||||
"Invalid Read at loc %" PRIu64 ", eof: %" PRIu64,
|
||||
state->loc,
|
||||
state->eof);
|
||||
return 0;
|
||||
}
|
||||
to_read = min(size, min(state->size, (tsize_t)state->eof) - (tsize_t)state->loc);
|
||||
|
@ -217,7 +221,12 @@ ImagingLibTiffInit(ImagingCodecState state, int fp, uint32_t offset) {
|
|||
}
|
||||
|
||||
int
|
||||
_pickUnpackers(Imaging im, ImagingCodecState state, TIFF *tiff, uint16_t planarconfig, ImagingShuffler *unpackers) {
|
||||
_pickUnpackers(
|
||||
Imaging im,
|
||||
ImagingCodecState state,
|
||||
TIFF *tiff,
|
||||
uint16_t planarconfig,
|
||||
ImagingShuffler *unpackers) {
|
||||
// if number of bands is 1, there is no difference with contig case
|
||||
if (planarconfig == PLANARCONFIG_SEPARATE && im->bands > 1) {
|
||||
uint16_t bits_per_sample = 8;
|
||||
|
@ -232,10 +241,14 @@ _pickUnpackers(Imaging im, ImagingCodecState state, TIFF *tiff, uint16_t planarc
|
|||
// We'll pick appropriate set of unpackers depending on planar_configuration
|
||||
// It does not matter if data is RGB(A), CMYK or LUV really,
|
||||
// we just copy it plane by plane
|
||||
unpackers[0] = ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "R;16N" : "R", NULL);
|
||||
unpackers[1] = ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "G;16N" : "G", NULL);
|
||||
unpackers[2] = ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "B;16N" : "B", NULL);
|
||||
unpackers[3] = ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "A;16N" : "A", NULL);
|
||||
unpackers[0] =
|
||||
ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "R;16N" : "R", NULL);
|
||||
unpackers[1] =
|
||||
ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "G;16N" : "G", NULL);
|
||||
unpackers[2] =
|
||||
ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "B;16N" : "B", NULL);
|
||||
unpackers[3] =
|
||||
ImagingFindUnpacker("RGBA", bits_per_sample == 16 ? "A;16N" : "A", NULL);
|
||||
|
||||
return im->bands;
|
||||
} else {
|
||||
|
@ -247,10 +260,10 @@ _pickUnpackers(Imaging im, ImagingCodecState state, TIFF *tiff, uint16_t planarc
|
|||
|
||||
int
|
||||
_decodeAsRGBA(Imaging im, ImagingCodecState state, TIFF *tiff) {
|
||||
// To avoid dealing with YCbCr subsampling and other complications, let libtiff handle it
|
||||
// Use a TIFFRGBAImage wrapping the tiff image, and let libtiff handle
|
||||
// all of the conversion. Metadata read from the TIFFRGBAImage could
|
||||
// be different from the metadata that the base tiff returns.
|
||||
// To avoid dealing with YCbCr subsampling and other complications, let libtiff
|
||||
// handle it Use a TIFFRGBAImage wrapping the tiff image, and let libtiff handle all
|
||||
// of the conversion. Metadata read from the TIFFRGBAImage could be different from
|
||||
// the metadata that the base tiff returns.
|
||||
|
||||
INT32 current_row;
|
||||
UINT8 *new_data;
|
||||
|
@ -259,17 +272,16 @@ _decodeAsRGBA(Imaging im, ImagingCodecState state, TIFF *tiff) {
|
|||
TIFFRGBAImage img;
|
||||
char emsg[1024] = "";
|
||||
|
||||
// Since using TIFFRGBAImage* functions, we can read whole tiff into rastrr in one call
|
||||
// Let's select smaller block size. Multiplying image width by (tile length OR rows per strip)
|
||||
// gives us manageable block size in pixels
|
||||
// Since using TIFFRGBAImage* functions, we can read whole tiff into rastrr in one
|
||||
// call Let's select smaller block size. Multiplying image width by (tile length OR
|
||||
// rows per strip) gives us manageable block size in pixels
|
||||
if (TIFFIsTiled(tiff)) {
|
||||
ret = TIFFGetFieldDefaulted(tiff, TIFFTAG_TILELENGTH, &rows_per_block);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
ret = TIFFGetFieldDefaulted(tiff, TIFFTAG_ROWSPERSTRIP, &rows_per_block);
|
||||
}
|
||||
|
||||
if (ret != 1 || rows_per_block==(UINT32)(-1)) {
|
||||
if (ret != 1 || rows_per_block == (UINT32)(-1)) {
|
||||
rows_per_block = state->ysize;
|
||||
}
|
||||
|
||||
|
@ -357,7 +369,12 @@ decodergba_err:
|
|||
}
|
||||
|
||||
int
|
||||
_decodeTile(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, ImagingShuffler *unpackers) {
|
||||
_decodeTile(
|
||||
Imaging im,
|
||||
ImagingCodecState state,
|
||||
TIFF *tiff,
|
||||
int planes,
|
||||
ImagingShuffler *unpackers) {
|
||||
INT32 x, y, tile_y, current_tile_length, current_tile_width;
|
||||
UINT32 tile_width, tile_length;
|
||||
tsize_t tile_bytes_size, row_byte_size;
|
||||
|
@ -396,8 +413,8 @@ _decodeTile(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imaging
|
|||
|
||||
if (tile_bytes_size > ((tile_length * state->bits / planes + 7) / 8) * tile_width) {
|
||||
// If the tile size as expected by LibTiff isn't what we're expecting, abort.
|
||||
// man: TIFFTileSize returns the equivalent size for a tile of data as it would be returned in a
|
||||
// call to TIFFReadTile ...
|
||||
// man: TIFFTileSize returns the equivalent size for a tile of data as it
|
||||
// would be returned in a call to TIFFReadTile ...
|
||||
state->errcode = IMAGING_CODEC_BROKEN;
|
||||
return -1;
|
||||
}
|
||||
|
@ -428,19 +445,24 @@ _decodeTile(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imaging
|
|||
|
||||
TRACE(("Read tile at %dx%d; \n\n", x, y));
|
||||
|
||||
current_tile_width = min((INT32) tile_width, state->xsize - x);
|
||||
current_tile_length = min((INT32) tile_length, state->ysize - y);
|
||||
current_tile_width = min((INT32)tile_width, state->xsize - x);
|
||||
current_tile_length = min((INT32)tile_length, state->ysize - y);
|
||||
// iterate over each line in the tile and stuff data into image
|
||||
for (tile_y = 0; tile_y < current_tile_length; tile_y++) {
|
||||
TRACE(("Writing tile data at %dx%d using tile_width: %d; \n", tile_y + y, x, current_tile_width));
|
||||
TRACE(
|
||||
("Writing tile data at %dx%d using tile_width: %d; \n",
|
||||
tile_y + y,
|
||||
x,
|
||||
current_tile_width));
|
||||
|
||||
// UINT8 * bbb = state->buffer + tile_y * row_byte_size;
|
||||
// TRACE(("chars: %x%x%x%x\n", ((UINT8 *)bbb)[0], ((UINT8 *)bbb)[1], ((UINT8 *)bbb)[2], ((UINT8 *)bbb)[3]));
|
||||
// TRACE(("chars: %x%x%x%x\n", ((UINT8 *)bbb)[0], ((UINT8 *)bbb)[1],
|
||||
// ((UINT8 *)bbb)[2], ((UINT8 *)bbb)[3]));
|
||||
|
||||
shuffler((UINT8*) im->image[tile_y + y] + x * im->pixelsize,
|
||||
state->buffer + tile_y * row_byte_size,
|
||||
current_tile_width
|
||||
);
|
||||
shuffler(
|
||||
(UINT8 *)im->image[tile_y + y] + x * im->pixelsize,
|
||||
state->buffer + tile_y * row_byte_size,
|
||||
current_tile_width);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -450,7 +472,12 @@ _decodeTile(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imaging
|
|||
}
|
||||
|
||||
int
|
||||
_decodeStrip(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, ImagingShuffler *unpackers) {
|
||||
_decodeStrip(
|
||||
Imaging im,
|
||||
ImagingCodecState state,
|
||||
TIFF *tiff,
|
||||
int planes,
|
||||
ImagingShuffler *unpackers) {
|
||||
INT32 strip_row = 0;
|
||||
UINT8 *new_data;
|
||||
UINT32 rows_per_strip;
|
||||
|
@ -458,7 +485,7 @@ _decodeStrip(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imagin
|
|||
tsize_t strip_size, row_byte_size, unpacker_row_byte_size;
|
||||
|
||||
ret = TIFFGetField(tiff, TIFFTAG_ROWSPERSTRIP, &rows_per_strip);
|
||||
if (ret != 1 || rows_per_strip==(UINT32)(-1)) {
|
||||
if (ret != 1 || rows_per_strip == (UINT32)(-1)) {
|
||||
rows_per_strip = state->ysize;
|
||||
}
|
||||
|
||||
|
@ -478,8 +505,8 @@ _decodeStrip(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imagin
|
|||
unpacker_row_byte_size = (state->xsize * state->bits / planes + 7) / 8;
|
||||
if (strip_size > (unpacker_row_byte_size * rows_per_strip)) {
|
||||
// If the strip size as expected by LibTiff isn't what we're expecting, abort.
|
||||
// man: TIFFStripSize returns the equivalent size for a strip of data as it would be returned in a
|
||||
// call to TIFFReadEncodedStrip ...
|
||||
// man: TIFFStripSize returns the equivalent size for a strip of data as it
|
||||
// would be returned in a call to TIFFReadEncodedStrip ...
|
||||
state->errcode = IMAGING_CODEC_BROKEN;
|
||||
return -1;
|
||||
}
|
||||
|
@ -513,8 +540,13 @@ _decodeStrip(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imagin
|
|||
int plane;
|
||||
for (plane = 0; plane < planes; plane++) {
|
||||
ImagingShuffler shuffler = unpackers[plane];
|
||||
if (TIFFReadEncodedStrip(tiff, TIFFComputeStrip(tiff, state->y, plane), (tdata_t)state->buffer, strip_size) == -1) {
|
||||
TRACE(("Decode Error, strip %d\n", TIFFComputeStrip(tiff, state->y, 0)));
|
||||
if (TIFFReadEncodedStrip(
|
||||
tiff,
|
||||
TIFFComputeStrip(tiff, state->y, plane),
|
||||
(tdata_t)state->buffer,
|
||||
strip_size) == -1) {
|
||||
TRACE(
|
||||
("Decode Error, strip %d\n", TIFFComputeStrip(tiff, state->y, 0)));
|
||||
state->errcode = IMAGING_CODEC_BROKEN;
|
||||
return -1;
|
||||
}
|
||||
|
@ -523,16 +555,17 @@ _decodeStrip(Imaging im, ImagingCodecState state, TIFF *tiff, int planes, Imagin
|
|||
|
||||
// iterate over each row in the strip and stuff data into image
|
||||
for (strip_row = 0;
|
||||
strip_row < min((INT32) rows_per_strip, state->ysize - state->y);
|
||||
strip_row < min((INT32)rows_per_strip, state->ysize - state->y);
|
||||
strip_row++) {
|
||||
TRACE(("Writing data into line %d ; \n", state->y + strip_row));
|
||||
|
||||
// UINT8 * bbb = state->buffer + strip_row * (state->bytes / rows_per_strip);
|
||||
// TRACE(("chars: %x %x %x %x\n", ((UINT8 *)bbb)[0], ((UINT8 *)bbb)[1], ((UINT8 *)bbb)[2], ((UINT8 *)bbb)[3]));
|
||||
// UINT8 * bbb = state->buffer + strip_row * (state->bytes /
|
||||
// rows_per_strip); TRACE(("chars: %x %x %x %x\n", ((UINT8 *)bbb)[0],
|
||||
// ((UINT8 *)bbb)[1], ((UINT8 *)bbb)[2], ((UINT8 *)bbb)[3]));
|
||||
|
||||
shuffler(
|
||||
(UINT8*) im->image[state->y + state->yoff + strip_row] +
|
||||
state->xoff * im->pixelsize,
|
||||
(UINT8 *)im->image[state->y + state->yoff + strip_row] +
|
||||
state->xoff * im->pixelsize,
|
||||
state->buffer + strip_row * row_byte_size,
|
||||
state->xsize);
|
||||
}
|
||||
|
@ -666,7 +699,6 @@ ImagingLibTiffDecode(
|
|||
goto decode_err;
|
||||
}
|
||||
|
||||
|
||||
TIFFGetField(tiff, TIFFTAG_PHOTOMETRIC, &photometric);
|
||||
TIFFGetField(tiff, TIFFTAG_COMPRESSION, &compression);
|
||||
TIFFGetFieldDefaulted(tiff, TIFFTAG_PLANARCONFIG, &planarconfig);
|
||||
|
@ -675,16 +707,17 @@ ImagingLibTiffDecode(
|
|||
// Let LibTiff read them as RGBA
|
||||
readAsRGBA = photometric == PHOTOMETRIC_YCBCR;
|
||||
|
||||
if (readAsRGBA && compression == COMPRESSION_JPEG && planarconfig == PLANARCONFIG_CONTIG) {
|
||||
// If using new JPEG compression, let libjpeg do RGB conversion for performance reasons
|
||||
if (readAsRGBA && compression == COMPRESSION_JPEG &&
|
||||
planarconfig == PLANARCONFIG_CONTIG) {
|
||||
// If using new JPEG compression, let libjpeg do RGB conversion for performance
|
||||
// reasons
|
||||
TIFFSetField(tiff, TIFFTAG_JPEGCOLORMODE, JPEGCOLORMODE_RGB);
|
||||
readAsRGBA = 0;
|
||||
}
|
||||
|
||||
if (readAsRGBA) {
|
||||
_decodeAsRGBA(im, state, tiff);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
planes = _pickUnpackers(im, state, tiff, planarconfig, unpackers);
|
||||
if (planes <= 0) {
|
||||
goto decode_err;
|
||||
|
@ -692,8 +725,7 @@ ImagingLibTiffDecode(
|
|||
|
||||
if (TIFFIsTiled(tiff)) {
|
||||
_decodeTile(im, state, tiff, planes, unpackers);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
_decodeStrip(im, state, tiff, planes, unpackers);
|
||||
}
|
||||
|
||||
|
@ -702,20 +734,20 @@ ImagingLibTiffDecode(
|
|||
// so we have to convert it to RGBA
|
||||
if (planes > 3 && strcmp(im->mode, "RGBA") == 0) {
|
||||
uint16_t extrasamples;
|
||||
uint16_t* sampleinfo;
|
||||
uint16_t *sampleinfo;
|
||||
ImagingShuffler shuffle;
|
||||
INT32 y;
|
||||
|
||||
TIFFGetFieldDefaulted(tiff, TIFFTAG_EXTRASAMPLES, &extrasamples, &sampleinfo);
|
||||
TIFFGetFieldDefaulted(
|
||||
tiff, TIFFTAG_EXTRASAMPLES, &extrasamples, &sampleinfo);
|
||||
|
||||
if (extrasamples >= 1 &&
|
||||
(sampleinfo[0] == EXTRASAMPLE_UNSPECIFIED || sampleinfo[0] == EXTRASAMPLE_ASSOCALPHA)
|
||||
) {
|
||||
if (extrasamples >= 1 && (sampleinfo[0] == EXTRASAMPLE_UNSPECIFIED ||
|
||||
sampleinfo[0] == EXTRASAMPLE_ASSOCALPHA)) {
|
||||
shuffle = ImagingFindUnpacker("RGBA", "RGBa", NULL);
|
||||
|
||||
for (y = state->yoff; y < state->ysize; y++) {
|
||||
UINT8* ptr = (UINT8*) im->image[y + state->yoff] +
|
||||
state->xoff * im->pixelsize;
|
||||
UINT8 *ptr = (UINT8 *)im->image[y + state->yoff] +
|
||||
state->xoff * im->pixelsize;
|
||||
shuffle(ptr, ptr, state->xsize);
|
||||
}
|
||||
}
|
||||
|
@ -723,7 +755,7 @@ ImagingLibTiffDecode(
|
|||
}
|
||||
}
|
||||
|
||||
decode_err:
|
||||
decode_err:
|
||||
// TIFFClose in libtiff calls tif_closeproc and TIFFCleanup
|
||||
if (clientstate->fp) {
|
||||
// Pillow will manage the closing of the file rather than libtiff
|
||||
|
@ -973,7 +1005,8 @@ ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int byt
|
|||
}
|
||||
|
||||
if (state->state == 1 && !clientstate->fp) {
|
||||
int read = (int)_tiffReadProc(clientstate, (tdata_t)buffer, (tsize_t)bytes);
|
||||
int read =
|
||||
(int)_tiffReadProc((thandle_t)clientstate, (tdata_t)buffer, (tsize_t)bytes);
|
||||
TRACE(
|
||||
("Buffer: %p: %c%c%c%c\n",
|
||||
buffer,
|
||||
|
|
|
@ -30,7 +30,7 @@ typedef struct {
|
|||
* Should be uint32 for libtiff 3.9.x
|
||||
* uint64 for libtiff 4.0.x
|
||||
*/
|
||||
TIFF *tiff; /* Used in write */
|
||||
TIFF *tiff; /* Used in write */
|
||||
toff_t eof;
|
||||
int flrealloc; /* may we realloc */
|
||||
} TIFFSTATE;
|
||||
|
|
|
@ -1437,90 +1437,90 @@ band3I(UINT8 *out, const UINT8 *in, int pixels) {
|
|||
}
|
||||
|
||||
static void
|
||||
band016B(UINT8* out, const UINT8* in, int pixels)
|
||||
{
|
||||
band016B(UINT8 *out, const UINT8 *in, int pixels) {
|
||||
int i;
|
||||
/* band 0 only, big endian */
|
||||
for (i = 0; i < pixels; i++) {
|
||||
out[0] = in[0];
|
||||
out += 4; in += 2;
|
||||
out += 4;
|
||||
in += 2;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
band116B(UINT8* out, const UINT8* in, int pixels)
|
||||
{
|
||||
band116B(UINT8 *out, const UINT8 *in, int pixels) {
|
||||
int i;
|
||||
/* band 1 only, big endian */
|
||||
for (i = 0; i < pixels; i++) {
|
||||
out[1] = in[0];
|
||||
out += 4; in += 2;
|
||||
out += 4;
|
||||
in += 2;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
band216B(UINT8* out, const UINT8* in, int pixels)
|
||||
{
|
||||
band216B(UINT8 *out, const UINT8 *in, int pixels) {
|
||||
int i;
|
||||
/* band 2 only, big endian */
|
||||
for (i = 0; i < pixels; i++) {
|
||||
out[2] = in[0];
|
||||
out += 4; in += 2;
|
||||
out += 4;
|
||||
in += 2;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
band316B(UINT8* out, const UINT8* in, int pixels)
|
||||
{
|
||||
band316B(UINT8 *out, const UINT8 *in, int pixels) {
|
||||
int i;
|
||||
/* band 3 only, big endian */
|
||||
for (i = 0; i < pixels; i++) {
|
||||
out[3] = in[0];
|
||||
out += 4; in += 2;
|
||||
out += 4;
|
||||
in += 2;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
band016L(UINT8* out, const UINT8* in, int pixels)
|
||||
{
|
||||
band016L(UINT8 *out, const UINT8 *in, int pixels) {
|
||||
int i;
|
||||
/* band 0 only, little endian */
|
||||
for (i = 0; i < pixels; i++) {
|
||||
out[0] = in[1];
|
||||
out += 4; in += 2;
|
||||
out += 4;
|
||||
in += 2;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
band116L(UINT8* out, const UINT8* in, int pixels)
|
||||
{
|
||||
band116L(UINT8 *out, const UINT8 *in, int pixels) {
|
||||
int i;
|
||||
/* band 1 only, little endian */
|
||||
for (i = 0; i < pixels; i++) {
|
||||
out[1] = in[1];
|
||||
out += 4; in += 2;
|
||||
out += 4;
|
||||
in += 2;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
band216L(UINT8* out, const UINT8* in, int pixels)
|
||||
{
|
||||
band216L(UINT8 *out, const UINT8 *in, int pixels) {
|
||||
int i;
|
||||
/* band 2 only, little endian */
|
||||
for (i = 0; i < pixels; i++) {
|
||||
out[2] = in[1];
|
||||
out += 4; in += 2;
|
||||
out += 4;
|
||||
in += 2;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
band316L(UINT8* out, const UINT8* in, int pixels)
|
||||
{
|
||||
band316L(UINT8 *out, const UINT8 *in, int pixels) {
|
||||
int i;
|
||||
/* band 3 only, little endian */
|
||||
for (i = 0; i < pixels; i++) {
|
||||
out[3] = in[1];
|
||||
out += 4; in += 2;
|
||||
out += 4;
|
||||
in += 2;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1687,7 +1687,6 @@ static struct {
|
|||
{"RGB", "G;16N", 16, band116L},
|
||||
{"RGB", "B;16N", 16, band216L},
|
||||
|
||||
|
||||
{"RGBA", "R;16N", 16, band016L},
|
||||
{"RGBA", "G;16N", 16, band116L},
|
||||
{"RGBA", "B;16N", 16, band216L},
|
||||
|
|
36
src/path.c
36
src/path.c
|
@ -162,24 +162,24 @@ PyPath_Flatten(PyObject *data, double **pxy) {
|
|||
return -1;
|
||||
}
|
||||
|
||||
#define assign_item_to_array(op, decref) \
|
||||
if (PyFloat_Check(op)) { \
|
||||
xy[j++] = PyFloat_AS_DOUBLE(op); \
|
||||
} else if (PyLong_Check(op)) { \
|
||||
xy[j++] = (float)PyLong_AS_LONG(op); \
|
||||
} else if (PyNumber_Check(op)) { \
|
||||
xy[j++] = PyFloat_AsDouble(op); \
|
||||
} else if (PyArg_ParseTuple(op, "dd", &x, &y)) { \
|
||||
xy[j++] = x; \
|
||||
xy[j++] = y; \
|
||||
} else { \
|
||||
PyErr_SetString(PyExc_ValueError, "incorrect coordinate type"); \
|
||||
if (decref) { \
|
||||
Py_DECREF(op); \
|
||||
} \
|
||||
free(xy); \
|
||||
return -1; \
|
||||
}
|
||||
#define assign_item_to_array(op, decref) \
|
||||
if (PyFloat_Check(op)) { \
|
||||
xy[j++] = PyFloat_AS_DOUBLE(op); \
|
||||
} else if (PyLong_Check(op)) { \
|
||||
xy[j++] = (float)PyLong_AS_LONG(op); \
|
||||
} else if (PyNumber_Check(op)) { \
|
||||
xy[j++] = PyFloat_AsDouble(op); \
|
||||
} else if (PyArg_ParseTuple(op, "dd", &x, &y)) { \
|
||||
xy[j++] = x; \
|
||||
xy[j++] = y; \
|
||||
} else { \
|
||||
PyErr_SetString(PyExc_ValueError, "incorrect coordinate type"); \
|
||||
if (decref) { \
|
||||
Py_DECREF(op); \
|
||||
} \
|
||||
free(xy); \
|
||||
return -1; \
|
||||
}
|
||||
|
||||
/* Copy table to path array */
|
||||
if (PyList_Check(data)) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user