mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-25 17:36:18 +03:00
commit
82c29f65d3
|
@ -2313,7 +2313,7 @@ def open(fp, mode="r"):
|
|||
return None
|
||||
|
||||
im = _open_core(fp, filename, prefix)
|
||||
|
||||
|
||||
if im is None:
|
||||
if init():
|
||||
im = _open_core(fp, filename, prefix)
|
||||
|
@ -2327,6 +2327,7 @@ def open(fp, mode="r"):
|
|||
#
|
||||
# Image processing.
|
||||
|
||||
|
||||
def alpha_composite(im1, im2):
|
||||
"""
|
||||
Alpha composite im2 over im1.
|
||||
|
|
|
@ -28,7 +28,7 @@ class ImagePalette(object):
|
|||
:param mode: The mode to use for the Palette. See:
|
||||
:ref:`concept-modes`. Defaults to "RGB"
|
||||
:param palette: An optional palette. If given, it must be a bytearray,
|
||||
an array or a list of ints between 0-255 and of length ``size``
|
||||
an array or a list of ints between 0-255 and of length ``size``
|
||||
times the number of colors in ``mode``. The list must be aligned
|
||||
by channel (All R values must be contiguous in the list before G
|
||||
and B values.) Defaults to 0 through 255 per channel.
|
||||
|
|
|
@ -551,7 +551,7 @@ class ImageFileDirectory(collections.MutableMapping):
|
|||
# NUL (binary zero). Also, I don't think this was well
|
||||
# exercised before.
|
||||
if sys.version_info[0] == 2:
|
||||
value = value.decode('ascii','replace')
|
||||
value = value.decode('ascii', 'replace')
|
||||
data = value = b"" + value.encode('ascii', 'replace') + b"\0"
|
||||
else:
|
||||
# integer data
|
||||
|
|
|
@ -54,19 +54,19 @@ def _mp_compile(self, sources, output_dir=None, macros=None,
|
|||
|
||||
def install():
|
||||
|
||||
fl_pypy3 = hasattr(sys, 'pypy_version_info') and sys.version_info > (3,0)
|
||||
fl_pypy3 = hasattr(sys, 'pypy_version_info') and sys.version_info > (3, 0)
|
||||
fl_win = sys.platform.startswith('win')
|
||||
|
||||
|
||||
if fl_pypy3:
|
||||
# see https://github.com/travis-ci/travis-ci/issues/3587
|
||||
print("Single threaded build for pypy3")
|
||||
return
|
||||
|
||||
|
||||
if fl_win:
|
||||
#windows barfs on multiprocessing installs
|
||||
print("Single threaded build for windows")
|
||||
return
|
||||
|
||||
|
||||
if MAX_PROCS != 1:
|
||||
# explicitly don't enable if environment says 1 processor
|
||||
try:
|
||||
|
@ -75,9 +75,10 @@ def install():
|
|||
pool = Pool(2)
|
||||
CCompiler.compile = _mp_compile
|
||||
except Exception as msg:
|
||||
print("Exception installing mp_compile, proceeding without: %s" % msg)
|
||||
print("Exception installing mp_compile, proceeding without:"
|
||||
"%s" % msg)
|
||||
else:
|
||||
print("Single threaded build, not installing mp_compile: %s processes" %
|
||||
MAX_PROCS)
|
||||
print("Single threaded build, not installing mp_compile:"
|
||||
"%s processes" % MAX_PROCS)
|
||||
|
||||
install()
|
||||
|
|
Loading…
Reference in New Issue
Block a user