| @@ -1,254 +1,257 @@ | | | @@ -1,254 +1,257 @@ |
1 | $NetBSD: patch-ai,v 1.1 2004/02/14 22:27:30 kristerw Exp $ | | 1 | $NetBSD: patch-ai,v 1.2 2012/06/13 08:15:14 mef Exp $ |
2 | | | 2 | |
3 | --- libfstt/raster_hints.cc.orig Sat Feb 14 22:10:14 2004 | | 3 | Convert varargs-macros to old-style macros, to make the package |
4 | +++ libfstt/raster_hints.cc Sat Feb 14 22:39:52 2004 | | 4 | compile when using gcc 2.95. |
5 | @@ -123,7 +123,7 @@ | | 5 | |
| | | 6 | --- libfstt/raster_hints.cc.orig 2012-03-03 00:33:23.000000000 +0900 |
| | | 7 | +++ libfstt/raster_hints.cc 2012-06-13 11:53:44.000000000 +0900 |
| | | 8 | @@ -121,7 +121,7 @@ |
6 | int val = cvtTab->nextVal(); | | 9 | int val = cvtTab->nextVal(); |
7 | // (ld 2048 = 11) - (SHIFT = 6) = 5 | | 10 | // (ld 2048 = 11) - (SHIFT = 6) = 5 |
8 | cvt[i] = ((val * scale + 32) >> 6) << xxexp; | | 11 | cvt[i] = ((val * scale + 32) >> 6) << xxexp; |
9 | - debug("cvt[%3d] = %5d -> %5d\n", i, val, cvt[i]); | | 12 | - debug("cvt[%3d] = %5d -> %5d\n", i, val, cvt[i]); |
10 | + debug3("cvt[%3d] = %5d -> %5d\n", i, val, cvt[i]); | | 13 | + debug3("cvt[%3d] = %5d -> %5d\n", i, val, cvt[i]); |
11 | } | | 14 | } |
12 | | | 15 | |
13 | if (ttFont->prepTable == 0) | | 16 | if (ttFont->prepTable == 0) |
14 | @@ -198,13 +198,13 @@ | | 17 | @@ -196,13 +196,13 @@ |
15 | y -= gs.round_phase - gs.round_thold; | | 18 | y -= gs.round_phase - gs.round_thold; |
16 | y &= -gs.round_period; | | 19 | y &= -gs.round_period; |
17 | y += gs.round_phase; | | 20 | y += gs.round_phase; |
18 | - debug("\tsround(%d) = %d\t", x, (x<0)?-y:+y); | | 21 | - debug("\tsround(%d) = %d\t", x, (x<0)?-y:+y); |
19 | + debug2("\tsround(%d) = %d\t", x, (x<0)?-y:+y); | | 22 | + debug2("\tsround(%d) = %d\t", x, (x<0)?-y:+y); |
20 | break; | | 23 | break; |
21 | case ROUND_SUPER45: | | 24 | case ROUND_SUPER45: |
22 | y -= gs.round_phase - gs.round_thold; | | 25 | y -= gs.round_phase - gs.round_thold; |
23 | y -= y % gs.round_period; | | 26 | y -= y % gs.round_period; |
24 | y += gs.round_phase; | | 27 | y += gs.round_phase; |
25 | - debug("\tsround45(%d) = %d\t", x, (x<0)?-y:+y); | | 28 | - debug("\tsround45(%d) = %d\t", x, (x<0)?-y:+y); |
26 | + debug2("\tsround45(%d) = %d\t", x, (x<0)?-y:+y); | | 29 | + debug2("\tsround45(%d) = %d\t", x, (x<0)?-y:+y); |
27 | break; | | 30 | break; |
28 | } | | 31 | } |
29 | if (y < 0) return 0; | | 32 | if (y < 0) return 0; |
30 | @@ -214,8 +214,8 @@ | | 33 | @@ -212,8 +212,8 @@ |
31 | inline int | | 34 | inline int |
32 | GraphicsState::absNewMeasure(int dx11D6, int dy11D6) | | 35 | GraphicsState::absNewMeasure(int dx11D6, int dy11D6) |
33 | { | | 36 | { |
34 | - debug("\ndx = %d, dy = %d", dx11D6, dy11D6); | | 37 | - debug("\ndx = %d, dy = %d", dx11D6, dy11D6); |
35 | - debug(",\tpx = %d, py = %d", p_vec_x, p_vec_y); | | 38 | - debug(",\tpx = %d, py = %d", p_vec_x, p_vec_y); |
36 | + debug2("\ndx = %d, dy = %d", dx11D6, dy11D6); | | 39 | + debug2("\ndx = %d, dy = %d", dx11D6, dy11D6); |
37 | + debug2(",\tpx = %d, py = %d", p_vec_x, p_vec_y); | | 40 | + debug2(",\tpx = %d, py = %d", p_vec_x, p_vec_y); |
38 | | | 41 | |
39 | int dist = dx11D6 * p_vec_x + dy11D6 * p_vec_y + 0x2000; | | 42 | int dist = dx11D6 * p_vec_x + dy11D6 * p_vec_y + 0x2000; |
40 | dist >>= 14; | | 43 | dist >>= 14; |
41 | @@ -225,8 +225,8 @@ | | 44 | @@ -223,8 +223,8 @@ |
42 | inline int | | 45 | inline int |
43 | GraphicsState::absOldMeasure(int dx11D6, int dy11D6) | | 46 | GraphicsState::absOldMeasure(int dx11D6, int dy11D6) |
44 | { | | 47 | { |
45 | - debug("\ndx = %d, dy = %d", dx11D6, dy11D6); | | 48 | - debug("\ndx = %d, dy = %d", dx11D6, dy11D6); |
46 | - debug(",\tdpx = %d, dpy = %d", dp_vec_x, dp_vec_y); | | 49 | - debug(",\tdpx = %d, dpy = %d", dp_vec_x, dp_vec_y); |
47 | + debug2("\ndx = %d, dy = %d", dx11D6, dy11D6); | | 50 | + debug2("\ndx = %d, dy = %d", dx11D6, dy11D6); |
48 | + debug2(",\tdpx = %d, dpy = %d", dp_vec_x, dp_vec_y); | | 51 | + debug2(",\tdpx = %d, dpy = %d", dp_vec_x, dp_vec_y); |
49 | | | 52 | |
50 | int dist = dx11D6 * dp_vec_x + dy11D6 * dp_vec_y + 0x2000; | | 53 | int dist = dx11D6 * dp_vec_x + dy11D6 * dp_vec_y + 0x2000; |
51 | dist >>= 14; | | 54 | dist >>= 14; |
52 | @@ -237,7 +237,7 @@ | | 55 | @@ -235,7 +235,7 @@ |
53 | Rasterizer::newMeasure(const point& p2, const point& p1) | | 56 | Rasterizer::newMeasure(const Point &p2, const Point &p1) |
54 | { | | 57 | { |
55 | int dist = gs.absNewMeasure(p2.xnow - p1.xnow, p2.ynow - p1.ynow); | | 58 | int dist = gs.absNewMeasure(p2.xnow - p1.xnow, p2.ynow - p1.ynow); |
56 | - debug("\nnewMeasure p[%d]-p[%d] = %f", | | 59 | - debug("\nnewMeasure p[%d]-p[%d] = %f", |
57 | + debug3("\nnewMeasure p[%d]-p[%d] = %f", | | 60 | + debug3("\nnewMeasure p[%d]-p[%d] = %f", |
58 | &p2 - p[1], &p1 - p[1], dist / FSHIFT); | | 61 | &p2 - p[1], &p1 - p[1], dist / FSHIFT); |
59 | | | 62 | |
60 | return dist; | | 63 | return dist; |
61 | @@ -247,7 +247,7 @@ | | 64 | @@ -245,7 +245,7 @@ |
62 | Rasterizer::oldMeasure(const point& p2, const point& p1) | | 65 | Rasterizer::oldMeasure(const Point &p2, const Point &p1) |
63 | { | | 66 | { |
64 | int dist = gs.absOldMeasure(p2.xold - p1.xold, p2.yold - p1.yold); | | 67 | int dist = gs.absOldMeasure(p2.xold - p1.xold, p2.yold - p1.yold); |
65 | - debug("\noldMeasure p[%d]-p[%d] = %f", | | 68 | - debug("\noldMeasure p[%d]-p[%d] = %f", |
66 | + debug3("\noldMeasure p[%d]-p[%d] = %f", | | 69 | + debug3("\noldMeasure p[%d]-p[%d] = %f", |
67 | &p2 - p[1], &p1 - p[1], dist / FSHIFT); | | 70 | &p2 - p[1], &p1 - p[1], dist / FSHIFT); |
68 | return dist; | | 71 | return dist; |
69 | } | | 72 | } |
70 | @@ -271,9 +271,9 @@ | | 73 | @@ -269,9 +269,9 @@ |
71 | vx = 0; | | 74 | vx = 0; |
72 | vy = 0; | | 75 | vy = 0; |
73 | } | | 76 | } |
74 | - debug("\t(%d %d) - ", p2.xnow, p2.ynow); | | 77 | - debug("\t(%d %d) - ", p2.xnow, p2.ynow); |
75 | - debug("(%d %d)", p1.xnow, p1.ynow); | | 78 | - debug("(%d %d)", p1.xnow, p1.ynow); |
76 | - debug("\nvx vy = %f %f", vx / FSHIFT, vy / FSHIFT); | | 79 | - debug("\nvx vy = %f %f", vx / FSHIFT, vy / FSHIFT); |
77 | + debug2("\t(%d %d) - ", p2.xnow, p2.ynow); | | 80 | + debug2("\t(%d %d) - ", p2.xnow, p2.ynow); |
78 | + debug2("(%d %d)", p1.xnow, p1.ynow); | | 81 | + debug2("(%d %d)", p1.xnow, p1.ynow); |
79 | + debug2("\nvx vy = %f %f", vx / FSHIFT, vy / FSHIFT); | | 82 | + debug2("\nvx vy = %f %f", vx / FSHIFT, vy / FSHIFT); |
80 | } | | 83 | } |
81 | | | 84 | |
82 | void | | 85 | void |
83 | @@ -295,22 +295,22 @@ | | 86 | @@ -293,22 +293,22 @@ |
84 | vx = 0; | | 87 | vx = 0; |
85 | vy = 0; | | 88 | vy = 0; |
86 | } | | 89 | } |
87 | - debug("\t(%d %d) - ", p2.xold, p2.yold); | | 90 | - debug("\t(%d %d) - ", p2.xold, p2.yold); |
88 | - debug("(%d %d)", p1.xold, p1.yold); | | 91 | - debug("(%d %d)", p1.xold, p1.yold); |
89 | - debug("\nvx vy = %f %f", vx / FSHIFT, vy / FSHIFT); | | 92 | - debug("\nvx vy = %f %f", vx / FSHIFT, vy / FSHIFT); |
90 | + debug2("\t(%d %d) - ", p2.xold, p2.yold); | | 93 | + debug2("\t(%d %d) - ", p2.xold, p2.yold); |
91 | + debug2("(%d %d)", p1.xold, p1.yold); | | 94 | + debug2("(%d %d)", p1.xold, p1.yold); |
92 | + debug2("\nvx vy = %f %f", vx / FSHIFT, vy / FSHIFT); | | 95 | + debug2("\nvx vy = %f %f", vx / FSHIFT, vy / FSHIFT); |
93 | } | | 96 | } |
94 | | | 97 | |
95 | inline void | | 98 | inline void |
96 | GraphicsState::movePoint(point& pp, int len11D6) | | 99 | GraphicsState::movePoint(Point &pp, int len11D6) |
97 | { | | 100 | { |
98 | - debug("\nmovePoint by %f", len11D6 / FSHIFT); | | 101 | - debug("\nmovePoint by %f", len11D6 / FSHIFT); |
99 | - debug("\t(%d %d)", pp.xnow, pp.ynow); | | 102 | - debug("\t(%d %d)", pp.xnow, pp.ynow); |
100 | + debug1("\nmovePoint by %f", len11D6 / FSHIFT); | | 103 | + debug1("\nmovePoint by %f", len11D6 / FSHIFT); |
101 | + debug2("\t(%d %d)", pp.xnow, pp.ynow); | | 104 | + debug2("\t(%d %d)", pp.xnow, pp.ynow); |
102 | | | 105 | |
103 | pp.xnow += (len11D6 * move_x) >> 14; | | 106 | pp.xnow += (len11D6 * move_x) >> 14; |
104 | pp.ynow += (len11D6 * move_y) >> 14; | | 107 | pp.ynow += (len11D6 * move_y) >> 14; |
105 | pp.flags |= flags; | | 108 | pp.flags |= flags; |
106 | | | 109 | |
107 | - debug("\t-> (%d %d)\n", pp.xnow, pp.ynow); | | 110 | - debug("\t-> (%d %d)\n", pp.xnow, pp.ynow); |
108 | + debug2("\t-> (%d %d)\n", pp.xnow, pp.ynow); | | 111 | + debug2("\t-> (%d %d)\n", pp.xnow, pp.ynow); |
109 | } | | 112 | } |
110 | | | 113 | |
111 | void | | 114 | void |
112 | @@ -350,7 +350,7 @@ | | 115 | @@ -348,7 +348,7 @@ |
113 | assert(stack >= stackbase); | | 116 | assert(stack >= stackbase); |
114 | | | 117 | |
115 | int opc = f->readUByte(); | | 118 | int opc = f->readUByte(); |
116 | - debug("\n::%05X %02X\t", f->fileOffset() - 1, opc); | | 119 | - debug("\n::%05X %02X\t", f->fileOffset() - 1, opc); |
117 | + debug2("\n::%05X %02X\t", f->fileOffset() - 1, opc); | | 120 | + debug2("\n::%05X %02X\t", f->fileOffset() - 1, opc); |
118 | switch (opc) { | | 121 | switch (opc) { |
119 | | | 122 | |
120 | // pushing onto the stack | | 123 | // pushing onto the stack |
121 | @@ -363,11 +363,11 @@ | | 124 | @@ -361,11 +361,11 @@ |
122 | case PUSHB04: case PUSHB05: | | 125 | case PUSHB04: case PUSHB05: |
123 | case PUSHB06: case PUSHB07: | | 126 | case PUSHB06: case PUSHB07: |
124 | m = opc - (PUSHB00 - 1); | | 127 | m = opc - (PUSHB00 - 1); |
125 | - debug("PUSHB * %d\n>\t\t", m); | | 128 | - debug("PUSHB * %d\n>\t\t", m); |
126 | + debug1("PUSHB * %d\n>\t\t", m); | | 129 | + debug1("PUSHB * %d\n>\t\t", m); |
127 | while (--m >= 0) { | | 130 | while (--m >= 0) { |
128 | ++stack; | | 131 | ++stack; |
129 | *stack = f->readUByte(); | | 132 | *stack = f->readUByte(); |
130 | - debug("%d,\t", *stack); | | 133 | - debug("%d,\t", *stack); |
131 | + debug1("%d,\t", *stack); | | 134 | + debug1("%d,\t", *stack); |
132 | if ((m & 7) == 0) | | 135 | if ((m & 7) == 0) |
133 | debug("\n>\t\t"); | | 136 | debug("\n>\t\t"); |
134 | } | | 137 | } |
135 | @@ -381,10 +381,10 @@ | | 138 | @@ -379,10 +379,10 @@ |
136 | case PUSHW04: case PUSHW05: | | 139 | case PUSHW04: case PUSHW05: |
137 | case PUSHW06: case PUSHW07: | | 140 | case PUSHW06: case PUSHW07: |
138 | m = opc - (PUSHW00 - 1); | | 141 | m = opc - (PUSHW00 - 1); |
139 | - debug("PUSHW * %d\n>\t\t", m); | | 142 | - debug("PUSHW * %d\n>\t\t", m); |
140 | + debug1("PUSHW * %d\n>\t\t", m); | | 143 | + debug1("PUSHW * %d\n>\t\t", m); |
141 | while (--m >= 0) { | | 144 | while (--m >= 0) { |
142 | *(++stack) = f->readSShort(); | | 145 | *(++stack) = f->readSShort(); |
143 | - debug("%d,\t", *stack); | | 146 | - debug("%d,\t", *stack); |
144 | + debug1("%d,\t", *stack); | | 147 | + debug1("%d,\t", *stack); |
145 | if ((m & 7) == 0) | | 148 | if ((m & 7) == 0) |
146 | debug("\n>\t\t"); | | 149 | debug("\n>\t\t"); |
147 | } | | 150 | } |
148 | @@ -396,12 +396,12 @@ | | 151 | @@ -394,12 +394,12 @@ |
149 | m = *stack; | | 152 | m = *stack; |
150 | assert(m >= 0 && m < sizeStor); | | 153 | assert(m >= 0 && m < sizeStor); |
151 | *stack = stor[m]; | | 154 | *stack = stor[m]; |
152 | - debug("RS store[%d] = %d", m, *stack); | | 155 | - debug("RS store[%d] = %d", m, *stack); |
153 | + debug2("RS store[%d] = %d", m, *stack); | | 156 | + debug2("RS store[%d] = %d", m, *stack); |
154 | break; | | 157 | break; |
155 | case WS: | | 158 | case WS: |
156 | m = *(stack--); | | 159 | m = *(stack--); |
157 | n = *(stack--); | | 160 | n = *(stack--); |
158 | - debug("WS %d -> store[%d]", m, n); | | 161 | - debug("WS %d -> store[%d]", m, n); |
159 | + debug2("WS %d -> store[%d]", m, n); | | 162 | + debug2("WS %d -> store[%d]", m, n); |
160 | assert(n >= 0 && n < sizeStor); | | 163 | assert(n >= 0 && n < sizeStor); |
161 | stor[n] = m; | | 164 | stor[n] = m; |
162 | break; | | 165 | break; |
163 | @@ -413,7 +413,7 @@ | | 166 | @@ -411,7 +411,7 @@ |
164 | n = *(stack--); | | 167 | n = *(stack--); |
165 | assert(n >= 0 && n < sizeCvt); | | 168 | assert(n >= 0 && n < sizeCvt); |
166 | cvt[n] = m; | | 169 | cvt[n] = m; |
167 | - debug("WCVTP %d -> cvt[%d] = %d", m, n, cvt[n]); | | 170 | - debug("WCVTP %d -> cvt[%d] = %d", m, n, cvt[n]); |
168 | + debug3("WCVTP %d -> cvt[%d] = %d", m, n, cvt[n]); | | 171 | + debug3("WCVTP %d -> cvt[%d] = %d", m, n, cvt[n]); |
169 | break; | | 172 | break; |
170 | case WCVTF: | | 173 | case WCVTF: |
171 | m = *(stack--); | | 174 | m = *(stack--); |
172 | @@ -421,13 +421,13 @@ | | 175 | @@ -419,13 +419,13 @@ |
173 | assert(n >= 0 && n < sizeCvt); | | 176 | assert(n >= 0 && n < sizeCvt); |
174 | //XXX: how does one scale a scalar with the ((xx,xy),(yx,yy)) matrix??? | | 177 | //XXX: how does one scale a scalar with the ((xx,xy),(yx,yy)) matrix??? |
175 | cvt[n] = ((m * (xx + yy) + 32) >> 6) << xxexp; | | 178 | cvt[n] = ((m * (xx + yy) + 32) >> 6) << xxexp; |
176 | - debug("#WCVTF %d -> cvt[%d] = %d\n", m, n, cvt[n]); | | 179 | - debug("#WCVTF %d -> cvt[%d] = %d\n", m, n, cvt[n]); |
177 | + debug3("#WCVTF %d -> cvt[%d] = %d\n", m, n, cvt[n]); | | 180 | + debug3("#WCVTF %d -> cvt[%d] = %d\n", m, n, cvt[n]); |
178 | break; | | 181 | break; |
179 | case RCVT: | | 182 | case RCVT: |
180 | m = *stack; | | 183 | m = *stack; |
181 | assert(m >= 0 && m < sizeCvt); | | 184 | assert(m >= 0 && m < sizeCvt); |
182 | *stack = cvt[m]; | | 185 | *stack = cvt[m]; |
183 | - debug("RCVT cvt[%d] = %d", m, *stack); | | 186 | - debug("RCVT cvt[%d] = %d", m, *stack); |
184 | + debug2("RCVT cvt[%d] = %d", m, *stack); | | 187 | + debug2("RCVT cvt[%d] = %d", m, *stack); |
185 | break; | | 188 | break; |
186 | | | 189 | |
187 | // accessing the graphics state | | 190 | // accessing the graphics state |
188 | @@ -493,7 +493,7 @@ | | 191 | @@ -491,7 +491,7 @@ |
189 | case SDPVTL0: | | 192 | case SDPVTL0: |
190 | m = *(stack--); | | 193 | m = *(stack--); |
191 | n = *(stack--); | | 194 | n = *(stack--); |
192 | - debug("SDPVTL0 p[%d] p[%d]", m, n); | | 195 | - debug("SDPVTL0 p[%d] p[%d]", m, n); |
193 | + debug2("SDPVTL0 p[%d] p[%d]", m, n); | | 196 | + debug2("SDPVTL0 p[%d] p[%d]", m, n); |
194 | oldLine2vector(gs.zp1[n], gs.zp2[m], gs.dp_vec_x, gs.dp_vec_y); | | 197 | oldLine2vector(gs.zp1[n], gs.zp2[m], gs.dp_vec_x, gs.dp_vec_y); |
195 | newLine2vector(gs.zp1[n], gs.zp2[m], gs.p_vec_x, gs.p_vec_y); | | 198 | newLine2vector(gs.zp1[n], gs.zp2[m], gs.p_vec_x, gs.p_vec_y); |
196 | gs.recalc(); | | 199 | gs.recalc(); |
197 | @@ -501,7 +501,7 @@ | | 200 | @@ -499,7 +499,7 @@ |
198 | case SDPVTL1: | | 201 | case SDPVTL1: |
199 | m = *(stack--); | | 202 | m = *(stack--); |
200 | n = *(stack--); | | 203 | n = *(stack--); |
201 | - debug("SDPVTL1 p[%d] p[%d]", m, n); | | 204 | - debug("SDPVTL1 p[%d] p[%d]", m, n); |
202 | + debug2("SDPVTL1 p[%d] p[%d]", m, n); | | 205 | + debug2("SDPVTL1 p[%d] p[%d]", m, n); |
203 | oldLine2vector(gs.zp1[n], gs.zp2[m], gs.dp_vec_y, gs.dp_vec_x); | | 206 | oldLine2vector(gs.zp1[n], gs.zp2[m], gs.dp_vec_y, gs.dp_vec_x); |
204 | gs.dp_vec_x = -gs.dp_vec_x; | | 207 | gs.dp_vec_x = -gs.dp_vec_x; |
205 | newLine2vector(gs.zp1[n], gs.zp2[m], gs.p_vec_y, gs.p_vec_x); | | 208 | newLine2vector(gs.zp1[n], gs.zp2[m], gs.p_vec_y, gs.p_vec_x); |
206 | @@ -511,7 +511,7 @@ | | 209 | @@ -509,7 +509,7 @@ |
207 | case SPVTL0: | | 210 | case SPVTL0: |
208 | m = *(stack--); | | 211 | m = *(stack--); |
209 | n = *(stack--); | | 212 | n = *(stack--); |
210 | - debug("SPVTL0 p[%d] p[%d]", m, n); | | 213 | - debug("SPVTL0 p[%d] p[%d]", m, n); |
211 | + debug2("SPVTL0 p[%d] p[%d]", m, n); | | 214 | + debug2("SPVTL0 p[%d] p[%d]", m, n); |
212 | newLine2vector(gs.zp1[n], gs.zp2[m], gs.p_vec_x, gs.p_vec_y); | | 215 | newLine2vector(gs.zp1[n], gs.zp2[m], gs.p_vec_x, gs.p_vec_y); |
213 | gs.dp_vec_x = gs.p_vec_x; | | 216 | gs.dp_vec_x = gs.p_vec_x; |
214 | gs.dp_vec_y = gs.p_vec_y; | | 217 | gs.dp_vec_y = gs.p_vec_y; |
215 | @@ -520,7 +520,7 @@ | | 218 | @@ -518,7 +518,7 @@ |
216 | case SPVTL1: | | 219 | case SPVTL1: |
217 | m = *(stack--); | | 220 | m = *(stack--); |
218 | n = *(stack--); | | 221 | n = *(stack--); |
219 | - debug("SPVTL1 p[%d] p[%d]\t", m, n); | | 222 | - debug("SPVTL1 p[%d] p[%d]\t", m, n); |
220 | + debug2("SPVTL1 p[%d] p[%d]\t", m, n); | | 223 | + debug2("SPVTL1 p[%d] p[%d]\t", m, n); |
221 | newLine2vector(gs.zp1[n], gs.zp2[m], gs.p_vec_y, gs.p_vec_x); | | 224 | newLine2vector(gs.zp1[n], gs.zp2[m], gs.p_vec_y, gs.p_vec_x); |
222 | gs.dp_vec_y = gs.p_vec_y = -gs.p_vec_y; | | 225 | gs.dp_vec_y = gs.p_vec_y = -gs.p_vec_y; |
223 | gs.dp_vec_x = gs.p_vec_x; | | 226 | gs.dp_vec_x = gs.p_vec_x; |
224 | @@ -529,14 +529,14 @@ | | 227 | @@ -527,14 +527,14 @@ |
225 | case SFVTL0: | | 228 | case SFVTL0: |
226 | m = *(stack--); | | 229 | m = *(stack--); |
227 | n = *(stack--); | | 230 | n = *(stack--); |
228 | - debug("SFVTL0 p[%d] p[%d]\t", m, n); | | 231 | - debug("SFVTL0 p[%d] p[%d]\t", m, n); |
229 | + debug2("SFVTL0 p[%d] p[%d]\t", m, n); | | 232 | + debug2("SFVTL0 p[%d] p[%d]\t", m, n); |
230 | newLine2vector(gs.zp1[n], gs.zp2[m], gs.f_vec_x, gs.f_vec_y); | | 233 | newLine2vector(gs.zp1[n], gs.zp2[m], gs.f_vec_x, gs.f_vec_y); |
231 | gs.recalc(); | | 234 | gs.recalc(); |
232 | break; | | 235 | break; |
233 | case SFVTL1: | | 236 | case SFVTL1: |
234 | m = *(stack--); | | 237 | m = *(stack--); |
235 | n = *(stack--); | | 238 | n = *(stack--); |
236 | - debug("SFVTL1 p[%d] p[%d]", m, n); | | 239 | - debug("SFVTL1 p[%d] p[%d]", m, n); |
237 | + debug2("SFVTL1 p[%d] p[%d]", m, n); | | 240 | + debug2("SFVTL1 p[%d] p[%d]", m, n); |
238 | newLine2vector(gs.zp1[n], gs.zp2[m], gs.f_vec_y, gs.f_vec_x); | | 241 | newLine2vector(gs.zp1[n], gs.zp2[m], gs.f_vec_y, gs.f_vec_x); |
239 | gs.f_vec_y = -gs.f_vec_y; | | 242 | gs.f_vec_y = -gs.f_vec_y; |
240 | gs.recalc(); | | 243 | gs.recalc(); |
241 | @@ -550,58 +550,58 @@ | | 244 | @@ -548,58 +548,58 @@ |
242 | case SPVFS: | | 245 | case SPVFS: |
243 | gs.dp_vec_y = gs.p_vec_y = *(stack--); | | 246 | gs.dp_vec_y = gs.p_vec_y = *(stack--); |
244 | gs.dp_vec_x = gs.p_vec_x = *(stack--); | | 247 | gs.dp_vec_x = gs.p_vec_x = *(stack--); |
245 | - debug("#SPVFS = %d %d", gs.p_vec_x, gs.p_vec_y); | | 248 | - debug("#SPVFS = %d %d", gs.p_vec_x, gs.p_vec_y); |
246 | + debug2("#SPVFS = %d %d", gs.p_vec_x, gs.p_vec_y); | | 249 | + debug2("#SPVFS = %d %d", gs.p_vec_x, gs.p_vec_y); |
247 | gs.recalc(); | | 250 | gs.recalc(); |
248 | break; | | 251 | break; |
249 | case SFVFS: | | 252 | case SFVFS: |
250 | gs.f_vec_y = *(stack--); | | 253 | gs.f_vec_y = *(stack--); |
251 | gs.f_vec_x = *(stack--); | | 254 | gs.f_vec_x = *(stack--); |
252 | - debug("#SFVFS = %d %d", gs.f_vec_x, gs.f_vec_y); | | 255 | - debug("#SFVFS = %d %d", gs.f_vec_x, gs.f_vec_y); |
253 | + debug2("#SFVFS = %d %d", gs.f_vec_x, gs.f_vec_y); | | 256 | + debug2("#SFVFS = %d %d", gs.f_vec_x, gs.f_vec_y); |
254 | gs.recalc(); | | 257 | gs.recalc(); |
| @@ -298,77 +301,77 @@ $NetBSD: patch-ai,v 1.1 2004/02/14 22:27 | | | @@ -298,77 +301,77 @@ $NetBSD: patch-ai,v 1.1 2004/02/14 22:27 |
298 | m = *(stack--); | | 301 | m = *(stack--); |
299 | assert(m >= 0 && m <= 1); | | 302 | assert(m >= 0 && m <= 1); |
300 | gs.zp2 = p[m]; | | 303 | gs.zp2 = p[m]; |
301 | - debug("SZP2 %d", m); | | 304 | - debug("SZP2 %d", m); |
302 | + debug1("SZP2 %d", m); | | 305 | + debug1("SZP2 %d", m); |
303 | break; | | 306 | break; |
304 | case SZPS: | | 307 | case SZPS: |
305 | m = *(stack--); | | 308 | m = *(stack--); |
306 | - debug("SZPS %d", m); | | 309 | - debug("SZPS %d", m); |
307 | + debug1("SZPS %d", m); | | 310 | + debug1("SZPS %d", m); |
308 | assert(m >= 0 && m <= 1); | | 311 | assert(m >= 0 && m <= 1); |
309 | gs.zp2 = gs.zp1 = gs.zp0 = p[m]; | | 312 | gs.zp2 = gs.zp1 = gs.zp0 = p[m]; |
310 | break; | | 313 | break; |
311 | @@ -631,7 +631,7 @@ | | 314 | @@ -629,7 +629,7 @@ |
312 | break; | | 315 | break; |
313 | case SROUND: | | 316 | case SROUND: |
314 | m = *(stack--); | | 317 | m = *(stack--); |
315 | - debug("SROUND %d %d %d", (m >> 6) & 3, (m >> 4) & 3, m); | | 318 | - debug("SROUND %d %d %d", (m >> 6) & 3, (m >> 4) & 3, m); |
316 | + debug3("SROUND %d %d %d", (m >> 6) & 3, (m >> 4) & 3, m); | | 319 | + debug3("SROUND %d %d %d", (m >> 6) & 3, (m >> 4) & 3, m); |
317 | gs.round_state = ROUND_SUPER; | | 320 | gs.round_state = ROUND_SUPER; |
318 | n = (m >> 6) & 3; | | 321 | n = (m >> 6) & 3; |
319 | gs.round_period = 0x20 << n; | | 322 | gs.round_period = 0x20 << n; |
320 | @@ -643,12 +643,12 @@ | | 323 | @@ -641,12 +641,12 @@ |
321 | gs.round_thold = (gs.round_period >> 3) * (m - 4); | | 324 | gs.round_thold = (gs.round_period >> 3) * (m - 4); |
322 | else | | 325 | else |
323 | gs.round_thold = gs.round_period - 1; | | 326 | gs.round_thold = gs.round_period - 1; |
324 | - debug("-> period 0x%02X, thold 0x%02X, phase 0x%02X", | | 327 | - debug("-> period 0x%02X, thold 0x%02X, phase 0x%02X", |
325 | + debug3("-> period 0x%02X, thold 0x%02X, phase 0x%02X", | | 328 | + debug3("-> period 0x%02X, thold 0x%02X, phase 0x%02X", |
326 | gs.round_period, gs.round_thold, gs.round_phase); | | 329 | gs.round_period, gs.round_thold, gs.round_phase); |
327 | break; | | 330 | break; |
328 | case S45ROUND: | | 331 | case S45ROUND: |
329 | m = *(stack--); | | 332 | m = *(stack--); |
330 | - debug("SROUND45 %d %d %d", (m >> 6) & 3, (m >> 4) & 3, m); | | 333 | - debug("SROUND45 %d %d %d", (m >> 6) & 3, (m >> 4) & 3, m); |
331 | + debug3("SROUND45 %d %d %d", (m >> 6) & 3, (m >> 4) & 3, m); | | 334 | + debug3("SROUND45 %d %d %d", (m >> 6) & 3, (m >> 4) & 3, m); |
332 | gs.round_state = ROUND_SUPER45; | | 335 | gs.round_state = ROUND_SUPER45; |
333 | gs.round_period = 1444 >> (7 - ((m >> 6) & 3)); | | 336 | gs.round_period = 1444 >> (7 - ((m >> 6) & 3)); |
334 | gs.round_phase = (gs.round_period * (m & 0x30)) >> 6; | | 337 | gs.round_phase = (gs.round_period * (m & 0x30)) >> 6; |
335 | @@ -657,21 +657,21 @@ | | 338 | @@ -655,21 +655,21 @@ |
336 | gs.round_thold = (gs.round_period * (m - 4)) >> 3; | | 339 | gs.round_thold = (gs.round_period * (m - 4)) >> 3; |
337 | else | | 340 | else |
338 | gs.round_thold = gs.round_period - 1; | | 341 | gs.round_thold = gs.round_period - 1; |
339 | - debug("-> period 0x%02X, thold 0x%02X, phase 0x%02X", | | 342 | - debug("-> period 0x%02X, thold 0x%02X, phase 0x%02X", |
340 | + debug3("-> period 0x%02X, thold 0x%02X, phase 0x%02X", | | 343 | + debug3("-> period 0x%02X, thold 0x%02X, phase 0x%02X", |
341 | gs.round_period, gs.round_thold, gs.round_phase); | | 344 | gs.round_period, gs.round_thold, gs.round_phase); |
342 | break; | | 345 | break; |
343 | case SLOOP: | | 346 | case SLOOP: |
344 | gs.loop = *(stack--); | | 347 | gs.loop = *(stack--); |
345 | - debug("SLOOP %d", gs.loop); | | 348 | - debug("SLOOP %d", gs.loop); |
346 | + debug1("SLOOP %d", gs.loop); | | 349 | + debug1("SLOOP %d", gs.loop); |
347 | break; | | 350 | break; |
348 | case SMD: | | 351 | case SMD: |
349 | gs.min_distance = *(stack--); | | 352 | gs.min_distance = *(stack--); |
350 | - debug("SMD %d", gs.min_distance); | | 353 | - debug("SMD %d", gs.min_distance); |
351 | + debug1("SMD %d", gs.min_distance); | | 354 | + debug1("SMD %d", gs.min_distance); |
352 | break; | | 355 | break; |
353 | case INSTCTRL: | | 356 | case INSTCTRL: |
354 | gs.instr_control = *(stack--); | | 357 | gs.instr_control = *(stack--); |
355 | m = *(stack--); | | 358 | m = *(stack--); |
356 | - debug("###INSTCTRL %d %d", gs.instr_control, m); | | 359 | - debug("###INSTCTRL %d %d", gs.instr_control, m); |
357 | + debug2("###INSTCTRL %d %d", gs.instr_control, m); | | 360 | + debug2("###INSTCTRL %d %d", gs.instr_control, m); |
358 | if (gs.instr_control == 1) | | 361 | if (gs.instr_control == 1) |
359 | if (m && grid_fitting >= 0) | | 362 | if (m && grid_fitting >= 0) |
360 | grid_fitting = -grid_fitting; | | 363 | grid_fitting = -grid_fitting; |
361 | @@ -685,24 +685,24 @@ | | 364 | @@ -683,24 +683,24 @@ |
362 | if (m & 0x0800 && mppem > (m & 0xff)) gs.dropout_control = 0; | | 365 | if (m & 0x0800 && mppem > (m & 0xff)) gs.dropout_control = 0; |
363 | if (m & 0x1000 && (xy || yx)) gs.dropout_control = 0; | | 366 | if (m & 0x1000 && (xy || yx)) gs.dropout_control = 0; |
364 | if (m & 0x2000 && xx == yy) gs.dropout_control = 0; | | 367 | if (m & 0x2000 && xx == yy) gs.dropout_control = 0; |
365 | - debug("SCANCTRL %04X -> %d", m, gs.dropout_control); | | 368 | - debug("SCANCTRL %04X -> %d", m, gs.dropout_control); |
366 | + debug2("SCANCTRL %04X -> %d", m, gs.dropout_control); | | 369 | + debug2("SCANCTRL %04X -> %d", m, gs.dropout_control); |
367 | break; | | 370 | break; |
368 | case SCANTYPE: | | 371 | case SCANTYPE: |
369 | m = *(stack--); | | 372 | m = *(stack--); |
370 | - debug("###SCANTYPE %d", m); | | 373 | - debug("###SCANTYPE %d", m); |
371 | + debug1("###SCANTYPE %d", m); | | 374 | + debug1("###SCANTYPE %d", m); |
372 | // TODO | | 375 | // TODO |
373 | break; | | 376 | break; |
374 | case SCVTCI: | | 377 | case SCVTCI: |
| @@ -378,27 +381,27 @@ $NetBSD: patch-ai,v 1.1 2004/02/14 22:27 | | | @@ -378,27 +381,27 @@ $NetBSD: patch-ai,v 1.1 2004/02/14 22:27 |
378 | break; | | 381 | break; |
379 | case SSWCI: | | 382 | case SSWCI: |
380 | gs.swidth_cut_in = *(stack--); | | 383 | gs.swidth_cut_in = *(stack--); |
381 | - debug("SSWCI %d", gs.swidth_cut_in); | | 384 | - debug("SSWCI %d", gs.swidth_cut_in); |
382 | + debug1("SSWCI %d", gs.swidth_cut_in); | | 385 | + debug1("SSWCI %d", gs.swidth_cut_in); |
383 | break; | | 386 | break; |
384 | case SSW: | | 387 | case SSW: |
385 | gs.swidth_value = *(stack--); | | 388 | gs.swidth_value = *(stack--); |
386 | - debug("SSW %d", gs.swidth_value); | | 389 | - debug("SSW %d", gs.swidth_value); |
387 | + debug1("SSW %d", gs.swidth_value); | | 390 | + debug1("SSW %d", gs.swidth_value); |
388 | break; | | 391 | break; |
389 | case FLIPON: | | 392 | case FLIPON: |
390 | gs.auto_flip = 1; | | 393 | gs.auto_flip = 1; |
391 | @@ -715,37 +715,37 @@ | | 394 | @@ -713,37 +713,37 @@ |
392 | case SANGW: | | 395 | case SANGW: |
393 | // angle_weight is obsolete! | | 396 | // angle_weight is obsolete! |
394 | m = *(stack--); | | 397 | m = *(stack--); |
395 | - debug("SANGW %d is obsolete", m); | | 398 | - debug("SANGW %d is obsolete", m); |
396 | + debug1("SANGW %d is obsolete", m); | | 399 | + debug1("SANGW %d is obsolete", m); |
397 | break; | | 400 | break; |
398 | case SDB: | | 401 | case SDB: |
399 | gs.delta_base = *(stack--); | | 402 | gs.delta_base = *(stack--); |
400 | - debug("SDB %d", gs.delta_base); | | 403 | - debug("SDB %d", gs.delta_base); |
401 | + debug1("SDB %d", gs.delta_base); | | 404 | + debug1("SDB %d", gs.delta_base); |
402 | break; | | 405 | break; |
403 | case SDS: | | 406 | case SDS: |
404 | gs.delta_shift = *(stack--); | | 407 | gs.delta_shift = *(stack--); |
| @@ -424,126 +427,126 @@ $NetBSD: patch-ai,v 1.1 2004/02/14 22:27 | | | @@ -424,126 +427,126 @@ $NetBSD: patch-ai,v 1.1 2004/02/14 22:27 |
424 | - debug("\t=> %d", *stack); | | 427 | - debug("\t=> %d", *stack); |
425 | + debug1("\t=> %d", *stack); | | 428 | + debug1("\t=> %d", *stack); |
426 | break; | | 429 | break; |
427 | case SCFS: | | 430 | case SCFS: |
428 | // move point along freedom vector, so that | | 431 | // move point along freedom vector, so that |
429 | // projection gets desired length | | 432 | // projection gets desired length |
430 | m = *(stack--); | | 433 | m = *(stack--); |
431 | n = *(stack--); | | 434 | n = *(stack--); |
432 | - debug("SCFS p[%d][%d] to %f", gs.zp2 == p[1], n, m / FSHIFT); | | 435 | - debug("SCFS p[%d][%d] to %f", gs.zp2 == p[1], n, m / FSHIFT); |
433 | + debug3("SCFS p[%d][%d] to %f", gs.zp2 == p[1], n, m / FSHIFT); | | 436 | + debug3("SCFS p[%d][%d] to %f", gs.zp2 == p[1], n, m / FSHIFT); |
434 | pp = &gs.zp2[n]; | | 437 | pp = &gs.zp2[n]; |
435 | if (gs.zp2 == p[1]) { | | 438 | if (gs.zp2 == p[1]) { |
436 | int i = gs.absNewMeasure(pp->xnow, pp->ynow); | | 439 | int i = gs.absNewMeasure(pp->xnow, pp->ynow); |
437 | @@ -758,15 +758,15 @@ | | 440 | @@ -756,15 +756,15 @@ |
438 | case MD0: | | 441 | case MD0: |
439 | m = *(stack--); | | 442 | m = *(stack--); |
440 | n = *stack; | | 443 | n = *stack; |
441 | - debug("MD0 p[%d][%d] ", gs.zp1 == p[1], m); | | 444 | - debug("MD0 p[%d][%d] ", gs.zp1 == p[1], m); |
442 | - debug("- p[%d][%d]", gs.zp0 == p[1], n); | | 445 | - debug("- p[%d][%d]", gs.zp0 == p[1], n); |
443 | + debug2("MD0 p[%d][%d] ", gs.zp1 == p[1], m); | | 446 | + debug2("MD0 p[%d][%d] ", gs.zp1 == p[1], m); |
444 | + debug2("- p[%d][%d]", gs.zp0 == p[1], n); | | 447 | + debug2("- p[%d][%d]", gs.zp0 == p[1], n); |
445 | *stack = newMeasure(gs.zp0[n], gs.zp1[m]); | | 448 | *stack = newMeasure(gs.zp0[n], gs.zp1[m]); |
446 | break; | | 449 | break; |
447 | case MD1: | | 450 | case MD1: |
448 | m = *(stack--); | | 451 | m = *(stack--); |
449 | n = *stack; | | 452 | n = *stack; |
450 | - debug("MD1 p[%d][%d] ", gs.zp1 == p[1], m); | | 453 | - debug("MD1 p[%d][%d] ", gs.zp1 == p[1], m); |
451 | - debug("- p[%d][%d]", gs.zp0 == p[1], n); | | 454 | - debug("- p[%d][%d]", gs.zp0 == p[1], n); |
452 | + debug2("MD1 p[%d][%d] ", gs.zp1 == p[1], m); | | 455 | + debug2("MD1 p[%d][%d] ", gs.zp1 == p[1], m); |
453 | + debug2("- p[%d][%d]", gs.zp0 == p[1], n); | | 456 | + debug2("- p[%d][%d]", gs.zp0 == p[1], n); |
454 | *stack = oldMeasure(gs.zp0[n], gs.zp1[m]); // Thanks David | | 457 | *stack = oldMeasure(gs.zp0[n], gs.zp1[m]); // Thanks David |
455 | break; | | 458 | break; |
456 | case MPPEM: | | 459 | case MPPEM: |
457 | @@ -775,11 +775,11 @@ | | 460 | @@ -773,11 +773,11 @@ |
458 | if (m < 0) | | 461 | if (m < 0) |
459 | m = -m; | | 462 | m = -m; |
460 | *(++stack) = m; | | 463 | *(++stack) = m; |
461 | - debug("\t => mppem = %d", m); | | 464 | - debug("\t => mppem = %d", m); |
462 | + debug1("\t => mppem = %d", m); | | 465 | + debug1("\t => mppem = %d", m); |
463 | break; | | 466 | break; |
464 | case MPS: | | 467 | case MPS: |
465 | *(++stack) = pointSize; | | 468 | *(++stack) = pointSize; |
466 | - debug("MPS %d", *stack); | | 469 | - debug("MPS %d", *stack); |
467 | + debug1("MPS %d", *stack); | | 470 | + debug1("MPS %d", *stack); |
468 | break; | | 471 | break; |
469 | | | 472 | |
470 | // outline manipulation | | 473 | // outline manipulation |
471 | @@ -787,7 +787,7 @@ | | 474 | @@ -785,7 +785,7 @@ |
472 | case FLIPPT: | | 475 | case FLIPPT: |
473 | for (m = gs.loop; --m >= 0;) { | | 476 | for (m = gs.loop; --m >= 0;) { |
474 | n = *(stack--); | | 477 | n = *(stack--); |
475 | - debug("FLIPPT * %d p[%d][%d]", m, gs.zp0 == p[1], n); | | 478 | - debug("FLIPPT * %d p[%d][%d]", m, gs.zp0 == p[1], n); |
476 | + debug3("FLIPPT * %d p[%d][%d]", m, gs.zp0 == p[1], n); | | 479 | + debug3("FLIPPT * %d p[%d][%d]", m, gs.zp0 == p[1], n); |
477 | gs.zp1[n].flags ^= ON_CURVE; | | 480 | gs.zp1[n].flags ^= ON_CURVE; |
478 | } | | 481 | } |
479 | gs.loop = 1; | | 482 | gs.loop = 1; |
480 | @@ -795,7 +795,7 @@ | | 483 | @@ -793,7 +793,7 @@ |
481 | case FLIPRGON: | | 484 | case FLIPRGON: |
482 | m = *(stack--); | | 485 | m = *(stack--); |
483 | n = *(stack--); | | 486 | n = *(stack--); |
484 | - debug("FLIPRGON p[%d][%d .. %d]", gs.zp0 == p[1], n, m); | | 487 | - debug("FLIPRGON p[%d][%d .. %d]", gs.zp0 == p[1], n, m); |
485 | + debug3("FLIPRGON p[%d][%d .. %d]", gs.zp0 == p[1], n, m); | | 488 | + debug3("FLIPRGON p[%d][%d .. %d]", gs.zp0 == p[1], n, m); |
486 | pp = &gs.zp1[n]; | | 489 | pp = &gs.zp1[n]; |
487 | for (m -= n-1; --m >= 0; ++pp) | | 490 | for (m -= n-1; --m >= 0; ++pp) |
488 | pp->flags |= ON_CURVE; | | 491 | pp->flags |= ON_CURVE; |
489 | @@ -803,7 +803,7 @@ | | 492 | @@ -801,7 +801,7 @@ |
490 | case FLIPRGOFF: | | 493 | case FLIPRGOFF: |
491 | m = *(stack--); | | 494 | m = *(stack--); |
492 | n = *(stack--); | | 495 | n = *(stack--); |
493 | - debug("FLIPRGOFF p[%d][%d .. %d]", gs.zp0 == p[1], n, m); | | 496 | - debug("FLIPRGOFF p[%d][%d .. %d]", gs.zp0 == p[1], n, m); |
494 | + debug3("FLIPRGOFF p[%d][%d .. %d]", gs.zp0 == p[1], n, m); | | 497 | + debug3("FLIPRGOFF p[%d][%d .. %d]", gs.zp0 == p[1], n, m); |
495 | pp = &gs.zp1[n]; | | 498 | pp = &gs.zp1[n]; |
496 | for (m -= n-1; --m >= 0; ++pp) | | 499 | for (m -= n-1; --m >= 0; ++pp) |
497 | pp->flags &= ~ON_CURVE; | | 500 | pp->flags &= ~ON_CURVE; |
498 | @@ -814,8 +814,8 @@ | | 501 | @@ -812,8 +812,8 @@ |
499 | n = gs.absNewMeasure(pp->xnow - pp->xold, pp->ynow - pp->yold); | | 502 | n = gs.absNewMeasure(pp->xnow - pp->xold, pp->ynow - pp->yold); |
500 | for (m = gs.loop; --m >= 0;) { | | 503 | for (m = gs.loop; --m >= 0;) { |
501 | int i = *(stack--); | | 504 | int i = *(stack--); |
502 | - debug("SHP * %d p[%d], rp = p[%d]", m, i, pp-p[1]); | | 505 | - debug("SHP * %d p[%d], rp = p[%d]", m, i, pp-p[1]); |
503 | - debug(" moved by %f", n / FSHIFT); | | 506 | - debug(" moved by %f", n / FSHIFT); |
504 | + debug3("SHP * %d p[%d], rp = p[%d]", m, i, pp-p[1]); | | 507 | + debug3("SHP * %d p[%d], rp = p[%d]", m, i, pp-p[1]); |
505 | + debug1(" moved by %f", n / FSHIFT); | | 508 | + debug1(" moved by %f", n / FSHIFT); |
506 | gs.movePoint(gs.zp2[i], n); | | 509 | gs.movePoint(gs.zp2[i], n); |
507 | } | | 510 | } |
508 | gs.loop = 1; | | 511 | gs.loop = 1; |
509 | @@ -826,14 +826,14 @@ | | 512 | @@ -824,14 +824,14 @@ |
510 | m = *(stack--); | | 513 | m = *(stack--); |
511 | assert(m >= 0 && m < sizeContours); | | 514 | assert(m >= 0 && m < sizeContours); |
512 | pp = (opc & 1) ? &gs.zp0[gs.rp1] : &gs.zp1[gs.rp2]; | | 515 | pp = (opc & 1) ? &gs.zp0[gs.rp1] : &gs.zp1[gs.rp2]; |
513 | - debug("SHC%d rp[%d]", opc & 1, pp - p[1]); | | 516 | - debug("SHC%d rp[%d]", opc & 1, pp - p[1]); |
514 | + debug2("SHC%d rp[%d]", opc & 1, pp - p[1]); | | 517 | + debug2("SHC%d rp[%d]", opc & 1, pp - p[1]); |
515 | n = gs.absNewMeasure(pp->xnow - pp->xold, pp->ynow - pp->yold); | | 518 | n = gs.absNewMeasure(pp->xnow - pp->xold, pp->ynow - pp->yold); |
516 | int i = (m <= 0) ? 0 : endPoints[m-1] + 1; | | 519 | int i = (m <= 0) ? 0 : endPoints[m-1] + 1; |
517 | m = (gs.zp2 == p[0]) ? nPoints[0] : endPoints[m]; | | 520 | m = (gs.zp2 == p[0]) ? nPoints[0] : endPoints[m]; |
518 | for (; i <= m; ++i) { | | 521 | for (; i <= m; ++i) { |
519 | if (pp == &gs.zp2[i]) | | 522 | if (pp == &gs.zp2[i]) |
520 | continue; | | 523 | continue; |
521 | - debug("SHC%d p[%d] by %f\n", opc & 1, i, n / FSHIFT); | | 524 | - debug("SHC%d p[%d] by %f\n", opc & 1, i, n / FSHIFT); |
522 | + debug3("SHC%d p[%d] by %f\n", opc & 1, i, n / FSHIFT); | | 525 | + debug3("SHC%d p[%d] by %f\n", opc & 1, i, n / FSHIFT); |
523 | gs.movePoint(gs.zp2[i], n); | | 526 | gs.movePoint(gs.zp2[i], n); |
524 | } | | 527 | } |
525 | } | | 528 | } |
526 | @@ -841,32 +841,32 @@ | | 529 | @@ -839,32 +839,32 @@ |
527 | case SHZ0: | | 530 | case SHZ0: |
528 | case SHZ1: | | 531 | case SHZ1: |
529 | m = *(stack--); | | 532 | m = *(stack--); |
530 | - debug("SHZ%d rp = p[%d]\n ", opc & 1, | | 533 | - debug("SHZ%d rp = p[%d]\n ", opc & 1, |
531 | + debug2("SHZ%d rp = p[%d]\n ", opc & 1, | | 534 | + debug2("SHZ%d rp = p[%d]\n ", opc & 1, |
532 | (opc & 1) ? gs.rp1 : gs.rp2); | | 535 | (opc & 1) ? gs.rp1 : gs.rp2); |
533 | pp = (opc & 1) ? &gs.zp0[gs.rp1] : &gs.zp1[gs.rp2]; | | 536 | pp = (opc & 1) ? &gs.zp0[gs.rp1] : &gs.zp1[gs.rp2]; |
534 | n = gs.absNewMeasure(pp->xnow - pp->xold, pp->ynow - pp->yold); | | 537 | n = gs.absNewMeasure(pp->xnow - pp->xold, pp->ynow - pp->yold); |
535 | assert(m >= 0 && m <= 1); | | 538 | assert(m >= 0 && m <= 1); |
536 | for (point *pp1 = p[m], *pp2 = pp1 + nPoints[m]; pp1 < pp2; ++pp1) { | | 539 | for (Point *pp1 = p[m], *pp2 = pp1 + nPoints[m]; pp1 < pp2; ++pp1) { |
537 | if (pp1 == pp) continue; | | 540 | if (pp1 == pp) continue; |
538 | - debug("\nSHZ p[%d] by %f", pp1 - p[m], n / FSHIFT); | | 541 | - debug("\nSHZ p[%d] by %f", pp1 - p[m], n / FSHIFT); |
539 | - debug("\t(%d %d) -> ", pp1->xnow, pp1->ynow); | | 542 | - debug("\t(%d %d) -> ", pp1->xnow, pp1->ynow); |
540 | + debug2("\nSHZ p[%d] by %f", pp1 - p[m], n / FSHIFT); | | 543 | + debug2("\nSHZ p[%d] by %f", pp1 - p[m], n / FSHIFT); |
541 | + debug2("\t(%d %d) -> ", pp1->xnow, pp1->ynow); | | 544 | + debug2("\t(%d %d) -> ", pp1->xnow, pp1->ynow); |
542 | pp1->xnow += (n * gs.move_x) >> 14; | | 545 | pp1->xnow += (n * gs.move_x) >> 14; |
543 | pp1->ynow += (n * gs.move_y) >> 14; | | 546 | pp1->ynow += (n * gs.move_y) >> 14; |
544 | - debug("(%d %d)\n", pp1->xnow, pp1->ynow); | | 547 | - debug("(%d %d)\n", pp1->xnow, pp1->ynow); |
545 | + debug2("(%d %d)\n", pp1->xnow, pp1->ynow); | | 548 | + debug2("(%d %d)\n", pp1->xnow, pp1->ynow); |
546 | } | | 549 | } |
547 | break; | | 550 | break; |
548 | case SHPIX: | | 551 | case SHPIX: |
549 | m = *(stack--); | | 552 | m = *(stack--); |
| @@ -554,378 +557,378 @@ $NetBSD: patch-ai,v 1.1 2004/02/14 22:27 | | | @@ -554,378 +557,378 @@ $NetBSD: patch-ai,v 1.1 2004/02/14 22:27 |
554 | + debug3("SHPIX * %d p[%d][%d] ", n, gs.zp2 == p[1], i); | | 557 | + debug3("SHPIX * %d p[%d][%d] ", n, gs.zp2 == p[1], i); |
555 | + debug1("by %f", m / FSHIFT); | | 558 | + debug1("by %f", m / FSHIFT); |
556 | pp = &gs.zp2[i]; | | 559 | pp = &gs.zp2[i]; |
557 | - debug("\n%d %d ->", pp->xnow, pp->ynow); | | 560 | - debug("\n%d %d ->", pp->xnow, pp->ynow); |
558 | + debug2("\n%d %d ->", pp->xnow, pp->ynow); | | 561 | + debug2("\n%d %d ->", pp->xnow, pp->ynow); |
559 | pp->xnow += (m * gs.f_vec_x) >> 14; | | 562 | pp->xnow += (m * gs.f_vec_x) >> 14; |
560 | pp->ynow += (m * gs.f_vec_y) >> 14; | | 563 | pp->ynow += (m * gs.f_vec_y) >> 14; |
561 | pp->flags |= gs.flags; | | 564 | pp->flags |= gs.flags; |
562 | - debug("\t%d %d", pp->xnow, pp->ynow); | | 565 | - debug("\t%d %d", pp->xnow, pp->ynow); |
563 | + debug2("\t%d %d", pp->xnow, pp->ynow); | | 566 | + debug2("\t%d %d", pp->xnow, pp->ynow); |
564 | } | | 567 | } |
565 | gs.loop = 1; | | 568 | gs.loop = 1; |
566 | break; | | 569 | break; |
567 | @@ -876,8 +876,8 @@ | | 570 | @@ -874,8 +874,8 @@ |
568 | n = *(stack--); | | 571 | n = *(stack--); |
569 | gs.rp2 = n; | | 572 | gs.rp2 = n; |
570 | gs.rp1 = gs.rp0; | | 573 | gs.rp1 = gs.rp0; |
571 | - debug("MSIRP%d p[%d][%d] ", opc & 1, gs.zp1 == p[1], n); | | 574 | - debug("MSIRP%d p[%d][%d] ", opc & 1, gs.zp1 == p[1], n); |
572 | - debug("to %f, rp = p[%d][%d]", m / FSHIFT, | | 575 | - debug("to %f, rp = p[%d][%d]", m / FSHIFT, |
573 | + debug3("MSIRP%d p[%d][%d] ", opc & 1, gs.zp1 == p[1], n); | | 576 | + debug3("MSIRP%d p[%d][%d] ", opc & 1, gs.zp1 == p[1], n); |
574 | + debug3("to %f, rp = p[%d][%d]", m / FSHIFT, | | 577 | + debug3("to %f, rp = p[%d][%d]", m / FSHIFT, |
575 | gs.zp0 == p[1], gs.rp0); | | 578 | gs.zp0 == p[1], gs.rp0); |
576 | if (gs.zp1 == p[1]) { | | 579 | if (gs.zp1 == p[1]) { |
577 | int i = newMeasure(p[1][n], gs.zp0[gs.rp0]); | | 580 | int i = newMeasure(p[1][n], gs.zp0[gs.rp0]); |
578 | @@ -895,9 +895,9 @@ | | 581 | @@ -893,9 +893,9 @@ |
579 | case MDAP0: | | 582 | case MDAP0: |
580 | case MDAP1: | | 583 | case MDAP1: |
581 | gs.rp0 = gs.rp1 = *(stack--); | | 584 | gs.rp0 = gs.rp1 = *(stack--); |
582 | - debug("MDAP%d p[%d]", opc & 1, gs.rp0); | | 585 | - debug("MDAP%d p[%d]", opc & 1, gs.rp0); |
583 | + debug2("MDAP%d p[%d]", opc & 1, gs.rp0); | | 586 | + debug2("MDAP%d p[%d]", opc & 1, gs.rp0); |
584 | pp = &gs.zp0[gs.rp0]; | | 587 | pp = &gs.zp0[gs.rp0]; |
585 | - debug("\nxy %d %d", pp->xnow, pp->ynow); | | 588 | - debug("\nxy %d %d", pp->xnow, pp->ynow); |
586 | + debug2("\nxy %d %d", pp->xnow, pp->ynow); | | 589 | + debug2("\nxy %d %d", pp->xnow, pp->ynow); |
587 | pp->flags |= gs.flags; | | 590 | pp->flags |= gs.flags; |
588 | if (opc & 1) { | | 591 | if (opc & 1) { |
589 | #if 0 // XXX | | 592 | #if 0 // XXX |
590 | @@ -905,11 +905,11 @@ | | 593 | @@ -903,11 +903,11 @@ |
591 | pp->xnow = round(pp->xnow); | | 594 | pp->xnow = round(pp->xnow); |
592 | if (gs.f_vec_y) | | 595 | if (gs.f_vec_y) |
593 | pp->ynow = round(pp->ynow); | | 596 | pp->ynow = round(pp->ynow); |
594 | - debug("\t-> %d %d", pp->xnow, pp->ynow); | | 597 | - debug("\t-> %d %d", pp->xnow, pp->ynow); |
595 | + debug2("\t-> %d %d", pp->xnow, pp->ynow); | | 598 | + debug2("\t-> %d %d", pp->xnow, pp->ynow); |
596 | #else | | 599 | #else |
597 | m = gs.absNewMeasure(pp->xnow, pp->ynow); | | 600 | m = gs.absNewMeasure(pp->xnow, pp->ynow); |
598 | gs.movePoint(*pp, round(m) - m); | | 601 | gs.movePoint(*pp, round(m) - m); |
599 | - debug("\t-> %d %d", pp->xnow, pp->ynow); | | 602 | - debug("\t-> %d %d", pp->xnow, pp->ynow); |
600 | + debug2("\t-> %d %d", pp->xnow, pp->ynow); | | 603 | + debug2("\t-> %d %d", pp->xnow, pp->ynow); |
601 | #endif | | 604 | #endif |
602 | } | | 605 | } |
603 | break; | | 606 | break; |
604 | @@ -917,10 +917,10 @@ | | 607 | @@ -915,10 +915,10 @@ |
605 | case MIAP1: | | 608 | case MIAP1: |
606 | m = *(stack--); | | 609 | m = *(stack--); |
607 | gs.rp0 = gs.rp1 = *(stack--); | | 610 | gs.rp0 = gs.rp1 = *(stack--); |
608 | - debug("MIAP%d p[%d][%d] ", opc & 1, gs.zp0 == p[1], gs.rp0); | | 611 | - debug("MIAP%d p[%d][%d] ", opc & 1, gs.zp0 == p[1], gs.rp0); |
609 | - debug("to cvt[%d] = ", m); | | 612 | - debug("to cvt[%d] = ", m); |
610 | + debug3("MIAP%d p[%d][%d] ", opc & 1, gs.zp0 == p[1], gs.rp0); | | 613 | + debug3("MIAP%d p[%d][%d] ", opc & 1, gs.zp0 == p[1], gs.rp0); |
611 | + debug1("to cvt[%d] = ", m); | | 614 | + debug1("to cvt[%d] = ", m); |
612 | m = cvt[m]; | | 615 | m = cvt[m]; |
613 | - debug("%f", m / FSHIFT); | | 616 | - debug("%f", m / FSHIFT); |
614 | + debug1("%f", m / FSHIFT); | | 617 | + debug1("%f", m / FSHIFT); |
615 | if (gs.zp0 != p[0]) { | | 618 | if (gs.zp0 != p[0]) { |
616 | pp = &p[1][gs.rp0]; | | 619 | pp = &p[1][gs.rp0]; |
617 | int i = gs.absNewMeasure(pp->xnow, pp->ynow); | | 620 | int i = gs.absNewMeasure(pp->xnow, pp->ynow); |
618 | @@ -929,7 +929,7 @@ | | 621 | @@ -927,7 +927,7 @@ |
619 | m = i; | | 622 | m = i; |
620 | m = round(m); | | 623 | m = round(m); |
621 | } | | 624 | } |
622 | - debug("\nabsdist = %f", i / FSHIFT); | | 625 | - debug("\nabsdist = %f", i / FSHIFT); |
623 | + debug1("\nabsdist = %f", i / FSHIFT); | | 626 | + debug1("\nabsdist = %f", i / FSHIFT); |
624 | gs.movePoint(gs.zp0[gs.rp0], m - i); | | 627 | gs.movePoint(gs.zp0[gs.rp0], m - i); |
625 | } else { // magic in the twilight zone | | 628 | } else { // magic in the twilight zone |
626 | pp = &p[0][gs.rp0]; | | 629 | pp = &p[0][gs.rp0]; |
627 | @@ -959,18 +959,18 @@ | | 630 | @@ -957,18 +957,18 @@ |
628 | case MDRP1E: case MDRP1F: | | 631 | case MDRP1E: case MDRP1F: |
629 | gs.rp2 = *(stack--); | | 632 | gs.rp2 = *(stack--); |
630 | gs.rp1 = gs.rp0; | | 633 | gs.rp1 = gs.rp0; |
631 | - debug("#MDRP%02X p[%d], rp = p[%d]", opc & 15, gs.rp2, gs.rp0); | | 634 | - debug("#MDRP%02X p[%d], rp = p[%d]", opc & 15, gs.rp2, gs.rp0); |
632 | + debug3("#MDRP%02X p[%d], rp = p[%d]", opc & 15, gs.rp2, gs.rp0); | | 635 | + debug3("#MDRP%02X p[%d], rp = p[%d]", opc & 15, gs.rp2, gs.rp0); |
633 | n = oldMeasure(gs.zp1[gs.rp2], gs.zp0[gs.rp0]); | | 636 | n = oldMeasure(gs.zp1[gs.rp2], gs.zp0[gs.rp0]); |
634 | m = newMeasure(gs.zp1[gs.rp2], gs.zp0[gs.rp0]); | | 637 | m = newMeasure(gs.zp1[gs.rp2], gs.zp0[gs.rp0]); |
635 | - debug("\nwgoaldist = %f, nowdist = %f", n / FSHIFT, m / FSHIFT); | | 638 | - debug("\nwgoaldist = %f, nowdist = %f", n / FSHIFT, m / FSHIFT); |
636 | - debug("\n(%d %d)-", gs.zp1[gs.rp2].xnow, gs.zp1[gs.rp2].ynow); | | 639 | - debug("\n(%d %d)-", gs.zp1[gs.rp2].xnow, gs.zp1[gs.rp2].ynow); |
637 | - debug("rp0(%d %d)", gs.zp0[gs.rp0].xnow, gs.zp0[gs.rp0].ynow); | | 640 | - debug("rp0(%d %d)", gs.zp0[gs.rp0].xnow, gs.zp0[gs.rp0].ynow); |
638 | + debug2("\nwgoaldist = %f, nowdist = %f", n / FSHIFT, m / FSHIFT); | | 641 | + debug2("\nwgoaldist = %f, nowdist = %f", n / FSHIFT, m / FSHIFT); |
639 | + debug2("\n(%d %d)-", gs.zp1[gs.rp2].xnow, gs.zp1[gs.rp2].ynow); | | 642 | + debug2("\n(%d %d)-", gs.zp1[gs.rp2].xnow, gs.zp1[gs.rp2].ynow); |
640 | + debug2("rp0(%d %d)", gs.zp0[gs.rp0].xnow, gs.zp0[gs.rp0].ynow); | | 643 | + debug2("rp0(%d %d)", gs.zp0[gs.rp0].xnow, gs.zp0[gs.rp0].ynow); |
641 | | | 644 | |
642 | if (((n >= 0) ? +n : -n) < gs.swidth_cut_in) | | 645 | if (((n >= 0) ? +n : -n) < gs.swidth_cut_in) |
643 | n = (n >= 0) ? +gs.swidth_value : -gs.swidth_value; | | 646 | n = (n >= 0) ? +gs.swidth_value : -gs.swidth_value; |
644 | if (opc & 0x10) | | 647 | if (opc & 0x10) |
645 | gs.rp0 = gs.rp2; | | 648 | gs.rp0 = gs.rp2; |
646 | - debug("\nmdrp1.wanted = %d", n); | | 649 | - debug("\nmdrp1.wanted = %d", n); |
647 | + debug1("\nmdrp1.wanted = %d", n); | | 650 | + debug1("\nmdrp1.wanted = %d", n); |
648 | if (opc & 0x08) | | 651 | if (opc & 0x08) { |
649 | if (n >= 0) { | | 652 | if (n >= 0) { |
650 | if (n < +gs.min_distance) | | 653 | if (n < +gs.min_distance) |
651 | @@ -981,7 +981,7 @@ | | 654 | @@ -980,7 +980,7 @@ |
652 | } | | 655 | } |
653 | if (opc & 0x04) | | 656 | if (opc & 0x04) |
654 | n = round(n); | | 657 | n = round(n); |
655 | - debug("\nmdrp2.wanted = %d", n); | | 658 | - debug("\nmdrp2.wanted = %d", n); |
656 | + debug1("\nmdrp2.wanted = %d", n); | | 659 | + debug1("\nmdrp2.wanted = %d", n); |
657 | // XXX: ignore black/gray/white for now | | 660 | // XXX: ignore black/gray/white for now |
658 | gs.movePoint(gs.zp1[gs.rp2], n - m); | | 661 | gs.movePoint(gs.zp1[gs.rp2], n - m); |
659 | break; | | 662 | break; |
660 | @@ -1005,10 +1005,10 @@ | | 663 | @@ -1004,10 +1004,10 @@ |
661 | m = *(stack--); | | 664 | m = *(stack--); |
662 | gs.rp2 = *(stack--); | | 665 | gs.rp2 = *(stack--); |
663 | pp = &gs.zp1[gs.rp2]; | | 666 | pp = &gs.zp1[gs.rp2]; |
664 | - debug("#MIRP%02X p[%d] with cvt[%d]", opc & 15, gs.rp2, m); | | 667 | - debug("#MIRP%02X p[%d] with cvt[%d]", opc & 15, gs.rp2, m); |
665 | + debug3("#MIRP%02X p[%d] with cvt[%d]", opc & 15, gs.rp2, m); | | 668 | + debug3("#MIRP%02X p[%d] with cvt[%d]", opc & 15, gs.rp2, m); |
666 | | | 669 | |
667 | m = cvt[m]; | | 670 | m = cvt[m]; |
668 | - debug(" = %f, rp = p[%d]", m / FSHIFT, gs.rp0); | | 671 | - debug(" = %f, rp = p[%d]", m / FSHIFT, gs.rp0); |
669 | + debug2(" = %f, rp = p[%d]", m / FSHIFT, gs.rp0); | | 672 | + debug2(" = %f, rp = p[%d]", m / FSHIFT, gs.rp0); |
670 | if (((m >= 0)? +m : -m) < +gs.swidth_cut_in) | | 673 | if (((m >= 0)? +m : -m) < +gs.swidth_cut_in) |
671 | m = (m >= 0) ? +gs.swidth_value : -gs.swidth_value; | | 674 | m = (m >= 0) ? +gs.swidth_value : -gs.swidth_value; |
672 | | | 675 | |
673 | @@ -1016,7 +1016,7 @@ | | 676 | @@ -1015,7 +1015,7 @@ |
674 | | | 677 | |
675 | if ((n^m) < 0 && gs.auto_flip) { | | 678 | if ((n^m) < 0 && gs.auto_flip) { |
676 | m = -m; | | 679 | m = -m; |
677 | - debug("\nautoflip m = %f", m / FSHIFT); | | 680 | - debug("\nautoflip m = %f", m / FSHIFT); |
678 | + debug1("\nautoflip m = %f", m / FSHIFT); | | 681 | + debug1("\nautoflip m = %f", m / FSHIFT); |
679 | } | | 682 | } |
680 | if (opc & 0x04) { | | 683 | if (opc & 0x04) { |
681 | if (((m>n) ? m - n : n - m) >= +gs.cvt_cut_in) | | 684 | if (((m>n) ? m - n : n - m) >= +gs.cvt_cut_in) |
682 | @@ -1041,7 +1041,7 @@ | | 685 | @@ -1040,7 +1040,7 @@ |
683 | case ALIGNRP: | | 686 | case ALIGNRP: |
684 | for (m = gs.loop; --m >= 0;) { | | 687 | for (m = gs.loop; --m >= 0;) { |
685 | int n = *(stack--); | | 688 | int n = *(stack--); |
686 | - debug("ALIGNRP * %d p[%d], rp0 = p[%d]", m, n, gs.rp0); | | 689 | - debug("ALIGNRP * %d p[%d], rp0 = p[%d]", m, n, gs.rp0); |
687 | + debug3("ALIGNRP * %d p[%d], rp0 = p[%d]", m, n, gs.rp0); | | 690 | + debug3("ALIGNRP * %d p[%d], rp0 = p[%d]", m, n, gs.rp0); |
688 | int i = newMeasure(gs.zp0[gs.rp0], gs.zp1[n]); | | 691 | int i = newMeasure(gs.zp0[gs.rp0], gs.zp1[n]); |
689 | gs.movePoint(gs.zp1[n], i); | | 692 | gs.movePoint(gs.zp1[n], i); |
690 | } | | 693 | } |
691 | @@ -1051,7 +1051,7 @@ | | 694 | @@ -1050,7 +1050,7 @@ |
692 | { | | 695 | { |
693 | m = *(stack--); | | 696 | m = *(stack--); |
694 | n = *(stack--); | | 697 | n = *(stack--); |
695 | - debug("ALIGNPTS %d %d", m, n); | | 698 | - debug("ALIGNPTS %d %d", m, n); |
696 | + debug2("ALIGNPTS %d %d", m, n); | | 699 | + debug2("ALIGNPTS %d %d", m, n); |
697 | int i = newMeasure(gs.zp0[m], gs.zp1[n]) >> 1; | | 700 | int i = newMeasure(gs.zp0[m], gs.zp1[n]) >> 1; |
698 | gs.movePoint(gs.zp0[m], -i); | | 701 | gs.movePoint(gs.zp0[m], -i); |
699 | gs.movePoint(gs.zp1[n], +i); | | 702 | gs.movePoint(gs.zp1[n], +i); |
700 | @@ -1065,9 +1065,9 @@ | | 703 | @@ -1064,9 +1064,9 @@ |
701 | point* pp4 = &gs.zp0[*(stack--)]; | | 704 | Point *pp4 = &gs.zp0[*(stack--)]; |
702 | m = *(stack--); | | 705 | m = *(stack--); |
703 | | | 706 | |
704 | - debug("ISECT p[%d] ", m); | | 707 | - debug("ISECT p[%d] ", m); |
705 | - debug("between p[%d]-p[%d] ", pp1-gs.zp1, pp2-gs.zp1); | | 708 | - debug("between p[%d]-p[%d] ", pp1-gs.zp1, pp2-gs.zp1); |
706 | - debug("and p[%d]-p[%d] ", pp3-gs.zp0, pp4-gs.zp0); | | 709 | - debug("and p[%d]-p[%d] ", pp3-gs.zp0, pp4-gs.zp0); |
707 | + debug1("ISECT p[%d] ", m); | | 710 | + debug1("ISECT p[%d] ", m); |
708 | + debug2("between p[%d]-p[%d] ", pp1-gs.zp1, pp2-gs.zp1); | | 711 | + debug2("between p[%d]-p[%d] ", pp1-gs.zp1, pp2-gs.zp1); |
709 | + debug2("and p[%d]-p[%d] ", pp3-gs.zp0, pp4-gs.zp0); | | 712 | + debug2("and p[%d]-p[%d] ", pp3-gs.zp0, pp4-gs.zp0); |
710 | | | 713 | |
711 | int f1 = (pp1->xnow - pp3->xnow) * (pp4->ynow - pp3->ynow) - | | 714 | int f1 = (pp1->xnow - pp3->xnow) * (pp4->ynow - pp3->ynow) - |
712 | (pp1->ynow - pp3->ynow) * (pp4->xnow - pp3->xnow); | | 715 | (pp1->ynow - pp3->ynow) * (pp4->xnow - pp3->xnow); |
713 | @@ -1087,7 +1087,7 @@ | | 716 | @@ -1086,7 +1086,7 @@ |
714 | MULDIV(f1, pp2->ynow - pp1->ynow, f2); | | 717 | MULDIV(f1, pp2->ynow - pp1->ynow, f2); |
715 | } | | 718 | } |
716 | | | 719 | |
717 | - debug("\n-> %d %d", pp3->xnow, pp3->ynow); | | 720 | - debug("\n-> %d %d", pp3->xnow, pp3->ynow); |
718 | + debug2("\n-> %d %d", pp3->xnow, pp3->ynow); | | 721 | + debug2("\n-> %d %d", pp3->xnow, pp3->ynow); |
719 | } | | 722 | } |
720 | break; | | 723 | break; |
721 | case AA: | | 724 | case AA: |
722 | @@ -1097,9 +1097,9 @@ | | 725 | @@ -1096,9 +1096,9 @@ |
723 | case IP: | | 726 | case IP: |
724 | for (m = gs.loop; --m >= 0;) { | | 727 | for (m = gs.loop; --m >= 0;) { |
725 | int n = *(stack--); | | 728 | int n = *(stack--); |
726 | - debug("IP * %d p[%d] ", m, n); | | 729 | - debug("IP * %d p[%d] ", m, n); |
727 | - debug("between p[%d][%d] ", gs.zp1 == p[1], gs.rp2); | | 730 | - debug("between p[%d][%d] ", gs.zp1 == p[1], gs.rp2); |
728 | - debug("and p[%d][%d]", gs.zp0 == p[1], gs.rp1); | | 731 | - debug("and p[%d][%d]", gs.zp0 == p[1], gs.rp1); |
729 | + debug2("IP * %d p[%d] ", m, n); | | 732 | + debug2("IP * %d p[%d] ", m, n); |
730 | + debug2("between p[%d][%d] ", gs.zp1 == p[1], gs.rp2); | | 733 | + debug2("between p[%d][%d] ", gs.zp1 == p[1], gs.rp2); |
731 | + debug2("and p[%d][%d]", gs.zp0 == p[1], gs.rp1); | | 734 | + debug2("and p[%d][%d]", gs.zp0 == p[1], gs.rp1); |
732 | interpolate(gs.zp2[n], gs.zp1[gs.rp2], gs.zp0[gs.rp1]); | | 735 | interpolate(gs.zp2[n], gs.zp1[gs.rp2], gs.zp0[gs.rp1]); |
733 | debug("\n"); | | 736 | debug("\n"); |
734 | } | | 737 | } |
735 | @@ -1108,13 +1108,13 @@ | | 738 | @@ -1107,13 +1107,13 @@ |
736 | case UTP: | | 739 | case UTP: |
737 | m = *(stack--); | | 740 | m = *(stack--); |
738 | gs.zp0[m].flags &= ~(X_TOUCHED | Y_TOUCHED); | | 741 | gs.zp0[m].flags &= ~(X_TOUCHED | Y_TOUCHED); |
739 | - debug("UTP p[%d]", m); | | 742 | - debug("UTP p[%d]", m); |
740 | + debug1("UTP p[%d]", m); | | 743 | + debug1("UTP p[%d]", m); |
741 | break; | | 744 | break; |
742 | case IUP0: | | 745 | case IUP0: |
743 | pp = p[1]; | | 746 | pp = p[1]; |
744 | for (m = 0; m < nEndPoints; ++m) { | | 747 | for (m = 0; m < nEndPoints; ++m) { |
745 | point* last = p[1] + endPoints[m]; | | 748 | Point *last = p[1] + endPoints[m]; |
746 | - debug("IUP0 p[%d .. %d]", pp - p[1], last - p[1]); | | 749 | - debug("IUP0 p[%d .. %d]", pp - p[1], last - p[1]); |
747 | + debug2("IUP0 p[%d .. %d]", pp - p[1], last - p[1]); | | 750 | + debug2("IUP0 p[%d .. %d]", pp - p[1], last - p[1]); |
748 | doIUP0(pp, last); | | 751 | doIUP0(pp, last); |
749 | pp = last + 1; | | 752 | pp = last + 1; |
750 | } | | 753 | } |
751 | @@ -1123,7 +1123,7 @@ | | 754 | @@ -1122,7 +1122,7 @@ |
752 | pp = p[1]; | | 755 | pp = p[1]; |
753 | for (m = 0; m < nEndPoints; ++m) { | | 756 | for (m = 0; m < nEndPoints; ++m) { |
754 | point* last = p[1] + endPoints[m]; | | 757 | Point *last = p[1] + endPoints[m]; |
755 | - debug("IUP1 p[%d .. %d]", pp - p[1], last - p[1]); | | 758 | - debug("IUP1 p[%d .. %d]", pp - p[1], last - p[1]); |
756 | + debug2("IUP1 p[%d .. %d]", pp - p[1], last - p[1]); | | 759 | + debug2("IUP1 p[%d .. %d]", pp - p[1], last - p[1]); |
757 | doIUP1(pp, last); | | 760 | doIUP1(pp, last); |
758 | pp = last + 1; | | 761 | pp = last + 1; |
759 | } | | 762 | } |
760 | @@ -1138,11 +1138,11 @@ | | 763 | @@ -1137,11 +1137,11 @@ |
761 | n = 0; | | 764 | n = 0; |
762 | deltap_label: | | 765 | deltap_label: |
763 | m = *(stack--); | | 766 | m = *(stack--); |
764 | - debug("DELTAP%d * %d", (-n >> 4) + 1, m); | | 767 | - debug("DELTAP%d * %d", (-n >> 4) + 1, m); |
765 | - debug("\tmppem=%d, deltabase=%d", mppem, gs.delta_base); | | 768 | - debug("\tmppem=%d, deltabase=%d", mppem, gs.delta_base); |
766 | + debug2("DELTAP%d * %d", (-n >> 4) + 1, m); | | 769 | + debug2("DELTAP%d * %d", (-n >> 4) + 1, m); |
767 | + debug2("\tmppem=%d, deltabase=%d", mppem, gs.delta_base); | | 770 | + debug2("\tmppem=%d, deltabase=%d", mppem, gs.delta_base); |
768 | n += mppem - gs.delta_base; | | 771 | n += mppem - gs.delta_base; |
769 | if (n < 0 || n > 15) { | | 772 | if (n < 0 || n > 15) { |
770 | - debug("\n=> skipping %d exceptions", m); | | 773 | - debug("\n=> skipping %d exceptions", m); |
771 | + debug1("\n=> skipping %d exceptions", m); | | 774 | + debug1("\n=> skipping %d exceptions", m); |
772 | stack -= m << 1; | | 775 | stack -= m << 1; |
773 | break; | | 776 | break; |
774 | } | | 777 | } |
775 | @@ -1150,8 +1150,8 @@ | | 778 | @@ -1149,8 +1149,8 @@ |
776 | while (--m >= 0) { | | 779 | while (--m >= 0) { |
777 | int pno = *(stack--); | | 780 | int pno = *(stack--); |
778 | int arg = *(stack--); | | 781 | int arg = *(stack--); |
779 | - debug("\np[%d] arg %04X", pno, arg); | | 782 | - debug("\np[%d] arg %04X", pno, arg); |
780 | - debug("\targ.n=%d, n=%d", arg >> 4, n >> 4); | | 783 | - debug("\targ.n=%d, n=%d", arg >> 4, n >> 4); |
781 | + debug2("\np[%d] arg %04X", pno, arg); | | 784 | + debug2("\np[%d] arg %04X", pno, arg); |
782 | + debug2("\targ.n=%d, n=%d", arg >> 4, n >> 4); | | 785 | + debug2("\targ.n=%d, n=%d", arg >> 4, n >> 4); |
783 | if (n > (arg & 0xf0)) | | 786 | if (n > (arg & 0xf0)) |
784 | break; | | 787 | break; |
785 | if (n == (arg & 0xf0)) { | | 788 | if (n == (arg & 0xf0)) { |
786 | @@ -1159,7 +1159,7 @@ | | 789 | @@ -1158,7 +1158,7 @@ |
787 | if (arg >= 0) | | 790 | if (arg >= 0) |
788 | ++arg; | | 791 | ++arg; |
789 | arg <<= (SHIFT - gs.delta_shift); | | 792 | arg <<= (SHIFT - gs.delta_shift); |
790 | - debug("\tmoving by %f from (%d %d) ", | | 793 | - debug("\tmoving by %f from (%d %d) ", |
791 | + debug3("\tmoving by %f from (%d %d) ", | | 794 | + debug3("\tmoving by %f from (%d %d) ", |
792 | arg / FSHIFT, | | 795 | arg / FSHIFT, |
793 | gs.zp0[pno].xnow, gs.zp0[pno].ynow); | | 796 | gs.zp0[pno].xnow, gs.zp0[pno].ynow); |
794 | #if 0 | | 797 | #if 0 |
795 | @@ -1169,7 +1169,7 @@ | | 798 | @@ -1168,7 +1168,7 @@ |
796 | gs.zp0[pno].ynow += (arg * gs.f_vec_y) >> 14; | | 799 | gs.zp0[pno].ynow += (arg * gs.f_vec_y) >> 14; |
797 | gs.zp0[pno].flags |= gs.flags; | | 800 | gs.zp0[pno].flags |= gs.flags; |
798 | #endif | | 801 | #endif |
799 | - debug("to (%d %d)\n", | | 802 | - debug("to (%d %d)\n", |
800 | + debug2("to (%d %d)\n", | | 803 | + debug2("to (%d %d)\n", |
801 | gs.zp0[pno].xnow, gs.zp0[pno].ynow); | | 804 | gs.zp0[pno].xnow, gs.zp0[pno].ynow); |
802 | } | | 805 | } |
803 | } | | 806 | } |
804 | @@ -1198,8 +1198,8 @@ | | 807 | @@ -1197,8 +1197,8 @@ |
805 | n = 0; | | 808 | n = 0; |
806 | deltac_label: | | 809 | deltac_label: |
807 | m = *(stack--); | | 810 | m = *(stack--); |
808 | - debug("DELTAC%d * %d", (-n >> 4) + 1, m); | | 811 | - debug("DELTAC%d * %d", (-n >> 4) + 1, m); |
809 | - debug("\tmppem=%d, deltabase=%d", mppem, gs.delta_base); | | 812 | - debug("\tmppem=%d, deltabase=%d", mppem, gs.delta_base); |
810 | + debug2("DELTAC%d * %d", (-n >> 4) + 1, m); | | 813 | + debug2("DELTAC%d * %d", (-n >> 4) + 1, m); |
811 | + debug2("\tmppem=%d, deltabase=%d", mppem, gs.delta_base); | | 814 | + debug2("\tmppem=%d, deltabase=%d", mppem, gs.delta_base); |
812 | n += mppem - gs.delta_base; | | 815 | n += mppem - gs.delta_base; |
813 | if (n < 0 || n > 15) { | | 816 | if (n < 0 || n > 15) { |
814 | stack -= m << 1; | | 817 | stack -= m << 1; |
815 | @@ -1209,7 +1209,7 @@ | | 818 | @@ -1208,7 +1208,7 @@ |
816 | while (--m >= 0) { | | 819 | while (--m >= 0) { |
817 | int cno = *(stack--); | | 820 | int cno = *(stack--); |
818 | int arg = *(stack--); | | 821 | int arg = *(stack--); |
819 | - debug("\ncvt[%d] arg = %04X, n = %d", | | 822 | - debug("\ncvt[%d] arg = %04X, n = %d", |
820 | + debug3("\ncvt[%d] arg = %04X, n = %d", | | 823 | + debug3("\ncvt[%d] arg = %04X, n = %d", |
821 | cno, arg, n >> 4); | | 824 | cno, arg, n >> 4); |
822 | if (n > (arg & 0xf0)) | | 825 | if (n > (arg & 0xf0)) |
823 | break; | | 826 | break; |
824 | @@ -1217,10 +1217,10 @@ | | 827 | @@ -1216,10 +1216,10 @@ |
825 | arg = (arg & 15) - 8; | | 828 | arg = (arg & 15) - 8; |
826 | if (arg >= 0) ++arg; | | 829 | if (arg >= 0) ++arg; |
827 | arg <<= SHIFT - gs.delta_shift; | | 830 | arg <<= SHIFT - gs.delta_shift; |
828 | - debug("\tmoved by %f,\t%d ", | | 831 | - debug("\tmoved by %f,\t%d ", |
829 | + debug2("\tmoved by %f,\t%d ", | | 832 | + debug2("\tmoved by %f,\t%d ", |
830 | arg / FSHIFT, cvt[cno]); | | 833 | arg / FSHIFT, cvt[cno]); |
831 | cvt[cno] += arg; | | 834 | cvt[cno] += arg; |
832 | - debug("-> %d", cvt[cno]); | | 835 | - debug("-> %d", cvt[cno]); |
833 | + debug1("-> %d", cvt[cno]); | | 836 | + debug1("-> %d", cvt[cno]); |
834 | } | | 837 | } |
835 | } | | 838 | } |
836 | #ifndef DEBUG | | 839 | #ifndef DEBUG |
837 | @@ -1230,8 +1230,8 @@ | | 840 | @@ -1229,8 +1229,8 @@ |
838 | while (--m >= 0) { | | 841 | while (--m >= 0) { |
839 | int cno = *(stack--); | | 842 | int cno = *(stack--); |
840 | int arg = *(stack--); | | 843 | int arg = *(stack--); |
841 | - debug("\n(cvt[%d] arg %04X", cno, arg); | | 844 | - debug("\n(cvt[%d] arg %04X", cno, arg); |
842 | - debug("\targ.n=%d, n=%d)", arg >> 4, n >> 4); | | 845 | - debug("\targ.n=%d, n=%d)", arg >> 4, n >> 4); |
843 | + debug2("\n(cvt[%d] arg %04X", cno, arg); | | 846 | + debug2("\n(cvt[%d] arg %04X", cno, arg); |
844 | + debug2("\targ.n=%d, n=%d)", arg >> 4, n >> 4); | | 847 | + debug2("\targ.n=%d, n=%d)", arg >> 4, n >> 4); |
845 | }; | | 848 | }; |
846 | #endif | | 849 | #endif |
847 | break; | | 850 | break; |
848 | @@ -1241,7 +1241,7 @@ | | 851 | @@ -1240,7 +1240,7 @@ |
849 | case DUP: | | 852 | case DUP: |
850 | m = *stack; | | 853 | m = *stack; |
851 | *(++stack) = m; | | 854 | *(++stack) = m; |
852 | - debug("DUP = %d", m); | | 855 | - debug("DUP = %d", m); |
853 | + debug1("DUP = %d", m); | | 856 | + debug1("DUP = %d", m); |
854 | break; | | 857 | break; |
855 | case POP: | | 858 | case POP: |
856 | debug("POP"); | | 859 | debug("POP"); |
857 | @@ -1260,20 +1260,20 @@ | | 860 | @@ -1259,20 +1259,20 @@ |
858 | case DEPTH: | | 861 | case DEPTH: |
859 | m = stack - stackbase; | | 862 | m = stack - stackbase; |
860 | *(++stack) = m; | | 863 | *(++stack) = m; |
861 | - debug("DEPTH = %d", m); | | 864 | - debug("DEPTH = %d", m); |
862 | + debug1("DEPTH = %d", m); | | 865 | + debug1("DEPTH = %d", m); |
863 | break; | | 866 | break; |
864 | case CINDEX: | | 867 | case CINDEX: |
865 | m = *stack; | | 868 | m = *stack; |
866 | assert(stack - m >= stackbase); | | 869 | assert(stack - m >= stackbase); |
867 | *stack = *(stack - m); | | 870 | *stack = *(stack - m); |
868 | - debug("CINDEX %d = %d", m, *stack); | | 871 | - debug("CINDEX %d = %d", m, *stack); |
869 | + debug2("CINDEX %d = %d", m, *stack); | | 872 | + debug2("CINDEX %d = %d", m, *stack); |
870 | break; | | 873 | break; |
871 | case MINDEX: | | 874 | case MINDEX: |
872 | m = *stack; | | 875 | m = *stack; |
873 | stack -= m; | | 876 | stack -= m; |
874 | assert(stack >= stackbase); | | 877 | assert(stack >= stackbase); |
875 | n = *stack; | | 878 | n = *stack; |
876 | - debug("MINDEX %d = %d", m, n); | | 879 | - debug("MINDEX %d = %d", m, n); |
877 | + debug2("MINDEX %d = %d", m, n); | | 880 | + debug2("MINDEX %d = %d", m, n); |
878 | for (; --m > 0; ++stack) | | 881 | for (; --m > 0; ++stack) |
879 | stack[0] = stack[1]; | | 882 | stack[0] = stack[1]; |
880 | *stack = n; | | 883 | *stack = n; |
881 | @@ -1283,15 +1283,15 @@ | | 884 | @@ -1282,15 +1282,15 @@ |
882 | *(stack - 0) = *(stack - 2); | | 885 | *(stack - 0) = *(stack - 2); |
883 | *(stack - 2) = *(stack - 1); | | 886 | *(stack - 2) = *(stack - 1); |
884 | *(stack - 1) = m; | | 887 | *(stack - 1) = m; |
885 | - debug("ROLL %d %d %d", m, *(stack - 2), *stack); | | 888 | - debug("ROLL %d %d %d", m, *(stack - 2), *stack); |
886 | - debug(" => %d %d %d", *stack, m, *(stack - 2)); | | 889 | - debug(" => %d %d %d", *stack, m, *(stack - 2)); |
887 | + debug3("ROLL %d %d %d", m, *(stack - 2), *stack); | | 890 | + debug3("ROLL %d %d %d", m, *(stack - 2), *stack); |
888 | + debug3(" => %d %d %d", *stack, m, *(stack - 2)); | | 891 | + debug3(" => %d %d %d", *stack, m, *(stack - 2)); |
889 | break; | | 892 | break; |
890 | | | 893 | |
891 | // control flow | | 894 | // control flow |
892 | | | 895 | |
893 | case IF: | | 896 | case IF: |
894 | m = *(stack--); | | 897 | m = *(stack--); |
895 | - debug("IF %d", m); | | 898 | - debug("IF %d", m); |
896 | + debug1("IF %d", m); | | 899 | + debug1("IF %d", m); |
897 | if (!m) | | 900 | if (!m) |
898 | skipHints(f); | | 901 | skipHints(f); |
899 | break; | | 902 | break; |
900 | @@ -1305,7 +1305,7 @@ | | 903 | @@ -1304,7 +1304,7 @@ |
901 | break; | | 904 | break; |
902 | case JROT: | | 905 | case JROT: |
903 | m = *(stack--); | | 906 | m = *(stack--); |
904 | - debug("JROT %d -> ", m); | | 907 | - debug("JROT %d -> ", m); |
905 | + debug1("JROT %d -> ", m); | | 908 | + debug1("JROT %d -> ", m); |
906 | if (m) | | 909 | if (m) |
907 | goto jump_relative; | | 910 | goto jump_relative; |
908 | debug("not taken"); | | 911 | debug("not taken"); |
909 | @@ -1313,7 +1313,7 @@ | | 912 | @@ -1312,7 +1312,7 @@ |
910 | break; | | 913 | break; |
911 | case JROF: | | 914 | case JROF: |
912 | m = *(stack--); | | 915 | m = *(stack--); |
913 | - debug("JROF %d -> ", m); | | 916 | - debug("JROF %d -> ", m); |
914 | + debug1("JROF %d -> ", m); | | 917 | + debug1("JROF %d -> ", m); |
915 | if (!m) | | 918 | if (!m) |
916 | goto jump_relative; | | 919 | goto jump_relative; |
917 | debug("not taken"); | | 920 | debug("not taken"); |
918 | @@ -1322,81 +1322,81 @@ | | 921 | @@ -1321,81 +1321,81 @@ |
919 | case JMPR: | | 922 | case JMPR: |
920 | jump_relative: | | 923 | jump_relative: |
921 | m = *(stack--); | | 924 | m = *(stack--); |
922 | - debug("JMPR %d", m); | | 925 | - debug("JMPR %d", m); |
923 | + debug1("JMPR %d", m); | | 926 | + debug1("JMPR %d", m); |
924 | f->seekRelative(m-1); | | 927 | f->seekRelative(m-1); |
925 | break; | | 928 | break; |
926 | case LT: | | 929 | case LT: |
927 | m = *(stack--); | | 930 | m = *(stack--); |
928 | n = *stack; | | 931 | n = *stack; |
929 | *stack = (n < m); | | 932 | *stack = (n < m); |
930 | - debug("LT %d %d = %d", m, n, *stack); | | 933 | - debug("LT %d %d = %d", m, n, *stack); |
931 | + debug3("LT %d %d = %d", m, n, *stack); | | 934 | + debug3("LT %d %d = %d", m, n, *stack); |
| @@ -1001,27 +1004,27 @@ $NetBSD: patch-ai,v 1.1 2004/02/14 22:27 | | | @@ -1001,27 +1004,27 @@ $NetBSD: patch-ai,v 1.1 2004/02/14 22:27 |
1001 | m = *(stack--); | | 1004 | m = *(stack--); |
1002 | *stack += m; | | 1005 | *stack += m; |
1003 | - debug("ADD %d %d = %d", m, *stack - m, *stack); | | 1006 | - debug("ADD %d %d = %d", m, *stack - m, *stack); |
1004 | + debug3("ADD %d %d = %d", m, *stack - m, *stack); | | 1007 | + debug3("ADD %d %d = %d", m, *stack - m, *stack); |
1005 | break; | | 1008 | break; |
1006 | case SUB: | | 1009 | case SUB: |
1007 | m = *(stack--); | | 1010 | m = *(stack--); |
1008 | *stack -= m; | | 1011 | *stack -= m; |
1009 | - debug("SUB %d %d = %d", m, *stack + m, *stack); | | 1012 | - debug("SUB %d %d = %d", m, *stack + m, *stack); |
1010 | + debug3("SUB %d %d = %d", m, *stack + m, *stack); | | 1013 | + debug3("SUB %d %d = %d", m, *stack + m, *stack); |
1011 | break; | | 1014 | break; |
1012 | case DIV: | | 1015 | case DIV: |
1013 | m = *(stack--); | | 1016 | m = *(stack--); |
1014 | @@ -1405,46 +1405,46 @@ | | 1017 | @@ -1404,46 +1404,46 @@ |
1015 | *stack = (n << SHIFT) / m; | | 1018 | *stack = (n << SHIFT) / m; |
1016 | else | | 1019 | else |
1017 | *stack = (n >= 0) ? 0x7ffffff : -0x7ffffff; | | 1020 | *stack = (n >= 0) ? 0x7ffffff : -0x7ffffff; |
1018 | - debug("DIV %d %d = %d", m, n, *stack); | | 1021 | - debug("DIV %d %d = %d", m, n, *stack); |
1019 | + debug3("DIV %d %d = %d", m, n, *stack); | | 1022 | + debug3("DIV %d %d = %d", m, n, *stack); |
1020 | break; | | 1023 | break; |
1021 | case MUL: | | 1024 | case MUL: |
1022 | m = *(stack--); | | 1025 | m = *(stack--); |
1023 | n = *stack; | | 1026 | n = *stack; |
1024 | *stack = (m * n + 32) >> SHIFT; | | 1027 | *stack = (m * n + 32) >> SHIFT; |
1025 | - debug("MUL %d %d = %d", m, n, *stack); | | 1028 | - debug("MUL %d %d = %d", m, n, *stack); |
1026 | + debug3("MUL %d %d = %d", m, n, *stack); | | 1029 | + debug3("MUL %d %d = %d", m, n, *stack); |
1027 | break; | | 1030 | break; |
| @@ -1056,162 +1059,162 @@ $NetBSD: patch-ai,v 1.1 2004/02/14 22:27 | | | @@ -1056,162 +1059,162 @@ $NetBSD: patch-ai,v 1.1 2004/02/14 22:27 |
1056 | - debug("MAX %d %d = %d", m, n, *stack); | | 1059 | - debug("MAX %d %d = %d", m, n, *stack); |
1057 | + debug3("MAX %d %d = %d", m, n, *stack); | | 1060 | + debug3("MAX %d %d = %d", m, n, *stack); |
1058 | break; | | 1061 | break; |
1059 | case MIN: | | 1062 | case MIN: |
1060 | m = *(stack--); | | 1063 | m = *(stack--); |
1061 | n = *stack; | | 1064 | n = *stack; |
1062 | if (m < n) | | 1065 | if (m < n) |
1063 | *stack = m; | | 1066 | *stack = m; |
1064 | - debug("MIN %d %d = %d", m, n, *stack); | | 1067 | - debug("MIN %d %d = %d", m, n, *stack); |
1065 | + debug3("MIN %d %d = %d", m, n, *stack); | | 1068 | + debug3("MIN %d %d = %d", m, n, *stack); |
1066 | break; | | 1069 | break; |
1067 | case ROUND00: case ROUND01: | | 1070 | case ROUND00: case ROUND01: |
1068 | case ROUND02: case ROUND03: | | 1071 | case ROUND02: case ROUND03: |
1069 | @@ -1452,7 +1452,7 @@ | | 1072 | @@ -1451,7 +1451,7 @@ |
1070 | m = *stack; | | 1073 | m = *stack; |
1071 | // XXX: ignore black/gray/white for now | | 1074 | // XXX: ignore black/gray/white for now |
1072 | *stack = round(m); | | 1075 | *stack = round(m); |
1073 | - debug("#ROUND%02X %d = %d", opc & 3, m, *stack); | | 1076 | - debug("#ROUND%02X %d = %d", opc & 3, m, *stack); |
1074 | + debug3("#ROUND%02X %d = %d", opc & 3, m, *stack); | | 1077 | + debug3("#ROUND%02X %d = %d", opc & 3, m, *stack); |
1075 | break; | | 1078 | break; |
1076 | case NROUND00: case NROUND01: | | 1079 | case NROUND00: case NROUND01: |
1077 | case NROUND02: case NROUND03: | | 1080 | case NROUND02: case NROUND03: |
1078 | @@ -1460,11 +1460,11 @@ | | 1081 | @@ -1459,11 +1459,11 @@ |
1079 | m = *stack; | | 1082 | m = *stack; |
1080 | // XXX: ignore black/gray/white for now | | 1083 | // XXX: ignore black/gray/white for now |
1081 | *stack = m; | | 1084 | *stack = m; |
1082 | - debug("#NROUND%02X %d = %d", opc & 3, m, *stack); | | 1085 | - debug("#NROUND%02X %d = %d", opc & 3, m, *stack); |
1083 | + debug3("#NROUND%02X %d = %d", opc & 3, m, *stack); | | 1086 | + debug3("#NROUND%02X %d = %d", opc & 3, m, *stack); |
1084 | break; | | 1087 | break; |
1085 | case FDEF: | | 1088 | case FDEF: |
1086 | m = *(stack--); | | 1089 | m = *(stack--); |
1087 | - debug("FDEF %d", m); | | 1090 | - debug("FDEF %d", m); |
1088 | + debug1("FDEF %d", m); | | 1091 | + debug1("FDEF %d", m); |
1089 | assert(m >= 0 && m < sizeFDefs); | | 1092 | assert(m >= 0 && m < sizeFDefs); |
1090 | fdefs[m].f = f; | | 1093 | fdefs[m].f = f; |
1091 | fdefs[m].offset = f->tell(); | | 1094 | fdefs[m].offset = f->tell(); |
1092 | @@ -1476,7 +1476,7 @@ | | 1095 | @@ -1475,7 +1475,7 @@ |
1093 | return; | | 1096 | return; |
1094 | case IDEF: | | 1097 | case IDEF: |
1095 | m = *(stack--); | | 1098 | m = *(stack--); |
1096 | - debug("IDEF %02X", m); | | 1099 | - debug("IDEF %02X", m); |
1097 | + debug1("IDEF %02X", m); | | 1100 | + debug1("IDEF %02X", m); |
1098 | assert(m >= 0 && m < sizeIDefs); | | 1101 | assert(m >= 0 && m < sizeIDefs); |
1099 | idefs[m].f = f; | | 1102 | idefs[m].f = f; |
1100 | idefs[m].offset = f->tell(); | | 1103 | idefs[m].offset = f->tell(); |
1101 | @@ -1486,7 +1486,7 @@ | | 1104 | @@ -1485,7 +1485,7 @@ |
1102 | case CALL: | | 1105 | case CALL: |
1103 | { | | 1106 | { |
1104 | m = *(stack--); | | 1107 | m = *(stack--); |
1105 | - debug("CALL %d\n", m); | | 1108 | - debug("CALL %d\n", m); |
1106 | + debug1("CALL %d\n", m); | | 1109 | + debug1("CALL %d\n", m); |
1107 | assert(m >= 0 && m < sizeFDefs); | | 1110 | assert(m >= 0 && m < sizeFDefs); |
1108 | | | 1111 | |
1109 | int ofs = f->tell(); | | 1112 | int ofs = f->tell(); |
1110 | @@ -1500,7 +1500,7 @@ | | 1113 | @@ -1499,7 +1499,7 @@ |
1111 | { | | 1114 | { |
1112 | m = *(stack--); | | 1115 | m = *(stack--); |
1113 | n = *(stack--); | | 1116 | n = *(stack--); |
1114 | - debug("LOOPCALL %d * %d\n", m, n); | | 1117 | - debug("LOOPCALL %d * %d\n", m, n); |
1115 | + debug2("LOOPCALL %d * %d\n", m, n); | | 1118 | + debug2("LOOPCALL %d * %d\n", m, n); |
1116 | | | 1119 | |
1117 | int ofs = f->tell(); | | 1120 | int ofs = f->tell(); |
1118 | FDefs* fd = &fdefs[m]; | | 1121 | FDefs* fd = &fdefs[m]; |
1119 | @@ -1524,19 +1524,19 @@ | | 1122 | @@ -1523,19 +1523,19 @@ |
1120 | if (m & GLYPH_STRETCHED) | | 1123 | if (m & GLYPH_STRETCHED) |
1121 | if (xx != yy) | | 1124 | if (xx != yy) |
1122 | *stack |= IS_STRETCHED; | | 1125 | *stack |= IS_STRETCHED; |
1123 | - debug("GETINFO %d = 0x%03X", m, *stack); | | 1126 | - debug("GETINFO %d = 0x%03X", m, *stack); |
1124 | + debug2("GETINFO %d = 0x%03X", m, *stack); | | 1127 | + debug2("GETINFO %d = 0x%03X", m, *stack); |
1125 | break; | | 1128 | break; |
1126 | default: | | 1129 | default: |
1127 | { | | 1130 | { |
1128 | int ofs = f->tell(); | | 1131 | int ofs = f->tell(); |
1129 | IDefs* idef = &idefs[opc]; | | 1132 | IDefs* idef = &idefs[opc]; |
1130 | - debug("IDEF_CALL 0x%02X, ofs = %05X, len = %d\n", | | 1133 | - debug("IDEF_CALL 0x%02X, ofs = %05X, len = %d\n", |
1131 | + debug3("IDEF_CALL 0x%02X, ofs = %05X, len = %d\n", | | 1134 | + debug3("IDEF_CALL 0x%02X, ofs = %05X, len = %d\n", |
1132 | opc, idef->offset, idef->length); | | 1135 | opc, idef->offset, idef->length); |
1133 | | | 1136 | |
1134 | if (idef->length) // Thanks Colin McCormack | | 1137 | if (idef->length) // Thanks Colin McCormack |
1135 | execHints(idef->f, idef->offset, idef->length); | | 1138 | execHints(idef->f, idef->offset, idef->length); |
1136 | else | | 1139 | else |
1137 | - debug("illegal instruction %02X\n", opc); | | 1140 | - debug("illegal instruction %02X\n", opc); |
1138 | + debug1("illegal instruction %02X\n", opc); | | 1141 | + debug1("illegal instruction %02X\n", opc); |
1139 | f->seekAbsolute(ofs); | | 1142 | f->seekAbsolute(ofs); |
1140 | } | | 1143 | } |
1141 | | | 1144 | |
1142 | @@ -1578,7 +1578,7 @@ | | 1145 | @@ -1574,7 +1574,7 @@ |
1143 | debug("\nskipping..."); | | 1146 | debug("\nskipping..."); |
1144 | for (int depth = 0;;) { | | 1147 | for (int depth = 0;;) { |
1145 | int opc = f->readUByte(); | | 1148 | int opc = f->readUByte(); |
1146 | - debug(" %02X ", opc); | | 1149 | - debug(" %02X ", opc); |
1147 | + debug1(" %02X ", opc); | | 1150 | + debug1(" %02X ", opc); |
1148 | switch (opc) { | | 1151 | switch (opc) { |
1149 | case NPUSHB: | | 1152 | case NPUSHB: |
1150 | opc = f->readUByte() + PUSHB00 - 1; | | 1153 | opc = f->readUByte() + PUSHB00 - 1; |
1151 | @@ -1642,7 +1642,7 @@ | | 1154 | @@ -1637,7 +1637,7 @@ |
1152 | dist = MULDIV(doldp1, dnew21, dold21) - dnewp1; | | 1155 | dist = MULDIV(doldp1, dnew21, dold21) - dnewp1; |
1153 | } | | 1156 | } |
1154 | | | 1157 | |
1155 | - debug("\nmove by %f", dist / FSHIFT); | | 1158 | - debug("\nmove by %f", dist / FSHIFT); |
1156 | + debug1("\nmove by %f", dist / FSHIFT); | | 1159 | + debug1("\nmove by %f", dist / FSHIFT); |
1157 | gs.movePoint(pp, dist); | | 1160 | gs.movePoint(pp, dist); |
1158 | } | | 1161 | } |
1159 | | | 1162 | |
1160 | @@ -1653,11 +1653,11 @@ | | 1163 | @@ -1647,11 +1647,11 @@ |
1161 | int dold21 = p2->yold - p1->yold; | | 1164 | int dold21 = p2->yold - p1->yold; |
1162 | int doldp1 = pp->yold - p1->yold; | | 1165 | int doldp1 = pp->yold - p1->yold; |
1163 | | | 1166 | |
1164 | - debug("\np[%d] between p[%d] and p[%d]", pp - p[1], p1 - p[1], | | 1167 | - debug("\np[%d] between p[%d] and p[%d]", pp - p[1], p1 - p[1], |
1165 | + debug3("\np[%d] between p[%d] and p[%d]", pp - p[1], p1 - p[1], | | 1168 | + debug3("\np[%d] between p[%d] and p[%d]", pp - p[1], p1 - p[1], |
1166 | p2 - p[1]); | | 1169 | p2 - p[1]); |
1167 | - debug("\nd21o dp1o %f %f", dold21 / FSHIFT, doldp1 / FSHIFT); | | 1170 | - debug("\nd21o dp1o %f %f", dold21 / FSHIFT, doldp1 / FSHIFT); |
1168 | + debug2("\nd21o dp1o %f %f", dold21 / FSHIFT, doldp1 / FSHIFT); | | 1171 | + debug2("\nd21o dp1o %f %f", dold21 / FSHIFT, doldp1 / FSHIFT); |
1169 | | | 1172 | |
1170 | - debug("\tchanging y: %d %d", pp->xnow, pp->ynow); | | 1173 | - debug("\tchanging y: %d %d", pp->xnow, pp->ynow); |
1171 | + debug2("\tchanging y: %d %d", pp->xnow, pp->ynow); | | 1174 | + debug2("\tchanging y: %d %d", pp->xnow, pp->ynow); |
1172 | | | 1175 | |
1173 | if ((dold21 ^ doldp1) < 0 || doldp1 == 0) | | 1176 | if ((dold21 ^ doldp1) < 0 || doldp1 == 0) |
1174 | pp->ynow = pp->yold + p1->ynow - p1->yold; | | 1177 | pp->ynow = pp->yold + p1->ynow - p1->yold; |
1175 | @@ -1666,11 +1666,11 @@ | | 1178 | @@ -1660,11 +1660,11 @@ |
1176 | pp->ynow = pp->yold + p2->ynow - p2->yold; | | 1179 | pp->ynow = pp->yold + p2->ynow - p2->yold; |
1177 | else { | | 1180 | else { |
1178 | int dnew21 = p2->ynow - p1->ynow; | | 1181 | int dnew21 = p2->ynow - p1->ynow; |
1179 | - debug("\nd21n %8.3f", dnew21 / FSHIFT); | | 1182 | - debug("\nd21n %8.3f", dnew21 / FSHIFT); |
1180 | + debug1("\nd21n %8.3f", dnew21 / FSHIFT); | | 1183 | + debug1("\nd21n %8.3f", dnew21 / FSHIFT); |
1181 | pp->ynow = MULDIV(doldp1 + 1, dnew21, dold21) + p1->ynow; | | 1184 | pp->ynow = MULDIV(doldp1 + 1, dnew21, dold21) + p1->ynow; |
1182 | } | | 1185 | } |
1183 | | | 1186 | |
1184 | - debug(" -> %d %d\n", pp->xnow, pp->ynow); | | 1187 | - debug(" -> %d %d\n", pp->xnow, pp->ynow); |
1185 | + debug2(" -> %d %d\n", pp->xnow, pp->ynow); | | 1188 | + debug2(" -> %d %d\n", pp->xnow, pp->ynow); |
1186 | } | | 1189 | } |
1187 | | | 1190 | |
1188 | | | 1191 | void |
1189 | @@ -1680,11 +1680,11 @@ | | 1192 | @@ -1673,11 +1673,11 @@ |
1190 | int dold21 = p2->xold - p1->xold; | | 1193 | int dold21 = p2->xold - p1->xold; |
1191 | int doldp1 = pp->xold - p1->xold; | | 1194 | int doldp1 = pp->xold - p1->xold; |
1192 | | | 1195 | |
1193 | - debug("\np[%d] between p[%d] and p[%d]", pp - p[1], p1 - p[1], | | 1196 | - debug("\np[%d] between p[%d] and p[%d]", pp - p[1], p1 - p[1], |
1194 | + debug3("\np[%d] between p[%d] and p[%d]", pp - p[1], p1 - p[1], | | 1197 | + debug3("\np[%d] between p[%d] and p[%d]", pp - p[1], p1 - p[1], |
1195 | p2 - p[1]); | | 1198 | p2 - p[1]); |
1196 | - debug("\nd21o dp1o %f %f", dold21 / FSHIFT, doldp1 / FSHIFT); | | 1199 | - debug("\nd21o dp1o %f %f", dold21 / FSHIFT, doldp1 / FSHIFT); |
1197 | + debug2("\nd21o dp1o %f %f", dold21 / FSHIFT, doldp1 / FSHIFT); | | 1200 | + debug2("\nd21o dp1o %f %f", dold21 / FSHIFT, doldp1 / FSHIFT); |
1198 | | | 1201 | |
1199 | - debug("\nchanging x: %d %d", pp->xnow, pp->ynow); | | 1202 | - debug("\nchanging x: %d %d", pp->xnow, pp->ynow); |
1200 | + debug2("\nchanging x: %d %d", pp->xnow, pp->ynow); | | 1203 | + debug2("\nchanging x: %d %d", pp->xnow, pp->ynow); |
1201 | | | 1204 | |
1202 | if ((dold21 ^ doldp1) < 0 || doldp1 == 0) | | 1205 | if ((dold21 ^ doldp1) < 0 || doldp1 == 0) |
1203 | pp->xnow = pp->xold + p1->xnow - p1->xold; | | 1206 | pp->xnow = pp->xold + p1->xnow - p1->xold; |
1204 | @@ -1693,11 +1693,11 @@ | | 1207 | @@ -1686,11 +1686,11 @@ |
1205 | pp->xnow = pp->xold + p2->xnow - p2->xold; | | 1208 | pp->xnow = pp->xold + p2->xnow - p2->xold; |
1206 | else { | | 1209 | else { |
1207 | int dnew21 = p2->xnow - p1->xnow; | | 1210 | int dnew21 = p2->xnow - p1->xnow; |
1208 | - debug("\t(d21n %8.3f)", dnew21 / FSHIFT); | | 1211 | - debug("\t(d21n %8.3f)", dnew21 / FSHIFT); |
1209 | + debug1("\t(d21n %8.3f)", dnew21 / FSHIFT); | | 1212 | + debug1("\t(d21n %8.3f)", dnew21 / FSHIFT); |
1210 | pp->xnow = MULDIV(doldp1 + 1, dnew21, dold21) + p1->xnow; | | 1213 | pp->xnow = MULDIV(doldp1 + 1, dnew21, dold21) + p1->xnow; |
1211 | } | | 1214 | } |
1212 | | | 1215 | |
1213 | - debug(" -> %d %d\n", pp->xnow, pp->ynow); | | 1216 | - debug(" -> %d %d\n", pp->xnow, pp->ynow); |
1214 | + debug2(" -> %d %d\n", pp->xnow, pp->ynow); | | 1217 | + debug2(" -> %d %d\n", pp->xnow, pp->ynow); |
1215 | } | | 1218 | } |
1216 | | | 1219 | |
1217 | | | 1220 | void |