diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-07-08 17:29:56 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-07-08 17:29:56 +0000 |
| commit | 34378b4a469d47761ef4362efd9e898ca97709cf (patch) | |
| tree | d98d3d8b656089e8dbdcb18d8eedc96db8999d8e | |
| parent | fix indent (diff) | |
| download | w3m-34378b4a469d47761ef4362efd9e898ca97709cf.tar.gz w3m-34378b4a469d47761ef4362efd9e898ca97709cf.zip | |
[w3m-dev 03931] Re: clear image
* w3mimgdisplay.c (ClearImage): offset
* w3mimg/fb/fb.c (fb_clear): memcpy by pixel_size
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | w3mimg/fb/fb.c | 15 | ||||
| -rw-r--r-- | w3mimgdisplay.c | 4 |
3 files changed, 17 insertions, 10 deletions
@@ -1,3 +1,9 @@ +2003-07-09 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> + + * [w3m-dev 03931] Re: clear image + * w3mimgdisplay.c (ClearImage): offset + * w3mimg/fb/fb.c (fb_clear): memcpy by pixel_size + 2003-07-08 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> * [w3m-dev 03929] clear image @@ -7892,4 +7898,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.845 2003/07/07 15:48:16 ukai Exp $ +$Id: ChangeLog,v 1.846 2003/07/08 17:29:56 ukai Exp $ diff --git a/w3mimg/fb/fb.c b/w3mimg/fb/fb.c index 029d130..25bf8ba 100644 --- a/w3mimg/fb/fb.c +++ b/w3mimg/fb/fb.c @@ -1,4 +1,4 @@ -/* $Id: fb.c,v 1.11 2003/07/07 15:49:39 ukai Exp $ */ +/* $Id: fb.c,v 1.12 2003/07/08 17:29:56 ukai Exp $ */ /************************************************************************** fb.c 0.3 Copyright (C) 2002, hito **************************************************************************/ @@ -368,8 +368,8 @@ fb_height(void) int fb_clear(int x, int y, int w, int h, int r, int g, int b) { - unsigned long bg; - int i, offset_fb; + unsigned long work; + int i, j, offset_fb; if (is_open != TRUE || x > fb_width() || y > fb_height()) return 1; @@ -379,11 +379,12 @@ fb_clear(int x, int y, int w, int h, int r, int g, int b) h = fb_height() - y; offset_fb = fscinfo.line_length * y + pixel_size * x; - bg = ((r >> (CHAR_BIT - vscinfo.red.length)) << vscinfo.red.offset) + - ((g >> (CHAR_BIT - vscinfo.green.length)) << vscinfo.green.offset) + - ((b >> (CHAR_BIT - vscinfo.blue.length)) << vscinfo.blue.offset); + work = ((r >> (CHAR_BIT - vscinfo.red.length)) << vscinfo.red.offset) + + ((g >> (CHAR_BIT - vscinfo.green.length)) << vscinfo.green.offset) + + ((b >> (CHAR_BIT - vscinfo.blue.length)) << vscinfo.blue.offset); for (i = 0; i < h; i++) { - memcpy(buf + offset_fb, bg, pixel_size * w); + for (j = 0; j < w; j++) + memcpy(buf + offset_fb + pixel_size * j, &work, pixel_size); offset_fb += fscinfo.line_length; } return 0; diff --git a/w3mimgdisplay.c b/w3mimgdisplay.c index 67f0305..8fb733d 100644 --- a/w3mimgdisplay.c +++ b/w3mimgdisplay.c @@ -1,4 +1,4 @@ -/* $Id: w3mimgdisplay.c,v 1.15 2003/07/07 15:49:03 ukai Exp $ */ +/* $Id: w3mimgdisplay.c,v 1.16 2003/07/08 17:29:56 ukai Exp $ */ #include <stdio.h> #include <stdlib.h> #include <ctype.h> @@ -324,5 +324,5 @@ ClearImage(char *buf) for (; isdigit(*p); p++) h = 10 * h + (*p - '0'); - w_op->clear(w_op, x, y, w, h); + w_op->clear(w_op, x + offset_x, y + offset_y, w, h); } |