hack202406 - requested changes

This commit is contained in:
Jeffrey A. Clark (Alex) 2024-06-20 09:23:30 -04:00
parent c5ebc81dc3
commit e0a5d81127
2 changed files with 4 additions and 5 deletions

View File

@ -117,7 +117,7 @@ class ImageFile(Image.Image):
self.readonly = 1 # until we know better self.readonly = 1 # until we know better
self.newconfig = () self.mb_config = ()
self.decoderconfig = () self.decoderconfig = ()
self.decodermaxblock = MAXBLOCK self.decodermaxblock = MAXBLOCK
@ -227,7 +227,7 @@ class ImageFile(Image.Image):
msg = "buffer is not large enough" msg = "buffer is not large enough"
raise OSError(msg) raise OSError(msg)
self.im = Image.core.map_buffer( self.im = Image.core.map_buffer(
self.map, self.size, decoder_name, offset, args, *self.newconfig self.map, self.size, decoder_name, offset, args, *self.mb_config
) )
readonly = 1 readonly = 1
# After trashing self.im, # After trashing self.im,
@ -316,7 +316,7 @@ class ImageFile(Image.Image):
def load_prepare(self) -> None: def load_prepare(self) -> None:
# create image memory if necessary # create image memory if necessary
if not self.im or self.im.mode != self.mode or self.im.size != self.size: if not self.im or self.im.mode != self.mode or self.im.size != self.size:
self.im = Image.core.new(self.mode, self.size, *self.newconfig) self.im = Image.core.new(self.mode, self.size, *self.mb_config)
# create palette (optional) # create palette (optional)
if self.mode == "P": if self.mode == "P":
Image.Image.load(self) Image.Image.load(self)

View File

@ -60,7 +60,6 @@ from ._deprecate import deprecate
from .TiffTags import TYPES from .TiffTags import TYPES
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG) # XXX hack202406
# Set these to true to force use of libtiff for reading or writing. # Set these to true to force use of libtiff for reading or writing.
READ_LIBTIFF = False READ_LIBTIFF = False
@ -1483,7 +1482,7 @@ class TiffImageFile(ImageFile.ImageFile):
logger.debug("- pil mode: %s", self.mode) logger.debug("- pil mode: %s", self.mode)
if self.mode == "MB": if self.mode == "MB":
assert max(bps_tuple) == min(bps_tuple) assert max(bps_tuple) == min(bps_tuple)
self.newconfig = (max(bps_tuple), samples_per_pixel) self.mb_config = (max(bps_tuple), samples_per_pixel)
self.info["compression"] = self._compression self.info["compression"] = self._compression