cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
openbsd-ports/print/teTeX/base/patches/patch-texk_ps2pkm_paths_c
sturm 09e522ec98 update to tetex-3.0, see included ChangeLog for details 
the texmf-doc SUBPACKAGE is not distributed via ftp due to size constraints
2005-02-21 21:36:06 +00:00

229 lines
11 KiB
Plaintext
Raw Blame History

$OpenBSD: patch-texk_ps2pkm_paths_c,v 1.1 2005/02/21 21:36:07 sturm Exp $
--- texk/ps2pkm/paths.c.orig Sun Feb 13 13:23:21 2005
+++ texk/ps2pkm/paths.c Sun Feb 13 13:39:00 2005
@@ -215,7 +215,7 @@ struct segment *t1_Loc(S, x, y)
register struct segment *r;
- IfTrace3((MustTraceCalls),"..Loc(S=%z, x=%f, y=%f)\n", S, &x, &y);
+ IfTrace3((MustTraceCalls),"..Loc(S=%p, x=%f, y=%f)\n", S, x, y);
r = (struct segment *)Allocate(sizeof(struct segment), &movetemplate, 0);
TYPECHECK("Loc", S, SPACETYPE, r, (0), struct segment *);
@@ -236,7 +236,7 @@ struct segment *ILoc(S, x, y)
{
register struct segment *r;
- IfTrace3((MustTraceCalls),"..ILoc(S=%z, x=%d, y=%d)\n",
+ IfTrace3((MustTraceCalls),"..ILoc(S=%p, x=%d, y=%d)\n",
S, (LONG) x, (LONG) y);
r = (struct segment *)Allocate(sizeof(struct segment), &movetemplate, 0);
TYPECHECK("Loc", S, SPACETYPE, r, (0), struct segment *);
@@ -262,7 +262,7 @@ struct segment *SubLoc(p1, p2)
register struct segment *p1;
register struct segment *p2;
{
- IfTrace2((MustTraceCalls),"SubLoc(%z, %z)\n", p1, p2);
+ IfTrace2((MustTraceCalls),"SubLoc(%p, %p)\n", p1, p2);
ARGCHECK(!ISLOCATION(p1), "SubLoc: bad first arg", p1, NULL, (0), struct segment *);
ARGCHECK(!ISLOCATION(p2), "SubLoc: bad second arg", p2, NULL, (0), struct segment *);
@@ -307,7 +307,7 @@ struct segment *Line(P)
register struct segment *P; /* relevant coordinate space */
{
- IfTrace1((MustTraceCalls),"..Line(%z)\n", P);
+ IfTrace1((MustTraceCalls),"..Line(%p)\n", P);
ARGCHECK(!ISLOCATION(P), "Line: arg not a location", P, NULL, (0), struct segment *);
P = UniquePath(P);
@@ -350,7 +350,7 @@ struct beziersegment *Bezier(B, C, D)
register struct beziersegment *r; /* output segment */
- IfTrace3((MustTraceCalls),"..Bezier(%z, %z, %z)\n", B, C, D);
+ IfTrace3((MustTraceCalls),"..Bezier(%p, %p, %p)\n", B, C, D);
ARGCHECK(!ISLOCATION(B), "Bezier: bad B", B, NULL, (2,C,D), struct beziersegment *);
ARGCHECK(!ISLOCATION(C), "Bezier: bad C", C, NULL, (2,B,D), struct beziersegment *);
ARGCHECK(!ISLOCATION(D), "Bezier: bad D", D, NULL, (2,B,C), struct beziersegment *);
@@ -457,8 +457,8 @@ rules.
struct segment *Join(p1, p2)
register struct segment *p1,*p2;
{
- IfTrace2((MustTraceCalls && PathDebug > 1),"..Join(%z, %z)\n", p1, p2);
- IfTrace2((MustTraceCalls && PathDebug <=1),"..Join(%x, %x)\n", p1, p2);
+ IfTrace2((MustTraceCalls && PathDebug > 1),"..Join(%p, %p)\n", p1, p2);
+ IfTrace2((MustTraceCalls && PathDebug <=1),"..Join(%p, %p)\n", p1, p2);
/*
We start with a whole bunch of very straightforward argument tests:
*/
@@ -613,7 +613,7 @@ struct segment *t1_ClosePath(p0,lastonly
register fractpel firstx,firsty; /* start position of sub path */
register struct segment *lastnonhint; /* last non-hint segment in path */
- IfTrace1((MustTraceCalls),"ClosePath(%z)\n", p0);
+ IfTrace1((MustTraceCalls),"ClosePath(%p)\n", p0);
if (p0 != NULL && p0->type == TEXTTYPE)
return(UniquePath(p0));
if (p0->type == STROKEPATHTYPE)
@@ -661,7 +661,7 @@ At each break, we insert a close segment
if (r->dest.x <= CLOSEFUDGE && r->dest.x >= -CLOSEFUDGE
&& r->dest.y <= CLOSEFUDGE && r->dest.y >= -CLOSEFUDGE) {
IfTrace2((PathDebug),
- "ClosePath forced closed by (%p,%p)\n",
+ "ClosePath forced closed by (%d,%d)\n",
r->dest.x, r->dest.y);
lastnonhint->dest.x += r->dest.x;
lastnonhint->dest.y += r->dest.y;
@@ -713,7 +713,7 @@ struct segment *Reverse(p)
register struct segment *r; /* output path built here */
register struct segment *nextp; /* contains next sub-path */
- IfTrace1((MustTraceCalls),"Reverse(%z)\n", p);
+ IfTrace1((MustTraceCalls),"Reverse(%p)\n", p);
if (p == NULL)
return(NULL);
@@ -877,7 +877,7 @@ struct segment *ReverseSubPaths(p)
register struct segment *nomove; /* the part of sub-path without move segment */
struct fractpoint delta;
- IfTrace1((MustTraceCalls),"ReverseSubPaths(%z)\n", p);
+ IfTrace1((MustTraceCalls),"ReverseSubPaths(%p)\n", p);
if (p == NULL)
return(NULL);
@@ -1032,7 +1032,7 @@ struct segment *PathTransform(p0, S)
}
default:
- IfTrace1(TRUE,"path = %z\n", p);
+ IfTrace1(TRUE,"path = %p\n", p);
t1_abort("PathTransform: invalid segment");
}
oldx += savex;
@@ -1099,7 +1099,7 @@ void QueryLoc(P, S, xP, yP)
register struct XYspace *S; /* XY space to return coordinates in */
register DOUBLE *xP,*yP; /* coordinates returned here */
{
- IfTrace4((MustTraceCalls),"QueryLoc(P=%z, S=%z, (%x, %x))\n",
+ IfTrace4((MustTraceCalls),"QueryLoc(P=%p, S=%p, (%p, %p))\n",
P, S, xP, yP);
if (!ISLOCATION(P)) {
ArgErr("QueryLoc: first arg not a location", P, NULL);
@@ -1132,7 +1132,7 @@ void QueryPath(path, typeP, Bp, Cp, Dp,
{
register int coerced = FALSE; /* did I coerce a text path? */
- IfTrace3((MustTraceCalls), "QueryPath(%z, %x, %x, ...)\n",
+ IfTrace3((MustTraceCalls), "QueryPath(%p, %p, %p, ...)\n",
path, typeP, Bp);
if (path == NULL) {
*typeP = -1;
@@ -1210,8 +1210,8 @@ void QueryBounds(p0, S, xminP, yminP, xm
int coerced = FALSE; /* we have coerced the path from another object */
DOUBLE x1,y1,x2,y2,x3,y3,x4,y4; /* corners of rectangle in space X */
- IfTrace2((MustTraceCalls), "QueryBounds(%z, %z,", p0, S);
- IfTrace4((MustTraceCalls), " %x, %x, %x, %x)\n",
+ IfTrace2((MustTraceCalls), "QueryBounds(%p, %p,", p0, S);
+ IfTrace4((MustTraceCalls), " %p, %p, %p, %p)\n",
xminP, yminP, xmaxP, ymaxP);
if (S->type != SPACETYPE) {
ArgErr("QueryBounds: bad XYspace", S, NULL);
@@ -1386,7 +1386,7 @@ to ask about an entire path.
struct segment *DropSegment(path)
register struct segment *path;
{
- IfTrace1((MustTraceCalls),"DropSegment(%z)\n", path);
+ IfTrace1((MustTraceCalls),"DropSegment(%p)\n", path);
if (path != NULL && path->type == STROKEPATHTYPE)
path = CoercePath(path);
ARGCHECK((path == NULL || !ISPATHANCHOR(path)),
@@ -1408,7 +1408,7 @@ first segment only.
struct segment *HeadSegment(path)
register struct segment *path; /* input path */
{
- IfTrace1((MustTraceCalls),"HeadSegment(%z)\n", path);
+ IfTrace1((MustTraceCalls),"HeadSegment(%p)\n", path);
if (path == NULL)
return(NULL);
if (path->type == STROKEPATHTYPE)
@@ -1438,7 +1438,7 @@ void DumpPath(p)
register fractpel lastx,lasty;
DOUBLE roundness;
- IfTrace1(TRUE,"Dumping path, anchor=%x:\n", p);
+ IfTrace1(TRUE,"Dumping path, anchor=%p:\n", p);
lastx = lasty = 0;
for (;p != NULL; p=p->link) {
@@ -1450,13 +1450,13 @@ void DumpPath(p)
case LINETYPE:
IfTrace1(TRUE,". line<%x> to", (LONG) p->flag);
- IfTrace4(TRUE," (%p,%p), delta=(%p,%p)",
+ IfTrace4(TRUE," (%d,%d), delta=(%d,%d)",
x + lastx, y + lasty, x, y);
break;
case MOVETYPE:
IfTrace1(TRUE,"MOVE<%x> to", (LONG) p->flag);
- IfTrace4(TRUE,"(%p,%p), delta=(%p,%p)",
+ IfTrace4(TRUE,"(%d,%d), delta=(%d,%d)",
x + lastx, y + lasty, x, y);
break;
@@ -1465,10 +1465,10 @@ void DumpPath(p)
register struct conicsegment *cp = (struct conicsegment *) p;
roundness = cp->roundness;
- IfTrace2(TRUE, ". conic to (%p,%p),",
+ IfTrace2(TRUE, ". conic to (%d,%d),",
x + lastx, y + lasty);
- IfTrace3(TRUE," M=(%p,%p), r=%f", cp->M.x + lastx,
- cp->M.y + lasty, &roundness);
+ IfTrace3(TRUE," M=(%d,%d), r=%f", cp->M.x + lastx,
+ cp->M.y + lasty, roundness);
}
break;
@@ -1476,10 +1476,10 @@ void DumpPath(p)
{
register struct beziersegment *bp = (struct beziersegment *) p;
- IfTrace4(TRUE,". bezier to (%p,%p), B=(%p,%p)",
+ IfTrace4(TRUE,". bezier to (%d,%d), B=(%d,%d)",
x + lastx, y + lasty,
bp->B.x + lastx, bp->B.y + lasty);
- IfTrace2(TRUE, ", C=(%p,%p)",
+ IfTrace2(TRUE, ", C=(%d,%d)",
bp->C.x + lastx, bp->C.y + lasty);
}
break;
@@ -1488,13 +1488,13 @@ void DumpPath(p)
{
register struct hintsegment *hp = (struct hintsegment *) p;
- IfTrace4(TRUE,". hint ref=(%p,%p), width=(%p,%p)",
+ IfTrace4(TRUE,". hint ref=(%d,%d), width=(%d,%d)",
hp->ref.x + lastx, hp->ref.y + lasty,
hp->width.x, hp->width.y);
IfTrace4(TRUE, ", %c %c %c %c",
hp->orientation, hp->hinttype,
hp->adjusttype, hp->direction);
- IfTrace1(TRUE, ", %ld", (LONG) hp->label);
+ IfTrace1(TRUE, ", %d", (LONG) hp->label);
}
break;
@@ -1505,7 +1505,7 @@ void DumpPath(p)
default:
IfTrace0(TRUE, "bad path segment?");
}
- IfTrace1(TRUE," at %x\n", p);
+ IfTrace1(TRUE," at %p\n", p);
lastx += x;
lasty += y;
}
Reference in New Issue View Git Blame Copy Permalink