Index: TASImage.cxx
===================================================================
RCS file: /user/cvs/root/asimage/src/TASImage.cxx,v
retrieving revision 1.22
diff -u -r1.22 TASImage.cxx
--- TASImage.cxx	3 May 2005 13:11:32 -0000	1.22
+++ TASImage.cxx	20 May 2005 12:39:43 -0000
@@ -4488,7 +4488,8 @@
 
 //_____________________________________________________________________________
 static void fill_hline_notile_argb32(ASDrawContext *ctx, int x_from, int y, 
-                                     int x_to, CARD32 ratio)
+//                                     int x_to, CARD32 ratio)
+                                     int x_to, CARD8 ratio)
 {
    //
 
@@ -4496,7 +4497,7 @@
 
    if (ratio != 0 && x_to >= 0 && x_from < cw && y >= 0 && y < ctx->canvas_height) {	
       CARD32 value = ratio;
-      CARD32 *dst = ctx->canvas + y*cw; 
+      CARD32 *dst = (CARD32*) (ctx->canvas + y*cw); 
       int x1 = x_from;
       int x2 = x_to; 
 
@@ -4514,11 +4515,11 @@
 }
 
 //_____________________________________________________________________________
-static void apply_tool_2D_argb32(ASDrawContext *ctx, int curr_x, int curr_y, CARD32)
+static void apply_tool_2D_argb32(ASDrawContext *ctx, int curr_x, int curr_y, CARD8)
 {
    //
 
-   CARD32 *src = ctx->tool->matrix;
+   CARD32 *src = (CARD32*)ctx->tool->matrix;
    int corner_x = curr_x - ctx->tool->center_x;
    int corner_y = curr_y - ctx->tool->center_y; 
    int tw = ctx->tool->width;
@@ -4527,7 +4528,7 @@
    int ch = ctx->canvas_height;
    int aw = tw; 
    int ah = th;
-   CARD32 *dst = ctx->canvas; 
+   CARD32 *dst = (CARD32*)ctx->canvas; 
    int x, y;
 
    if (corner_x+tw <= 0 || corner_x >= cw || corner_y+th <= 0 || corner_y >= ch) {
@@ -4574,7 +4575,7 @@
 
 	ctx->canvas_width = im->width; 
 	ctx->canvas_height = im->height;
-	ctx->canvas = im->alt.argb32;
+	ctx->canvas = (CARD8*)im->alt.argb32;
    ctx->scratch_canvas = 0;
 
 	ctx->tool = brush;
@@ -4608,7 +4609,7 @@
    };
 
    static ASDrawTool *brush = new ASDrawTool;
-   brush->matrix = matrix;
+   brush->matrix = (CARD8*)matrix;
    brush->width = thick;
    brush->height = thick;
    brush->center_y = brush->center_x = thick/2;