| OLD | NEW |
| 1 #if !defined(_FX_JPEG_TURBO_) | |
| 2 /* | 1 /* |
| 3 * jdmerge.c | 2 * jdmerge.c |
| 4 * | 3 * |
| 5 * Copyright (C) 1994-1996, Thomas G. Lane. | 4 * Copyright (C) 1994-1996, Thomas G. Lane. |
| 6 * This file is part of the Independent JPEG Group's software. | 5 * This file is part of the Independent JPEG Group's software. |
| 7 * For conditions of distribution and use, see the accompanying README file. | 6 * For conditions of distribution and use, see the accompanying README file. |
| 8 * | 7 * |
| 9 * This file contains code for merged upsampling/color conversion. | 8 * This file contains code for merged upsampling/color conversion. |
| 10 * | 9 * |
| 11 * This file combines functions from jdsample.c and jdcolor.c; | 10 * This file combines functions from jdsample.c and jdcolor.c; |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 upsample->pub.upsample = merged_1v_upsample; | 394 upsample->pub.upsample = merged_1v_upsample; |
| 396 upsample->upmethod = h2v1_merged_upsample; | 395 upsample->upmethod = h2v1_merged_upsample; |
| 397 /* No spare row needed */ | 396 /* No spare row needed */ |
| 398 upsample->spare_row = NULL; | 397 upsample->spare_row = NULL; |
| 399 } | 398 } |
| 400 | 399 |
| 401 build_ycc_rgb_table(cinfo); | 400 build_ycc_rgb_table(cinfo); |
| 402 } | 401 } |
| 403 | 402 |
| 404 #endif /* UPSAMPLE_MERGING_SUPPORTED */ | 403 #endif /* UPSAMPLE_MERGING_SUPPORTED */ |
| 405 | |
| 406 #endif //_FX_JPEG_TURBO_ | |
| OLD | NEW |