X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fimage.c;h=83d8216b43bd02c7152bf05dc8ede398557fd2de;hb=f806f2ad0dfa82c3abd3d027250a549ca22f4374;hp=3938823a4c61bdb26da0770ce297fee2d25664b2;hpb=182260bf970d56e056a8c0c580ad61302d21ab0f;p=rocksndiamonds.git diff --git a/src/image.c b/src/image.c index 3938823a..83d8216b 100644 --- a/src/image.c +++ b/src/image.c @@ -76,7 +76,7 @@ static Pixmap Image_to_Mask(Image *image, Display *display, Window window) dst_ptr += bytes_per_row; /* continue with leftmost byte of next row */ } - mask_pixmap = XCreateBitmapFromData(display, window, mask_data, + mask_pixmap = XCreateBitmapFromData(display, window, (char *)mask_data, image->width, image->height); free(mask_data); @@ -375,7 +375,7 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual, ximage->byte_order = MSBFirst; src_ptr = image->data; - dst_ptr = ximage->data; + dst_ptr = (byte *)ximage->data; switch (visual->class) { @@ -514,7 +514,7 @@ int Read_PCX_to_Pixmap(Display *display, Window window, GC gc, char *filename, /* read the graphic file in PCX format to image structure */ if ((image = Read_PCX_to_Image(filename)) == NULL) - return PCX_FileInvalid; + return errno_pcx; #if DEBUG_TIMING printf("%s:\n", filename); @@ -548,7 +548,7 @@ int Read_PCX_to_Pixmap(Display *display, Window window, GC gc, char *filename, *pixmap = ximageinfo->pixmap; *pixmap_mask = ximageinfo->pixmap_mask; - return(PCX_Success); + return PCX_Success; } #endif /* !MSDOS */