diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-02 10:16:54 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2014-03-02 10:16:54 +0000 |
| commit | 2c876b676564879380f0d239e4fe723933e71717 (patch) | |
| tree | 07f976782062ddcd3a27aef1d49890fee76d9977 /src/lib | |
| parent | 6d0785a78fecc58cf4bb571956547999c4d1e437 (diff) | |
[trunk] Remove simple warnings about comments, missing case in switch statement
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/openjp2/j2k.c | 32 | ||||
| -rw-r--r-- | src/lib/openjp2/jp2.c | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/tcd.c | 2 |
3 files changed, 20 insertions, 16 deletions
diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index 4d988df5..4ec94195 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -5862,6 +5862,9 @@ void opj_j2k_set_cinema_parameters(opj_cparameters_t *parameters, opj_image_t *i case OPJ_CINEMA4K_24: parameters->cp_rsiz = OPJ_CINEMA4K; break; + case OPJ_OFF: + assert(0); + break; } /* No tiling */ @@ -9781,7 +9784,6 @@ OPJ_BOOL opj_j2k_write_first_tile_part (opj_j2k_t *p_j2k, opj_stream_private_t *p_stream, struct opj_event_mgr * p_manager ) { -// OPJ_UINT32 compno; OPJ_UINT32 l_nb_bytes_written = 0; OPJ_UINT32 l_current_nb_bytes_written; OPJ_BYTE * l_begin_data = 00; @@ -9812,19 +9814,21 @@ OPJ_BOOL opj_j2k_write_first_tile_part (opj_j2k_t *p_j2k, p_total_data_size -= l_current_nb_bytes_written; if (l_cp->m_specific_param.m_enc.m_cinema == 0) { -// for (compno = 1; compno < p_j2k->m_private_image->numcomps; compno++) { -// l_current_nb_bytes_written = 0; -// opj_j2k_write_coc_in_memory(p_j2k,compno,p_data,&l_current_nb_bytes_written,p_manager); -// l_nb_bytes_written += l_current_nb_bytes_written; -// p_data += l_current_nb_bytes_written; -// p_total_data_size -= l_current_nb_bytes_written; - -// l_current_nb_bytes_written = 0; -// opj_j2k_write_qcc_in_memory(p_j2k,compno,p_data,&l_current_nb_bytes_written,p_manager); -// l_nb_bytes_written += l_current_nb_bytes_written; -// p_data += l_current_nb_bytes_written; -// p_total_data_size -= l_current_nb_bytes_written; -// } +#if 0 + for (compno = 1; compno < p_j2k->m_private_image->numcomps; compno++) { + l_current_nb_bytes_written = 0; + opj_j2k_write_coc_in_memory(p_j2k,compno,p_data,&l_current_nb_bytes_written,p_manager); + l_nb_bytes_written += l_current_nb_bytes_written; + p_data += l_current_nb_bytes_written; + p_total_data_size -= l_current_nb_bytes_written; + + l_current_nb_bytes_written = 0; + opj_j2k_write_qcc_in_memory(p_j2k,compno,p_data,&l_current_nb_bytes_written,p_manager); + l_nb_bytes_written += l_current_nb_bytes_written; + p_data += l_current_nb_bytes_written; + p_total_data_size -= l_current_nb_bytes_written; + } +#endif if (l_cp->tcps[p_j2k->m_current_tile_number].numpocs) { l_current_nb_bytes_written = 0; diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c index d59ec434..92a3726a 100644 --- a/src/lib/openjp2/jp2.c +++ b/src/lib/openjp2/jp2.c @@ -823,7 +823,7 @@ static OPJ_BOOL opj_jp2_check_color(opj_image_t *image, opj_jp2_color_t *color, return OPJ_TRUE; } -// file9.jp2 +/* file9.jp2 */ void opj_jp2_apply_pclr(opj_image_t *image, opj_jp2_color_t *color) { opj_image_comp_t *old_comps, *new_comps; diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c index 4388819a..f44d3e96 100644 --- a/src/lib/openjp2/tcd.c +++ b/src/lib/openjp2/tcd.c @@ -1006,7 +1006,7 @@ OPJ_BOOL opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_t * p_code_block) { if (! p_code_block->data) { - p_code_block->data = (OPJ_BYTE*) opj_malloc(OPJ_J2K_DEFAULT_CBLK_DATA_SIZE); //why +1 ? + p_code_block->data = (OPJ_BYTE*) opj_malloc(OPJ_J2K_DEFAULT_CBLK_DATA_SIZE); /*why +1 ?*/ if(! p_code_block->data) { return OPJ_FALSE; } |