Simplified code

Author: radarhere

src/_imaging.c

@@ -2359,9 +2359,7 @@ _getextrema(ImagingObject *self, PyObject *args) {
             case IMAGING_TYPE_FLOAT32:
                 return Py_BuildValue("dd", extrema.f[0], extrema.f[1]);
             case IMAGING_TYPE_I16:
-                if (self->image->mode == IMAGING_MODE_I_16) {
-                    return Py_BuildValue("HH", extrema.s[0], extrema.s[1]);
-                }
+                return Py_BuildValue("HH", extrema.s[0], extrema.s[1]);
         }
     }
 

src/libImaging/Filter.c

@@ -470,8 +470,7 @@ ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32 *kernel, FLOAT32 o
     Imaging imOut;
     ImagingSectionCookie cookie;
 
-    if (im->type == IMAGING_TYPE_FLOAT32 ||
-        (im->type == IMAGING_TYPE_I16 && im->bands != 1)) {
+    if (im->type == IMAGING_TYPE_FLOAT32) {
         return (Imaging)ImagingError_ModeError();
     }
 

src/libImaging/Point.c

@@ -245,23 +245,20 @@ ImagingPointTransform(Imaging imIn, double scale, double offset) {
             ImagingSectionLeave(&cookie);
             break;
         case IMAGING_TYPE_I16:
-            if (imIn->mode == IMAGING_MODE_I_16) {
-                ImagingSectionEnter(&cookie);
-                for (y = 0; y < imIn->ysize; y++) {
-                    char *in = (char *)imIn->image[y];
-                    char *out = (char *)imOut->image[y];
-                    /* FIXME: add clipping? */
-                    for (x = 0; x < imIn->xsize; x++) {
-                        UINT16 v;
-                        memcpy(&v, in + x * sizeof(v), sizeof(v));
-                        v = v * scale + offset;
-                        memcpy(out + x * sizeof(UINT16), &v, sizeof(v));
-                    }
+            ImagingSectionEnter(&cookie);
+            for (y = 0; y < imIn->ysize; y++) {
+                char *in = (char *)imIn->image[y];
+                char *out = (char *)imOut->image[y];
+                /* FIXME: add clipping? */
+                for (x = 0; x < imIn->xsize; x++) {
+                    UINT16 v;
+                    memcpy(&v, in + x * sizeof(v), sizeof(v));
+                    v = v * scale + offset;
+                    memcpy(out + x * sizeof(UINT16), &v, sizeof(v));
                 }
-                ImagingSectionLeave(&cookie);
-                break;
             }
-            /* FALL THROUGH */
+            ImagingSectionLeave(&cookie);
+            break;
         default:
             ImagingDelete(imOut);
             return (Imaging)ImagingError_ValueError("internal error");

src/libImaging/Reduce.c

@@ -1452,11 +1452,8 @@ ImagingReduce(Imaging imIn, int xscale, int yscale, int box[4]) {
     ImagingSectionCookie cookie;
     Imaging imOut = NULL;
 
-    if (imIn->mode == IMAGING_MODE_P || imIn->mode == IMAGING_MODE_1) {
-        return (Imaging)ImagingError_ModeError();
-    }
-
-    if (imIn->type == IMAGING_TYPE_I16) {
+    if (imIn->mode == IMAGING_MODE_P || imIn->mode == IMAGING_MODE_1 ||
+        imIn->type == IMAGING_TYPE_I16) {
         return (Imaging)ImagingError_ModeError();
     }
 

src/libImaging/Resample.c

@@ -718,12 +718,8 @@ ImagingResample(Imaging imIn, int xsize, int ysize, int filter, float box[4]) {
     }
 
     if (imIn->type == IMAGING_TYPE_I16) {
-        if (isModeI16(imIn->mode)) {
-            ResampleHorizontal = _ImagingResampleHorizontal_16bpc;
-            ResampleVertical = _ImagingResampleVertical_16bpc;
-        } else {
-            return (Imaging)ImagingError_ModeError();
-        }
+        ResampleHorizontal = _ImagingResampleHorizontal_16bpc;
+        ResampleVertical = _ImagingResampleVertical_16bpc;
     } else if (imIn->image8) {
         ResampleHorizontal = _ImagingResampleHorizontal_8bpc;
         ResampleVertical = _ImagingResampleVertical_8bpc;