Merge pull request #641 from smuehlst/opj_hp_issue_640

Fix HP compiler warning about redeclaration of function
Fix #640
Fix #243

diff --git a/src/lib/openjp2/dwt.c b/src/lib/openjp2/dwt.c
index 92752f4289821352dd624ca46d3bb76a27420df2..d63c120e2347616defd1727bc4fc7b12b8d70b75 100644 (file)
--- a/src/lib/openjp2/dwt.c
+++ b/src/lib/openjp2/dwt.c
@@ -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) {

diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c
index 5af1a69aae23dce7368f2ccaee0d339a4ebdae15..ebc26b2dd41987e7243651a0ffa08159dbccacfe 100644 (file)
--- a/src/lib/openjp2/t2.c
+++ b/src/lib/openjp2/t2.c
@@ -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)