From 7a867aacc20d8a5677fd485d9b65812733a770f7 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 14 Feb 2009 14:12:29 +0000 Subject: Fix character sign issue causing corrupt characters to be plotted Fixed warnings from making signs explicit svn path=/trunk/netsurf/; revision=6491 --- framebuffer/fb_16bpp_plotters.c | 12 ++++++------ framebuffer/fb_32bpp_plotters.c | 6 +++--- framebuffer/fb_8bpp_plotters.c | 32 ++++++++++++++++++-------------- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/framebuffer/fb_16bpp_plotters.c b/framebuffer/fb_16bpp_plotters.c index a7afefd53..39d17b095 100644 --- a/framebuffer/fb_16bpp_plotters.c +++ b/framebuffer/fb_16bpp_plotters.c @@ -205,16 +205,16 @@ static bool fb_16bpp_text(int x, int y, const struct css_style *style, uint16_t fgcol; uint16_t bgcol; - char *buffer = NULL; + unsigned char *buffer = NULL; int x0,y0,x1,y1; int xoff, yoff; /* x and y offset into image */ int height = fb_font->height; /* 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) return true; - length = strlen(buffer); + length = strlen((char *)buffer); /* 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) { 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; } @@ -291,7 +291,7 @@ static bool fb_16bpp_arc(int x, int y, int radius, int angle1, int angle2, colour c) { 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; } @@ -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]) { 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; } diff --git a/framebuffer/fb_32bpp_plotters.c b/framebuffer/fb_32bpp_plotters.c index c4dc42807..942632825 100644 --- a/framebuffer/fb_32bpp_plotters.c +++ b/framebuffer/fb_32bpp_plotters.c @@ -191,16 +191,16 @@ static bool fb_32bpp_text(int x, int y, const struct css_style *style, uint32_t *pvideo; uint32_t fgcol; - char *buffer = NULL; + unsigned char *buffer = NULL; int x0,y0,x1,y1; int xoff, yoff; /* x and y offset into image */ int height = fb_font->height; /* 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) return true; - length = strlen(buffer); + length = strlen((char *)buffer); /* y is given to the fonts baseline we need it to the fonts top */ diff --git a/framebuffer/fb_8bpp_plotters.c b/framebuffer/fb_8bpp_plotters.c index 15804a9ed..087cf025b 100644 --- a/framebuffer/fb_8bpp_plotters.c +++ b/framebuffer/fb_8bpp_plotters.c @@ -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, int line_width, colour c, bool dotted, bool dashed) { - LOG(("%s(%d, %d, %d, %d, %d, 0x%lx, %d, %d)\n", __func__, - x0,y0,width,height,line_width,c,dotted,dashed)); + LOG(("%d, %d, %d, %d, %d, 0x%lx, %d, %d\n", + x0, y0, width, height, line_width, (unsigned long)c, dotted, dashed)); return true; } static bool fb_8bpp_line(int x0, int y0, int x1, int y1, int width, colour c, bool dotted, bool dashed) { - LOG(("%s(%d, %d, %d, %d, %d, 0x%lx, %d, %d)\n", __func__, - x0,y0,x1,y1,width,c,dotted,dashed)); + LOG(("%d, %d, %d, %d, %d, 0x%lx, %d, %d", + x0, y0, x1, y1, width, (unsigned long)c, dotted, dashed)); 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) { - LOG(("%s(%lx)\n", __func__, c)); + LOG(("colour %lx", (unsigned long)c)); fb_8bpp_fill(fb_plot_ctx.x0, fb_plot_ctx.y0, 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 fgcol; - char *buffer = NULL; + unsigned char *buffer = NULL; int x0,y0,x1,y1; int xoff, yoff; /* x and y offset into image */ int height = fb_font->height; /* 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) return true; - length = strlen(buffer); + length = strlen((char *)buffer); /* 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) { - 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; } @@ -218,7 +218,7 @@ static bool fb_8bpp_arc(int x, int y, int radius, int angle1, int angle2, colour c) { 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; } @@ -266,11 +266,15 @@ static bool fb_8bpp_flush(void) return true; } -static bool fb_8bpp_path(const float *p, unsigned int n, colour fill, float width, - colour c, const float transform[6]) +static bool fb_8bpp_path(const float *p, + 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__, - *p, n, fill, width, c, *transform)); + LOG(("%f, %d, 0x%lx, %f, 0x%lx, %f", + *p, n, (unsigned long)fill, width, (unsigned long)c, *transform)); return true; } -- cgit v1.2.3