aboutsummaryrefslogtreecommitdiff
path: root/transupp.c
diff options
context:
space:
mode:
authorTom Gall <tom.gall@linaro.org>2011-08-09 14:49:46 -0500
committerTom Gall <tom.gall@linaro.org>2011-08-09 14:49:46 -0500
commit4a72099711359606b1fc10c1744057a6c568d5d8 (patch)
tree9413089fe9922a1a0e23c4739bd87caf5f357877 /transupp.c
parent0c0e874b223e9ccc4a756c471f8792102b2d34a4 (diff)
Sync with mainline apply everything between 1.1.1 to 8/8/2011
Diffstat (limited to 'transupp.c')
-rw-r--r--transupp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/transupp.c b/transupp.c
index 5c31416..2513691 100644
--- a/transupp.c
+++ b/transupp.c
@@ -1022,7 +1022,7 @@ jtransform_request_workspace (j_decompress_ptr srcinfo,
case JXFORM_FLIP_H:
if (info->trim)
trim_right_edge(info, srcinfo->output_width);
- if (info->y_crop_offset != 0)
+ if (info->y_crop_offset != 0 || info->slow_hflip)
need_workspace = TRUE;
/* do_flip_h_no_crop doesn't need a workspace array */
break;
@@ -1448,7 +1448,7 @@ jtransform_execute_transform (j_decompress_ptr srcinfo,
src_coef_arrays, dst_coef_arrays);
break;
case JXFORM_FLIP_H:
- if (info->y_crop_offset != 0)
+ if (info->y_crop_offset != 0 || info->slow_hflip)
do_flip_h(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
src_coef_arrays, dst_coef_arrays);
else