[trunk] Create a new static *_impl function to avoid a warning triggered by the depre...
[openjpeg.git] / src / lib / openjp2 / openjpeg.c
index be0b16caecb7d979cb4d88788e50a9f50b478975..31199b2433bebd576ce98133604b9da7d7c136b1 100644 (file)
@@ -1,5 +1,7 @@
 /*
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France 
+ * Copyright (c) 2012, CS Systemes d'Information, France
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,7 +30,6 @@
 #include <windows.h>
 #endif /* _WIN32 */
 
-#include "opj_config.h"
 #include "opj_includes.h"
 
 /**
 typedef struct opj_decompression
 {
        /** Main header reading function handler*/
-       opj_bool (*opj_read_header) (   struct opj_stream_private * cio,
+       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,
+       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_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,
+                                                                               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_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,
+       OPJ_BOOL (* opj_end_decompress) (       void *p_codec,
                                                                                struct opj_stream_private *cio,
                                                                                struct opj_event_mgr * p_manager);
        /** Codec destroy function handler*/
@@ -72,21 +73,21 @@ typedef struct opj_decompression
        /** 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_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_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_BOOL (*opj_set_decoded_resolution_factor) ( void * p_codec, 
                                                     OPJ_UINT32 res_factor, 
                                                     opj_event_mgr_t * p_manager);
 
@@ -97,23 +98,23 @@ typedef struct opj_decompression
  */
 typedef struct opj_compression
 {
-       opj_bool (* opj_start_compress) (       void *p_codec,
+       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,
+       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_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,
+       OPJ_BOOL (* opj_end_compress) ( void * p_codec,
                                                                        struct opj_stream_private *p_cio,
                                                                        struct opj_event_mgr * p_manager);
 
@@ -142,7 +143,7 @@ typedef struct opj_codec_private
        /** 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;
+       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);
@@ -152,7 +153,7 @@ 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 +168,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 +183,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 +203,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)
@@ -230,7 +231,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;
@@ -285,7 +286,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
        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 +294,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 +316,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 +335,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 +361,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 +370,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 +395,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 +411,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 +436,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 +453,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 +467,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 +487,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 +510,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 +531,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 +553,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 +583,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 +608,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,7 +631,7 @@ 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;
@@ -663,21 +663,21 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format)
        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,
@@ -699,22 +699,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,
@@ -736,8 +736,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 +751,13 @@ 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; 
                parameters->max_comp_size = 0;
                parameters->numresolution = 6;
-               parameters->cp_rsiz = STD_RSIZ;
+               parameters->cp_rsiz = OPJ_STD_RSIZ;
                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;
@@ -805,7 +805,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)
 {
@@ -824,7 +824,7 @@ opj_bool OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec,
        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)
 {
@@ -843,17 +843,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;
                }
        }
 
@@ -861,7 +860,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) {
@@ -878,7 +877,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) {
@@ -897,7 +896,7 @@ 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)
 {
@@ -906,7 +905,7 @@ opj_bool OPJ_CALLCONV opj_set_MCT(opj_cparameters_t *parameters,
        OPJ_UINT32 l_mct_total_size = l_matrix_size + l_dc_shift_size;
 
        /* add MCT capability */
-       int rsiz = (int)parameters->cp_rsiz | (int)MCT;
+       OPJ_INT32 rsiz = (OPJ_INT32)parameters->cp_rsiz | (OPJ_INT32)OPJ_MCT;
        parameters->cp_rsiz = (OPJ_RSIZ_CAPABILITIES)rsiz;
        parameters->irreversible = 1;
 
@@ -923,7 +922,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,
@@ -1031,14 +1030,9 @@ 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)
-{
-       return opj_stream_create_file_stream(p_file,J2K_STREAM_CHUNK_SIZE,p_is_read_stream);
-}
-
-opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream (     FILE * p_file, 
+static opj_stream_t* opj_stream_create_file_stream_impl (      FILE * p_file, 
                                                                                                                        OPJ_SIZE_T p_size, 
-                                                                                                                       opj_bool p_is_read_stream)
+                                                                                                                       OPJ_BOOL p_is_read_stream)
 {
        opj_stream_t* l_stream = 00;
 
@@ -1051,12 +1045,66 @@ opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream (      FILE * 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_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;
+}
+
+opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (FILE * p_file, OPJ_BOOL p_is_read_stream)
+{
+       return opj_stream_create_file_stream_impl(p_file,OPJ_J2K_STREAM_CHUNK_SIZE,p_is_read_stream);
+}
+
+opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream_v3 (const char *fname, OPJ_BOOL p_is_read_stream)
+{
+    return opj_stream_create_file_stream_v3(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)
+{
+       return opj_stream_create_file_stream_impl(p_file,p_size,p_is_read_stream);
+}
+
+opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream_v3 (
+        const char *fname, 
+               OPJ_SIZE_T p_size, 
+        OPJ_BOOL p_is_read_stream)
+{
+    opj_stream_t* l_stream = 00;
+    FILE *p_file;
+    const char *mode;
+
+    if (! fname) {
+        return NULL;
+    }
+    
+    if(p_is_read_stream) mode = "rb"; else mode = "wb";
+
+    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);
 
-       return l_stream;
+    return l_stream;
 }