[trunk] Add debug info to track issue 80
[openjpeg.git] / src / lib / openjp2 / openjpeg.c
index ad0111630588060c2b5eae7941729992460be85a..0522acb00b45fe287d715a011f0901e7ead0f152 100644 (file)
 
 #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 */
@@ -211,10 +94,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)
@@ -1061,7 +944,7 @@ opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream_v3 (
         return NULL;
     }
 
-    opj_stream_set_user_data(l_stream, p_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);