Unified · Split
| @@ -109,4 +109,4 @@ int otfrune2glyph(Otf *o, Rune r); · 108 unmodified lines | ||
| 109 | 109 | Rune otfglyph2rune(Otf *o, int g); |
| 110 | 110 | |
| 111 | 111 | Glyf *otfglyf(Otf *o, int index); |
| 112 | −GlyfImage *otfdrawglyf(Otf *o, Glyf *g, double ppem); | |
| 112 | +GlyfImage *otfdrawglyf(Otf *o, Glyf *g, double ppem, double scaleX, double scaleY); | |
| @@ -110,7 +110,7 @@ int otfrune2glyph(Otf *o, Rune r); · 109 unmodified lines | ||
| 110 | 110 | Rune otfglyph2rune(Otf *o, int g); |
| 111 | 111 | |
| 112 | 112 | Glyf *otfglyf(Otf *o, int index); |
| 113 | −GlyfImage *otfdrawglyf(Otf *o, Glyf *g, double ppem); | |
| 113 | +GlyfImage *otfdrawglyf(Otf *o, Glyf *g, double ppem, double scaleX, double scaleY); | |
| 114 | 114 | |
| 115 | 115 | typedef struct SubHeader SubHeader; |
| 116 | 116 | typedef struct MapGroup MapGroup; |
| @@ -548,15 +548,15 @@ glyfmaxnpts(Glyf *g) · 547 unmodified lines | ||
| 548 | 548 | } |
| 549 | 549 | |
| 550 | 550 | GlyfImage * |
| 551 | −otfdrawglyf(Otf *o, Glyf *g, double ppem) | |
| 551 | +otfdrawglyf(Otf *o, Glyf *g, double ppem, double scaleX, double scaleY) | |
| 552 | 552 | { |
| 553 | 553 | int i, j, maxptstotal, maxpts, ngs, w, h, npx, baseline; |
| 554 | 554 | Glyf *gs[MAXCOMPONENTS]; |
| 555 | 555 | ComponentGlyph *cg; |
| 556 | − Sval scale, offY; | |
| 557 | 556 | SegQ *s₀, *s, *p; |
| 558 | 557 | GlyfImage *im; |
| 559 | 558 | Sval bb[4]; |
| 559 | + Sval offY; | |
| 560 | 560 | Spt *pts; |
| 561 | 561 | |
| 562 | 562 | ngs = 0; |
| @@ -589,15 +589,16 @@ FIXME metrics (lsb+rsb) · 26 unmodified lines | ||
| 589 | 589 | */ |
| 590 | 590 | |
| 591 | 591 | pts = calloc(1, maxpts*sizeof(*pts) + maxptstotal/2*sizeof(*s)); |
| 592 | − scale = ppem / o->td.head->unitsPerEm; | |
| 593 | − bb[0] = g->xMin*scale; | |
| 594 | − bb[1] = g->yMin*scale; | |
| 595 | − bb[2] = g->xMax*scale; | |
| 596 | − bb[3] = g->yMax*scale; | |
| 592 | + scaleX *= ppem / o->td.head->unitsPerEm; | |
| 593 | + scaleY *= ppem / o->td.head->unitsPerEm; | |
| 594 | + bb[0] = g->xMin*scaleX; | |
| 595 | + bb[1] = g->yMin*scaleY; | |
| 596 | + bb[2] = g->xMax*scaleX; | |
| 597 | + bb[3] = g->yMax*scaleY; | |
| 597 | 598 | s = s₀ = (SegQ*)(pts + maxpts); |
| 598 | 599 | cg = g->component; |
| 599 | 600 | for(i = 0; i < ngs; i++){ |
| 600 | − Sval dx = 0, dy = 0, gscaleX = scale, gscaleY = scale; | |
| 601 | + Sval dx = 0, dy = 0, gscaleX = scaleX, gscaleY = scaleY; | |
| 601 | 602 | if(cg != nil){ |
| 602 | 603 | if(cg->flags & CGLYPH_FL_SIGNED_XY){ |
| 603 | 604 | dx = cg->dx; |
| @@ -614,8 +615,8 @@ FIXME metrics (lsb+rsb) · 10 unmodified lines | ||
| 614 | 615 | dx *= gscaleX; |
| 615 | 616 | dy *= gscaleY; |
| 616 | 617 | }else{ |
| 617 | − dx *= scale; | |
| 618 | − dy *= scale; | |
| 618 | + dx *= scaleX; | |
| 619 | + dy *= scaleY; | |
| 619 | 620 | } |
| 620 | 621 | /* FIXME rounding |
| 621 | 622 | if(cg->flags & CGLYPH_FL_ROUND_TO_GRID_XY){ |
| @@ -10,12 +10,14 @@ printusage(Otfile *f) · 9 unmodified lines | ||
| 10 | 10 | f->print(f->aux, " -m: print out glyph ids or render them all as a map (with -p)\n"); |
| 11 | 11 | f->print(f->aux, " -R: ignore glyphs that do not represent valid runes\n"); |
| 12 | 12 | f->print(f->aux, " -H: highlight a specific glyph in the map by its ID\n"); |
| 13 | + f->print(f->aux, " -x: horizontal scale factor\n"); | |
| 14 | + f->print(f->aux, " -y: vertical scale factor\n"); | |
| 13 | 15 | f->print(f->aux, "Specifying -m more than once adds guide lines\n"); |
| 14 | 16 | f->print(f->aux, "Specifying -m more than twice makes empty pixels filled out\n"); |
| 15 | 17 | } |
| 16 | 18 | |
| 17 | 19 | static int gind = -1, map, highlight = -1, runesonly; |
| 18 | −static double ppem; | |
| 20 | +static double ppem, scaleX = 1, scaleY = 1; | |
| 19 | 21 | static Rune rune = NoRune; |
| 20 | 22 | |
| 21 | 23 | static int |
| @@ -76,6 +78,8 @@ dumpmap(Otfile *f, GlyfImage **im, int n) · 54 unmodified lines | ||
| 76 | 78 | break; |
| 77 | 79 | |
| 78 | 80 | for(x = 0; i < j; i++){ |
| 81 | + if(im[i] == nil) | |
| 82 | + continue; | |
| 79 | 83 | u8int *lt = b + ((y + prebase - (im[i]->h+im[i]->baseline))*bw + x)*3; |
| 80 | 84 | x += im[i]->w + gap; |
| 81 | 85 | for(d = 0; d < im[i]->h; d++, lt += bw*3){ |
| @@ -148,7 +152,7 @@ glypherr: · 66 unmodified lines | ||
| 148 | 152 | return -1; |
| 149 | 153 | } |
| 150 | 154 | if(ppem > 0 && g->numberOfContours != 0){ |
| 151 | − if((im[i] = otfdrawglyf(o, g, ppem)) == nil) | |
| 155 | + if((im[i] = otfdrawglyf(o, g, ppem, scaleX, scaleY)) == nil) | |
| 152 | 156 | goto glypherr; |
| 153 | 157 | }else if(ppem <= 0){ |
| 154 | 158 | out->print(out->aux, "%d (%s):\n", i, |
| @@ -171,7 +175,7 @@ glypherr: · 16 unmodified lines | ||
| 171 | 175 | goto glypherr; |
| 172 | 176 | }else if(ppem > 0){ |
| 173 | 177 | GlyfImage *im; |
| 174 | − if((im = otfdrawglyf(o, g, ppem)) == nil) | |
| 178 | + if((im = otfdrawglyf(o, g, ppem, scaleX, scaleY)) == nil) | |
| 175 | 179 | goto glypherr; |
| 176 | 180 | if(out->write != otfdiscard && dumpmap(out, &im, 1) != 0) |
| 177 | 181 | return -1; |
| @@ -218,6 +222,12 @@ errboth: \ · 40 unmodified lines | ||
| 218 | 222 | case 'R': \ |
| 219 | 223 | runesonly++; \ |
| 220 | 224 | break; \ |
| 225 | + case 'x': \ | |
| 226 | + scaleX = strtod(EARGF(usage(&out)), nil); \ | |
| 227 | + break; \ | |
| 228 | + case 'y': \ | |
| 229 | + scaleY = strtod(EARGF(usage(&out)), nil); \ | |
| 230 | + break; \ | |
| 221 | 231 | default: \ |
| 222 | 232 | usage(&out); \ |
| 223 | 233 | }ARGEND \ |