diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-15 15:52:43 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-15 15:52:43 +0000 |
| commit | 9b2897ccd983c1d03bcac7bc111f7fabe7ac99db (patch) | |
| tree | 20932f60863ee563cbbd889ba9a5c0a266b525b1 | |
| parent | 3c4698435c518ee4562785ebf5034fcc5677509e (diff) | |
[trunk] Fix another set of issue with calling convention
| -rw-r--r-- | src/lib/openjp2/openjpeg.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c index 92a93cbe..8952a25b 100644 --- a/src/lib/openjp2/openjpeg.c +++ b/src/lib/openjp2/openjpeg.c @@ -664,29 +664,29 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format) switch(p_format) { case CODEC_J2K: - l_codec->m_codec_data.m_compression.opj_encode = (opj_bool (*) (void *, + l_codec->m_codec_data.m_compression.opj_encode = (opj_bool (OPJ_CALLCONV *) (void *, struct opj_stream_private *, struct opj_event_mgr * )) opj_j2k_encode_v2; - l_codec->m_codec_data.m_compression.opj_end_compress = (opj_bool (*) ( void *, + l_codec->m_codec_data.m_compression.opj_end_compress = (opj_bool (OPJ_CALLCONV *) ( void *, struct opj_stream_private *, struct opj_event_mgr *)) opj_j2k_end_compress; - l_codec->m_codec_data.m_compression.opj_start_compress = (opj_bool (*) (void *, + l_codec->m_codec_data.m_compression.opj_start_compress = (opj_bool (OPJ_CALLCONV *) (void *, struct opj_stream_private *, struct opj_image * , struct opj_event_mgr *)) opj_j2k_start_compress; - l_codec->m_codec_data.m_compression.opj_write_tile = (opj_bool (*) (void *, + l_codec->m_codec_data.m_compression.opj_write_tile = (opj_bool (OPJ_CALLCONV *) (void *, OPJ_UINT32, OPJ_BYTE*, OPJ_UINT32, struct opj_stream_private *, struct opj_event_mgr *) ) opj_j2k_write_tile; - l_codec->m_codec_data.m_compression.opj_destroy = (void (*) (void *)) opj_j2k_destroy; + l_codec->m_codec_data.m_compression.opj_destroy = (void (OPJ_CALLCONV *) (void *)) opj_j2k_destroy; - l_codec->m_codec_data.m_compression.opj_setup_encoder = (void (*) ( void *, + l_codec->m_codec_data.m_compression.opj_setup_encoder = (void (OPJ_CALLCONV *) ( void *, opj_cparameters_t *, struct opj_image *, struct opj_event_mgr * )) opj_j2k_setup_encoder; @@ -701,29 +701,29 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format) case CODEC_JP2: /* get a JP2 decoder handle */ - l_codec->m_codec_data.m_compression.opj_encode = (opj_bool (*) (void *, + l_codec->m_codec_data.m_compression.opj_encode = (opj_bool (OPJ_CALLCONV *) (void *, struct opj_stream_private *, struct opj_event_mgr * )) opj_jp2_encode; - l_codec->m_codec_data.m_compression.opj_end_compress = (opj_bool (*) ( void *, + l_codec->m_codec_data.m_compression.opj_end_compress = (opj_bool (OPJ_CALLCONV *) ( void *, struct opj_stream_private *, struct opj_event_mgr *)) opj_jp2_end_compress; - l_codec->m_codec_data.m_compression.opj_start_compress = (opj_bool (*) (void *, + l_codec->m_codec_data.m_compression.opj_start_compress = (opj_bool (OPJ_CALLCONV *) (void *, struct opj_stream_private *, struct opj_image * , struct opj_event_mgr *)) opj_jp2_start_compress; - l_codec->m_codec_data.m_compression.opj_write_tile = (opj_bool (*) (void *, + l_codec->m_codec_data.m_compression.opj_write_tile = (opj_bool (OPJ_CALLCONV *) (void *, OPJ_UINT32, OPJ_BYTE*, OPJ_UINT32, struct opj_stream_private *, struct opj_event_mgr *)) opj_jp2_write_tile; - l_codec->m_codec_data.m_compression.opj_destroy = (void (*) (void *)) opj_jp2_destroy; + l_codec->m_codec_data.m_compression.opj_destroy = (void (OPJ_CALLCONV *) (void *)) opj_jp2_destroy; - l_codec->m_codec_data.m_compression.opj_setup_encoder = (void (*) ( void *, + l_codec->m_codec_data.m_compression.opj_setup_encoder = (void (OPJ_CALLCONV *) ( void *, opj_cparameters_t *, struct opj_image *, struct opj_event_mgr * )) opj_jp2_setup_encoder; |