mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-02-04 21:50:54 +03:00
Remove disabled _is_raw()
This commit is contained in:
parent
f5440cc3e1
commit
a0aff1a87f
|
@ -88,28 +88,6 @@ class IptcImageFile(ImageFile.ImageFile):
|
||||||
|
|
||||||
return tag, size
|
return tag, size
|
||||||
|
|
||||||
def _is_raw(self, offset, size):
|
|
||||||
#
|
|
||||||
# check if the file can be mapped
|
|
||||||
|
|
||||||
# DISABLED: the following only slows things down...
|
|
||||||
return 0
|
|
||||||
|
|
||||||
self.fp.seek(offset)
|
|
||||||
t, sz = self.field()
|
|
||||||
if sz != size[0]:
|
|
||||||
return 0
|
|
||||||
y = 1
|
|
||||||
while True:
|
|
||||||
self.fp.seek(sz, 1)
|
|
||||||
t, s = self.field()
|
|
||||||
if t != (8, 10):
|
|
||||||
break
|
|
||||||
if s != sz:
|
|
||||||
return 0
|
|
||||||
y += 1
|
|
||||||
return y == size[1]
|
|
||||||
|
|
||||||
def _open(self):
|
def _open(self):
|
||||||
|
|
||||||
# load descriptive fields
|
# load descriptive fields
|
||||||
|
@ -157,12 +135,8 @@ class IptcImageFile(ImageFile.ImageFile):
|
||||||
|
|
||||||
# tile
|
# tile
|
||||||
if tag == (8, 10):
|
if tag == (8, 10):
|
||||||
if compression == "raw" and self._is_raw(offset, self.size):
|
self.tile = [("iptc", (compression, offset),
|
||||||
self.tile = [(compression, (offset, size + 5, -1),
|
(0, 0, self.size[0], self.size[1]))]
|
||||||
(0, 0, self.size[0], self.size[1]))]
|
|
||||||
else:
|
|
||||||
self.tile = [("iptc", (compression, offset),
|
|
||||||
(0, 0, self.size[0], self.size[1]))]
|
|
||||||
|
|
||||||
def load(self):
|
def load(self):
|
||||||
|
|
||||||
|
|
|
@ -41,19 +41,6 @@ class TestFileIptc(PillowTestCase):
|
||||||
self.assertEqual(iptc[(2, 90)], b"Budapest")
|
self.assertEqual(iptc[(2, 90)], b"Budapest")
|
||||||
self.assertEqual(iptc[(2, 101)], b"Hungary")
|
self.assertEqual(iptc[(2, 101)], b"Hungary")
|
||||||
|
|
||||||
# _FIXME: is_raw() is disabled. Should we remove it?
|
|
||||||
def test__is_raw_equal_zero(self):
|
|
||||||
# Arrange
|
|
||||||
im = self.dummy_IptcImagePlugin()
|
|
||||||
offset = 0
|
|
||||||
size = 4
|
|
||||||
|
|
||||||
# Act
|
|
||||||
ret = im._is_raw(offset, size)
|
|
||||||
|
|
||||||
# Assert
|
|
||||||
self.assertEqual(ret, 0)
|
|
||||||
|
|
||||||
def test_i(self):
|
def test_i(self):
|
||||||
# Arrange
|
# Arrange
|
||||||
c = b"a"
|
c = b"a"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user