archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

BLF: Style: Fix bad casts.

Browse Source 
This could have caused overflow issue.
This commit is contained in:
Clément Foucault
2018-04-10 11:34:45 +02:00
parent 8d1c21998a
commit 21a57ec29e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,8 +243,7 @@ static void blf_glyph_cache_texture(FontBLF *font, GlyphCacheBLF *gc)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
unsigned int pix_count = (unsigned int)(gc->p2_width * gc->p2_height);
unsigned char *pixels = MEM_callocN(pix_count * sizeof(*pixels), "BLF texture init");
unsigned char *pixels = MEM_callocN((size_t)gc->p2_width * (size_t)gc->p2_height, "BLF texture init");
glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, gc->p2_width, gc->p2_height, 0, GL_RED, GL_UNSIGNED_BYTE, pixels);
MEM_freeN(pixels);
}
@@ -345,8 +344,8 @@ GlyphBLF *blf_glyph_add(FontBLF *font, unsigned int index, unsigned int c)
}
}
g->bitmap = (unsigned char *)MEM_mallocN((size_t)(g->width * g->height), "glyph bitmap");
memcpy((void *)g->bitmap, (void *)bitmap.buffer, (size_t)(g->width * g->height));
g->bitmap = (unsigned char *)MEM_mallocN((size_t)g->width * (size_t)g->height, "glyph bitmap");
memcpy((void *)g->bitmap, (void *)bitmap.buffer, (size_t)g->width * (size_t)g->height);
}
g->advance = ((float)slot->advance.x) / 64.0f;