WebSVN - shark - Path Comparison - /shark/trunk/drivers/ Rev 742 and /shark/trunk/drivers/ Rev 743

Ignore whitespace Rev 742 → Rev 743

 /shark/trunk/drivers/fb/fun16.c
 ,7 → 166,7
 }
-void grx_putimage(WORD x1, WORD y1, WORD x2, WORD y2, void *buf)
+void grx_putimage(WORD x1, WORD y1, WORD x2, WORD y2, WORD *buf)
 {
   WORD bpr;
 ,7 → 178,7
   bpr = grx_info->var.xres * 2;
   p = buf;
   addr = (LIN_ADDR)(grx_info->screen_base + x1 * 2 + bpr * y1);
-  dx = (x2 - x1) * 2;
+  dx = (x2 - x1 + 1) * 2;
   for (y = y1; y < y2; y++) {
     memcpy(addr, p, dx);
 ,7 → 188,7
 }
-void grx_getimage(WORD x1, WORD y1, WORD x2, WORD y2, void *buf)
+void grx_getimage(WORD x1, WORD y1, WORD x2, WORD y2, WORD *buf)
 {
     WORD bpr;
     LIN_ADDR addr, p;
 ,7 → 199,7
     bpr = grx_info->var.xres * 2;
     p = buf;
     addr = (LIN_ADDR)(grx_info->screen_base + x1 * 2 + bpr * y1);
-    dx = (x2 - x1) * 2;
+    dx = (x2 - x1 + 1) * 2;
     for (y = y1; y < y2; y++) {
         memcpy(p, addr, dx);

 /shark/trunk/drivers/fb/include/drivers/shark_fb26.h
 ,8 → 40,8
 void grx_plot(WORD x, WORD y, DWORD color);
 DWORD grx_getpixel(WORD x, WORD y);
-void grx_getimage(WORD x1, WORD y1, WORD x2, WORD y2, void *buf);
-void grx_putimage(WORD x1, WORD y1, WORD x2, WORD y2, void *buf);
+void grx_getimage(WORD x1, WORD y1, WORD x2, WORD y2, WORD *buf);
+void grx_putimage(WORD x1, WORD y1, WORD x2, WORD y2, WORD *buf);
 void grx_box(WORD x1, WORD y1, WORD x2, WORD y2, DWORD color);
 void grx_clear(DWORD color);
 void grx_rect(WORD x1, WORD y1, WORD x2, WORD y2, DWORD color);