From eda4c26d24f196eab1aeadff49c1694541da6c1a Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Fri, 5 Oct 2012 09:20:05 +0000 Subject: [PATCH] [trunk] Fix spelling. writting -> writing --- src/lib/openjp2/cio.c | 2 +- src/lib/openjp2/j2k.c | 18 +++++++++--------- src/lib/openjp2/jp2.c | 32 ++++++++++++++++---------------- src/lib/openjp2/jp2.h | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/lib/openjp2/cio.c b/src/lib/openjp2/cio.c index bd0ab15c..93f488c2 100644 --- a/src/lib/openjp2/cio.c +++ b/src/lib/openjp2/cio.c @@ -574,7 +574,7 @@ opj_bool opj_stream_flush (opj_stream_private_t * p_stream, opj_event_mgr_t * p_ if (l_current_write_nb_bytes == (OPJ_SIZE_T)-1) { p_stream->m_status |= opj_stream_e_error; - opj_event_msg_v2(p_event_mgr, EVT_INFO, "Error on writting stream!\n"); + opj_event_msg_v2(p_event_mgr, EVT_INFO, "Error on writing stream!\n"); return OPJ_FALSE; } diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index 2bb6c52f..6f1b16e1 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -343,7 +343,7 @@ static opj_bool opj_j2k_post_write_tile (opj_j2k_v2_t * p_j2k, * Sets up the procedures to do on writing header. * Developers wanting to extend the library can add their own writing procedures. */ -static void opj_j2k_setup_header_writting (opj_j2k_v2_t *p_j2k); +static void opj_j2k_setup_header_writing (opj_j2k_v2_t *p_j2k); static opj_bool opj_j2k_write_first_tile_part( opj_j2k_v2_t *p_j2k, OPJ_BYTE * p_data, @@ -602,7 +602,7 @@ static void opj_j2k_write_poc_in_memory(opj_j2k_v2_t *p_j2k, OPJ_UINT32 * p_data_written, opj_event_mgr_t * p_manager ); /** - * Gets the maximum size taken by the writting of a POC. + * Gets the maximum size taken by the writing of a POC. */ static OPJ_UINT32 opj_j2k_get_max_poc_size(opj_j2k_v2_t *p_j2k); @@ -2293,12 +2293,12 @@ opj_bool opj_j2k_write_cod( opj_j2k_v2_t *p_j2k, l_remaining_size -= 9; if (! opj_j2k_write_SPCod_SPCoc(p_j2k,p_j2k->m_current_tile_number,0,l_current_data,&l_remaining_size,p_manager)) { - opj_event_msg_v2(p_manager, EVT_ERROR, "Error writting COD marker\n"); + opj_event_msg_v2(p_manager, EVT_ERROR, "Error writing COD marker\n"); return OPJ_FALSE; } if (l_remaining_size != 0) { - opj_event_msg_v2(p_manager, EVT_ERROR, "Error writting COD marker\n"); + opj_event_msg_v2(p_manager, EVT_ERROR, "Error writing COD marker\n"); return OPJ_FALSE; } @@ -2617,12 +2617,12 @@ opj_bool opj_j2k_write_qcd( opj_j2k_v2_t *p_j2k, l_remaining_size -= 4; if (! opj_j2k_write_SQcd_SQcc(p_j2k,p_j2k->m_current_tile_number,0,l_current_data,&l_remaining_size,p_manager)) { - opj_event_msg_v2(p_manager, EVT_ERROR, "Error writting QCD marker\n"); + opj_event_msg_v2(p_manager, EVT_ERROR, "Error writing QCD marker\n"); return OPJ_FALSE; } if (l_remaining_size != 0) { - opj_event_msg_v2(p_manager, EVT_ERROR, "Error writting QCD marker\n"); + opj_event_msg_v2(p_manager, EVT_ERROR, "Error writing QCD marker\n"); return OPJ_FALSE; } @@ -7825,7 +7825,7 @@ opj_bool opj_j2k_write_SPCod_SPCoc( opj_j2k_v2_t *p_j2k, if (l_tccp->csty & J2K_CCP_CSTY_PRT) { if (*p_header_size < l_tccp->numresolutions) { - opj_event_msg_v2(p_manager, EVT_ERROR, "Error writting SPCod SPCoc element\n"); + opj_event_msg_v2(p_manager, EVT_ERROR, "Error writing SPCod SPCoc element\n"); return OPJ_FALSE; } @@ -9110,7 +9110,7 @@ opj_bool opj_j2k_start_compress(opj_j2k_v2_t *p_j2k, } /* customization of the encoding */ - opj_j2k_setup_header_writting(p_j2k); + opj_j2k_setup_header_writing(p_j2k); /* write header */ if (! opj_j2k_exec (p_j2k,p_j2k->m_procedure_list,p_stream,p_manager)) { @@ -9333,7 +9333,7 @@ void opj_j2k_setup_encoding_validation (opj_j2k_v2_t *p_j2k) opj_procedure_list_add_procedure(p_j2k->m_validation_list, (opj_procedure)opj_j2k_mct_validation); } -void opj_j2k_setup_header_writting (opj_j2k_v2_t *p_j2k) +void opj_j2k_setup_header_writing (opj_j2k_v2_t *p_j2k) { /* preconditions */ assert(p_j2k != 00); diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c index 95e6a751..744d41ae 100644 --- 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); @@ -1185,7 +1185,7 @@ opj_bool opj_jp2_write_jp2h(opj_jp2_v2_t *jp2, l_current_writer = l_writers; for (i=0;im_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); @@ -1458,7 +1458,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 +1468,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 +1689,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 +2050,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); diff --git a/src/lib/openjp2/jp2.h b/src/lib/openjp2/jp2.h index f2f3c757..d02410b6 100644 --- a/src/lib/openjp2/jp2.h +++ b/src/lib/openjp2/jp2.h @@ -258,7 +258,7 @@ opj_jp2_img_header_writer_handler_t; * @param stream the stream to write data to. * @param p_manager user event manager. * - * @return true if writting was successful. + * @return true if writing was successful. */ opj_bool opj_jp2_write_jp2h(opj_jp2_v2_t *jp2, opj_stream_private_t *stream,