diff options
| author | hbono@chromium.org <hbono@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-01-18 07:01:04 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2012-01-18 07:01:04 +0000 |
| commit | 0ec930ec950c94f0319d5b94a201b7e61ef15130 (patch) | |
| tree | 054faea3c3c43feb650c30568c054c24ab272217 /turbojpeg.c | |
| parent | 90462e929b057167d5c5eeed2374952db1b5e3ef (diff) | |
Update libjpeg-turbo to 1.2.0.
This change applies the upstream changes from 1.1.90 to 1.2.0 (r733).
BUG=none
TEST=webkit layout_tests
Review URL: https://chromiumcodereview.appspot.com/9232002
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@118072 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'turbojpeg.c')
| -rw-r--r-- | turbojpeg.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/turbojpeg.c b/turbojpeg.c index 9fc60ce..e27f0da 100644 --- a/turbojpeg.c +++ b/turbojpeg.c @@ -147,12 +147,16 @@ static int setCompDefaults(struct jpeg_compress_struct *cinfo, case TJPF_BGR: cinfo->in_color_space=JCS_EXT_BGR; break; case TJPF_RGBX: + case TJPF_RGBA: cinfo->in_color_space=JCS_EXT_RGBX; break; case TJPF_BGRX: + case TJPF_BGRA: cinfo->in_color_space=JCS_EXT_BGRX; break; case TJPF_XRGB: + case TJPF_ARGB: cinfo->in_color_space=JCS_EXT_XRGB; break; case TJPF_XBGR: + case TJPF_ABGR: cinfo->in_color_space=JCS_EXT_XBGR; break; #else case TJPF_RGB: @@ -213,20 +217,28 @@ static int setDecompDefaults(struct jpeg_decompress_struct *dinfo, dinfo->out_color_space=JCS_EXT_XRGB; break; case TJPF_XBGR: dinfo->out_color_space=JCS_EXT_XBGR; break; + #if JCS_ALPHA_EXTENSIONS==1 + case TJPF_RGBA: + dinfo->out_color_space=JCS_EXT_RGBA; break; + case TJPF_BGRA: + dinfo->out_color_space=JCS_EXT_BGRA; break; + case TJPF_ARGB: + dinfo->out_color_space=JCS_EXT_ARGB; break; + case TJPF_ABGR: + dinfo->out_color_space=JCS_EXT_ABGR; break; + #endif #else case TJPF_RGB: if(RGB_RED==0 && RGB_GREEN==1 && RGB_BLUE==2 && RGB_PIXELSIZE==3) { dinfo->out_color_space=JCS_RGB; break; } + #endif default: _throw("Unsupported pixel format"); - #endif } - #if JCS_EXTENSIONS!=1 bailout: - #endif return retval; } |