diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2023-10-08 17:43:54 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2023-10-08 17:43:54 +0000 |
| commit | 4b091760fddc73ffc877563b445599db21557e78 (patch) | |
| tree | 902fb25bdee055388372c3478dc291a4be982bac | |
| parent | ba88b729c83d4d99e6b9cae861044c67cd95997d (diff) | |
| download | netpbm-mirror-4b091760fddc73ffc877563b445599db21557e78.tar.gz netpbm-mirror-4b091760fddc73ffc877563b445599db21557e78.tar.xz netpbm-mirror-4b091760fddc73ffc877563b445599db21557e78.zip | |
whitespace
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4735 9d0c8265-081b-0410-96cb-a4ca84ce46f8
77 files changed, 739 insertions, 447 deletions
diff --git a/converter/ppm/411toppm.c b/converter/ppm/411toppm.c index eb2372a5..a50e5145 100644 --- a/converter/ppm/411toppm.c +++ b/converter/ppm/411toppm.c @@ -105,7 +105,7 @@ parseCommandLine(int argc, const char ** argv, opt.opt_table = option_def; opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */ - + pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others. */ @@ -182,7 +182,7 @@ YUVtoPPM(FILE * const ifP, r = CHOP((int)(tempR >> 16)); g = CHOP((int)(tempG >> 16)); b = CHOP((int)(tempB >> 16)); - + PPM_ASSIGN(pixrow[col], r, g, b); } } @@ -225,6 +225,8 @@ main(int argc, const char **argv) { return 0; } + + /* By default a .411 file is width=64, height=48, 4608 bytes. There is no header. diff --git a/converter/ppm/autocad.h b/converter/ppm/autocad.h index 3005782b..ef82cf6f 100644 --- a/converter/ppm/autocad.h +++ b/converter/ppm/autocad.h @@ -56,7 +56,7 @@ static unsigned char acadcol[256][3] = { {76, 38, 66}, {38, 0, 28}, {38, 19, 33}, {255, 0, 127}, {255, 127, 191}, {165, 0, 82}, {165, 82, 124}, {127, 0, 63}, {127, 63, 95}, {76, 0, 38}, {76, 38, 57}, {38, 0, 19}, {38, 19, 28}, {255, 0, 63}, {255, 127, 159}, - {165, 0, 41}, {165, 82, 103}, {127, 0, 31}, {127, 63, 79}, {76, 0, 19}, + {165, 0, 41}, {165, 82, 103}, {127, 0, 31}, {127, 63, 79}, {76, 0, 19}, {76, 38, 47}, {38, 0, 9}, {38, 19, 23}, {84, 84, 84}, {118, 118, 118}, {152, 152, 152}, {186, 186, 186}, {220, 220, 220}, {255, 255, 255} }; diff --git a/converter/ppm/eyuvtoppm.c b/converter/ppm/eyuvtoppm.c index 910a125b..3ec29268 100644 --- a/converter/ppm/eyuvtoppm.c +++ b/converter/ppm/eyuvtoppm.c @@ -1,6 +1,6 @@ /* Bryan got this from mm.ftp-cs.berkeley.edu from the package - mpeg-encode-1.5b-src under the name eyuvtoppm.c on March 30, 2000. - The file was dated April 14, 1995. + mpeg-encode-1.5b-src under the name eyuvtoppm.c on March 30, 2000. + The file was dated April 14, 1995. Bryan rewrote the program entirely to match Netpbm coding style, use the Netpbm libraries and also to output to stdout and ignore @@ -70,7 +70,7 @@ parseCommandLine(int argc, char ** argv, option_def_index = 0; /* incremented by OPTENT3 */ OPTENT3('w', "width", OPT_UINT, &cmdlineP->width, NULL, 0); OPTENT3('h', "height", OPT_UINT, &cmdlineP->height, NULL, 0); - + /* DEFAULTS */ cmdlineP->width = 352; cmdlineP->height = 240; @@ -93,7 +93,7 @@ parseCommandLine(int argc, char ** argv, "You specified %u.", cmdlineP->height); - if (argc-1 == 0) + if (argc-1 == 0) cmdlineP->inputFileName = "-"; else if (argc-1 != 1) pm_error("Program takes zero or one argument (filename). You " @@ -106,7 +106,7 @@ parseCommandLine(int argc, char ** argv, -static uint8 ** +static uint8 ** allocUint8Array(unsigned int const cols, unsigned int const rows) { @@ -129,7 +129,7 @@ allocUint8Array(unsigned int const cols, -static void +static void freeUint8Array(uint8 ** const array, unsigned int const rows) { @@ -162,28 +162,28 @@ freeStorage(unsigned int const rows, uint8 ** const orig_y, uint8 ** const orig_cb, uint8 ** const orig_cr) { - - freeUint8Array(orig_y, rows); - freeUint8Array(orig_cb, rows); + + freeUint8Array(orig_y, rows); + freeUint8Array(orig_cb, rows); freeUint8Array(orig_cr, rows); } -static void +static void YUVtoPPM(FILE * const ofP, unsigned int const cols, unsigned int const rows, uint8 ** const orig_y, uint8 ** const orig_cb, - uint8 ** const orig_cr) { + uint8 ** const orig_cr) { /*---------------------------------------------------------------------------- Convert the YUV image in arrays orig_y[][], orig_cb[][], and orig_cr[][] to a PPM image and write it to file *ofP. -----------------------------------------------------------------------------*/ pixel * const pixrow = ppm_allocrow(cols); - + unsigned int row; ppm_writeppminit(ofP, cols, rows, 255, FALSE); @@ -202,11 +202,11 @@ YUVtoPPM(FILE * const ofP, tempR = 104635*v + 76310*y; tempG = -25690*u + -53294*v + 76310*y; tempB = 132278*u + 76310*y; - + r = CHOP((int)(tempR >> 16)); g = CHOP((int)(tempG >> 16)); b = CHOP((int)(tempB >> 16)); - + PPM_ASSIGN(pixrow[col], r, g, b); } ppm_writeppmrow(stdout, pixrow, cols, 255, FALSE); @@ -216,12 +216,12 @@ YUVtoPPM(FILE * const ofP, -static void +static void ReadYUV(FILE * const ifP, unsigned int const cols, unsigned int const rows, - uint8 ** const orig_y, - uint8 ** const orig_cb, + uint8 ** const orig_y, + uint8 ** const orig_cb, uint8 ** const orig_cr, bool * const eofP) { @@ -240,7 +240,7 @@ ReadYUV(FILE * const ifP, if (bytesRead != cols) eof = true; } - + for (row = 0; row < rows / 2 && !eof; ++row) { /* U */ size_t bytesRead; @@ -249,7 +249,7 @@ ReadYUV(FILE * const ifP, if (bytesRead != cols / 2) eof = true; } - + for (row = 0; row < rows / 2 && !eof; ++row) { /* V */ size_t bytesRead; @@ -297,7 +297,7 @@ main(int argc, const char **argv) { for (frameSeq = 0, eof = false; !eof; ++frameSeq) { - ReadYUV(ifP, cmdline.width, cmdline.height, + ReadYUV(ifP, cmdline.width, cmdline.height, orig_y, orig_cb, orig_cr, &eof); if (!eof) { @@ -317,3 +317,4 @@ main(int argc, const char **argv) { } + diff --git a/converter/ppm/gouldtoppm.c b/converter/ppm/gouldtoppm.c index 5db7c51a..6cc7726c 100644 --- a/converter/ppm/gouldtoppm.c +++ b/converter/ppm/gouldtoppm.c @@ -22,101 +22,106 @@ main( argc, argv ) int argc; char *argv[]; { - FILE *ifp; - pixel *pixrow; + FILE *ifp; + pixel *pixrow; - unsigned long cols, nlines, bytesperline, bitsperpixel, NB, x, y; - unsigned char pbuffer[4]; + unsigned long cols, nlines, bytesperline, bitsperpixel, NB, x, y; + unsigned char pbuffer[4]; - int color_type; + int color_type; - ppm_init( &argc, argv ); + ppm_init( &argc, argv ); - if ( argc > 2 ) - pm_usage( "[gouldfile]" ); + if ( argc > 2 ) + pm_usage( "[gouldfile]" ); - if ( argc == 2 ) - ifp = pm_openr( argv[1] ); - else - ifp = stdin; + if ( argc == 2 ) + ifp = pm_openr( argv[1] ); + else + ifp = stdin; - getgouldheader( ifp, &cols, &nlines, &bytesperline, &bitsperpixel, &NB); + getgouldheader( ifp, &cols, &nlines, &bytesperline, &bitsperpixel, &NB); - ppm_writeppminit(stdout, cols, nlines, MAXVAL, 0); + ppm_writeppminit(stdout, cols, nlines, MAXVAL, 0); - color_type = bitsperpixel/8; - if (color_type == 0) color_type = NB; + color_type = bitsperpixel/8; + if (color_type == 0) color_type = NB; - pixrow = ppm_allocrow(cols); + pixrow = ppm_allocrow(cols); - for (y = 0; y < nlines; ++y) - { - for (x = 0; x < cols; ++x) - { - switch (color_type) - { - case 0: - pm_error("incorrect color type" ); + for (y = 0; y < nlines; ++y) + { + for (x = 0; x < cols; ++x) + { + switch (color_type) + { + case 0: + pm_error("incorrect color type" ); - case 1: - fread(pbuffer, 1, 1, ifp); - PPM_ASSIGN( pixrow[x], pbuffer[0], pbuffer[0], pbuffer[0]); - break; + case 1: + fread(pbuffer, 1, 1, ifp); + PPM_ASSIGN( pixrow[x], pbuffer[0], pbuffer[0], pbuffer[0]); + break; - case 2: - fread(pbuffer, 2, 1, ifp); - PPM_ASSIGN( pixrow[x], pbuffer[0], pbuffer[1], pbuffer[1]); - break; + case 2: + fread(pbuffer, 2, 1, ifp); + PPM_ASSIGN( pixrow[x], pbuffer[0], pbuffer[1], pbuffer[1]); + break; - case 3: - fread(pbuffer, 3, 1, ifp); - PPM_ASSIGN( pixrow[x], pbuffer[0], pbuffer[1], pbuffer[2]); - break; + case 3: + fread(pbuffer, 3, 1, ifp); + PPM_ASSIGN( pixrow[x], pbuffer[0], pbuffer[1], pbuffer[2]); + break; - default : - fread(pbuffer, 3, 1, ifp); - PPM_ASSIGN( pixrow[x], pbuffer[0], pbuffer[1], pbuffer[2]); - break; + default : + fread(pbuffer, 3, 1, ifp); + PPM_ASSIGN( pixrow[x], pbuffer[0], pbuffer[1], pbuffer[2]); + break; - } /* switch */ - } - ppm_writeppmrow(stdout, pixrow, cols, MAXVAL, 0); - } + } /* switch */ + } + ppm_writeppmrow(stdout, pixrow, cols, MAXVAL, 0); + } - pm_close(ifp); - pm_close(stdout); + pm_close(ifp); + pm_close(stdout); - exit(0); + exit(0); } + + static void getgouldheader( infile, cols, nlines, bytesperline, bitsperpixel, NB) FILE *infile; unsigned long *cols, *nlines, *bytesperline, *bitsperpixel, *NB; { - unsigned long nlines_new, bytesperline_new, numheaderrec; - unsigned char headerblk[512]; - int i; - - if (fread(headerblk, 512, 1, infile) == 0) - pm_error("cannot read gould header" ); - - *nlines = (headerblk[3]<<8) | headerblk[2]; - *bytesperline = (headerblk[5]<<8) | headerblk[4]; - *bitsperpixel = (headerblk[7]<<8) | headerblk[6]; - numheaderrec = (headerblk[9]<<8) | headerblk[8]; - nlines_new = (headerblk[15]<<24)| (headerblk[14]<<16) | (headerblk[13]<<8) | (headerblk[12]); - bytesperline_new = (headerblk[19]<<24)| (headerblk[18]<<16) | (headerblk[17]<<8) | (headerblk[16]); - *NB = (headerblk[23]<<24)| (headerblk[22]<<16) | (headerblk[21]<<8) | (headerblk[20]); - - if (numheaderrec > 1) - for (i = 1 ; i <numheaderrec; ++i) - if (fread(headerblk, 512, 1, infile) == 0) - pm_error("cannot read gould header(2nd)" ); - - if (*nlines==0) *nlines=nlines_new; - if (*bytesperline==0) *bytesperline=bytesperline_new; - - *cols = (*bytesperline)*8 / (*bitsperpixel); + unsigned long nlines_new, bytesperline_new, numheaderrec; + unsigned char headerblk[512]; + int i; + + if (fread(headerblk, 512, 1, infile) == 0) + pm_error("cannot read gould header" ); + + *nlines = (headerblk[3]<<8) | headerblk[2]; + *bytesperline = (headerblk[5]<<8) | headerblk[4]; + *bitsperpixel = (headerblk[7]<<8) | headerblk[6]; + numheaderrec = (headerblk[9]<<8) | headerblk[8]; + nlines_new = (headerblk[15]<<24)| (headerblk[14]<<16) | (headerblk[13]<<8) | (headerblk[12]); + bytesperline_new = (headerblk[19]<<24)| (headerblk[18]<<16) | (headerblk[17]<<8) | (headerblk[16]); + *NB = (headerblk[23]<<24)| (headerblk[22]<<16) | (headerblk[21]<<8) | (headerblk[20]); + + if (numheaderrec > 1) + for (i = 1 ; i <numheaderrec; ++i) + if (fread(headerblk, 512, 1, infile) == 0) + pm_error("cannot read gould header(2nd)" ); + + if (*nlines==0) *nlines=nlines_new; + if (*bytesperline==0) *bytesperline=bytesperline_new; + + *cols = (*bytesperline)*8 / (*bitsperpixel); } + + + diff --git a/converter/ppm/ilbmtoppm.c b/converter/ppm/ilbmtoppm.c index 1b66c0b3..8a8cf9f3 100644 --- a/converter/ppm/ilbmtoppm.c +++ b/converter/ppm/ilbmtoppm.c @@ -112,6 +112,7 @@ ID2string(IFF_ID const id) { } + /**************************************************************************** Memory allocation ****************************************************************************/ @@ -154,6 +155,7 @@ alloc_rawrow(unsigned int const cols) { } + /**************************************************************************** Basic I/O functions ****************************************************************************/ @@ -207,6 +209,8 @@ get_byte(FILE * const ifP, return (unsigned char) i; } + + static long get_big_long(FILE * const ifP, IFF_ID const iffid, @@ -540,6 +544,7 @@ read_bmhd(FILE * const ifP, } + /**************************************************************************** ILBM functions ****************************************************************************/ @@ -594,6 +599,7 @@ read_ilbm_plane(FILE * const ifP, } + static const unsigned char bit_mask[] = {1, 2, 4, 8, 16, 32, 64, 128}; static void @@ -637,6 +643,7 @@ decodeRow(FILE * const ifP, } + static void decodeMask(FILE * const ifP, unsigned long * const remainingChunksizeP, @@ -699,6 +706,7 @@ decodeMask(FILE * const ifP, } + /**************************************************************************** Multipalette handling ****************************************************************************/ @@ -1609,6 +1617,8 @@ rgbn_to_ppm(FILE * const ifP, chunk_end(ifP, ID_BODY, remainingChunksize); } + + /**************************************************************************** Multipalette chunk reader @@ -1782,6 +1792,7 @@ PCHG_Decompress(PCHGHeader * const PCHG, } + static void PCHG_ConvertSmall(PCHGHeader * const pchgP, ColorMap * const cmapP, diff --git a/converter/ppm/leaftoppm.c b/converter/ppm/leaftoppm.c index 61c19c1e..0dcc1255 100644 --- a/converter/ppm/leaftoppm.c +++ b/converter/ppm/leaftoppm.c @@ -10,7 +10,7 @@ * implied warranty. * * known problems: doesn't do compressed ileaf images. - * + * */ #include <stdio.h> @@ -20,11 +20,11 @@ #define LEAF_MAXVAL 255 static void -leaf_init(FILE * const fp, +leaf_init(FILE * const fp, int * const colsP, - int * const rowsP, - int * const depthP, - int * const ncolorsP, + int * const rowsP, + int * const depthP, + int * const ncolorsP, pixel * const colors) { unsigned char buf[256]; @@ -34,41 +34,41 @@ leaf_init(FILE * const fp, short rows; short depth; long magic; - + pm_readbiglong(fp, &magic); if ((uint32_t)magic != 0x894f5053) pm_error("Bad magic number. First 4 bytes should be " "0x894f5053 but are instead 0x%08x", (unsigned)magic); - + /* version = 2 bytes - hres = 2 + hres = 2 vres = 2 unique id = 4 offset x = 2 offset y = 2 - TOTAL = 14 bytes + TOTAL = 14 bytes */ - + pm_readbigshort(fp, &version); if (fread(buf, 1, 12, fp) != 12) pm_error("bad header, short file?"); - + pm_readbigshort(fp, &cols); *colsP = cols; pm_readbigshort(fp, &rows); *rowsP = rows; pm_readbigshort(fp, &depth); *depthP = depth; - + if ((compressed = fgetc(fp)) != 0) pm_error("Can't do compressed images."); if ((*depthP == 1) && (version < 4)) { - fgetc(fp); + fgetc(fp); *ncolorsP = 0; } else if ((*depthP == 8) && (version < 4)) { - fgetc(fp); + fgetc(fp); *ncolorsP = 0; } else { long format; @@ -121,19 +121,19 @@ main(int argc, char * argv[]) { pixel colormap[MAXCOLORS]; int rows, cols, row, col, depth, ncolors; - + ppm_init(&argc, argv); - + if (argc-1 > 1) pm_error("Too many arguments. Only argument is ileaf file name"); - + if (argc-1 == 1) ifd = pm_openr(argv[1]); else ifd = stdin; - + leaf_init(ifd, &cols, &rows, &depth, &ncolors, colormap); - + if ((depth == 8) && (ncolors == 0)) { /* gray image */ gray * grayrow; @@ -177,7 +177,7 @@ main(int argc, char * argv[]) { ppm_writeppminit(stdout, cols, rows, (pixval) maxval, 0); pixrow = ppm_allocrow( cols ); - + for (row = 0; row < rows; ++row) { for (col = 0; col < cols; ++col) pixrow[col] = colormap[fgetc(ifd)]; @@ -190,18 +190,18 @@ main(int argc, char * argv[]) { /* mono image */ bit *bitrow; unsigned int row; - + pbm_writepbminit(stdout, cols, rows, 0); bitrow = pbm_allocrow(cols); - + for (row = 0; row < rows; ++row) { unsigned char bits; bits = 0x00; /* initial value */ for (col = 0; col < cols; ++col) { int const shift = col % 8; - if (shift == 0) + if (shift == 0) bits = (unsigned char) fgetc(ifd); - bitrow[col] = (bits & (unsigned char)(0x01 << (7 - shift))) ? + bitrow[col] = (bits & (unsigned char)(0x01 << (7 - shift))) ? PBM_WHITE : PBM_BLACK; } if ((cols % 16) && (cols % 16) <= 8) @@ -211,6 +211,9 @@ main(int argc, char * argv[]) { pbm_freerow(bitrow); } pm_close(ifd); - + return 0; } + + + diff --git a/converter/ppm/mtvtoppm.c b/converter/ppm/mtvtoppm.c index e8558632..42f99428 100644 --- a/converter/ppm/mtvtoppm.c +++ b/converter/ppm/mtvtoppm.c @@ -30,39 +30,42 @@ main( argc, argv ) ppm_init( &argc, argv ); if ( argc > 2 ) - pm_usage( "[mtvfile]" ); + pm_usage( "[mtvfile]" ); if ( argc == 2 ) - ifp = pm_openr( argv[1] ); + ifp = pm_openr( argv[1] ); else - ifp = stdin; + ifp = stdin; /* Read in the MTV file. First the header. */ if ( fgets( line, MAXLINE, ifp ) == NULL ) - pm_error( "unable to read MTV file header" ); + pm_error( "unable to read MTV file header" ); if ( sscanf( line, "%d%d", &cols, &rows ) != 2 ) - pm_error( "unable to parse MTV file header" ); + pm_error( "unable to parse MTV file header" ); if ( cols <= 0 || rows <= 0 ) - pm_error( "invalid size: %d %d", cols, rows ); + pm_error( "invalid size: %d %d", cols, rows ); maxval = 255; ppm_writeppminit( stdout, cols, rows, maxval, 0 ); pixelrow = ppm_allocrow( cols ); for ( row = 0; row < rows; row++ ) - { - for ( col = 0, pP = pixelrow; col < cols; col++, pP++ ) - { - if ( fread( buf, sizeof(buf), 1, ifp ) != 1 ) - pm_error( "EOF / read error" ); - PPM_ASSIGN( *pP, buf[0], buf[1], buf[2] ); - } - ppm_writeppmrow( stdout, pixelrow, cols, maxval, 0 ); - } + { + for ( col = 0, pP = pixelrow; col < cols; col++, pP++ ) + { + if ( fread( buf, sizeof(buf), 1, ifp ) != 1 ) + pm_error( "EOF / read error" ); + PPM_ASSIGN( *pP, buf[0], buf[1], buf[2] ); + } + ppm_writeppmrow( stdout, pixelrow, cols, maxval, 0 ); + } pm_close( ifp ); pm_close( stdout ); exit( 0 ); } + + + diff --git a/converter/ppm/neotoppm.c b/converter/ppm/neotoppm.c index d8cf2918..6ce5ef43 100644 --- a/converter/ppm/neotoppm.c +++ b/converter/ppm/neotoppm.c @@ -57,7 +57,7 @@ main( int argc, char * argv[] ) { /* Read the palette. */ for ( i = 0; i < 16; ++i ) { short j; - + pm_readbigshort (ifp, &j); PPM_ASSIGN( pal[i], ( j & 0x700 ) >> 8, @@ -102,3 +102,6 @@ main( int argc, char * argv[] ) { exit( 0 ); } + + + diff --git a/converter/ppm/pc1toppm.c b/converter/ppm/pc1toppm.c index ec6678a4..45d09faa 100644 --- a/converter/ppm/pc1toppm.c +++ b/converter/ppm/pc1toppm.c @@ -13,7 +13,7 @@ documentation. This software is provided "as is" without express or implied warranty. - Algorithm for PC1 compression from "gimp-degas" GIMP plugin + Algorithm for PC1 compression from "gimp-degas" GIMP plugin by Markus F.X.J. Oberhumer */ @@ -39,7 +39,7 @@ unsigned int const colsPerBlock = 16; static void -readPalette(FILE * const ifP, +readPalette(FILE * const ifP, pixel (* const palP)[]) { /* Read the palette. */ @@ -78,7 +78,7 @@ processStretch(unsigned int const countbyte, } } else { /* next byte repeated 257-countbyte times */ - + unsigned char const duplicated_color = getc(ifP); unsigned int const count = 257 - countbyte; unsigned int i; @@ -121,8 +121,8 @@ readPc1(FILE * const ifP, unsigned int const countbyte = getc(ifP); processStretch(countbyte, ifP, &col, &bufferCursor); - } - } + } + } } @@ -130,7 +130,7 @@ readPc1(FILE * const ifP, static void reInterleave(unsigned char const buffer[], unsigned short (* const screenP)[]) { - + /* The buffer is in one plane for each line, to optimize packing */ /* Re-interleave to match the Atari screen layout */ @@ -142,10 +142,10 @@ reInterleave(unsigned char const buffer[], for (block = 0; block < BLOCKS; ++block) { unsigned int plane; for (plane = 0; plane < planes; ++plane) { - unsigned int const blockIndex = + unsigned int const blockIndex = row*ROWBYTES + plane*PLANEBYTES + block*BLOCKBYTES; - screen[row*ROWSHORTS + block*BLOCKSHORTS + plane] = + screen[row*ROWSHORTS + block*BLOCKSHORTS + plane] = (buffer[blockIndex+0] << 8) + (buffer[blockIndex+1]); } } @@ -202,9 +202,9 @@ main(int argc, char ** argv) { const char * inputFilename; FILE* ifP; pixel palette[16]; /* Degas palette */ - static unsigned short screen[32000/2]; + static unsigned short screen[32000/2]; /* simulates the Atari's video RAM */ - static unsigned char buffer[32000]; + static unsigned char buffer[32000]; /* simulates the Atari's video RAM */ ppm_init(&argc, argv); @@ -231,3 +231,6 @@ main(int argc, char ** argv) { return 0; } + + + diff --git a/converter/ppm/pi1toppm.c b/converter/ppm/pi1toppm.c index 69b99863..9a07f535 100644 --- a/converter/ppm/pi1toppm.c +++ b/converter/ppm/pi1toppm.c @@ -90,3 +90,6 @@ main( argc, argv ) exit( 0 ); } + + + diff --git a/converter/ppm/picttoppm.c b/converter/ppm/picttoppm.c index ec701cfc..8ca553bd 100644 --- a/converter/ppm/picttoppm.c +++ b/converter/ppm/picttoppm.c @@ -339,6 +339,7 @@ allocateRaster(struct Raster * const rasterP, } + static void freeRaster(struct Raster const raster) { @@ -346,6 +347,7 @@ freeRaster(struct Raster const raster) { } + struct BlitInfo { struct Rect srcRect; struct Rect srcBounds; @@ -763,6 +765,7 @@ skipPolyOrRegion(FILE * const ifP, } + #define NA (0) #define FNT_BOLD (1) @@ -969,6 +972,7 @@ rectequal(const struct Rect * const comparand, } + static int rectheight(const struct Rect * const r) { @@ -2719,6 +2723,7 @@ interpretCompressedLine(unsigned char * const linebuf, } + /* There is some confusion about when, in PICT, a line length is one byte and when it is two. An Apple document says it is two bytes when the number of pixels in the row, padded, is > 250. Ppmtopict generated PICTs that way @@ -3194,6 +3199,8 @@ drawPen(struct Canvas * const canvasP, drawPenRect(canvasP, &clippedPenrect); } + + /* * Digital Line Drawing * by Paul Heckbert diff --git a/converter/ppm/ppmtoacad.c b/converter/ppm/ppmtoacad.c index b5ee4d65..4f4dc5dd 100644 --- a/converter/ppm/ppmtoacad.c +++ b/converter/ppm/ppmtoacad.c @@ -108,33 +108,33 @@ static void outrun(color, ysize, y, xstart, xend) stdout, (int) ((xend + 1) * aspect + 0.4999)); (void) pm_writelittleshort(stdout, yb - yspan); } else { - (void) pm_writelittleshort(stdout, (short) 0xFD00); + (void) pm_writelittleshort(stdout, (short) 0xFD00); /* Solid fill header */ - (void) pm_writelittleshort(stdout, 4); + (void) pm_writelittleshort(stdout, 4); /* Vertices to follow */ (void) pm_writelittleshort(stdout, -2); /* Fill type */ - (void) pm_writelittleshort(stdout, (short)0xFD00); + (void) pm_writelittleshort(stdout, (short)0xFD00); /* Solid fill vertex */ (void) pm_writelittleshort(stdout, xstart); (void) pm_writelittleshort(stdout, yb); - (void) pm_writelittleshort(stdout, (short) 0xFD00); + (void) pm_writelittleshort(stdout, (short) 0xFD00); /* Solid fill vertex */ (void) pm_writelittleshort(stdout, xend + 1); (void) pm_writelittleshort(stdout, yb); - (void) pm_writelittleshort(stdout, (short) 0xFD00); + (void) pm_writelittleshort(stdout, (short) 0xFD00); /* Solid fill vertex */ (void) pm_writelittleshort(stdout, xend + 1); (void) pm_writelittleshort(stdout, yb - yspan); - (void) pm_writelittleshort(stdout, (short) 0xFD00); + (void) pm_writelittleshort(stdout, (short) 0xFD00); /* Solid fill vertex */ (void) pm_writelittleshort(stdout, xstart); (void) pm_writelittleshort(stdout, yb - yspan); - (void) pm_writelittleshort(stdout, (short) 0xFD00); + (void) pm_writelittleshort(stdout, (short) 0xFD00); /* Solid fill trailer */ (void) pm_writelittleshort(stdout, 4); /* Vertices that precede */ (void) pm_writelittleshort(stdout, -2); /* Fill type */ @@ -147,6 +147,8 @@ static void outrun(color, ysize, y, xstart, xend) } } + + /* SLIDEOUT -- Write an AutoCAD slide. */ static void slideout(xdots, ydots, ncolors, red, green, blue) @@ -253,12 +255,14 @@ static void slideout(xdots, ydots, ncolors, red, green, blue) if (dxbmode) { putchar(0); /* DXB end sentinel */ } else { - (void) pm_writelittleshort(stdout, (short) 0xFC00); + (void) pm_writelittleshort(stdout, (short) 0xFC00); /* End of file marker */ } pm_freerow((char *) acadmap); } + + /* Main program. */ int main(argc, argv) @@ -391,3 +395,6 @@ int main(argc, argv) pm_freerow((char *) Blue); exit(0); } + + + diff --git a/converter/ppm/ppmtoapplevol.c b/converter/ppm/ppmtoapplevol.c index 1e979de9..50c85dc6 100644 --- a/converter/ppm/ppmtoapplevol.c +++ b/converter/ppm/ppmtoapplevol.c @@ -97,3 +97,6 @@ main (int argc, const char * argv[]) { return 0; } + + + diff --git a/converter/ppm/ppmtoarbtxt.c b/converter/ppm/ppmtoarbtxt.c index 6d4c6eac..cb2c388b 100644 --- a/converter/ppm/ppmtoarbtxt.c +++ b/converter/ppm/ppmtoarbtxt.c @@ -69,11 +69,11 @@ parseCommandLine(int argc, const char ** argv, unsigned int hdSpec, tlSpec; unsigned int option_def_index; - + MALLOCARRAY(option_def, 100); option_def_index = 0; /* incremented by OPTENTRY */ - OPTENT3(0, "hd", OPT_STRING, &cmdlineP->hd, + OPTENT3(0, "hd", OPT_STRING, &cmdlineP->hd, &hdSpec, 0); OPTENT3(0, "tl", OPT_STRING, &cmdlineP->tl, &tlSpec, 0); @@ -113,7 +113,6 @@ parseCommandLine(int argc, const char ** argv, - typedef enum { /* The types of object we handle */ BDATA, IRED, IGREEN, IBLUE, ILUM, FRED, FGREEN, FBLUE, FLUM, @@ -134,7 +133,7 @@ typedef union { char * bdat; /* Binary data (text with newlines etc.) */ unsigned int ndat; } binData; - + struct Icdat { char icformat[MAXFORMAT+1]; /* Integer colors */ unsigned int icolmin, icolmax; @@ -144,7 +143,7 @@ typedef union { char fcformat[MAXFORMAT+1]; /* Float colors */ double fcolmin, fcolmax; } fcolData; - + struct Idat { char iformat[MAXFORMAT+1]; /* Integer data */ } iData; @@ -152,7 +151,7 @@ typedef union { /* Each object has a type and some data */ -typedef struct { +typedef struct { SkeletonObjectType objType; SkeletonObjectData odata; } SkeletonObject; @@ -187,11 +186,11 @@ dumpSkeleton(SkeletonObject ** const skeletonPList, static void dumpAllSkeleton(SkeletonObject ** const bodySkeletonPList, unsigned int const bodyNskl, - SkeletonObject ** const headSkeletonPList, + SkeletonObject ** const headSkeletonPList, unsigned int const headNskl, SkeletonObject ** const tailSkeletonPList, unsigned int const tailNskl) { - + pm_message("Body skeleton:"); dumpSkeleton(bodySkeletonPList, bodyNskl); @@ -240,7 +239,7 @@ writeFcol(FILE * const ofP, double const value) { struct Fcdat * const fcdataP = &objectP->odata.fcolData; - + fprintf(ofP, fcdataP->fcformat, (double) (fcdataP->fcolmin @@ -255,7 +254,7 @@ writeIdat(FILE * const ofP, unsigned int const value) { struct Idat * const idataP = &objectP->odata.iData; - + fprintf(ofP, idataP->iformat, value); } @@ -272,7 +271,7 @@ writeText(FILE * const ofP, double const red, double const green, double const blue) { - + unsigned int i; for (i = 0; i < nObj; ++i) { @@ -352,6 +351,7 @@ objClass(SkeletonObjectType const objType) { } + /*---------------------------------------------------------------------------- Format string validation @@ -366,7 +366,7 @@ objClass(SkeletonObjectType const objType) { Documentation for parse_printf_format() is usually available in texinfo format on GNU/Linux systems. As of Dec. 2014 there is no official man page. - + Online documentation is available from: https:// www.gnu.org/software/libc/manual/html_node/Parsing-a-Template-String.html @@ -379,7 +379,7 @@ validateParsePrintfFlag(int const printfConversion, const char ** const errorP) { /*---------------------------------------------------------------------------- Assuming 'printfConversion' is the value reported by parse_printf_format() - as the type of argument a format string requires, + as the type of argument a format string requires, return an explanation of how it is incompatible with 'ctyp' as *errorP -- return null string if it is compatible. -----------------------------------------------------------------------------*/ @@ -403,7 +403,7 @@ validateParsePrintfFlag(int const printfConversion, default: switch (printfConversion & ~PA_FLAG_MASK) { case PA_CHAR: - pm_message("Warning: char type conversion."); + pm_message("Warning: char type conversion."); case PA_INT: if(objClass(ctyp) == OBJTYP_ICOLOR || objClass(ctyp) == OBJTYP_INT ) @@ -496,7 +496,7 @@ validateFormatOne(char const typeSpecifier, case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': break; - + case 'c': case 'C': pm_message("Warning: char type conversion: %%%c.", typeSpecifier); case 'i': case 'd': case 'u': case 'o': case 'x': case 'X': @@ -599,12 +599,12 @@ validateFormat(const char * const format, if (error) pm_error("Invalid format string '%s'. %s", format, error); -} - +} + static SkeletonObject * -newBinDataObj(unsigned int const nDat, +newBinDataObj(unsigned int const nDat, const char * const bdat) { /*---------------------------------------------------------------------------- Create a binary data object. @@ -787,7 +787,7 @@ newFcSkelFromReplString(const char * const fcolorObjstr, retval = NULL; return retval; -} +} @@ -805,7 +805,7 @@ newISkelFromReplString(const char * const intObjstr, int nOdata; nOdata = sscanf(intObjstr, "%s", formstr); - + if (nOdata == 1) retval = newIdataObj(objType, formstr); else if (nOdata == EOF) { @@ -815,7 +815,7 @@ newISkelFromReplString(const char * const intObjstr, retval = NULL; return retval; -} +} @@ -842,7 +842,7 @@ newSkeletonFromReplString(const char * const objstr) { int conversionCt; char s1[MAX_OBJ_BUF]; /* Dry read. */ char s2[MAX_OBJ_BUF]; /* Extra tailing characters. */ - float f1, f2; /* Dry read. */ + float f1, f2; /* Dry read. */ typstr[0] = '\0'; /* initial value */ @@ -905,7 +905,7 @@ readThroughCloseParen(FILE * const ifP, if (chr == ')') { gotEscSeq = true; objstr[i] = '\0'; - } else + } else objstr[i] = chr; } } @@ -942,7 +942,7 @@ SkeletonBuffer_add(SkeletonBuffer * const bufferP, pm_error("Too many skeletons. Max = %u", bufferP->capacity); bufferP->skeletonPList[bufferP->nSkeleton++] = skeletonP; -} +} @@ -1050,7 +1050,7 @@ readSkeletonFile(const char * const filename, /* A buffer for accumulating skeleton objects */ Buffer buffer; /* A buffer for accumulating binary (literal; unsubstituted) data, on - its way to becoming a binary skeleton object. + its way to becoming a binary skeleton object. */ bool eof; const char * error; @@ -1135,7 +1135,7 @@ convertIt(FILE * const ifP, FILE * const ofP, SkeletonObject ** const bodySkeletonPList, unsigned int const bodyNskl, - SkeletonObject ** const headSkeletonPList, + SkeletonObject ** const headSkeletonPList, unsigned int const headNskl, SkeletonObject ** const tailSkeletonPList, unsigned int const tailNskl) { @@ -1154,7 +1154,7 @@ convertIt(FILE * const ifP, dmaxval = (double)maxval; /* Write header */ - writeText(ofP, headNskl, headSkeletonPList, + writeText(ofP, headNskl, headSkeletonPList, cols, rows , 0, 0, 0.0, 0.0, 0.0); /* Write raster */ @@ -1175,7 +1175,7 @@ convertIt(FILE * const ifP, } /* Write trailer */ - writeText(ofP, tailNskl, tailSkeletonPList, + writeText(ofP, tailNskl, tailSkeletonPList, cols, rows, 0, 0, 0.0, 0.0, 0.0); } @@ -1184,7 +1184,7 @@ convertIt(FILE * const ifP, int main(int argc, const char ** argv) { - + struct CmdlineInfo cmdline; unsigned int headNskl, bodyNskl, tailNskl; @@ -1240,3 +1240,4 @@ main(int argc, } + diff --git a/converter/ppm/ppmtoascii.c b/converter/ppm/ppmtoascii.c index 6b0b04d7..524bcd2c 100644 --- a/converter/ppm/ppmtoascii.c +++ b/converter/ppm/ppmtoascii.c @@ -164,7 +164,7 @@ ppmtoascii(pixel * const * const pixels, for (row = 0; row < rows; row += cellHeight) { unsigned int col; - for (col = 0; col < cols; col += cellWidth) { + for (col = 0; col < cols; col += cellWidth) { unsigned int const sumthresh = cellWidth * cellHeight * 1.0 / 2; float sumr, sumg, sumb; @@ -181,7 +181,7 @@ ppmtoascii(pixel * const * const pixels, for (subcol = 0; subcol < cellWidth; ++subcol) { pixel color; pixval value; - + if (row + subrow < rows && col + subcol < cols) color = pixels[row + subrow][col + subcol]; else @@ -225,7 +225,7 @@ main(int argc, const char ** argv) { parseCommandLine(argc, argv, &cmdline); ifP = pm_openr(cmdline.inputFileName); - + pixels = ppm_readppm(ifP, &cols, &rows, &maxval); pm_close(ifP); @@ -234,3 +234,6 @@ main(int argc, const char ** argv) { return 0; } + + + diff --git a/converter/ppm/ppmtobmp.c b/converter/ppm/ppmtobmp.c index 41cee482..8590c5ef 100644 --- a/converter/ppm/ppmtobmp.c +++ b/converter/ppm/ppmtobmp.c @@ -183,6 +183,7 @@ putLong(FILE * const fp, long const v) { } + /*---------------------------------------------------------------------------- BMP writing -----------------------------------------------------------------------------*/ diff --git a/converter/ppm/ppmtoeyuv.c b/converter/ppm/ppmtoeyuv.c index c4cedcdf..0cfe9b13 100644 --- a/converter/ppm/ppmtoeyuv.c +++ b/converter/ppm/ppmtoeyuv.c @@ -66,7 +66,7 @@ #include "ppm.h" #include "mallocvar.h" -typedef unsigned char uint8; +typedef unsigned char uint8; /* Multiplication tables */ @@ -92,6 +92,8 @@ luminance(pixel const p) { ; } + + static __inline__ float chrominanceRed(pixel const p) { return mult5[PPM_GETR(p)] @@ -100,6 +102,8 @@ chrominanceRed(pixel const p) { ; } + + static __inline__ float chrominanceBlue(pixel const p) { return mult16874[PPM_GETR(p)] @@ -171,10 +175,10 @@ freeMultiplicationTables(void) { * * PPMtoYUV * - * convert PPM data into YUV data - * assumes that ydivisor = 1 + * convert PPM data into YUV data + * assumes that ydivisor = 1 * - * RETURNS: nothing + * RETURNS: nothing * * SIDE EFFECTS: none * @@ -362,8 +366,8 @@ main(int argc, const char **argv) { eof = false; /* EOF not yet encountered */ lastMaxval = 0; /* No previous maxval */ - lastWidth = 0; /* No previous width */ - lastHeight = 0; /* No previous height */ + lastWidth = 0; /* No previous width */ + lastHeight = 0; /* No previous height */ orig_y = orig_cr = orig_cb = 0; while (!eof) { diff --git a/converter/ppm/ppmtoicr.c b/converter/ppm/ppmtoicr.c index 74ed4308..de21fc68 100644 --- a/converter/ppm/ppmtoicr.c +++ b/converter/ppm/ppmtoicr.c @@ -149,7 +149,6 @@ validateComputableSize(unsigned int const cols, - static void makeIcrColormap(colorhist_vector const chv, unsigned int const colorCt, @@ -290,6 +289,7 @@ windowNameFmFileName(const char * const fileName) { } + int main(int argc, const char ** const argv) { diff --git a/converter/ppm/ppmtoilbm.c b/converter/ppm/ppmtoilbm.c index f9672733..c91315c3 100644 --- a/converter/ppm/ppmtoilbm.c +++ b/converter/ppm/ppmtoilbm.c @@ -344,6 +344,7 @@ writeTextChunks(void) { } + static void writeCmap(pixel * const colormap, int const colors, @@ -2138,7 +2139,7 @@ main(int argc, char ** argv) { else if( pm_keymatch(argv[argn], "-nofloyd", 5) || pm_keymatch(argv[argn], "-nofs", 5) ) - defunctArgs++; + defunctArgs++; else if( pm_keymatch(argv[argn], "-annotation", 3) ) { if( ++argn >= argc ) diff --git a/converter/ppm/ppmtoleaf.c b/converter/ppm/ppmtoleaf.c index dcff0985..dc73dc48 100644 --- a/converter/ppm/ppmtoleaf.c +++ b/converter/ppm/ppmtoleaf.c @@ -11,7 +11,7 @@ * * Known problems: pgms are not converted to leaf grayscales; they are * converted to 8-bit color images with all gray for colors. - * + * */ #include <stdio.h> @@ -31,7 +31,7 @@ static int colorstobpp(unsigned int const colors) { int bpp; - + if (colors <= 2) bpp = 1; else if (colors <= 256) @@ -49,15 +49,14 @@ GetPixel(int const x, int const y) { int color; - + color = ppm_lookupcolor(cht, &pixels[y][x]); - + return color; } - static void leaf_writeimg(unsigned int const width, unsigned int const height, @@ -70,52 +69,52 @@ leaf_writeimg(unsigned int const width, */ /* NOTE: byte order in ileaf img file fmt is big-endian, always! */ - + /* magic */ fputc(0x89, stdout); fputc(0x4f, stdout); fputc(0x50, stdout); fputc(0x53, stdout); - + /* version 4 */ fputc(0x00, stdout); fputc(0x04, stdout); - + /* h resolution: pixels/inch: say 75=screen resolution */ fputc(0x00, stdout); fputc(75, stdout); - + /* v resolution: pixels/inch: say 75=screen resolution */ fputc(0x00, stdout); fputc(75, stdout); - + /* unique id, could be anything */ fputc(0x01, stdout); fputc(0x02, stdout); fputc(0x03, stdout); fputc(0x04, stdout); - + /* x offset, always zero */ fputc(0x00, stdout); fputc(0x00, stdout); - + /* y offset, always zero */ fputc(0x00, stdout); fputc(0x00, stdout); - + /* dimensions 64k x 64k max */ fputc((unsigned char)((width >> 8) & 0x00ff), stdout); fputc((unsigned char)(width & 0x00ff), stdout); fputc((unsigned char)((height >> 8) & 0x00ff), stdout); fputc((unsigned char)(height & 0x00ff), stdout); - + /* depth */ fputc(0x00, stdout); fputc((unsigned char)depth, stdout); - + /* compressed, 0=uncompressed, 1=compressed */ fputc(0x00, stdout); - + /* format, mono/gray = 0x20000000, RGB=0x29000000 */ if (depth == 1) fputc(0x20, stdout); @@ -125,7 +124,7 @@ leaf_writeimg(unsigned int const width, fputc(0x00, stdout); fputc(0x00, stdout); fputc(0x00, stdout); - + /* colormap size */ if (depth == 8) { unsigned int i; @@ -139,10 +138,10 @@ leaf_writeimg(unsigned int const width, fputc((unsigned char) Green[i]*255/maxval, stdout); for (i = 0; i < 256; ++i) fputc((unsigned char) Blue[i]*255/maxval, stdout); - + for (row=0; row < height; ++row) { unsigned int col; - for (col = 0; col < width; ++col) + for (col = 0; col < width; ++col) fputc(GetPixel(col, row), stdout); if ((width % 2) != 0) fputc(0x00, stdout); /* pad to 2-bytes */ @@ -180,18 +179,18 @@ leaf_writeimg(unsigned int const width, fputc(0x00, stdout); fputc(0x00, stdout); - + for (row = 0; row < height; ++row) { unsigned int col; - for (col = 0; col < width; ++col) + for (col = 0; col < width; ++col) fputc(pixels[row][col].r * 255 / maxval, stdout); if (width % 2 != 0) fputc(0x00, stdout); /* pad to 2-bytes */ - for (col = 0; col < width; ++col) + for (col = 0; col < width; ++col) fputc(pixels[row][col].g * 255 / maxval, stdout); if (width % 2 != 0) fputc(0x00, stdout); /* pad to 2-bytes */ - for (col = 0; col < width; ++col) + for (col = 0; col < width; ++col) fputc(pixels[row][col].b * 255 / maxval, stdout); if (width % 2 != 0) fputc(0x00, stdout); /* pad to 2-bytes */ @@ -212,24 +211,24 @@ main(int argc, const char * argv[]) { pixval maxval; colorhist_vector chv; const char * const usage = "[ppmfile]"; - + pm_proginit(&argc, argv); - + argn = 1; - + if (argn < argc) { ifP = pm_openr(argv[argn]); argn++; } else ifP = stdin; - + if (argn != argc) pm_usage(usage); - + pixels = ppm_readppm(ifP, &cols, &rows, &maxval); - + pm_close(ifP); - + /* Figure out the colormap. */ pm_message("Computing colormap..."); chv = ppm_computecolorhist(pixels, cols, rows, MAXCOLORS, &colors); @@ -237,14 +236,14 @@ main(int argc, const char * argv[]) { unsigned int i; pm_message("... Done. %u colors found.", colors); - + for (i = 0; i < colors; ++i) { Red[i] = (int) PPM_GETR( chv[i].color); Green[i] = (int) PPM_GETG( chv[i].color); Blue[i] = (int) PPM_GETB( chv[i].color); } BitsPerPixel = colorstobpp(colors); - + /* And make a hash table for fast lookup. */ cht = ppm_colorhisttocolorhash(chv, colors); ppm_freecolorhist(chv); @@ -252,8 +251,11 @@ main(int argc, const char * argv[]) { BitsPerPixel = 24; pm_message(" ... Done. 24-bit true color %u color image.", colors); } - + leaf_writeimg(cols, rows, BitsPerPixel, colors, maxval); - + return 0; } + + + diff --git a/converter/ppm/ppmtomitsu.c b/converter/ppm/ppmtomitsu.c index e1f6990c..8fb7cddd 100644 --- a/converter/ppm/ppmtomitsu.c +++ b/converter/ppm/ppmtomitsu.c @@ -761,3 +761,6 @@ main(int argc, const char ** argv) { pm_close(ifP); return 0; } + + + diff --git a/converter/ppm/ppmtompeg/bframe.c b/converter/ppm/ppmtompeg/bframe.c index fb546cc0..8bce3e14 100644 --- a/converter/ppm/ppmtompeg/bframe.c +++ b/converter/ppm/ppmtompeg/bframe.c @@ -114,7 +114,6 @@ halfMotion(motion const motion) { - /*===========================================================================* * * compute the block resulting from motion compensation @@ -439,7 +438,6 @@ MotionSufficient(MpegFrame * const curr, - struct stats { int IBlocks; int BBlocks; @@ -1156,6 +1154,7 @@ SetBQScale(qB) } + /*===========================================================================* * * GetBQScale @@ -1174,6 +1173,7 @@ GetBQScale() } + /*===========================================================================* * * ResetBFrameStats @@ -1326,6 +1326,7 @@ ComputeBMotionLumBlock(MpegFrame * const prev, } + /*===========================================================================* * * estimate the seconds to compute a B-frame @@ -1344,3 +1345,4 @@ EstimateSecondsPerBFrame() { } + diff --git a/converter/ppm/ppmtompeg/bitio.c b/converter/ppm/ppmtompeg/bitio.c index 79c9f36f..b95f1ce1 100644 --- a/converter/ppm/ppmtompeg/bitio.c +++ b/converter/ppm/ppmtompeg/bitio.c @@ -133,6 +133,7 @@ Dump(BitBucket * const bbPtr) { } + /*=====================* * EXPORTED PROCEDURES * *=====================*/ @@ -217,6 +218,7 @@ Bitio_Free(BitBucket * const bbPtr) { } + /*===========================================================================* * * Bitio_Write @@ -318,6 +320,7 @@ Bitio_Write(BitBucket * const bbPtr, } + /*===========================================================================* * * Bitio_Flush @@ -516,6 +519,7 @@ Bitio_WriteToSocket(BitBucket * const bbPtr, } + /*===========================================================================* * * Bitio_BytePad @@ -534,3 +538,6 @@ Bitio_BytePad(BitBucket * const bbPtr) { Bitio_Write(bbPtr, 0, lastPtrPtr->bitsleftcur % 8); } } + + + diff --git a/converter/ppm/ppmtompeg/block.c b/converter/ppm/ppmtompeg/block.c index 23396b4c..db8dc277 100644 --- a/converter/ppm/ppmtompeg/block.c +++ b/converter/ppm/ppmtompeg/block.c @@ -42,6 +42,8 @@ halfVector(vector const v) { return half; } + + /*===========================* * COMPUTE DCT OF DIFFERENCE * *===========================*/ @@ -361,6 +363,7 @@ ComputeMotionLumBlock(MpegFrame * const prevFrame, } + /*=======================* * BASIC ERROR FUNCTIONS * *=======================*/ @@ -691,6 +694,7 @@ AddMotionBlock(Block block, } + /*===========================================================================* * * adds the motion-compensated B-frame block to the given block @@ -734,6 +738,7 @@ AddBMotionBlock(Block block, } + /*===========================================================================* * * copies the given block into the appropriate data area @@ -764,6 +769,7 @@ BlockToData(uint8 ** const data, } + /*===========================================================================* * * copies data into appropriate blocks @@ -834,6 +840,7 @@ BlockifyFrame(MpegFrame * const frameP) { } + /*===========================================================================* * * * UNUSED PROCEDURES * @@ -925,6 +932,7 @@ ComputeSubSampledMotionLumBlock(MpegFrame * const prevFrame, } + /*===========================================================================* * * return the MAD of the currentBlock and the motion-compensated block, @@ -1021,6 +1029,7 @@ LumMotionErrorSubSampled(LumBlock const currentBlock, } + #endif /* UNUSED_PROCEDURES */ /* * Copyright (c) 1995 The Regents of the University of California. diff --git a/converter/ppm/ppmtompeg/bsearch.c b/converter/ppm/ppmtompeg/bsearch.c index b825ef72..6d13ab34 100644 --- a/converter/ppm/ppmtompeg/bsearch.c +++ b/converter/ppm/ppmtompeg/bsearch.c @@ -116,6 +116,7 @@ SetBSearchAlg(const char * const alg) { } + /*===========================================================================* * * BSearchName @@ -256,6 +257,7 @@ FindBestMatchExhaust(const LumBlock * const blockP, } + /*===========================================================================* * * FindBestMatchTwoLevel @@ -587,6 +589,7 @@ FindBestMatchSubSample(const LumBlock * const blockP, } + /*===========================================================================* * * FindBestMatch @@ -775,6 +778,7 @@ BMotionSearchSimple(const LumBlock * const currentBlockP, } + /*===========================================================================* * * BMotionSearchCross2 @@ -863,6 +867,7 @@ BMotionSearchCross2(const LumBlock * const currentBlockP, } + /*===========================================================================* * * BMotionSearchExhaust @@ -1027,6 +1032,7 @@ BMotionSearch(const LumBlock * const currentBlockP, } + /*===========================================================================* * * * UNUSED PROCEDURES * @@ -1085,4 +1091,5 @@ ValidBMotion(by, bx, mode, fmy, fmx, bmy, bmx) } + #endif /* UNUSED_PROCEDURES */ diff --git a/converter/ppm/ppmtompeg/file.c b/converter/ppm/ppmtompeg/file.c index b81e8077..bc097452 100644 --- a/converter/ppm/ppmtompeg/file.c +++ b/converter/ppm/ppmtompeg/file.c @@ -301,3 +301,6 @@ MatchesGlob(char *string, char *glob) { return TRUE; } + + + diff --git a/converter/ppm/ppmtompeg/frame.c b/converter/ppm/ppmtompeg/frame.c index 09e35410..81c1ff9f 100644 --- a/converter/ppm/ppmtompeg/frame.c +++ b/converter/ppm/ppmtompeg/frame.c @@ -395,6 +395,7 @@ Frame_Init(unsigned int const numOfFramesRequested) { } + /*===========================================================================* * * FreeFrame @@ -495,6 +496,7 @@ Frame_Exit(void) { } + /*===========================================================================* * * Frame_Free @@ -845,3 +847,4 @@ Frame_Resize(MpegFrame * const omf, } + diff --git a/converter/ppm/ppmtompeg/frametype.c b/converter/ppm/ppmtompeg/frametype.c index 78e324d0..ff45564b 100644 --- a/converter/ppm/ppmtompeg/frametype.c +++ b/converter/ppm/ppmtompeg/frametype.c @@ -187,6 +187,7 @@ FType_PastRef(currFrameNum) } + /*===========================================================================* * * SetFramePattern diff --git a/converter/ppm/ppmtompeg/fsize.c b/converter/ppm/ppmtompeg/fsize.c index 84772719..83b383e4 100644 --- a/converter/ppm/ppmtompeg/fsize.c +++ b/converter/ppm/ppmtompeg/fsize.c @@ -94,6 +94,7 @@ Fsize_Validate(int * const xP, } + /*===========================================================================* * * Fsize_Note @@ -132,3 +133,6 @@ Fsize_Note(int const id, } #endif } + + + diff --git a/converter/ppm/ppmtompeg/gethostname.c b/converter/ppm/ppmtompeg/gethostname.c index 649fff91..dedb3129 100644 --- a/converter/ppm/ppmtompeg/gethostname.c +++ b/converter/ppm/ppmtompeg/gethostname.c @@ -26,3 +26,6 @@ GetHostName(void) { return strdup(utsname.nodename); } + + + diff --git a/converter/ppm/ppmtompeg/gethostname_win32.c b/converter/ppm/ppmtompeg/gethostname_win32.c index b831e22d..2e03476d 100644 --- a/converter/ppm/ppmtompeg/gethostname_win32.c +++ b/converter/ppm/ppmtompeg/gethostname_win32.c @@ -30,6 +30,8 @@ pushString(push_string_t *p, const char *fmt, ...) va_end(args); } + + #if _WIN32_WINNT < 0x0600 /* * Reference available here: @@ -371,6 +373,8 @@ get_string_version(push_string_t *str) return TRUE; } + + const char * GetHostName(void) { @@ -389,6 +393,8 @@ GetHostName(void) return (const char *)_strdup(str.str); } + + #ifdef GETHOSTNAME_LOCAL_DEBUG int WINAPI WinMain(HINSTANCE hCurInst, HINSTANCE hPrevInst, LPSTR lpsCmdLine, int nCmdShow) diff --git a/converter/ppm/ppmtompeg/headers/frames.h b/converter/ppm/ppmtompeg/headers/frames.h index 9108ac21..88638690 100644 --- a/converter/ppm/ppmtompeg/headers/frames.h +++ b/converter/ppm/ppmtompeg/headers/frames.h @@ -125,6 +125,8 @@ MotionToFrameCoord(int const by, *xP = bx * DCTSIZE + mx; } + + #define COORD_IN_FRAME(fy,fx, type) \ ((type == LUM_BLOCK) ? \ ((fy >= 0) && (fx >= 0) && (fy < Fsize_y) && (fx < Fsize_x)) : \ @@ -175,6 +177,7 @@ encodeMotionVector(int const x, } + #define DoQuant(bit, src, dest) \ if (pattern & bit) { \ switch (Mpost_QuantZigBlock(src, dest, QScale, FALSE)) { \ diff --git a/converter/ppm/ppmtompeg/iframe.c b/converter/ppm/ppmtompeg/iframe.c index 81ff0ec0..2bc50196 100644 --- a/converter/ppm/ppmtompeg/iframe.c +++ b/converter/ppm/ppmtompeg/iframe.c @@ -983,3 +983,6 @@ int32 time_elapsed(void) { return timeBuffer.tms_utime + timeBuffer.tms_stime; #endif } + + + diff --git a/converter/ppm/ppmtompeg/input.c b/converter/ppm/ppmtompeg/input.c index e12b0d4c..83aa387c 100644 --- a/converter/ppm/ppmtompeg/input.c +++ b/converter/ppm/ppmtompeg/input.c @@ -415,6 +415,7 @@ processSimpleFileName(const char * const input, } + #define INPUT_ENTRY_BLOCK_SIZE 128 void diff --git a/converter/ppm/ppmtompeg/jpeg.c b/converter/ppm/ppmtompeg/jpeg.c index 4540f6f0..6680404b 100644 --- a/converter/ppm/ppmtompeg/jpeg.c +++ b/converter/ppm/ppmtompeg/jpeg.c @@ -339,7 +339,6 @@ JMovie2JPEG(const char * const infilename, - /*===========================================================================* * * ReadJPEG contributed by James Arthur Boucher of Boston University's diff --git a/converter/ppm/ppmtompeg/jrevdct.c b/converter/ppm/ppmtompeg/jrevdct.c index ebadb997..f46051bc 100644 --- a/converter/ppm/ppmtompeg/jrevdct.c +++ b/converter/ppm/ppmtompeg/jrevdct.c @@ -179,6 +179,8 @@ mpeg_jrevdct(data) else mpeg_jrevdct_quick(data); } + + /* * Perform the inverse DCT on one block of coefficients. */ @@ -1179,6 +1181,7 @@ mpeg_jrevdct_quick(data) } + /* here is the reference one, in case of problems with the normal one */ /* idctref.c, Inverse Discrete Fourier Transform, double precision */ @@ -1273,3 +1276,6 @@ int16 *block; block[8*i+j] = (v<-256) ? -256 : ((v>255) ? 255 : v); } } + + + diff --git a/converter/ppm/ppmtompeg/memory.c b/converter/ppm/ppmtompeg/memory.c index 0ebe4686..8c272707 100644 --- a/converter/ppm/ppmtompeg/memory.c +++ b/converter/ppm/ppmtompeg/memory.c @@ -59,13 +59,20 @@ char *MemAlloc(size_t size) return malloc(size); } + + void MemFree(char *ptr, long bytes) { totalMemory -= bytes; free(ptr); } + + void PrintMaxMemory(void) { fprintf(stdout, "MMMMM-----MAX MEMORY-----MMMMM = %ld\n", maxMemory); } + + + diff --git a/converter/ppm/ppmtompeg/mfwddct.c b/converter/ppm/ppmtompeg/mfwddct.c index 8b379cd8..1355ef91 100644 --- a/converter/ppm/ppmtompeg/mfwddct.c +++ b/converter/ppm/ppmtompeg/mfwddct.c @@ -326,6 +326,7 @@ mp_fwd_dct_fast(data2d, dest2d) } + extern boolean pureDCT; void mp_fwd_dct_block2(data, dest) @@ -348,6 +349,8 @@ mp_fwd_dct_block2(data, dest) else mp_fwd_dct_fast(data, dest); } + + /* Modifies from the MPEG2 verification coder */ /* fdctref.c, forward discrete cosine transform, double precision */ diff --git a/converter/ppm/ppmtompeg/mheaders.c b/converter/ppm/ppmtompeg/mheaders.c index 7e5db6c1..54dada83 100644 --- a/converter/ppm/ppmtompeg/mheaders.c +++ b/converter/ppm/ppmtompeg/mheaders.c @@ -429,6 +429,7 @@ GenMBType(bbPtr, pict_code_type, mb_quant, motion_forw, motion_back, } + /*===========================================================================* * * GenMotionCode @@ -459,6 +460,7 @@ GenMotionCode(BitBucket * const bbPtr, } + /*===========================================================================* * * GenBlockPattern @@ -485,6 +487,7 @@ GenBlockPattern(bbPtr, mb_pattern) } + /*===========================================================================* * * GenMBAddrIncr @@ -512,6 +515,7 @@ GenMBAddrIncr(bbPtr, addr_incr) } + /*===========================================================================* * * GenPictHead @@ -624,6 +628,7 @@ GenPictHead(bbPtr, temp_ref, code_type, vbv_delay, full_pel_forw_flag, } + /*=====================* * EXPORTED PROCEDURES * *=====================*/ @@ -649,6 +654,7 @@ SetGOPStartTime(index) } + /*===========================================================================* * * Mhead_GenPictureHeader @@ -688,6 +694,7 @@ Mhead_GenPictureHeader(bbPtr, frameType, pictCount, f_code) } + /*===========================================================================* * * Mhead_GenSequenceHeader @@ -849,6 +856,7 @@ Mhead_GenSequenceHeader(BitBucket * const bbPtr, } + /*===========================================================================* * * Mhead_GenSequenceEnder @@ -869,6 +877,7 @@ Mhead_GenSequenceEnder(bbPtr) } + /*===========================================================================* * * Mhead_GenGOPHeader @@ -967,6 +976,7 @@ Mhead_GenGOPHeader(bbPtr, drop_frame_flag, tc_hrs, tc_min, tc_sec, tc_pict, } + /*===========================================================================* * * Mhead_GenSliceHeader @@ -1010,6 +1020,7 @@ Mhead_GenSliceHeader(bbPtr, verticalPos, qscale, extra_info, extra_info_size) } + /*===========================================================================* * * Mhead_GenSliceEnder @@ -1030,6 +1041,7 @@ Mhead_GenSliceEnder(bbPtr) } + /*===========================================================================* * * Mhead_GenMBHeader @@ -1158,6 +1170,7 @@ if ( addr_incr != 1 ) } + #ifdef UNUSED_PROCEDURES /* GenMBEnd only used for `D` pictures. Shouldn't really ever be called. */ @@ -1169,4 +1182,6 @@ GenMBEnd(bbPtr) Bitio_Write(bbPtr, 0x01, 1); } + + #endif /* UNUSED_PROCEDURES */ diff --git a/converter/ppm/ppmtompeg/moutput.c b/converter/ppm/ppmtompeg/moutput.c index 765a2b6f..bc7fb2b6 100644 --- a/converter/ppm/ppmtompeg/moutput.c +++ b/converter/ppm/ppmtompeg/moutput.c @@ -167,6 +167,7 @@ void UnQuantZig(FlatBlock in, Block out, int qscale, boolean iblock) } + /* * -------------------------------------------------------------- * @@ -335,6 +336,7 @@ void mp_rle_huff_block(FlatBlock in, BitBucket *out) } + /* * -------------------------------------------------------------- * @@ -440,3 +442,6 @@ void mp_rle_huff_pblock(FlatBlock in, BitBucket *out) DBG_PRINT(("End of block\n")); Bitio_Write(out, 0x2, 2); /* end of block marker */ } + + + diff --git a/converter/ppm/ppmtompeg/mpeg.c b/converter/ppm/ppmtompeg/mpeg.c index e67eec1e..ff8c6035 100644 --- a/converter/ppm/ppmtompeg/mpeg.c +++ b/converter/ppm/ppmtompeg/mpeg.c @@ -285,7 +285,6 @@ SetBitRateFileName(const char * const fileName) { - static void finishFrameOutput(MpegFrame * const frameP, BitBucket * const bbP, @@ -316,7 +315,6 @@ finishFrameOutput(MpegFrame * const frameP, - static void outputIFrame(MpegFrame * const frameP, BitBucket * const bbP, @@ -1241,6 +1239,7 @@ SetStatFileName(const char * const fileName) { } + /*===========================================================================* * * SetGOPSize @@ -1260,6 +1259,7 @@ SetGOPSize(size) } + /*===========================================================================* * * PrintStartStats @@ -1463,6 +1463,7 @@ SetFrameRate() } + /*=====================* * INTERNAL PROCEDURES * *=====================*/ diff --git a/converter/ppm/ppmtompeg/mquant.c b/converter/ppm/ppmtompeg/mquant.c index 99b1cb8e..0251a142 100644 --- a/converter/ppm/ppmtompeg/mquant.c +++ b/converter/ppm/ppmtompeg/mquant.c @@ -42,3 +42,6 @@ void mp_quant_block(Block in, Block out) { out[i][7] = in[i][7] / qtable[i][7]; } } + + + diff --git a/converter/ppm/ppmtompeg/nojpeg.c b/converter/ppm/ppmtompeg/nojpeg.c index 5b86ab56..dc1b222e 100644 --- a/converter/ppm/ppmtompeg/nojpeg.c +++ b/converter/ppm/ppmtompeg/nojpeg.c @@ -52,6 +52,7 @@ JMovie2JPEG(const char * const infilename, } + void ReadJPEG(MpegFrame * const mf, FILE * const fp) { @@ -59,3 +60,6 @@ ReadJPEG(MpegFrame * const mf, pm_error("This program has not been built with the " "ability to handle JPEG input files"); } + + + diff --git a/converter/ppm/ppmtompeg/noparallel.c b/converter/ppm/ppmtompeg/noparallel.c index 02c46a58..d21f3e9a 100644 --- a/converter/ppm/ppmtompeg/noparallel.c +++ b/converter/ppm/ppmtompeg/noparallel.c @@ -92,6 +92,7 @@ SetParallelPerfect(boolean const val) { } + void SetRemoteShell(const char * const shell) { /* do nothing -- this may be called during non-parallel execution */ @@ -228,3 +229,6 @@ GetRemoteDecodedRefFrame(MpegFrame * const frame, pm_error("This version of Ppmtompeg cannot run parallel mode because " "it does not have socket capability."); } + + + diff --git a/converter/ppm/ppmtompeg/opts.c b/converter/ppm/ppmtompeg/opts.c index 6f5f9816..9d750c54 100644 --- a/converter/ppm/ppmtompeg/opts.c +++ b/converter/ppm/ppmtompeg/opts.c @@ -157,7 +157,6 @@ SetupCollectQuantStats(const char * const charPtr) - /*===========================================================================* * * SetupKillDimAreas @@ -223,6 +222,7 @@ SetupSquashSmall(const char * const charPtr) } + /*===========================================================================* * * SetupLocalDCT @@ -254,6 +254,7 @@ SetupLocalDCT(const char * const charPtr) } + /*===========================================================================* * * SetupLaplace @@ -290,6 +291,8 @@ SetupLaplace() } } + + static void SetupWriteDistortions(const char * const charPtr) { @@ -341,6 +344,8 @@ SetupWriteDistortions(const char * const charPtr) }} } + + /*=====================* * EXPORTED PROCEDURES * *=====================*/ @@ -361,6 +366,7 @@ CalcLambdas(void) { } + /*===========================================================================* * * Mpost_UnQuantZigBlockLaplace @@ -424,6 +430,8 @@ Mpost_UnQuantZigBlockLaplace(in, out, qscale, iblock) } } + + int mse(Block blk1, Block blk2) { @@ -442,7 +450,6 @@ mse(Block blk1, Block blk2) - /*===========================================================================* * * Tune_Init @@ -489,6 +496,8 @@ void Tune_Init() } + + /*===========================================================================* * * ParseTuneParam @@ -545,3 +554,4 @@ void ParseTuneParam(const char * const charPtr) } + diff --git a/converter/ppm/ppmtompeg/parallel.c b/converter/ppm/ppmtompeg/parallel.c index b24764d6..fb0f2fe9 100644 --- a/converter/ppm/ppmtompeg/parallel.c +++ b/converter/ppm/ppmtompeg/parallel.c @@ -324,6 +324,7 @@ static void } + /*===========================================================================* * * NotifyDecodeServerReady @@ -446,6 +447,7 @@ int id; } + /*===========================================================================* * * SendDecodedFrame @@ -484,6 +486,7 @@ SendDecodedFrame(MpegFrame * const frameP) { } + /*===========================================================================* * * GetRemoteDecodedFrame @@ -524,6 +527,7 @@ GetRemoteDecodedRefFrame(MpegFrame * const frameP, } + /********* routines handling forks, execs, PIDs and signals save, system-style forks @@ -559,6 +563,8 @@ static void cleanup_fork( dummy ) /* try to kill all child processes */ } } + + /*===========================================================================* * * safe_fork @@ -611,6 +617,7 @@ static int safe_fork(command) /* fork child process and remember its PID * } + /*=====================* * EXPORTED PROCEDURES * *=====================*/ @@ -638,6 +645,7 @@ SetIOConvert(boolean const separate) { } + /*===========================================================================* * * SetParallelPerfect @@ -657,6 +665,7 @@ SetParallelPerfect(boolean val) } + /*===========================================================================* * * SetRemoteShell @@ -675,6 +684,7 @@ SetRemoteShell(const char * const shell) { } + static void decodedFrameToDisk(int const otherSock) { /*---------------------------------------------------------------------------- @@ -1146,6 +1156,7 @@ GetRemoteFrame(MpegFrame * const frameP, } + struct combineControl { unsigned int numFrames; }; @@ -1323,6 +1334,7 @@ CombineServer(int const numFrames, } + /*=====================* * MASTER SERVER STUFF * *=====================*/ diff --git a/converter/ppm/ppmtompeg/param.c b/converter/ppm/ppmtompeg/param.c index 9499b4ea..3408c6fc 100644 --- a/converter/ppm/ppmtompeg/param.c +++ b/converter/ppm/ppmtompeg/param.c @@ -241,6 +241,7 @@ ReadMachineNames(FILE * const fpointer) } + /*===========================================================================* * * GetFrameRate @@ -1044,6 +1045,7 @@ ReadParamFile(const char * const fileName, } + /* * Copyright (c) 1995 The Regents of the University of California. * All rights reserved. diff --git a/converter/ppm/ppmtompeg/pframe.c b/converter/ppm/ppmtompeg/pframe.c index d61848b1..89aab874 100644 --- a/converter/ppm/ppmtompeg/pframe.c +++ b/converter/ppm/ppmtompeg/pframe.c @@ -75,6 +75,8 @@ halfVector(vector const vector) { return half; } + + /*===========================================================================* * * decide if (0,0) motion is better than the given motion vector @@ -120,6 +122,7 @@ ZeroMotionBetter(const LumBlock * const currentBlockP, } + /*===========================================================================* * * USER-MODIFIABLE @@ -851,6 +854,7 @@ GenPFrame(BitBucket * const bb, } + /*===========================================================================* * * ResetPFrameStats @@ -876,6 +880,7 @@ void } + /*===========================================================================* * * SetPQScale @@ -895,6 +900,7 @@ int qP; } + /*===========================================================================* * * GetPQScale @@ -913,6 +919,7 @@ int } + float PFrameTotalTime(void) { return (float)totalTime/(float)TIME_RATE; @@ -992,6 +999,7 @@ float } + /*===========================================================================* * * ComputeHalfPixelData @@ -1048,6 +1056,7 @@ MpegFrame *frame; } + /* * Copyright (c) 1995 The Regents of the University of California. * All rights reserved. diff --git a/converter/ppm/ppmtompeg/postdct.c b/converter/ppm/ppmtompeg/postdct.c index 68712963..f3de075a 100644 --- a/converter/ppm/ppmtompeg/postdct.c +++ b/converter/ppm/ppmtompeg/postdct.c @@ -261,6 +261,7 @@ Mpost_UnQuantZigBlock(in, out, qscale, iblock) } + /*===========================================================================* * * Mpost_QuantZigBlock @@ -460,6 +461,7 @@ Mpost_RLEHuffIBlock(in, out) } + /*===========================================================================* * * Mpost_RLEHuffPBlock @@ -565,6 +567,7 @@ Mpost_RLEHuffPBlock(in, out) } + /*===========================================================================* * * CalcRLEHuffLength @@ -624,3 +627,6 @@ CalcRLEHuffLength(in) countbits += 2; /* end of block marker */ return countbits; } + + + diff --git a/converter/ppm/ppmtompeg/ppmtompeg.c b/converter/ppm/ppmtompeg/ppmtompeg.c index cc2cb27e..78e33c54 100644 --- a/converter/ppm/ppmtompeg/ppmtompeg.c +++ b/converter/ppm/ppmtompeg/ppmtompeg.c @@ -402,7 +402,6 @@ encodeSomeFrames(struct inputSource * const inputSourceP, - static void encodeFrames(struct inputSource * const inputSourceP, boolean const childProcess, @@ -507,7 +506,6 @@ encodeFrames(struct inputSource * const inputSourceP, - static void runMaster(struct inputSource * const inputSourceP, const char * const paramFileName, @@ -708,3 +706,6 @@ main(int argc, char **argv) { return 0; } + + + diff --git a/converter/ppm/ppmtompeg/psearch.c b/converter/ppm/ppmtompeg/psearch.c index de3d3e26..c82ad4ad 100644 --- a/converter/ppm/ppmtompeg/psearch.c +++ b/converter/ppm/ppmtompeg/psearch.c @@ -135,6 +135,7 @@ SetPixelSearch(const char * const searchType) { } + /*===========================================================================* * * SetPSearchAlg @@ -164,6 +165,7 @@ SetPSearchAlg(const char * const alg) } + /*===========================================================================* * * PSearchName @@ -198,6 +200,7 @@ PSearchName(void) } + /*===========================================================================* * * SetSearchRange @@ -232,6 +235,7 @@ SetSearchRange(int const pixelsP, int const pixelsB) { } + /*===========================================================================* * * USER-MODIFIABLE @@ -252,6 +256,7 @@ MotionSearchPreComputation(MpegFrame * const frameP) { } + /*===========================================================================* * * PSubSampleSearch @@ -649,6 +654,7 @@ PLocalSearch(const LumBlock * const currentBlockP, } + /*===========================================================================* * * PTwoLevelSearch @@ -837,6 +843,7 @@ ShowPMVHistogram(fpointer) } + void ShowBBMVHistogram(fpointer) FILE *fpointer; @@ -884,6 +891,7 @@ ShowBBMVHistogram(fpointer) } + void ShowBFMVHistogram(fpointer) FILE *fpointer; @@ -931,6 +939,7 @@ ShowBFMVHistogram(fpointer) } + /* * Copyright (c) 1995 The Regents of the University of California. * All rights reserved. diff --git a/converter/ppm/ppmtompeg/qtest.c b/converter/ppm/ppmtompeg/qtest.c index 85eda2c8..15e4e197 100644 --- a/converter/ppm/ppmtompeg/qtest.c +++ b/converter/ppm/ppmtompeg/qtest.c @@ -61,3 +61,6 @@ main() printf("Huffman output is %d bits\n", bb->totalbits); } + + + diff --git a/converter/ppm/ppmtompeg/rate.c b/converter/ppm/ppmtompeg/rate.c index 26c30ffe..4237427e 100644 --- a/converter/ppm/ppmtompeg/rate.c +++ b/converter/ppm/ppmtompeg/rate.c @@ -316,6 +316,8 @@ initRateControl(bool const wantUnderflowWarning, return result; } + + /*===========================================================================* * * initGOPRateControl @@ -464,7 +466,6 @@ targetRateControl(MpegFrame * const frame) { - static void updateVBVBuffer(int const frameBits) { /*---------------------------------------------------------------------------- @@ -580,6 +581,7 @@ updateRateControl(int const type) { } + /*===========================================================================* * * MB_RateOut @@ -647,6 +649,7 @@ void incNumBlocks(num) } + /*===========================================================================* * * incMacroBlockBits() @@ -670,6 +673,7 @@ void incMacroBlockBits(num) } + /*===========================================================================* * * needQScaleChange(current Q scale, 4 luminance blocks) @@ -707,6 +711,7 @@ int needQScaleChange(oldQScale, blk0, blk1, blk2, blk3) } + /*===========================================================================* * * determineMBCount() @@ -761,6 +766,7 @@ void checkBufferFullness (oldQScale) } + /*===========================================================================* * * void checkSpatialActivity() @@ -845,7 +851,6 @@ void checkSpatialActivity(blk0, blk1, blk2, blk3) - /*============================================================================* * * getRateMode () @@ -864,6 +869,7 @@ int getRateMode() } + /*===========================================================================* * * setBitRate () @@ -921,7 +927,6 @@ int getBitRate () - /*===========================================================================* * * setBufferSize () @@ -954,6 +959,7 @@ void setBufferSize (const char * const charPtr) } + /*===========================================================================* * * getBufferSize () diff --git a/converter/ppm/ppmtompeg/readframe.c b/converter/ppm/ppmtompeg/readframe.c index dcc02052..85f432d8 100644 --- a/converter/ppm/ppmtompeg/readframe.c +++ b/converter/ppm/ppmtompeg/readframe.c @@ -386,6 +386,7 @@ SetFileType(const char * const conversion) } + /*===========================================================================* * * SetFileFormat @@ -558,6 +559,8 @@ ReadEYUV(mf, fpointer, width, height) /* ignore leftover stuff on the bottom */ } + + /*===========================================================================* * * ReadAYUV @@ -616,6 +619,8 @@ ReadAYUV(mf, fpointer, width, height) } + + /*===========================================================================* * * SeparateLine @@ -702,6 +707,7 @@ SeparateLine(fpointer, lineptr, width) } + /*===========================================================================* * * ReadY @@ -749,6 +755,7 @@ ReadY(mf, fpointer, width, height) } + /*===========================================================================* * * ReadSub4 @@ -808,6 +815,7 @@ ReadSub4(mf, fpointer, width, height) } + /*=====================* * INTERNAL PROCEDURES * *=====================*/ @@ -846,7 +854,6 @@ int w,h; - /*===========================================================================* * * DoKillDim @@ -912,6 +919,7 @@ int w,h; } + /* * Copyright (c) 1995 The Regents of the University of California. * All rights reserved. diff --git a/converter/ppm/ppmtompeg/rgbtoycc.c b/converter/ppm/ppmtompeg/rgbtoycc.c index 9357c8d8..189003d7 100644 --- a/converter/ppm/ppmtompeg/rgbtoycc.c +++ b/converter/ppm/ppmtompeg/rgbtoycc.c @@ -108,6 +108,7 @@ compute_mult_tables(const pixval maxval) { } + /*=====================* * EXPORTED PROCEDURES * *=====================*/ @@ -202,3 +203,6 @@ PNMtoYUV(MpegFrame * const frameP, } } } + + + diff --git a/converter/ppm/ppmtompeg/specifics.c b/converter/ppm/ppmtompeg/specifics.c index e8597978..acf98116 100644 --- a/converter/ppm/ppmtompeg/specifics.c +++ b/converter/ppm/ppmtompeg/specifics.c @@ -247,6 +247,8 @@ FILE *fp; } + + /* Version 1 */ void Parse_Specifics_File_v1(fp) FILE *fp; @@ -442,7 +444,6 @@ Parse_Specifics_File_v2(FILE * const fP) { - /*================================================================= * * MakeFslEntry @@ -467,8 +468,6 @@ FrameSpecList *MakeFslEntry() - - /*================================================================ * * AddSlc @@ -503,8 +502,6 @@ int snum,qs; - - /*================================================================ * * AddBs @@ -544,9 +541,6 @@ int bnum,qs; - - - /*================================================================ * * SpecLookup @@ -685,6 +679,7 @@ int start_qs; } + /*================================================================ * * SpecTypeLookup @@ -718,3 +713,6 @@ int fn; #endif return tmp->frametype; } + + + diff --git a/converter/ppm/ppmtompeg/subsample.c b/converter/ppm/ppmtompeg/subsample.c index 93b76db0..e411feb4 100644 --- a/converter/ppm/ppmtompeg/subsample.c +++ b/converter/ppm/ppmtompeg/subsample.c @@ -199,6 +199,7 @@ LumMotionErrorB(const LumBlock * const currentBlockP, } + /*===========================================================================* * * LumMotionErrorC @@ -240,6 +241,7 @@ LumMotionErrorC(const LumBlock * const currentBlockP, } + /*===========================================================================* * * LumMotionErrorD @@ -279,3 +281,6 @@ LumMotionErrorD(const LumBlock * const currentBlockP, } return diff; } + + + diff --git a/converter/ppm/ppmtoneo.c b/converter/ppm/ppmtoneo.c index 5703c12a..d573e9e6 100644 --- a/converter/ppm/ppmtoneo.c +++ b/converter/ppm/ppmtoneo.c @@ -121,3 +121,6 @@ main(int argc, char *argv[] ) { exit( 0 ); } + + + diff --git a/converter/ppm/ppmtopi1.c b/converter/ppm/ppmtopi1.c index 64f836c7..896ec7f7 100644 --- a/converter/ppm/ppmtopi1.c +++ b/converter/ppm/ppmtopi1.c @@ -118,3 +118,6 @@ main( argc, argv ) exit( 0 ); } + + + diff --git a/converter/ppm/ppmtopjxl.c b/converter/ppm/ppmtopjxl.c index bac55750..daaf7d59 100644 --- a/converter/ppm/ppmtopjxl.c +++ b/converter/ppm/ppmtopjxl.c @@ -578,3 +578,4 @@ main(int argc, const char * argv[]) { } + diff --git a/converter/ppm/ppmtoppm.c b/converter/ppm/ppmtoppm.c index 500c9856..3a48eacc 100644 --- a/converter/ppm/ppmtoppm.c +++ b/converter/ppm/ppmtoppm.c @@ -20,7 +20,7 @@ main(int argc, char *argv[]) { pixval maxval; int row; pixel* pixelrow; - + ppm_init(&argc, argv); if (argc-1 != 0) @@ -42,3 +42,6 @@ main(int argc, char *argv[]) { exit(0); } + + + diff --git a/converter/ppm/ppmtopuzz.c b/converter/ppm/ppmtopuzz.c index 1277cc20..08b852b0 100644 --- a/converter/ppm/ppmtopuzz.c +++ b/converter/ppm/ppmtopuzz.c @@ -33,12 +33,12 @@ main( argc, argv ) ppm_init( &argc, argv ); if ( argc > 2 ) - pm_usage( "[ppmfile]" ); + pm_usage( "[ppmfile]" ); if ( argc == 2 ) - ifp = pm_openr( argv[1] ); + ifp = pm_openr( argv[1] ); else - ifp = stdin; + ifp = stdin; pixels = ppm_readppm( ifp, &cols, &rows, &maxval ); pm_close( ifp ); @@ -46,11 +46,11 @@ main( argc, argv ) pm_message( "computing colormap..." ); chv = ppm_computecolorhist( pixels, cols, rows, MAXCOLORS, &colors ); if ( chv == (colorhist_vector) 0 ) - { - pm_message( - "too many colors - try doing a 'pnmquant %d'", MAXCOLORS ); - exit( 1 ); - } + { + pm_message( + "too many colors - try doing a 'pnmquant %d'", MAXCOLORS ); + exit( 1 ); + } pm_message( "%d colors found", colors ); /* Write puzzle header. */ @@ -58,19 +58,19 @@ main( argc, argv ) (void) pm_writebiglong( stdout, rows ); (void) putchar( (unsigned char) colors ); if ( maxval > MAXVAL ) - pm_message( - "maxval is not %d - automatically rescaling colors", MAXVAL ); + pm_message( + "maxval is not %d - automatically rescaling colors", MAXVAL ); for ( i = 0; i < colors; ++i ) - { - pixel p; + { + pixel p; - p = chv[i].color; - if ( maxval != MAXVAL ) - PPM_DEPTH( p, p, maxval, MAXVAL ); - (void) putchar( (unsigned char) PPM_GETR( p ) ); - (void) putchar( (unsigned char) PPM_GETG( p ) ); - (void) putchar( (unsigned char) PPM_GETB( p ) ); - } + p = chv[i].color; + if ( maxval != MAXVAL ) + PPM_DEPTH( p, p, maxval, MAXVAL ); + (void) putchar( (unsigned char) PPM_GETR( p ) ); + (void) putchar( (unsigned char) PPM_GETG( p ) ); + (void) putchar( (unsigned char) PPM_GETB( p ) ); + } /* Convert color vector to color hash table, for fast lookup. */ cht = ppm_colorhisttocolorhash( chv, colors ); @@ -78,19 +78,22 @@ main( argc, argv ) /* And write out the data. */ for ( row = 0; row < rows; ++row ) - { - for ( col = 0, pP = pixels[row]; col < cols; ++col, ++pP ) - { - register int color; - - color = ppm_lookupcolor( cht, pP ); - if ( color == -1 ) - pm_error( - "color not found?!? row=%d col=%d r=%d g=%d b=%d", - row, col, PPM_GETR(*pP), PPM_GETG(*pP), PPM_GETB(*pP) ); - (void) putchar( (unsigned char) color ); - } - } + { + for ( col = 0, pP = pixels[row]; col < cols; ++col, ++pP ) + { + register int color; + + color = ppm_lookupcolor( cht, pP ); + if ( color == -1 ) + pm_error( + "color not found?!? row=%d col=%d r=%d g=%d b=%d", + row, col, PPM_GETR(*pP), PPM_GETG(*pP), PPM_GETB(*pP) ); + (void) putchar( (unsigned char) color ); + } + } exit( 0 ); } + + + diff --git a/converter/ppm/ppmtospu.c b/converter/ppm/ppmtospu.c index a6acbaa0..df0fb970 100644 --- a/converter/ppm/ppmtospu.c +++ b/converter/ppm/ppmtospu.c @@ -48,11 +48,11 @@ parseCommandLine(int argc, const char ** argv, MALLOCARRAY_NOFAIL(option_def, 100); option_def_index = 0; /* incremented by OPTENT3 */ - OPTENT3(0, "d0", OPT_FLAG, + OPTENT3(0, "d0", OPT_FLAG, NULL, &d0Spec, 0); - OPTENT3(0, "d2", OPT_FLAG, + OPTENT3(0, "d2", OPT_FLAG, NULL, &d2Spec, 0); - OPTENT3(0, "d4", OPT_FLAG, + OPTENT3(0, "d4", OPT_FLAG, NULL, &d4Spec, 0); opt.opt_table = option_def; @@ -72,7 +72,7 @@ parseCommandLine(int argc, const char ** argv, else cmdlineP->dithflag = 2; - if (argc-1 < 1) + if (argc-1 < 1) cmdlineP->inputFileName = "-"; else { cmdlineP->inputFileName = argv[1]; @@ -129,7 +129,7 @@ findIndex(unsigned int const col, Spectrum palette index. -----------------------------------------------------------------------------*/ int r, x1; - + x1 = 10 * index; /* initial value */ if (index & 0x1) x1 -= 5; @@ -143,7 +143,7 @@ findIndex(unsigned int const col, if (col >= (x1+160)) r += 32; - + return r; } @@ -183,7 +183,7 @@ dither(unsigned int const row, { 0, 2 }, { 3, 1 } }; - + unsigned int c[3]; /* An element for each plane */ unsigned int col; @@ -262,7 +262,7 @@ sort(struct PixelType * const pixelType, ++i; while (pixelType[j-1].popularity > pivot) --j; - + if (i < j) { /* An element not less popular than pivot is to the left of a pixel not more popular than pivot, so swap them. Note that we @@ -274,7 +274,7 @@ sort(struct PixelType * const pixelType, --j; } } - + if (j - left > 1) sort(pixelType, left, j); if (right - i > 1) @@ -445,7 +445,7 @@ convertRow(unsigned int const row, /* Mark palette entries as all free */ for (i = 0; i < 48; ++i) palP->pal[row][i] = -1; - + /* Mark reserved palette entries */ palP->pal[row][0] = palP->pal[row][15] = palP->pal[row][16] = 0; palP->pal[row][31] = palP->pal[row][32] = palP->pal[row][47] = 0; @@ -494,7 +494,7 @@ writeScreen(const short * const screen) { /* Write the bitmap */ unsigned int i; - + for (i = 0; i < 16000; ++i) { char const c0 = 0xff & (screen[i] >> 8); char const c1 = 0xff & screen[i]; diff --git a/converter/ppm/ppmtoterm.c b/converter/ppm/ppmtoterm.c index d388f77d..6e41a8cb 100644 --- a/converter/ppm/ppmtoterm.c +++ b/converter/ppm/ppmtoterm.c @@ -86,7 +86,7 @@ parseCommandLine(int argc, const char ** argv, static void -generatePalette(unsigned char rgb[NUM_COLORS][3], +generatePalette(unsigned char rgb[NUM_COLORS][3], char ansiCode[NUM_COLORS][MAX_ANSI_STR_LEN], unsigned int * const paletteSizeP) { /*---------------------------------------------------------------------------- @@ -150,7 +150,7 @@ generatePalette(unsigned char rgb[NUM_COLORS][3], static void lookupInPalette(pixel const pixel, pixval const maxval, - unsigned char rgb[NUM_COLORS][3], + unsigned char rgb[NUM_COLORS][3], unsigned int const palLen, unsigned int * const paletteIdxP) { /*---------------------------------------------------------------------------- @@ -166,7 +166,7 @@ lookupInPalette(pixel const pixel, unsigned int paletteIdxSoFar; unsigned int dist; unsigned int i; - + /* The following loop calculates the index that corresponds to the minimum color distance between the given RGB values and the values available in the palette. @@ -200,18 +200,18 @@ main(int argc, const char ** argv) { unsigned char rgb[NUM_COLORS][3]; char ansiCode[NUM_COLORS][MAX_ANSI_STR_LEN]; - pm_proginit(&argc, argv); + pm_proginit(&argc, argv); parseCommandLine(argc, argv, &cmdline); ifP = pm_openr(cmdline.inputFileName); - + pixels = ppm_readppm(ifP, &cols, &rows, &maxval); pm_close(ifP); - + generatePalette(rgb, ansiCode, &palLen); - + for (row = 0; row < rows; ++row) { unsigned int col; for (col = 0; col < cols; ++col) { @@ -227,6 +227,9 @@ main(int argc, const char ** argv) { printf(ESC "\x30m"); ppm_freearray(pixels, rows); - + return 0; } + + + diff --git a/converter/ppm/ppmtowinicon.c b/converter/ppm/ppmtowinicon.c index 04c1dadc..0e2751f3 100644 --- a/converter/ppm/ppmtowinicon.c +++ b/converter/ppm/ppmtowinicon.c @@ -888,3 +888,4 @@ main(int argc, const char ** argv) { } + diff --git a/converter/ppm/ppmtoxpm.c b/converter/ppm/ppmtoxpm.c index 4ef0ee8b..2167acb2 100644 --- a/converter/ppm/ppmtoxpm.c +++ b/converter/ppm/ppmtoxpm.c @@ -157,6 +157,7 @@ parseCommandLine(int argc, const char ** argv, } + typedef struct { /* Information for an XPM color map entry */ char *cixel; diff --git a/converter/ppm/ppmtoyuv.c b/converter/ppm/ppmtoyuv.c index 75f79c1e..3b6f873d 100644 --- a/converter/ppm/ppmtoyuv.c +++ b/converter/ppm/ppmtoyuv.c @@ -2,7 +2,7 @@ ** ** by Marc Boucher ** Internet: marc@PostImage.COM -** +** ** Based on Example Conversion Program, A60/A64 Digital Video Interface ** Manual, page 69. ** @@ -42,7 +42,7 @@ convertRow(const pixel * const pixelrow, pixval const r = PPM_GETR(pixelrow[col]); pixval const g = PPM_GETG(pixelrow[col]); pixval const b = PPM_GETB(pixelrow[col]); - + y1 = 16829 * r + 33039 * g + 6416 * b + (*y2CarryP & 0xffff); u1 = -4853 * r - 9530 * g + 14383 * b; v1 = 14386 * r - 12046 * g - 2340 * b; @@ -110,7 +110,7 @@ main(int argc, const char **argv) { ppm_readppmrow(ifP, pixelrow, cols, maxval, format); convertRow(pixelrow, cols, yuvBuf, &u, &v, &u0, &v0, &y2Carry); - + fwrite(yuvBuf, cols*2, 1, stdout); } @@ -118,3 +118,6 @@ main(int argc, const char **argv) { return 0; } + + + diff --git a/converter/ppm/ppmtoyuvsplit.c b/converter/ppm/ppmtoyuvsplit.c index eb89ad29..a8723e32 100644 --- a/converter/ppm/ppmtoyuvsplit.c +++ b/converter/ppm/ppmtoyuvsplit.c @@ -209,3 +209,6 @@ main(int argc, const char ** argv) { fclose(vf); return 0; } + + + diff --git a/converter/ppm/rawtoppm.c b/converter/ppm/rawtoppm.c index 44e856da..7ba579ef 100644 --- a/converter/ppm/rawtoppm.c +++ b/converter/ppm/rawtoppm.c @@ -201,7 +201,7 @@ main(int argc, const char * argv[]) { if ( argn + 2 > argc ) pm_usage( usage ); - + cols = pm_parse_width(argv[argn++]); rows = pm_parse_height(argv[argn++]); @@ -250,3 +250,6 @@ main(int argc, const char * argv[]) { exit( 0 ); } + + + diff --git a/converter/ppm/rgb3toppm.c b/converter/ppm/rgb3toppm.c index a666553c..00d76916 100644 --- a/converter/ppm/rgb3toppm.c +++ b/converter/ppm/rgb3toppm.c @@ -37,7 +37,7 @@ main( argc, argv ) ppm_init( &argc, argv ); if ( argc != 4 ) - pm_usage( "<red pgmfile> <green pgmfile> <blue pgmfile> " ); + pm_usage( "<red pgmfile> <green pgmfile> <blue pgmfile> " ); rfd = pm_openr( argv[1] ); gfd = pm_openr( argv[2] ); @@ -46,10 +46,10 @@ main( argc, argv ) pgm_readpgminit( rfd, &cols, &rows, &rmaxval, &rformat ); pgm_readpgminit( gfd, &tcols, &trows, &gmaxval, &gformat ); if ( tcols != cols || trows != rows ) - pm_error( "all three graymaps must be the same size" ); + pm_error( "all three graymaps must be the same size" ); pgm_readpgminit( bfd, &tcols, &trows, &bmaxval, &bformat ); if ( tcols != cols || trows != rows ) - pm_error( "all three graymaps must be the same size" ); + pm_error( "all three graymaps must be the same size" ); pmaxval = rmaxval; if ( gmaxval > pmaxval ) pmaxval = gmaxval; @@ -62,22 +62,22 @@ main( argc, argv ) pixelrow = ppm_allocrow( cols ); for ( row = 0; row < rows; row++ ) - { - pgm_readpgmrow( rfd, rrow, cols, rmaxval, rformat ); - pgm_readpgmrow( gfd, grow, cols, gmaxval, gformat ); - pgm_readpgmrow( bfd, brow, cols, bmaxval, bformat ); - - for ( col = 0, rP = rrow, gP = grow, bP = brow, pP = pixelrow; - col < cols; - ++col, ++rP, ++gP, ++bP, ++pP ) - { - if ( rmaxval != pmaxval ) *rP = (int) *rP * pmaxval / rmaxval; - if ( gmaxval != pmaxval ) *gP = (int) *gP * pmaxval / gmaxval; - if ( bmaxval != pmaxval ) *bP = (int) *bP * pmaxval / bmaxval; - PPM_ASSIGN( *pP, *rP, *gP, *bP ); - } - ppm_writeppmrow( stdout, pixelrow, cols, pmaxval, 0 ); - } + { + pgm_readpgmrow( rfd, rrow, cols, rmaxval, rformat ); + pgm_readpgmrow( gfd, grow, cols, gmaxval, gformat ); + pgm_readpgmrow( bfd, brow, cols, bmaxval, bformat ); + + for ( col = 0, rP = rrow, gP = grow, bP = brow, pP = pixelrow; + col < cols; + ++col, ++rP, ++gP, ++bP, ++pP ) + { + if ( rmaxval != pmaxval ) *rP = (int) *rP * pmaxval / rmaxval; + if ( gmaxval != pmaxval ) *gP = (int) *gP * pmaxval / gmaxval; + if ( bmaxval != pmaxval ) *bP = (int) *bP * pmaxval / bmaxval; + PPM_ASSIGN( *pP, *rP, *gP, *bP ); + } + ppm_writeppmrow( stdout, pixelrow, cols, pmaxval, 0 ); + } pm_close( rfd ); pm_close( gfd ); @@ -86,3 +86,6 @@ main( argc, argv ) exit( 0 ); } + + + diff --git a/converter/ppm/sldtoppm.c b/converter/ppm/sldtoppm.c index 2fef0233..e4cdfef1 100644 --- a/converter/ppm/sldtoppm.c +++ b/converter/ppm/sldtoppm.c @@ -244,6 +244,8 @@ scanDirectory(FILE * const slFileP, *foundP = found; } + + /* SLIDEFIND -- Find a slide in a library or, if DIRONLY is nonzero, print a directory listing of the library. If UCASEN is nonzero, the requested slide name is @@ -733,3 +735,6 @@ main(int argc, return 0; } + + + diff --git a/converter/ppm/spctoppm.c b/converter/ppm/spctoppm.c index d2a48187..a20fcfd4 100644 --- a/converter/ppm/spctoppm.c +++ b/converter/ppm/spctoppm.c @@ -41,19 +41,19 @@ main( argc, argv ) /* Check args. */ if ( argc > 2 ) - pm_usage( "[spcfile]" ); + pm_usage( "[spcfile]" ); if ( argc == 2 ) - ifp = pm_openr( argv[1] ); + ifp = pm_openr( argv[1] ); else - ifp = stdin; + ifp = stdin; /* Check SPC file header. */ c1 = getc( ifp ); c2 = getc( ifp ); if ( ( c1 != 'S' ) || ( c2 != 'P' ) ) - pm_error( "not a Spectrum picture" ); + pm_error( "not a Spectrum picture" ); /* Skip reserved bytes. */ getc( ifp ); @@ -78,35 +78,35 @@ main( argc, argv ) pixelrow = ppm_allocrow( COLS ); for ( row = 0; row < ROWS; ++row ) - { - for ( col = 0, pP = pixelrow; col < COLS; ++col, ++pP ) - { - int c, ind, b, plane, x1; - - /* Compute pixel value. */ - ind = ( 80 * row ) + ( ( col >> 4 ) << 2 ); - b = 0x8000 >> (col & 0xf); - c = 0; - for ( plane = 0; plane < 4; ++plane ) - if ( b & sscreen[ind+plane] ) - c |= (1 << plane); - - /* Compute palette index. */ - x1 = 10 * c; - if ( c & 1 ) - x1 -= 5; - else - ++x1; - if ( ( col >= x1 ) && ( col < ( x1 + 160 ) ) ) - c += 16; - if ( col >= ( x1 + 160 ) ) - c += 32; - - /* Store the proper color. */ - *pP = pal[row][c]; - } - ppm_writeppmrow( stdout, pixelrow, COLS, (pixval) MAXVAL, 0 ); - } + { + for ( col = 0, pP = pixelrow; col < COLS; ++col, ++pP ) + { + int c, ind, b, plane, x1; + + /* Compute pixel value. */ + ind = ( 80 * row ) + ( ( col >> 4 ) << 2 ); + b = 0x8000 >> (col & 0xf); + c = 0; + for ( plane = 0; plane < 4; ++plane ) + if ( b & sscreen[ind+plane] ) + c |= (1 << plane); + + /* Compute palette index. */ + x1 = 10 * c; + if ( c & 1 ) + x1 -= 5; + else + ++x1; + if ( ( col >= x1 ) && ( col < ( x1 + 160 ) ) ) + c += 16; + if ( col >= ( x1 + 160 ) ) + c += 32; + + /* Store the proper color. */ + *pP = pal[row][c]; + } + ppm_writeppmrow( stdout, pixelrow, COLS, (pixval) MAXVAL, 0 ); + } pm_close( stdout ); @@ -123,7 +123,7 @@ DoBitmap( ifp ) /* Zero out first scan line. */ for ( i = 0; i < 160; ++i ) - screen[i] = 0; + screen[i] = 0; /* 'count' counts number of input bytes. */ count = 0; @@ -132,37 +132,37 @@ DoBitmap( ifp ) data = 0; while ( count < bitmap_length ) - { - /* Get next record header. */ - h = getc( ifp ); - ++count; - - if ( ( h >= 0 ) && ( count < bitmap_length ) ) - { - for ( i = 0; i <= h; ++i ) - { - c = getc( ifp ); - ++count; - DoChar( data, c ); - ++data; - } - } - else if ( ( h < 0 ) && ( count < bitmap_length ) ) - { - c = getc( ifp ); - ++count; - - for ( i = 0; i < ( 2 - h ); ++i ) - { - DoChar( data, c ); - ++data; - } - } + { + /* Get next record header. */ + h = getc( ifp ); + ++count; + + if ( ( h >= 0 ) && ( count < bitmap_length ) ) + { + for ( i = 0; i <= h; ++i ) + { + c = getc( ifp ); + ++count; + DoChar( data, c ); + ++data; + } + } + else if ( ( h < 0 ) && ( count < bitmap_length ) ) + { + c = getc( ifp ); + ++count; + + for ( i = 0; i < ( 2 - h ); ++i ) + { + DoChar( data, c ); + ++data; + } + } } /* Convert the char version of the screen to short. */ for ( i = 0; i < ROWS*COLS/4; ++i ) - sscreen[i] = ( screen[i<<1] << 8 ) + ( 0xff & screen[(i<<1)+1] ); + sscreen[i] = ( screen[i<<1] << 8 ) + ( 0xff & screen[(i<<1)+1] ); } static void @@ -184,22 +184,25 @@ DoColormap( ifp ) /* Clear first three palettes. */ for ( j = 0; j < 48; ++j ) - PPM_ASSIGN( pal[0][j], 0, 0, 0 ); + PPM_ASSIGN( pal[0][j], 0, 0, 0 ); /* Read the palettes. */ for ( i = 1; i < ROWS; ++i ) - for ( j = 0; j < 3; ++j ) - { - (void) pm_readbigshort( ifp, &mask ); - for ( b = 0; b < 15; ++b ) - if ( mask & ( 1 << b ) ) - { - short k; - (void) pm_readbigshort( ifp, &k ); - PPM_ASSIGN( pal[i][(j*16)+b], - ( k & 0x700 ) >> 8, - ( k & 0x070 ) >> 4, - ( k & 0x007 ) ); - } - } + for ( j = 0; j < 3; ++j ) + { + (void) pm_readbigshort( ifp, &mask ); + for ( b = 0; b < 15; ++b ) + if ( mask & ( 1 << b ) ) + { + short k; + (void) pm_readbigshort( ifp, &k ); + PPM_ASSIGN( pal[i][(j*16)+b], + ( k & 0x700 ) >> 8, + ( k & 0x070 ) >> 4, + ( k & 0x007 ) ); + } + } } + + + diff --git a/converter/ppm/tgatoppm.c b/converter/ppm/tgatoppm.c index 662f741b..82225516 100644 --- a/converter/ppm/tgatoppm.c +++ b/converter/ppm/tgatoppm.c @@ -94,7 +94,6 @@ parseCommandLine(int argc, char ** argv, - static unsigned char getbyte(FILE * const ifP) { diff --git a/converter/ppm/vidtoppm.c b/converter/ppm/vidtoppm.c index f3c20404..b0abe731 100644 --- a/converter/ppm/vidtoppm.c +++ b/converter/ppm/vidtoppm.c @@ -1,15 +1,15 @@ /* Bryan got this from mm.ftp-cs.berkeley.edu from the package - mpeg-encode-1.5b-src under the name vidtoppm.c on March 30, 2000. - The file was dated January 19, 1995. + mpeg-encode-1.5b-src under the name vidtoppm.c on March 30, 2000. + The file was dated January 19, 1995. This program does not use the netpbm libraries, but generates its output via the program rawtoppm. If any work is ever done on it (or, more to the point, any interest ever expressed in it), it should be converted just to call ppmwrite(), etc. directly. - There was no attached documentation, but the program appears to + There was no attached documentation, but the program appears to convert from Parallax XVideo JPEG format to a sequence of PPM files. It - does this conversion by putting each frame in a window and then + does this conversion by putting each frame in a window and then reading it out of the window, using libXvid. Because it requires special libraries and there is no known @@ -57,6 +57,8 @@ char *p; exit (1); } + + static char buffer[300000]; Visual * @@ -67,11 +69,11 @@ FindFullColorVisual (dpy, depth) XVisualInfo vinfo; XVisualInfo *vinfo_ret; int numitems, maxdepth; - + vinfo.class = TrueColor; - + vinfo_ret = XGetVisualInfo(dpy, VisualClassMask, &vinfo, &numitems); - + if (numitems == 0) return NULL; maxdepth = 0; @@ -85,15 +87,17 @@ FindFullColorVisual (dpy, depth) if (maxdepth < 24) return NULL; - if (XMatchVisualInfo(dpy, DefaultScreen(dpy), maxdepth, - TrueColor, &vinfo)) { + if (XMatchVisualInfo(dpy, DefaultScreen(dpy), maxdepth, + TrueColor, &vinfo)) { *depth = maxdepth; return vinfo.visual; } - + return NULL; } + + Window CreateFullColorWindow (dpy, x, y, w, h) Display *dpy; @@ -107,21 +111,23 @@ CreateFullColorWindow (dpy, x, y, w, h) int screen; screen = XDefaultScreen(dpy); - class = InputOutput; /* Could be InputOnly */ + class = InputOutput; /* Could be InputOnly */ visual = FindFullColorVisual (dpy, &depth); if (visual == NULL) { - return 0; + return 0; } mask = CWBackPixel | CWColormap | CWBorderPixel; xswa.colormap = XCreateColormap(dpy, XRootWindow(dpy, screen), - visual, AllocNone); + visual, AllocNone); xswa.background_pixel = BlackPixel(dpy, DefaultScreen(dpy)); xswa.border_pixel = WhitePixel(dpy, DefaultScreen(dpy)); return XCreateWindow(dpy, RootWindow(dpy, screen), x, y, w, h, - 1, depth, class, visual, mask, &xswa); + 1, depth, class, visual, mask, &xswa); } + + main (argc, argv) int argc; char **argv; @@ -169,16 +175,16 @@ char **argv; obase = argv[6]; quality = 100; - + if (argc > 7) quality = atoi (argv[7]); - + dpy = XOpenDisplay (NULL); screen = DefaultScreen(dpy); root = DefaultRootWindow(dpy); /* gc = DefaultGC(dpy, screen); */ /* win = XCreateSimpleWindow (dpy, root, 0, 0, width, height, - 0, NULL, NULL); + 0, NULL, NULL); */ win = CreateFullColorWindow(dpy, 0, 0, width+4, height+4); gc = XCreateGC(dpy, win, 0, NULL); @@ -195,7 +201,7 @@ char **argv; XPlxPutTable(dpy, win, gc, qTable, size, 0); XPlxPutTable(dpy, win, gc, qTable, size, 1); XPlxVideoTag (dpy, win, gc, PLX_VIDEO); - + inFile = fopen(filename, "rb"); if (inFile == NULL) { perror (filename); @@ -215,7 +221,7 @@ char **argv; exit(); } } - + for (i=start; i<=end; i++) { fprintf(stdout, "GRABBING FRAME %d\n", i); @@ -228,15 +234,15 @@ char **argv; perror("End of file."); exit(); } - + XPlxPutCImage (dpy, win, gc, &image, 0, 0, image.width, - image.height, 0, 0, width+2, height+2, 1); + image.height, 0, 0, width+2, height+2, 1); XFlush(dpy); ximage = XGetImage(dpy, win, 0, 0, width, height, 0x00ffffff, - ZPixmap); - + ZPixmap); + if (i == 0) { fprintf(stderr, "Depth %d\n", ximage->depth); fprintf(stderr, "Height: %d Width: %d\n", height, width ); @@ -252,10 +258,10 @@ char **argv; for (r=0; r<height; r++) { for (j=0; j<width; j++) { - fputc(*(tdata+3), outFile); - fputc(*(tdata+2), outFile); - fputc(*(tdata+1), outFile); - tdata += 4; + fputc(*(tdata+3), outFile); + fputc(*(tdata+2), outFile); + fputc(*(tdata+1), outFile); + tdata += 4; } } @@ -264,7 +270,10 @@ char **argv; free(tdata); sprintf(command, "rawtoppm %d %d < /tmp/foobar > %s", - width, height, ofname); + width, height, ofname); system(command); } } + + + diff --git a/converter/ppm/winicontoppm.c b/converter/ppm/winicontoppm.c index 91277441..54bc0809 100644 --- a/converter/ppm/winicontoppm.c +++ b/converter/ppm/winicontoppm.c @@ -115,7 +115,6 @@ parseCommandLine (int argc, const char ** argv, - static int GetByte(FILE * const ifP) { @@ -980,3 +979,6 @@ main(int argc, const char *argv[]) { return 0; } + + + diff --git a/converter/ppm/yuvsplittoppm.c b/converter/ppm/yuvsplittoppm.c index 5343a21e..b734be91 100644 --- a/converter/ppm/yuvsplittoppm.c +++ b/converter/ppm/yuvsplittoppm.c @@ -43,12 +43,12 @@ struct cmdlineInfo { static void -parseCommandLine(int argc, +parseCommandLine(int argc, char ** argv, struct cmdlineInfo *cmdlineP ) { /*---------------------------------------------------------------------------- Parse program command line described in Unix standard form by argc - and argv. Return the information in the options as *cmdlineP. + and argv. Return the information in the options as *cmdlineP. If command line is internally inconsistent (invalid options, etc.), issue error message to stderr and abort program. @@ -64,7 +64,7 @@ parseCommandLine(int argc, unsigned int option_def_index; option_def_index = 0; /* incremented by OPTENT3 */ - OPTENT3(0, "ccir601", OPT_FLAG, NULL, + OPTENT3(0, "ccir601", OPT_FLAG, NULL, &cmdlineP->ccir601, 0); opt.opt_table = option_def; @@ -103,13 +103,13 @@ computeTwoOutputRows(int const cols, unsigned char * const vbuf, pixel * const pixelrow1, pixel * const pixelrow2) { - + int col; for (col = 0; col < cols; col += 2) { long int r0,g0,b0,r1,g1,b1,r2,g2,b2,r3,g3,b3; long int u,v,y0,y1,y2,y3,u0,u1,u2,u3,v0,v1,v2,v3; - + y0 = y1buf[col]; y1 = y1buf[col+1]; y2 = y2buf[col]; @@ -117,7 +117,7 @@ computeTwoOutputRows(int const cols, u = ubuf[col/2] - 128; v = vbuf[col/2] - 128; - + if (ccir601) { y0 = ((y0-16)*255)/219; y1 = ((y1-16)*255)/219; @@ -128,7 +128,7 @@ computeTwoOutputRows(int const cols, v = (v*255)/224 ; } /* mean the chroma for subsampling */ - + u0=u1=u2=u3=u; v0=v1=v2=v3=v; @@ -138,25 +138,25 @@ computeTwoOutputRows(int const cols, [Y] [65496 0 91880] [R] [U] = [65533 -22580 -46799] [G] [V] [65537 116128 -8] [B] - + */ r0 = 65536 * y0 + 91880 * v0; g0 = 65536 * y0 - 22580 * u0 - 46799 * v0; b0 = 65536 * y0 + 116128 * u0 ; - + r1 = 65536 * y1 + 91880 * v1; g1 = 65536 * y1 - 22580 * u1 - 46799 * v1; b1 = 65536 * y1 + 116128 * u1 ; - + r2 = 65536 * y2 + 91880 * v2; g2 = 65536 * y2 - 22580 * u2 - 46799 * v2; b2 = 65536 * y2 + 116128 * u2 ; - + r3 = 65536 * y3 + 91880 * v3; g3 = 65536 * y3 - 22580 * u3 - 46799 * v3; b3 = 65536 * y3 + 116128 * u3 ; - + r0 = limit(r0); r1 = limit(r1); r2 = limit(r2); @@ -195,7 +195,7 @@ main(int argc, char **argv) { ppm_init(&argc, argv); parseCommandLine(argc, argv, &cmdline); - + pm_asprintf(&ufname, "%s.U", cmdline.filenameBase); pm_asprintf(&vfname, "%s.V", cmdline.filenameBase); pm_asprintf(&yfname, "%s.Y", cmdline.filenameBase); @@ -215,7 +215,7 @@ main(int argc, char **argv) { if (cmdline.height % 2 != 0) { pm_message("Warning: odd height; last row ignored"); rows = cmdline.height - 1; - } else + } else rows = cmdline.height; pixelrow1 = ppm_allocrow(cols); @@ -251,3 +251,6 @@ main(int argc, char **argv) { exit(0); } + + + diff --git a/converter/ppm/yuvtoppm.c b/converter/ppm/yuvtoppm.c index 9c5d79c4..87f541e5 100644 --- a/converter/ppm/yuvtoppm.c +++ b/converter/ppm/yuvtoppm.c @@ -2,7 +2,7 @@ ** ** by Marc Boucher ** Internet: marc@PostImage.COM -** +** ** Based on Example Conversion Program, A60/A64 Digital Video Interface ** Manual, page 69 ** @@ -72,7 +72,7 @@ parseCommandLine(int argc, const char ** argv, cmdlineP->cols = widthArg; cmdlineP->rows = heightArg; - + if (cmdlineP->cols % 2 != 0) pm_error("Number of columns (%u) is odd. " "A YUV image must have an " @@ -213,9 +213,12 @@ main (int argc, const char ** argv) { ifP = pm_openr(cmdline.inputFileName); yuvtoppm(ifP, cmdline.cols, cmdline.rows, stdout); - + pm_close(ifP); pm_close(stdout); return 0; } + + + |