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/jp2.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/jp2.c')
| -rw-r--r-- | src/lib/openjp2/jp2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c index b4a33638..2d4acc29 100644 --- a/src/lib/openjp2/jp2.c +++ b/src/lib/openjp2/jp2.c @@ -36,7 +36,7 @@ /** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */ /*@{*/ -#define BOX_SIZE 1024 +#define OPJ_BOX_SIZE 1024 /** @name Local static functions */ /*@{*/ @@ -1497,7 +1497,7 @@ OPJ_BOOL opj_jp2_encode(opj_jp2_t *jp2, opj_stream_private_t *stream, opj_event_mgr_t * p_manager) { - return opj_j2k_encode_v2(jp2->j2k, stream, p_manager); + return opj_j2k_encode(jp2->j2k, stream, p_manager); } OPJ_BOOL opj_jp2_end_decompress(opj_jp2_t *jp2, @@ -1632,7 +1632,7 @@ OPJ_BOOL opj_jp2_read_header_procedure( opj_jp2_t *jp2, opj_jp2_box_t box; OPJ_UINT32 l_nb_bytes_read; const opj_jp2_header_handler_t * l_current_handler; - OPJ_UINT32 l_last_data_size = BOX_SIZE; + OPJ_UINT32 l_last_data_size = OPJ_BOX_SIZE; OPJ_UINT32 l_current_data_size; OPJ_BYTE * l_current_data = 00; |