python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-11 08:42:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into context_manager

Browse Source
This commit is contained in:
Andrew Murray 2025-01-31 23:21:50 +11:00 committed by GitHub
commit b9d3bb6347
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
22 changed files with 143 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/test_file_libtiff.py
View File

@ -1132,11 +1132,13 @@ class TestFileLibTiff(LibTiffTestCase):
) )
def test_buffering(self, test_file: str) -> None: def test_buffering(self, test_file: str) -> None:
# load exif first # load exif first
with Image.open(open(test_file, "rb", buffering=1048576)) as im: with open(test_file, "rb", buffering=1048576) as f:
with Image.open(f) as im:
exif = dict(im.getexif()) exif = dict(im.getexif())
# load image before exif # load image before exif
with Image.open(open(test_file, "rb", buffering=1048576)) as im2: with open(test_file, "rb", buffering=1048576) as f:
with Image.open(f) as im2:
im2.load() im2.load()
exif_after_load = dict(im2.getexif()) exif_after_load = dict(im2.getexif())

22
Tests/test_imagedraw.py
View File

@ -1397,6 +1397,28 @@ def test_stroke_descender() -> None:
assert_image_similar_tofile(im, "Tests/images/imagedraw_stroke_descender.png", 6.76) assert_image_similar_tofile(im, "Tests/images/imagedraw_stroke_descender.png", 6.76)
@skip_unless_feature("freetype2")
def test_stroke_inside_gap() -> None:
# Arrange
im = Image.new("RGB", (120, 130))
draw = ImageDraw.Draw(im)
font = ImageFont.truetype("Tests/fonts/FreeMono.ttf", 120)
# Act
draw.text((12, 12), "i", "#f00", font, stroke_width=20)
# Assert
for y in range(im.height):
glyph = ""
for x in range(im.width):
if im.getpixel((x, y)) == (0, 0, 0):
if glyph == "started":
glyph = "ended"
else:
assert glyph != "ended", "Gap inside stroked glyph"
glyph = "started"
@skip_unless_feature("freetype2") @skip_unless_feature("freetype2")
def test_split_word() -> None: def test_split_word() -> None:
# Arrange # Arrange

14
Tests/test_imagefont.py
View File

@ -461,6 +461,20 @@ def test_free_type_font_get_mask(font: ImageFont.FreeTypeFont) -> None:
assert mask.size == (108, 13) assert mask.size == (108, 13)
def test_stroke_mask() -> None:
# Arrange
text = "i"
# Act
font = ImageFont.truetype(FONT_PATH, 128)
mask = font.getmask(text, stroke_width=2)
# Assert
assert mask.getpixel((34, 5)) == 255
assert mask.getpixel((38, 5)) == 0
assert mask.getpixel((42, 5)) == 255
def test_load_when_image_not_found() -> None: def test_load_when_image_not_found() -> None:
with tempfile.NamedTemporaryFile(delete=False) as tmp: with tempfile.NamedTemporaryFile(delete=False) as tmp:
pass pass

5
src/PIL/BufrStubImagePlugin.py
View File

@ -10,6 +10,7 @@
# #
from __future__ import annotations from __future__ import annotations
import os
from typing import IO from typing import IO
from . import Image, ImageFile from . import Image, ImageFile
@ -41,13 +42,11 @@ class BufrStubImageFile(ImageFile.StubImageFile):
def _open(self) -> None: def _open(self) -> None:
assert self.fp is not None assert self.fp is not None
offset = self.fp.tell()
if not _accept(self.fp.read(4)): if not _accept(self.fp.read(4)):
msg = "Not a BUFR file" msg = "Not a BUFR file"
raise SyntaxError(msg) raise SyntaxError(msg)
self.fp.seek(offset) self.fp.seek(-4, os.SEEK_CUR)
# make something up # make something up
self._mode = "F" self._mode = "F"

5
src/PIL/GribStubImagePlugin.py
View File

@ -10,6 +10,7 @@
# #
from __future__ import annotations from __future__ import annotations
import os
from typing import IO from typing import IO
from . import Image, ImageFile from . import Image, ImageFile
@ -41,13 +42,11 @@ class GribStubImageFile(ImageFile.StubImageFile):
def _open(self) -> None: def _open(self) -> None:
assert self.fp is not None assert self.fp is not None
offset = self.fp.tell()
if not _accept(self.fp.read(8)): if not _accept(self.fp.read(8)):
msg = "Not a GRIB file" msg = "Not a GRIB file"
raise SyntaxError(msg) raise SyntaxError(msg)
self.fp.seek(offset) self.fp.seek(-8, os.SEEK_CUR)
# make something up # make something up
self._mode = "F" self._mode = "F"

5
src/PIL/Hdf5StubImagePlugin.py
View File

@ -10,6 +10,7 @@
# #
from __future__ import annotations from __future__ import annotations
import os
from typing import IO from typing import IO
from . import Image, ImageFile from . import Image, ImageFile
@ -41,13 +42,11 @@ class HDF5StubImageFile(ImageFile.StubImageFile):
def _open(self) -> None: def _open(self) -> None:
assert self.fp is not None assert self.fp is not None
offset = self.fp.tell()
if not _accept(self.fp.read(8)): if not _accept(self.fp.read(8)):
msg = "Not an HDF file" msg = "Not an HDF file"
raise SyntaxError(msg) raise SyntaxError(msg)
self.fp.seek(offset) self.fp.seek(-8, os.SEEK_CUR)
# make something up # make something up
self._mode = "F" self._mode = "F"

4
src/PIL/ImageDraw.py
View File

@ -643,6 +643,7 @@ class ImageDraw:
features=features, features=features,
language=language, language=language,
stroke_width=stroke_width, stroke_width=stroke_width,
stroke_filled=True,
anchor=anchor, anchor=anchor,
ink=ink, ink=ink,
start=start, start=start,
@ -692,7 +693,8 @@ class ImageDraw:
draw_text(stroke_ink, stroke_width) draw_text(stroke_ink, stroke_width)
# Draw normal text # Draw normal text
draw_text(ink, 0) if ink != stroke_ink:
draw_text(ink)
else: else:
# Only draw normal text # Only draw normal text
draw_text(ink) draw_text(ink)

1
src/PIL/ImageFont.py
View File

@ -644,6 +644,7 @@ class FreeTypeFont:
features, features,
language, language,
stroke_width, stroke_width,
kwargs.get("stroke_filled", False),
anchor, anchor,
ink, ink,
start[0], start[0],

2
src/PIL/PngImagePlugin.py
View File

@ -1388,7 +1388,7 @@ def _save(
b"\0", # 12: interlace flag b"\0", # 12: interlace flag
) )
chunks = [b"cHRM", b"gAMA", b"sBIT", b"sRGB", b"tIME"] chunks = [b"cHRM", b"cICP", b"gAMA", b"sBIT", b"sRGB", b"tIME"]
icc = im.encoderinfo.get("icc_profile", im.info.get("icc_profile")) icc = im.encoderinfo.get("icc_profile", im.info.get("icc_profile"))
if icc: if icc:

1
src/PIL/_imagingft.pyi
View File

@ -28,6 +28,7 @@ class Font:
features: list[str] | None, features: list[str] | None,
lang: str | None, lang: str | None,
stroke_width: float, stroke_width: float,
stroke_filled: bool,
anchor: str | None, anchor: str | None,
foreground_ink_long: int, foreground_ink_long: int,
x_start: float, x_start: float,

93
src/_imaging.c
View File

@ -473,8 +473,7 @@ getpixel(Imaging im, ImagingAccess access, int x, int y) {
} }
/* unknown type */ /* unknown type */
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static char * static char *
@ -965,8 +964,7 @@ _convert2(ImagingObject *self, PyObject *args) {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -1214,8 +1212,7 @@ _getpixel(ImagingObject *self, PyObject *args) {
} }
if (self->access == NULL) { if (self->access == NULL) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
return getpixel(self->image, self->access, x, y); return getpixel(self->image, self->access, x, y);
@ -1417,8 +1414,7 @@ _paste(ImagingObject *self, PyObject *args) {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -1691,8 +1687,7 @@ _putdata(ImagingObject *self, PyObject *args) {
Py_XDECREF(seq); Py_XDECREF(seq);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -1752,8 +1747,7 @@ _putpalette(ImagingObject *self, PyObject *args) {
self->image->palette->size = palettesize * 8 / bits; self->image->palette->size = palettesize * 8 / bits;
unpack(self->image->palette->palette, palette, self->image->palette->size); unpack(self->image->palette->palette, palette, self->image->palette->size);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -1777,8 +1771,7 @@ _putpalettealpha(ImagingObject *self, PyObject *args) {
strcpy(self->image->palette->mode, "RGBA"); strcpy(self->image->palette->mode, "RGBA");
self->image->palette->palette[index * 4 + 3] = (UINT8)alpha; self->image->palette->palette[index * 4 + 3] = (UINT8)alpha;
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -1805,8 +1798,7 @@ _putpalettealphas(ImagingObject *self, PyObject *args) {
self->image->palette->palette[i * 4 + 3] = (UINT8)values[i]; self->image->palette->palette[i * 4 + 3] = (UINT8)values[i];
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -1842,8 +1834,7 @@ _putpixel(ImagingObject *self, PyObject *args) {
self->access->put_pixel(im, x, y, ink); self->access->put_pixel(im, x, y, ink);
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -2010,8 +2001,7 @@ im_setmode(ImagingObject *self, PyObject *args) {
} }
self->access = ImagingAccessNew(im); self->access = ImagingAccessNew(im);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -2074,8 +2064,7 @@ _transform(ImagingObject *self, PyObject *args) {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -2202,8 +2191,7 @@ _getbbox(ImagingObject *self, PyObject *args) {
} }
if (!ImagingGetBBox(self->image, bbox, alpha_only)) { if (!ImagingGetBBox(self->image, bbox, alpha_only)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
return Py_BuildValue("iiii", bbox[0], bbox[1], bbox[2], bbox[3]); return Py_BuildValue("iiii", bbox[0], bbox[1], bbox[2], bbox[3]);
@ -2283,8 +2271,7 @@ _getextrema(ImagingObject *self) {
} }
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -2347,8 +2334,7 @@ _fillband(ImagingObject *self, PyObject *args) {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -2363,8 +2349,7 @@ _putband(ImagingObject *self, PyObject *args) {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -2950,8 +2935,7 @@ _draw_arc(ImagingDrawObject *self, PyObject *args) {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -2988,8 +2972,7 @@ _draw_bitmap(ImagingDrawObject *self, PyObject *args) {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -3045,8 +3028,7 @@ _draw_chord(ImagingDrawObject *self, PyObject *args) {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -3100,8 +3082,7 @@ _draw_ellipse(ImagingDrawObject *self, PyObject *args) {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -3164,8 +3145,7 @@ _draw_lines(ImagingDrawObject *self, PyObject *args) {
free(xy); free(xy);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -3196,8 +3176,7 @@ _draw_points(ImagingDrawObject *self, PyObject *args) {
free(xy); free(xy);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* from outline.c */ /* from outline.c */
@ -3225,8 +3204,7 @@ _draw_outline(ImagingDrawObject *self, PyObject *args) {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -3282,8 +3260,7 @@ _draw_pieslice(ImagingDrawObject *self, PyObject *args) {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -3334,8 +3311,7 @@ _draw_polygon(ImagingDrawObject *self, PyObject *args) {
free(ixy); free(ixy);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -3389,8 +3365,7 @@ _draw_rectangle(ImagingDrawObject *self, PyObject *args) {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static struct PyMethodDef _draw_methods[] = { static struct PyMethodDef _draw_methods[] = {
@ -3595,8 +3570,7 @@ _save_ppm(ImagingObject *self, PyObject *args) {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
@ -3984,8 +3958,7 @@ _reset_stats(PyObject *self, PyObject *args) {
arena->stats_freed_blocks = 0; arena->stats_freed_blocks = 0;
MUTEX_UNLOCK(&ImagingDefaultArena.mutex); MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -4045,8 +4018,7 @@ _set_alignment(PyObject *self, PyObject *args) {
ImagingDefaultArena.alignment = alignment; ImagingDefaultArena.alignment = alignment;
MUTEX_UNLOCK(&ImagingDefaultArena.mutex); MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -4070,8 +4042,7 @@ _set_block_size(PyObject *self, PyObject *args) {
ImagingDefaultArena.block_size = block_size; ImagingDefaultArena.block_size = block_size;
MUTEX_UNLOCK(&ImagingDefaultArena.mutex); MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -4099,8 +4070,7 @@ _set_blocks_max(PyObject *self, PyObject *args) {
return ImagingError_MemoryError(); return ImagingError_MemoryError();
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -4115,8 +4085,7 @@ _clear_cache(PyObject *self, PyObject *args) {
ImagingMemoryClearCache(&ImagingDefaultArena, i); ImagingMemoryClearCache(&ImagingDefaultArena, i);
MUTEX_UNLOCK(&ImagingDefaultArena.mutex); MUTEX_UNLOCK(&ImagingDefaultArena.mutex);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */

90
src/_imagingcms.c
View File

@ -654,8 +654,7 @@ cms_get_display_profile_win32(PyObject *self, PyObject *args) {
return PyUnicode_FromStringAndSize(filename, filename_size - 1); return PyUnicode_FromStringAndSize(filename, filename_size - 1);
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
#endif #endif
@ -672,20 +671,17 @@ _profile_read_mlu(CmsProfileObject *self, cmsTagSignature info) {
wchar_t *buf; wchar_t *buf;
if (!cmsIsTag(self->profile, info)) { if (!cmsIsTag(self->profile, info)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
mlu = cmsReadTag(self->profile, info); mlu = cmsReadTag(self->profile, info);
if (!mlu) { if (!mlu) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
len = cmsMLUgetWide(mlu, lc, cc, NULL, 0); len = cmsMLUgetWide(mlu, lc, cc, NULL, 0);
if (len == 0) { if (len == 0) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
buf = malloc(len); buf = malloc(len);
@ -723,14 +719,12 @@ _profile_read_signature(CmsProfileObject *self, cmsTagSignature info) {
unsigned int *sig; unsigned int *sig;
if (!cmsIsTag(self->profile, info)) { if (!cmsIsTag(self->profile, info)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
sig = (unsigned int *)cmsReadTag(self->profile, info); sig = (unsigned int *)cmsReadTag(self->profile, info);
if (!sig) { if (!sig) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
return _profile_read_int_as_string(*sig); return _profile_read_int_as_string(*sig);
@ -780,14 +774,12 @@ _profile_read_ciexyz(CmsProfileObject *self, cmsTagSignature info, int multi) {
cmsCIEXYZ *XYZ; cmsCIEXYZ *XYZ;
if (!cmsIsTag(self->profile, info)) { if (!cmsIsTag(self->profile, info)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
XYZ = (cmsCIEXYZ *)cmsReadTag(self->profile, info); XYZ = (cmsCIEXYZ *)cmsReadTag(self->profile, info);
if (!XYZ) { if (!XYZ) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
if (multi) { if (multi) {
return _xyz3_py(XYZ); return _xyz3_py(XYZ);
@ -801,14 +793,12 @@ _profile_read_ciexyy_triple(CmsProfileObject *self, cmsTagSignature info) {
cmsCIExyYTRIPLE *triple; cmsCIExyYTRIPLE *triple;
if (!cmsIsTag(self->profile, info)) { if (!cmsIsTag(self->profile, info)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
triple = (cmsCIExyYTRIPLE *)cmsReadTag(self->profile, info); triple = (cmsCIExyYTRIPLE *)cmsReadTag(self->profile, info);
if (!triple) { if (!triple) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* Note: lcms does all the heavy lifting and error checking (nr of /* Note: lcms does all the heavy lifting and error checking (nr of
@ -835,21 +825,18 @@ _profile_read_named_color_list(CmsProfileObject *self, cmsTagSignature info) {
PyObject *result; PyObject *result;
if (!cmsIsTag(self->profile, info)) { if (!cmsIsTag(self->profile, info)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
ncl = (cmsNAMEDCOLORLIST *)cmsReadTag(self->profile, info); ncl = (cmsNAMEDCOLORLIST *)cmsReadTag(self->profile, info);
if (ncl == NULL) { if (ncl == NULL) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
n = cmsNamedColorCount(ncl); n = cmsNamedColorCount(ncl);
result = PyList_New(n); result = PyList_New(n);
if (!result) { if (!result) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
@ -858,8 +845,7 @@ _profile_read_named_color_list(CmsProfileObject *self, cmsTagSignature info) {
str = PyUnicode_FromString(name); str = PyUnicode_FromString(name);
if (str == NULL) { if (str == NULL) {
Py_DECREF(result); Py_DECREF(result);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
PyList_SET_ITEM(result, i, str); PyList_SET_ITEM(result, i, str);
} }
@ -926,8 +912,7 @@ _is_intent_supported(CmsProfileObject *self, int clut) {
result = PyDict_New(); result = PyDict_New();
if (result == NULL) { if (result == NULL) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
n = cmsGetSupportedIntents(INTENTS, intent_ids, intent_descs); n = cmsGetSupportedIntents(INTENTS, intent_ids, intent_descs);
@ -957,8 +942,7 @@ _is_intent_supported(CmsProfileObject *self, int clut) {
Py_XDECREF(id); Py_XDECREF(id);
Py_XDECREF(entry); Py_XDECREF(entry);
Py_XDECREF(result); Py_XDECREF(result);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
PyDict_SetItem(result, id, entry); PyDict_SetItem(result, id, entry);
Py_DECREF(id); Py_DECREF(id);
@ -1042,8 +1026,7 @@ cms_profile_getattr_creation_date(CmsProfileObject *self, void *closure) {
result = cmsGetHeaderCreationDateTime(self->profile, &ct); result = cmsGetHeaderCreationDateTime(self->profile, &ct);
if (!result) { if (!result) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
return PyDateTime_FromDateAndTime( return PyDateTime_FromDateAndTime(
@ -1141,8 +1124,7 @@ cms_profile_getattr_saturation_rendering_intent_gamut(
static PyObject * static PyObject *
cms_profile_getattr_red_colorant(CmsProfileObject *self, void *closure) { cms_profile_getattr_red_colorant(CmsProfileObject *self, void *closure) {
if (!cmsIsMatrixShaper(self->profile)) { if (!cmsIsMatrixShaper(self->profile)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
return _profile_read_ciexyz(self, cmsSigRedColorantTag, 0); return _profile_read_ciexyz(self, cmsSigRedColorantTag, 0);
} }
@ -1150,8 +1132,7 @@ cms_profile_getattr_red_colorant(CmsProfileObject *self, void *closure) {
static PyObject * static PyObject *
cms_profile_getattr_green_colorant(CmsProfileObject *self, void *closure) { cms_profile_getattr_green_colorant(CmsProfileObject *self, void *closure) {
if (!cmsIsMatrixShaper(self->profile)) { if (!cmsIsMatrixShaper(self->profile)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
return _profile_read_ciexyz(self, cmsSigGreenColorantTag, 0); return _profile_read_ciexyz(self, cmsSigGreenColorantTag, 0);
} }
@ -1159,8 +1140,7 @@ cms_profile_getattr_green_colorant(CmsProfileObject *self, void *closure) {
static PyObject * static PyObject *
cms_profile_getattr_blue_colorant(CmsProfileObject *self, void *closure) { cms_profile_getattr_blue_colorant(CmsProfileObject *self, void *closure) {
if (!cmsIsMatrixShaper(self->profile)) { if (!cmsIsMatrixShaper(self->profile)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
return _profile_read_ciexyz(self, cmsSigBlueColorantTag, 0); return _profile_read_ciexyz(self, cmsSigBlueColorantTag, 0);
} }
@ -1176,21 +1156,18 @@ cms_profile_getattr_media_white_point_temperature(
cmsBool result; cmsBool result;
if (!cmsIsTag(self->profile, info)) { if (!cmsIsTag(self->profile, info)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
XYZ = (cmsCIEXYZ *)cmsReadTag(self->profile, info); XYZ = (cmsCIEXYZ *)cmsReadTag(self->profile, info);
if (XYZ == NULL || XYZ->X == 0) { if (XYZ == NULL || XYZ->X == 0) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
cmsXYZ2xyY(&xyY, XYZ); cmsXYZ2xyY(&xyY, XYZ);
result = cmsTempFromWhitePoint(&tempK, &xyY); result = cmsTempFromWhitePoint(&tempK, &xyY);
if (!result) { if (!result) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
return PyFloat_FromDouble(tempK); return PyFloat_FromDouble(tempK);
} }
@ -1229,8 +1206,7 @@ cms_profile_getattr_red_primary(CmsProfileObject *self, void *closure) {
result = _calculate_rgb_primaries(self, &primaries); result = _calculate_rgb_primaries(self, &primaries);
} }
if (!result) { if (!result) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
return _xyz_py(&primaries.Red); return _xyz_py(&primaries.Red);
@ -1245,8 +1221,7 @@ cms_profile_getattr_green_primary(CmsProfileObject *self, void *closure) {
result = _calculate_rgb_primaries(self, &primaries); result = _calculate_rgb_primaries(self, &primaries);
} }
if (!result) { if (!result) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
return _xyz_py(&primaries.Green); return _xyz_py(&primaries.Green);
@ -1261,8 +1236,7 @@ cms_profile_getattr_blue_primary(CmsProfileObject *self, void *closure) {
result = _calculate_rgb_primaries(self, &primaries); result = _calculate_rgb_primaries(self, &primaries);
} }
if (!result) { if (!result) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
return _xyz_py(&primaries.Blue); return _xyz_py(&primaries.Blue);
@ -1321,14 +1295,12 @@ cms_profile_getattr_icc_measurement_condition(CmsProfileObject *self, void *clos
const char *geo; const char *geo;
if (!cmsIsTag(self->profile, info)) { if (!cmsIsTag(self->profile, info)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
mc = (cmsICCMeasurementConditions *)cmsReadTag(self->profile, info); mc = (cmsICCMeasurementConditions *)cmsReadTag(self->profile, info);
if (!mc) { if (!mc) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
if (mc->Geometry == 1) { if (mc->Geometry == 1) {
@ -1362,14 +1334,12 @@ cms_profile_getattr_icc_viewing_condition(CmsProfileObject *self, void *closure)
cmsTagSignature info = cmsSigViewingConditionsTag; cmsTagSignature info = cmsSigViewingConditionsTag;
if (!cmsIsTag(self->profile, info)) { if (!cmsIsTag(self->profile, info)) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
vc = (cmsICCViewingConditions *)cmsReadTag(self->profile, info); vc = (cmsICCViewingConditions *)cmsReadTag(self->profile, info);
if (!vc) { if (!vc) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
return Py_BuildValue( return Py_BuildValue(

13
src/_imagingft.c
View File

@ -834,6 +834,7 @@ font_render(FontObject *self, PyObject *args) {
int mask = 0; /* is FT_LOAD_TARGET_MONO enabled? */ int mask = 0; /* is FT_LOAD_TARGET_MONO enabled? */
int color = 0; /* is FT_LOAD_COLOR enabled? */ int color = 0; /* is FT_LOAD_COLOR enabled? */
float stroke_width = 0; float stroke_width = 0;
int stroke_filled = 0;
PY_LONG_LONG foreground_ink_long = 0; PY_LONG_LONG foreground_ink_long = 0;
unsigned int foreground_ink; unsigned int foreground_ink;
const char *mode = NULL; const char *mode = NULL;
@ -853,7 +854,7 @@ font_render(FontObject *self, PyObject *args) {
if (!PyArg_ParseTuple( if (!PyArg_ParseTuple(
args, args,
"OO|zzOzfzLffO:render", "OO|zzOzfpzLffO:render",
&string, &string,
&fill, &fill,
&mode, &mode,
@ -861,6 +862,7 @@ font_render(FontObject *self, PyObject *args) {
&features, &features,
&lang, &lang,
&stroke_width, &stroke_width,
&stroke_filled,
&anchor, &anchor,
&foreground_ink_long, &foreground_ink_long,
&x_start, &x_start,
@ -1005,7 +1007,8 @@ font_render(FontObject *self, PyObject *args) {
if (stroker != NULL) { if (stroker != NULL) {
error = FT_Get_Glyph(glyph_slot, &glyph); error = FT_Get_Glyph(glyph_slot, &glyph);
if (!error) { if (!error) {
error = FT_Glyph_Stroke(&glyph, stroker, 1); error = stroke_filled ? FT_Glyph_StrokeBorder(&glyph, stroker, 0, 1)
: FT_Glyph_Stroke(&glyph, stroker, 1);
} }
if (!error) { if (!error) {
FT_Vector origin = {0, 0}; FT_Vector origin = {0, 0};
@ -1371,8 +1374,7 @@ font_setvarname(FontObject *self, PyObject *args) {
return geterror(error); return geterror(error);
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -1426,8 +1428,7 @@ font_setvaraxes(FontObject *self, PyObject *args) {
return geterror(error); return geterror(error);
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
#endif #endif

6
src/_imagingmath.c
View File

@ -192,8 +192,7 @@ _unop(PyObject *self, PyObject *args) {
unop(out, im1); unop(out, im1);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -226,8 +225,7 @@ _binop(PyObject *self, PyObject *args) {
binop(out, im1, im2); binop(out, im1, im2);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyMethodDef _functions[] = { static PyMethodDef _functions[] = {

3
src/_imagingtk.c
View File

@ -37,8 +37,7 @@ _tkinit(PyObject *self, PyObject *args) {
/* This will bomb if interp is invalid... */ /* This will bomb if interp is invalid... */
TkImaging_Init(interp); TkImaging_Init(interp);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyMethodDef functions[] = { static PyMethodDef functions[] = {

6
src/decode.c
View File

@ -213,8 +213,7 @@ _setimage(ImagingDecoderObject *decoder, PyObject *args) {
Py_XDECREF(decoder->lock); Py_XDECREF(decoder->lock);
decoder->lock = op; decoder->lock = op;
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -231,8 +230,7 @@ _setfd(ImagingDecoderObject *decoder, PyObject *args) {
Py_XINCREF(fd); Py_XINCREF(fd);
state->fd = fd; state->fd = fd;
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *

18
src/display.c
View File

@ -85,8 +85,7 @@ _expose(ImagingDisplayObject *display, PyObject *args) {
ImagingExposeDIB(display->dib, hdc); ImagingExposeDIB(display->dib, hdc);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -112,8 +111,7 @@ _draw(ImagingDisplayObject *display, PyObject *args) {
ImagingDrawDIB(display->dib, hdc, dst, src); ImagingDrawDIB(display->dib, hdc, dst, src);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
extern Imaging extern Imaging
@ -143,8 +141,7 @@ _paste(ImagingDisplayObject *display, PyObject *args) {
ImagingPasteDIB(display->dib, im, xy); ImagingPasteDIB(display->dib, im, xy);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -190,8 +187,7 @@ _releasedc(ImagingDisplayObject *display, PyObject *args) {
ReleaseDC(window, dc); ReleaseDC(window, dc);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -211,8 +207,7 @@ _frombytes(ImagingDisplayObject *display, PyObject *args) {
memcpy(display->dib->bits, buffer.buf, buffer.len); memcpy(display->dib->bits, buffer.buf, buffer.len);
PyBuffer_Release(&buffer); PyBuffer_Release(&buffer);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -709,8 +704,7 @@ PyImaging_EventLoopWin32(PyObject *self, PyObject *args) {
} }
Py_END_ALLOW_THREADS; Py_END_ALLOW_THREADS;
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */

6
src/encode.c
View File

@ -278,8 +278,7 @@ _setimage(ImagingEncoderObject *encoder, PyObject *args) {
Py_XDECREF(encoder->lock); Py_XDECREF(encoder->lock);
encoder->lock = op; encoder->lock = op;
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -296,8 +295,7 @@ _setfd(ImagingEncoderObject *encoder, PyObject *args) {
Py_XINCREF(fd); Py_XINCREF(fd);
state->fd = fd; state->fd = fd;
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *

72
src/libImaging/Except.c
View File

@ -1,72 +0,0 @@
/*
* The Python Imaging Library
* $Id$
*
* default exception handling
*
* This module is usually overridden by application code (e.g.
* _imaging.c for PIL's standard Python bindings). If you get
* linking errors, remove this file from your project/library.
*
* history:
* 1995-06-15 fl Created
* 1998-12-29 fl Minor tweaks
* 2003-09-13 fl Added ImagingEnter/LeaveSection()
*
* Copyright (c) 1997-2003 by Secret Labs AB.
* Copyright (c) 1995-2003 by Fredrik Lundh.
*
* See the README file for information on usage and redistribution.
*/
#include "Imaging.h"
/* exception state */
void *
ImagingError_OSError(void) {
fprintf(stderr, "*** exception: file access error\n");
return NULL;
}
void *
ImagingError_MemoryError(void) {
fprintf(stderr, "*** exception: out of memory\n");
return NULL;
}
void *
ImagingError_ModeError(void) {
return ImagingError_ValueError("bad image mode");
}
void *
ImagingError_Mismatch(void) {
return ImagingError_ValueError("images don't match");
}
void *
ImagingError_ValueError(const char *message) {
if (!message) {
message = "exception: bad argument to function";
}
fprintf(stderr, "*** %s\n", message);
return NULL;
}
void
ImagingError_Clear(void) {
/* nop */;
}
/* thread state */
void
ImagingSectionEnter(ImagingSectionCookie *cookie) {
/* pass */
}
void
ImagingSectionLeave(ImagingSectionCookie *cookie) {
/* pass */
}

4
src/libImaging/Imaging.h
View File

@ -609,10 +609,6 @@ ImagingLibTiffDecode(
extern int extern int
ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes); ImagingLibTiffEncode(Imaging im, ImagingCodecState state, UINT8 *buffer, int bytes);
#endif #endif
#ifdef HAVE_LIBMPEG
extern int
ImagingMpegDecode(Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes);
#endif
extern int extern int
ImagingMspDecode(Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes); ImagingMspDecode(Imaging im, ImagingCodecState state, UINT8 *buffer, Py_ssize_t bytes);
extern int extern int

15
src/outline.c
View File

@ -89,8 +89,7 @@ _outline_move(OutlineObject *self, PyObject *args) {
ImagingOutlineMove(self->outline, x0, y0); ImagingOutlineMove(self->outline, x0, y0);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -102,8 +101,7 @@ _outline_line(OutlineObject *self, PyObject *args) {
ImagingOutlineLine(self->outline, x1, y1); ImagingOutlineLine(self->outline, x1, y1);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -115,8 +113,7 @@ _outline_curve(OutlineObject *self, PyObject *args) {
ImagingOutlineCurve(self->outline, x1, y1, x2, y2, x3, y3); ImagingOutlineCurve(self->outline, x1, y1, x2, y2, x3, y3);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -127,8 +124,7 @@ _outline_close(OutlineObject *self, PyObject *args) {
ImagingOutlineClose(self->outline); ImagingOutlineClose(self->outline);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static PyObject * static PyObject *
@ -140,8 +136,7 @@ _outline_transform(OutlineObject *self, PyObject *args) {
ImagingOutlineTransform(self->outline, a); ImagingOutlineTransform(self->outline, a);
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static struct PyMethodDef _outline_methods[] = { static struct PyMethodDef _outline_methods[] = {

6
src/path.c
View File

@ -415,8 +415,7 @@ path_map(PyPathObject *self, PyObject *args) {
} }
self->mapping = 0; self->mapping = 0;
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static int static int
@ -528,8 +527,7 @@ path_transform(PyPathObject *self, PyObject *args) {
} }
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
static struct PyMethodDef methods[] = { static struct PyMethodDef methods[] = {