diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2024-09-14 01:37:51 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2024-09-14 01:37:51 +0000 |
commit | f92fc5fd74d7df568f65bcbf85ae22aa0dbfb9fd (patch) | |
tree | a14f6f06aa6b4625d3f8acff5974b5816ba4bf55 /converter | |
parent | bd42917405ebcd1011027e00f41c19df70829593 (diff) | |
download | netpbm-mirror-f92fc5fd74d7df568f65bcbf85ae22aa0dbfb9fd.tar.gz netpbm-mirror-f92fc5fd74d7df568f65bcbf85ae22aa0dbfb9fd.tar.xz netpbm-mirror-f92fc5fd74d7df568f65bcbf85ae22aa0dbfb9fd.zip |
cleanup
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4942 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter')
-rw-r--r-- | converter/ppm/ppmtompeg/bitio.c | 4 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/bsearch.c | 2 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/jrevdct.c | 6 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/mfwddct.c | 2 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/mpeg.c | 2 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/opts.c | 6 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/parallel.c | 6 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/pframe.c | 4 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/postdct.c | 50 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/psearch.c | 6 | ||||
-rw-r--r-- | converter/ppm/ppmtompeg/readframe.c | 12 |
11 files changed, 50 insertions, 50 deletions
diff --git a/converter/ppm/ppmtompeg/bitio.c b/converter/ppm/ppmtompeg/bitio.c index b95f1ce1..881f5c3f 100644 --- a/converter/ppm/ppmtompeg/bitio.c +++ b/converter/ppm/ppmtompeg/bitio.c @@ -238,8 +238,8 @@ Bitio_Write(BitBucket * const bbPtr, uint32 const bits_arg, int const nbits) { - register struct bitBucket *lastPtr, *newPtr; - register int delta; + struct bitBucket *lastPtr, *newPtr; + int delta; uint32 bits; bits=bits_arg; diff --git a/converter/ppm/ppmtompeg/bsearch.c b/converter/ppm/ppmtompeg/bsearch.c index 6d13ab34..4e546712 100644 --- a/converter/ppm/ppmtompeg/bsearch.c +++ b/converter/ppm/ppmtompeg/bsearch.c @@ -168,7 +168,7 @@ FindBestMatchExhaust(const LumBlock * const blockP, int32 const bestSoFar, int const searchRange) { - register int mx, my; + int mx, my; int32 bestDiff; int stepSize; int leftMY, leftMX; diff --git a/converter/ppm/ppmtompeg/jrevdct.c b/converter/ppm/ppmtompeg/jrevdct.c index f46051bc..507f93dd 100644 --- a/converter/ppm/ppmtompeg/jrevdct.c +++ b/converter/ppm/ppmtompeg/jrevdct.c @@ -193,7 +193,7 @@ mpeg_jrevdct_quick(data) int32 tmp10, tmp11, tmp12, tmp13; int32 z1, z2, z3, z4, z5; int32 d0, d1, d2, d3, d4, d5, d6, d7; - register DCTELEM *dataptr; + DCTELEM *dataptr; int rowctr; SHIFT_TEMPS @@ -213,7 +213,7 @@ mpeg_jrevdct_quick(data) * row DCT calculations can be simplified this way. */ - register int *idataptr = (int*)dataptr; + int *idataptr = (int*)dataptr; d0 = dataptr[0]; d1 = dataptr[1]; if ((d1 == 0) && (idataptr[1] | idataptr[2] | idataptr[3]) == 0) { @@ -221,7 +221,7 @@ mpeg_jrevdct_quick(data) if (d0) { /* Compute a 32 bit value to assign. */ DCTELEM dcval = (DCTELEM) (d0 << PASS1_BITS); - register int v = (dcval & 0xffff) | ((dcval << 16) & 0xffff0000); + int v = (dcval & 0xffff) | ((dcval << 16) & 0xffff0000); idataptr[0] = v; idataptr[1] = v; diff --git a/converter/ppm/ppmtompeg/mfwddct.c b/converter/ppm/ppmtompeg/mfwddct.c index 1355ef91..2b548d59 100644 --- a/converter/ppm/ppmtompeg/mfwddct.c +++ b/converter/ppm/ppmtompeg/mfwddct.c @@ -209,7 +209,7 @@ mp_fwd_dct_fast(data2d, dest2d) * a 1-d array */ int16 *dest = (int16 *) dest2d; int pass, rowctr; - register int16 *inptr, *outptr; + int16 *inptr, *outptr; int16 workspace[DCTSIZE_SQ]; SHIFT_TEMPS diff --git a/converter/ppm/ppmtompeg/mpeg.c b/converter/ppm/ppmtompeg/mpeg.c index ff8c6035..08d2462b 100644 --- a/converter/ppm/ppmtompeg/mpeg.c +++ b/converter/ppm/ppmtompeg/mpeg.c @@ -1671,7 +1671,7 @@ ReadDecodedRefFrame(MpegFrame * const frameP, FILE *fpointer; const char * fileName; int width, height; - register int y; + int y; width = Fsize_x; height = Fsize_y; diff --git a/converter/ppm/ppmtompeg/opts.c b/converter/ppm/ppmtompeg/opts.c index 9d750c54..fc16a41c 100644 --- a/converter/ppm/ppmtompeg/opts.c +++ b/converter/ppm/ppmtompeg/opts.c @@ -386,9 +386,9 @@ Mpost_UnQuantZigBlockLaplace(in, out, qscale, iblock) int qscale; boolean iblock; { - register int index; + int index; int position; - register int qentry; + int qentry; int level, coeff; double low, high; double mid,lam; @@ -435,7 +435,7 @@ Mpost_UnQuantZigBlockLaplace(in, out, qscale, iblock) int mse(Block blk1, Block blk2) { - register int index, error, tmp; + int index, error, tmp; int16 *bp1, *bp2; bp1 = (int16 *)blk1; diff --git a/converter/ppm/ppmtompeg/parallel.c b/converter/ppm/ppmtompeg/parallel.c index fb0f2fe9..a683d657 100644 --- a/converter/ppm/ppmtompeg/parallel.c +++ b/converter/ppm/ppmtompeg/parallel.c @@ -549,7 +549,7 @@ GetRemoteDecodedRefFrame(MpegFrame * const frameP, static void cleanup_fork( dummy ) /* try to kill all child processes */ int dummy; { - register int i; + int i; for (i = 0; i < current_max_forked_pid; ++i ) { #ifdef DEBUG_FORK @@ -581,14 +581,14 @@ static int safe_fork(command) /* fork child process and remember its PID * { static int init=0; char *argis[MAXARGS]; - register int i=1; + int i=1; if (!(argis[0] = strtok(command, " \t"))) return(0); /* tokenize */ while ((argis[i] = strtok(NULL, " \t")) && i < MAXARGS) ++i; argis[i] = NULL; #ifdef DEBUG_FORK - {register int i=0; + {int i=0; fprintf(stderr, "Command %s becomes:\n", command); while(argis[i]) {fprintf(stderr, "--%s--\n", argis[i]); ++i;} } #endif diff --git a/converter/ppm/ppmtompeg/pframe.c b/converter/ppm/ppmtompeg/pframe.c index 89aab874..b7a739dc 100644 --- a/converter/ppm/ppmtompeg/pframe.c +++ b/converter/ppm/ppmtompeg/pframe.c @@ -446,7 +446,7 @@ GenPFrame(BitBucket * const bb, int lastX, lastY; int mbAddress; int slicePos; - register int index; + int index; float snr[3], psnr[3]; int QScale; BlockMV *info; @@ -1016,7 +1016,7 @@ void ComputeHalfPixelData(frame) MpegFrame *frame; { - register int x, y; + int x, y; /* we add 1 before dividing by 2 because .5 is supposed to be rounded up * (see MPEG-1, page D-31) diff --git a/converter/ppm/ppmtompeg/postdct.c b/converter/ppm/ppmtompeg/postdct.c index f3de075a..d4be3225 100644 --- a/converter/ppm/ppmtompeg/postdct.c +++ b/converter/ppm/ppmtompeg/postdct.c @@ -196,10 +196,10 @@ Mpost_UnQuantZigBlock(in, out, qscale, iblock) int qscale; boolean iblock; { - register int index; + int index; int start; int position; - register int qentry; + int qentry; int level, coeff; if ( iblock ) { @@ -279,13 +279,13 @@ int Mpost_QuantZigBlock(in, out, qscale, iblock) Block in; FlatBlock out; - register int qscale; + int qscale; int iblock; { - register int i; - register int16 temp; - register int qentry; - register int position; + int i; + int16 temp; + int qentry; + int position; boolean nonZero = FALSE; boolean overflow = FALSE; @@ -392,12 +392,12 @@ Mpost_RLEHuffIBlock(in, out) FlatBlock in; BitBucket *out; { - register int i; - register int nzeros = 0; - register int16 cur; - register int16 acur; - register uint32 code; - register int nbits; + int i; + int nzeros = 0; + int16 cur; + int16 acur; + uint32 code; + int nbits; /* * yes, Virginia, we start at 1. The DC coefficient is handled @@ -478,12 +478,12 @@ Mpost_RLEHuffPBlock(in, out) FlatBlock in; BitBucket *out; { - register int i; - register int nzeros = 0; - register int16 cur; - register int16 acur; - register uint32 code; - register int nbits; + int i; + int nzeros = 0; + int16 cur; + int16 acur; + uint32 code; + int nbits; boolean first_dct = TRUE; /* @@ -583,12 +583,12 @@ int CalcRLEHuffLength(in) FlatBlock in; { - register int i; - register int nzeros = 0; - register int16 cur; - register int16 acur; - register int nbits; - register int countbits=0; + int i; + int nzeros = 0; + int16 cur; + int16 acur; + int nbits; + int countbits=0; boolean first_dct = TRUE; for (i = 0; i < DCTSIZE_SQ; i++) { diff --git a/converter/ppm/ppmtompeg/psearch.c b/converter/ppm/ppmtompeg/psearch.c index c82ad4ad..54f5a215 100644 --- a/converter/ppm/ppmtompeg/psearch.c +++ b/converter/ppm/ppmtompeg/psearch.c @@ -802,7 +802,7 @@ void ShowPMVHistogram(fpointer) FILE *fpointer; { - register int x, y; + int x, y; int *columnTotals; int rowTotal; @@ -848,7 +848,7 @@ void ShowBBMVHistogram(fpointer) FILE *fpointer; { - register int x, y; + int x, y; int *columnTotals; int rowTotal; @@ -896,7 +896,7 @@ void ShowBFMVHistogram(fpointer) FILE *fpointer; { - register int x, y; + int x, y; int *columnTotals; int rowTotal; diff --git a/converter/ppm/ppmtompeg/readframe.c b/converter/ppm/ppmtompeg/readframe.c index 85f432d8..d8624fa6 100644 --- a/converter/ppm/ppmtompeg/readframe.c +++ b/converter/ppm/ppmtompeg/readframe.c @@ -511,7 +511,7 @@ ReadEYUV(mf, fpointer, width, height) int width; int height; { - register int y; + int y; uint8 junk[4096]; int safe_read_count; @@ -579,7 +579,7 @@ ReadAYUV(mf, fpointer, width, height) int width; int height; { - register int x, y; + int x, y; struct YuvLine line1, line2; uint8 junk[4096]; uint8 *cbptr, *crptr; @@ -726,7 +726,7 @@ ReadY(mf, fpointer, width, height) int width; int height; { - register int y; + int y; uint8 junk[4096]; int safe_read_count; @@ -774,8 +774,8 @@ ReadSub4(mf, fpointer, width, height) int width; int height; { - register int y; - register int x; + int y; + int x; uint8 buffer[1024]; int safe_read_count; @@ -892,7 +892,7 @@ int w,h; { static bool init_done=FALSE; static unsigned char mapper[256]; - register int i,j; + int i,j; double slope, intercept; slope = (kill_dim_end - kill_dim_break*kill_dim_slope)*1.0 / |