Skip to content

Commit

Permalink
Merge pull request #1996 from uploadcare/test-for-1986
Browse files Browse the repository at this point in the history
Improve test for #1986
  • Loading branch information
wiredfool committed Jun 30, 2016
2 parents 1656b47 + 9c3bd46 commit d553a9d
Showing 1 changed file with 7 additions and 18 deletions.
25 changes: 7 additions & 18 deletions Tests/test_image_convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,25 +123,14 @@ def test_trns_RGB(self):
self.assertNotIn('transparency', p.info)
p.save(f)

# ref https://github.com/python-pillow/Pillow/issues/1979

def test_p_la(self):
def L(rgb):
return int((rgb[0] * 299 + rgb[1] * 587 + rgb[2] * 114) / 1000)

def convert_to_gray(im, pixel):
if im.mode == 'P':
color_id = im.getpixel(pixel)
color = im.getpalette()[color_id * 3:(color_id+1)*3]
return L(color)
elif im.mode == 'LA':
color = im.getpixel(pixel)
return color[0]

im_p = hopper('P')
im_la = im_p.convert('LA')
self.assertEqual(convert_to_gray(im_p, (5, 5)),
convert_to_gray(im_la, (5, 5)))
im = hopper('RGBA')
alpha = hopper('L')
im.putalpha(alpha)

comparable = im.convert('P').convert('LA').split()[1]

self.assert_image_similar(alpha, comparable, 5)


if __name__ == '__main__':
Expand Down

0 comments on commit d553a9d

Please sign in to comment.