Resolved segfaults

Author: radarhere

Tests/test_qt_image_fromqpixmap.py

@@ -11,17 +11,6 @@ def roundtrip(self, expected):
         # Qt saves all pixmaps as rgb
         self.assert_image_equal(result, expected.convert('RGB'))
 
-    def test_sanity_1(self):
-        self.roundtrip(hopper('1'))
-
-    def test_sanity_rgb(self):
-        self.roundtrip(hopper('RGB'))
-
-    def test_sanity_rgba(self):
-        self.roundtrip(hopper('RGBA'))
-
-    def test_sanity_l(self):
-        self.roundtrip(hopper('L'))
-
-    def test_sanity_p(self):
-        self.roundtrip(hopper('P'))
+    def test_sanity(self):
+        for mode in ('1', 'RGB', 'RGBA', 'L', 'P'):
+            self.roundtrip(hopper(mode))

src/libImaging/Convert.c

@@ -982,8 +982,8 @@ static void
 p2pa(UINT8* out, const UINT8* in, int xsize, const UINT8* palette)
 {
     int x;
-    for (x = 0; x < xsize; x++, in+=4) {
-        const UINT8* rgba = &palette[in[0] * 4];
+    for (x = 0; x < xsize; x++, in++) {
+        const UINT8* rgba = &palette[in[0]];
         *out++ = in[0];
         *out++ = in[0];
         *out++ = in[0];