rnd-19981109-2

[rocksndiamonds.git] / src / gifload.c

diff --git a/src/gifload.c b/src/gifload.c
index ac64df6aba0a0ce9c79877fda0a4496c1f2a4de1..977678cdff307886a13e4a7d4d8a9b1b75ff1a3b 100644 (file)
--- a/src/gifload.c
+++ b/src/gifload.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33659 Bielefeld-Senne                             *
-*        Telefon: (0521) 493245                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
-*               q99492@pbhrzx.uni-paderborn.de             *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  gifload.c                                               *
 ***********************************************************/
@@ -15,7 +14,7 @@
 #ifndef MSDOS
 #include "gifload.h"
 
-#include "xli.h"
+#include "image.h"
 
 #ifdef DEBUG
 /*
@@ -28,7 +27,6 @@
 extern long Counter(void);
 
 
-
 int Read_GIF_to_Pixmaps(Display *display, Window window, char *filename,
                        Pixmap *pixmap, Pixmap *pixmap_mask)
 {
@@ -44,7 +42,7 @@ int Read_GIF_to_Pixmaps(Display *display, Window window, char *filename,
 #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);
@@ -78,7 +76,7 @@ int Read_GIF_to_Pixmaps(Display *display, Window window, char *filename,
   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);
@@ -95,7 +93,7 @@ int Read_GIF_to_Pixmaps(Display *display, Window window, char *filename,
     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);
@@ -119,7 +117,7 @@ int Read_GIF_to_Pixmaps(Display *display, Window window, char *filename,
 #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");
@@ -134,7 +132,7 @@ int Read_GIF_to_Pixmaps(Display *display, Window window, char *filename,
 #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);