python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-13 05:06:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow for an empty line in EPS header data

Browse Source
This commit is contained in:
Andrew Murray 2017-12-22 17:01:54 +11:00
parent 3d8035bf31
commit e107ed6fcf
3 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
PIL/EpsImagePlugin.py
View File

@ -227,53 +227,56 @@ class EpsImageFile(ImageFile.ImageFile):
# #
# Load EPS header # Load EPS header
s = fp.readline().strip('\r\n') s_raw = fp.readline()
s = s_raw.strip('\r\n')
while s: while s_raw:
if len(s) > 255: if s:
raise SyntaxError("not an EPS file") if len(s) > 255:
raise SyntaxError("not an EPS file")
try: try:
m = split.match(s) m = split.match(s)
except re.error as v: except re.error as v:
raise SyntaxError("not an EPS file") raise SyntaxError("not an EPS file")
if m:
k, v = m.group(1, 2)
self.info[k] = v
if k == "BoundingBox":
try:
# Note: The DSC spec says that BoundingBox
# fields should be integers, but some drivers
# put floating point values there anyway.
box = [int(float(i)) for i in v.split()]
self.size = box[2] - box[0], box[3] - box[1]
self.tile = [("eps", (0, 0) + self.size, offset,
(length, box))]
except:
pass
else:
m = field.match(s)
if m: if m:
k = m.group(1) k, v = m.group(1, 2)
self.info[k] = v
if k == "BoundingBox":
try:
# Note: The DSC spec says that BoundingBox
# fields should be integers, but some drivers
# put floating point values there anyway.
box = [int(float(i)) for i in v.split()]
self.size = box[2] - box[0], box[3] - box[1]
self.tile = [("eps", (0, 0) + self.size, offset,
(length, box))]
except:
pass
if k == "EndComments":
break
if k[:8] == "PS-Adobe":
self.info[k[:8]] = k[9:]
else:
self.info[k] = ""
elif s[0] == '%':
# handle non-DSC Postscript comments that some
# tools mistakenly put in the Comments section
pass
else: else:
raise IOError("bad EPS header") m = field.match(s)
if m:
k = m.group(1)
s = fp.readline().strip('\r\n') if k == "EndComments":
break
if k[:8] == "PS-Adobe":
self.info[k[:8]] = k[9:]
else:
self.info[k] = ""
elif s[0] == '%':
# handle non-DSC Postscript comments that some
# tools mistakenly put in the Comments section
pass
else:
raise IOError("bad EPS header")
if s[:1] != "%": s_raw = fp.readline()
s = s_raw.strip('\r\n')
if s and s[:1] != "%":
break break
# #

BIN
Tests/images/zero_bb_emptyline.eps Normal file
View File

Binary file not shown.

10
Tests/test_file_eps.py
View File

@ -278,6 +278,16 @@ class TestFileEps(PillowTestCase):
# Assert # Assert
self.assertEqual(img.mode, "RGB") self.assertEqual(img.mode, "RGB")
def test_emptyline(self):
# Test file includes an empty line in the header data
emptyline_file = "Tests/images/zero_bb_emptyline.eps"
image = Image.open(emptyline_file)
image.load()
self.assertEqual(image.mode, "RGB")
self.assertEqual(image.size, (460, 352))
self.assertEqual(image.format, "EPS")
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()