projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981109-2
[rocksndiamonds.git]
/
src
/
gifload.c
diff --git
a/src/gifload.c
b/src/gifload.c
index 1e1aebcd43cb3706f9594a2c0ee0b9890300a941..977678cdff307886a13e4a7d4d8a9b1b75ff1a3b 100644
(file)
--- a/
src/gifload.c
+++ b/
src/gifload.c
@@
-14,7
+14,7
@@
#ifndef MSDOS
#include "gifload.h"
#ifndef MSDOS
#include "gifload.h"
-#include "
xli
.h"
+#include "
image
.h"
#ifdef DEBUG
/*
#ifdef DEBUG
/*
@@
-27,7
+27,6
@@
extern long Counter(void);
extern long Counter(void);
-
int Read_GIF_to_Pixmaps(Display *display, Window window, char *filename,
Pixmap *pixmap, Pixmap *pixmap_mask)
{
int Read_GIF_to_Pixmaps(Display *display, Window window, char *filename,
Pixmap *pixmap, Pixmap *pixmap_mask)
{
@@
-43,7
+42,7
@@
int Read_GIF_to_Pixmaps(Display *display, Window window, char *filename,
#endif
/* load GIF file */
#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);
{
printf("Loading GIF image failed -- maybe no GIF...\n");
exit(1);
@@
-77,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 */
depth = DefaultDepth(display, screen);
/* convert internal image structure to X11 XImage */
- if (!(ximageinfo =
imageTo
XImage(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);
{
fprintf(stderr, "Cannot convert Image to XImage.\n");
exit(1);
@@
-94,7
+93,7
@@
int Read_GIF_to_Pixmaps(Display *display, Window window, char *filename,
XSetWindowColormap(display, window, ximageinfo->cmap);
/* convert XImage to Pixmap */
XSetWindowColormap(display, window, ximageinfo->cmap);
/* convert XImage to Pixmap */
- if ((*pixmap =
ximageTo
Pixmap(display, window, ximageinfo)) == None)
+ if ((*pixmap =
XImage_to_
Pixmap(display, window, ximageinfo)) == None)
{
fprintf(stderr, "Cannot convert XImage to Pixmap.\n");
exit(1);
{
fprintf(stderr, "Cannot convert XImage to Pixmap.\n");
exit(1);
@@
-118,7
+117,7
@@
int Read_GIF_to_Pixmaps(Display *display, Window window, char *filename,
#endif
/* convert internal image structure to X11 XImage */
#endif
/* convert internal image structure to X11 XImage */
- if (!(ximageinfo_mask =
imageTo
XImage(display, screen, visual, depth,
+ if (!(ximageinfo_mask =
Image_to_
XImage(display, screen, visual, depth,
image_mask)))
{
fprintf(stderr, "Cannot convert Image to XImage.\n");
image_mask)))
{
fprintf(stderr, "Cannot convert Image to XImage.\n");
@@
-133,7
+132,7
@@
int Read_GIF_to_Pixmaps(Display *display, Window window, char *filename,
#endif
/* convert XImage to Pixmap */
#endif
/* convert XImage to Pixmap */
- if ((*pixmap_mask =
ximageTo
Pixmap(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);
{
fprintf(stderr, "Cannot convert XImage to Pixmap.\n");
exit(1);