Merge pull request #4114 from radarhere/tiff_size

Removed deprecated setting of TIFF image sizes
This commit is contained in:
Andrew Murray 2019-10-05 02:33:08 +10:00 committed by GitHub
commit 6a83d5b239
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 35 deletions

View File

@ -73,15 +73,6 @@ class TestFileTiff(PillowTestCase):
ifd.legacy_api = None ifd.legacy_api = None
self.assertEqual(str(e.exception), "Not allowing setting of legacy api") self.assertEqual(str(e.exception), "Not allowing setting of legacy api")
def test_size(self):
filename = "Tests/images/pil168.tif"
im = Image.open(filename)
def set_size():
im.size = (256, 256)
self.assert_warning(DeprecationWarning, set_size)
def test_xyres_tiff(self): def test_xyres_tiff(self):
filename = "Tests/images/pil168.tif" filename = "Tests/images/pil168.tif"
im = Image.open(filename) im = Image.open(filename)

View File

@ -81,19 +81,6 @@ Deprecated Deprecated Deprecated
``IptcImagePlugin.__version__`` ``PixarImagePlugin.__version__`` ``IptcImagePlugin.__version__`` ``PixarImagePlugin.__version__``
=============================== ================================= ================================== =============================== ================================= ==================================
Setting the size of TIFF images
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. deprecated:: 5.3.0
Setting the image size of a TIFF image (eg. ``im.size = (256, 256)``) issues
a ``DeprecationWarning``:
.. code-block:: none
Setting the size of a TIFF image directly is deprecated, and will
be removed in a future version. Use the resize method instead.
ImageCms.CmsProfile attributes ImageCms.CmsProfile attributes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -127,6 +114,14 @@ PILLOW_VERSION constant
``PILLOW_VERSION`` has been removed. Use ``__version__`` instead. ``PILLOW_VERSION`` has been removed. Use ``__version__`` instead.
Setting the size of TIFF images
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*Removed in version 7.0.0.*
Setting the size of a TIFF image directly (eg. ``im.size = (256, 256)``) throws
an error. Use ``Image.resize`` instead.
VERSION constant VERSION constant
~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~

View File

@ -1079,19 +1079,6 @@ class TiffImageFile(ImageFile.ImageFile):
"""Return the current frame number""" """Return the current frame number"""
return self.__frame return self.__frame
@property
def size(self):
return self._size
@size.setter
def size(self, value):
warnings.warn(
"Setting the size of a TIFF image directly is deprecated, and will"
" be removed in a future version. Use the resize method instead.",
DeprecationWarning,
)
self._size = value
def load(self): def load(self):
if self.use_load_libtiff: if self.use_load_libtiff:
return self._load_libtiff() return self._load_libtiff()