From e0a5d81127819bf5d51c2b78dd4f2cc1191adb4a Mon Sep 17 00:00:00 2001 From: "Jeffrey A. Clark (Alex)" Date: Thu, 20 Jun 2024 09:23:30 -0400 Subject: [PATCH] hack202406 - requested changes --- src/PIL/ImageFile.py | 6 +++--- src/PIL/TiffImagePlugin.py | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py index 967bd392b..e07a34f17 100644 --- a/src/PIL/ImageFile.py +++ b/src/PIL/ImageFile.py @@ -117,7 +117,7 @@ class ImageFile(Image.Image): self.readonly = 1 # until we know better - self.newconfig = () + self.mb_config = () self.decoderconfig = () self.decodermaxblock = MAXBLOCK @@ -227,7 +227,7 @@ class ImageFile(Image.Image): msg = "buffer is not large enough" raise OSError(msg) 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 # After trashing self.im, @@ -316,7 +316,7 @@ class ImageFile(Image.Image): def load_prepare(self) -> None: # create image memory if necessary 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) if self.mode == "P": Image.Image.load(self) diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py index f17bf6db6..35cf4ef7e 100644 --- a/src/PIL/TiffImagePlugin.py +++ b/src/PIL/TiffImagePlugin.py @@ -60,7 +60,6 @@ from ._deprecate import deprecate from .TiffTags import TYPES logger = logging.getLogger(__name__) -logger.setLevel(logging.DEBUG) # XXX hack202406 # Set these to true to force use of libtiff for reading or writing. READ_LIBTIFF = False @@ -1483,7 +1482,7 @@ class TiffImageFile(ImageFile.ImageFile): logger.debug("- pil mode: %s", self.mode) if self.mode == "MB": 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