diff options
| author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-09-30 11:12:05 -0700 |
|---|---|---|
| committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-09-30 11:12:05 -0700 |
| commit | d53e6fdb0a86ca1ddb12876a60f7f2d7508b5349 (patch) | |
| tree | 1d1eebf565936adff5d2d5c68741774e8d86f0eb /core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.h | |
| parent | 1b24b697659b9b933f336238665c835497464a0b (diff) | |
| download | pdfium-d53e6fdb0a86ca1ddb12876a60f7f2d7508b5349.tar.xz | |
Update openjpeg
BUG=407964, 414182, 413447
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/589243004
Diffstat (limited to 'core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.h')
| -rw-r--r-- | core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.h b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.h index 4228bd66dc..909e35119b 100644 --- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.h +++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.h @@ -304,8 +304,6 @@ typedef struct opj_tcp typedef struct opj_encoding_param { - /** Digital cinema profile*/ - OPJ_CINEMA_MODE m_cinema; /** Maximum rate for each component. If == 0, component size limitation is not considered */ OPJ_UINT32 m_max_comp_size; /** Position of tile part flag in progression order*/ @@ -343,7 +341,7 @@ typedef struct opj_cp /** Size of the image in bits*/ /*int img_size;*/ /** Rsiz*/ - OPJ_RSIZ_CAPABILITIES rsiz; + OPJ_UINT16 rsiz; /** XTOsiz */ OPJ_UINT32 tx0; /* MSD see norm */ /** YTOsiz */ @@ -596,7 +594,7 @@ void opj_j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters); opj_j2k_t* opj_j2k_create_compress(void); -void opj_j2k_setup_encoder( opj_j2k_t *p_j2k, +OPJ_BOOL opj_j2k_setup_encoder( opj_j2k_t *p_j2k, opj_cparameters_t *parameters, opj_image_t *image, opj_event_mgr_t * p_manager); |