empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'rr1-maint'

Browse source
This commit is contained in:
Ilari Liusvaara 2013-05-30 23:37:43 +03:00
commit bd592f223d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/library/framebuffer.cpp
View file

@ -811,8 +811,8 @@ template<bool X> void bitmap_font::render(struct framebuffer<X>& scr, int32_t x,
if(gy < 0) ystart = -gy;
xlength -= xstart;
ylength -= ystart;
if(gx + xlength > swidth) xlength = swidth - gx;
if(gy + ylength > sheight) ylength = sheight - gy;
if(gx + xstart + xlength > swidth) xlength = swidth - (gx + xstart);
if(gy + ystart + ylength > sheight) ylength = sheight - (gy + ystart);
if(g.data)
for(size_t i = 0; i < ylength; i++) {
typename framebuffer<X>::element_t* r = scr.rowptr(gy + ystart + i) +