cleanup

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4945 9d0c8265-081b-0410-96cb-a4ca84ce46f8

4 files changed, 43 insertions, 43 deletions

diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_mqdec.c b/converter/other/jpeg2000/libjasper/jpc/jpc_mqdec.c
index 2d419522..099fa6c4 100644
--- a/converter/other/jpeg2000/libjasper/jpc/jpc_mqdec.c
+++ b/converter/other/jpeg2000/libjasper/jpc/jpc_mqdec.c
@@ -269,7 +269,7 @@ void jpc_mqdec_setctx(jpc_mqdec_t *mqdec, int ctxno, jpc_mqctx_t *ctx)
 
 /* Decode a bit. */
 
-int jpc_mqdec_getbit_func(register jpc_mqdec_t *mqdec)
+int jpc_mqdec_getbit_func(jpc_mqdec_t *mqdec)
 {
         int bit;
         JAS_DBGLOG(100, ("jpc_mqdec_getbit_func(%p)\n", mqdec));
@@ -282,10 +282,10 @@ int jpc_mqdec_getbit_func(register jpc_mqdec_t *mqdec)
 }
 
 /* Apply MPS_EXCHANGE algorithm (with RENORMD). */
-int jpc_mqdec_mpsexchrenormd(register jpc_mqdec_t *mqdec)
+int jpc_mqdec_mpsexchrenormd(jpc_mqdec_t *mqdec)
 {
         int ret;
-        register jpc_mqstate_t *state = *mqdec->curctx;
+        jpc_mqstate_t *state = *mqdec->curctx;
         jpc_mqdec_mpsexchange(mqdec->areg, state->qeval, mqdec->curctx, ret);
         jpc_mqdec_renormd(mqdec->areg, mqdec->creg, mqdec->ctreg, mqdec->in,
           mqdec->eof, mqdec->inbuffer);
@@ -293,10 +293,10 @@ int jpc_mqdec_mpsexchrenormd(register jpc_mqdec_t *mqdec)
 }
 
 /* Apply LPS_EXCHANGE algorithm (with RENORMD). */
-int jpc_mqdec_lpsexchrenormd(register jpc_mqdec_t *mqdec)
+int jpc_mqdec_lpsexchrenormd(jpc_mqdec_t *mqdec)
 {
         int ret;
-        register jpc_mqstate_t *state = *mqdec->curctx;
+        jpc_mqstate_t *state = *mqdec->curctx;
         jpc_mqdec_lpsexchange(mqdec->areg, state->qeval, mqdec->curctx, ret);
         jpc_mqdec_renormd(mqdec->areg, mqdec->creg, mqdec->ctreg, mqdec->in,
           mqdec->eof, mqdec->inbuffer);
diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_qmfb.c b/converter/other/jpeg2000/libjasper/jpc/jpc_qmfb.c
index c2a87e19..422c299c 100644
--- a/converter/other/jpeg2000/libjasper/jpc/jpc_qmfb.c
+++ b/converter/other/jpeg2000/libjasper/jpc/jpc_qmfb.c
@@ -184,7 +184,7 @@ static void jpc_qmfb1d_setup(jpc_fix_t *startptr, int startind, int endind,
 }
 
 static void jpc_qmfb1d_split(jpc_fix_t *startptr, int startind, int endind,
-  register int step, jpc_fix_t *lstartptr, int lstartind, int lendind,
+  int step, jpc_fix_t *lstartptr, int lstartind, int lendind,
   jpc_fix_t *hstartptr, int hstartind, int hendind)
 {
 #define QMFB_SPLITBUFSIZE 4096
@@ -194,10 +194,10 @@ static void jpc_qmfb1d_split(jpc_fix_t *startptr, int startind, int endind,
         int hlen;
         int twostep;
         jpc_fix_t *tmpptr;
-        register jpc_fix_t *ptr;
-        register jpc_fix_t *hptr;
-        register jpc_fix_t *lptr;
-        register int n;
+        jpc_fix_t *ptr;
+        jpc_fix_t *hptr;
+        jpc_fix_t *lptr;
+        int n;
         int state;
 
         twostep = step << 1;
@@ -286,7 +286,7 @@ static void jpc_qmfb1d_split(jpc_fix_t *startptr, int startind, int endind,
 }
 
 static void jpc_qmfb1d_join(jpc_fix_t *startptr, int startind, int endind,
-  register int step, jpc_fix_t *lstartptr, int lstartind, int lendind,
+  int step, jpc_fix_t *lstartptr, int lstartind, int lendind,
   jpc_fix_t *hstartptr, int hstartind, int hendind)
 {
 #define QMFB_JOINBUFSIZE        4096
@@ -296,10 +296,10 @@ static void jpc_qmfb1d_join(jpc_fix_t *startptr, int startind, int endind,
         int hlen;
         int twostep;
         jpc_fix_t *tmpptr;
-        register jpc_fix_t *ptr;
-        register jpc_fix_t *hptr;
-        register jpc_fix_t *lptr;
-        register int n;
+        jpc_fix_t *ptr;
+        jpc_fix_t *hptr;
+        jpc_fix_t *lptr;
+        int n;
         int state;
 
         twostep = step << 1;
@@ -456,9 +456,9 @@ error:
 
 #define NFT_LIFT0(lstartptr, lstartind, lendind, hstartptr, hstartind, hendind, step, pluseq) \
 { \
-        register jpc_fix_t *lptr = (lstartptr); \
-        register jpc_fix_t *hptr = (hstartptr); \
-        register int n = (hendind) - (hstartind); \
+        jpc_fix_t *lptr = (lstartptr); \
+        jpc_fix_t *hptr = (hstartptr); \
+        int n = (hendind) - (hstartind); \
         if ((hstartind) < (lstartind)) { \
                 pluseq(*hptr, *lptr); \
                 hptr += (step); \
@@ -479,9 +479,9 @@ error:
 
 #define NFT_LIFT1(lstartptr, lstartind, lendind, hstartptr, hstartind, hendind, step, pluseq) \
 { \
-        register jpc_fix_t *lptr = (lstartptr); \
-        register jpc_fix_t *hptr = (hstartptr); \
-        register int n = (lendind) - (lstartind); \
+        jpc_fix_t *lptr = (lstartptr); \
+        jpc_fix_t *hptr = (hstartptr); \
+        int n = (lendind) - (lstartind); \
         if ((hstartind) >= (lstartind)) { \
                 pluseq(*lptr, *hptr); \
                 lptr += (step); \
@@ -502,9 +502,9 @@ error:
 
 #define RFT_LIFT0(lstartptr, lstartind, lendind, hstartptr, hstartind, hendind, step, pmeqop) \
 { \
-        register jpc_fix_t *lptr = (lstartptr); \
-        register jpc_fix_t *hptr = (hstartptr); \
-        register int n = (hendind) - (hstartind); \
+        jpc_fix_t *lptr = (lstartptr); \
+        jpc_fix_t *hptr = (hstartptr); \
+        int n = (hendind) - (hstartind); \
         if ((hstartind) < (lstartind)) { \
                 *hptr pmeqop *lptr; \
                 hptr += (step); \
@@ -525,9 +525,9 @@ error:
 
 #define RFT_LIFT1(lstartptr, lstartind, lendind, hstartptr, hstartind, hendind, step, pmeqop) \
 { \
-        register jpc_fix_t *lptr = (lstartptr); \
-        register jpc_fix_t *hptr = (hstartptr); \
-        register int n = (lendind) - (lstartind); \
+        jpc_fix_t *lptr = (lstartptr); \
+        jpc_fix_t *hptr = (hstartptr); \
+        int n = (lendind) - (lstartind); \
         if ((hstartind) >= (lstartind)) { \
                 *lptr pmeqop ((*hptr << 1) + 2) >> 2; \
                 lptr += (step); \
@@ -776,9 +776,9 @@ error:
 
 #define NNS_LIFT0(lstartptr, lstartind, lendind, hstartptr, hstartind, hendind, step, alpha) \
 { \
-        register jpc_fix_t *lptr = (lstartptr); \
-        register jpc_fix_t *hptr = (hstartptr); \
-        register int n = (hendind) - (hstartind); \
+        jpc_fix_t *lptr = (lstartptr); \
+        jpc_fix_t *hptr = (hstartptr); \
+        int n = (hendind) - (hstartind); \
         jpc_fix_t twoalpha = jpc_fix_mulbyint(alpha, 2); \
         if ((hstartind) < (lstartind)) { \
                 jpc_fix_pluseq(*hptr, jpc_fix_mul(*lptr, (twoalpha))); \
@@ -800,9 +800,9 @@ error:
 
 #define NNS_LIFT1(lstartptr, lstartind, lendind, hstartptr, hstartind, hendind, step, alpha) \
 { \
-        register jpc_fix_t *lptr = (lstartptr); \
-        register jpc_fix_t *hptr = (hstartptr); \
-        register int n = (lendind) - (lstartind); \
+        jpc_fix_t *lptr = (lstartptr); \
+        jpc_fix_t *hptr = (hstartptr); \
+        int n = (lendind) - (lstartind); \
         int twoalpha = jpc_fix_mulbyint(alpha, 2); \
         if ((hstartind) >= (lstartind)) { \
                 jpc_fix_pluseq(*lptr, jpc_fix_mul(*hptr, (twoalpha))); \
@@ -824,8 +824,8 @@ error:
 
 #define NNS_SCALE(startptr, startind, endind, step, alpha) \
 { \
-        register jpc_fix_t *ptr = (startptr); \
-        register int n = (endind) - (startind); \
+        jpc_fix_t *ptr = (startptr); \
+        int n = (endind) - (startind); \
         while (n-- > 0) { \
                 jpc_fix_muleq(*ptr, alpha); \
                 ptr += (step); \
diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_t1dec.c b/converter/other/jpeg2000/libjasper/jpc/jpc_t1dec.c
index dd6ae05a..98e58901 100644
--- a/converter/other/jpeg2000/libjasper/jpc/jpc_t1dec.c
+++ b/converter/other/jpeg2000/libjasper/jpc/jpc_t1dec.c
@@ -224,7 +224,7 @@ static long t1dec_cnt = 0;
 
 
 static int
-dec_sigpass(jpc_dec_t *dec, register jpc_mqdec_t *mqdec, int bitpos,
+dec_sigpass(jpc_dec_t *dec, jpc_mqdec_t *mqdec, int bitpos,
             int orient,
             int vcausalflag, jas_matrix_t *flags, jas_matrix_t *data)
 {
@@ -414,7 +414,7 @@ dec_rawsigpass(jpc_dec_t *dec, jpc_bitstream_t *in, int bitpos,
 
 
 static int
-dec_refpass(jpc_dec_t *dec, register jpc_mqdec_t *mqdec, int bitpos,
+dec_refpass(jpc_dec_t *dec, jpc_mqdec_t *mqdec, int bitpos,
             int vcausalflag, jas_matrix_t *flags, jas_matrix_t *data)
 {
     int i;
@@ -619,7 +619,7 @@ plabel \
 }
 
 static int
-dec_clnpass(jpc_dec_t *dec, register jpc_mqdec_t *mqdec, int bitpos,
+dec_clnpass(jpc_dec_t *dec, jpc_mqdec_t *mqdec, int bitpos,
             int orient, int vcausalflag, int segsymflag, jas_matrix_t *flags,
             jas_matrix_t *data)
 {
diff --git a/converter/other/jpeg2000/libjasper/jpc/jpc_t2cod.c b/converter/other/jpeg2000/libjasper/jpc/jpc_t2cod.c
index 9a635285..53ae3731 100644
--- a/converter/other/jpeg2000/libjasper/jpc/jpc_t2cod.c
+++ b/converter/other/jpeg2000/libjasper/jpc/jpc_t2cod.c
@@ -186,7 +186,7 @@ int jpc_pi_next(jpc_pi_t *pi)
         }
 }
 
-static int jpc_pi_nextlrcp(register jpc_pi_t *pi)
+static int jpc_pi_nextlrcp(jpc_pi_t *pi)
 {
         jpc_pchg_t *pchg;
         int *prclyrno;
@@ -229,7 +229,7 @@ skip:
         return 1;
 }
 
-static int jpc_pi_nextrlcp(register jpc_pi_t *pi)
+static int jpc_pi_nextrlcp(jpc_pi_t *pi)
 {
         jpc_pchg_t *pchg;
         int *prclyrno;
@@ -270,7 +270,7 @@ skip:
         return 1;
 }
 
-static int jpc_pi_nextrpcl(register jpc_pi_t *pi)
+static int jpc_pi_nextrpcl(jpc_pi_t *pi)
 {
         int rlvlno;
         jpc_pirlvl_t *pirlvl;
@@ -362,7 +362,7 @@ skip:
         return 1;
 }
 
-static int jpc_pi_nextpcrl(register jpc_pi_t *pi)
+static int jpc_pi_nextpcrl(jpc_pi_t *pi)
 {
         int rlvlno;
         jpc_pirlvl_t *pirlvl;
@@ -456,7 +456,7 @@ skip:
         return 1;
 }
 
-static int jpc_pi_nextcprl(register jpc_pi_t *pi)
+static int jpc_pi_nextcprl(jpc_pi_t *pi)
 {
         int rlvlno;
         jpc_pirlvl_t *pirlvl;