godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4535 from sanikoyes/Pr-crash-dynamic-font 

Fix crash in dynamic font
This commit is contained in:
Rémi Verschelde 2016-05-04 08:35:16 +02:00
parent dd69aeceac c824781e98
commit 6a4b62e720
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/resources/dynamic_font.cpp
View File

@ -261,6 +261,8 @@ void DynamicFontAtSize::_update_char(CharType p_char) {
if (tex_index==-1) {
//could not find texture to fit, create one
tex_x = 0;
tex_y = 0;
int texsize = MAX(size*8,256);
if (mw>texsize)
@ -280,6 +282,7 @@ void DynamicFontAtSize::_update_char(CharType p_char) {
{
//zero texture
DVector<uint8_t>::Write w = tex.imgdata.write();
ERR_FAIL_COND(texsize*texsize*2 > tex.imgdata.size());
for(int i=0;i<texsize*texsize*2;i++) {
w[i]=0;
}
@ -305,6 +308,7 @@ void DynamicFontAtSize::_update_char(CharType p_char) {
for(int j=0;j<w;j++) {
int ofs = ( (i+tex_y+rect_margin)*tex.texture_size+j+tex_x+rect_margin)*2;
ERR_FAIL_COND(ofs >= tex.imgdata.size());
wr[ofs+0]=255; //grayscale as 1
wr[ofs+1]=cpbitmap[i*w+j]; //alpha as 0
}