| Index: jmorecfg.h
|
| diff --git a/jmorecfg.h b/jmorecfg.h
|
| index e9d8d54a12016f9d22702adadc20068b61d16141..8e512eb6b7020291dde7442db381317273ccccc3 100644
|
| --- a/jmorecfg.h
|
| +++ b/jmorecfg.h
|
| @@ -4,7 +4,7 @@
|
| * This file was part of the Independent JPEG Group's software:
|
| * Copyright (C) 1991-1997, Thomas G. Lane.
|
| * Modifications:
|
| - * Copyright (C) 2009, 2011, D. R. Commander.
|
| + * Copyright (C) 2009, 2011, 2014, D. R. Commander.
|
| * For conditions of distribution and use, see the accompanying README file.
|
| *
|
| * This file contains additional configuration options that customize the
|
| @@ -323,7 +323,7 @@ typedef int boolean;
|
| #define RGB_BLUE 2 /* Offset of Blue */
|
| #define RGB_PIXELSIZE 3 /* JSAMPLEs per RGB scanline element */
|
|
|
| -#define JPEG_NUMCS 16
|
| +#define JPEG_NUMCS 17
|
|
|
| #define EXT_RGB_RED 0
|
| #define EXT_RGB_GREEN 1
|
| @@ -358,25 +358,29 @@ typedef int boolean;
|
| static const int rgb_red[JPEG_NUMCS] = {
|
| -1, -1, RGB_RED, -1, -1, -1, EXT_RGB_RED, EXT_RGBX_RED,
|
| EXT_BGR_RED, EXT_BGRX_RED, EXT_XBGR_RED, EXT_XRGB_RED,
|
| - EXT_RGBX_RED, EXT_BGRX_RED, EXT_XBGR_RED, EXT_XRGB_RED
|
| + EXT_RGBX_RED, EXT_BGRX_RED, EXT_XBGR_RED, EXT_XRGB_RED,
|
| + -1
|
| };
|
|
|
| static const int rgb_green[JPEG_NUMCS] = {
|
| -1, -1, RGB_GREEN, -1, -1, -1, EXT_RGB_GREEN, EXT_RGBX_GREEN,
|
| EXT_BGR_GREEN, EXT_BGRX_GREEN, EXT_XBGR_GREEN, EXT_XRGB_GREEN,
|
| - EXT_RGBX_GREEN, EXT_BGRX_GREEN, EXT_XBGR_GREEN, EXT_XRGB_GREEN
|
| + EXT_RGBX_GREEN, EXT_BGRX_GREEN, EXT_XBGR_GREEN, EXT_XRGB_GREEN,
|
| + -1
|
| };
|
|
|
| static const int rgb_blue[JPEG_NUMCS] = {
|
| -1, -1, RGB_BLUE, -1, -1, -1, EXT_RGB_BLUE, EXT_RGBX_BLUE,
|
| EXT_BGR_BLUE, EXT_BGRX_BLUE, EXT_XBGR_BLUE, EXT_XRGB_BLUE,
|
| - EXT_RGBX_BLUE, EXT_BGRX_BLUE, EXT_XBGR_BLUE, EXT_XRGB_BLUE
|
| + EXT_RGBX_BLUE, EXT_BGRX_BLUE, EXT_XBGR_BLUE, EXT_XRGB_BLUE,
|
| + -1
|
| };
|
|
|
| static const int rgb_pixelsize[JPEG_NUMCS] = {
|
| -1, -1, RGB_PIXELSIZE, -1, -1, -1, EXT_RGB_PIXELSIZE, EXT_RGBX_PIXELSIZE,
|
| EXT_BGR_PIXELSIZE, EXT_BGRX_PIXELSIZE, EXT_XBGR_PIXELSIZE, EXT_XRGB_PIXELSIZE,
|
| - EXT_RGBX_PIXELSIZE, EXT_BGRX_PIXELSIZE, EXT_XBGR_PIXELSIZE, EXT_XRGB_PIXELSIZE
|
| + EXT_RGBX_PIXELSIZE, EXT_BGRX_PIXELSIZE, EXT_XBGR_PIXELSIZE, EXT_XRGB_PIXELSIZE,
|
| + -1
|
| };
|
|
|
| /* Definitions for speed-related optimizations. */
|
|
|