From a3722c4d6b63ffd6617a87e1473dcd7b0e484d36 Mon Sep 17 00:00:00 2001 From: didier amyot Date: Mon, 14 Nov 2016 21:42:56 -0500 Subject: [PATCH] hahah --- tests/test_visual_cryptographie.py | 20 ++++++++++---------- visual_cryptography/visual_cryptography.py | 2 -- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/tests/test_visual_cryptographie.py b/tests/test_visual_cryptographie.py index a4d83d9..9bf0ede 100644 --- a/tests/test_visual_cryptographie.py +++ b/tests/test_visual_cryptographie.py @@ -9,7 +9,7 @@ from visual_cryptography.visual_cryptography import ImageLayer, produce_image_la class TestImageLayer(TestCase): test_data = b'000001000100101010000100040028010000160000002800000010000000200000000100040000000000800000000000000000000000100000000000000000000000FF84000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000111111111100000010000000010000001000000001000000000000000000000000000000000000000000000000000000000000000000000011100001110000001110000111000000111000011100000000000000000000000000000000000FFFF0000FFFF0000FFFF0000FFFF0000E0070000EFF70000EFF70000FFFF0000FFFF0000FFFF0000FFFF0000E3C70000E3C70000E3C70000FFFF0000FFFF0000' - + def get_test_image(self): return BytesIO(b16decode(self.test_data)) @@ -17,7 +17,7 @@ class TestImageLayer(TestCase): def test_produce_image_layer_from_real_image(self): img = produce_image_layer_from_real_image(self.get_test_image()) self.assertEqual(img.data[2][3], 0) - self.assertEqual(img.data[0][0], 1) + self.assertEqual(img.data[0][0], 0) def test_get_empty_data(self): @@ -29,13 +29,13 @@ class TestImageLayer(TestCase): def test_produce_empty_shares(self): img = ImageLayer(5, 6) ret = img.produce_empty_shares() - + two_shares = 2 self.assertEqual(len(ret), two_shares) - + ten_pixels_width = 10 self.assertEqual(len(ret[0]), ten_pixels_width) - + twelve_pixels_height = 12 self.assertEqual(len(ret[0][0]), twelve_pixels_height) @@ -43,19 +43,19 @@ class TestImageLayer(TestCase): def test_place_sub_pixels_in_shares_position(self): img = ImageLayer(2, 3) shares = img.produce_empty_shares() - + c = [[1, 1, 1, 1],[1, 1, 1, 1]] img.place_sub_pixels_in_shares(1,1, shares, c) - + self.assertListEqual(shares[0][0].tolist(), [0,0,0,0,0,0]) self.assertListEqual(shares[0][1].tolist(), [0,0,0,0,0,0]) self.assertListEqual(shares[0][2].tolist(), [0,0,1,1,0,0]) self.assertListEqual(shares[0][3].tolist(), [0,0,1,1,0,0]) - + def test_place_sub_pixels_in_shares(self): img = ImageLayer(2, 3) shares = img.produce_empty_shares() - + c = [[1, 0, 0, 1],[0, 1, 0, 1]] img.place_sub_pixels_in_shares(1,1, shares, c) self.assertListEqual(shares[0][0].tolist(), [0,0,0,0,0,0]) @@ -66,7 +66,7 @@ class TestImageLayer(TestCase): def test_get_pixel_value_in_share(self): img = ImageLayer(10, 10) share = img.produce_empty_shares()[0] - + pixel = [1, 2, 3, 4] img.place_sub_pixels_in_shares(3,1, [share], [pixel]) self.assertEqual(pixel, img.get_pixel_value_in_share(3,1, share)) diff --git a/visual_cryptography/visual_cryptography.py b/visual_cryptography/visual_cryptography.py index 51e6c1d..c1fefd5 100644 --- a/visual_cryptography/visual_cryptography.py +++ b/visual_cryptography/visual_cryptography.py @@ -114,11 +114,9 @@ def cmyk_to_black_and_white(r, g, b, a): def produce_image_layer_from_real_image(image_path): im = Image.open(image_path).convert('RGBA') ret = ImageLayer(*im.size) - d = {} for i in range(im.size[0]): for j in range(im.size[1]): r, g, b, a = im.im.getpixel((i,j)) - d[(r, g, b, a)] = cmyk_to_black_and_white(r, g, b, a) ret.data[j][i] = cmyk_to_black_and_white(r, g, b, a) return ret