make otfdrawglyf itself allocate the image

Sigrid Solveig Haflínudóttir committed 2 years ago

Commit 2cfe3c21 parent a5576434 files · +57 −55Browse files

Unified · Split

4 files

otf.h.in +5 −5
plan9/otf.h +5 −5
rast.c +19 −15
test.h +28 −30

otf.h.in+5−5

@@ -94,19 +94,19 @@ void otfclose(Otf *o); · 93 unmodified lines
94	94
95	95	/* FIXME these might go eventually */
96	96
	97	+typedef struct Glyf Glyf;
97	98	typedef struct GlyfImage GlyfImage;
98	99
99	100	struct GlyfImage {
100		− u8int *b;
101	101	int w;
102	102	int h;
103	103	int baseline;
	104	+ u8int b[];
104	105	};
105	106
106		−typedef struct Glyf Glyf;
107		−Glyf otfglyf(Otf o, int index);
108	107	int otfglyfnum(Otf *o);
109		−int otfdrawglyf(Otf o, Glyf g, double ppem, GlyfImage *im);
110		−int otfupem(Otf *o);
111	108	int otfrune2glyph(Otf *o, Rune r);
112	109	Rune otfglyph2rune(Otf *o, int g);
	110	+
	111	+Glyf otfglyf(Otf o, int index);
	112	+GlyfImage otfdrawglyf(Otf o, Glyf *g, double ppem);

plan9/otf.h+5−5

@@ -95,23 +95,23 @@ void otfclose(Otf *o); · 94 unmodified lines
95	95
96	96	/* FIXME these might go eventually */
97	97
	98	+typedef struct Glyf Glyf;
98	99	typedef struct GlyfImage GlyfImage;
99	100
100	101	struct GlyfImage {
101		− u8int *b;
102	102	int w;
103	103	int h;
104	104	int baseline;
	105	+ u8int b[];
105	106	};
106	107
107		−typedef struct Glyf Glyf;
108		−Glyf otfglyf(Otf o, int index);
109	108	int otfglyfnum(Otf *o);
110		−int otfdrawglyf(Otf o, Glyf g, double ppem, GlyfImage *im);
111		−int otfupem(Otf *o);
112	109	int otfrune2glyph(Otf *o, Rune r);
113	110	Rune otfglyph2rune(Otf *o, int g);
114	111
	112	+Glyf otfglyf(Otf o, int index);
	113	+GlyfImage otfdrawglyf(Otf o, Glyf *g, double ppem);
	114	+
115	115	typedef struct SubHeader SubHeader;
116	116	typedef struct MapGroup MapGroup;
117	117	typedef struct SubtableCmap0 SubtableCmap0;

rast.c+19−15

@@ -547,20 +547,21 @@ glyfmaxnpts(Glyf *g) · 546 unmodified lines
547	547	return npts < 2 ? 0 : npts;
548	548	}
549	549
550		−int
551		−otfdrawglyf(Otf o, Glyf g, double ppem, GlyfImage *im)
	550	+GlyfImage *
	551	+otfdrawglyf(Otf o, Glyf g, double ppem)
552	552	{
553		− int i, j, maxptstotal, maxpts, ngs, w, h, r, npx, baseline;
	553	+ int i, j, maxptstotal, maxpts, ngs, w, h, npx, baseline;
554	554	Glyf *gs[MAXCOMPONENTS];
555	555	ComponentGlyph *cg;
556	556	Sval scale, offY;
557	557	SegQ s₀, s, *p;
	558	+ GlyfImage *im;
	559	+ Sval bb[4];
558	560	Spt *pts;
559		− u8int *b;
560	561
561		− r = -1;
562	562	ngs = 0;
563	563	pts = nil;
	564	+ im = nil;
564	565
565	566	if(g->simple != nil){
566	567	gs[ngs++] = g;
@@ -587,9 +588,12 @@ FIXME metrics (lsb+rsb) · 20 unmodified lines
587	588	}
588	589	*/
589	590
590		− scale = ppem / o->td.head->unitsPerEm;
591		− Sval bb[4] = {g->xMinscale, g->yMinscale, g->xMaxscale, g->yMaxscale};
592	591	pts = calloc(1, maxptssizeof(pts) + maxptstotal/2sizeof(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;
593	597	s = s₀ = (SegQ*)(pts + maxpts);
594	598	cg = g->component;
595	599	for(i = 0; i < ngs; i++){
@@ -656,16 +660,16 @@ FIXME metrics (lsb+rsb) · 60 unmodified lines
656	660	}
657	661
658	662	npx = w*h;
659		− b = malloc(npx);
660		− b[0] = 0;
661		− if(qbzr(s₀, s-s₀, w, h, b) == 0){
662		− im->b = b;
	663	+ im = malloc(sizeof(*im) + npx);
	664	+ im->b[0] = 0;
	665	+ if(qbzr(s₀, s-s₀, w, h, im->b) == 0){
663	666	im->w = w;
664	667	im->h = h;
665	668	im->baseline = baseline;
666		− r = 0;
667		− }else
668		− free(b);
	669	+ }else{
	670	+ free(im);
	671	+ im = nil;
	672	+ }
669	673
670	674	done:
671	675	for(i = 0; i < ngs; i++){
@@ -673,5 +677,5 @@ done: · 1 unmodified line
673	677	free(gs[i]);
674	678	}
675	679	free(pts);
676		− return r;
	680	+ return im;
677	681	}

test.h+28−30

@@ -19,7 +19,7 @@ static double ppem; · 18 unmodified lines
19	19	static Rune rune = NoRune;
20	20
21	21	static int
22		−dumpmap(Otfile f, GlyfImage im, int n)
	22	+dumpmap(Otfile f, GlyfImage *im, int n)
23	23	{
24	24	int x, y, i, j, t, maxh, prebase, postbase, d, border;
25	25	int gap, total, mid, npix, bw, bh, lines, fill;
@@ -31,20 +31,20 @@ dumpmap(Otfile f, GlyfImage im, int n) · 5 unmodified lines
31	31	fill = map > 2;
32	32	if(n == 1){
33	33	gap = 8;
34		− maxh = im->h;
35		− if(im->baseline)
36		− maxh += im->baseline;
37		− bw = 2*gap + im->w;
	34	+ maxh = im[0]->h;
	35	+ if(im[0]->baseline)
	36	+ maxh += im[0]->baseline;
	37	+ bw = 2*gap + im[0]->w;
38	38	bh = 2*gap + maxh;
39	39	npix = bw * bh;
40	40	}else{
41	41	gap = 1;
42	42	for(i = 0; i < n; i++){
43		− if(im[i].b == nil)
	43	+ if(im[i] == nil)
44	44	continue;
45		− if(maxh < im[i].h)
46		− maxh = im[i].h;
47		− total += im[i].w;
	45	+ if(maxh < im[i]->h)
	46	+ maxh = im[i]->h;
	47	+ total += im[i]->w;
48	48	}
49	49	mid = total / n;
50	50	npix = (mid+gap)(maxh+gap)n;
@@ -61,31 +61,29 @@ dumpmap(Otfile f, GlyfImage im, int n) · 10 unmodified lines
61	61	for(i = 0; i < n;){
62	62	prebase = postbase = 0;
63	63	for(x = 0, j = i; j < n; j++){
64		− if(im[j].b == nil)
	64	+ if(im[j] == nil)
65	65	continue;
66		− x += im[j].w + gap;
	66	+ x += im[j]->w + gap;
67	67	if(x > bw)
68	68	break;
69		− if(prebase < im[j].h+im[j].baseline)
70		− prebase = im[j].h+im[j].baseline;
71		− if(im[j].baseline < 0 && postbase < -im[j].baseline)
72		− postbase = -im[j].baseline;
	69	+ if(prebase < im[j]->h+im[j]->baseline)
	70	+ prebase = im[j]->h+im[j]->baseline;
	71	+ if(im[j]->baseline < 0 && postbase < -im[j]->baseline)
	72	+ postbase = -im[j]->baseline;
73	73	}
74	74	maxh = prebase + postbase;
75	75	if(j == i \|\| y+maxh > bh)
76	76	break;
77	77
78	78	for(x = 0; i < j; i++){
79		− if(im[i].b == nil)
80		− continue;
81		− u8int lt = b + ((y + prebase - (im[i].h+im[i].baseline))bw + x)*3;
82		− x += im[i].w + gap;
83		− for(d = 0; d < im[i].h; d++, lt += bw*3){
84		− for(t = 0; t < im[i].w; t++){
	79	+ u8int lt = b + ((y + prebase - (im[i]->h+im[i]->baseline))bw + x)*3;
	80	+ x += im[i]->w + gap;
	81	+ for(d = 0; d < im[i]->h; d++, lt += bw*3){
	82	+ for(t = 0; t < im[i]->w; t++){
85	83	u8int r, g, b;
86		− r = g = b = im[i].b[d*im[i].w + t];
87		− border = d == 0 \|\| t == 0 \|\| t == im[i].w-1 \|\| d == im[i].h-1;
88		− if((lines \|\| highlight == i) && g == 0xff && (d == im[i].h+im[i].baseline)){
	84	+ r = g = b = im[i]->b[d*im[i]->w + t];
	85	+ border = d == 0 \|\| t == 0 \|\| t == im[i]->w-1 \|\| d == im[i]->h-1;
	86	+ if((lines \|\| highlight == i) && g == 0xff && (d == im[i]->h+im[i]->baseline)){
89	87	g = 0;
90	88	b = 0;
91	89	}else if((lines \|\| highlight == i) && g == 0xff && (fill \|\| border)){
@@ -117,7 +115,7 @@ dumpmap(Otfile f, GlyfImage im, int n) · 25 unmodified lines
117	115	static int
118	116	process(Otfile in, Otfile out)
119	117	{
120		− GlyfImage *im;
	118	+ GlyfImage **im;
121	119	int i, n;
122	120	Glyf *g;
123	121	Otf *o;
@@ -150,7 +148,7 @@ glypherr: · 26 unmodified lines
150	148	return -1;
151	149	}
152	150	if(ppem > 0 && g->numberOfContours != 0){
153		− if(otfdrawglyf(o, g, ppem, im+i) != 0)
	151	+ if((im[i] = otfdrawglyf(o, g, ppem)) == nil)
154	152	goto glypherr;
155	153	}else if(ppem <= 0){
156	154	out->print(out->aux, "%d (%s):\n", i,
@@ -163,7 +161,7 @@ glypherr: · 6 unmodified lines
163	161	if(out->write != otfdiscard && dumpmap(out, im, n) != 0)
164	162	return -1;
165	163	for(i = 0; i < n; i++)
166		− free(im[i].b);
	164	+ free(im[i]);
167	165	free(im);
168	166	}
169	167	}else if(gind < 0){
@@ -172,12 +170,12 @@ glypherr: · 2 unmodified lines
172	170	if((g = otfglyf(o, gind)) == nil){
173	171	goto glypherr;
174	172	}else if(ppem > 0){
175		− GlyfImage im;
176		− if(otfdrawglyf(o, g, ppem, &im) != 0)
	173	+ GlyfImage *im;
	174	+ if((im = otfdrawglyf(o, g, ppem)) == nil)
177	175	goto glypherr;
178	176	if(out->write != otfdiscard && dumpmap(out, &im, 1) != 0)
179	177	return -1;
180		− free(im.b);
	178	+ free(im);
181	179	}else{
182	180	out->print(out->aux, "\n%d:\n", gind);
183	181	print_Glyf(out, indentΔ, o, g);

make otfdrawglyf itself allocate the image

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code