mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-16 14:34:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix character sign issue causing corrupt characters to be plotted

Browse Source 
Fixed warnings from making signs explicit

svn path=/trunk/netsurf/; revision=6491
This commit is contained in:
Vincent Sanders 2009-02-14 14:12:29 +00:00
parent 8ce23e69e0
commit 7a867aacc2
3 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
framebuffer/fb_16bpp_plotters.c
View File

@ -205,16 +205,16 @@ static bool fb_16bpp_text(int x, int y, const struct css_style *style,
uint16_t fgcol; uint16_t fgcol;
uint16_t bgcol; uint16_t bgcol;
char *buffer = NULL; unsigned char *buffer = NULL;
int x0,y0,x1,y1; int x0,y0,x1,y1;
int xoff, yoff; /* x and y offset into image */ int xoff, yoff; /* x and y offset into image */
int height = fb_font->height; int height = fb_font->height;
/* aquire thge text in local font encoding */ /* aquire thge text in local font encoding */
utf8_to_font_encoding(fb_font, text, length, &buffer); utf8_to_font_encoding(fb_font, text, length, (char **)&buffer);
if (!buffer) if (!buffer)
return true; return true;
length = strlen(buffer); length = strlen((char *)buffer);
/* y is given to the fonts baseline we need it to the fonts top */ /* y is given to the fonts baseline we need it to the fonts top */
@ -282,7 +282,7 @@ static bool fb_16bpp_text(int x, int y, const struct css_style *style,
static bool fb_16bpp_disc(int x, int y, int radius, colour c, bool filled) static bool fb_16bpp_disc(int x, int y, int radius, colour c, bool filled)
{ {
LOG(("x %d, y %d, r %d, c 0x%lx, fill %d", LOG(("x %d, y %d, r %d, c 0x%lx, fill %d",
x, y, radius, c, filled)); x, y, radius, (unsigned long)c, filled));
return true; return true;
} }
@ -291,7 +291,7 @@ static bool fb_16bpp_arc(int x, int y, int radius, int angle1, int angle2,
colour c) colour c)
{ {
LOG(("x %d, y %d, r %d, a1 %d, a2 %d, c 0x%lx", LOG(("x %d, y %d, r %d, a1 %d, a2 %d, c 0x%lx",
x, y, radius, angle1, angle2, c)); x, y, radius, angle1, angle2, (unsigned long)c));
return true; return true;
} }
@ -390,7 +390,7 @@ static bool fb_16bpp_path(const float *p, unsigned int n, colour fill, float wid
colour c, const float transform[6]) colour c, const float transform[6])
{ {
LOG(("%f, %d, 0x%lx, %f, 0x%lx, %f", LOG(("%f, %d, 0x%lx, %f, 0x%lx, %f",
*p, n, fill, width, c, *transform)); *p, n, fill, width, (unsigned long)c, *transform));
return true; return true;
} }

6
framebuffer/fb_32bpp_plotters.c
View File

@ -191,16 +191,16 @@ static bool fb_32bpp_text(int x, int y, const struct css_style *style,
uint32_t *pvideo; uint32_t *pvideo;
uint32_t fgcol; uint32_t fgcol;
char *buffer = NULL; unsigned char *buffer = NULL;
int x0,y0,x1,y1; int x0,y0,x1,y1;
int xoff, yoff; /* x and y offset into image */ int xoff, yoff; /* x and y offset into image */
int height = fb_font->height; int height = fb_font->height;
/* aquire thge text in local font encoding */ /* aquire thge text in local font encoding */
utf8_to_font_encoding(fb_font, text, length, &buffer); utf8_to_font_encoding(fb_font, text, length, (char**)&buffer);
if (!buffer) if (!buffer)
return true; return true;
length = strlen(buffer); length = strlen((char *)buffer);
/* y is given to the fonts baseline we need it to the fonts top */ /* y is given to the fonts baseline we need it to the fonts top */

32
framebuffer/fb_8bpp_plotters.c
View File

@ -41,16 +41,16 @@ fb_8bpp_get_xy_loc(int x, int y)
static bool fb_8bpp_rectangle(int x0, int y0, int width, int height, static bool fb_8bpp_rectangle(int x0, int y0, int width, int height,
int line_width, colour c, bool dotted, bool dashed) int line_width, colour c, bool dotted, bool dashed)
{ {
LOG(("%s(%d, %d, %d, %d, %d, 0x%lx, %d, %d)\n", __func__, LOG(("%d, %d, %d, %d, %d, 0x%lx, %d, %d\n",
x0,y0,width,height,line_width,c,dotted,dashed)); x0, y0, width, height, line_width, (unsigned long)c, dotted, dashed));
return true; return true;
} }
static bool fb_8bpp_line(int x0, int y0, int x1, int y1, int width, static bool fb_8bpp_line(int x0, int y0, int x1, int y1, int width,
colour c, bool dotted, bool dashed) colour c, bool dotted, bool dashed)
{ {
LOG(("%s(%d, %d, %d, %d, %d, 0x%lx, %d, %d)\n", __func__, LOG(("%d, %d, %d, %d, %d, 0x%lx, %d, %d",
x0,y0,x1,y1,width,c,dotted,dashed)); x0, y0, x1, y1, width, (unsigned long)c, dotted, dashed));
return true; return true;
} }
@ -118,7 +118,7 @@ static bool fb_8bpp_fill(int x0, int y0, int x1, int y1, colour c)
static bool fb_8bpp_clg(colour c) static bool fb_8bpp_clg(colour c)
{ {
LOG(("%s(%lx)\n", __func__, c)); LOG(("colour %lx", (unsigned long)c));
fb_8bpp_fill(fb_plot_ctx.x0, fb_8bpp_fill(fb_plot_ctx.x0,
fb_plot_ctx.y0, fb_plot_ctx.y0,
fb_plot_ctx.x1, fb_plot_ctx.x1,
@ -140,16 +140,16 @@ static bool fb_8bpp_text(int x, int y, const struct css_style *style,
uint8_t *pvideo; uint8_t *pvideo;
uint8_t fgcol; uint8_t fgcol;
char *buffer = NULL; unsigned char *buffer = NULL;
int x0,y0,x1,y1; int x0,y0,x1,y1;
int xoff, yoff; /* x and y offset into image */ int xoff, yoff; /* x and y offset into image */
int height = fb_font->height; int height = fb_font->height;
/* aquire thge text in local font encoding */ /* aquire thge text in local font encoding */
utf8_to_font_encoding(fb_font, text, length, &buffer); utf8_to_font_encoding(fb_font, text, length, (char **)&buffer);
if (!buffer) if (!buffer)
return true; return true;
length = strlen(buffer); length = strlen((char *)buffer);
/* y is given to the fonts baseline we need it to the fonts top */ /* y is given to the fonts baseline we need it to the fonts top */
@ -210,7 +210,7 @@ static bool fb_8bpp_text(int x, int y, const struct css_style *style,
static bool fb_8bpp_disc(int x, int y, int radius, colour c, bool filled) static bool fb_8bpp_disc(int x, int y, int radius, colour c, bool filled)
{ {
LOG(("x %d, y %d, rad %d, c 0x%lx, fill %d", x, y, radius, c, filled)); LOG(("x %d, y %d, rad %d, c 0x%lx, fill %d", x, y, radius, (unsigned long)c, filled));
return true; return true;
} }
@ -218,7 +218,7 @@ static bool fb_8bpp_arc(int x, int y, int radius, int angle1, int angle2,
colour c) colour c)
{ {
LOG(("x %d, y %d, radius %d, angle1 %d, angle2 %d, c 0x%lx", LOG(("x %d, y %d, radius %d, angle1 %d, angle2 %d, c 0x%lx",
x, y, radius, angle1, angle2, c)); x, y, radius, angle1, angle2, (unsigned long)c));
return true; return true;
} }
@ -266,11 +266,15 @@ static bool fb_8bpp_flush(void)
return true; return true;
} }
static bool fb_8bpp_path(const float *p, unsigned int n, colour fill, float width, static bool fb_8bpp_path(const float *p,
colour c, const float transform[6]) unsigned int n,
colour fill,
float width,
colour c,
const float transform[6])
{ {
LOG(("%s(%f, %d, 0x%lx, %f, 0x%lx, %f)\n", __func__, LOG(("%f, %d, 0x%lx, %f, 0x%lx, %f",
*p, n, fill, width, c, *transform)); *p, n, (unsigned long)fill, width, (unsigned long)c, *transform));
return true; return true;
} }