Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: third_party/libjpeg/fpdfapi_jdmerge.c

Issue 1591563002: XFA: Remove ifdefs for _FX_MANAGED_CODE_. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/libjpeg/fpdfapi_jdhuff.c ('k') | third_party/libjpeg/fpdfapi_jmemnobs.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * jdmerge.c 2 * jdmerge.c
3 * 3 *
4 * Copyright (C) 1994-1996, Thomas G. Lane. 4 * Copyright (C) 1994-1996, Thomas G. Lane.
5 * This file is part of the Independent JPEG Group's software. 5 * This file is part of the Independent JPEG Group's software.
6 * For conditions of distribution and use, see the accompanying README file. 6 * For conditions of distribution and use, see the accompanying README file.
7 * 7 *
8 * This file contains code for merged upsampling/color conversion. 8 * This file contains code for merged upsampling/color conversion.
9 * 9 *
10 * This file combines functions from jdsample.c and jdcolor.c; 10 * This file combines functions from jdsample.c and jdcolor.c;
(...skipping 20 matching lines...) Expand all
31 * the only common cases. (For uncommon cases we fall back on the more 31 * the only common cases. (For uncommon cases we fall back on the more
32 * general code in jdsample.c and jdcolor.c.) 32 * general code in jdsample.c and jdcolor.c.)
33 */ 33 */
34 34
35 #define JPEG_INTERNALS 35 #define JPEG_INTERNALS
36 #include "jinclude.h" 36 #include "jinclude.h"
37 #include "jpeglib.h" 37 #include "jpeglib.h"
38 38
39 #ifdef UPSAMPLE_MERGING_SUPPORTED 39 #ifdef UPSAMPLE_MERGING_SUPPORTED
40 40
41 #ifdef _FX_MANAGED_CODE_
42 #define my_upsampler my_upsampler_m
43 #endif
44
45 /* Private subobject */ 41 /* Private subobject */
46 42
47 typedef struct { 43 typedef struct {
48 struct jpeg_upsampler pub; /* public fields */ 44 struct jpeg_upsampler pub; /* public fields */
49 45
50 /* Pointer to routine to do actual upsampling/conversion of one row group */ 46 /* Pointer to routine to do actual upsampling/conversion of one row group */
51 JMETHOD(void, upmethod, (j_decompress_ptr cinfo, 47 JMETHOD(void, upmethod, (j_decompress_ptr cinfo,
52 JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr, 48 JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
53 JSAMPARRAY output_buf)); 49 JSAMPARRAY output_buf));
54 50
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 upsample->pub.upsample = merged_1v_upsample; 390 upsample->pub.upsample = merged_1v_upsample;
395 upsample->upmethod = h2v1_merged_upsample; 391 upsample->upmethod = h2v1_merged_upsample;
396 /* No spare row needed */ 392 /* No spare row needed */
397 upsample->spare_row = NULL; 393 upsample->spare_row = NULL;
398 } 394 }
399 395
400 build_ycc_rgb_table(cinfo); 396 build_ycc_rgb_table(cinfo);
401 } 397 }
402 398
403 #endif /* UPSAMPLE_MERGING_SUPPORTED */ 399 #endif /* UPSAMPLE_MERGING_SUPPORTED */
OLDNEW
« no previous file with comments | « third_party/libjpeg/fpdfapi_jdhuff.c ('k') | third_party/libjpeg/fpdfapi_jmemnobs.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698