diff options
Diffstat (limited to 'source/blender/blenfont/intern/blf_font.c')
-rw-r--r-- | source/blender/blenfont/intern/blf_font.c | 418 |
1 files changed, 214 insertions, 204 deletions
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index 7ec7e2357dd..69259aa6719 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -73,43 +73,43 @@ void blf_font_size(FontBLF *font, int size, int dpi) GlyphCacheBLF *gc; FT_Error err; - err= FT_Set_Char_Size(font->face, 0, (size * 64), dpi, dpi); + err = FT_Set_Char_Size(font->face, 0, (size * 64), dpi, dpi); if (err) { /* FIXME: here we can go through the fixed size and choice a close one */ printf("The current font don't support the size, %d and dpi, %d\n", size, dpi); return; } - font->size= size; - font->dpi= dpi; + font->size = size; + font->dpi = dpi; - gc= blf_glyph_cache_find(font, size, dpi); + gc = blf_glyph_cache_find(font, size, dpi); if (gc) - font->glyph_cache= gc; + font->glyph_cache = gc; else { - gc= blf_glyph_cache_new(font); + gc = blf_glyph_cache_new(font); if (gc) - font->glyph_cache= gc; + font->glyph_cache = gc; else - font->glyph_cache= NULL; + font->glyph_cache = NULL; } } static void blf_font_ensure_ascii_table(FontBLF *font) { - GlyphBLF **glyph_ascii_table= font->glyph_cache->glyph_ascii_table; + GlyphBLF **glyph_ascii_table = font->glyph_cache->glyph_ascii_table; /* build ascii on demand */ - if(glyph_ascii_table['0']==NULL) { + if (glyph_ascii_table['0'] == NULL) { GlyphBLF *g; unsigned int i; - for(i=0; i<256; i++) { - g= blf_glyph_search(font->glyph_cache, i); + for (i = 0; i<256; i++) { + g = blf_glyph_search(font->glyph_cache, i); if (!g) { - FT_UInt glyph_index= FT_Get_Char_Index(font->face, i); - g= blf_glyph_add(font, glyph_index, i); + FT_UInt glyph_index = FT_Get_Char_Index(font->face, i); + g = blf_glyph_add(font, glyph_index, i); } - glyph_ascii_table[i]= g; + glyph_ascii_table[i] = g; } } } @@ -122,67 +122,69 @@ static void blf_font_ensure_ascii_table(FontBLF *font) /* Note, * blf_font_ensure_ascii_table(font); must be called before this macro */ -#define BLF_UTF8_NEXT_FAST(_font, _g, _str, _i, _c, _glyph_ascii_table) \ - if(((_c)= (_str)[_i]) < 0x80) { \ - _g= (_glyph_ascii_table)[_c]; \ - _i++; \ - } \ - else if ((_c= BLI_str_utf8_as_unicode_step(_str, &(_i)))!=BLI_UTF8_ERR) { \ - if ((_g= blf_glyph_search((_font)->glyph_cache, _c)) == NULL) { \ - _g= blf_glyph_add(_font, \ - FT_Get_Char_Index((_font)->face, _c), _c); \ - } \ - } \ - - -#define BLF_KERNING_VARS(_font, _has_kerning, _kern_mode) \ - const short _has_kerning= FT_HAS_KERNING((_font)->face); \ - const FT_UInt _kern_mode= (_has_kerning == 0) ? 0 : \ - (((_font)->flags & BLF_KERNING_DEFAULT) ? \ - ft_kerning_default : FT_KERNING_UNFITTED) \ - - -#define BLF_KERNING_STEP(_font, _kern_mode, _g_prev, _g, _delta, _pen_x) \ -{ \ - if (_g_prev) { \ - _delta.x= _delta.y= 0; \ - if (FT_Get_Kerning((_font)->face, \ - (_g_prev)->idx, \ - (_g)->idx, \ - _kern_mode, \ - &(_delta)) == 0) \ - { \ - _pen_x += delta.x >> 6; \ - } \ - } \ -} \ +#define BLF_UTF8_NEXT_FAST(_font, _g, _str, _i, _c, _glyph_ascii_table) \ + if (((_c) = (_str)[_i]) < 0x80) { \ + _g = (_glyph_ascii_table)[_c]; \ + _i++; \ + } \ + else if ((_c = BLI_str_utf8_as_unicode_step(_str, &(_i))) != BLI_UTF8_ERR) { \ + if ((_g = blf_glyph_search((_font)->glyph_cache, _c)) == NULL) { \ + _g = blf_glyph_add(_font, \ + FT_Get_Char_Index((_font)->face, _c), _c); \ + } \ + } \ + + +#define BLF_KERNING_VARS(_font, _has_kerning, _kern_mode) \ + const short _has_kerning = FT_HAS_KERNING((_font)->face); \ + const FT_UInt _kern_mode = (_has_kerning == 0) ? 0 : \ + (((_font)->flags & BLF_KERNING_DEFAULT) ? \ + ft_kerning_default : FT_KERNING_UNFITTED) \ + + +#define BLF_KERNING_STEP(_font, _kern_mode, _g_prev, _g, _delta, _pen_x) \ +{ \ + if (_g_prev) { \ + _delta.x = _delta.y = 0; \ + if (FT_Get_Kerning((_font)->face, \ + (_g_prev)->idx, \ + (_g)->idx, \ + _kern_mode, \ + &(_delta)) == 0) \ + { \ + _pen_x += delta.x >> 6; \ + } \ + } \ +} \ void blf_font_draw(FontBLF *font, const char *str, unsigned int len) { unsigned int c; - GlyphBLF *g, *g_prev= NULL; + GlyphBLF *g, *g_prev = NULL; FT_Vector delta; - int pen_x= 0, pen_y= 0; - size_t i= 0; - GlyphBLF **glyph_ascii_table= font->glyph_cache->glyph_ascii_table; + int pen_x = 0, pen_y = 0; + size_t i = 0; + GlyphBLF **glyph_ascii_table = font->glyph_cache->glyph_ascii_table; BLF_KERNING_VARS(font, has_kerning, kern_mode); blf_font_ensure_ascii_table(font); while (str[i] && i < len) { - BLF_UTF8_NEXT_FAST(font, g, str, i, c, glyph_ascii_table); - if (c == BLI_UTF8_ERR) break; - if (g == NULL) continue; - if (has_kerning) BLF_KERNING_STEP(font, kern_mode, g_prev, g, delta, pen_x); + if (c == BLI_UTF8_ERR) + break; + if (g == NULL) + continue; + if (has_kerning) + BLF_KERNING_STEP(font, kern_mode, g_prev, g, delta, pen_x); /* do not return this loop if clipped, we want every character tested */ blf_glyph_render(font, g, (float)pen_x, (float)pen_y); pen_x += g->advance; - g_prev= g; + g_prev = g; } } @@ -190,24 +192,26 @@ void blf_font_draw(FontBLF *font, const char *str, unsigned int len) void blf_font_draw_ascii(FontBLF *font, const char *str, unsigned int len) { unsigned char c; - GlyphBLF *g, *g_prev= NULL; + GlyphBLF *g, *g_prev = NULL; FT_Vector delta; - int pen_x= 0, pen_y= 0; - GlyphBLF **glyph_ascii_table= font->glyph_cache->glyph_ascii_table; + int pen_x = 0, pen_y = 0; + GlyphBLF **glyph_ascii_table = font->glyph_cache->glyph_ascii_table; BLF_KERNING_VARS(font, has_kerning, kern_mode); blf_font_ensure_ascii_table(font); - while ((c= *(str++)) && len--) { - if ((g= glyph_ascii_table[c]) == NULL) continue; - if (has_kerning) BLF_KERNING_STEP(font, kern_mode, g_prev, g, delta, pen_x); + while ((c = *(str++)) && len--) { + if ((g = glyph_ascii_table[c]) == NULL) + continue; + if (has_kerning) + BLF_KERNING_STEP(font, kern_mode, g_prev, g, delta, pen_x); /* do not return this loop if clipped, we want every character tested */ blf_glyph_render(font, g, (float)pen_x, (float)pen_y); pen_x += g->advance; - g_prev= g; + g_prev = g; } } @@ -215,17 +219,17 @@ void blf_font_draw_ascii(FontBLF *font, const char *str, unsigned int len) void blf_font_buffer(FontBLF *font, const char *str) { unsigned int c; - GlyphBLF *g, *g_prev= NULL; + GlyphBLF *g, *g_prev = NULL; FT_Vector delta; - int pen_x= (int)font->pos[0], pen_y= 0; - size_t i= 0; - GlyphBLF **glyph_ascii_table= font->glyph_cache->glyph_ascii_table; + int pen_x = (int)font->pos[0], pen_y = 0; + size_t i = 0; + GlyphBLF **glyph_ascii_table = font->glyph_cache->glyph_ascii_table; /* buffer specific vars*/ - const unsigned char b_col_char[4]= {font->b_col[0] * 255, - font->b_col[1] * 255, - font->b_col[2] * 255, - font->b_col[3] * 255}; + const unsigned char b_col_char[4] = {font->b_col[0] * 255, + font->b_col[1] * 255, + font->b_col[2] * 255, + font->b_col[3] * 255}; unsigned char *cbuf; int chx, chy; int y, x; @@ -236,15 +240,17 @@ void blf_font_buffer(FontBLF *font, const char *str) blf_font_ensure_ascii_table(font); while (str[i]) { - BLF_UTF8_NEXT_FAST(font, g, str, i, c, glyph_ascii_table); - if (c == BLI_UTF8_ERR) break; - if (g == NULL) continue; - if (has_kerning) BLF_KERNING_STEP(font, kern_mode, g_prev, g, delta, pen_x); + if (c == BLI_UTF8_ERR) + break; + if (g == NULL) + continue; + if (has_kerning) + BLF_KERNING_STEP(font, kern_mode, g_prev, g, delta, pen_x); - chx= pen_x + ((int)g->pos_x); - chy= (int)font->pos[1] + g->height; + chx = pen_x + ((int)g->pos_x); + chy = (int)font->pos[1] + g->height; if (g->pitch < 0) { pen_y = (int)font->pos[1] + (g->height - (int)g->pos_y); @@ -255,41 +261,42 @@ void blf_font_buffer(FontBLF *font, const char *str) if ((chx + g->width) >= 0 && chx < font->bw && (pen_y + g->height) >= 0 && pen_y < font->bh) { /* dont draw beyond the buffer bounds */ - int width_clip= g->width; - int height_clip= g->height; - int yb_start= g->pitch < 0 ? 0 : g->height-1; - - if (width_clip + chx > font->bw) width_clip -= chx + width_clip - font->bw; - if (height_clip + pen_y > font->bh) height_clip -= pen_y + height_clip - font->bh; + int width_clip = g->width; + int height_clip = g->height; + int yb_start = g->pitch < 0 ? 0 : g->height-1; + + if (width_clip + chx > font->bw) + width_clip -= chx + width_clip - font->bw; + if (height_clip + pen_y > font->bh) + height_clip -= pen_y + height_clip - font->bh; /* drawing below the image? */ - if(pen_y < 0) { + if (pen_y < 0) { yb_start += (g->pitch < 0) ? -pen_y : pen_y; height_clip += pen_y; - pen_y= 0; + pen_y = 0; } if (font->b_fbuf) { - int yb= yb_start; - for (y=(chy >= 0 ? 0:-chy); y < height_clip; y++) { - for (x=(chx >= 0 ? 0:-chx); x < width_clip; x++) { - - a= *(g->bitmap + x + (yb * g->pitch)) / 255.0f; + int yb = yb_start; + for (y = (chy >= 0 ? 0:-chy); y < height_clip; y++) { + for (x = (chx >= 0 ? 0:-chx); x < width_clip; x++) { + a = *(g->bitmap + x + (yb * g->pitch)) / 255.0f; - if(a > 0.0f) { + if (a > 0.0f) { float alphatest; - fbuf= font->b_fbuf + font->bch * ((chx + x) + ((pen_y + y)*font->bw)); + fbuf = font->b_fbuf + font->bch * ((chx + x) + ((pen_y + y)*font->bw)); if (a >= 1.0f) { - fbuf[0]= font->b_col[0]; - fbuf[1]= font->b_col[1]; - fbuf[2]= font->b_col[2]; - fbuf[3]= (alphatest= (fbuf[3] + (font->b_col[3]))) < 1.0f ? alphatest : 1.0f; + fbuf[0] = font->b_col[0]; + fbuf[1] = font->b_col[1]; + fbuf[2] = font->b_col[2]; + fbuf[3] = (alphatest = (fbuf[3] + (font->b_col[3]))) < 1.0f ? alphatest : 1.0f; } else { - fbuf[0]= (font->b_col[0]*a) + (fbuf[0] * (1-a)); - fbuf[1]= (font->b_col[1]*a) + (fbuf[1] * (1-a)); - fbuf[2]= (font->b_col[2]*a) + (fbuf[2] * (1-a)); - fbuf[3]= (alphatest= (fbuf[3] + (font->b_col[3]*a))) < 1.0f ? alphatest : 1.0f; + fbuf[0] = (font->b_col[0]*a) + (fbuf[0] * (1-a)); + fbuf[1] = (font->b_col[1]*a) + (fbuf[1] * (1-a)); + fbuf[2] = (font->b_col[2]*a) + (fbuf[2] * (1-a)); + fbuf[3] = (alphatest = (fbuf[3] + (font->b_col[3]*a))) < 1.0f ? alphatest : 1.0f; } } } @@ -302,25 +309,26 @@ void blf_font_buffer(FontBLF *font, const char *str) } if (font->b_cbuf) { - int yb= yb_start; - for (y= 0; y < height_clip; y++) { - for (x= 0; x < width_clip; x++) { - a= *(g->bitmap + x + (yb * g->pitch)) / 255.0f; + int yb = yb_start; + for (y = 0; y < height_clip; y++) { + for (x = 0; x < width_clip; x++) { + a = *(g->bitmap + x + (yb * g->pitch)) / 255.0f; - if(a > 0.0f) { + if (a > 0.0f) { int alphatest; - cbuf= font->b_cbuf + font->bch * ((chx + x) + ((pen_y + y)*font->bw)); + cbuf = font->b_cbuf + font->bch * ((chx + x) + ((pen_y + y)*font->bw)); if (a >= 1.0f) { - cbuf[0]= b_col_char[0]; - cbuf[1]= b_col_char[1]; - cbuf[2]= b_col_char[2]; - cbuf[3]= (alphatest= ((int)cbuf[3] + (int)b_col_char[3])) < 255 ? alphatest : 255; + cbuf[0] = b_col_char[0]; + cbuf[1] = b_col_char[1]; + cbuf[2] = b_col_char[2]; + cbuf[3] = (alphatest = ((int)cbuf[3] + (int)b_col_char[3])) < 255 ? alphatest : 255; } else { - cbuf[0]= (b_col_char[0]*a) + (cbuf[0] * (1-a)); - cbuf[1]= (b_col_char[1]*a) + (cbuf[1] * (1-a)); - cbuf[2]= (b_col_char[2]*a) + (cbuf[2] * (1-a)); - cbuf[3]= (alphatest= ((int)cbuf[3] + (int)((font->b_col[3]*a)*255.0f))) < 255 ? alphatest : 255; + cbuf[0] = (b_col_char[0]*a) + (cbuf[0] * (1-a)); + cbuf[1] = (b_col_char[1]*a) + (cbuf[1] * (1-a)); + cbuf[2] = (b_col_char[2]*a) + (cbuf[2] * (1-a)); + cbuf[3] = (alphatest = ((int)cbuf[3] + (int)((font->b_col[3]*a)*255.0f))) < + 255 ? alphatest : 255; } } } @@ -334,58 +342,60 @@ void blf_font_buffer(FontBLF *font, const char *str) } pen_x += g->advance; - g_prev= g; + g_prev = g; } } void blf_font_boundbox(FontBLF *font, const char *str, rctf *box) { unsigned int c; - GlyphBLF *g, *g_prev= NULL; + GlyphBLF *g, *g_prev = NULL; FT_Vector delta; - int pen_x= 0, pen_y= 0; - size_t i= 0; - GlyphBLF **glyph_ascii_table= font->glyph_cache->glyph_ascii_table; + int pen_x = 0, pen_y = 0; + size_t i = 0; + GlyphBLF **glyph_ascii_table = font->glyph_cache->glyph_ascii_table; rctf gbox; BLF_KERNING_VARS(font, has_kerning, kern_mode); - box->xmin= 32000.0f; - box->xmax= -32000.0f; - box->ymin= 32000.0f; - box->ymax= -32000.0f; + box->xmin = 32000.0f; + box->xmax = -32000.0f; + box->ymin = 32000.0f; + box->ymax = -32000.0f; blf_font_ensure_ascii_table(font); while (str[i]) { - BLF_UTF8_NEXT_FAST(font, g, str, i, c, glyph_ascii_table); - if (c == BLI_UTF8_ERR) break; - if (g == NULL) continue; - if (has_kerning) BLF_KERNING_STEP(font, kern_mode, g_prev, g, delta, pen_x); + if (c == BLI_UTF8_ERR) + break; + if (g == NULL) + continue; + if (has_kerning) + BLF_KERNING_STEP(font, kern_mode, g_prev, g, delta, pen_x); - gbox.xmin= pen_x; - gbox.xmax= pen_x + g->advance; - gbox.ymin= g->box.ymin + pen_y; - gbox.ymax= g->box.ymax + pen_y; + gbox.xmin = pen_x; + gbox.xmax = pen_x + g->advance; + gbox.ymin = g->box.ymin + pen_y; + gbox.ymax = g->box.ymax + pen_y; - if (gbox.xmin < box->xmin) box->xmin= gbox.xmin; - if (gbox.ymin < box->ymin) box->ymin= gbox.ymin; + if (gbox.xmin < box->xmin) box->xmin = gbox.xmin; + if (gbox.ymin < box->ymin) box->ymin = gbox.ymin; - if (gbox.xmax > box->xmax) box->xmax= gbox.xmax; - if (gbox.ymax > box->ymax) box->ymax= gbox.ymax; + if (gbox.xmax > box->xmax) box->xmax = gbox.xmax; + if (gbox.ymax > box->ymax) box->ymax = gbox.ymax; pen_x += g->advance; - g_prev= g; + g_prev = g; } if (box->xmin > box->xmax) { - box->xmin= 0.0f; - box->ymin= 0.0f; - box->xmax= 0.0f; - box->ymax= 0.0f; + box->xmin = 0.0f; + box->ymin = 0.0f; + box->xmax = 0.0f; + box->ymax = 0.0f; } } @@ -395,17 +405,17 @@ void blf_font_width_and_height(FontBLF *font, const char *str, float *width, flo rctf box; if (font->flags & BLF_ASPECT) { - xa= font->aspect[0]; - ya= font->aspect[1]; + xa = font->aspect[0]; + ya = font->aspect[1]; } else { - xa= 1.0f; - ya= 1.0f; + xa = 1.0f; + ya = 1.0f; } blf_font_boundbox(font, str, &box); - *width= ((box.xmax - box.xmin) * xa); - *height= ((box.ymax - box.ymin) * ya); + *width = ((box.xmax - box.xmin) * xa); + *height = ((box.ymax - box.ymin) * ya); } float blf_font_width(FontBLF *font, const char *str) @@ -414,9 +424,9 @@ float blf_font_width(FontBLF *font, const char *str) rctf box; if (font->flags & BLF_ASPECT) - xa= font->aspect[0]; + xa = font->aspect[0]; else - xa= 1.0f; + xa = 1.0f; blf_font_boundbox(font, str, &box); return (box.xmax - box.xmin) * xa; @@ -428,9 +438,9 @@ float blf_font_height(FontBLF *font, const char *str) rctf box; if (font->flags & BLF_ASPECT) - ya= font->aspect[1]; + ya = font->aspect[1]; else - ya= 1.0f; + ya = 1.0f; blf_font_boundbox(font, str, &box); return (box.ymax - box.ymin) * ya; @@ -439,9 +449,9 @@ float blf_font_height(FontBLF *font, const char *str) float blf_font_fixed_width(FontBLF *font) { const unsigned int c = ' '; - GlyphBLF *g= blf_glyph_search(font->glyph_cache, c); + GlyphBLF *g = blf_glyph_search(font->glyph_cache, c); if (!g) { - g= blf_glyph_add(font, FT_Get_Char_Index(font->face, c), c); + g = blf_glyph_add(font, FT_Get_Char_Index(font->face, c), c); /* if we don't find the glyph. */ if (!g) { @@ -456,9 +466,9 @@ void blf_font_free(FontBLF *font) { GlyphCacheBLF *gc; - font->glyph_cache= NULL; + font->glyph_cache = NULL; while (font->cache.first) { - gc= font->cache.first; + gc = font->cache.first; BLI_remlink(&font->cache, gc); blf_glyph_cache_free(gc); } @@ -475,38 +485,38 @@ static void blf_font_fill(FontBLF *font) { unsigned int i; - font->aspect[0]= 1.0f; - font->aspect[1]= 1.0f; - font->aspect[2]= 1.0f; - font->pos[0]= 0.0f; - font->pos[1]= 0.0f; - font->angle= 0.0f; - - for (i= 0; i < 16; i++) - font->m[i]= 0; - - font->clip_rec.xmin= 0.0f; - font->clip_rec.xmax= 0.0f; - font->clip_rec.ymin= 0.0f; - font->clip_rec.ymax= 0.0f; - font->flags= 0; - font->dpi= 0; - font->size= 0; - font->cache.first= NULL; - font->cache.last= NULL; - font->glyph_cache= NULL; - font->blur= 0; - font->max_tex_size= -1; - font->b_fbuf= NULL; - font->b_cbuf= NULL; - font->bw= 0; - font->bh= 0; - font->bch= 0; - font->b_col[0]= 0; - font->b_col[1]= 0; - font->b_col[2]= 0; - font->b_col[3]= 0; - font->ft_lib= ft_lib; + font->aspect[0] = 1.0f; + font->aspect[1] = 1.0f; + font->aspect[2] = 1.0f; + font->pos[0] = 0.0f; + font->pos[1] = 0.0f; + font->angle = 0.0f; + + for (i = 0; i < 16; i++) + font->m[i] = 0; + + font->clip_rec.xmin = 0.0f; + font->clip_rec.xmax = 0.0f; + font->clip_rec.ymin = 0.0f; + font->clip_rec.ymax = 0.0f; + font->flags = 0; + font->dpi = 0; + font->size = 0; + font->cache.first = NULL; + font->cache.last = NULL; + font->glyph_cache = NULL; + font->blur = 0; + font->max_tex_size = -1; + font->b_fbuf = NULL; + font->b_cbuf = NULL; + font->bw = 0; + font->bh = 0; + font->bch = 0; + font->b_col[0] = 0; + font->b_col[1] = 0; + font->b_col[2] = 0; + font->b_col[3] = 0; + font->ft_lib = ft_lib; } FontBLF *blf_font_new(const char *name, const char *filename) @@ -515,14 +525,14 @@ FontBLF *blf_font_new(const char *name, const char *filename) FT_Error err; char *mfile; - font= (FontBLF *)MEM_callocN(sizeof(FontBLF), "blf_font_new"); - err= FT_New_Face(ft_lib, filename, 0, &font->face); + font = (FontBLF *)MEM_callocN(sizeof(FontBLF), "blf_font_new"); + err = FT_New_Face(ft_lib, filename, 0, &font->face); if (err) { MEM_freeN(font); return NULL; } - err= FT_Select_Charmap(font->face, ft_encoding_unicode); + err = FT_Select_Charmap(font->face, ft_encoding_unicode); if (err) { printf("Can't set the unicode character map!\n"); FT_Done_Face(font->face); @@ -530,17 +540,17 @@ FontBLF *blf_font_new(const char *name, const char *filename) return NULL; } - mfile= blf_dir_metrics_search(filename); + mfile = blf_dir_metrics_search(filename); if (mfile) { - err= FT_Attach_File(font->face, mfile); - if(err) { + err = FT_Attach_File(font->face, mfile); + if (err) { fprintf(stderr, "FT_Attach_File failed to load '%s' with error %d\n", filename, (int)err); } MEM_freeN(mfile); } - font->name= BLI_strdup(name); - font->filename= BLI_strdup(filename); + font->name = BLI_strdup(name); + font->filename = BLI_strdup(filename); blf_font_fill(font); return font; } @@ -549,9 +559,9 @@ void blf_font_attach_from_mem(FontBLF *font, const unsigned char *mem, int mem_s { FT_Open_Args open; - open.flags= FT_OPEN_MEMORY; - open.memory_base= (FT_Byte *)mem; - open.memory_size= mem_size; + open.flags = FT_OPEN_MEMORY; + open.memory_base = (FT_Byte *)mem; + open.memory_size = mem_size; FT_Attach_Stream(font->face, &open); } @@ -560,14 +570,14 @@ FontBLF *blf_font_new_from_mem(const char *name, unsigned char *mem, int mem_siz FontBLF *font; FT_Error err; - font= (FontBLF *)MEM_callocN(sizeof(FontBLF), "blf_font_new_from_mem"); - err= FT_New_Memory_Face(ft_lib, mem, mem_size, 0, &font->face); + font = (FontBLF *)MEM_callocN(sizeof(FontBLF), "blf_font_new_from_mem"); + err = FT_New_Memory_Face(ft_lib, mem, mem_size, 0, &font->face); if (err) { MEM_freeN(font); return NULL; } - err= FT_Select_Charmap(font->face, ft_encoding_unicode); + err = FT_Select_Charmap(font->face, ft_encoding_unicode); if (err) { printf("Can't set the unicode character map!\n"); FT_Done_Face(font->face); @@ -575,8 +585,8 @@ FontBLF *blf_font_new_from_mem(const char *name, unsigned char *mem, int mem_siz return NULL; } - font->name= BLI_strdup(name); - font->filename= NULL; + font->name = BLI_strdup(name); + font->filename = NULL; blf_font_fill(font); return font; } |