X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fximage-loader.h;h=bed163f3ccb556c69260d14b3b153956df8ba9d2;hp=f5b714ae7451887ce1b3ebfa8f17b6cfd916ee29;hb=refs%2Fheads%2Fmaster;hpb=78add6e627ee5f10e1fa6f3852602ea5066eee5a diff --git a/hacks/ximage-loader.h b/hacks/ximage-loader.h index f5b714ae..bed163f3 100644 --- a/hacks/ximage-loader.h +++ b/hacks/ximage-loader.h @@ -23,14 +23,15 @@ extern Pixmap image_data_to_pixmap (Display *, Window, int *width_ret, int *height_ret, Pixmap *mask_ret); -extern XImage *image_data_to_ximage (Display *, Visual *, - const unsigned char *image_data, - unsigned long data_size); - /* This XImage has RGBA data, which is what OpenGL code typically expects. + Also it is upside down: the origin is at the bottom left of the image. X11 typically expects 0RGB as it has no notion of alpha, only 1-bit masks. With X11 code, you should probably use the _pixmap routines instead. */ +extern XImage *image_data_to_ximage (Display *, Visual *, + const unsigned char *image_data, + unsigned long data_size); + extern XImage *file_to_ximage (Display *, Visual *, const char *filename); #endif /* _XIMAGE_LOADER_H_ */