X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fgrab-ximage.c;h=b1c1cf45a6fdeb28ae691658659feb9874fbbad3;hb=0d6b320def9180cf907ceaed56b23a972a11b757;hp=519f8c453e8f70d825679f80369df40ce77a5674;hpb=2d04c4f22466851aedb6ed0f2919d148f726b889;p=xscreensaver

diff --git a/hacks/glx/grab-ximage.c b/hacks/glx/grab-ximage.c
index 519f8c45..b1c1cf45 100644
--- a/hacks/glx/grab-ximage.c
+++ b/hacks/glx/grab-ximage.c
@@ -141,6 +141,13 @@ convert_ximage_to_rgba32 (Screen *screen, XImage *image)
                              0);
   to->data = (char *) calloc (to->height, to->bytes_per_line);
 
+  /* Set the bit order in the XImage structure to whatever the
+     local host's native bit order is.
+   */
+  to->bitmap_bit_order =
+    to->byte_order =
+    (bigendian() ? MSBFirst : LSBFirst);
+
   if (visual_class (screen, visual) == PseudoColor ||
       visual_class (screen, visual) == GrayScale)
     {
@@ -223,7 +230,7 @@ convert_ximage_to_rgba32 (Screen *screen, XImage *image)
    We use this when mipmapping fails on large textures.
  */
 static void
-halve_image (XImage *ximage)
+halve_image (XImage *ximage, XRectangle *geom)
 {
   int w2 = ximage->width/2;
   int h2 = ximage->height/2;
@@ -261,6 +268,14 @@ halve_image (XImage *ximage)
   *ximage = *ximage2;
   ximage2->data = 0;
   XFree (ximage2);
+
+  if (geom)
+    {
+      geom->x /= 2;
+      geom->y /= 2;
+      geom->width  /= 2;
+      geom->height /= 2;
+    }
 }
 
 
@@ -508,6 +523,7 @@ ximage_to_texture (XImage *ximage,
                    GLint type, GLint format,
                    int *width_return,
                    int *height_return,
+                   XRectangle *geometry,
                    Bool mipmap_p)
 {
   int max_reduction = 7;
@@ -595,7 +611,7 @@ ximage_to_texture (XImage *ximage,
           if (debug_p)
             fprintf (stderr, "%s: mipmap error (%dx%d): %s\n",
                      progname, ximage->width, ximage->height, s);
-          halve_image (ximage);
+          halve_image (ximage, geometry);
           goto AGAIN;
         }
     }
@@ -802,7 +818,13 @@ screen_to_texture_async_cb (Screen *screen, Window window, Drawable drawable,
         glBindTexture (GL_TEXTURE_2D, dd.texid);
 
       glPixelStorei (GL_UNPACK_ALIGNMENT, ximage->bitmap_pad / 8);
-      ok = ximage_to_texture (ximage, type, format, &tw, &th, dd.mipmap_p);
+      ok = ximage_to_texture (ximage, type, format, &tw, &th, geometry,
+                              dd.mipmap_p);
+      if (ok)
+        {
+          iw = ximage->width;	/* in case the image was shrunk */
+          ih = ximage->height;
+        }
     }
 
   if (ximage) XDestroyImage (ximage);