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 | e93d5a683f8af382bbdb4bea4cf6fe2bd8337411 (patch) | |
| tree | 7442eb5018fe7285d62e042693dfd9c91adcc29d /libopenjpeg/jp2.h | |
| parent | 91419e0e3e57aa1d88a385e1a2f9a8c710ff67b2 (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libopenjpeg/jp2.h b/libopenjpeg/jp2.h index 9ad662cb..42f082f4 100644 --- a/libopenjpeg/jp2.h +++ b/libopenjpeg/jp2.h @@ -193,7 +193,7 @@ Decode an image from a JPEG-2000 file stream @param cstr_info Codestream information structure if required, NULL otherwise @return Returns a decoded image if successful, returns NULL otherwise */ -opj_image_t* jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio, opj_codestream_info_t *cstr_info); +opj_image_t* opj_jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio, opj_codestream_info_t *cstr_info); /** Creates a JP2 compression structure @param cinfo Codec context info @@ -221,7 +221,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, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info); +bool opj_jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info); /* ----------------------------------------------------------------------- */ /*@}*/ |