X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fttf2pt1%2Fttf2pt1.c;h=0b03b2363995b45179e61faf9c514f6608355dd7;hb=359c111aa91dbbe9245a1bba2413692c63afdf73;hp=7a916abb2b58c10674b98f11f68dae2731ed0e84;hpb=50760be540fa6802296d7cb6eafa4d4b82a47a3b;p=swftools.git

diff --git a/pdf2swf/ttf2pt1/ttf2pt1.c b/pdf2swf/ttf2pt1/ttf2pt1.c
index 7a916ab..0b03b23 100644
--- a/pdf2swf/ttf2pt1/ttf2pt1.c
+++ b/pdf2swf/ttf2pt1/ttf2pt1.c
@@ -65,6 +65,8 @@
 #include <ctype.h>
 #include <math.h>
 
+#include "../../config.h"
+
 #ifdef _GNU_SOURCE
 #include <getopt.h>
 #endif
@@ -106,6 +108,12 @@ struct frontsw *frontswtab[] = {
 	NULL /* end of table */
 };
 
+#ifdef WIN32
+#define NOPIPES
+#else
+#undef NOPIPES
+#endif
+
 struct frontsw *cursw=0; /* the active front end */
 char *front_arg=""; /* optional argument */
 
@@ -605,7 +613,7 @@ unicode_init_user(
 	} 
 
 	/* now read in the encoding description file, if requested */
-	if ((unicode_map_file = fopen(path, "r")) == NULL) {
+	if ((unicode_map_file = fopen(path, "rb")) == NULL) {
 		fprintf(stderr, "**** Cannot access map file '%s' ****\n", path);
 		exit(1);
 	}
@@ -1707,7 +1715,7 @@ ttf2pt1_main(
 	/* save the command line for the record 
 	 * (we don't bother about escaping the shell special characters)
 	 */
-
+		
 	j = 0;
 	for(i=1; i<argc; i++) {
 		j += strlen(argv[i])+1;
@@ -1731,7 +1739,7 @@ ttf2pt1_main(
 		switch(oc) {
 		case 'W':
 			if(sscanf(optarg, "%d", &warnlevel) < 1 || warnlevel < 0) {
-				fprintf(stderr, "**** warning level must be a positive number\n");
+				fprintf(stderr, "**** warning level must be a positive number: %s (%d)\n", optarg, warnlevel);
 				exit(1);
 			}
 			break;
@@ -1981,6 +1989,7 @@ ttf2pt1_main(
 			break;
 		}
 	}
+
 	argc-=optind-1; /* the rest of code counts from argv[0] */
 	argv+=optind-1;
 
@@ -1992,7 +2001,6 @@ ttf2pt1_main(
 		usage();
 		exit(1);
 	}
-
 	/* try to guess the language by the locale used */
 	if(uni_lang_selected==0 && (lang=getenv("LANG"))!=0 ) {
 		for(i=0; i < sizeof uni_lang/sizeof(struct uni_language); i++) {
@@ -2067,19 +2075,18 @@ ttf2pt1_main(
 				}
 	}
 
-	if ((null_file = fopen(BITBUCKET, "w")) == NULL) {
+	if ((null_file = fopen(BITBUCKET, "wb")) == NULL) {
 		fprintf(stderr, "**** Cannot open %s ****\n",
 			BITBUCKET);
 		exit(1);
 	}
-
 	if (argv[2][0] == '-' && argv[2][1] == 0) {
-#ifdef WIN32
+#ifdef NOPIPES
 		if(encode) {
 			fprintf(stderr, "**** can't write encoded file to stdout ***\n");
 			exit(1);
 		}
-#endif /* WIN32 */
+#endif /* NOPIPES */
 		pfa_file = afm_file = dvienc_file = null_file;
 
 		if(wantafm || genlast == &gen_afm) { /* print .afm instead of .pfa */
@@ -2090,13 +2097,13 @@ ttf2pt1_main(
 			pfa_file=stdout;
 		}
 	} else {
-#ifndef WIN32
+#ifndef NOPIPES
 		snprintf(filename, sizeof filename, "%s.%s", argv[2], encode ? (pfbflag ? "pfb" : "pfa") : "t1a" );
-#else /* WIN32 */
+#else /* NOPIPES  */
 		snprintf(filename, sizeof filename, "%s.t1a", argv[2]);
-#endif /* WIN32 */
+#endif /* NOPIPES  */
 		if(gen_pfa) {
-			if ((pfa_file = fopen(filename, "w+b")) == NULL) {
+			if ((pfa_file = fopen(filename, "wb+")) == NULL) {
 				fprintf(stderr, "**** Cannot create %s ****\n", filename);
 				exit(1);
 			} else {
@@ -2127,25 +2134,25 @@ ttf2pt1_main(
 	/*
 	 * Now check whether we want a fully encoded .pfa file
 	 */
-#ifndef WIN32
+#ifndef NOPIPES
 	if (encode && pfa_file != null_file) {
 		int             p[2];
 		extern FILE    *ifp, *ofp;	/* from t1asm.c */
 
-		ifp=stdin;
-		ofp=stdout;
+		ifp=stdin; //?
+		ofp=stdout; //?
 
 		if (pipe(p) < 0) {
 			perror("**** Cannot create pipe ****\n");
 			exit(1);
 		}
 		ofp = pfa_file;
-		ifp = fdopen(p[0], "r");
+		ifp = fdopen(p[0], "rb");
 		if (ifp == NULL) {
 			perror("**** Cannot use pipe for reading ****\n");
 			exit(1);
 		}
-		pfa_file = fdopen(p[1], "w");
+		pfa_file = fdopen(p[1], "wb");
 		if (pfa_file == NULL) {
 			perror("**** Cannot use pipe for writing ****\n");
 			exit(1);
@@ -2161,7 +2168,7 @@ ttf2pt1_main(
 			fclose(ifp); fclose(ofp);
 		}
 	}
-#endif /* WIN32 */
+#endif /* NOPIPES  */
 
 	numglyphs = cursw->nglyphs();
 
@@ -2527,7 +2534,7 @@ ttf2pt1_main(
 
 	cursw->close();
 
-#ifndef WIN32
+#ifndef NOPIPES
 	while (wait(&ws) > 0) {
 	}
 #else 
@@ -2536,8 +2543,7 @@ ttf2pt1_main(
 
 		snprintf(filename, sizeof filename, "%s.%s", argv[2], pfbflag ? "pfb" : "pfa" );
 
-		if ((ofp = fopen(filename, "w+b")) == NULL) {
-			fprintf(stderr, "**** Cannot create %s ****\n", filename);
+		if ((ofp = fopen(filename, "wb+")) == NULL) {
 			exit(1);
 		} else {
 			WARNING_2 fprintf(stderr, "Creating file %s\n", filename);
@@ -2546,7 +2552,6 @@ ttf2pt1_main(
 		snprintf(filename, sizeof filename, "%s.t1a", argv[2]);
 
 		if ((ifp = fopen(filename, "rb")) == NULL) {
-			fprintf(stderr, "**** Cannot read %s ****\n", filename);
 			exit(1);
 		} else {
 			WARNING_2 fprintf(stderr, "Converting file %s\n", filename);
@@ -2558,7 +2563,7 @@ ttf2pt1_main(
 		if(unlink(filename) < 0) 
 			WARNING_1 fprintf(stderr, "Unable to remove file %s\n", filename);
 	}
-#endif /* WIN32 */
+#endif /* NOPIPES */
 
 	fclose(null_file);
 	return 0;