http://slackware.bholcomb.com/slackware/slackware-11.0/source/xap/xscreensaver/xscree...

[xscreensaver] / hacks / glx / xpm-ximage.h

diff --git a/hacks/glx/xpm-ximage.h b/hacks/glx/xpm-ximage.h
index cfe6e0da51e70ddd3ec13ac2e06138baf2519933..234f76bf716e71be622d473e7c5585676b4e3e7b 100644 (file)
--- a/hacks/glx/xpm-ximage.h
+++ b/hacks/glx/xpm-ximage.h
@@ -1,5 +1,5 @@
 /* xpm-ximage.h --- converts XPM data to an XImage for use with OpenGL.
- * xscreensaver, Copyright (c) 1998 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1998, 2002 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -23,6 +23,9 @@
    The Colormap argument is used just for parsing color names; no colors
    are allocated.
  */
-extern XImage *xpm_to_ximage (Display *, Visual *, Colormap, char **xpm_data);
+extern XImage *xpm_to_ximage (Display *, Visual *, Colormap, 
+                              char **xpm_data);
+extern XImage *xpm_file_to_ximage (Display *, Visual *, Colormap,
+                                   const char *filename);
 
 #endif /* _XPM_TEXTURE_H_ */