walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] Fix remaining issue with OPJ_CALLCONV

This commit is contained in:
Mathieu Malaterre 2012-10-25 10:41:55 +00:00
parent fd19413196
commit 9adbea785b
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/lib/openjp2/openjpeg.c
View File

@ -97,29 +97,29 @@ typedef struct opj_decompression
*/ */
typedef struct opj_compression typedef struct opj_compression
{ {
opj_bool (OPJ_CALLCONV * opj_start_compress) ( void *p_codec, opj_bool (* opj_start_compress) ( void *p_codec,
struct opj_stream_private *cio, struct opj_stream_private *cio,
struct opj_image * p_image, struct opj_image * p_image,
struct opj_event_mgr * p_manager); struct opj_event_mgr * p_manager);
opj_bool (OPJ_CALLCONV * opj_encode) ( void * p_codec, opj_bool (* opj_encode) ( void * p_codec,
struct opj_stream_private *p_cio, struct opj_stream_private *p_cio,
struct opj_event_mgr * p_manager); struct opj_event_mgr * p_manager);
opj_bool (OPJ_CALLCONV * opj_write_tile) ( void * p_codec, opj_bool (* opj_write_tile) ( void * p_codec,
OPJ_UINT32 p_tile_index, OPJ_UINT32 p_tile_index,
OPJ_BYTE * p_data, OPJ_BYTE * p_data,
OPJ_UINT32 p_data_size, OPJ_UINT32 p_data_size,
struct opj_stream_private * p_cio, struct opj_stream_private * p_cio,
struct opj_event_mgr * p_manager); struct opj_event_mgr * p_manager);
opj_bool (OPJ_CALLCONV * opj_end_compress) ( void * p_codec, opj_bool (* opj_end_compress) ( void * p_codec,
struct opj_stream_private *p_cio, struct opj_stream_private *p_cio,
struct opj_event_mgr * p_manager); struct opj_event_mgr * p_manager);
void (OPJ_CALLCONV * opj_destroy) (void * p_codec); void (* opj_destroy) (void * p_codec);
void (OPJ_CALLCONV * opj_setup_encoder) ( void * p_codec, void (* opj_setup_encoder) ( void * p_codec,
opj_cparameters_t * p_param, opj_cparameters_t * p_param,
struct opj_image * p_image, struct opj_image * p_image,
struct opj_event_mgr * p_manager); struct opj_event_mgr * p_manager);
@ -664,29 +664,29 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format)
switch(p_format) { switch(p_format) {
case CODEC_J2K: case CODEC_J2K:
l_codec->m_codec_data.m_compression.opj_encode = (opj_bool (OPJ_CALLCONV *) (void *, l_codec->m_codec_data.m_compression.opj_encode = (opj_bool (*) (void *,
struct opj_stream_private *, struct opj_stream_private *,
struct opj_event_mgr * )) opj_j2k_encode_v2; struct opj_event_mgr * )) opj_j2k_encode_v2;
l_codec->m_codec_data.m_compression.opj_end_compress = (opj_bool (OPJ_CALLCONV *) ( void *, l_codec->m_codec_data.m_compression.opj_end_compress = (opj_bool (*) ( void *,
struct opj_stream_private *, struct opj_stream_private *,
struct opj_event_mgr *)) opj_j2k_end_compress; struct opj_event_mgr *)) opj_j2k_end_compress;
l_codec->m_codec_data.m_compression.opj_start_compress = (opj_bool (OPJ_CALLCONV *) (void *, l_codec->m_codec_data.m_compression.opj_start_compress = (opj_bool (*) (void *,
struct opj_stream_private *, struct opj_stream_private *,
struct opj_image * , struct opj_image * ,
struct opj_event_mgr *)) opj_j2k_start_compress; struct opj_event_mgr *)) opj_j2k_start_compress;
l_codec->m_codec_data.m_compression.opj_write_tile = (opj_bool (OPJ_CALLCONV *) (void *, l_codec->m_codec_data.m_compression.opj_write_tile = (opj_bool (*) (void *,
OPJ_UINT32, OPJ_UINT32,
OPJ_BYTE*, OPJ_BYTE*,
OPJ_UINT32, OPJ_UINT32,
struct opj_stream_private *, struct opj_stream_private *,
struct opj_event_mgr *) ) opj_j2k_write_tile; struct opj_event_mgr *) ) opj_j2k_write_tile;
l_codec->m_codec_data.m_compression.opj_destroy = (void (OPJ_CALLCONV *) (void *)) opj_j2k_destroy; l_codec->m_codec_data.m_compression.opj_destroy = (void (*) (void *)) opj_j2k_destroy;
l_codec->m_codec_data.m_compression.opj_setup_encoder = (void (OPJ_CALLCONV *) ( void *, l_codec->m_codec_data.m_compression.opj_setup_encoder = (void (*) ( void *,
opj_cparameters_t *, opj_cparameters_t *,
struct opj_image *, struct opj_image *,
struct opj_event_mgr * )) opj_j2k_setup_encoder; 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: case CODEC_JP2:
/* get a JP2 decoder handle */ /* get a JP2 decoder handle */
l_codec->m_codec_data.m_compression.opj_encode = (opj_bool (OPJ_CALLCONV *) (void *, l_codec->m_codec_data.m_compression.opj_encode = (opj_bool (*) (void *,
struct opj_stream_private *, struct opj_stream_private *,
struct opj_event_mgr * )) opj_jp2_encode; struct opj_event_mgr * )) opj_jp2_encode;
l_codec->m_codec_data.m_compression.opj_end_compress = (opj_bool (OPJ_CALLCONV *) ( void *, l_codec->m_codec_data.m_compression.opj_end_compress = (opj_bool (*) ( void *,
struct opj_stream_private *, struct opj_stream_private *,
struct opj_event_mgr *)) opj_jp2_end_compress; struct opj_event_mgr *)) opj_jp2_end_compress;
l_codec->m_codec_data.m_compression.opj_start_compress = (opj_bool (OPJ_CALLCONV *) (void *, l_codec->m_codec_data.m_compression.opj_start_compress = (opj_bool (*) (void *,
struct opj_stream_private *, struct opj_stream_private *,
struct opj_image * , struct opj_image * ,
struct opj_event_mgr *)) opj_jp2_start_compress; struct opj_event_mgr *)) opj_jp2_start_compress;
l_codec->m_codec_data.m_compression.opj_write_tile = (opj_bool (OPJ_CALLCONV *) (void *, l_codec->m_codec_data.m_compression.opj_write_tile = (opj_bool (*) (void *,
OPJ_UINT32, OPJ_UINT32,
OPJ_BYTE*, OPJ_BYTE*,
OPJ_UINT32, OPJ_UINT32,
struct opj_stream_private *, struct opj_stream_private *,
struct opj_event_mgr *)) opj_jp2_write_tile; struct opj_event_mgr *)) opj_jp2_write_tile;
l_codec->m_codec_data.m_compression.opj_destroy = (void (OPJ_CALLCONV *) (void *)) opj_jp2_destroy; l_codec->m_codec_data.m_compression.opj_destroy = (void (*) (void *)) opj_jp2_destroy;
l_codec->m_codec_data.m_compression.opj_setup_encoder = (void (OPJ_CALLCONV *) ( void *, l_codec->m_codec_data.m_compression.opj_setup_encoder = (void (*) ( void *,
opj_cparameters_t *, opj_cparameters_t *,
struct opj_image *, struct opj_image *,
struct opj_event_mgr * )) opj_jp2_setup_encoder; struct opj_event_mgr * )) opj_jp2_setup_encoder;