Skip to content

Commit 3bd4924

Browse files
committed
gpujpeg_image_get_properties: update switch
- UNKNOWN and RAW return error - tst should have been handled by delegate (add abort) - remove default clause and replace with instances (to catch eventual values added in future)
1 parent 5a074c6 commit 3bd4924

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/gpujpeg_common.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,8 +1261,13 @@ gpujpeg_image_get_properties(const char *filename, struct gpujpeg_image_paramete
12611261
}
12621262

12631263
switch (format) {
1264-
case GPUJPEG_IMAGE_FILE_RAW:
12651264
case GPUJPEG_IMAGE_FILE_UNKNOWN:
1265+
ERROR_MSG("GPUJPEG_IMAGE_FILE_UNKNOWN should not be passed!\n");
1266+
return -1;
1267+
case GPUJPEG_IMAGE_FILE_JPEG:
1268+
ERROR_MSG("GPUJPEG_IMAGE_FILE_JPEG should not be passed!\n");
1269+
return -1;
1270+
case GPUJPEG_IMAGE_FILE_RAW:
12661271
param_image->pixel_format = GPUJPEG_PIXFMT_STD;
12671272
break;
12681273
case GPUJPEG_IMAGE_FILE_GRAY:
@@ -1280,9 +1285,11 @@ gpujpeg_image_get_properties(const char *filename, struct gpujpeg_image_paramete
12801285
case GPUJPEG_IMAGE_FILE_PNM:
12811286
case GPUJPEG_IMAGE_FILE_PPM:
12821287
case GPUJPEG_IMAGE_FILE_Y4M:
1288+
case GPUJPEG_IMAGE_FILE_TST:
12831289
GPUJPEG_ASSERT(0 && "image delegate should handle this file type!");
12841290
break;
1285-
default:
1291+
case GPUJPEG_IMAGE_FILE_RGB:
1292+
case GPUJPEG_IMAGE_FILE_YUV:
12861293
param_image->pixel_format = GPUJPEG_444_U8_P012;
12871294
break;
12881295
}

0 commit comments

Comments
 (0)