projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040619-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
image.c
diff --git
a/src/libgame/image.c
b/src/libgame/image.c
index e267fd8099604e7005ea4144be13746c60d66f86..977111f442092dfd43895a9d0677ad6b265b3adc 100644
(file)
--- a/
src/libgame/image.c
+++ b/
src/libgame/image.c
@@
-560,7
+560,7
@@
XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
XPutImage(ximageinfo->display, ximageinfo->pixmap, gc,
ximage, 0, 0, 0, 0, ximage->width, ximage->height);
XPutImage(ximageinfo->display, ximageinfo->pixmap, gc,
ximage, 0, 0, 0, 0, ximage->width, ximage->height);
- XDestroyImage(ximage);
+ X
11
DestroyImage(ximage);
return ximageinfo;
}
return ximageinfo;
}
@@
-621,8
+621,8
@@
void ZoomPixmap(Display *display, GC gc, Pixmap src_pixmap, Pixmap dst_pixmap,
dst_width, dst_height);
/* free temporary images */
dst_width, dst_height);
/* free temporary images */
- XDestroyImage(src_ximage);
- XDestroyImage(dst_ximage);
+ X
11
DestroyImage(src_ximage);
+ X
11
DestroyImage(dst_ximage);
}
void freeXImage(Image *image, XImageInfo *ximageinfo)
}
void freeXImage(Image *image, XImageInfo *ximageinfo)
@@
-730,7
+730,7
@@
static void *Load_PCX(char *filename)
if ((img_info->bitmap = LoadImage(filename)) == NULL)
{
if ((img_info->bitmap = LoadImage(filename)) == NULL)
{
- Error(ERR_WARN, "cannot
re
ad image file '%s': LoadImage() failed: %s",
+ Error(ERR_WARN, "cannot
lo
ad image file '%s': LoadImage() failed: %s",
filename, GetError());
free(img_info);
return NULL;
filename, GetError());
free(img_info);
return NULL;
@@
-845,7
+845,7
@@
struct PropertyMapping *getImageListPropertyMapping()
}
void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
}
void InitImageList(struct ConfigInfo *config_list, int num_file_list_entries,
- struct ConfigInfo *config_suffix_list,
+ struct Config
Type
Info *config_suffix_list,
char **base_prefixes, char **ext1_suffixes,
char **ext2_suffixes, char **ext3_suffixes,
char **ignore_tokens)
char **base_prefixes, char **ext1_suffixes,
char **ext2_suffixes, char **ext3_suffixes,
char **ignore_tokens)