From 25b669b8e1563774f910e4d14c99723d9fc77df4 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Fri, 16 Oct 2026 11:53:45 +1100
Subject: [PATCH] Check image type, instead of mode

---
 src/libImaging/Draw.c     |  2 +-
 src/libImaging/Geometry.c | 12 ++++++------
 src/libImaging/Paste.c    |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/libImaging/Draw.c b/src/libImaging/Draw.c
index aa273e30f7b..f2a7f9d3ad3 100644
--- a/src/libImaging/Draw.c
+++ b/src/libImaging/Draw.c
@@ -573,7 +573,7 @@ DRAW draw32rgba = {point32rgba, hline32rgba};
 
 #define DRAWINIT()                           \
     if (im->image8) {                        \
-        if (isModeI16(im->mode)) {           \
+        if (im->type == IMAGING_TYPE_I16) {  \
             draw = &draw16;                  \
             ink = ink16(im, ink_);           \
         } else {                             \
diff --git a/src/libImaging/Geometry.c b/src/libImaging/Geometry.c
index bd9122a2bcc..ba348fd9c3a 100644
--- a/src/libImaging/Geometry.c
+++ b/src/libImaging/Geometry.c
@@ -44,7 +44,7 @@ ImagingFlipLeftRight(Imaging imOut, Imaging imIn) {
     MUTEX_LOCK(&imIn->mutex);
 
     if (imIn->image8) {
-        if (isModeI16(imIn->mode)) {
+        if (imIn->type == IMAGING_TYPE_I16) {
             FLIP_LEFT_RIGHT(UINT16, image8)
         } else {
             FLIP_LEFT_RIGHT(UINT8, image8)
@@ -138,7 +138,7 @@ ImagingRotate90(Imaging imOut, Imaging imIn) {
     MUTEX_LOCK(&imIn->mutex);
 
     if (imIn->image8) {
-        if (isModeI16(imIn->mode)) {
+        if (imIn->type == IMAGING_TYPE_I16) {
             ROTATE_90(UINT16, image8);
         } else {
             ROTATE_90(UINT8, image8);
@@ -201,7 +201,7 @@ ImagingTranspose(Imaging imOut, Imaging imIn) {
     MUTEX_LOCK(&imIn->mutex);
 
     if (imIn->image8) {
-        if (isModeI16(imIn->mode)) {
+        if (imIn->type == IMAGING_TYPE_I16) {
             TRANSPOSE(UINT16, image8);
         } else {
             TRANSPOSE(UINT8, image8);
@@ -266,7 +266,7 @@ ImagingTransverse(Imaging imOut, Imaging imIn) {
     MUTEX_LOCK(&imIn->mutex);
 
     if (imIn->image8) {
-        if (isModeI16(imIn->mode)) {
+        if (imIn->type == IMAGING_TYPE_I16) {
             TRANSVERSE(UINT16, image8);
         } else {
             TRANSVERSE(UINT8, image8);
@@ -314,7 +314,7 @@ ImagingRotate180(Imaging imOut, Imaging imIn) {
 
     yr = ysize - 1;
     if (imIn->image8) {
-        if (isModeI16(imIn->mode)) {
+        if (imIn->type == IMAGING_TYPE_I16) {
             ROTATE_180(UINT16, image8)
         } else {
             ROTATE_180(UINT8, image8)
@@ -378,7 +378,7 @@ ImagingRotate270(Imaging imOut, Imaging imIn) {
     MUTEX_LOCK(&imIn->mutex);
 
     if (imIn->image8) {
-        if (isModeI16(imIn->mode)) {
+        if (imIn->type == IMAGING_TYPE_I16) {
             ROTATE_270(UINT16, image8);
         } else {
             ROTATE_270(UINT8, image8);
diff --git a/src/libImaging/Paste.c b/src/libImaging/Paste.c
index 0396cf58095..9e4451cbc38 100644
--- a/src/libImaging/Paste.c
+++ b/src/libImaging/Paste.c
@@ -79,8 +79,8 @@ paste_mask_1(
 
     PREPARE_PASTE_LOOP();
     if (imOut->image8) {
-        int in_i16 = isModeI16(imIn->mode);
-        int out_i16 = isModeI16(imOut->mode);
+        int in_i16 = imIn->type == IMAGING_TYPE_I16;
+        int out_i16 = imOut->type == IMAGING_TYPE_I16;
         for (; y != y_end; y += offset) {
             UINT8 *out = imOut->image8[y + dy] + dx;
             if (out_i16) {
@@ -460,7 +460,7 @@ fill_mask_L(
     unsigned int tmp1;
 
     if (imOut->image8) {
-        int i16 = isModeI16(imOut->mode);
+        int i16 = imOut->type == IMAGING_TYPE_I16;
         for (y = 0; y < ysize; y++) {
             UINT8 *out = imOut->image8[y + dy] + dx;
             if (i16) {