python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-25 09:26:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Throw TypeError if no cursors were found in .cur file

Browse Source
This commit is contained in:
Andrew Murray 2015-11-26 19:56:41 +11:00
parent ea2982f284
commit 0c3e224537
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PIL/CurImagePlugin.py
View File

@ -66,6 +66,8 @@ class CurImageFile(BmpImagePlugin.BmpImageFile):
# print "hotspot y", i16(s[6:]) # print "hotspot y", i16(s[6:])
# print "bytes", i32(s[8:]) # print "bytes", i32(s[8:])
# print "offset", i32(s[12:]) # print "offset", i32(s[12:])
if not m:
raise TypeError("No cursors were found")
# load as bitmap # load as bitmap
self._bitmap(i32(m[12:]) + offset) self._bitmap(i32(m[12:]) + offset)

BIN
Tests/images/no_cursors.cur Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6 B

15
Tests/test_file_cur.py
View File

@ -2,17 +2,14 @@ from helper import unittest, PillowTestCase
from PIL import Image, CurImagePlugin from PIL import Image, CurImagePlugin
TEST_FILE = "Tests/images/deerstalker.cur"
class TestFileCur(PillowTestCase): class TestFileCur(PillowTestCase):
def test_sanity(self): def test_sanity(self):
# Arrange im = Image.open(TEST_FILE)
test_file = "Tests/images/deerstalker.cur"
# Act
im = Image.open(test_file)
# Assert
self.assertEqual(im.size, (32, 32)) self.assertEqual(im.size, (32, 32))
self.assertIsInstance(im, CurImagePlugin.CurImageFile) self.assertIsInstance(im, CurImagePlugin.CurImageFile)
# Check some pixel colors to ensure image is loaded properly # Check some pixel colors to ensure image is loaded properly
@ -26,6 +23,12 @@ class TestFileCur(PillowTestCase):
self.assertRaises(SyntaxError, self.assertRaises(SyntaxError,
lambda: CurImagePlugin.CurImageFile(invalid_file)) lambda: CurImagePlugin.CurImageFile(invalid_file))
no_cursors_file = "Tests/images/no_cursors.cur"
cur = CurImagePlugin.CurImageFile(TEST_FILE)
cur.fp = open(no_cursors_file, "rb")
self.assertRaises(TypeError, cur._open)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()