Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 1 | /* |
| 2 | * jdsample.c |
| 3 | * |
DRC | a73e870 | 2012-12-31 02:52:30 +0000 | [diff] [blame] | 4 | * This file was part of the Independent JPEG Group's software: |
Thomas G. Lane | 489583f | 1996-02-07 00:00:00 +0000 | [diff] [blame] | 5 | * Copyright (C) 1991-1996, Thomas G. Lane. |
DRC | a6ef282 | 2013-09-28 03:23:49 +0000 | [diff] [blame] | 6 | * libjpeg-turbo Modifications: |
Pierre Ossman | 59a3938 | 2009-03-09 13:15:56 +0000 | [diff] [blame] | 7 | * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB |
DRC | ce0dd94 | 2016-02-06 12:18:44 -0600 | [diff] [blame] | 8 | * Copyright (C) 2010, 2015-2016, D. R. Commander. |
DRC | 123f725 | 2016-05-24 10:23:56 -0500 | [diff] [blame] | 9 | * Copyright (C) 2014, MIPS Technologies, Inc., California. |
DRC | 3ab68cf | 2016-02-19 18:32:10 -0600 | [diff] [blame] | 10 | * Copyright (C) 2015, Google, Inc. |
Jonathan Wright | 509c268 | 2019-05-09 13:46:53 +0100 | [diff] [blame] | 11 | * Copyright (C) 2019, Arm Limited. |
DRC | 7e3acc0 | 2015-10-10 10:25:46 -0500 | [diff] [blame] | 12 | * For conditions of distribution and use, see the accompanying README.ijg |
| 13 | * file. |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 14 | * |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 15 | * This file contains upsampling routines. |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 16 | * |
| 17 | * Upsampling input data is counted in "row groups". A row group |
| 18 | * is defined to be (v_samp_factor * DCT_scaled_size / min_DCT_scaled_size) |
| 19 | * sample rows of each component. Upsampling will normally produce |
| 20 | * max_v_samp_factor pixel rows from each row group (but this could vary |
| 21 | * if the upsampler is applying a scale factor of its own). |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 22 | * |
| 23 | * An excellent reference for image resampling is |
| 24 | * Digital Image Warping, George Wolberg, 1990. |
| 25 | * Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7. |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 26 | */ |
| 27 | |
DRC | ce0dd94 | 2016-02-06 12:18:44 -0600 | [diff] [blame] | 28 | #include "jinclude.h" |
DRC | eb32cc1 | 2015-06-25 03:44:36 +0000 | [diff] [blame] | 29 | #include "jdsample.h" |
Pierre Ossman | 59a3938 | 2009-03-09 13:15:56 +0000 | [diff] [blame] | 30 | #include "jsimd.h" |
DRC | 36a6eec | 2010-10-08 08:05:44 +0000 | [diff] [blame] | 31 | #include "jpegcomp.h" |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 32 | |
| 33 | |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 34 | |
| 35 | /* |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 36 | * Initialize for an upsampling pass. |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 37 | */ |
| 38 | |
Thomas G. Lane | 489583f | 1996-02-07 00:00:00 +0000 | [diff] [blame] | 39 | METHODDEF(void) |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 40 | start_pass_upsample(j_decompress_ptr cinfo) |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 41 | { |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 42 | my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample; |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 43 | |
| 44 | /* Mark the conversion buffer empty */ |
| 45 | upsample->next_row_out = cinfo->max_v_samp_factor; |
| 46 | /* Initialize total-height counter for detecting bottom of image */ |
| 47 | upsample->rows_to_go = cinfo->output_height; |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 48 | } |
| 49 | |
| 50 | |
| 51 | /* |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 52 | * Control routine to do upsampling (and color conversion). |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 53 | * |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 54 | * In this version we upsample each component independently. |
| 55 | * We upsample one row group into the conversion buffer, then apply |
| 56 | * color conversion a row at a time. |
| 57 | */ |
| 58 | |
Thomas G. Lane | 489583f | 1996-02-07 00:00:00 +0000 | [diff] [blame] | 59 | METHODDEF(void) |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 60 | sep_upsample(j_decompress_ptr cinfo, JSAMPIMAGE input_buf, |
| 61 | JDIMENSION *in_row_group_ctr, JDIMENSION in_row_groups_avail, |
| 62 | JSAMPARRAY output_buf, JDIMENSION *out_row_ctr, |
| 63 | JDIMENSION out_rows_avail) |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 64 | { |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 65 | my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample; |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 66 | int ci; |
DRC | bd49803 | 2016-02-19 08:53:33 -0600 | [diff] [blame] | 67 | jpeg_component_info *compptr; |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 68 | JDIMENSION num_rows; |
| 69 | |
| 70 | /* Fill the conversion buffer, if it's empty */ |
| 71 | if (upsample->next_row_out >= cinfo->max_v_samp_factor) { |
| 72 | for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components; |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 73 | ci++, compptr++) { |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 74 | /* Invoke per-component upsample method. Notice we pass a POINTER |
| 75 | * to color_buf[ci], so that fullsize_upsample can change it. |
| 76 | */ |
| 77 | (*upsample->methods[ci]) (cinfo, compptr, |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 78 | input_buf[ci] + (*in_row_group_ctr * upsample->rowgroup_height[ci]), |
| 79 | upsample->color_buf + ci); |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 80 | } |
| 81 | upsample->next_row_out = 0; |
| 82 | } |
| 83 | |
| 84 | /* Color-convert and emit rows */ |
| 85 | |
| 86 | /* How many we have in the buffer: */ |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 87 | num_rows = (JDIMENSION)(cinfo->max_v_samp_factor - upsample->next_row_out); |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 88 | /* Not more than the distance to the end of the image. Need this test |
| 89 | * in case the image height is not a multiple of max_v_samp_factor: |
| 90 | */ |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 91 | if (num_rows > upsample->rows_to_go) |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 92 | num_rows = upsample->rows_to_go; |
| 93 | /* And not more than what the client can accept: */ |
| 94 | out_rows_avail -= *out_row_ctr; |
| 95 | if (num_rows > out_rows_avail) |
| 96 | num_rows = out_rows_avail; |
| 97 | |
| 98 | (*cinfo->cconvert->color_convert) (cinfo, upsample->color_buf, |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 99 | (JDIMENSION)upsample->next_row_out, |
| 100 | output_buf + *out_row_ctr, (int)num_rows); |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 101 | |
| 102 | /* Adjust counts */ |
| 103 | *out_row_ctr += num_rows; |
| 104 | upsample->rows_to_go -= num_rows; |
| 105 | upsample->next_row_out += num_rows; |
| 106 | /* When the buffer is emptied, declare this input row group consumed */ |
| 107 | if (upsample->next_row_out >= cinfo->max_v_samp_factor) |
| 108 | (*in_row_group_ctr)++; |
| 109 | } |
| 110 | |
| 111 | |
| 112 | /* |
| 113 | * These are the routines invoked by sep_upsample to upsample pixel values |
| 114 | * of a single component. One row group is processed per call. |
| 115 | */ |
| 116 | |
| 117 | |
| 118 | /* |
| 119 | * For full-size components, we just make color_buf[ci] point at the |
| 120 | * input buffer, and thus avoid copying any data. Note that this is |
| 121 | * safe only because sep_upsample doesn't declare the input row group |
| 122 | * "consumed" until we are done color converting and emitting it. |
| 123 | */ |
| 124 | |
Thomas G. Lane | 489583f | 1996-02-07 00:00:00 +0000 | [diff] [blame] | 125 | METHODDEF(void) |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 126 | fullsize_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr, |
| 127 | JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 128 | { |
| 129 | *output_data_ptr = input_data; |
| 130 | } |
| 131 | |
| 132 | |
| 133 | /* |
| 134 | * This is a no-op version used for "uninteresting" components. |
| 135 | * These components will not be referenced by color conversion. |
| 136 | */ |
| 137 | |
Thomas G. Lane | 489583f | 1996-02-07 00:00:00 +0000 | [diff] [blame] | 138 | METHODDEF(void) |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 139 | noop_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr, |
| 140 | JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 141 | { |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 142 | *output_data_ptr = NULL; /* safety check */ |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 143 | } |
| 144 | |
| 145 | |
| 146 | /* |
| 147 | * This version handles any integral sampling ratios. |
Thomas G. Lane | 4a6b730 | 1992-03-17 00:00:00 +0000 | [diff] [blame] | 148 | * This is not used for typical JPEG files, so it need not be fast. |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 149 | * Nor, for that matter, is it particularly accurate: the algorithm is |
| 150 | * simple replication of the input pixel onto the corresponding output |
| 151 | * pixels. The hi-falutin sampling literature refers to this as a |
| 152 | * "box filter". A box filter tends to introduce visible artifacts, |
| 153 | * so if you are actually going to use 3:1 or 4:1 sampling ratios |
| 154 | * you would be well advised to improve this code. |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 155 | */ |
| 156 | |
Thomas G. Lane | 489583f | 1996-02-07 00:00:00 +0000 | [diff] [blame] | 157 | METHODDEF(void) |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 158 | int_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr, |
| 159 | JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 160 | { |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 161 | my_upsample_ptr upsample = (my_upsample_ptr)cinfo->upsample; |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 162 | JSAMPARRAY output_data = *output_data_ptr; |
Thomas G. Lane | 4a6b730 | 1992-03-17 00:00:00 +0000 | [diff] [blame] | 163 | register JSAMPROW inptr, outptr; |
| 164 | register JSAMPLE invalue; |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 165 | register int h; |
| 166 | JSAMPROW outend; |
| 167 | int h_expand, v_expand; |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 168 | int inrow, outrow; |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 169 | |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 170 | h_expand = upsample->h_expand[compptr->component_index]; |
| 171 | v_expand = upsample->v_expand[compptr->component_index]; |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 172 | |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 173 | inrow = outrow = 0; |
| 174 | while (outrow < cinfo->max_v_samp_factor) { |
| 175 | /* Generate one output row with proper horizontal expansion */ |
| 176 | inptr = input_data[inrow]; |
| 177 | outptr = output_data[outrow]; |
| 178 | outend = outptr + cinfo->output_width; |
| 179 | while (outptr < outend) { |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 180 | invalue = *inptr++; /* don't need GETJSAMPLE() here */ |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 181 | for (h = h_expand; h > 0; h--) { |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 182 | *outptr++ = invalue; |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 183 | } |
| 184 | } |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 185 | /* Generate any additional output rows by duplicating the first one */ |
| 186 | if (v_expand > 1) { |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 187 | jcopy_sample_rows(output_data, outrow, output_data, outrow + 1, |
| 188 | v_expand - 1, cinfo->output_width); |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 189 | } |
| 190 | inrow++; |
| 191 | outrow += v_expand; |
| 192 | } |
| 193 | } |
| 194 | |
| 195 | |
| 196 | /* |
| 197 | * Fast processing for the common case of 2:1 horizontal and 1:1 vertical. |
| 198 | * It's still a box filter. |
| 199 | */ |
| 200 | |
Thomas G. Lane | 489583f | 1996-02-07 00:00:00 +0000 | [diff] [blame] | 201 | METHODDEF(void) |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 202 | h2v1_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr, |
| 203 | JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 204 | { |
| 205 | JSAMPARRAY output_data = *output_data_ptr; |
| 206 | register JSAMPROW inptr, outptr; |
| 207 | register JSAMPLE invalue; |
| 208 | JSAMPROW outend; |
| 209 | int inrow; |
| 210 | |
| 211 | for (inrow = 0; inrow < cinfo->max_v_samp_factor; inrow++) { |
| 212 | inptr = input_data[inrow]; |
| 213 | outptr = output_data[inrow]; |
| 214 | outend = outptr + cinfo->output_width; |
| 215 | while (outptr < outend) { |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 216 | invalue = *inptr++; /* don't need GETJSAMPLE() here */ |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 217 | *outptr++ = invalue; |
| 218 | *outptr++ = invalue; |
| 219 | } |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 220 | } |
| 221 | } |
| 222 | |
| 223 | |
| 224 | /* |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 225 | * Fast processing for the common case of 2:1 horizontal and 2:1 vertical. |
| 226 | * It's still a box filter. |
| 227 | */ |
| 228 | |
Thomas G. Lane | 489583f | 1996-02-07 00:00:00 +0000 | [diff] [blame] | 229 | METHODDEF(void) |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 230 | h2v2_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr, |
| 231 | JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 232 | { |
| 233 | JSAMPARRAY output_data = *output_data_ptr; |
| 234 | register JSAMPROW inptr, outptr; |
| 235 | register JSAMPLE invalue; |
| 236 | JSAMPROW outend; |
| 237 | int inrow, outrow; |
| 238 | |
| 239 | inrow = outrow = 0; |
| 240 | while (outrow < cinfo->max_v_samp_factor) { |
| 241 | inptr = input_data[inrow]; |
| 242 | outptr = output_data[outrow]; |
| 243 | outend = outptr + cinfo->output_width; |
| 244 | while (outptr < outend) { |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 245 | invalue = *inptr++; /* don't need GETJSAMPLE() here */ |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 246 | *outptr++ = invalue; |
| 247 | *outptr++ = invalue; |
| 248 | } |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 249 | jcopy_sample_rows(output_data, outrow, output_data, outrow + 1, 1, |
| 250 | cinfo->output_width); |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 251 | inrow++; |
| 252 | outrow += 2; |
| 253 | } |
| 254 | } |
| 255 | |
| 256 | |
| 257 | /* |
| 258 | * Fancy processing for the common case of 2:1 horizontal and 1:1 vertical. |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 259 | * |
| 260 | * The upsampling algorithm is linear interpolation between pixel centers, |
| 261 | * also known as a "triangle filter". This is a good compromise between |
| 262 | * speed and visual quality. The centers of the output pixels are 1/4 and 3/4 |
| 263 | * of the way between input pixel centers. |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 264 | * |
| 265 | * A note about the "bias" calculations: when rounding fractional values to |
| 266 | * integer, we do not want to always round 0.5 up to the next integer. |
| 267 | * If we did that, we'd introduce a noticeable bias towards larger values. |
| 268 | * Instead, this code is arranged so that 0.5 will be rounded up or down at |
| 269 | * alternate pixel locations (a simple ordered dither pattern). |
Thomas G. Lane | 4a6b730 | 1992-03-17 00:00:00 +0000 | [diff] [blame] | 270 | */ |
| 271 | |
Thomas G. Lane | 489583f | 1996-02-07 00:00:00 +0000 | [diff] [blame] | 272 | METHODDEF(void) |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 273 | h2v1_fancy_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr, |
| 274 | JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) |
Thomas G. Lane | 4a6b730 | 1992-03-17 00:00:00 +0000 | [diff] [blame] | 275 | { |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 276 | JSAMPARRAY output_data = *output_data_ptr; |
Thomas G. Lane | 4a6b730 | 1992-03-17 00:00:00 +0000 | [diff] [blame] | 277 | register JSAMPROW inptr, outptr; |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 278 | register int invalue; |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 279 | register JDIMENSION colctr; |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 280 | int inrow; |
Thomas G. Lane | 4a6b730 | 1992-03-17 00:00:00 +0000 | [diff] [blame] | 281 | |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 282 | for (inrow = 0; inrow < cinfo->max_v_samp_factor; inrow++) { |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 283 | inptr = input_data[inrow]; |
| 284 | outptr = output_data[inrow]; |
| 285 | /* Special case for first column */ |
| 286 | invalue = GETJSAMPLE(*inptr++); |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 287 | *outptr++ = (JSAMPLE)invalue; |
| 288 | *outptr++ = (JSAMPLE)((invalue * 3 + GETJSAMPLE(*inptr) + 2) >> 2); |
Thomas G. Lane | 4a6b730 | 1992-03-17 00:00:00 +0000 | [diff] [blame] | 289 | |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 290 | for (colctr = compptr->downsampled_width - 2; colctr > 0; colctr--) { |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 291 | /* General case: 3/4 * nearer pixel + 1/4 * further pixel */ |
| 292 | invalue = GETJSAMPLE(*inptr++) * 3; |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 293 | *outptr++ = (JSAMPLE)((invalue + GETJSAMPLE(inptr[-2]) + 1) >> 2); |
| 294 | *outptr++ = (JSAMPLE)((invalue + GETJSAMPLE(*inptr) + 2) >> 2); |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 295 | } |
| 296 | |
| 297 | /* Special case for last column */ |
| 298 | invalue = GETJSAMPLE(*inptr); |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 299 | *outptr++ = (JSAMPLE)((invalue * 3 + GETJSAMPLE(inptr[-1]) + 1) >> 2); |
| 300 | *outptr++ = (JSAMPLE)invalue; |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 301 | } |
| 302 | } |
| 303 | |
| 304 | |
| 305 | /* |
Kornel LesiĆski | 628c168 | 2016-07-10 19:01:51 +0100 | [diff] [blame] | 306 | * Fancy processing for 1:1 horizontal and 2:1 vertical (4:4:0 subsampling). |
| 307 | * |
| 308 | * This is a less common case, but it can be encountered when losslessly |
| 309 | * rotating/transposing a JPEG file that uses 4:2:2 chroma subsampling. |
| 310 | */ |
| 311 | |
| 312 | METHODDEF(void) |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 313 | h1v2_fancy_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr, |
| 314 | JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) |
Kornel LesiĆski | 628c168 | 2016-07-10 19:01:51 +0100 | [diff] [blame] | 315 | { |
| 316 | JSAMPARRAY output_data = *output_data_ptr; |
| 317 | JSAMPROW inptr0, inptr1, outptr; |
| 318 | #if BITS_IN_JSAMPLE == 8 |
Jonathan Wright | 509c268 | 2019-05-09 13:46:53 +0100 | [diff] [blame] | 319 | int thiscolsum, bias; |
Kornel LesiĆski | 628c168 | 2016-07-10 19:01:51 +0100 | [diff] [blame] | 320 | #else |
Jonathan Wright | 509c268 | 2019-05-09 13:46:53 +0100 | [diff] [blame] | 321 | JLONG thiscolsum, bias; |
Kornel LesiĆski | 628c168 | 2016-07-10 19:01:51 +0100 | [diff] [blame] | 322 | #endif |
| 323 | JDIMENSION colctr; |
| 324 | int inrow, outrow, v; |
| 325 | |
| 326 | inrow = outrow = 0; |
| 327 | while (outrow < cinfo->max_v_samp_factor) { |
| 328 | for (v = 0; v < 2; v++) { |
| 329 | /* inptr0 points to nearest input row, inptr1 points to next nearest */ |
| 330 | inptr0 = input_data[inrow]; |
Jonathan Wright | 509c268 | 2019-05-09 13:46:53 +0100 | [diff] [blame] | 331 | if (v == 0) { /* next nearest is row above */ |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 332 | inptr1 = input_data[inrow - 1]; |
Jonathan Wright | 509c268 | 2019-05-09 13:46:53 +0100 | [diff] [blame] | 333 | bias = 1; |
| 334 | } else { /* next nearest is row below */ |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 335 | inptr1 = input_data[inrow + 1]; |
Jonathan Wright | 509c268 | 2019-05-09 13:46:53 +0100 | [diff] [blame] | 336 | bias = 2; |
| 337 | } |
Kornel LesiĆski | 628c168 | 2016-07-10 19:01:51 +0100 | [diff] [blame] | 338 | outptr = output_data[outrow++]; |
| 339 | |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 340 | for (colctr = 0; colctr < compptr->downsampled_width; colctr++) { |
Kornel LesiĆski | 628c168 | 2016-07-10 19:01:51 +0100 | [diff] [blame] | 341 | thiscolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++); |
Jonathan Wright | 509c268 | 2019-05-09 13:46:53 +0100 | [diff] [blame] | 342 | *outptr++ = (JSAMPLE)((thiscolsum + bias) >> 2); |
Kornel LesiĆski | 628c168 | 2016-07-10 19:01:51 +0100 | [diff] [blame] | 343 | } |
| 344 | } |
| 345 | inrow++; |
| 346 | } |
| 347 | } |
| 348 | |
| 349 | |
| 350 | /* |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 351 | * Fancy processing for the common case of 2:1 horizontal and 2:1 vertical. |
| 352 | * Again a triangle filter; see comments for h2v1 case, above. |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 353 | * |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 354 | * It is OK for us to reference the adjacent input rows because we demanded |
| 355 | * context from the main buffer controller (see initialization code). |
Thomas G. Lane | 4a6b730 | 1992-03-17 00:00:00 +0000 | [diff] [blame] | 356 | */ |
| 357 | |
Thomas G. Lane | 489583f | 1996-02-07 00:00:00 +0000 | [diff] [blame] | 358 | METHODDEF(void) |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 359 | h2v2_fancy_upsample(j_decompress_ptr cinfo, jpeg_component_info *compptr, |
| 360 | JSAMPARRAY input_data, JSAMPARRAY *output_data_ptr) |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 361 | { |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 362 | JSAMPARRAY output_data = *output_data_ptr; |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 363 | register JSAMPROW inptr0, inptr1, outptr; |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 364 | #if BITS_IN_JSAMPLE == 8 |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 365 | register int thiscolsum, lastcolsum, nextcolsum; |
| 366 | #else |
DRC | 1e32fe3 | 2015-10-14 17:32:39 -0500 | [diff] [blame] | 367 | register JLONG thiscolsum, lastcolsum, nextcolsum; |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 368 | #endif |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 369 | register JDIMENSION colctr; |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 370 | int inrow, outrow, v; |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 371 | |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 372 | inrow = outrow = 0; |
| 373 | while (outrow < cinfo->max_v_samp_factor) { |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 374 | for (v = 0; v < 2; v++) { |
| 375 | /* inptr0 points to nearest input row, inptr1 points to next nearest */ |
| 376 | inptr0 = input_data[inrow]; |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 377 | if (v == 0) /* next nearest is row above */ |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 378 | inptr1 = input_data[inrow - 1]; |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 379 | else /* next nearest is row below */ |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 380 | inptr1 = input_data[inrow + 1]; |
Thomas G. Lane | 4a6b730 | 1992-03-17 00:00:00 +0000 | [diff] [blame] | 381 | outptr = output_data[outrow++]; |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 382 | |
| 383 | /* Special case for first column */ |
| 384 | thiscolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++); |
| 385 | nextcolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++); |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 386 | *outptr++ = (JSAMPLE)((thiscolsum * 4 + 8) >> 4); |
| 387 | *outptr++ = (JSAMPLE)((thiscolsum * 3 + nextcolsum + 7) >> 4); |
| 388 | lastcolsum = thiscolsum; thiscolsum = nextcolsum; |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 389 | |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 390 | for (colctr = compptr->downsampled_width - 2; colctr > 0; colctr--) { |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 391 | /* General case: 3/4 * nearer pixel + 1/4 * further pixel in each */ |
| 392 | /* dimension, thus 9/16, 3/16, 3/16, 1/16 overall */ |
| 393 | nextcolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++); |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 394 | *outptr++ = (JSAMPLE)((thiscolsum * 3 + lastcolsum + 8) >> 4); |
| 395 | *outptr++ = (JSAMPLE)((thiscolsum * 3 + nextcolsum + 7) >> 4); |
| 396 | lastcolsum = thiscolsum; thiscolsum = nextcolsum; |
Thomas G. Lane | 4a6b730 | 1992-03-17 00:00:00 +0000 | [diff] [blame] | 397 | } |
Thomas G. Lane | 88aeed4 | 1992-12-10 00:00:00 +0000 | [diff] [blame] | 398 | |
| 399 | /* Special case for last column */ |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 400 | *outptr++ = (JSAMPLE)((thiscolsum * 3 + lastcolsum + 8) >> 4); |
| 401 | *outptr++ = (JSAMPLE)((thiscolsum * 4 + 7) >> 4); |
Thomas G. Lane | 4a6b730 | 1992-03-17 00:00:00 +0000 | [diff] [blame] | 402 | } |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 403 | inrow++; |
Thomas G. Lane | 4a6b730 | 1992-03-17 00:00:00 +0000 | [diff] [blame] | 404 | } |
| 405 | } |
| 406 | |
| 407 | |
| 408 | /* |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 409 | * Module initialization routine for upsampling. |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 410 | */ |
| 411 | |
Thomas G. Lane | 489583f | 1996-02-07 00:00:00 +0000 | [diff] [blame] | 412 | GLOBAL(void) |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 413 | jinit_upsampler(j_decompress_ptr cinfo) |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 414 | { |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 415 | my_upsample_ptr upsample; |
| 416 | int ci; |
DRC | bd49803 | 2016-02-19 08:53:33 -0600 | [diff] [blame] | 417 | jpeg_component_info *compptr; |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 418 | boolean need_buffer, do_fancy; |
| 419 | int h_in_group, v_in_group, h_out_group, v_out_group; |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 420 | |
DRC | 3ab68cf | 2016-02-19 18:32:10 -0600 | [diff] [blame] | 421 | if (!cinfo->master->jinit_upsampler_no_alloc) { |
| 422 | upsample = (my_upsample_ptr) |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 423 | (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE, |
DRC | 3ab68cf | 2016-02-19 18:32:10 -0600 | [diff] [blame] | 424 | sizeof(my_upsampler)); |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 425 | cinfo->upsample = (struct jpeg_upsampler *)upsample; |
DRC | 3ab68cf | 2016-02-19 18:32:10 -0600 | [diff] [blame] | 426 | upsample->pub.start_pass = start_pass_upsample; |
| 427 | upsample->pub.upsample = sep_upsample; |
| 428 | upsample->pub.need_context_rows = FALSE; /* until we find out differently */ |
| 429 | } else |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 430 | upsample = (my_upsample_ptr)cinfo->upsample; |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 431 | |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 432 | if (cinfo->CCIR601_sampling) /* this isn't supported */ |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 433 | ERREXIT(cinfo, JERR_CCIR601_NOTIMPL); |
| 434 | |
| 435 | /* jdmainct.c doesn't support context rows when min_DCT_scaled_size = 1, |
| 436 | * so don't ask for it. |
| 437 | */ |
DRC | 49967cd | 2010-10-09 19:57:51 +0000 | [diff] [blame] | 438 | do_fancy = cinfo->do_fancy_upsampling && cinfo->_min_DCT_scaled_size > 1; |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 439 | |
| 440 | /* Verify we can handle the sampling factors, select per-component methods, |
| 441 | * and create storage as needed. |
| 442 | */ |
| 443 | for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components; |
| 444 | ci++, compptr++) { |
| 445 | /* Compute size of an "input group" after IDCT scaling. This many samples |
| 446 | * are to be converted to max_h_samp_factor * max_v_samp_factor pixels. |
| 447 | */ |
DRC | 49967cd | 2010-10-09 19:57:51 +0000 | [diff] [blame] | 448 | h_in_group = (compptr->h_samp_factor * compptr->_DCT_scaled_size) / |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 449 | cinfo->_min_DCT_scaled_size; |
DRC | 49967cd | 2010-10-09 19:57:51 +0000 | [diff] [blame] | 450 | v_in_group = (compptr->v_samp_factor * compptr->_DCT_scaled_size) / |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 451 | cinfo->_min_DCT_scaled_size; |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 452 | h_out_group = cinfo->max_h_samp_factor; |
| 453 | v_out_group = cinfo->max_v_samp_factor; |
| 454 | upsample->rowgroup_height[ci] = v_in_group; /* save for use later */ |
| 455 | need_buffer = TRUE; |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 456 | if (!compptr->component_needed) { |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 457 | /* Don't bother to upsample an uninteresting component. */ |
| 458 | upsample->methods[ci] = noop_upsample; |
| 459 | need_buffer = FALSE; |
| 460 | } else if (h_in_group == h_out_group && v_in_group == v_out_group) { |
| 461 | /* Fullsize components can be processed without any work. */ |
| 462 | upsample->methods[ci] = fullsize_upsample; |
| 463 | need_buffer = FALSE; |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 464 | } else if (h_in_group * 2 == h_out_group && v_in_group == v_out_group) { |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 465 | /* Special cases for 2h1v upsampling */ |
Pierre Ossman | 59a3938 | 2009-03-09 13:15:56 +0000 | [diff] [blame] | 466 | if (do_fancy && compptr->downsampled_width > 2) { |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 467 | if (jsimd_can_h2v1_fancy_upsample()) |
| 468 | upsample->methods[ci] = jsimd_h2v1_fancy_upsample; |
| 469 | else |
| 470 | upsample->methods[ci] = h2v1_fancy_upsample; |
Pierre Ossman | 59a3938 | 2009-03-09 13:15:56 +0000 | [diff] [blame] | 471 | } else { |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 472 | if (jsimd_can_h2v1_upsample()) |
| 473 | upsample->methods[ci] = jsimd_h2v1_upsample; |
| 474 | else |
| 475 | upsample->methods[ci] = h2v1_upsample; |
Pierre Ossman | 59a3938 | 2009-03-09 13:15:56 +0000 | [diff] [blame] | 476 | } |
Kornel LesiĆski | 628c168 | 2016-07-10 19:01:51 +0100 | [diff] [blame] | 477 | } else if (h_in_group == h_out_group && |
| 478 | v_in_group * 2 == v_out_group && do_fancy) { |
| 479 | /* Non-fancy upsampling is handled by the generic method */ |
| 480 | upsample->methods[ci] = h1v2_fancy_upsample; |
| 481 | upsample->pub.need_context_rows = TRUE; |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 482 | } else if (h_in_group * 2 == h_out_group && |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 483 | v_in_group * 2 == v_out_group) { |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 484 | /* Special cases for 2h2v upsampling */ |
| 485 | if (do_fancy && compptr->downsampled_width > 2) { |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 486 | if (jsimd_can_h2v2_fancy_upsample()) |
| 487 | upsample->methods[ci] = jsimd_h2v2_fancy_upsample; |
| 488 | else |
| 489 | upsample->methods[ci] = h2v2_fancy_upsample; |
| 490 | upsample->pub.need_context_rows = TRUE; |
Pierre Ossman | 59a3938 | 2009-03-09 13:15:56 +0000 | [diff] [blame] | 491 | } else { |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 492 | if (jsimd_can_h2v2_upsample()) |
| 493 | upsample->methods[ci] = jsimd_h2v2_upsample; |
| 494 | else |
| 495 | upsample->methods[ci] = h2v2_upsample; |
Pierre Ossman | 59a3938 | 2009-03-09 13:15:56 +0000 | [diff] [blame] | 496 | } |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 497 | } else if ((h_out_group % h_in_group) == 0 && |
DRC | e5eaf37 | 2014-05-09 18:00:32 +0000 | [diff] [blame] | 498 | (v_out_group % v_in_group) == 0) { |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 499 | /* Generic integral-factors upsampling method */ |
DRC | 5ef4630 | 2014-05-18 20:04:47 +0000 | [diff] [blame] | 500 | #if defined(__mips__) |
| 501 | if (jsimd_can_int_upsample()) |
| 502 | upsample->methods[ci] = jsimd_int_upsample; |
| 503 | else |
| 504 | #endif |
| 505 | upsample->methods[ci] = int_upsample; |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 506 | upsample->h_expand[ci] = (UINT8)(h_out_group / h_in_group); |
| 507 | upsample->v_expand[ci] = (UINT8)(v_out_group / v_in_group); |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 508 | } else |
| 509 | ERREXIT(cinfo, JERR_FRACT_SAMPLE_NOTIMPL); |
DRC | 3ab68cf | 2016-02-19 18:32:10 -0600 | [diff] [blame] | 510 | if (need_buffer && !cinfo->master->jinit_upsampler_no_alloc) { |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 511 | upsample->color_buf[ci] = (*cinfo->mem->alloc_sarray) |
DRC | 19c791c | 2018-03-08 10:55:20 -0600 | [diff] [blame] | 512 | ((j_common_ptr)cinfo, JPOOL_IMAGE, |
| 513 | (JDIMENSION)jround_up((long)cinfo->output_width, |
| 514 | (long)cinfo->max_h_samp_factor), |
| 515 | (JDIMENSION)cinfo->max_v_samp_factor); |
Thomas G. Lane | 36a4ccc | 1994-09-24 00:00:00 +0000 | [diff] [blame] | 516 | } |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 517 | } |
Thomas G. Lane | 2cbeb8a | 1991-10-07 00:00:00 +0000 | [diff] [blame] | 518 | } |