QB64/qb64
QB64/qb64
1
1
Fork 0
mirror of https://github.com/QB64Official/qb64.git synced 2024-07-03 07:41:21 +00:00
Code Releases Wiki Activity

Fixes severe bug in TTF usage which caused programs crash intermittently/always due to non-zero initialized memory

Browse source 
Fixes bug (add clipping) which causes rendering of TTF fonts outside screen boundaries to wrap/crash
This commit is contained in:
Galleon 2014-10-12 00:45:02 -07:00
parent 9b5c4bcc39
commit 2ffc8fcbca
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal/c/libqb.cpp
View file

@ -20379,21 +20379,21 @@ void sub_mkdir(qbs *str){
for (y2=0;y2<h;y2++){
cp=rt_data+y2*w;
for (x2=0;x2<w;x2++){
if (*cp++) pset(x+x2,y+y2,color); else pset(x+x2,y+y2,background_color);
if (*cp++) pset_and_clip(x+x2,y+y2,color); else pset_and_clip(x+x2,y+y2,background_color);
}}
break;
case 1:
for (y2=0;y2<h;y2++){
cp=rt_data+y2*w;
for (x2=0;x2<w;x2++){
if (*cp++) pset(x+x2,y+y2,color);
if (*cp++) pset_and_clip(x+x2,y+y2,color);
}}
break;
case 2:
for (y2=0;y2<h;y2++){
cp=rt_data+y2*w;
for (x2=0;x2<w;x2++){
if (!(*cp++)) pset(x+x2,y+y2,background_color);
if (!(*cp++)) pset_and_clip(x+x2,y+y2,background_color);
}}
break;
default:
@ -20455,7 +20455,7 @@ void sub_mkdir(qbs *str){
g4=qbr_float_to_long(g3);
b4=qbr_float_to_long(b3);
alpha4=qbr_float_to_long(alpha3);
pset(x+x2,y+y2,b4+(g4<<8)+(r4<<16)+(alpha4<<24));
pset_and_clip(x+x2,y+y2,b4+(g4<<8)+(r4<<16)+(alpha4<<24));
}}
break;
@ -20464,7 +20464,7 @@ void sub_mkdir(qbs *str){
cp=rt_data+y2*w;
for (x2=0;x2<w;x2++){
z3=*cp++;
if (z3) pset(x+x2,y+y2,((z3*a)>>8<<24)+z);
if (z3) pset_and_clip(x+x2,y+y2,((z3*a)>>8<<24)+z);
}}
break;
case 2:
@ -20472,7 +20472,7 @@ void sub_mkdir(qbs *str){
cp=rt_data+y2*w;
for (x2=0;x2<w;x2++){
z3=*cp++;
if (z3!=255) pset(x+x2,y+y2,(((255-z3)*a2)>>8<<24)+z2);
if (z3!=255) pset_and_clip(x+x2,y+y2,(((255-z3)*a2)>>8<<24)+z2);
}}
break;
default:

2
internal/c/parts/video/font/ttf/src.c
View file

@ -254,6 +254,8 @@ fonts=(fonts_struct*)realloc(fonts,sizeof(fonts_struct)*(fonts_last+1));
fonts[i].in_use=0;
got_index:
memset(&fonts[i],0,sizeof(fonts_struct));
//duplicate content
static uint8* content;
content=(uint8*)malloc(content_bytes);