summaryrefslogtreecommitdiff
path: root/jpeglib.h
diff options
context:
space:
mode:
authorAaron Gable <agable@chromium.org>2015-08-06 09:54:48 -0700
committerAaron Gable <agable@chromium.org>2015-08-06 09:54:48 -0700
commitfeec46f80444b8eed4126a86a2c0e2cffe1c9673 (patch)
tree8bb36e3f61e201cb718af143ea8409ace64d6e4d /jpeglib.h
parentc9c8755c326b42c8d0dc938ec3f0d1d648bd361a (diff)
Add support for decoding to 565 to libjpeg_turbo
It was submitted upstream at libjpeg_turbo as r1295 plus sundry fixes and SIMD optimizations (r1385, r1386, r1398, and r1402). Now cherry pick the change into third_party/libjpeg-turbo. At this time, this new capability is intended for Android devices, not Chrome, and should have no affect on JPEG decode behavior or perf of Chrome. BUG=516761 R=noel@chromium.org Review URL: https://codereview.chromium.org/1270213002 .
Diffstat (limited to 'jpeglib.h')
-rw-r--r--jpeglib.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/jpeglib.h b/jpeglib.h
index 45599a7..4906ec6 100644
--- a/jpeglib.h
+++ b/jpeglib.h
@@ -5,7 +5,7 @@
* Copyright (C) 1991-1998, Thomas G. Lane.
* Modified 2002-2009 by Guido Vollbeding.
* Modifications:
- * Copyright (C) 2009-2011, 2013, D. R. Commander.
+ * Copyright (C) 2009-2011, 2013-2014, D. R. Commander.
* Copyright (C) 2015, Google, Inc.
* For conditions of distribution and use, see the accompanying README file.
*
@@ -243,7 +243,8 @@ typedef enum {
JCS_EXT_RGBA, /* red/green/blue/alpha */
JCS_EXT_BGRA, /* blue/green/red/alpha */
JCS_EXT_ABGR, /* alpha/blue/green/red */
- JCS_EXT_ARGB /* alpha/red/green/blue */
+ JCS_EXT_ARGB, /* alpha/red/green/blue */
+ JCS_RGB565 /* 5-bit red/6-bit green/5-bit blue */
} J_COLOR_SPACE;
/* DCT/IDCT algorithm options. */