diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 15:24:12 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-02 15:24:12 +0000 |
| commit | b9e216ac6f3546cb54648e7d7166c5c3ea272cfb (patch) | |
| tree | c58258268ca645d8cf215a7a6943b5b98aaafc2c | |
| parent | e78e2885fe3f63cb806c959573f38e01be3c1ca2 (diff) | |
[trunk] merge r1229 from branch 1.5 over to trunk
| -rw-r--r-- | libopenjpeg/t1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libopenjpeg/t1.c b/libopenjpeg/t1.c index 92da1d7b..32257912 100644 --- a/libopenjpeg/t1.c +++ b/libopenjpeg/t1.c @@ -146,20 +146,20 @@ static void t1_enc_refpass_step( /** Decode refinement pass */ -static void INLINE t1_dec_refpass_step_raw( +static INLINE void t1_dec_refpass_step_raw( opj_t1_t *t1, flag_t *flagsp, int *datap, int poshalf, int neghalf, int vsc); -static void INLINE t1_dec_refpass_step_mqc( +static INLINE void t1_dec_refpass_step_mqc( opj_t1_t *t1, flag_t *flagsp, int *datap, int poshalf, int neghalf); -static void INLINE t1_dec_refpass_step_mqc_vsc( +static INLINE void t1_dec_refpass_step_mqc_vsc( opj_t1_t *t1, flag_t *flagsp, int *datap, |