| Index: jdmaster.c
|
| ===================================================================
|
| --- jdmaster.c (revision 111873)
|
| +++ jdmaster.c (working copy)
|
| @@ -2,7 +2,7 @@
|
| * jdmaster.c
|
| *
|
| * Copyright (C) 1991-1997, Thomas G. Lane.
|
| - * Copyright (C) 2009-2010, D. R. Commander.
|
| + * Copyright (C) 2009-2011, D. R. Commander.
|
| * This file is part of the Independent JPEG Group's software.
|
| * For conditions of distribution and use, see the accompanying README file.
|
| *
|
| @@ -57,7 +57,11 @@
|
| cinfo->out_color_space != JCS_EXT_BGR &&
|
| cinfo->out_color_space != JCS_EXT_BGRX &&
|
| cinfo->out_color_space != JCS_EXT_XBGR &&
|
| - cinfo->out_color_space != JCS_EXT_XRGB) ||
|
| + cinfo->out_color_space != JCS_EXT_XRGB &&
|
| + cinfo->out_color_space != JCS_EXT_RGBA &&
|
| + cinfo->out_color_space != JCS_EXT_BGRA &&
|
| + cinfo->out_color_space != JCS_EXT_ABGR &&
|
| + cinfo->out_color_space != JCS_EXT_ARGB) ||
|
| cinfo->out_color_components != rgb_pixelsize[cinfo->out_color_space])
|
| return FALSE;
|
| /* and it only handles 2h1v or 2h2v sampling ratios */
|
| @@ -209,6 +213,10 @@
|
| case JCS_EXT_BGRX:
|
| case JCS_EXT_XBGR:
|
| case JCS_EXT_XRGB:
|
| + case JCS_EXT_RGBA:
|
| + case JCS_EXT_BGRA:
|
| + case JCS_EXT_ABGR:
|
| + case JCS_EXT_ARGB:
|
| cinfo->out_color_components = rgb_pixelsize[cinfo->out_color_space];
|
| break;
|
| case JCS_YCbCr:
|
|
|