diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-11-16 08:29:43 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-11-16 08:29:43 +0000 |
| commit | fcf9fa36515132d0a75bfcfb58cf9439dcbe6240 (patch) | |
| tree | 07c3b6711d60db8039604c4effc04a0d20ec29ca /src/lib/openjp2/openjpeg.c | |
| parent | 583df79be9502bc4ff3ac7181d902675aabc6716 (diff) | |
[trunk] add opj_ prefix to some internal define and use the new opj type instead of int and float in some files
Diffstat (limited to 'src/lib/openjp2/openjpeg.c')
| -rw-r--r-- | src/lib/openjp2/openjpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c index da034c5e..0ed7e67a 100644 --- a/src/lib/openjp2/openjpeg.c +++ b/src/lib/openjp2/openjpeg.c @@ -667,7 +667,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format) case OPJ_CODEC_J2K: l_codec->m_codec_data.m_compression.opj_encode = (OPJ_BOOL (*) (void *, struct opj_stream_private *, - struct opj_event_mgr * )) opj_j2k_encode_v2; + struct opj_event_mgr * )) opj_j2k_encode; l_codec->m_codec_data.m_compression.opj_end_compress = (OPJ_BOOL (*) ( void *, struct opj_stream_private *, @@ -907,7 +907,7 @@ OPJ_BOOL OPJ_CALLCONV opj_set_MCT(opj_cparameters_t *parameters, OPJ_UINT32 l_mct_total_size = l_matrix_size + l_dc_shift_size; /* add MCT capability */ - int rsiz = (int)parameters->cp_rsiz | (int)OPJ_MCT; + OPJ_INT32 rsiz = (OPJ_INT32)parameters->cp_rsiz | (OPJ_INT32)OPJ_MCT; parameters->cp_rsiz = (OPJ_RSIZ_CAPABILITIES)rsiz; parameters->irreversible = 1; |