Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: store BLF buffer size in a variable

Browse Source
This commit is contained in:
Campbell Barton
2020-05-03 18:08:30 +10:00
parent ccaab72685
commit a6380d063f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenfont/intern/blf_glyph.c
View File

@@ -212,7 +212,7 @@ void blf_glyph_cache_free(GlyphCacheBLF *gc)
GlyphBLF *g; GlyphBLF *g;
unsigned int i; unsigned int i;
for (i = 0; i < 257; i++) { for (i = 0; i < ARRAY_SIZE(gc->bucket); i++) {
while ((g = BLI_pophead(&gc->bucket[i]))) { while ((g = BLI_pophead(&gc->bucket[i]))) {
blf_glyph_free(g); blf_glyph_free(g);
} }
@@ -330,17 +330,18 @@ GlyphBLF *blf_glyph_add(FontBLF *font, GlyphCacheBLF *gc, unsigned int index, un
g->dims[0] = (int)bitmap.width; g->dims[0] = (int)bitmap.width;
g->dims[1] = (int)bitmap.rows; g->dims[1] = (int)bitmap.rows;
if (g->dims[0] && g->dims[1]) { const int buffer_size = g->dims[0] * g->dims[1];
if (buffer_size != 0) {
if (font->flags & BLF_MONOCHROME) { if (font->flags & BLF_MONOCHROME) {
/* Font buffer uses only 0 or 1 values, Blender expects full 0..255 range */ /* Font buffer uses only 0 or 1 values, Blender expects full 0..255 range */
int i; for (int i = 0; i < buffer_size; i++) {
for (i = 0; i < (g->dims[0] * g->dims[1]); i++) {
bitmap.buffer[i] = bitmap.buffer[i] ? 255 : 0; bitmap.buffer[i] = bitmap.buffer[i] ? 255 : 0;
} }
} }
g->bitmap = MEM_mallocN((size_t)g->dims[0] * (size_t)g->dims[1], "glyph bitmap"); g->bitmap = MEM_mallocN((size_t)buffer_size, "glyph bitmap");
memcpy(g->bitmap, (void *)bitmap.buffer, (size_t)g->dims[0] * (size_t)g->dims[1]); memcpy(g->bitmap, bitmap.buffer, (size_t)buffer_size);
} }
g->advance = ((float)slot->advance.x) / 64.0f; g->advance = ((float)slot->advance.x) / 64.0f;