[Brlcad-commits] CVS: brlcad/src/other/URToolkit/cnv aliastorle.c,1.2,1.2.2.1 cubitorle.c,1.2,1.2.2.
Open Source Solid Modeling CAD
Brought to you by:
brlcad
Update of /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2783/src/other/URToolkit/cnv Modified Files: Tag: trimnurbs-branch aliastorle.c cubitorle.c graytorle.c painttorle.c rawtorle.c rletoabA60.c rletoalias.c rletoascii.c rletogray.c rletopaint.c rletops.c rletoraw.c rletorla.c rletotarga.c targatorle.c vcrtorle.c wasatchrle.c xbmtorle.c Log Message: update from HEAD Index: aliastorle.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/aliastorle.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- aliastorle.c 6 Nov 2005 03:50:58 -0000 1.2 +++ aliastorle.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -118,7 +118,7 @@ * [None] */ -void +int main( argc, argv ) int argc; char **argv; Index: cubitorle.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/cubitorle.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- cubitorle.c 6 Nov 2005 03:50:58 -0000 1.2 +++ cubitorle.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -32,7 +32,7 @@ void read_cubi_hdr(), read_cubi_row(), read_cubi_chan(), bit_read(); -void +int main(argc, argv) int argc; char *argv[]; Index: graytorle.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/graytorle.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- graytorle.c 6 Nov 2005 03:50:58 -0000 1.2 +++ graytorle.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -40,7 +40,7 @@ * -a Uses first input file as alpha channel. */ -void +int main(argc, argv) int argc; char *argv[]; Index: painttorle.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/painttorle.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- painttorle.c 6 Nov 2005 03:50:58 -0000 1.2 +++ painttorle.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -47,7 +47,7 @@ void init(), read_scan(), write_scan(); -void +int main(argc,argv) int argc; char *argv[]; Index: rawtorle.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/rawtorle.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- rawtorle.c 6 Nov 2005 03:50:58 -0000 1.2 +++ rawtorle.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -67,7 +67,7 @@ }\ } -void +int main(argc,argv) int argc; char *argv[]; Index: rletoabA60.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/rletoabA60.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- rletoabA60.c 6 Nov 2005 03:50:58 -0000 1.2 +++ rletoabA60.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -53,7 +53,7 @@ rle_pixel scanblu[FRAME_LENGTH][LINE_LENGTH]; rle_pixel scangrn[FRAME_LENGTH][LINE_LENGTH]; -void +int main(argc,argv) int argc; char **argv; Index: rletoalias.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/rletoalias.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- rletoalias.c 6 Nov 2005 03:50:58 -0000 1.2 +++ rletoalias.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -109,7 +109,7 @@ * [None] */ -void +int main( argc, argv ) int argc; char **argv; Index: rletoascii.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/rletoascii.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- rletoascii.c 6 Nov 2005 03:50:58 -0000 1.2 +++ rletoascii.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -60,7 +60,7 @@ */ static char default_asciistr[] = "@BR*#$PX0woIcv:+!~\"., "; -void +int main(argc, argv) int argc; char *argv[]; Index: rletogray.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/rletogray.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- rletogray.c 6 Nov 2005 03:50:58 -0000 1.2 +++ rletogray.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -42,7 +42,7 @@ * infile File to split. If none, uses stdin. */ -void +int main(argc, argv) int argc; char *argv[]; Index: rletopaint.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/rletopaint.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- rletopaint.c 6 Nov 2005 03:50:58 -0000 1.2 +++ rletopaint.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -74,7 +74,7 @@ int compress_line(); void write_paint_line(), bytes_to_bits(); -void +int main(argc, argv) int argc; char *argv[]; Index: rletops.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/rletops.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -w -u -r1.3 -r1.3.2.1 --- rletops.c 6 Nov 2005 03:50:58 -0000 1.3 +++ rletops.c 7 Apr 2006 19:34:06 -0000 1.3.2.1 @@ -59,7 +59,7 @@ static int gencps = 0; /* generate color PostScript? */ -void +int main( argc, argv ) int argc; char **argv; Index: rletoraw.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/rletoraw.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -w -u -r1.3 -r1.3.2.1 --- rletoraw.c 6 Nov 2005 03:50:58 -0000 1.3 +++ rletoraw.c 7 Apr 2006 19:34:06 -0000 1.3.2.1 @@ -66,7 +66,7 @@ }\ -void +int main(argc,argv) int argc; char *argv[]; Index: rletorla.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/rletorla.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -w -u -r1.3 -r1.3.2.1 --- rletorla.c 6 Nov 2005 03:50:58 -0000 1.3 +++ rletorla.c 7 Apr 2006 19:34:06 -0000 1.3.2.1 @@ -31,6 +31,7 @@ #include <stdlib.h> #include <stdio.h> +#include <unistd.h> #include "rlb_header.h" #include "rle.h" Index: rletotarga.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/rletotarga.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- rletotarga.c 6 Nov 2005 03:50:58 -0000 1.2 +++ rletotarga.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -63,7 +63,7 @@ image_descriptor; /* Image Descriptor Byte */ }; -void +int main(argc,argv) int argc; char *argv[]; Index: targatorle.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/targatorle.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- targatorle.c 6 Nov 2005 03:50:58 -0000 1.2 +++ targatorle.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -120,7 +120,7 @@ void init_comp(); unsigned char getbyte(); -void +int main(argc,argv) int argc; char *argv[]; Index: vcrtorle.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/vcrtorle.c,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -w -u -r1.3 -r1.3.2.1 --- vcrtorle.c 6 Nov 2005 03:50:58 -0000 1.3 +++ vcrtorle.c 7 Apr 2006 19:34:06 -0000 1.3.2.1 @@ -331,7 +331,7 @@ /* !!! Will have to be modified when we handle NB>1. !!! */ nread = fread( VICARImage, 1, NS*NL, fd ); if ( nread < NS*NL ) - fprintf( stderr, "%s: Short read from %s (%d bytes missing)\n", + fprintf( stderr, "%s: Short read from %s (%ld bytes missing)\n", the_hdr.cmd, the_hdr.file_name, NS*NL - nread ); for(y=(NL-1);y>=0;y--) /* flip in y */ { Index: wasatchrle.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/wasatchrle.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- wasatchrle.c 6 Nov 2005 03:50:58 -0000 1.2 +++ wasatchrle.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -52,7 +52,7 @@ rle_pixel count, data; } was_op; -void +int main(argc, argv) int argc; char **argv; Index: xbmtorle.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/other/URToolkit/cnv/xbmtorle.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -w -u -r1.2 -r1.2.2.1 --- xbmtorle.c 6 Nov 2005 03:50:58 -0000 1.2 +++ xbmtorle.c 7 Apr 2006 19:34:06 -0000 1.2.2.1 @@ -67,7 +67,7 @@ * Reads the bitmap, then builds an RLE image with one pixel per * bit in the input. */ -void +int main( argc, argv ) int argc; char **argv; |