While I'm rooting around, note that we depend on sqlite3 now, not berkeley.

[mandoc.git] / term_ps.c

diff --git a/term_ps.c b/term_ps.c
index 50984dc0613abb9c69812550fc2f38a4f6a5db2e..e8a906858a6e71e33fa27b1f7454d1627d305029 100644 (file)
--- a/term_ps.c
+++ b/term_ps.c
@@ -1,6 +1,6 @@
-/*     $Id: term_ps.c,v 1.50 2011/05/15 00:58:48 kristaps Exp $ */
+/*     $Id: term_ps.c,v 1.54 2011/10/16 12:20:34 schwarze Exp $ */
 /*
- * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -429,12 +429,14 @@ static struct termp *
 pspdf_alloc(char *outopts)
 {
        struct termp    *p;
-       size_t           pagex, pagey, marginx, marginy, lineheight;
+       unsigned int     pagex, pagey;
+       size_t           marginx, marginy, lineheight;
        const char      *toks[2];
        const char      *pp;
        char            *v;
 
-       p = term_alloc(TERMENC_ASCII);
+       p = mandoc_calloc(1, sizeof(struct termp));
+       p->enc = TERMENC_ASCII;
        p->ps = mandoc_calloc(1, sizeof(struct termp_ps));
 
        p->advance = ps_advance;
@@ -484,10 +486,9 @@ pspdf_alloc(char *outopts)
                } else if (0 == strcasecmp(pp, "legal")) {
                        pagex = 216;
                        pagey = 356;
-               } else if (2 != sscanf(pp, "%zux%zu", &pagex, &pagey))
+               } else if (2 != sscanf(pp, "%ux%u", &pagex, &pagey))
                        fprintf(stderr, "%s: Unknown paper\n", pp);
-       } else if (NULL == pp)
-               pp = "letter";
+       }
 
        /* 
         * This MUST be defined before any PNT2AFM or AFM2PNT
@@ -512,8 +513,8 @@ pspdf_alloc(char *outopts)
 
        lineheight = PNT2AFM(p, ((double)p->ps->scale * 1.4));
 
-       p->ps->width = pagex;
-       p->ps->height = pagey;
+       p->ps->width = (size_t)pagex;
+       p->ps->height = (size_t)pagey;
        p->ps->header = pagey - (marginy / 2) - (lineheight / 2);
        p->ps->top = pagey - marginy;
        p->ps->footer = (marginy / 2) - (lineheight / 2);
@@ -574,7 +575,7 @@ ps_printf(struct termp *p, const char *fmt, ...)
        ps_growbuf(p, PS_BUFSLOP);
 
        pos = (int)p->ps->psmargcur;
-       len = vsnprintf(&p->ps->psmarg[pos], PS_BUFSLOP, fmt, ap);
+       vsnprintf(&p->ps->psmarg[pos], PS_BUFSLOP, fmt, ap);
 
        va_end(ap);