*/
typedef struct opj_compression
{
- opj_bool (* opj_start_compress) (void *p_codec,struct opj_stream_private *cio,struct opj_image * p_image, struct opj_event_mgr * p_manager);
- opj_bool (* opj_encode) (void * p_codec, struct opj_stream_private *p_cio, struct opj_event_mgr * p_manager);
- opj_bool (* opj_write_tile) (void * p_codec,OPJ_UINT32 p_tile_index,OPJ_BYTE * p_data,OPJ_UINT32 p_data_size,struct opj_stream_private * p_cio,struct opj_event_mgr * p_manager);
- opj_bool (* opj_end_compress) (void * p_codec, struct opj_stream_private *p_cio, struct opj_event_mgr * p_manager);
+ opj_bool (* opj_start_compress) ( void *p_codec,
+ struct opj_stream_private *cio,
+ struct opj_image * p_image,
+ struct opj_event_mgr * p_manager);
+
+ opj_bool (* opj_encode) ( void * p_codec,
+ struct opj_stream_private *p_cio,
+ struct opj_event_mgr * p_manager);
+
+ opj_bool (* opj_write_tile) ( void * p_codec,
+ OPJ_UINT32 p_tile_index,
+ OPJ_BYTE * p_data,
+ OPJ_UINT32 p_data_size,
+ struct opj_stream_private * p_cio,
+ struct opj_event_mgr * p_manager);
+
+ opj_bool (* opj_end_compress) ( void * p_codec,
+ struct opj_stream_private *p_cio,
+ struct opj_event_mgr * p_manager);
+
void (* opj_destroy) (void * p_codec);
- void (*opj_setup_encoder) (void * p_codec,opj_cparameters_t * p_param,struct opj_image * p_image, struct opj_event_mgr * p_manager);
+
+ void (*opj_setup_encoder) ( void * p_codec,
+ opj_cparameters_t * p_param,
+ struct opj_image * p_image,
+ struct opj_event_mgr * p_manager);
}opj_compression_t;
const char* OPJ_CALLCONV opj_version(void) {
- return PACKAGE_VERSION;
+ return OPJ_PACKAGE_VERSION;
}
case CODEC_J2K:
l_info->m_codec_data.m_compression.opj_encode = (opj_bool (*) ( void *,
struct opj_stream_private *,
- struct opj_event_mgr * ) ) j2k_encode_v2;
+ struct opj_event_mgr * )) j2k_encode_v2;
l_info->m_codec_data.m_compression.opj_end_compress = (opj_bool (*) ( void *,
struct opj_stream_private *,
l_info->m_codec_data.m_compression.opj_start_compress = (opj_bool (*) ( void *,
struct opj_stream_private *,
struct opj_image * ,
- struct opj_event_mgr *) ) j2k_start_compress;
+ struct opj_event_mgr *)) j2k_start_compress;
+
+ l_info->m_codec_data.m_compression.opj_write_tile = (opj_bool (*) ( void *,
+ OPJ_UINT32,
+ OPJ_BYTE*,
+ OPJ_UINT32,
+ struct opj_stream_private *,
+ struct opj_event_mgr *) ) j2k_write_tile;
- l_info->m_codec_data.m_compression.opj_write_tile = (opj_bool (*) (void *,OPJ_UINT32,OPJ_BYTE*,OPJ_UINT32,struct opj_stream_private *, struct opj_event_mgr *)) j2k_write_tile;
l_info->m_codec_data.m_compression.opj_destroy = (void (*) (void *)) j2k_destroy;
- l_info->m_codec_data.m_compression.opj_setup_encoder = (void (*) (void *,opj_cparameters_t *,struct opj_image *, struct opj_event_mgr * )) j2k_setup_encoder;
- l_info->m_codec = j2k_create_compress();
- if (! l_info->m_codec)
- {
+ l_info->m_codec_data.m_compression.opj_setup_encoder = (void (*) ( void *,
+ opj_cparameters_t *,
+ struct opj_image *,
+ struct opj_event_mgr * )) j2k_setup_encoder;
+
+ l_info->m_codec = j2k_create_compress_v2();
+ if (! l_info->m_codec) {
opj_free(l_info);
return 00;
}
+
break;
case CODEC_JP2:
/* get a JP2 decoder handle */
- l_info->m_codec_data.m_compression.opj_encode = (bool (*) (void *, struct opj_stream_private *, struct opj_event_mgr * )) opj_jp2_encode;
- l_info->m_codec_data.m_compression.opj_end_compress = (bool (*) (void *, struct opj_stream_private *, struct opj_event_mgr *)) jp2_end_compress;
- l_info->m_codec_data.m_compression.opj_start_compress = (bool (*) (void *,struct opj_stream_private *,struct opj_image * , struct opj_event_mgr *)) jp2_start_compress;
- l_info->m_codec_data.m_compression.opj_write_tile = (bool (*) (void *,OPJ_UINT32,OPJ_BYTE*,OPJ_UINT32,struct opj_stream_private *, struct opj_event_mgr *)) jp2_write_tile;
+ l_info->m_codec_data.m_compression.opj_encode = (opj_bool (*) ( void *,
+ struct opj_stream_private *,
+ struct opj_event_mgr * )) opj_jp2_encode;
+
+ l_info->m_codec_data.m_compression.opj_end_compress = (opj_bool (*) ( void *,
+ struct opj_stream_private *,
+ struct opj_event_mgr *)) jp2_end_compress;
+
+ l_info->m_codec_data.m_compression.opj_start_compress = (opj_bool (*) ( void *,
+ struct opj_stream_private *,
+ struct opj_image * ,
+ struct opj_event_mgr *)) jp2_start_compress;
+
+ l_info->m_codec_data.m_compression.opj_write_tile = (opj_bool (*) ( void *,
+ OPJ_UINT32,
+ OPJ_BYTE*,
+ OPJ_UINT32,
+ struct opj_stream_private *,
+ struct opj_event_mgr *)) jp2_write_tile;
+
l_info->m_codec_data.m_compression.opj_destroy = (void (*) (void *)) jp2_destroy;
- l_info->m_codec_data.m_compression.opj_setup_encoder = (void (*) (void *,opj_cparameters_t *,struct opj_image *, struct opj_event_mgr * )) jp2_setup_encoder;
- l_info->m_codec = jp2_create(false);
+ l_info->m_codec_data.m_compression.opj_setup_encoder = (void (*) ( void *,
+ opj_cparameters_t *,
+ struct opj_image *,
+ struct opj_event_mgr * )) jp2_setup_encoder;
+
+ l_info->m_codec = jp2_create(OPJ_FALSE);
if (! l_info->m_codec) {
opj_free(l_info);
return 00;
}
+
break;
case CODEC_UNKNOWN:
return 00;
}
- set_default_event_handler(&(l_info->m_event_mgr));
+ /*set_default_event_handler(&(l_info->m_event_mgr));*/
return (opj_codec_t*) l_info;
}
}
}
+opj_bool OPJ_CALLCONV opj_setup_encoder_v2(opj_codec_t *p_info, opj_cparameters_t *parameters, opj_image_t *image)
+{
+ if (p_info && parameters && image) {
+ opj_codec_private_t * l_codec = ((opj_codec_private_t *) p_info);
+
+ if (! l_codec->is_decompressor) {
+ l_codec->m_codec_data.m_compression.opj_setup_encoder(l_codec->m_codec,parameters,image,l_codec->m_event_mgr);
+ return OPJ_TRUE;
+ }
+ }
+
+ return OPJ_FALSE;
+}
+
+opj_bool OPJ_CALLCONV opj_start_compress ( opj_codec_t *p_codec,
+ opj_image_t * p_image,
+ opj_stream_t *p_cio)
+{
+ if (p_codec && p_cio) {
+ opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec;
+ opj_stream_private_t * l_cio = (opj_stream_private_t *) p_cio;
+
+ if (! l_codec->is_decompressor) {
+ return l_codec->m_codec_data.m_compression.opj_start_compress(l_codec->m_codec,l_cio,p_image,l_codec->m_event_mgr);
+ }
+ }
+
+ return OPJ_FALSE;
+}
+
+opj_bool OPJ_CALLCONV opj_encode_v2(opj_codec_t *p_info, opj_stream_t *cio)
+{
+ if (p_info && cio) {
+ opj_codec_private_t * l_codec = (opj_codec_private_t *) p_info;
+ opj_stream_private_t * l_cio = (opj_stream_private_t *) cio;
+
+ if (! l_codec->is_decompressor) {
+ l_codec->m_codec_data.m_compression.opj_encode(l_codec->m_codec,l_cio,l_codec->m_event_mgr);
+ return OPJ_TRUE;
+ }
+ }
+
+ return OPJ_FALSE;
+
+}
+
+opj_bool OPJ_CALLCONV opj_end_compress (opj_codec_t *p_codec,opj_stream_t *p_cio)
+{
+ if (p_codec && p_cio) {
+ opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec;
+ opj_stream_private_t * l_cio = (opj_stream_private_t *) p_cio;
+
+ if (! l_codec->is_decompressor) {
+ return l_codec->m_codec_data.m_compression.opj_end_compress(l_codec->m_codec,l_cio,l_codec->m_event_mgr);
+ }
+ }
+ return OPJ_FALSE;
+
+}
+
opj_bool OPJ_CALLCONV opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index) {
if (index != NULL)
opj_event_msg((opj_common_ptr)cinfo, EVT_WARNING, "Set index to NULL when calling the opj_encode function.\n"
projects / openjpeg.git / blobdiff