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/openjpeg.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/openjpeg.c')
| -rw-r--r-- | libopenjpeg/openjpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index c79c7fe1..518e902b 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -160,7 +160,7 @@ opj_image_t* OPJ_CALLCONV opj_decode_with_info(opj_dinfo_t *dinfo, opj_cio_t *ci case CODEC_JPT: return j2k_decode_jpt_stream((opj_j2k_t*)dinfo->j2k_handle, cio, cstr_info); case CODEC_JP2: - return jp2_decode((opj_jp2_t*)dinfo->jp2_handle, cio, cstr_info); + return opj_jp2_decode((opj_jp2_t*)dinfo->jp2_handle, cio, cstr_info); case CODEC_UNKNOWN: default: break; @@ -311,7 +311,7 @@ bool OPJ_CALLCONV opj_encode_with_info(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_i case CODEC_J2K: return j2k_encode((opj_j2k_t*)cinfo->j2k_handle, cio, image, cstr_info); case CODEC_JP2: - return jp2_encode((opj_jp2_t*)cinfo->jp2_handle, cio, image, cstr_info); + return opj_jp2_encode((opj_jp2_t*)cinfo->jp2_handle, cio, image, cstr_info); case CODEC_JPT: case CODEC_UNKNOWN: default: |