X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fglmatrix.c;h=9b5754069a039a12e39e14a635ce8a839ba60a7c;hp=1fa1123cf394dc4e30ff3048034a50aa5e3603df;hb=6a1da724858673ac40aa13a9612340d8bed8c7b9;hpb=96bdd7cf6ea60c418a76921acaf0e34d6f5be930 diff --git a/hacks/glx/glmatrix.c b/hacks/glx/glmatrix.c index 1fa1123c..9b575406 100644 --- a/hacks/glx/glmatrix.c +++ b/hacks/glx/glmatrix.c @@ -57,6 +57,11 @@ extern XtAppContext app; #include "xpm-ximage.h" #include +#ifdef __GNUC__ + __extension__ /* don't warn about "string length is greater than the length + ISO C89 compilers are required to support" when including + the following XPM file... */ +#endif #include "../images/matrix3.xpm" #ifdef USE_GL /* whole file */ @@ -333,7 +338,7 @@ draw_glyph (ModeInfo *mi, int glyph, int wire = MI_IS_WIREFRAME(mi); GLfloat w = mp->tex_char_width; GLfloat h = mp->tex_char_height; - GLfloat cx, cy; + GLfloat cx = 0, cy = 0; GLfloat S = 1; Bool spinner_p = (glyph < 0); @@ -587,6 +592,7 @@ matrix_handle_event (ModeInfo *mi, XEvent *event) } +#if 0 static Bool bigendian (void) { @@ -594,6 +600,7 @@ bigendian (void) u.i = 1; return !u.c[0]; } +#endif /* The image with the characters in it is 512x598, meaning that it needs to @@ -719,9 +726,15 @@ load_textures (ModeInfo *mi, Bool flip_p) */ { int rpos, gpos, bpos, apos; /* bitfield positions */ +#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 +#endif rpos = 0, gpos = 8, bpos = 16, apos = 24; for (y = 0; y < xi->height; y++)