diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-04-12 17:24:30 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-04-12 17:24:30 +0000 |
| commit | fef7d00dc8f646913141fa55687eef52064e7e20 (patch) | |
| tree | 3f0b66267a33e1716f8e222d757e5fe54d1c12fd /libopenjpeg/jp2.h | |
| parent | a916dcd052695d0e7dd3b919eafd00f35fd824a7 (diff) | |
Fixed internal function names conflict with Jasper (http://code.google.com/p/openjpeg/issues/detail?id=30)
Diffstat (limited to 'libopenjpeg/jp2.h')
| -rw-r--r-- | libopenjpeg/jp2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libopenjpeg/jp2.h b/libopenjpeg/jp2.h index e98cde39..4dfa36cf 100644 --- a/libopenjpeg/jp2.h +++ b/libopenjpeg/jp2.h @@ -203,7 +203,7 @@ void jp2_setup_decoder(opj_jp2_t *jp2, struct opj_dparameters *parameters); * @param cstr_info Codestream information structure if required, NULL otherwise * @return Returns a decoded image if successful, returns NULL otherwise */ -struct opj_image* jp2_decode(opj_jp2_t *jp2, struct opj_stream_private *cio, struct opj_event_mgr * p_manager); +struct opj_image* opj_jp2_decode(opj_jp2_t *jp2, struct opj_stream_private *cio, struct opj_event_mgr * p_manager); /** Setup the encoder parameters using the current image and using user parameters. Coding parameters are returned in jp2->j2k->cp. @@ -237,7 +237,7 @@ Encode an image into a JPEG-2000 file stream @param cstr_info Codestream information structure if required, NULL otherwise @return Returns true if successful, returns false otherwise */ -bool jp2_encode(opj_jp2_t *jp2, struct opj_stream_private *cio, struct opj_event_mgr * p_manager); +bool opj_jp2_encode(opj_jp2_t *jp2, struct opj_stream_private *cio, struct opj_event_mgr * p_manager); /** * Reads a jpeg2000 file header structure. @@ -286,7 +286,7 @@ bool jp2_write_tile ( * @param p_stream the stream to write data to. * @param p_manager the user event manager. */ -bool jp2_decode_tile ( +bool opj_jp2_decode_tile ( opj_jp2_t * p_jp2, OPJ_UINT32 p_tile_index, OPJ_BYTE * p_data, |