X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fimage.h;h=860521c00af4043b7411457a494cbbf27f74c408;hb=4bca9bc5f299a9b287134b06e41b147f506792b4;hp=50335eea15a5eaff0117bbe4a4f0f217c49ad3b8;hpb=40a487dcc5d3028343ff9123a72b8b3839a42861;p=rocksndiamonds.git diff --git a/src/image.h b/src/image.h index 50335eea..860521c0 100644 --- a/src/image.h +++ b/src/image.h @@ -14,6 +14,8 @@ #ifndef IMAGE_H #define IMAGE_H +#ifndef TARGET_SDL + #include "main.h" #define MAX_COLORS 256 /* maximal number of colors for each image */ @@ -23,7 +25,6 @@ typedef unsigned short Intensity; /* RGB intensity for X11 */ typedef struct { Display *display; /* destination display */ - int screen; /* destination screen */ int depth; /* depth of destination drawable */ Pixel index[MAX_COLORS]; /* array of pixel values */ int no; /* number of pixels in the array */ @@ -50,18 +51,10 @@ typedef struct byte *data; /* image data */ } Image; -#define PCX_Success 0 -#define PCX_OpenFailed -1 -#define PCX_ReadFailed -2 -#define PCX_FileInvalid -3 -#define PCX_NoMemory -4 -#define PCX_ColorFailed -5 - -int Read_PCX_to_Pixmaps(Display *, Window, GC, char *, Pixmap *, Pixmap *); - -Image *Read_PCX_to_Image(char *); Image *newImage(unsigned int, unsigned int, unsigned int); void freeImage(Image *); void freeXImage(Image *, XImageInfo *); +int Read_PCX_to_Pixmap(Display *, Window, GC, char *, Pixmap *, Pixmap *); +#endif /* !TARGET_SDL */ #endif /* IMAGE_H */