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/tcd.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/tcd.c')
| -rw-r--r-- | src/lib/openjp2/tcd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c index 9bc9d611..18ebd077 100644 --- a/src/lib/openjp2/tcd.c +++ b/src/lib/openjp2/tcd.c @@ -609,7 +609,7 @@ void opj_tcd_destroy(opj_tcd_t *tcd) { } /* ----------------------------------------------------------------------- */ -#define MACRO_TCD_ALLOCATE(FUNCTION,TYPE,FRACTION,ELEMENT,FUNCTION_ELEMENT) \ +#define OPJ_MACRO_TCD_ALLOCATE(FUNCTION,TYPE,FRACTION,ELEMENT,FUNCTION_ELEMENT) \ OPJ_BOOL FUNCTION ( opj_tcd_t *p_tcd, \ OPJ_UINT32 p_tile_no \ ) \ @@ -989,10 +989,10 @@ OPJ_BOOL FUNCTION ( opj_tcd_t *p_tcd, \ } \ -MACRO_TCD_ALLOCATE(opj_tcd_init_encode_tile, opj_tcd_cblk_enc_t, 1.f, enc, opj_tcd_code_block_enc_allocate) -MACRO_TCD_ALLOCATE(opj_tcd_init_decode_tile, opj_tcd_cblk_dec_t, 0.5f, dec, opj_tcd_code_block_dec_allocate) +OPJ_MACRO_TCD_ALLOCATE(opj_tcd_init_encode_tile, opj_tcd_cblk_enc_t, 1.f, enc, opj_tcd_code_block_enc_allocate) +OPJ_MACRO_TCD_ALLOCATE(opj_tcd_init_decode_tile, opj_tcd_cblk_dec_t, 0.5f, dec, opj_tcd_code_block_dec_allocate) -#undef MACRO_TCD_ALLOCATE +#undef OPJ_MACRO_TCD_ALLOCATE /** * Allocates memory for an encoding code block. @@ -1614,10 +1614,10 @@ OPJ_BOOL opj_tcd_mct_decode ( opj_tcd_t *p_tcd ) l_samples); } else { - opj_mct_decode_real( (float*)l_tile->comps[0].data, - (float*)l_tile->comps[1].data, - (float*)l_tile->comps[2].data, - l_samples); + opj_mct_decode_real((OPJ_FLOAT32*)l_tile->comps[0].data, + (OPJ_FLOAT32*)l_tile->comps[1].data, + (OPJ_FLOAT32*)l_tile->comps[2].data, + l_samples); } } } |