projects / openjpeg.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #545 from mayeut/master
[openjpeg.git] / src / lib / openjp2 / jp2.c
diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index 543832c41c3c52cfafbf315df369976c4f4a5259..a51bb21bbc27191e6c9a100ece3cea203974eeb6 100644 (file)
--- a/src/lib/openjp2/jp2.c
+++ b/src/lib/openjp2/jp2.c
@@ -158,7 +158,7 @@ static OPJ_BOOL opj_jp2_read_ftyp(  opj_jp2_t *jp2,
                                                                        OPJ_UINT32 p_header_size,
                                                                        opj_event_mgr_t * p_manager );
 
-OPJ_BOOL opj_jp2_skip_jp2c(    opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_skip_jp2c(     opj_jp2_t *jp2,
                                                    opj_stream_private_t *cio,
                                                    opj_event_mgr_t * p_manager );
 
@@ -177,6 +177,19 @@ static OPJ_BOOL opj_jp2_read_jp2h(  opj_jp2_t *jp2,
                                     OPJ_UINT32 p_header_size,
                                     opj_event_mgr_t * p_manager );
 
+/**
+ * Writes the Jpeg2000 file Header box - JP2 Header box (warning, this is a super box).
+ *
+ * @param  jp2      the jpeg2000 file codec.
+ * @param  stream      the stream to write data to.
+ * @param  p_manager  user event manager.
+ *
+ * @return true if writing was successful.
+ */
+static OPJ_BOOL opj_jp2_write_jp2h(opj_jp2_t *jp2,
+                                                                                                               opj_stream_private_t *stream,
+                                                                                                               opj_event_mgr_t * p_manager );
+
 /**
  * Writes the Jpeg2000 codestream Header box - JP2C Header box. This function must be called AFTER the coding has been done.
  *
@@ -375,7 +388,7 @@ static void opj_jp2_setup_encoding_validation (opj_jp2_t *jp2);
  */
 static void opj_jp2_setup_header_writing (opj_jp2_t *jp2);
 
-OPJ_BOOL opj_jp2_default_validation (  opj_jp2_t * jp2,
+static OPJ_BOOL opj_jp2_default_validation (   opj_jp2_t * jp2,
                                         opj_stream_private_t *cio,
                                         opj_event_mgr_t * p_manager );
 
@@ -397,14 +410,14 @@ static const opj_jp2_header_handler_t * opj_jp2_img_find_handler (OPJ_UINT32 p_i
  */
 static const opj_jp2_header_handler_t * opj_jp2_find_handler (OPJ_UINT32 p_id );
 
-const opj_jp2_header_handler_t jp2_header [] =
+static const opj_jp2_header_handler_t jp2_header [] =
 {
        {JP2_JP,opj_jp2_read_jp},
        {JP2_FTYP,opj_jp2_read_ftyp},
        {JP2_JP2H,opj_jp2_read_jp2h}
 };
 
-const opj_jp2_header_handler_t jp2_img_header [] =
+static const opj_jp2_header_handler_t jp2_img_header [] =
 {
        {JP2_IHDR,opj_jp2_read_ihdr},
        {JP2_COLR,opj_jp2_read_colr},
@@ -445,7 +458,7 @@ static void opj_jp2_setup_decoding_validation (opj_jp2_t *jp2);
 static void opj_jp2_setup_header_reading (opj_jp2_t *jp2);
 
 /* ----------------------------------------------------------------------- */
- OPJ_BOOL opj_jp2_read_boxhdr(opj_jp2_box_t *box,
+static OPJ_BOOL opj_jp2_read_boxhdr(opj_jp2_box_t *box,
                               OPJ_UINT32 * p_number_bytes_read,
                               opj_stream_private_t *cio,
                               opj_event_mgr_t * p_manager )
@@ -525,7 +538,7 @@ static void jp2_write_url(opj_cio_t *cio, char *Idx_file) {
 }
 #endif
 
-OPJ_BOOL opj_jp2_read_ihdr( opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_read_ihdr( opj_jp2_t *jp2,
                             OPJ_BYTE *p_image_header_data,
                             OPJ_UINT32 p_image_header_size,
                             opj_event_mgr_t * p_manager )
@@ -573,7 +586,7 @@ OPJ_BOOL opj_jp2_read_ihdr( opj_jp2_t *jp2,
        return OPJ_TRUE;
 }
 
-OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_t *jp2,
+static OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_t *jp2,
                               OPJ_UINT32 * p_nb_bytes_written
                               )
 {
@@ -623,7 +636,7 @@ OPJ_BYTE * opj_jp2_write_ihdr(opj_jp2_t *jp2,
        return l_ihdr_data;
 }
 
-OPJ_BYTE * opj_jp2_write_bpcc( opj_jp2_t *jp2,
+static OPJ_BYTE * opj_jp2_write_bpcc(  opj_jp2_t *jp2,
                                                        OPJ_UINT32 * p_nb_bytes_written
                                 )
 {
@@ -659,7 +672,7 @@ OPJ_BYTE * opj_jp2_write_bpcc(      opj_jp2_t *jp2,
        return l_bpcc_data;
 }
 
-OPJ_BOOL opj_jp2_read_bpcc( opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_read_bpcc( opj_jp2_t *jp2,
                             OPJ_BYTE * p_bpc_header_data,
                             OPJ_UINT32 p_bpc_header_size,
                             opj_event_mgr_t * p_manager
@@ -741,7 +754,7 @@ static OPJ_BYTE * opj_jp2_write_cdef(opj_jp2_t *jp2, OPJ_UINT32 * p_nb_bytes_wri
        return l_cdef_data;
 }
 
-OPJ_BYTE * opj_jp2_write_colr(  opj_jp2_t *jp2,
+static OPJ_BYTE * opj_jp2_write_colr(  opj_jp2_t *jp2,
                                                            OPJ_UINT32 * p_nb_bytes_written
                                 )
 {
@@ -805,7 +818,7 @@ OPJ_BYTE * opj_jp2_write_colr(  opj_jp2_t *jp2,
        return l_colr_data;
 }
 
-void opj_jp2_free_pclr(opj_jp2_color_t *color)
+static void opj_jp2_free_pclr(opj_jp2_color_t *color)
 {
     opj_free(color->jp2_pclr->channel_sign);
     opj_free(color->jp2_pclr->channel_size);
@@ -934,7 +947,7 @@ static OPJ_BOOL opj_jp2_check_color(opj_image_t *image, opj_jp2_color_t *color,
 }
 
 /* file9.jp2 */
-void opj_jp2_apply_pclr(opj_image_t *image, opj_jp2_color_t *color)
+static void opj_jp2_apply_pclr(opj_image_t *image, opj_jp2_color_t *color)
 {
        opj_image_comp_t *old_comps, *new_comps;
        OPJ_BYTE *channel_size, *channel_sign;
@@ -1030,7 +1043,7 @@ void opj_jp2_apply_pclr(opj_image_t *image, opj_jp2_color_t *color)
 
 }/* apply_pclr() */
 
-OPJ_BOOL opj_jp2_read_pclr(    opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_read_pclr(     opj_jp2_t *jp2,
                             OPJ_BYTE * p_pclr_header_data,
                             OPJ_UINT32 p_pclr_header_size,
                             opj_event_mgr_t * p_manager
@@ -1137,7 +1150,7 @@ OPJ_BOOL opj_jp2_read_pclr(       opj_jp2_t *jp2,
        return OPJ_TRUE;
 }
 
-OPJ_BOOL opj_jp2_read_cmap(    opj_jp2_t * jp2,
+static OPJ_BOOL opj_jp2_read_cmap(     opj_jp2_t * jp2,
                             OPJ_BYTE * p_cmap_header_data,
                             OPJ_UINT32 p_cmap_header_size,
                             opj_event_mgr_t * p_manager
@@ -1197,7 +1210,7 @@ OPJ_BOOL opj_jp2_read_cmap(       opj_jp2_t * jp2,
        return OPJ_TRUE;
 }
 
-void opj_jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color)
+static void opj_jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color)
 {
        opj_jp2_cdef_info_t *info;
        OPJ_UINT16 i, n, cn, asoc, acn;
@@ -1261,7 +1274,7 @@ void opj_jp2_apply_cdef(opj_image_t *image, opj_jp2_color_t *color)
        
 }/* jp2_apply_cdef() */
 
-OPJ_BOOL opj_jp2_read_cdef(    opj_jp2_t * jp2,
+static OPJ_BOOL opj_jp2_read_cdef(     opj_jp2_t * jp2,
                             OPJ_BYTE * p_cdef_header_data,
                                                        OPJ_UINT32 p_cdef_header_size,
                                                        opj_event_mgr_t * p_manager
@@ -1329,7 +1342,7 @@ OPJ_BOOL opj_jp2_read_cdef(       opj_jp2_t * jp2,
        return OPJ_TRUE;
 }
 
-OPJ_BOOL opj_jp2_read_colr( opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_read_colr( opj_jp2_t *jp2,
                             OPJ_BYTE * p_colr_header_data,
                             OPJ_UINT32 p_colr_header_size,
                             opj_event_mgr_t * p_manager
@@ -1465,7 +1478,7 @@ OPJ_BOOL opj_jp2_decode(opj_jp2_t *jp2,
        return OPJ_TRUE;
 }
 
-OPJ_BOOL opj_jp2_write_jp2h(opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_write_jp2h(opj_jp2_t *jp2,
                             opj_stream_private_t *stream,
                             opj_event_mgr_t * p_manager
                             )
@@ -1568,7 +1581,7 @@ OPJ_BOOL opj_jp2_write_jp2h(opj_jp2_t *jp2,
        return l_result;
 }
 
-OPJ_BOOL opj_jp2_write_ftyp(opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_write_ftyp(opj_jp2_t *jp2,
                                                        opj_stream_private_t *cio,
                                                        opj_event_mgr_t * p_manager )
 {
@@ -1618,7 +1631,7 @@ OPJ_BOOL opj_jp2_write_ftyp(opj_jp2_t *jp2,
        return l_result;
 }
 
-OPJ_BOOL opj_jp2_write_jp2c(opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_write_jp2c(opj_jp2_t *jp2,
                                                        opj_stream_private_t *cio,
                                                        opj_event_mgr_t * p_manager )
 {
@@ -1655,7 +1668,7 @@ OPJ_BOOL opj_jp2_write_jp2c(opj_jp2_t *jp2,
        return OPJ_TRUE;
 }
 
-OPJ_BOOL opj_jp2_write_jp(     opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_write_jp(      opj_jp2_t *jp2,
                                            opj_stream_private_t *cio,
                                                opj_event_mgr_t * p_manager )
 {
@@ -1917,7 +1930,7 @@ OPJ_BOOL opj_jp2_end_compress(    opj_jp2_t *jp2,
        return opj_jp2_exec(jp2,jp2->m_procedure_list,cio,p_manager);
 }
 
-void opj_jp2_setup_end_header_writing (opj_jp2_t *jp2)
+static void opj_jp2_setup_end_header_writing (opj_jp2_t *jp2)
 {
        /* preconditions */
        assert(jp2 != 00);
@@ -1937,7 +1950,7 @@ void opj_jp2_setup_end_header_writing (opj_jp2_t *jp2)
 #endif
 }
 
-void opj_jp2_setup_end_header_reading (opj_jp2_t *jp2)
+static void opj_jp2_setup_end_header_reading (opj_jp2_t *jp2)
 {
        /* preconditions */
        assert(jp2 != 00);
@@ -1945,7 +1958,7 @@ void opj_jp2_setup_end_header_reading (opj_jp2_t *jp2)
        /* DEVELOPER CORNER, add your custom procedures */
 }
 
-OPJ_BOOL opj_jp2_default_validation (  opj_jp2_t * jp2,
+static OPJ_BOOL opj_jp2_default_validation (   opj_jp2_t * jp2,
                                         opj_stream_private_t *cio,
                                         opj_event_mgr_t * p_manager
                                         )
@@ -1999,7 +2012,7 @@ OPJ_BOOL opj_jp2_default_validation (     opj_jp2_t * jp2,
        return l_is_valid;
 }
 
-OPJ_BOOL opj_jp2_read_header_procedure(  opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_read_header_procedure(  opj_jp2_t *jp2,
                                                 opj_stream_private_t *stream,
                                                 opj_event_mgr_t * p_manager
                                                 )
@@ -2195,7 +2208,7 @@ OPJ_BOOL opj_jp2_start_compress(opj_jp2_t *jp2,
        return opj_j2k_start_compress(jp2->j2k,stream,p_image,p_manager);
 }
 
-const opj_jp2_header_handler_t * opj_jp2_find_handler (OPJ_UINT32 p_id)
+static const opj_jp2_header_handler_t * opj_jp2_find_handler (OPJ_UINT32 p_id)
 {
        OPJ_UINT32 i, l_handler_size = sizeof(jp2_header) / sizeof(opj_jp2_header_handler_t);
 
@@ -2343,7 +2356,7 @@ static OPJ_BOOL opj_jp2_read_ftyp(        opj_jp2_t *jp2,
        return OPJ_TRUE;
 }
 
-OPJ_BOOL opj_jp2_skip_jp2c(    opj_jp2_t *jp2,
+static OPJ_BOOL opj_jp2_skip_jp2c(     opj_jp2_t *jp2,
                                                opj_stream_private_t *stream,
                                                opj_event_mgr_t * p_manager )
 {
@@ -2457,7 +2470,7 @@ static OPJ_BOOL opj_jp2_read_jp2h(  opj_jp2_t *jp2,
        return OPJ_TRUE;
 }
 
-OPJ_BOOL opj_jp2_read_boxhdr_char(   opj_jp2_box_t *box,
+static OPJ_BOOL opj_jp2_read_boxhdr_char(   opj_jp2_box_t *box,
                                      OPJ_BYTE * p_data,
                                      OPJ_UINT32 * p_number_bytes_read,
                                      OPJ_UINT32 p_box_max_size,
@@ -2560,7 +2573,7 @@ OPJ_BOOL opj_jp2_read_header(     opj_stream_private_t *p_stream,
                                                        p_manager);
 }
 
-void opj_jp2_setup_encoding_validation (opj_jp2_t *jp2)
+static void opj_jp2_setup_encoding_validation (opj_jp2_t *jp2)
 {
        /* preconditions */
        assert(jp2 != 00);
@@ -2569,14 +2582,14 @@ void opj_jp2_setup_encoding_validation (opj_jp2_t *jp2)
        /* DEVELOPER CORNER, add your custom validation procedure */
 }
 
-void opj_jp2_setup_decoding_validation (opj_jp2_t *jp2)
+static void opj_jp2_setup_decoding_validation (opj_jp2_t *jp2)
 {
        /* preconditions */
        assert(jp2 != 00);
        /* DEVELOPER CORNER, add your custom validation procedure */
 }
 
-void opj_jp2_setup_header_writing (opj_jp2_t *jp2)
+static void opj_jp2_setup_header_writing (opj_jp2_t *jp2)
 {
        /* preconditions */
        assert(jp2 != 00);
@@ -2592,7 +2605,7 @@ void opj_jp2_setup_header_writing (opj_jp2_t *jp2)
 
 }
 
-void opj_jp2_setup_header_reading (opj_jp2_t *jp2)
+static void opj_jp2_setup_header_reading (opj_jp2_t *jp2)
 {
        /* preconditions */
        assert(jp2 != 00);
Fork of openjpeg with some changes used by DCP-o-matic.