#ifndef MSDOS
#include "gifload.h"
-#include "xli.h"
+#include "image.h"
#ifdef DEBUG
/*
extern long Counter(void);
-
int Read_GIF_to_Pixmaps(Display *display, Window window, char *filename,
Pixmap *pixmap, Pixmap *pixmap_mask)
{
#endif
/* load GIF file */
- if (!(image = gifLoad(filename)))
+ if (!(image = Read_GIF_to_Image(filename)))
{
printf("Loading GIF image failed -- maybe no GIF...\n");
exit(1);
depth = DefaultDepth(display, screen);
/* convert internal image structure to X11 XImage */
- if (!(ximageinfo = imageToXImage(display, screen, visual, depth, image)))
+ if (!(ximageinfo = Image_to_XImage(display, screen, visual, depth, image)))
{
fprintf(stderr, "Cannot convert Image to XImage.\n");
exit(1);
XSetWindowColormap(display, window, ximageinfo->cmap);
/* convert XImage to Pixmap */
- if ((*pixmap = ximageToPixmap(display, window, ximageinfo)) == None)
+ if ((*pixmap = XImage_to_Pixmap(display, window, ximageinfo)) == None)
{
fprintf(stderr, "Cannot convert XImage to Pixmap.\n");
exit(1);
#endif
/* convert internal image structure to X11 XImage */
- if (!(ximageinfo_mask = imageToXImage(display, screen, visual, depth,
+ if (!(ximageinfo_mask = Image_to_XImage(display, screen, visual, depth,
image_mask)))
{
fprintf(stderr, "Cannot convert Image to XImage.\n");
#endif
/* convert XImage to Pixmap */
- if ((*pixmap_mask = ximageToPixmap(display, window, ximageinfo_mask)) == None)
+ if ((*pixmap_mask = XImage_to_Pixmap(display, window, ximageinfo_mask)) == None)
{
fprintf(stderr, "Cannot convert XImage to Pixmap.\n");
exit(1);