jasper: Remove remaining 'register' instruction.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
master
Slávek Banko 2 months ago
parent 7a8a323bf3
commit d8b495cc75
Signed by: SlavekB
GPG Key ID: 608F5293A04BE668

@ -1,3 +1,9 @@
jasper (1.900.1-debian1-2.5ubuntu24.04.0+8~b) noble; urgency=high
* Remove register instruction.
-- Slávek Banko <slavek.banko@axis.cz> Tue, 16 Apr 2024 00:17:47 +0200
jasper (1.900.1-debian1-2.5ubuntu24.04.0+7~b) noble; urgency=high
* Add missing function prototype.

@ -0,0 +1,518 @@
Index: b/src/libjasper/jpc/jpc_mqdec.c
===================================================================
--- a/src/libjasper/jpc/jpc_mqdec.c
+++ b/src/libjasper/jpc/jpc_mqdec.c
@@ -220,7 +220,7 @@
/* 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));
@@ -233,10 +233,10 @@
}
/* 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);
@@ -244,10 +244,10 @@
}
/* 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);
Index: b/src/libjasper/jpc/jpc_mqdec.h
===================================================================
--- a/src/libjasper/jpc/jpc_mqdec.h
+++ b/src/libjasper/jpc/jpc_mqdec.h
@@ -196,12 +196,12 @@
#define jpc_mqdec_mpsexchange(areg, delta, curctx, bit) \
{ \
if ((areg) < (delta)) { \
- register jpc_mqstate_t *state = *(curctx); \
+ jpc_mqstate_t *state = *(curctx); \
/* LPS decoded. */ \
(bit) = state->mps ^ 1; \
*(curctx) = state->nlps; \
} else { \
- register jpc_mqstate_t *state = *(curctx); \
+ jpc_mqstate_t *state = *(curctx); \
/* MPS decoded. */ \
(bit) = state->mps; \
*(curctx) = state->nmps; \
@@ -211,12 +211,12 @@
#define jpc_mqdec_lpsexchange(areg, delta, curctx, bit) \
{ \
if ((areg) >= (delta)) { \
- register jpc_mqstate_t *state = *(curctx); \
+ jpc_mqstate_t *state = *(curctx); \
(areg) = (delta); \
(bit) = state->mps ^ 1; \
*(curctx) = state->nlps; \
} else { \
- register jpc_mqstate_t *state = *(curctx); \
+ jpc_mqstate_t *state = *(curctx); \
(areg) = (delta); \
(bit) = state->mps; \
*(curctx) = state->nmps; \
Index: b/src/libjasper/jpc/jpc_qmfb.c
===================================================================
--- a/src/libjasper/jpc/jpc_qmfb.c
+++ b/src/libjasper/jpc/jpc_qmfb.c
@@ -308,10 +308,10 @@
size_t bufsize = JPC_CEILDIVPOW2(numcols, 1);
jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
jpc_fix_t *buf = splitbuf;
- register jpc_fix_t *srcptr;
- register jpc_fix_t *dstptr;
- register int n;
- register int m;
+ jpc_fix_t *srcptr;
+ jpc_fix_t *dstptr;
+ int n;
+ int m;
int hstartcol;
/* Get a buffer. */
@@ -368,10 +368,10 @@
size_t bufsize = JPC_CEILDIVPOW2(numrows, 1);
jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
jpc_fix_t *buf = splitbuf;
- register jpc_fix_t *srcptr;
- register jpc_fix_t *dstptr;
- register int n;
- register int m;
+ jpc_fix_t *srcptr;
+ jpc_fix_t *dstptr;
+ int n;
+ int m;
int hstartrow;
/* Get a buffer. */
@@ -431,10 +431,10 @@
jpc_fix_t *buf = splitbuf;
jpc_fix_t *srcptr;
jpc_fix_t *dstptr;
- register jpc_fix_t *srcptr2;
- register jpc_fix_t *dstptr2;
- register int n;
- register int i;
+ jpc_fix_t *srcptr2;
+ jpc_fix_t *dstptr2;
+ int n;
+ int i;
int m;
int hstartrow;
@@ -513,10 +513,10 @@
jpc_fix_t *buf = splitbuf;
jpc_fix_t *srcptr;
jpc_fix_t *dstptr;
- register jpc_fix_t *srcptr2;
- register jpc_fix_t *dstptr2;
- register int n;
- register int i;
+ jpc_fix_t *srcptr2;
+ jpc_fix_t *dstptr2;
+ int n;
+ int i;
int m;
int hstartcol;
@@ -591,9 +591,9 @@
int bufsize = JPC_CEILDIVPOW2(numcols, 1);
jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
jpc_fix_t *buf = joinbuf;
- register jpc_fix_t *srcptr;
- register jpc_fix_t *dstptr;
- register int n;
+ jpc_fix_t *srcptr;
+ jpc_fix_t *dstptr;
+ int n;
int hstartcol;
/* Allocate memory for the join buffer from the heap. */
@@ -648,9 +648,9 @@
size_t bufsize = JPC_CEILDIVPOW2(numrows, 1);
jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
jpc_fix_t *buf = joinbuf;
- register jpc_fix_t *srcptr;
- register jpc_fix_t *dstptr;
- register int n;
+ jpc_fix_t *srcptr;
+ jpc_fix_t *dstptr;
+ int n;
int hstartcol;
/* Allocate memory for the join buffer from the heap. */
@@ -707,10 +707,10 @@
jpc_fix_t *buf = joinbuf;
jpc_fix_t *srcptr;
jpc_fix_t *dstptr;
- register jpc_fix_t *srcptr2;
- register jpc_fix_t *dstptr2;
- register int n;
- register int i;
+ jpc_fix_t *srcptr2;
+ jpc_fix_t *dstptr2;
+ int n;
+ int i;
int hstartcol;
/* Allocate memory for the join buffer from the heap. */
@@ -785,10 +785,10 @@
jpc_fix_t *buf = joinbuf;
jpc_fix_t *srcptr;
jpc_fix_t *dstptr;
- register jpc_fix_t *srcptr2;
- register jpc_fix_t *dstptr2;
- register int n;
- register int i;
+ jpc_fix_t *srcptr2;
+ jpc_fix_t *dstptr2;
+ int n;
+ int i;
int hstartcol;
/* Allocate memory for the join buffer from the heap. */
@@ -861,9 +861,9 @@
void jpc_ft_fwdlift_row(jpc_fix_t *a, int numcols, int parity)
{
- register jpc_fix_t *lptr;
- register jpc_fix_t *hptr;
- register int n;
+ jpc_fix_t *lptr;
+ jpc_fix_t *hptr;
+ int n;
int llen;
llen = (numcols + 1 - parity) >> 1;
@@ -921,11 +921,11 @@
jpc_fix_t *lptr;
jpc_fix_t *hptr;
#if 0
- register jpc_fix_t *lptr2;
- register jpc_fix_t *hptr2;
- register int i;
+ jpc_fix_t *lptr2;
+ jpc_fix_t *hptr2;
+ int i;
#endif
- register int n;
+ int n;
int llen;
llen = (numrows + 1 - parity) >> 1;
@@ -982,10 +982,10 @@
jpc_fix_t *lptr;
jpc_fix_t *hptr;
- register jpc_fix_t *lptr2;
- register jpc_fix_t *hptr2;
- register int n;
- register int i;
+ jpc_fix_t *lptr2;
+ jpc_fix_t *hptr2;
+ int n;
+ int i;
int llen;
llen = (numrows + 1 - parity) >> 1;
@@ -1082,10 +1082,10 @@
jpc_fix_t *lptr;
jpc_fix_t *hptr;
- register jpc_fix_t *lptr2;
- register jpc_fix_t *hptr2;
- register int n;
- register int i;
+ jpc_fix_t *lptr2;
+ jpc_fix_t *hptr2;
+ int n;
+ int i;
int llen;
llen = (numrows + 1 - parity) >> 1;
@@ -1179,9 +1179,9 @@
void jpc_ft_invlift_row(jpc_fix_t *a, int numcols, int parity)
{
- register jpc_fix_t *lptr;
- register jpc_fix_t *hptr;
- register int n;
+ jpc_fix_t *lptr;
+ jpc_fix_t *hptr;
+ int n;
int llen;
llen = (numcols + 1 - parity) >> 1;
@@ -1239,11 +1239,11 @@
jpc_fix_t *lptr;
jpc_fix_t *hptr;
#if 0
- register jpc_fix_t *lptr2;
- register jpc_fix_t *hptr2;
- register int i;
+ jpc_fix_t *lptr2;
+ jpc_fix_t *hptr2;
+ int i;
#endif
- register int n;
+ int n;
int llen;
llen = (numrows + 1 - parity) >> 1;
@@ -1300,10 +1300,10 @@
jpc_fix_t *lptr;
jpc_fix_t *hptr;
- register jpc_fix_t *lptr2;
- register jpc_fix_t *hptr2;
- register int n;
- register int i;
+ jpc_fix_t *lptr2;
+ jpc_fix_t *hptr2;
+ int n;
+ int i;
int llen;
llen = (numrows + 1 - parity) >> 1;
@@ -1400,10 +1400,10 @@
jpc_fix_t *lptr;
jpc_fix_t *hptr;
- register jpc_fix_t *lptr2;
- register jpc_fix_t *hptr2;
- register int n;
- register int i;
+ jpc_fix_t *lptr2;
+ jpc_fix_t *hptr2;
+ int n;
+ int i;
int llen;
llen = (numrows + 1 - parity) >> 1;
@@ -1581,9 +1581,9 @@
void jpc_ns_fwdlift_row(jpc_fix_t *a, int numcols, int parity)
{
- register jpc_fix_t *lptr;
- register jpc_fix_t *hptr;
- register int n;
+ jpc_fix_t *lptr;
+ jpc_fix_t *hptr;
+ int n;
int llen;
llen = (numcols + 1 - parity) >> 1;
@@ -1705,10 +1705,10 @@
jpc_fix_t *lptr;
jpc_fix_t *hptr;
- register jpc_fix_t *lptr2;
- register jpc_fix_t *hptr2;
- register int n;
- register int i;
+ jpc_fix_t *lptr2;
+ jpc_fix_t *hptr2;
+ int n;
+ int i;
int llen;
llen = (numrows + 1 - parity) >> 1;
@@ -1913,10 +1913,10 @@
jpc_fix_t *lptr;
jpc_fix_t *hptr;
- register jpc_fix_t *lptr2;
- register jpc_fix_t *hptr2;
- register int n;
- register int i;
+ jpc_fix_t *lptr2;
+ jpc_fix_t *hptr2;
+ int n;
+ int i;
int llen;
llen = (numrows + 1 - parity) >> 1;
@@ -2121,9 +2121,9 @@
jpc_fix_t *lptr;
jpc_fix_t *hptr;
- register jpc_fix_t *lptr2;
- register jpc_fix_t *hptr2;
- register int n;
+ jpc_fix_t *lptr2;
+ jpc_fix_t *hptr2;
+ int n;
int llen;
llen = (numrows + 1 - parity) >> 1;
@@ -2295,9 +2295,9 @@
void jpc_ns_invlift_row(jpc_fix_t *a, int numcols, int parity)
{
- register jpc_fix_t *lptr;
- register jpc_fix_t *hptr;
- register int n;
+ jpc_fix_t *lptr;
+ jpc_fix_t *hptr;
+ int n;
int llen;
llen = (numcols + 1 - parity) >> 1;
@@ -2419,10 +2419,10 @@
jpc_fix_t *lptr;
jpc_fix_t *hptr;
- register jpc_fix_t *lptr2;
- register jpc_fix_t *hptr2;
- register int n;
- register int i;
+ jpc_fix_t *lptr2;
+ jpc_fix_t *hptr2;
+ int n;
+ int i;
int llen;
llen = (numrows + 1 - parity) >> 1;
@@ -2627,10 +2627,10 @@
jpc_fix_t *lptr;
jpc_fix_t *hptr;
- register jpc_fix_t *lptr2;
- register jpc_fix_t *hptr2;
- register int n;
- register int i;
+ jpc_fix_t *lptr2;
+ jpc_fix_t *hptr2;
+ int n;
+ int i;
int llen;
llen = (numrows + 1 - parity) >> 1;
@@ -2835,9 +2835,9 @@
jpc_fix_t *lptr;
jpc_fix_t *hptr;
- register jpc_fix_t *lptr2;
- register jpc_fix_t *hptr2;
- register int n;
+ jpc_fix_t *lptr2;
+ jpc_fix_t *hptr2;
+ int n;
int llen;
llen = (numrows + 1 - parity) >> 1;
Index: b/src/libjasper/jpc/jpc_t1cod.h
===================================================================
--- a/src/libjasper/jpc/jpc_t1cod.h
+++ b/src/libjasper/jpc/jpc_t1cod.h
@@ -239,8 +239,8 @@
/* Update the per-sample state information. */
#define JPC_UPDATEFLAGS4(fp, rowstep, s, vcausalflag) \
{ \
- register jpc_fix_t *np = (fp) - (rowstep); \
- register jpc_fix_t *sp = (fp) + (rowstep); \
+ jpc_fix_t *np = (fp) - (rowstep); \
+ jpc_fix_t *sp = (fp) + (rowstep); \
if ((vcausalflag)) { \
sp[-1] |= JPC_NESIG; \
sp[1] |= JPC_NWSIG; \
Index: b/src/libjasper/jpc/jpc_t1dec.c
===================================================================
--- a/src/libjasper/jpc/jpc_t1dec.c
+++ b/src/libjasper/jpc/jpc_t1dec.c
@@ -359,7 +359,7 @@
} \
}
-static int dec_sigpass(jpc_dec_t *dec, register jpc_mqdec_t *mqdec, int bitpos, int orient,
+static int dec_sigpass(jpc_dec_t *dec, jpc_mqdec_t *mqdec, int bitpos, int orient,
int vcausalflag, jas_matrix_t *flags, jas_matrix_t *data)
{
int i;
@@ -567,7 +567,7 @@
} \
}
-static int dec_refpass(jpc_dec_t *dec, register jpc_mqdec_t *mqdec, int bitpos,
+static int dec_refpass(jpc_dec_t *dec, jpc_mqdec_t *mqdec, int bitpos,
int vcausalflag, jas_matrix_t *flags, jas_matrix_t *data)
{
int i;
@@ -773,7 +773,7 @@
*(fp) &= ~JPC_VISIT; \
}
-static int dec_clnpass(jpc_dec_t *dec, register jpc_mqdec_t *mqdec, int bitpos, int orient,
+static int 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)
{
int i;
Index: b/src/libjasper/jpc/jpc_t2cod.c
===================================================================
--- a/src/libjasper/jpc/jpc_t2cod.c
+++ b/src/libjasper/jpc/jpc_t2cod.c
@@ -137,7 +137,7 @@
}
}
-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;
@@ -180,7 +180,7 @@
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;
@@ -221,7 +221,7 @@
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;
@@ -313,7 +313,7 @@
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;
@@ -407,7 +407,7 @@
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;

@ -28,3 +28,4 @@ CVE-2018-19541.patch
CVE-2018-19540.patch
CVE-2018-19542.patch
add-missing-function-prototype.diff
remove-register-instruction.diff

Loading…
Cancel
Save