X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fopenjp2%2Fopenjpeg.c;h=d5ffb7106934e2685198e9c21c4de0bf3c2c1d7f;hb=6def7e38b4497b81f9338876548e97e8279c2acd;hp=65293cfe422b6e7d07edc8c10a739688bff49b8a;hpb=f824078c14af9ff8153f4ee26a2c5a37117e8855;p=openjpeg.git diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c index 65293cfe..d5ffb710 100644 --- a/src/lib/openjp2/openjpeg.c +++ b/src/lib/openjp2/openjpeg.c @@ -1,5 +1,12 @@ /* + * The copyright in this software is being made available under the 2-clauses + * BSD License, included below. This software may be subject to other third + * party and contributor rights, including patent rights, and no such rights + * are granted under this license. + * * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2008, 2011-2012, Centre National d'Etudes Spatiales (CNES), FR + * Copyright (c) 2012, CS Systemes d'Information, France * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,131 +35,13 @@ #include #endif /* _WIN32 */ -#include "opj_config.h" #include "opj_includes.h" -/** - * Decompression handler. - */ -typedef struct opj_decompression -{ - /** Main header reading function handler*/ - opj_bool (*opj_read_header) ( struct opj_stream_private * cio, - void * p_codec, - opj_image_t **p_image, - struct opj_event_mgr * p_manager); - /** Decoding function */ - opj_bool (*opj_decode) ( void * p_codec, - struct opj_stream_private *p_cio, - opj_image_t *p_image, - struct opj_event_mgr * p_manager); - /** FIXME DOC */ - opj_bool (*opj_read_tile_header)( void * p_codec, - OPJ_UINT32 * p_tile_index, - OPJ_UINT32* p_data_size, - OPJ_INT32 * p_tile_x0, OPJ_INT32 * p_tile_y0, - OPJ_INT32 * p_tile_x1, OPJ_INT32 * p_tile_y1, - OPJ_UINT32 * p_nb_comps, - opj_bool * p_should_go_on, - struct opj_stream_private *p_cio, - struct opj_event_mgr * p_manager); - /** FIXME DOC */ - opj_bool (*opj_decode_tile_data)( 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); - /** Reading function used after codestream if necessary */ - opj_bool (* opj_end_decompress) ( void *p_codec, - struct opj_stream_private *cio, - struct opj_event_mgr * p_manager); - /** Codec destroy function handler*/ - void (*opj_destroy) (void * p_codec); - /** Setup decoder function handler */ - void (*opj_setup_decoder) (void * p_codec, opj_dparameters_t * p_param); - /** Set decode area function handler */ - opj_bool (*opj_set_decode_area) ( void * p_codec, - opj_image_t* p_image, - OPJ_INT32 p_start_x, OPJ_INT32 p_end_x, - OPJ_INT32 p_start_y, OPJ_INT32 p_end_y, - struct opj_event_mgr * p_manager); - - /** Get tile function */ - opj_bool (*opj_get_decoded_tile) ( void *p_codec, - opj_stream_private_t *p_cio, - opj_image_t *p_image, - struct opj_event_mgr * p_manager, - OPJ_UINT32 tile_index); - - /** Set the decoded resolution factor */ - opj_bool (*opj_set_decoded_resolution_factor) ( void * p_codec, - OPJ_UINT32 res_factor, - opj_event_mgr_t * p_manager); - -}opj_decompression_t; - -/** - * Compression handler. FIXME DOC - */ -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); - - 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); - -}opj_compression_t; - -/** - * Main codec handler used for compression or decompression. - */ -typedef struct opj_codec_private -{ - /** FIXME DOC */ - union - { - opj_decompression_t m_decompression; - opj_compression_t m_compression; - } m_codec_data; - /** FIXME DOC*/ - void * m_codec; - /** Event handler */ - opj_event_mgr_t m_event_mgr; - /** Flag to indicate if the codec is used to decode or encode*/ - opj_bool is_decompressor; - void (*opj_dump_codec) (void * p_codec, OPJ_INT32 info_flag, FILE* output_stream); - opj_codestream_info_v2_t* (*opj_get_codec_info)(void* p_codec); - opj_codestream_index_t* (*opj_get_codec_index)(void* p_codec); -} -opj_codec_private_t; /* ---------------------------------------------------------------------- */ /* Functions to set the message handlers */ -opj_bool OPJ_CALLCONV opj_set_info_handler( opj_codec_t * p_codec, +OPJ_BOOL OPJ_CALLCONV opj_set_info_handler( opj_codec_t * p_codec, opj_msg_callback p_callback, void * p_user_data) { @@ -167,7 +56,7 @@ opj_bool OPJ_CALLCONV opj_set_info_handler( opj_codec_t * p_codec, return OPJ_TRUE; } -opj_bool OPJ_CALLCONV opj_set_warning_handler( opj_codec_t * p_codec, +OPJ_BOOL OPJ_CALLCONV opj_set_warning_handler( opj_codec_t * p_codec, opj_msg_callback p_callback, void * p_user_data) { @@ -182,7 +71,7 @@ opj_bool OPJ_CALLCONV opj_set_warning_handler( opj_codec_t * p_codec, return OPJ_TRUE; } -opj_bool OPJ_CALLCONV opj_set_error_handler(opj_codec_t * p_codec, +OPJ_BOOL OPJ_CALLCONV opj_set_error_handler(opj_codec_t * p_codec, opj_msg_callback p_callback, void * p_user_data) { @@ -202,7 +91,7 @@ opj_bool OPJ_CALLCONV opj_set_error_handler(opj_codec_t * p_codec, static OPJ_SIZE_T opj_read_from_file (void * p_buffer, OPJ_SIZE_T p_nb_bytes, FILE * p_file) { OPJ_SIZE_T l_nb_read = fread(p_buffer,1,p_nb_bytes,p_file); - return l_nb_read ? l_nb_read : -1; + return l_nb_read ? l_nb_read : (OPJ_SIZE_T)-1; } static OPJ_UINT64 opj_get_data_length_from_file (FILE * p_file) @@ -210,10 +99,10 @@ static OPJ_UINT64 opj_get_data_length_from_file (FILE * p_file) OPJ_OFF_T file_length = 0; OPJ_FSEEK(p_file, 0, SEEK_END); - file_length = (OPJ_UINT64)OPJ_FTELL(p_file); + file_length = (OPJ_OFF_T)OPJ_FTELL(p_file); OPJ_FSEEK(p_file, 0, SEEK_SET); - return file_length; + return (OPJ_UINT64)file_length; } static OPJ_SIZE_T opj_write_from_file (void * p_buffer, OPJ_SIZE_T p_nb_bytes, FILE * p_file) @@ -230,7 +119,7 @@ static OPJ_OFF_T opj_skip_from_file (OPJ_OFF_T p_nb_bytes, FILE * p_user_data) return p_nb_bytes; } -static opj_bool opj_seek_from_file (OPJ_OFF_T p_nb_bytes, FILE * p_user_data) +static OPJ_BOOL opj_seek_from_file (OPJ_OFF_T p_nb_bytes, FILE * p_user_data) { if (OPJ_FSEEK(p_user_data,p_nb_bytes,SEEK_SET)) { return OPJ_FALSE; @@ -243,7 +132,7 @@ static opj_bool opj_seek_from_file (OPJ_OFF_T p_nb_bytes, FILE * p_user_data) #ifdef _WIN32 #ifndef OPJ_STATIC BOOL APIENTRY -DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { +DllMain(HINSTANCE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { OPJ_ARG_NOT_USED(lpReserved); OPJ_ARG_NOT_USED(hModule); @@ -280,12 +169,11 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format) if (!l_codec){ return 00; } - memset(l_codec, 0, sizeof(opj_codec_private_t)); l_codec->is_decompressor = 1; switch (p_format) { - case CODEC_J2K: + case OPJ_CODEC_J2K: l_codec->opj_dump_codec = (void (*) (void*, OPJ_INT32, FILE*)) j2k_dump; l_codec->opj_get_codec_info = (opj_codestream_info_v2_t* (*) (void*) ) j2k_get_cstr_info; @@ -293,17 +181,17 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format) l_codec->opj_get_codec_index = (opj_codestream_index_t* (*) (void*) ) j2k_get_cstr_index; l_codec->m_codec_data.m_decompression.opj_decode = - (opj_bool (*) ( void *, + (OPJ_BOOL (*) ( void *, struct opj_stream_private *, opj_image_t*, struct opj_event_mgr * )) opj_j2k_decode; l_codec->m_codec_data.m_decompression.opj_end_decompress = - (opj_bool (*) ( void *, + (OPJ_BOOL (*) ( void *, struct opj_stream_private *, struct opj_event_mgr *)) opj_j2k_end_decompress; l_codec->m_codec_data.m_decompression.opj_read_header = - (opj_bool (*) ( struct opj_stream_private *, + (OPJ_BOOL (*) ( struct opj_stream_private *, void *, opj_image_t **, struct opj_event_mgr * )) opj_j2k_read_header; @@ -315,18 +203,18 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format) (void (*) (void * , opj_dparameters_t * )) opj_j2k_setup_decoder; l_codec->m_codec_data.m_decompression.opj_read_tile_header = - (opj_bool (*) ( void *, + (OPJ_BOOL (*) ( void *, OPJ_UINT32*, OPJ_UINT32*, OPJ_INT32*, OPJ_INT32*, OPJ_INT32*, OPJ_INT32*, OPJ_UINT32*, - opj_bool*, + OPJ_BOOL*, struct opj_stream_private *, struct opj_event_mgr * )) opj_j2k_read_tile_header; l_codec->m_codec_data.m_decompression.opj_decode_tile_data = - (opj_bool (*) ( void *, + (OPJ_BOOL (*) ( void *, OPJ_UINT32, OPJ_BYTE*, OPJ_UINT32, @@ -334,20 +222,20 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format) struct opj_event_mgr *)) opj_j2k_decode_tile; l_codec->m_codec_data.m_decompression.opj_set_decode_area = - (opj_bool (*) ( void *, + (OPJ_BOOL (*) ( void *, opj_image_t*, OPJ_INT32, OPJ_INT32, OPJ_INT32, OPJ_INT32, struct opj_event_mgr *)) opj_j2k_set_decode_area; l_codec->m_codec_data.m_decompression.opj_get_decoded_tile = - (opj_bool (*) ( void *p_codec, + (OPJ_BOOL (*) ( void *p_codec, opj_stream_private_t *p_cio, opj_image_t *p_image, struct opj_event_mgr * p_manager, OPJ_UINT32 tile_index)) opj_j2k_get_tile; l_codec->m_codec_data.m_decompression.opj_set_decoded_resolution_factor = - (opj_bool (*) ( void * p_codec, + (OPJ_BOOL (*) ( void * p_codec, OPJ_UINT32 res_factor, struct opj_event_mgr * p_manager)) opj_j2k_set_decoded_resolution_factor; @@ -360,7 +248,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format) break; - case CODEC_JP2: + case OPJ_CODEC_JP2: /* get a JP2 decoder handle */ l_codec->opj_dump_codec = (void (*) (void*, OPJ_INT32, FILE*)) jp2_dump; @@ -369,24 +257,24 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format) l_codec->opj_get_codec_index = (opj_codestream_index_t* (*) (void*) ) jp2_get_cstr_index; l_codec->m_codec_data.m_decompression.opj_decode = - (opj_bool (*) ( void *, + (OPJ_BOOL (*) ( void *, struct opj_stream_private *, opj_image_t*, struct opj_event_mgr * )) opj_jp2_decode; l_codec->m_codec_data.m_decompression.opj_end_decompress = - (opj_bool (*) ( void *, + (OPJ_BOOL (*) ( void *, struct opj_stream_private *, struct opj_event_mgr *)) opj_jp2_end_decompress; l_codec->m_codec_data.m_decompression.opj_read_header = - (opj_bool (*) ( struct opj_stream_private *, + (OPJ_BOOL (*) ( struct opj_stream_private *, void *, opj_image_t **, struct opj_event_mgr * )) opj_jp2_read_header; l_codec->m_codec_data.m_decompression.opj_read_tile_header = - (opj_bool (*) ( void *, + (OPJ_BOOL (*) ( void *, OPJ_UINT32*, OPJ_UINT32*, OPJ_INT32*, @@ -394,12 +282,12 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format) OPJ_INT32 * , OPJ_INT32 * , OPJ_UINT32 * , - opj_bool *, + OPJ_BOOL *, struct opj_stream_private *, struct opj_event_mgr * )) opj_jp2_read_tile_header; l_codec->m_codec_data.m_decompression.opj_decode_tile_data = - (opj_bool (*) ( void *, + (OPJ_BOOL (*) ( void *, OPJ_UINT32,OPJ_BYTE*,OPJ_UINT32, struct opj_stream_private *, struct opj_event_mgr * )) opj_jp2_decode_tile; @@ -410,20 +298,20 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format) (void (*) (void * ,opj_dparameters_t * )) opj_jp2_setup_decoder; l_codec->m_codec_data.m_decompression.opj_set_decode_area = - (opj_bool (*) ( void *, + (OPJ_BOOL (*) ( void *, opj_image_t*, OPJ_INT32,OPJ_INT32,OPJ_INT32,OPJ_INT32, struct opj_event_mgr * )) opj_jp2_set_decode_area; l_codec->m_codec_data.m_decompression.opj_get_decoded_tile = - (opj_bool (*) ( void *p_codec, + (OPJ_BOOL (*) ( void *p_codec, opj_stream_private_t *p_cio, opj_image_t *p_image, struct opj_event_mgr * p_manager, OPJ_UINT32 tile_index)) opj_jp2_get_tile; l_codec->m_codec_data.m_decompression.opj_set_decoded_resolution_factor = - (opj_bool (*) ( void * p_codec, + (OPJ_BOOL (*) ( void * p_codec, OPJ_UINT32 res_factor, opj_event_mgr_t * p_manager)) opj_jp2_set_decoded_resolution_factor; @@ -435,8 +323,8 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format) } break; - case CODEC_UNKNOWN: - case CODEC_JPT: + case OPJ_CODEC_UNKNOWN: + case OPJ_CODEC_JPT: default: opj_free(l_codec); return 00; @@ -452,7 +340,6 @@ void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *paramete /* default decoding parameters */ parameters->cp_layer = 0; parameters->cp_reduce = 0; - parameters->cp_limit_decoding = NO_LIMITATION; parameters->decod_format = -1; parameters->cod_format = -1; @@ -467,7 +354,7 @@ void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *paramete } } -opj_bool OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec, +OPJ_BOOL OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec, opj_dparameters_t *parameters ) { @@ -487,7 +374,7 @@ opj_bool OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec, return OPJ_FALSE; } -opj_bool OPJ_CALLCONV opj_read_header ( opj_stream_t *p_stream, +OPJ_BOOL OPJ_CALLCONV opj_read_header ( opj_stream_t *p_stream, opj_codec_t *p_codec, opj_image_t **p_image ) { @@ -510,7 +397,7 @@ opj_bool OPJ_CALLCONV opj_read_header ( opj_stream_t *p_stream, return OPJ_FALSE; } -opj_bool OPJ_CALLCONV opj_decode( opj_codec_t *p_codec, +OPJ_BOOL OPJ_CALLCONV opj_decode( opj_codec_t *p_codec, opj_stream_t *p_stream, opj_image_t* p_image) { @@ -531,7 +418,7 @@ opj_bool OPJ_CALLCONV opj_decode( opj_codec_t *p_codec, return OPJ_FALSE; } -opj_bool OPJ_CALLCONV opj_set_decode_area( opj_codec_t *p_codec, +OPJ_BOOL OPJ_CALLCONV opj_set_decode_area( opj_codec_t *p_codec, opj_image_t* p_image, OPJ_INT32 p_start_x, OPJ_INT32 p_start_y, OPJ_INT32 p_end_x, OPJ_INT32 p_end_y @@ -553,14 +440,14 @@ opj_bool OPJ_CALLCONV opj_set_decode_area( opj_codec_t *p_codec, return OPJ_FALSE; } -opj_bool OPJ_CALLCONV opj_read_tile_header( opj_codec_t *p_codec, +OPJ_BOOL OPJ_CALLCONV opj_read_tile_header( opj_codec_t *p_codec, opj_stream_t * p_stream, OPJ_UINT32 * p_tile_index, OPJ_UINT32 * p_data_size, OPJ_INT32 * p_tile_x0, OPJ_INT32 * p_tile_y0, OPJ_INT32 * p_tile_x1, OPJ_INT32 * p_tile_y1, OPJ_UINT32 * p_nb_comps, - opj_bool * p_should_go_on) + OPJ_BOOL * p_should_go_on) { if (p_codec && p_stream && p_data_size && p_tile_index) { opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec; @@ -583,7 +470,7 @@ opj_bool OPJ_CALLCONV opj_read_tile_header( opj_codec_t *p_codec, return OPJ_FALSE; } -opj_bool OPJ_CALLCONV opj_decode_tile_data( opj_codec_t *p_codec, +OPJ_BOOL OPJ_CALLCONV opj_decode_tile_data( opj_codec_t *p_codec, OPJ_UINT32 p_tile_index, OPJ_BYTE * p_data, OPJ_UINT32 p_data_size, @@ -608,7 +495,7 @@ opj_bool OPJ_CALLCONV opj_decode_tile_data( opj_codec_t *p_codec, return OPJ_FALSE; } -opj_bool OPJ_CALLCONV opj_get_decoded_tile( opj_codec_t *p_codec, +OPJ_BOOL OPJ_CALLCONV opj_get_decoded_tile( opj_codec_t *p_codec, opj_stream_t *p_stream, opj_image_t *p_image, OPJ_UINT32 tile_index) @@ -631,20 +518,18 @@ opj_bool OPJ_CALLCONV opj_get_decoded_tile( opj_codec_t *p_codec, return OPJ_FALSE; } -opj_bool OPJ_CALLCONV opj_set_decoded_resolution_factor(opj_codec_t *p_codec, +OPJ_BOOL OPJ_CALLCONV opj_set_decoded_resolution_factor(opj_codec_t *p_codec, OPJ_UINT32 res_factor ) { opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec; if ( !l_codec ){ - fprintf(stderr, "[ERROR] Input parameters of the setup_decoder function are incorrect.\n"); return OPJ_FALSE; } - l_codec->m_codec_data.m_decompression.opj_set_decoded_resolution_factor(l_codec->m_codec, + return l_codec->m_codec_data.m_decompression.opj_set_decoded_resolution_factor(l_codec->m_codec, res_factor, &(l_codec->m_event_mgr) ); - return OPJ_TRUE; } /* ---------------------------------------------------------------------- */ @@ -658,26 +543,25 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format) if (!l_codec) { return 00; } - memset(l_codec, 0, sizeof(opj_codec_private_t)); l_codec->is_decompressor = 0; switch(p_format) { - case CODEC_J2K: - l_codec->m_codec_data.m_compression.opj_encode = (opj_bool (*) (void *, + case OPJ_CODEC_J2K: + l_codec->m_codec_data.m_compression.opj_encode = (OPJ_BOOL (*) (void *, struct opj_stream_private *, - struct opj_event_mgr * )) opj_j2k_encode_v2; + struct opj_event_mgr * )) opj_j2k_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 (*) ( 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 (*) (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 (*) (void *, OPJ_UINT32, OPJ_BYTE*, OPJ_UINT32, @@ -686,7 +570,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format) 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 (*) ( void *, + l_codec->m_codec_data.m_compression.opj_setup_encoder = (OPJ_BOOL (*) ( void *, opj_cparameters_t *, struct opj_image *, struct opj_event_mgr * )) opj_j2k_setup_encoder; @@ -699,22 +583,22 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format) break; - case CODEC_JP2: + case OPJ_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 (*) (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 (*) ( 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 (*) (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 (*) (void *, OPJ_UINT32, OPJ_BYTE*, OPJ_UINT32, @@ -723,7 +607,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format) 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 (*) ( void *, + l_codec->m_codec_data.m_compression.opj_setup_encoder = (OPJ_BOOL (*) ( void *, opj_cparameters_t *, struct opj_image *, struct opj_event_mgr * )) opj_jp2_setup_encoder; @@ -736,8 +620,8 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format) break; - case CODEC_UNKNOWN: - case CODEC_JPT: + case OPJ_CODEC_UNKNOWN: + case OPJ_CODEC_JPT: default: opj_free(l_codec); return 00; @@ -751,13 +635,14 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete if(parameters) { memset(parameters, 0, sizeof(opj_cparameters_t)); /* default coding parameters */ - parameters->cp_cinema = OFF; + parameters->cp_cinema = OPJ_OFF; /* DEPRECATED */ + parameters->rsiz = OPJ_PROFILE_NONE; parameters->max_comp_size = 0; parameters->numresolution = 6; - parameters->cp_rsiz = STD_RSIZ; + parameters->cp_rsiz = OPJ_STD_RSIZ; /* DEPRECATED */ parameters->cblockw_init = 64; parameters->cblockh_init = 64; - parameters->prog_order = LRCP; + parameters->prog_order = OPJ_LRCP; parameters->roi_compno = -1; /* no ROI */ parameters->subsampling_dx = 1; parameters->subsampling_dy = 1; @@ -769,6 +654,7 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete parameters->cp_disto_alloc = 0; parameters->cp_fixed_alloc = 0; parameters->cp_fixed_quality = 0; + parameters->jpip_on = OPJ_FALSE; /* UniPG>> */ #ifdef USE_JPWL parameters->jpwl_epc_on = OPJ_FALSE; @@ -804,7 +690,7 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete } } -opj_bool OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec, +OPJ_BOOL OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec, opj_cparameters_t *parameters, opj_image_t *p_image) { @@ -812,18 +698,17 @@ opj_bool OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec, opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec; if (! l_codec->is_decompressor) { - l_codec->m_codec_data.m_compression.opj_setup_encoder( l_codec->m_codec, + return l_codec->m_codec_data.m_compression.opj_setup_encoder( l_codec->m_codec, parameters, p_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_BOOL OPJ_CALLCONV opj_start_compress ( opj_codec_t *p_codec, opj_image_t * p_image, opj_stream_t *p_stream) { @@ -842,17 +727,16 @@ opj_bool OPJ_CALLCONV opj_start_compress ( opj_codec_t *p_codec, return OPJ_FALSE; } -opj_bool OPJ_CALLCONV opj_encode(opj_codec_t *p_info, opj_stream_t *p_stream) +OPJ_BOOL OPJ_CALLCONV opj_encode(opj_codec_t *p_info, opj_stream_t *p_stream) { if (p_info && p_stream) { opj_codec_private_t * l_codec = (opj_codec_private_t *) p_info; opj_stream_private_t * l_stream = (opj_stream_private_t *) p_stream; if (! l_codec->is_decompressor) { - l_codec->m_codec_data.m_compression.opj_encode( l_codec->m_codec, + return l_codec->m_codec_data.m_compression.opj_encode( l_codec->m_codec, l_stream, &(l_codec->m_event_mgr)); - return OPJ_TRUE; } } @@ -860,7 +744,7 @@ opj_bool OPJ_CALLCONV opj_encode(opj_codec_t *p_info, opj_stream_t *p_stream) } -opj_bool OPJ_CALLCONV opj_end_compress (opj_codec_t *p_codec, +OPJ_BOOL OPJ_CALLCONV opj_end_compress (opj_codec_t *p_codec, opj_stream_t *p_stream) { if (p_codec && p_stream) { @@ -877,7 +761,7 @@ opj_bool OPJ_CALLCONV opj_end_compress (opj_codec_t *p_codec, } -opj_bool OPJ_CALLCONV opj_end_decompress ( opj_codec_t *p_codec, +OPJ_BOOL OPJ_CALLCONV opj_end_decompress ( opj_codec_t *p_codec, opj_stream_t *p_stream) { if (p_codec && p_stream) { @@ -896,17 +780,20 @@ opj_bool OPJ_CALLCONV opj_end_decompress ( opj_codec_t *p_codec, return OPJ_FALSE; } -opj_bool OPJ_CALLCONV opj_set_MCT(opj_cparameters_t *parameters, +OPJ_BOOL OPJ_CALLCONV opj_set_MCT(opj_cparameters_t *parameters, OPJ_FLOAT32 * pEncodingMatrix, OPJ_INT32 * p_dc_shift,OPJ_UINT32 pNbComp) { - OPJ_UINT32 l_matrix_size = pNbComp * pNbComp * sizeof(OPJ_FLOAT32); - OPJ_UINT32 l_dc_shift_size = pNbComp * sizeof(OPJ_INT32); + OPJ_UINT32 l_matrix_size = pNbComp * pNbComp * (OPJ_UINT32)sizeof(OPJ_FLOAT32); + OPJ_UINT32 l_dc_shift_size = pNbComp * (OPJ_UINT32)sizeof(OPJ_INT32); OPJ_UINT32 l_mct_total_size = l_matrix_size + l_dc_shift_size; /* add MCT capability */ - int rsiz = (int)parameters->cp_rsiz | (int)MCT; - parameters->cp_rsiz = (OPJ_RSIZ_CAPABILITIES)rsiz; + if (OPJ_IS_PART2(parameters->rsiz)) { + parameters->rsiz |= OPJ_EXTENSION_MCT; + } else { + parameters->rsiz = ((OPJ_PROFILE_PART2) | (OPJ_EXTENSION_MCT)); + } parameters->irreversible = 1; /* use array based MCT */ @@ -922,7 +809,7 @@ opj_bool OPJ_CALLCONV opj_set_MCT(opj_cparameters_t *parameters, return OPJ_TRUE; } -opj_bool OPJ_CALLCONV opj_write_tile ( opj_codec_t *p_codec, +OPJ_BOOL OPJ_CALLCONV opj_write_tile ( opj_codec_t *p_codec, OPJ_UINT32 p_tile_index, OPJ_BYTE * p_data, OPJ_UINT32 p_data_size, @@ -1029,33 +916,44 @@ void OPJ_CALLCONV opj_destroy_cstr_index(opj_codestream_index_t **p_cstr_index) } } -/* ---------------------------------------------------------------------- */ -opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (FILE * p_file, opj_bool p_is_read_stream) +opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (const char *fname, OPJ_BOOL p_is_read_stream) { - return opj_stream_create_file_stream(p_file,J2K_STREAM_CHUNK_SIZE,p_is_read_stream); + return opj_stream_create_file_stream(fname, OPJ_J2K_STREAM_CHUNK_SIZE, p_is_read_stream); } -opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream ( FILE * p_file, - OPJ_SIZE_T p_size, - opj_bool p_is_read_stream) +opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream ( + const char *fname, + OPJ_SIZE_T p_size, + OPJ_BOOL p_is_read_stream) { - opj_stream_t* l_stream = 00; + opj_stream_t* l_stream = 00; + FILE *p_file; + const char *mode; - if (! p_file) { - return NULL; - } + if (! fname) { + return NULL; + } + + if(p_is_read_stream) mode = "rb"; else mode = "wb"; - l_stream = opj_stream_create(p_size,p_is_read_stream); - if (! l_stream) { - return NULL; - } + p_file = fopen(fname, mode); + + if (! p_file) { + return NULL; + } + + l_stream = opj_stream_create(p_size,p_is_read_stream); + if (! l_stream) { + fclose(p_file); + return NULL; + } - opj_stream_set_user_data(l_stream, p_file); - opj_stream_set_user_data_length(l_stream, opj_get_data_length_from_file(p_file)); - opj_stream_set_read_function(l_stream, (opj_stream_read_fn) opj_read_from_file); - opj_stream_set_write_function(l_stream, (opj_stream_write_fn) opj_write_from_file); - opj_stream_set_skip_function(l_stream, (opj_stream_skip_fn) opj_skip_from_file); - opj_stream_set_seek_function(l_stream, (opj_stream_seek_fn) opj_seek_from_file); + opj_stream_set_user_data(l_stream, p_file, (opj_stream_free_user_data_fn) fclose); + opj_stream_set_user_data_length(l_stream, opj_get_data_length_from_file(p_file)); + opj_stream_set_read_function(l_stream, (opj_stream_read_fn) opj_read_from_file); + opj_stream_set_write_function(l_stream, (opj_stream_write_fn) opj_write_from_file); + opj_stream_set_skip_function(l_stream, (opj_stream_skip_fn) opj_skip_from_file); + opj_stream_set_seek_function(l_stream, (opj_stream_seek_fn) opj_seek_from_file); - return l_stream; + return l_stream; }