mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-23 12:36:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix clipping and only apply color conversion for hicolor systems.

Browse Source 
svn path=/trunk/netsurf/; revision=13372
This commit is contained in:
Ole Loots 2012-01-03 23:29:25 +00:00
parent 5cdfd5a086
commit 68466df8a2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
atari/plot/font_freetype.c
View File

@ -386,8 +386,8 @@ static void draw_glyph8(FONT_PLOTTER self, GRECT * loc, uint8_t * pixdata, int p
clip.g_x = self->plotter->clipping.x0;
clip.g_y = self->plotter->clipping.y0;
clip.g_w = self->plotter->clipping.x1 - self->plotter->clipping.x0;
clip.g_h = self->plotter->clipping.y1 - self->plotter->clipping.y0;
clip.g_w = (self->plotter->clipping.x1 - self->plotter->clipping.x0)+1;
clip.g_h = (self->plotter->clipping.y1 - self->plotter->clipping.y0)+1;
if( !rc_intersect( &clip, loc ) ){
return;
@ -434,8 +434,8 @@ static void draw_glyph1(FONT_PLOTTER self, GRECT * loc, uint8_t * pixdata, int p
clip.g_x = self->plotter->clipping.x0;
clip.g_y = self->plotter->clipping.y0;
clip.g_w = self->plotter->clipping.x1 - self->plotter->clipping.x0;
clip.g_h = self->plotter->clipping.y1 - self->plotter->clipping.y0;
clip.g_w = (self->plotter->clipping.x1 - self->plotter->clipping.x0)+1;
clip.g_h = (self->plotter->clipping.y1 - self->plotter->clipping.y0)+1;
if( !rc_intersect( &clip, loc ) ){
return;
@ -503,7 +503,8 @@ static int text( FONT_PLOTTER self, int x, int y, const char *text, size_t leng
uint32_t c = fstyle->foreground ;
/* in -> BGR */
/* out -> ARGB */
c = ABGR_TO_RGB(c);
if( app.nplanes > 8 )
c = ABGR_TO_RGB(c);
while (nxtchr < length) {
ucs4 = utf8_to_ucs4(text + nxtchr, length - nxtchr);
@ -526,7 +527,7 @@ static int text( FONT_PLOTTER self, int x, int y, const char *text, size_t leng
&loc,
bglyph->bitmap.buffer,
bglyph->bitmap.pitch,
fstyle->foreground
c
);
}
}