projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftp://ftp.linux.ncsu.edu/mirror/ftp.redhat.com/pub/redhat/linux/enterprise/4/en/os...
[xscreensaver]
/
hacks
/
glx
/
xpm-ximage.c
diff --git
a/hacks/glx/xpm-ximage.c
b/hacks/glx/xpm-ximage.c
index a524e7659adb6ed55495592577e1176e08503fb7..7d67728b117c5bad5b7d73a38d4f885ae528bc59 100644
(file)
--- a/
hacks/glx/xpm-ximage.c
+++ b/
hacks/glx/xpm-ximage.c
@@
-9,7
+9,7
@@
* software for any purpose. It is provided "as is" without express or
* implied warranty.
*
* software for any purpose. It is provided "as is" without express or
* implied warranty.
*
- * Alpha channel support by Eric Lassauge <lassauge@
mail.dotcom.fr>.
+ * Alpha channel support by Eric Lassauge <lassauge@
users.sourceforge.net>
*/
#ifdef HAVE_CONFIG_H
*/
#ifdef HAVE_CONFIG_H
@@
-165,6
+165,7
@@
xpm_to_ximage_1 (Display *dpy, Visual *visual, Colormap cmap,
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
+#if 0
static Bool
bigendian (void)
{
static Bool
bigendian (void)
{
@@
-172,6
+173,7
@@
bigendian (void)
u.i = 1;
return !u.c[0];
}
u.i = 1;
return !u.c[0];
}
+#endif
/* The libxpm version of this function...
/* The libxpm version of this function...
@@
-267,9
+269,15
@@
xpm_to_ximage_1 (Display *dpy, Visual *visual, Colormap cmap,
things as necessary) OpenGL pretends everything is client-side, so
we need to pack things in the right order for the client machine.
*/
things as necessary) OpenGL pretends everything is client-side, so
we need to pack things in the right order for the client machine.
*/
+#if 0
+ /* #### Cherub says that the little-endian case must be taken on MacOSX,
+ or else the colors/alpha are the wrong way around. How can
+ that be the case?
+ */
if (bigendian())
rpos = 24, gpos = 16, bpos = 8, apos = 0;
else
if (bigendian())
rpos = 24, gpos = 16, bpos = 8, apos = 0;
else
+#endif
rpos = 0, gpos = 8, bpos = 16, apos = 24;
for (y = 0; y < xpm_image.height; y++)
rpos = 0, gpos = 8, bpos = 16, apos = 24;
for (y = 0; y < xpm_image.height; y++)