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 /jdmaster.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 'jdmaster.c')
| -rw-r--r-- | jdmaster.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -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 @@ use_merged_upsample (j_decompress_ptr cinfo) 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 @@ jpeg_calc_output_dimensions (j_decompress_ptr cinfo) 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: |