sean-m
/
stb
mirror of https://github.com/nothings/stb.git
1
0
Fork 0
Code Issues Releases Activity

Merge branch 'master' of http://github.com/rygorous/stb into working

pull/49/head
Sean Barrett 2014-09-18 07:10:43 -07:00
parent 17e82a4080 f36b7116e2
commit 69d4c6738b
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
stb_truetype.h
View File

@ -1385,14 +1385,21 @@ void stbtt_FreeShape(const stbtt_fontinfo *info, stbtt_vertex *v)
void stbtt_GetGlyphBitmapBoxSubpixel(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y,float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1) void stbtt_GetGlyphBitmapBoxSubpixel(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y,float shift_x, float shift_y, int *ix0, int *iy0, int *ix1, int *iy1)
{ {
int x0,y0,x1,y1; int x0,y0,x1,y1;
if (!stbtt_GetGlyphBox(font, glyph, &x0,&y0,&x1,&y1)) if (!stbtt_GetGlyphBox(font, glyph, &x0,&y0,&x1,&y1)) {
x0=y0=x1=y1=0; // e.g. space character // e.g. space character
// now move to integral bboxes (treating pixels as little squares, what pixels get touched)? if (ix0) *ix0 = 0;
if (ix0) *ix0 = STBTT_ifloor(x0 * scale_x + shift_x); if (iy0) *iy0 = 0;
if (iy0) *iy0 = -STBTT_iceil (y1 * scale_y + shift_y); if (ix1) *ix1 = 0;
if (ix1) *ix1 = STBTT_iceil (x1 * scale_x + shift_x); if (iy1) *iy1 = 0;
if (iy1) *iy1 = -STBTT_ifloor(y0 * scale_y + shift_y); } else {
// move to integral bboxes (treating pixels as little squares, what pixels get touched)?
if (ix0) *ix0 = STBTT_ifloor( x0 * scale_x + shift_x);
if (iy0) *iy0 = STBTT_ifloor(-y1 * scale_y + shift_y);
if (ix1) *ix1 = STBTT_iceil ( x1 * scale_x + shift_x);
if (iy1) *iy1 = STBTT_iceil (-y0 * scale_y + shift_y);
}
} }
void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1) void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo *font, int glyph, float scale_x, float scale_y, int *ix0, int *iy0, int *ix1, int *iy1)
{ {
stbtt_GetGlyphBitmapBoxSubpixel(font, glyph, scale_x, scale_y,0.0f,0.0f, ix0, iy0, ix1, iy1); stbtt_GetGlyphBitmapBoxSubpixel(font, glyph, scale_x, scale_y,0.0f,0.0f, ix0, iy0, ix1, iy1);
@ -1639,9 +1646,9 @@ static void stbtt__rasterize(stbtt__bitmap *result, stbtt__point *pts, int *wcou
a=j,b=k; a=j,b=k;
} }
e[n].x0 = p[a].x * scale_x + shift_x; e[n].x0 = p[a].x * scale_x + shift_x;
e[n].y0 = p[a].y * y_scale_inv * vsubsample + shift_y; e[n].y0 = (p[a].y * y_scale_inv + shift_y) * vsubsample;
e[n].x1 = p[b].x * scale_x + shift_x; e[n].x1 = p[b].x * scale_x + shift_x;
e[n].y1 = p[b].y * y_scale_inv * vsubsample + shift_y; e[n].y1 = (p[b].y * y_scale_inv + shift_y) * vsubsample;
++n; ++n;
} }
} }