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.c | |
| 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.c')
| -rw-r--r-- | libopenjpeg/jp2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index 9c14a6be..62085a70 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -681,7 +681,7 @@ bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color) }/* jp2_read_jp2h() */ -opj_image_t* jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio, +opj_image_t* opj_jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio, opj_codestream_info_t *cstr_info) { opj_common_ptr cinfo; @@ -743,7 +743,7 @@ opj_image_t* jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio, } return image; -}/* jp2_decode() */ +}/* opj_jp2_decode() */ void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio) { @@ -1065,7 +1065,7 @@ void jp2_setup_encoder(opj_jp2_t *jp2, opj_cparameters_t *parameters, opj_image_ } -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) { /* JP2 encoding */ |