Skip to content

Commit cbe50ed

Browse files
committed
Simplified code
1 parent 140d06d commit cbe50ed

3 files changed

Lines changed: 5 additions & 13 deletions

File tree

src/libImaging/Filter.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,7 @@ ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32 *kernel, FLOAT32 o
470470
Imaging imOut;
471471
ImagingSectionCookie cookie;
472472

473-
if (im->type == IMAGING_TYPE_FLOAT32 ||
474-
(im->type == IMAGING_TYPE_I16 && im->bands != 1)) {
473+
if (im->type == IMAGING_TYPE_FLOAT32) {
475474
return (Imaging)ImagingError_ModeError();
476475
}
477476

src/libImaging/Reduce.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,11 +1452,8 @@ ImagingReduce(Imaging imIn, int xscale, int yscale, int box[4]) {
14521452
ImagingSectionCookie cookie;
14531453
Imaging imOut = NULL;
14541454

1455-
if (imIn->mode == IMAGING_MODE_P || imIn->mode == IMAGING_MODE_1) {
1456-
return (Imaging)ImagingError_ModeError();
1457-
}
1458-
1459-
if (imIn->type == IMAGING_TYPE_I16) {
1455+
if (imIn->mode == IMAGING_MODE_P || imIn->mode == IMAGING_MODE_1 ||
1456+
imIn->type == IMAGING_TYPE_I16) {
14601457
return (Imaging)ImagingError_ModeError();
14611458
}
14621459

src/libImaging/Resample.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -718,12 +718,8 @@ ImagingResample(Imaging imIn, int xsize, int ysize, int filter, float box[4]) {
718718
}
719719

720720
if (imIn->type == IMAGING_TYPE_I16) {
721-
if (isModeI16(imIn->mode)) {
722-
ResampleHorizontal = _ImagingResampleHorizontal_16bpc;
723-
ResampleVertical = _ImagingResampleVertical_16bpc;
724-
} else {
725-
return (Imaging)ImagingError_ModeError();
726-
}
721+
ResampleHorizontal = _ImagingResampleHorizontal_16bpc;
722+
ResampleVertical = _ImagingResampleVertical_16bpc;
727723
} else if (imIn->image8) {
728724
ResampleHorizontal = _ImagingResampleHorizontal_8bpc;
729725
ResampleVertical = _ImagingResampleVertical_8bpc;

0 commit comments

Comments
 (0)