wdvi

commit 97f8596d4faba4d85958ffbb4811a42f266a12dd
parent 5854dd185ba998944fdac5e902cc67ecc8f06074
Author: Kyle Milz <krwmilz@gmail.com>
Date:   Sun, 12 Mar 2023 00:04:02 +0000

move numerator and denominator into local scope

Diffstat:
M
dvi-init.c
 | 
18
+++++++++---------

1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/dvi-init.c b/dvi-init.c
@@ -57,7 +57,6 @@ static	Boolean		dvi_is_valid = False;	/* if not initializing */
 /*
  * DVI preamble and postamble information.
  */
-static	long		numerator, denominator;
 static	unsigned int	dvi_unshrunk_page_w, dvi_unshrunk_page_h;
 
 
@@ -470,18 +469,18 @@ dvi_magic_ok(FILE *dvi)
  *      it into global variables for later use.
  */
 static Boolean
-process_preamble(void)
+process_preamble(long *numerator, long *denominator)
 {
 	char	 comment[256 + 1];
 	size_t   k;
 
 	if (dvi_magic_ok(dvi_file) == False)
 		return False;
-	numerator     = four(dvi_file);
-	denominator   = four(dvi_file);
+	*numerator     = four(dvi_file);
+	*denominator   = four(dvi_file);
 	magnification = four(dvi_file);
-	dimconv = (((double) numerator * magnification)
-		/ ((double) denominator * 1000.));
+	dimconv = (((double) *numerator * magnification)
+		/ ((double) *denominator * 1000.));
 	dimconv = dimconv * (((long) pixels_per_inch)<<16) / 254000;
 	tpic_conv = pixels_per_inch * magnification / 1000000.0;
 	k = one(dvi_file);
@@ -551,7 +550,7 @@ find_postamble(void)
  *      used in the job.
  */
 static	Boolean
-read_postamble(long *last_page_offset)
+read_postamble(long *last_page_offset, long numerator, long denominator)
 {
 	unsigned char   cmnd;
 	struct font	*fontp;
@@ -755,13 +754,14 @@ set_titles(void)
 Boolean
 init_dvi_file(void)
 {
+	long	numerator, denominator;
 	long	last_page_offset;
 
-	if (!process_preamble())
+	if (!process_preamble(&numerator, &denominator))
 		goto err;
 	if (!find_postamble())
 		goto err;
-	if (!read_postamble(&last_page_offset))
+	if (!read_postamble(&last_page_offset, numerator, denominator))
 		goto err;
 
 	prepare_pages(last_page_offset);