diff options
Diffstat (limited to 'converter')
-rw-r--r-- | converter/other/pngtopnm.c | 22 | ||||
-rw-r--r-- | converter/other/pnmtoddif.c | 4 | ||||
-rw-r--r-- | converter/pbm/pbmtocmuwm.c | 6 | ||||
-rw-r--r-- | converter/pbm/pbmtogem.c | 6 | ||||
-rw-r--r-- | converter/pbm/pbmtogo.c | 6 | ||||
-rw-r--r-- | converter/pbm/pbmtoicon.c | 6 | ||||
-rw-r--r-- | converter/pbm/pbmtomgr.c | 6 | ||||
-rw-r--r-- | converter/pbm/pbmtopi3.c | 6 | ||||
-rw-r--r-- | converter/pbm/pbmtoptx.c | 6 | ||||
-rw-r--r-- | converter/pbm/pbmtoybm.c | 6 | ||||
-rw-r--r-- | converter/pgm/pgmtofs.c | 6 | ||||
-rw-r--r-- | converter/pgm/pgmtolispm.c | 6 | ||||
-rw-r--r-- | converter/ppm/ppmtoilbm.c | 42 | ||||
-rw-r--r-- | converter/ppm/ppmtomitsu.c | 51 | ||||
-rw-r--r-- | converter/ppm/ppmtopict.c | 7 | ||||
-rw-r--r-- | converter/ppm/spctoppm.c | 7 |
16 files changed, 0 insertions, 193 deletions
diff --git a/converter/other/pngtopnm.c b/converter/other/pngtopnm.c index bb8afb8d..2b88bd1e 100644 --- a/converter/other/pngtopnm.c +++ b/converter/other/pngtopnm.c @@ -240,23 +240,12 @@ gamma_correct(png_uint_16 const v, -#ifdef __STDC__ static int iscolor (png_color c) -#else -static int iscolor (c) -png_color c; -#endif { return c.red != c.green || c.green != c.blue; } -#ifdef __STDC__ static void save_text (png_info *info_ptr, FILE *tfp) -#else -static void save_text (info_ptr, tfp) -png_info *info_ptr; -FILE *tfp; -#endif { int i, j, k; @@ -285,12 +274,7 @@ FILE *tfp; } } -#ifdef __STDC__ static void show_time (png_info *info_ptr) -#else -static void show_time (info_ptr) -png_info *info_ptr; -#endif { static const char * const month[] = { "", "January", "February", "March", "April", "May", "June", @@ -305,13 +289,7 @@ png_info *info_ptr; } } -#ifdef __STDC__ static void pngtopnm_error_handler (png_structp png_ptr, png_const_charp msg) -#else -static void pngtopnm_error_handler (png_ptr, msg) -png_structp png_ptr; -png_const_charp msg; -#endif { jmpbuf_wrapper *jmpbuf_ptr; diff --git a/converter/other/pnmtoddif.c b/converter/other/pnmtoddif.c index 65152865..3a910a7b 100644 --- a/converter/other/pnmtoddif.c +++ b/converter/other/pnmtoddif.c @@ -166,11 +166,7 @@ wr_int(unsigned char ** buffer, int val) } else { sign = val < 0 ? 0xff : 0x00; /* Sign bits */ length = 4; -#ifdef __STDC__ mask = 0xffu << 24; -#else - mask = 0xff << 24; -#endif while ((val & mask) == sign) { /* Find the smallest representation */ length--; mask >>= 8; diff --git a/converter/pbm/pbmtocmuwm.c b/converter/pbm/pbmtocmuwm.c index 64d7af40..f22ffff3 100644 --- a/converter/pbm/pbmtocmuwm.c +++ b/converter/pbm/pbmtocmuwm.c @@ -83,14 +83,8 @@ putinit( rows, cols ) bitshift = 7; } -#if __STDC__ static void putbit( bit b ) -#else /*__STDC__*/ -static void -putbit( b ) - bit b; -#endif /*__STDC__*/ { if ( bitsperitem == 8 ) putitem( ); diff --git a/converter/pbm/pbmtogem.c b/converter/pbm/pbmtogem.c index 59f2b9cf..cefbdc95 100644 --- a/converter/pbm/pbmtogem.c +++ b/converter/pbm/pbmtogem.c @@ -129,14 +129,8 @@ putinit (rows, cols) linerepeat = -1; } -#if __STDC__ static void putbit( bit b ) -#else /*__STDC__*/ -static void -putbit( b ) - bit b; -#endif /*__STDC__*/ { if ( bitsperitem == 8 ) putitem( ); diff --git a/converter/pbm/pbmtogo.c b/converter/pbm/pbmtogo.c index a2349176..67fe5821 100644 --- a/converter/pbm/pbmtogo.c +++ b/converter/pbm/pbmtogo.c @@ -264,14 +264,8 @@ putinit() bitshift = 7; } -#if __STDC__ static void putbit(bit b) -#else /*__STDC__*/ -static void -putbit(b) -bit b; -#endif /*__STDC__*/ { if (b == PBM_BLACK) item += 1 << bitshift; diff --git a/converter/pbm/pbmtoicon.c b/converter/pbm/pbmtoicon.c index 0e21c202..e61ccf13 100644 --- a/converter/pbm/pbmtoicon.c +++ b/converter/pbm/pbmtoicon.c @@ -80,14 +80,8 @@ putinit( ) firstitem = 1; } -#if __STDC__ static void putbit( bit b ) -#else /*__STDC__*/ -static void -putbit( b ) -bit b; -#endif /*__STDC__*/ { if ( bitsperitem == 16 ) putitem( ); diff --git a/converter/pbm/pbmtomgr.c b/converter/pbm/pbmtomgr.c index 7a6e7fc1..816e2a69 100644 --- a/converter/pbm/pbmtomgr.c +++ b/converter/pbm/pbmtomgr.c @@ -86,14 +86,8 @@ putinit( rows, cols ) bitshift = 7; } -#if __STDC__ static void putbit( bit b ) -#else /*__STDC__*/ -static void -putbit( b ) - bit b; -#endif /*__STDC__*/ { if ( bitsperitem == 8 ) putitem( ); diff --git a/converter/pbm/pbmtopi3.c b/converter/pbm/pbmtopi3.c index 06023d7a..6a60af62 100644 --- a/converter/pbm/pbmtopi3.c +++ b/converter/pbm/pbmtopi3.c @@ -89,14 +89,8 @@ putinit( ) bitshift = 7; } -#if __STDC__ static void putbit( bit b ) -#else /*__STDC__*/ -static void -putbit( b ) - bit b; -#endif /*__STDC__*/ { if (bitsperitem == 8) putitem( ); diff --git a/converter/pbm/pbmtoptx.c b/converter/pbm/pbmtoptx.c index 5031efcb..8cd60326 100644 --- a/converter/pbm/pbmtoptx.c +++ b/converter/pbm/pbmtoptx.c @@ -67,14 +67,8 @@ putinit( ) bitshift = 0; } -#if __STDC__ static void putbit( bit b ) -#else /*__STDC__*/ -static void -putbit( b ) - bit b; -#endif /*__STDC__*/ { if ( bitsperitem == 6 ) putitem( ); diff --git a/converter/pbm/pbmtoybm.c b/converter/pbm/pbmtoybm.c index 1d2be3d9..508e8e92 100644 --- a/converter/pbm/pbmtoybm.c +++ b/converter/pbm/pbmtoybm.c @@ -80,14 +80,8 @@ putinit( cols, rows ) bitshift = 0; } -#if __STDC__ static void putbit( bit b ) -#else /*__STDC__*/ -static void -putbit( b ) - bit b; -#endif /*__STDC__*/ { if ( bitsperitem == 16 ) putitem( ); diff --git a/converter/pgm/pgmtofs.c b/converter/pgm/pgmtofs.c index b34d77c4..53a2e7b3 100644 --- a/converter/pgm/pgmtofs.c +++ b/converter/pgm/pgmtofs.c @@ -128,14 +128,8 @@ putitem( ) bitshift = 8 - bitspersample; } -#if __STDC__ static void putgray( gray g ) -#else /*__STDC__*/ - static void -putgray( g ) - gray g; -#endif /*__STDC__*/ { if ( bitsperitem == 8 ) putitem( ); diff --git a/converter/pgm/pgmtolispm.c b/converter/pgm/pgmtolispm.c index 02f2fd1e..abb85494 100644 --- a/converter/pgm/pgmtolispm.c +++ b/converter/pgm/pgmtolispm.c @@ -115,14 +115,8 @@ depth_to_word_size (depth) /* Lispm architecture specific - if a bitmap is writt -#if __STDC__ static void putval( gray b ) -#else /*__STDC__*/ -static void -putval( b ) -gray b; -#endif /*__STDC__*/ { if ( bitsperitem == 32 ) putitem( ); diff --git a/converter/ppm/ppmtoilbm.c b/converter/ppm/ppmtoilbm.c index 6c04c9be..c0d58edb 100644 --- a/converter/ppm/ppmtoilbm.c +++ b/converter/ppm/ppmtoilbm.c @@ -635,20 +635,9 @@ ppm_to_ham(fp, cols, rows, maxval, colormap, colors, cmapmaxval, hamplanes) static long -#ifdef __STDC__ do_ham_body(FILE *ifP, FILE *ofp, int cols, int rows, pixval maxval, pixval hammaxval, int nPlanes, pixel *colormap, int colors) -#else -do_ham_body(ifP, ofp, cols, rows, maxval, hammaxval, nPlanes, colormap, colors) - FILE *ifP, *ofp; - int cols, rows; - pixval maxval; /* maxval of image color components */ - pixval hammaxval; /* maxval of HAM color changes */ - int nPlanes; - pixel *colormap; - int colors; -#endif { register int col, row, i; rawtype *raw_rowbuf; @@ -876,16 +865,8 @@ ppm_to_deep(fp, cols, rows, maxval, bitspercolor) static long -#if __STDC__ do_deep_body(FILE *ifP, FILE *ofp, int cols, int rows, pixval maxval, int bitspercolor) -#else -do_deep_body(ifP, ofp, cols, rows, maxval, bitspercolor) - FILE *ifP, *ofp; - int cols, rows; - pixval maxval; - int bitspercolor; -#endif { register int row, col; pixel *pP; @@ -1014,16 +995,8 @@ ppm_to_dcol(fp, cols, rows, maxval, dcol) static long -#if __STDC__ do_dcol_body(FILE *ifP, FILE *ofp, int cols, int rows, pixval maxval, DirectColor *dcol) -#else -do_dcol_body(ifP, ofp, cols, rows, maxval, dcol) - FILE *ifP, *ofp; - int cols, rows; - pixval maxval; - DirectColor *dcol; -#endif { register int row, col; pixel *pP; @@ -1161,18 +1134,8 @@ ppm_to_std(fp, cols, rows, maxval, colormap, colors, cmapmaxval, static long -#if __STDC__ do_std_body(FILE *ifP, FILE *ofp, int cols, int rows, pixval maxval, pixel *colormap, int colors, int nPlanes) -#else -do_std_body(ifP, ofp, cols, rows, maxval, colormap, colors, nPlanes) - FILE *ifP, *ofp; - int cols, rows; - pixval maxval; - pixel *colormap; - int colors; - int nPlanes; -#endif { register int row, col, i; pixel *pP; @@ -1783,12 +1746,7 @@ runbyte1(size) /************ other utility functions ************/ static void -#if __STDC__ put_big_short(short s) -#else -put_big_short(s) - short s; -#endif { if ( pm_writebigshort( stdout, s ) == -1 ) pm_error( "write error" ); diff --git a/converter/ppm/ppmtomitsu.c b/converter/ppm/ppmtomitsu.c index 3934ae45..e8d6540a 100644 --- a/converter/ppm/ppmtomitsu.c +++ b/converter/ppm/ppmtomitsu.c @@ -41,7 +41,6 @@ typedef struct hashinfo { struct hashinfo *next; } hashinfo; -#ifdef __STDC__ static void lineputinit(int cols, int rows, int sharpness, int enlarge, int copy, struct mediasize medias); static void frametransferinit(int cols, int rows, int sharpness, int enlarge, @@ -52,28 +51,13 @@ static void lookuptabledata(int cols, int rows, int enlarge, struct mediasize medias); static void check_and_rotate(int cols, int rows, int enlarge, struct mediasize medias); -#define CONST const -#else /*__STDC__*/ -static int lineputinit(); -static int lookuptableinit(); -static int lookuptabledata(); -static int frametransferinit(); -static int check_and_rotate(); -#define CONST -#endif #define cmd(arg) fputc((arg), stdout) #define datum(arg) fputc((char)(arg), stdout) #define data(arg,num) fwrite((arg), sizeof(char), (num), stdout) -#ifdef __STDC__ int main(int argc, char *argv[] ) -#else -int main( argc, argv ) - int argc; - char* argv[]; -#endif { FILE *ifp; /*hashinfo colorhashtable[HASHSIZE];*/ @@ -365,16 +349,9 @@ int main( argc, argv ) exit(0); } -#ifdef __STDC__ static void lineputinit(int cols, int rows, int sharpness, int enlarge, int copy, struct mediasize medias) -#else /*__STDC__*/ -static int lineputinit(cols, rows, sharpness, enlarge, copy, medias) - int cols, rows; - int sharpness, enlarge, copy; - struct mediasize medias; -#endif /*__STDC__*/ { ONLINE; CLRMEM; @@ -429,14 +406,8 @@ static int lineputinit(cols, rows, sharpness, enlarge, copy, medias) return; } -#ifdef __STDC__ static void lookuptableinit(int sharpness, int enlarge, int copy, struct mediasize medias) -#else /*__STDC__*/ -static int lookuptableinit(sharpness, enlarge, copy, medias) - int sharpness, enlarge, copy; - struct mediasize medias; -#endif /*__STDC__*/ { ONLINE; CLRMEM; @@ -489,15 +460,8 @@ static int lookuptableinit(sharpness, enlarge, copy, medias) return; } -#ifdef __STDC__ static void lookuptabledata(int cols, int rows, int enlarge, struct mediasize medias) -#else /*__STDC__*/ -static int lookuptabledata(cols, rows, enlarge, medias) - int rows, cols; - int enlarge; - struct mediasize medias; -#endif /*__STDC__*/ { DONELOOKUPTABLE; check_and_rotate(cols, rows, enlarge, medias); @@ -505,16 +469,8 @@ static int lookuptabledata(cols, rows, enlarge, medias) return; } -#ifdef __STDC__ static void frametransferinit(int cols, int rows, int sharpness, int enlarge, int copy, struct mediasize medias) -#else -static int frametransferinit(cols, rows, sharpness, enlarge, copy, medias) - - int rows, cols; - int sharpness, enlarge, copy; - struct mediasize medias; -#endif { ONLINE; CLRMEM; @@ -569,15 +525,8 @@ static int frametransferinit(cols, rows, sharpness, enlarge, copy, medias) } -#ifdef __STDC__ static void check_and_rotate(int cols, int rows, int enlarge, struct mediasize medias) -#else -static int -check_and_rotate(cols, rows, enlarge, medias) - int cols, rows, enlarge; - struct mediasize medias; -#endif { if (cols > rows) { ROTATEIMG(DOROTATE); /* rotate image */ diff --git a/converter/ppm/ppmtopict.c b/converter/ppm/ppmtopict.c index e2428fb6..22456857 100644 --- a/converter/ppm/ppmtopict.c +++ b/converter/ppm/ppmtopict.c @@ -282,15 +282,8 @@ int i; (void) putc(i & 0xff, fd); } -#if __STDC__ static void putLong( FILE *fd, long i ) -#else /*__STDC__*/ -static void -putLong(fd, i) -FILE *fd; -long i; -#endif /*__STDC__*/ { (void) putc((int)((i >> 24) & 0xff), fd); (void) putc(((int)(i >> 16) & 0xff), fd); diff --git a/converter/ppm/spctoppm.c b/converter/ppm/spctoppm.c index 3eea7821..d2a48187 100644 --- a/converter/ppm/spctoppm.c +++ b/converter/ppm/spctoppm.c @@ -165,15 +165,8 @@ DoBitmap( ifp ) sscreen[i] = ( screen[i<<1] << 8 ) + ( 0xff & screen[(i<<1)+1] ); } -#if __STDC__ static void DoChar( int n, char c ) -#else /*__STDC__*/ -static void -DoChar( n, c ) - int n; - char c; -#endif /*__STDC__*/ { int i; |