[brlcad-commits] SF.net SVN: brlcad: [30176] brlcad/trunk/src/conv
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <bo...@us...> - 2008-01-31 21:59:08
|
Revision: 30176 http://brlcad.svn.sourceforge.net/brlcad/?rev=30176&view=rev Author: bob1961 Date: 2008-01-31 13:59:10 -0800 (Thu, 31 Jan 2008) Log Message: ----------- Mods to get things working on Windows. Modified Paths: -------------- brlcad/trunk/src/conv/asc-nmg.c brlcad/trunk/src/conv/asc2pix.c brlcad/trunk/src/conv/bot-bldxf.c brlcad/trunk/src/conv/bot-raw.c brlcad/trunk/src/conv/bot_shell-vtk.c brlcad/trunk/src/conv/conv-vg2g.c brlcad/trunk/src/conv/cy-g.c brlcad/trunk/src/conv/dxf-g.c brlcad/trunk/src/conv/enf-g.c brlcad/trunk/src/conv/euclid-g.c brlcad/trunk/src/conv/euclid_format.c brlcad/trunk/src/conv/euclid_unformat.c brlcad/trunk/src/conv/g-acad.c brlcad/trunk/src/conv/g-adrt.c brlcad/trunk/src/conv/g-dxf.c brlcad/trunk/src/conv/g-euclid.c brlcad/trunk/src/conv/g-euclid1.c brlcad/trunk/src/conv/g-nff.c brlcad/trunk/src/conv/g-obj.c brlcad/trunk/src/conv/g-shell.rect.c brlcad/trunk/src/conv/g-tankill.c brlcad/trunk/src/conv/g-var.c brlcad/trunk/src/conv/g-vrml.c brlcad/trunk/src/conv/g-x3d.c brlcad/trunk/src/conv/nastran-g.c brlcad/trunk/src/conv/nmg-rib.c brlcad/trunk/src/conv/nmg-sgp.c brlcad/trunk/src/conv/pix2asc.c brlcad/trunk/src/conv/ply-g.c brlcad/trunk/src/conv/poly-bot.c brlcad/trunk/src/conv/tankill-g.c Modified: brlcad/trunk/src/conv/asc-nmg.c =================================================================== --- brlcad/trunk/src/conv/asc-nmg.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/asc-nmg.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -52,8 +52,6 @@ static void descr_to_nmg(struct shell *s, FILE *fp, fastf_t *Ext); char usage[] = "Usage: %s [file]\n"; -extern char *bu_optarg; -extern int bu_optind; /* * M a i n @@ -69,11 +67,14 @@ /* Get ascii NMG input file name. */ if (bu_optind >= argc) { - afile = "-"; - fpin = stdin; + afile = "-"; + fpin = stdin; +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(fpin), O_BINARY); +#endif } else { afile = argv[bu_optind]; - if ((fpin = fopen(afile, "r")) == NULL) { + if ((fpin = fopen(afile, "rb")) == NULL) { fprintf(stderr, "%s: cannot open %s for reading\n", argv[0], afile); @@ -81,6 +82,7 @@ } } + /* Get BRL-CAD output data base name. */ bu_optind++; if (bu_optind >= argc) { Modified: brlcad/trunk/src/conv/asc2pix.c =================================================================== --- brlcad/trunk/src/conv/asc2pix.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/asc2pix.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -52,6 +52,10 @@ register int a, b; register int i; +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); +#endif /* Init map */ for (i=0;i<256;i++) rmap[i] = -1; /* Unused entries */ for (i=0; i<10; i++) rmap['0'+i] = i; Modified: brlcad/trunk/src/conv/bot-bldxf.c =================================================================== --- brlcad/trunk/src/conv/bot-bldxf.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/bot-bldxf.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -260,7 +260,7 @@ snprintf(Value, 32, "%s.dxf", name); if (debug&DEBUG_NAMES) fprintf(stderr, "Writing DXF: %s\n", Value); - FH= fopen(Value, "w"); + FH= fopen(Value, "wb"); /* Write Header */ Modified: brlcad/trunk/src/conv/bot-raw.c =================================================================== --- brlcad/trunk/src/conv/bot-raw.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/bot-raw.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -111,7 +111,7 @@ FILE *fh; - fh = fopen(av[2], "w"); + fh = fopen(av[2], "wb"); MAT_IDN(mat); Modified: brlcad/trunk/src/conv/bot_shell-vtk.c =================================================================== --- brlcad/trunk/src/conv/bot_shell-vtk.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/bot_shell-vtk.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -437,7 +437,7 @@ if ( output_file ) { - if ( (fd_out=fopen( output_file, "w" )) == NULL ) + if ((fd_out=fopen( output_file, "wb")) == NULL) { perror( argv[0] ); bu_exit(1, "Cannot open output file (%s)\n", output_file); @@ -446,6 +446,7 @@ else bu_exit(1, "Output file must be specified!\n"); + /* Open BRL-CAD database */ database_index = bu_optind; if ((rtip=rt_dirbuild(argv[bu_optind], idbuf, sizeof(idbuf))) == RTI_NULL ) Modified: brlcad/trunk/src/conv/conv-vg2g.c =================================================================== --- brlcad/trunk/src/conv/conv-vg2g.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/conv-vg2g.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -70,7 +70,7 @@ printf("Usage: conv-vg2g file.vg file.g\n"); return 11; } - if ( (ifd = open( argv[1], 0 )) < 0 ) { + if ((ifd = open( argv[1], O_BINARY)) < 0) { perror(argv[1]); return 12; } @@ -79,6 +79,10 @@ return 13; } +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(ofd, O_BINARY); +#endif + /* check for conversion from version 3 to version 4 */ i = read(ifd, &rec, sizeof rec); if (i < 0) { Modified: brlcad/trunk/src/conv/cy-g.c =================================================================== --- brlcad/trunk/src/conv/cy-g.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/cy-g.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -71,11 +71,10 @@ return 1; } - if ( (infp=fopen( argv[1], "r" )) == NULL ) - { - bu_log( "Cannot open input file (%s)\n", argv[1] ); - bu_log( "%s", usage ); - return 1; + if ((infp=fopen( argv[1], "rb")) == NULL) { + bu_log( "Cannot open input file (%s)\n", argv[1] ); + bu_log( "%s", usage ); + return 1; } if ( (outfp = wdb_fopen( argv[2] )) == NULL ) Modified: brlcad/trunk/src/conv/dxf-g.c =================================================================== --- brlcad/trunk/src/conv/dxf-g.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/dxf-g.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -3220,6 +3220,8 @@ process_entities_code[curr_state->sub_state]( code ); break; } + + return( 0 ); } static int process_3dface_entities_code( int code ) @@ -3517,7 +3519,7 @@ dxf_file = argv[bu_optind++]; output_file = argv[bu_optind]; - if ( (dxf=fopen( dxf_file, "r")) == NULL ) { + if ( (dxf=fopen( dxf_file, "rb")) == NULL ) { perror( dxf_file ); bu_exit( 1, "Cannot open DXF file (%s)\n", dxf_file ); } Modified: brlcad/trunk/src/conv/enf-g.c =================================================================== --- brlcad/trunk/src/conv/enf-g.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/enf-g.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -78,8 +78,7 @@ static int verbose=0; -extern char *bu_optarg; -extern int bu_optind, bu_opterr, optopt; +extern int optopt; struct obj_info { char obj_type; /* type of this object (from defines below) */ @@ -662,10 +661,10 @@ input_file = bu_strdup( argv[bu_optind] ); output_file = bu_strdup( argv[bu_optind+1] ); - if ( (fd_in=fopen( input_file, "r" )) == NULL ) { - bu_log( "Cannot open %s for reading\n", input_file ); - perror( argv[0] ); - bu_exit( 1, NULL ); + if ((fd_in=fopen(input_file, "rb")) == NULL) { + bu_log( "Cannot open %s for reading\n", input_file ); + perror( argv[0] ); + bu_exit( 1, NULL ); } if ( (fd_out=wdb_fopen( output_file )) == NULL ) { @@ -680,6 +679,10 @@ perror( argv[0] ); bu_exit( 1, NULL ); } + +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(fd_parts), _O_BINARY); +#endif create_name_hash( fd_parts ); } Modified: brlcad/trunk/src/conv/euclid-g.c =================================================================== --- brlcad/trunk/src/conv/euclid-g.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/euclid-g.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -195,6 +195,10 @@ } } +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(stdin), O_BINARY); +#endif + /* Output BRL-CAD database header. No problem if more than one. */ if ( efile == NULL ) snprintf( title, BRLCAD_TITLE_LENGTH, "Conversion from EUCLID (tolerance distance = %gmm)", tol.dist ); Modified: brlcad/trunk/src/conv/euclid_format.c =================================================================== --- brlcad/trunk/src/conv/euclid_format.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/euclid_format.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -49,6 +49,11 @@ int old_id=(-1); int face_count=0; +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); +#endif + while ( scanf( "%d %d %f %d %d", &ident, &face_type, &tmp_a, &tmp_i, &npts ) != EOF ) { int i; Modified: brlcad/trunk/src/conv/euclid_unformat.c =================================================================== --- brlcad/trunk/src/conv/euclid_unformat.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/euclid_unformat.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -53,6 +53,11 @@ printf( "$03" ); +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); +#endif + while ( bu_fgets( str, sizeof(str), stdin ) ) { sscanf( str, "%d %d %d %d %d %f", &face_no, &npts, &face_type, &e, &ident, &a ); Modified: brlcad/trunk/src/conv/g-acad.c =================================================================== --- brlcad/trunk/src/conv/g-acad.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/g-acad.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -62,8 +62,6 @@ BU_EXTERN(union tree *do_region_end, (struct db_tree_state *tsp, struct db_full_path *pathp, union tree *curtree, genptr_t client_data)); -extern double nmg_eue_dist; /* from nmg_plot.c */ - static char usage[] = "\ Usage: %s [-v][-i][-xX lvl][-a abs_tess_tol][-r rel_tess_tol][-n norm_tess_tol]\n\ [-e error_file ][-D dist_calc_tol] -o output_file_name brlcad_db.g object(s)\n"; @@ -178,28 +176,31 @@ bu_exit(1, usage, argv[0]); } - if ( !output_file ) - fp = stdout; - else - { - /* Open output file */ - if ( (fp=fopen( output_file, "w+" )) == NULL ) - { - perror( argv[0] ); - bu_exit(1, "Cannot open output file (%s) for writing\n", output_file ); - } + if (!output_file) { + fp = stdout; +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(fp), O_BINARY); +#endif + } else { + /* Open output file */ + if ((fp=fopen( output_file, "wb+")) == NULL) { + perror(argv[0]); + bu_exit(1, "Cannot open output file (%s) for writing\n", output_file); + } } /* Open g-acad error log file */ - if ( !error_file) - fpe = stderr; - else - if ( (fpe=fopen( error_file, "w" )) == NULL ) - { - perror( argv[0] ); - bu_exit(1, "Cannot open output file (%s) for writing\n", error_file ); + if (!error_file) { + fpe = stderr; +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(fpe), O_BINARY); +#endif + } else if ((fpe=fopen( error_file, "wb")) == NULL) { + perror(argv[0]); + bu_exit(1, "Cannot open output file (%s) for writing\n", error_file); } + /* Open BRL-CAD database */ argc -= bu_optind; argv += bu_optind; Modified: brlcad/trunk/src/conv/g-adrt.c =================================================================== --- brlcad/trunk/src/conv/g-adrt.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/g-adrt.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -49,8 +49,12 @@ #ifndef HUGE +#if 1 +#define HUGE MAX_FASTF +#else #define HUGE 3.40282347e+38F #endif +#endif #define ADRT_GEOMETRY_REVISION 2 #define ADRT_MAX_NAMESIZE 256 @@ -537,7 +541,7 @@ bu_strlcpy(filename, argv[1], ADRT_MAX_NAMESIZE); bu_strlcat(filename, ".adrt", ADRT_MAX_NAMESIZE); - adrt_fh = fopen(filename, "w"); + adrt_fh = fopen(filename, "wb"); printf("converting: %s\n", argv[0]); /* write 2-byte endian */ @@ -595,7 +599,7 @@ bu_strlcpy(filename, argv[1], ADRT_MAX_NAMESIZE); bu_strlcat(filename, ".env", ADRT_MAX_NAMESIZE); - adrt_fh = fopen(filename, "w"); + adrt_fh = fopen(filename, "wb"); fprintf(adrt_fh, "geometry_file,%s.adrt\n", argv[1]); fprintf(adrt_fh, "properties_file,%s.properties\n", argv[1]); @@ -612,7 +616,7 @@ */ bu_strlcpy(filename, argv[1], ADRT_MAX_NAMESIZE); bu_strlcat(filename, ".properties", ADRT_MAX_NAMESIZE); - adrt_fh = fopen(filename, "w"); + adrt_fh = fopen(filename, "wb"); fprintf(adrt_fh, "properties,default\n"); fprintf(adrt_fh, "color,0.8,0.8,0.8\n"); fprintf(adrt_fh, "gloss,0.2\n"); @@ -630,7 +634,7 @@ bu_strlcpy(filename, argv[1], ADRT_MAX_NAMESIZE); bu_strlcat(filename, ".textures", ADRT_MAX_NAMESIZE); - adrt_fh = fopen(filename, "w"); + adrt_fh = fopen(filename, "wb"); fclose(adrt_fh); /* @@ -657,7 +661,7 @@ bu_strlcpy(filename, argv[1], ADRT_MAX_NAMESIZE); bu_strlcat(filename, ".frames", ADRT_MAX_NAMESIZE); - adrt_fh = fopen(filename, "w"); + adrt_fh = fopen(filename, "wb"); fprintf(adrt_fh, "frame,1\n"); fprintf(adrt_fh, "camera,10.0,10.0,10.0,0.0,0.0,0.0,0.0,20.0,0.0\n"); fclose(adrt_fh); Modified: brlcad/trunk/src/conv/g-dxf.c =================================================================== --- brlcad/trunk/src/conv/g-dxf.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/g-dxf.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -70,8 +70,6 @@ BU_EXTERN(union tree *get_layer, (struct db_tree_state *tsp, struct db_full_path *pathp, union tree *curtree, genptr_t client_data)); -extern double nmg_eue_dist; /* from nmg_plot.c */ - static char usage[] = "\ Usage: %s [-v] [-i] [-p] [-xX lvl] \n\ [-a abs_tess_tol] [-r rel_tess_tol] [-n norm_tess_tol] [-D dist_calc_tol] \n\ @@ -468,11 +466,14 @@ bu_exit(1, usage, argv[0], brlcad_ident("BRL-CAD to DXF Exporter")); } - if ( !output_file ) { + if (!output_file) { fp = stdout; +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(fp), O_BINARY); +#endif } else { /* Open output file */ - if ( (fp=fopen( output_file, "w+" )) == NULL ) { + if ((fp=fopen(output_file, "wb+")) == NULL) { perror( argv[0] ); bu_exit(1, " Cannot open output file (%s) for writing\n", output_file); } Modified: brlcad/trunk/src/conv/g-euclid.c =================================================================== --- brlcad/trunk/src/conv/g-euclid.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/g-euclid.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -575,11 +575,13 @@ bu_exit(1, "db_dirbuild failed\n"); } - if ( out_file == NULL ) + if (out_file == NULL) { fp_out = stdout; - else - { - if ((fp_out = fopen( out_file, "w")) == NULL) +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(fp_out), O_BINARY); +#endif + } else { + if ((fp_out = fopen( out_file, "wb")) == NULL) { bu_log( "Cannot open %s\n", out_file ); perror( argv[0] ); Modified: brlcad/trunk/src/conv/g-euclid1.c =================================================================== --- brlcad/trunk/src/conv/g-euclid1.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/g-euclid1.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -598,10 +598,9 @@ return curtree; dir = DB_FULL_PATH_CUR_DIR( pathp ); - if ( (fp_out = fopen( dir->d_namep, "w" )) == NULL ) - { - perror( "g-euclid" ); - bu_exit(1, "ERROR: Cannot open file %s\n", dir->d_namep); + if ((fp_out = fopen( dir->d_namep, "wb")) == NULL) { + perror( "g-euclid" ); + bu_exit(1, "ERROR: Cannot open file %s\n", dir->d_namep); } bu_log( "\n\nProcessing region %s:\n", dir->d_namep ); @@ -614,7 +613,9 @@ /* Error, bail out */ BU_UNSETJUMP; /* Relinquish the protection */ +#ifdef SIGALRM (void)alarm( 0 ); +#endif /* Sometimes the NMG library adds debugging bits when * it detects an internal error, before bombing out. @@ -650,9 +651,10 @@ if ( verbose ) bu_log( "\tEvaluating region\n" ); +#ifdef SIGALRM signal( SIGALRM, handler ); - (void)alarm( alarm_secs ); +#endif (void)nmg_model_fuse(*tsp->ts_m, tsp->ts_tol); ret_tree = nmg_booltree_evaluate(curtree, tsp->ts_tol, &rt_uniresource); /* librt/nmg_bool.c */ @@ -662,7 +664,9 @@ else r = (struct nmgregion *)NULL; +#ifdef SIGALRM (void)alarm( 0 ); +#endif BU_UNSETJUMP; /* Relinquish the protection */ regions_converted++; Modified: brlcad/trunk/src/conv/g-nff.c =================================================================== --- brlcad/trunk/src/conv/g-nff.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/g-nff.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -194,7 +194,7 @@ bu_exit(1, "No output file specified!\n" ); } else { /* Open output file */ - if ( (fpf=fopen( output_file, "w+" )) == NULL ) { + if ( (fpf=fopen( output_file, "wb+" )) == NULL ) { perror( argv[0] ); bu_exit(1, "Cannot open output file (%s) for writing\n", output_file ); } @@ -204,13 +204,14 @@ fp = bu_temp_file(NULL, 0); /* Open error log file */ - if ( !error_file) - fpe = stderr; - else - if ( (fpe=fopen( error_file, "w" )) == NULL ) - { - perror( argv[0] ); - bu_exit(1, "Cannot open output file (%s) for writing\n", error_file ); + if (!error_file) { + fpe = stderr; +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(fpe), O_BINARY); +#endif + } else if ((fpe=fopen( error_file, "wb")) == NULL) { + perror( argv[0] ); + bu_exit(1, "Cannot open output file (%s) for writing\n", error_file ); } /* Open BRL-CAD database */ Modified: brlcad/trunk/src/conv/g-obj.c =================================================================== --- brlcad/trunk/src/conv/g-obj.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/g-obj.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -62,8 +62,6 @@ BU_EXTERN(union tree *do_region_end, (struct db_tree_state *tsp, struct db_full_path *pathp, union tree *curtree, genptr_t client_data)); -extern double nmg_eue_dist; /* from nmg_plot.c */ - static char usage[] = "\ Usage: %s [-m][-v][-i][-u][-xX lvl][-a abs_tess_tol][-r rel_tess_tol][-n norm_tess_tol]\n\ [-e error_file ][-D dist_calc_tol] -o output_file_name brlcad_db.g object(s)\n"; @@ -105,10 +103,6 @@ register int c; double percent; -#ifdef _WIN32 - _fmode = _O_BINARY; -#endif - bu_setlinebuf( stderr ); #if MEMORY_LEAK_CHECKING @@ -208,13 +202,14 @@ } /* Open g-obj error log file */ - if ( !error_file) - fpe = stderr; - else - if ( (fpe=fopen( error_file, "w" )) == NULL ) - { - perror( argv[0] ); - bu_exit(1, "Cannot open output file (%s) for writing\n", error_file ); + if (!error_file) { + fpe = stderr; +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(fpe), O_BINARY); +#endif + } else if ((fpe=fopen(error_file, "wb")) == NULL) { + perror( argv[0] ); + bu_exit(1, "Cannot open output file (%s) for writing\n", error_file ); } /* Open BRL-CAD database */ Modified: brlcad/trunk/src/conv/g-shell.rect.c =================================================================== --- brlcad/trunk/src/conv/g-shell.rect.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/g-shell.rect.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -1768,10 +1768,6 @@ bu_debug = BU_DEBUG_COREDUMP; -#ifdef _WIN32 - _fmode = _O_BINARY; -#endif - bu_setlinebuf( stderr ); /* These need to be improved */ @@ -1921,7 +1917,7 @@ if ( plotfile ) { - if ( (fd_plot=fopen( plotfile, "w")) == NULL ) + if ( (fd_plot=fopen( plotfile, "wb")) == NULL ) { perror( argv[0] ); bu_exit(1, "ERROR: Cannot open plot file (%s)\n", plotfile ); Modified: brlcad/trunk/src/conv/g-tankill.c =================================================================== --- brlcad/trunk/src/conv/g-tankill.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/g-tankill.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -738,11 +738,13 @@ bu_exit(1, "db_dirbuild failed\n" ); } - if ( out_file == NULL ) - fp_out = stdout; - else - { - if ((fp_out = fopen( out_file, "w")) == NULL) + if (out_file == NULL) { + fp_out = stdout; +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(fp_out), O_BINARY); +#endif + } else { + if ((fp_out = fopen( out_file, "wb")) == NULL) { bu_log( "Cannot open %s\n", out_file ); perror( argv[0] ); @@ -752,7 +754,7 @@ if ( id_file != NULL ) { - if ((fp_id = fopen( id_file, "w")) == NULL) + if ((fp_id = fopen( id_file, "wb")) == NULL) { bu_log( "Cannot open %s\n", id_file ); perror( argv[0] ); Modified: brlcad/trunk/src/conv/g-var.c =================================================================== --- brlcad/trunk/src/conv/g-var.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/g-var.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -443,8 +443,11 @@ } /* setup output stream */ - if ( out_file == NULL ) { + if (out_file == NULL) { fp_out = stdout; +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(fp_out), O_BINARY); +#endif } else { if ( (fp_out = fopen( out_file, "wb") ) == NULL ) { bu_log( "Cannot open %s\n", out_file ); Modified: brlcad/trunk/src/conv/g-vrml.c =================================================================== --- brlcad/trunk/src/conv/g-vrml.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/g-vrml.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -640,11 +640,13 @@ bu_exit(1, "db_dirbuild() failed!\n" ); } - if ( out_file == NULL ) - fp_out = stdout; - else - { - if ((fp_out = fopen( out_file, "w")) == NULL) + if (out_file == NULL) { + fp_out = stdout; +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(fp_out), O_BINARY); +#endif + } else { + if ((fp_out = fopen( out_file, "wb")) == NULL) { perror( argv[0] ); bu_exit(1, "Cannot open %s\n", out_file ); @@ -882,13 +884,10 @@ long bytes_read=0; unsigned char tex_buf[TXT_BUF_LEN*3]; - if ( (tex_fd = open( mat.tx_file, O_RDONLY )) == (-1) ) - { - bu_log( "Cannot open texture file (%s)\n", mat.tx_file ); - perror( "g-vrml: " ); - } - else - { + if ((tex_fd = open(mat.tx_file, O_RDONLY | O_BINARY)) == (-1)) { + bu_log( "Cannot open texture file (%s)\n", mat.tx_file ); + perror( "g-vrml: " ); + } else { /* Johns note - need to check (test) the texture stuff */ fprintf( fp, "\t\t\t\ttextureTransform TextureTransform {\n"); fprintf( fp, "\t\t\t\t\tscale 1.33333 1.33333\n\t\t\t\t}\n"); Modified: brlcad/trunk/src/conv/g-x3d.c =================================================================== --- brlcad/trunk/src/conv/g-x3d.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/g-x3d.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -480,11 +480,13 @@ bu_exit(1, "db_dirbuild() failed!\n" ); } - if ( out_file == NULL ) - fp_out = stdout; - else - { - if ((fp_out = fopen( out_file, "w")) == NULL) + if (out_file == NULL) { + fp_out = stdout; +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(fp_out), O_BINARY); +#endif + } else { + if ((fp_out = fopen( out_file, "wb")) == NULL) { perror( argv[0] ); bu_exit(2, "Cannot open %s\n", out_file ); @@ -714,10 +716,9 @@ long bytes_read=0; unsigned char tex_buf[TXT_BUF_LEN*3]; - if ( (tex_fd = open( mat.tx_file, O_RDONLY )) == (-1) ) - { - bu_log( "Cannot open texture file (%s)\n", mat.tx_file ); - perror( "g-x3d: " ); + if ((tex_fd = open(mat.tx_file, O_RDONLY | O_BINARY)) == (-1)) { + bu_log( "Cannot open texture file (%s)\n", mat.tx_file ); + perror( "g-x3d: " ); } else { Modified: brlcad/trunk/src/conv/nastran-g.c =================================================================== --- brlcad/trunk/src/conv/nastran-g.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/nastran-g.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -1197,7 +1197,7 @@ break; case 'i': nastran_file = bu_optarg; - fpin = fopen( bu_optarg, "r" ); + fpin = fopen( bu_optarg, "rb" ); if ( fpin == (FILE *)NULL ) { bu_log( "Cannot open NASTRAN file (%s) for reading!\n", bu_optarg ); Modified: brlcad/trunk/src/conv/nmg-rib.c =================================================================== --- brlcad/trunk/src/conv/nmg-rib.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/nmg-rib.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -46,8 +46,6 @@ /* declarations to support use of bu_getopt() system call */ char *options = "ht"; -extern char *bu_optarg; -extern int bu_optind, bu_opterr, bu_getopt(int, char *const *, const char *); char *progname = "(noname)"; int triangulate = 0; Modified: brlcad/trunk/src/conv/nmg-sgp.c =================================================================== --- brlcad/trunk/src/conv/nmg-sgp.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/nmg-sgp.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -195,11 +195,13 @@ bu_exit(1, "db_dirbuild failed\n" ); } - if ( out_file == NULL ) - fp_out = stdout; - else - { - if ((fp_out = fopen( out_file, "w")) == NULL) + if (out_file == NULL) { + fp_out = stdout; +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(fp_out), O_BINARY); +#endif + } else { + if ((fp_out = fopen( out_file, "wb")) == NULL) { perror( argv[0] ); bu_exit(1, "Cannot open %s\n", out_file ); Modified: brlcad/trunk/src/conv/pix2asc.c =================================================================== --- brlcad/trunk/src/conv/pix2asc.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/pix2asc.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -38,6 +38,10 @@ int main(void) { +#if defined(_WIN32) && !defined(__CYGWIN__) + setmode(fileno(stdin), O_BINARY); + setmode(fileno(stdout), O_BINARY); +#endif while ( !feof(stdin) && fread( (char *)pix, sizeof(pix), 1, stdin) == 1 ) { putc( map[pix[0]>>4], stdout ); Modified: brlcad/trunk/src/conv/ply-g.c =================================================================== --- brlcad/trunk/src/conv/ply-g.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/ply-g.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -307,7 +307,12 @@ buf2[0] = buf1[0]; break; case 2: +#if 1 + buf2[0] = buf1[1]; + buf2[1] = buf1[0]; +#else swab( buf1, buf2, 2 ); +#endif break; case 4: lswap4( (unsigned int *)buf1, (unsigned int *)buf2 ); @@ -402,7 +407,12 @@ buf2[0] = buf1[0]; break; case 2: +#if 1 + buf2[0] = buf1[1]; + buf2[1] = buf1[0]; +#else swab( buf1, buf2, 2 ); +#endif break; case 4: lswap4( (unsigned int *)buf1, (unsigned int *)buf2 ); @@ -821,7 +831,7 @@ bu_exit(1, "ERROR: Cannot open output file (%s)\n", brlcad_file ); } - if ( (ply_fp=fopen( ply_file, "r")) == NULL ) { + if ( (ply_fp=fopen( ply_file, "rb")) == NULL ) { perror( ply_file ); bu_exit(1, "ERROR: Cannot open PLY file (%s)\n", ply_file ); } Modified: brlcad/trunk/src/conv/poly-bot.c =================================================================== --- brlcad/trunk/src/conv/poly-bot.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/poly-bot.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -83,14 +83,23 @@ tol.perp = 1e-6; tol.para = 1 - tol.perp; - if ( argc >= 3 ) { - ifp = fopen(argv[1], "r"); - if ( !ifp ) perror(argv[1]); - ofp = fopen(argv[2], "w"); - if ( !ofp ) perror(argv[2]); - if (ifp == NULL || ofp == NULL) { - bu_exit(1, "poly-bot: can't open files."); - } + if (argc >= 3) { + ifp = fopen(argv[1], "rb"); + if (!ifp) + perror(argv[1]); + + ofp = fopen(argv[2], "wb"); + if (!ofp) + perror(argv[2]); + + if (ifp == NULL || ofp == NULL) { + bu_exit(1, "poly-bot: can't open files."); + } +#if defined(_WIN32) && !defined(__CYGWIN__) + } else { + setmode(ifp, O_BINARY); + setmode(ofp, O_BINARY); +#endif } if (isatty(fileno(ifp))) { bu_exit(1, "%s", usage); Modified: brlcad/trunk/src/conv/tankill-g.c =================================================================== --- brlcad/trunk/src/conv/tankill-g.c 2008-01-31 20:16:32 UTC (rev 30175) +++ brlcad/trunk/src/conv/tankill-g.c 2008-01-31 21:59:10 UTC (rev 30176) @@ -214,7 +214,7 @@ tol.dist_sq = tol.dist * tol.dist; break; case 'i': /* input file name */ - if ( (in_fp = fopen( bu_optarg, "r" )) == NULL ) + if ( (in_fp = fopen( bu_optarg, "rb" )) == NULL ) { fprintf( stderr, "Cannot open %s\n", bu_optarg ); perror( "tankill-g" ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |