=================================================================== RCS file: /cvs/mandoc/term_ps.c,v retrieving revision 1.50 retrieving revision 1.52 diff -u -p -r1.50 -r1.52 --- mandoc/term_ps.c 2011/05/15 00:58:48 1.50 +++ mandoc/term_ps.c 2011/08/16 12:23:51 1.52 @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.50 2011/05/15 00:58:48 kristaps Exp $ */ +/* $Id: term_ps.c,v 1.52 2011/08/16 12:23:51 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons * @@ -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,7 +486,7 @@ 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"; @@ -512,8 +514,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);