rename jp2_write_jp_v2 to opj_jp2_write_jp

[openjpeg.git] / libopenjpeg / jp2.c

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index 4b51c967650eb23a67ff37d0074018d2197f5052..2c3faf614a35b6e711c25064d1940abeca854817 100644 (file)
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -165,9 +165,6 @@ static opj_bool opj_jp2_read_jp2h(  opj_jp2_v2_t *jp2,
                                     OPJ_UINT32 p_header_size,
                                     opj_event_mgr_t * p_manager );
 
-static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info);
-
-
 /**
  * Writes the Jpeg2000 codestream Header box - JP2C Header box. This function must be called AFTER the coding has been done.
  *
@@ -177,11 +174,9 @@ static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, op
  *
  * @return true if writting was successful.
 */
-static opj_bool jp2_write_jp2c_v2(     opj_jp2_v2_t *jp2,
-                                                               struct opj_stream_private *cio,
-                                                               struct opj_event_mgr * p_manager );
-
-static void jp2_write_jp(opj_cio_t *cio);
+static opj_bool opj_jp2_write_jp2c(    opj_jp2_v2_t *jp2,
+                                                                   opj_stream_private_t *cio,
+                                                                   opj_event_mgr_t * p_manager );
 
 /**
  * Reads a jpeg2000 file signature box.
@@ -198,6 +193,19 @@ static opj_bool opj_jp2_read_jp(opj_jp2_v2_t *jp2,
                                 OPJ_UINT32 p_header_size,
                                 opj_event_mgr_t * p_manager);
 
+/**
+ * Writes a jpeg2000 file signature box.
+ *
+ * @param cio the stream to write data to.
+ * @param      jp2                     the jpeg2000 file codec.
+ * @param p_manager the user event manager.
+ * 
+ * @return true if writting was successful.
+ */
+static opj_bool opj_jp2_write_jp(      opj_jp2_v2_t *jp2,
+                                                   opj_stream_private_t *cio,
+                                                       opj_event_mgr_t * p_manager );
+
 /**
 Apply collected palette data
 @param color Collector for profile, cdef and pclr data
@@ -1421,35 +1429,6 @@ opj_bool opj_jp2_write_ftyp(opj_jp2_v2_t *jp2,
        return l_result;
 }
 
-static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
-       unsigned int j2k_codestream_offset, j2k_codestream_length;
-       opj_jp2_box_t box;
-
-       opj_j2k_t *j2k = jp2->j2k;
-
-       box.init_pos = cio_tell(cio);
-       cio_skip(cio, 4);
-       cio_write(cio, JP2_JP2C, 4);    /* JP2C */
-
-       /* J2K encoding */
-       j2k_codestream_offset = cio_tell(cio);
-       if(!j2k_encode(j2k, cio, image, cstr_info)) {
-               opj_event_msg(j2k->cinfo, EVT_ERROR, "Failed to encode image\n");
-               return 0;
-       }
-       j2k_codestream_length = cio_tell(cio) - j2k_codestream_offset;
-
-       jp2->j2k_codestream_offset = j2k_codestream_offset;
-       jp2->j2k_codestream_length = j2k_codestream_length;
-
-       box.length = 8 + jp2->j2k_codestream_length;
-       cio_seek(cio, box.init_pos);
-       cio_write(cio, box.length, 4);  /* L */
-       cio_seek(cio, box.init_pos + box.length);
-
-       return box.length;
-}
-
 /**
  * Writes the Jpeg2000 codestream Header box - JP2C Header box.
  *
@@ -1459,7 +1438,7 @@ static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, op
  *
  * @return true if writting was successful.
 */
-opj_bool jp2_write_jp2c_v2(    opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_write_jp2c(opj_jp2_v2_t *jp2,
                                                        opj_stream_private_t *cio,
                                                        opj_event_mgr_t * p_manager ) 
 {
@@ -1496,20 +1475,6 @@ opj_bool jp2_write_jp2c_v2(      opj_jp2_v2_t *jp2,
        return OPJ_TRUE;
 }
 
-static void jp2_write_jp(opj_cio_t *cio) {
-       opj_jp2_box_t box;
-
-       box.init_pos = cio_tell(cio);
-       cio_skip(cio, 4);
-       cio_write(cio, JP2_JP, 4);              /* JP2 signature */
-       cio_write(cio, 0x0d0a870a, 4);
-
-       box.length = cio_tell(cio) - box.init_pos;
-       cio_seek(cio, box.init_pos);
-       cio_write(cio, box.length, 4);  /* L */
-       cio_seek(cio, box.init_pos + box.length);
-}
-
 /**
  * Writes a jpeg2000 file signature box.
  *
@@ -1519,9 +1484,9 @@ static void jp2_write_jp(opj_cio_t *cio) {
  * 
  * @return true if writting was successful.
  */
-opj_bool jp2_write_jp_v2(      opj_jp2_v2_t *jp2,
-                                                       opj_stream_private_t *cio,
-                                                       opj_event_mgr_t * p_manager ) 
+opj_bool opj_jp2_write_jp(     opj_jp2_v2_t *jp2,
+                                           opj_stream_private_t *cio,
+                                               opj_event_mgr_t * p_manager ) 
 {
        /* 12 bytes will be read */
        unsigned char l_signature_data [12];
@@ -1774,7 +1739,7 @@ void opj_jp2_setup_end_header_writting (opj_jp2_v2_t *jp2)
        /* preconditions */
        assert(jp2 != 00);
 
-       opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)jp2_write_jp2c_v2 );
+       opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp2c );
        /* DEVELOPER CORNER, add your custom procedures */
 }
 
@@ -2431,7 +2396,7 @@ void opj_jp2_setup_header_writting (opj_jp2_v2_t *jp2)
        /* preconditions */
        assert(jp2 != 00);
 
-       opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)jp2_write_jp_v2 );
+       opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp );
        opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_ftyp );
        opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp2h );
        opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_skip_jp2c );