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 /jdmerge.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 'jdmerge.c')
| -rw-r--r-- | jdmerge.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -329,6 +329,7 @@ h2v1_merged_upsample (j_decompress_ptr cinfo, output_buf); break; case JCS_EXT_RGBX: + case JCS_EXT_RGBA: extrgbx_h2v1_merged_upsample_internal(cinfo, input_buf, in_row_group_ctr, output_buf); break; @@ -337,14 +338,17 @@ h2v1_merged_upsample (j_decompress_ptr cinfo, output_buf); break; case JCS_EXT_BGRX: + case JCS_EXT_BGRA: extbgrx_h2v1_merged_upsample_internal(cinfo, input_buf, in_row_group_ctr, output_buf); break; case JCS_EXT_XBGR: + case JCS_EXT_ABGR: extxbgr_h2v1_merged_upsample_internal(cinfo, input_buf, in_row_group_ctr, output_buf); break; case JCS_EXT_XRGB: + case JCS_EXT_ARGB: extxrgb_h2v1_merged_upsample_internal(cinfo, input_buf, in_row_group_ctr, output_buf); break; @@ -371,6 +375,7 @@ h2v2_merged_upsample (j_decompress_ptr cinfo, output_buf); break; case JCS_EXT_RGBX: + case JCS_EXT_RGBA: extrgbx_h2v2_merged_upsample_internal(cinfo, input_buf, in_row_group_ctr, output_buf); break; @@ -379,14 +384,17 @@ h2v2_merged_upsample (j_decompress_ptr cinfo, output_buf); break; case JCS_EXT_BGRX: + case JCS_EXT_BGRA: extbgrx_h2v2_merged_upsample_internal(cinfo, input_buf, in_row_group_ctr, output_buf); break; case JCS_EXT_XBGR: + case JCS_EXT_ABGR: extxbgr_h2v2_merged_upsample_internal(cinfo, input_buf, in_row_group_ctr, output_buf); break; case JCS_EXT_XRGB: + case JCS_EXT_ARGB: extxrgb_h2v2_merged_upsample_internal(cinfo, input_buf, in_row_group_ctr, output_buf); break; |