[trunk] Fix compilation:

[openjpeg.git] / src / lib / openjp2 / jp2.c

diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
index 95e6a751046035462554303b8e1637562f3fcc7b..198c0e56c4cf2653b0508176f66ceb4efba87610 100644 (file)
--- a/src/lib/openjp2/jp2.c
+++ b/src/lib/openjp2/jp2.c
@@ -118,7 +118,7 @@ static OPJ_BYTE * opj_jp2_write_colr(   opj_jp2_v2_t *jp2,
  * @param      jp2                     the jpeg2000 file codec.
  * @param      p_manager       the user event manager.
  *
- * @return     true if writting was successful.
+ * @return     true if writing was successful.
  */
 static opj_bool opj_jp2_write_ftyp(    opj_jp2_v2_t *jp2,
                                                                        opj_stream_private_t *cio,
@@ -165,7 +165,7 @@ static opj_bool opj_jp2_read_jp2h(  opj_jp2_v2_t *jp2,
  * @param      jp2                     the jpeg2000 file codec.
  * @param      p_manager       user event manager.
  *
- * @return true if writting was successful.
+ * @return true if writing was successful.
 */
 static opj_bool opj_jp2_write_jp2c(    opj_jp2_v2_t *jp2,
                                                                    opj_stream_private_t *cio,
@@ -193,7 +193,7 @@ static opj_bool opj_jp2_read_jp(opj_jp2_v2_t *jp2,
  * @param      jp2                     the jpeg2000 file codec.
  * @param p_manager the user event manager.
  *
- * @return true if writting was successful.
+ * @return true if writing was successful.
  */
 static opj_bool opj_jp2_write_jp(      opj_jp2_v2_t *jp2,
                                                    opj_stream_private_t *cio,
@@ -259,14 +259,14 @@ static opj_bool opj_jp2_read_colr(  opj_jp2_v2_t *jp2,
 /*@}*/
 
 /**
- * Sets up the procedures to do on writting header after the codestream.
- * Developpers wanting to extend the library can add their own writting procedures.
+ * Sets up the procedures to do on writing header after the codestream.
+ * Developpers wanting to extend the library can add their own writing procedures.
  */
-static void opj_jp2_setup_end_header_writting (opj_jp2_v2_t *jp2);
+static void opj_jp2_setup_end_header_writing (opj_jp2_v2_t *jp2);
 
 /**
  * Sets up the procedures to do on reading header after the codestream.
- * Developpers wanting to extend the library can add their own writting procedures.
+ * Developpers wanting to extend the library can add their own writing procedures.
  */
 static void opj_jp2_setup_end_header_reading (opj_jp2_v2_t *jp2);
 
@@ -320,9 +320,9 @@ static opj_bool opj_jp2_read_boxhdr(opj_jp2_box_t *box,
 static void opj_jp2_setup_encoding_validation (opj_jp2_v2_t *jp2);
 
 /**
- * Sets up the procedures to do on writting header. Developpers wanting to extend the library can add their own writting procedures.
+ * Sets up the procedures to do on writing header. Developpers wanting to extend the library can add their own writing procedures.
  */
-static void opj_jp2_setup_header_writting (opj_jp2_v2_t *jp2);
+static void opj_jp2_setup_header_writing (opj_jp2_v2_t *jp2);
 
 opj_bool opj_jp2_default_validation (  opj_jp2_v2_t * jp2,
                                         opj_stream_private_t *cio,
@@ -389,7 +389,7 @@ static void opj_jp2_setup_decoding_validation (opj_jp2_v2_t *jp2);
 
 /**
  * Sets up the procedures to do on reading header.
- * Developpers wanting to extend the library can add their own writting procedures.
+ * Developpers wanting to extend the library can add their own writing procedures.
  */
 static void opj_jp2_setup_header_reading (opj_jp2_v2_t *jp2);
 
@@ -1108,7 +1108,7 @@ opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2,
        return OPJ_TRUE;
 }
 
-opj_bool opj_jp2_write_jp2h(opj_jp2_v2_t *jp2,
+opj_bool OPJ_CALLCONV opj_jp2_write_jp2h(opj_jp2_v2_t *jp2,
                             opj_stream_private_t *stream,
                             opj_event_mgr_t * p_manager
                             )
@@ -1185,7 +1185,7 @@ opj_bool opj_jp2_write_jp2h(opj_jp2_v2_t *jp2,
                l_current_writer = l_writers;
                for (i=0;i<l_nb_pass;++i) {
                        if (opj_stream_write_data(stream,l_current_writer->m_data,l_current_writer->m_size,p_manager) != l_current_writer->m_size) {
-                               opj_event_msg_v2(p_manager, EVT_ERROR, "Stream error while writting JP2 Header box\n");
+                               opj_event_msg_v2(p_manager, EVT_ERROR, "Stream error while writing JP2 Header box\n");
                                l_result = OPJ_FALSE;
                                break;
                        }
@@ -1250,7 +1250,7 @@ opj_bool opj_jp2_write_ftyp(opj_jp2_v2_t *jp2,
        l_result = (opj_stream_write_data(cio,l_ftyp_data,l_ftyp_size,p_manager) == l_ftyp_size);
        if (! l_result)
        {
-               opj_event_msg_v2(p_manager, EVT_ERROR, "Error while writting ftyp data to stream\n");
+               opj_event_msg_v2(p_manager, EVT_ERROR, "Error while writing ftyp data to stream\n");
        }
 
        opj_free(l_ftyp_data);
@@ -1339,7 +1339,7 @@ void opj_jp2_setup_decoder(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters)
 /* JP2 encoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
-void opj_jp2_setup_encoder(    opj_jp2_v2_t *jp2,
+void OPJ_CALLCONV opj_jp2_setup_encoder(       opj_jp2_v2_t *jp2,
                             opj_cparameters_t *parameters,
                             opj_image_t *image,
                             opj_event_mgr_t * p_manager)
@@ -1415,11 +1415,9 @@ void opj_jp2_setup_encoder(      opj_jp2_v2_t *jp2,
        }
        jp2->precedence = 0;    /* PRECEDENCE */
        jp2->approx = 0;                /* APPROX */
-       
-       /* jp2->jpip_on = parameters->jpip_on; */
 }
 
-opj_bool opj_jp2_encode(opj_jp2_v2_t *jp2,
+opj_bool OPJ_CALLCONV opj_jp2_encode(opj_jp2_v2_t *jp2,
                                                opj_stream_private_t *stream,
                                                opj_event_mgr_t * p_manager)
 {
@@ -1458,7 +1456,7 @@ opj_bool opj_jp2_end_compress(    opj_jp2_v2_t *jp2,
        assert(p_manager != 00);
 
        /* customization of the end encoding */
-       opj_jp2_setup_end_header_writting(jp2);
+       opj_jp2_setup_end_header_writing(jp2);
 
        if (! opj_j2k_end_compress(jp2->j2k,cio,p_manager)) {
                return OPJ_FALSE;
@@ -1468,7 +1466,7 @@ opj_bool opj_jp2_end_compress(    opj_jp2_v2_t *jp2,
        return opj_jp2_exec(jp2,jp2->m_procedure_list,cio,p_manager);
 }
 
-void opj_jp2_setup_end_header_writting (opj_jp2_v2_t *jp2)
+void opj_jp2_setup_end_header_writing (opj_jp2_v2_t *jp2)
 {
        /* preconditions */
        assert(jp2 != 00);
@@ -1689,7 +1687,7 @@ opj_bool opj_jp2_start_compress(opj_jp2_v2_t *jp2,
        }
 
        /* customization of the encoding */
-       opj_jp2_setup_header_writting(jp2);
+       opj_jp2_setup_header_writing(jp2);
 
        /* write header */
        if (! opj_jp2_exec (jp2,jp2->m_procedure_list,stream,p_manager)) {
@@ -2050,7 +2048,7 @@ void opj_jp2_setup_decoding_validation (opj_jp2_v2_t *jp2)
        /* DEVELOPER CORNER, add your custom validation procedure */
 }
 
-void opj_jp2_setup_header_writting (opj_jp2_v2_t *jp2)
+void opj_jp2_setup_header_writing (opj_jp2_v2_t *jp2)
 {
        /* preconditions */
        assert(jp2 != 00);
@@ -2097,7 +2095,7 @@ opj_bool opj_jp2_read_tile_header ( opj_jp2_v2_t * p_jp2,
                                                                p_manager);
 }
 
-opj_bool opj_jp2_write_tile (  opj_jp2_v2_t *p_jp2,
+opj_bool OPJ_CALLCONV opj_jp2_write_tile (     opj_jp2_v2_t *p_jp2,
                                                            OPJ_UINT32 p_tile_index,
                                                            OPJ_BYTE * p_data,
                                                            OPJ_UINT32 p_data_size,
@@ -2120,7 +2118,7 @@ opj_bool opj_jp2_decode_tile (  opj_jp2_v2_t * p_jp2,
        return opj_j2k_decode_tile (p_jp2->j2k,p_tile_index,p_data,p_data_size,p_stream,p_manager);
 }
 
-void opj_jp2_destroy(opj_jp2_v2_t *jp2)
+void OPJ_CALLCONV opj_jp2_destroy(opj_jp2_v2_t *jp2)
 {
        if (jp2) {
                /* destroy the J2K codec */
@@ -2251,7 +2249,7 @@ opj_bool opj_jp2_get_tile(        opj_jp2_v2_t *p_jp2,
 /* JP2 encoder interface                                             */
 /* ----------------------------------------------------------------------- */
 
-opj_jp2_v2_t* opj_jp2_create(opj_bool p_is_decoder)
+opj_jp2_v2_t* OPJ_CALLCONV opj_jp2_create(opj_bool p_is_decoder)
 {
        opj_jp2_v2_t *jp2 = (opj_jp2_v2_t*)opj_malloc(sizeof(opj_jp2_v2_t));
        if (jp2) {
@@ -2310,7 +2308,7 @@ opj_codestream_index_t* jp2_get_cstr_index(opj_jp2_v2_t* p_jp2)
        return j2k_get_cstr_index(p_jp2->j2k);
 }
 
-opj_codestream_info_v2_t* jp2_get_cstr_info(opj_jp2_v2_t* p_jp2)
+opj_codestream_info_v2_t* OPJ_CALLCONV jp2_get_cstr_info(opj_jp2_v2_t* p_jp2)
 {
        return j2k_get_cstr_info(p_jp2->j2k);
 }