Merge pull request #641 from smuehlst/opj_hp_issue_640

Fix HP compiler warning about redeclaration of function
Fix #640
Fix #243
This commit is contained in:
Matthieu Darbois 2015-10-19 22:23:54 +02:00
commit 5799672237
2 changed files with 2 additions and 2 deletions

View File

@ -795,7 +795,7 @@ static void opj_v4dwt_decode_step2(opj_v4_t* l, opj_v4_t* w, OPJ_INT32 k, OPJ_IN
/* <summary> */
/* Inverse 9-7 wavelet transform in 1-D. */
/* </summary> */
void opj_v4dwt_decode(opj_v4dwt_t* restrict dwt)
static void opj_v4dwt_decode(opj_v4dwt_t* restrict dwt)
{
OPJ_INT32 a, b;
if(dwt->cas == 0) {

View File

@ -1338,7 +1338,7 @@ static OPJ_BOOL opj_t2_skip_packet_data( opj_t2_t* p_t2,
}
OPJ_BOOL opj_t2_init_seg( opj_tcd_cblk_dec_t* cblk,
static OPJ_BOOL opj_t2_init_seg( opj_tcd_cblk_dec_t* cblk,
OPJ_UINT32 index,
OPJ_UINT32 cblksty,
OPJ_UINT32 first)