Merge pull request #7257 from radarhere/i16_point

python-pillow · Oct 5, 2023 · 6f73691 · 6f73691
2 parents 09605ff + ba9c830
commit 6f73691
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 11 deletions.
diff --git a/Tests/images/imagedraw_rectangle_I.png b/Tests/images/imagedraw_rectangle_I.png
diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py
@@ -586,6 +586,18 @@ def test_point(points):
     assert_image_equal_tofile(im, "Tests/images/imagedraw_point.png")
 
 
+def test_point_I16():
+    # Arrange
+    im = Image.new("I;16", (1, 1))
+    draw = ImageDraw.Draw(im)
+
+    # Act
+    draw.point((0, 0), fill=0x1234)
+
+    # Assert
+    assert im.getpixel((0, 0)) == 0x1234
+
+
 @pytest.mark.parametrize("points", POINTS)
 def test_polygon(points):
     # Arrange
@@ -732,7 +744,7 @@ def test_rectangle_I16(bbox):
     draw = ImageDraw.Draw(im)
 
     # Act
-    draw.rectangle(bbox, fill="black", outline="green")
+    draw.rectangle(bbox, outline=0xFFFF)
 
     # Assert
     assert_image_equal_tofile(im.convert("I"), "Tests/images/imagedraw_rectangle_I.png")

diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
@@ -141,7 +141,9 @@ def test_I16(font):
     draw = ImageDraw.Draw(im)
 
     txt = "Hello World!"
-    draw.text((10, 10), txt, font=font)
+    draw.text((10, 10), txt, fill=0xFFFE, font=font)
+
+    assert im.getpixel((12, 14)) == 0xFFFE
 
     target = "Tests/images/transparent_background_text_L.png"
     assert_image_similar_tofile(im.convert("L"), target, 0.01)

diff --git a/src/libImaging/Draw.c b/src/libImaging/Draw.c
@@ -41,6 +41,7 @@
 #define FLOOR(v) ((v) >= 0.0 ? (int)(v) : (int)floor(v))
 
 #define INK8(ink) (*(UINT8 *)ink)
+#define INK16(ink) (*(UINT16 *)ink)
 
 /*
  * Rounds around zero (up=away from zero, down=towards zero)
@@ -68,8 +69,13 @@ static inline void
 point8(Imaging im, int x, int y, int ink) {
     if (x >= 0 && x < im->xsize && y >= 0 && y < im->ysize) {
         if (strncmp(im->mode, "I;16", 4) == 0) {
-            im->image8[y][x * 2] = (UINT8)ink;
+#ifdef WORDS_BIGENDIAN
+            im->image8[y][x * 2] = (UINT8)(ink >> 8);
             im->image8[y][x * 2 + 1] = (UINT8)ink;
+#else
+            im->image8[y][x * 2] = (UINT8)ink;
+            im->image8[y][x * 2 + 1] = (UINT8)(ink >> 8);
+#endif
         } else {
             im->image8[y][x] = (UINT8)ink;
         }
@@ -631,13 +637,17 @@ DRAW draw32rgba = {point32rgba, hline32rgba, line32rgba, polygon32rgba};
 /* Interface                                                            */
 /* -------------------------------------------------------------------- */
 
-#define DRAWINIT()                           \
-    if (im->image8) {                        \
-        draw = &draw8;                       \
-        ink = INK8(ink_);                    \
-    } else {                                 \
-        draw = (op) ? &draw32rgba : &draw32; \
-        memcpy(&ink, ink_, sizeof(ink));     \
+#define DRAWINIT()                               \
+    if (im->image8) {                            \
+        draw = &draw8;                           \
+        if (strncmp(im->mode, "I;16", 4) == 0) { \
+            ink = INK16(ink_);                   \
+        } else {                                 \
+            ink = INK8(ink_);                    \
+        }                                        \
+    } else {                                     \
+        draw = (op) ? &draw32rgba : &draw32;     \
+        memcpy(&ink, ink_, sizeof(ink));         \
     }
 
 int

diff --git a/src/libImaging/Paste.c b/src/libImaging/Paste.c
@@ -425,7 +425,7 @@ fill_mask_L(
                 *out = BLEND(*mask, *out, ink[0], tmp1);
                 if (strncmp(imOut->mode, "I;16", 4) == 0) {
                     out++;
-                    *out = BLEND(*mask, *out, ink[0], tmp1);
+                    *out = BLEND(*mask, *out, ink[1], tmp1);
                 }
                 out++, mask++;
             }