Merge remote-tracking branch 'origin/released'

* origin/released:
  xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013

Conflicts:
	xorg-server/dix/dispatch.c
	xorg-server/dix/privates.c
	xorg-server/glx/glxcmds.c
	xorg-server/hw/kdrive/ephyr/ephyr.h
	xorg-server/hw/kdrive/ephyr/ephyrinit.c
	xorg-server/hw/kdrive/ephyr/hostx.c

1 files changed, 31 insertions, 57 deletions

diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index f37b5d71f..b2ca29f10 100644..100755
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -2020,7 +2020,7 @@ ProcPutImage(ClientPtr client)
 static int

 DoGetImage(ClientPtr client, int format, Drawable drawable,

            int x, int y, int width, int height,

-           Mask planemask, xGetImageReply ** im_return)

+           Mask planemask)

 {

     DrawablePtr pDraw, pBoundingDraw;

     int nlines, linesPerBuf, rc;

@@ -2120,46 +2120,32 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
 

     xgi.length = length;

 

-    if (im_return) {

-        pBuf = calloc(1, sz_xGetImageReply + length);

-        if (!pBuf)

-            return BadAlloc;

-        if (widthBytesLine == 0)

-            linesPerBuf = 0;

-        else

+    xgi.length = bytes_to_int32(xgi.length);

+    if (widthBytesLine == 0 || height == 0)

+        linesPerBuf = 0;

+    else if (widthBytesLine >= IMAGE_BUFSIZE)

+        linesPerBuf = 1;

+    else {

+        linesPerBuf = IMAGE_BUFSIZE / widthBytesLine;

+        if (linesPerBuf > height)

             linesPerBuf = height;

-        *im_return = (xGetImageReply *) pBuf;

-        *(xGetImageReply *) pBuf = xgi;

-        pBuf += sz_xGetImageReply;

     }

-    else {

-        xgi.length = bytes_to_int32(xgi.length);

-        if (widthBytesLine == 0 || height == 0)

-            linesPerBuf = 0;

-        else if (widthBytesLine >= IMAGE_BUFSIZE)

-            linesPerBuf = 1;

-        else {

-            linesPerBuf = IMAGE_BUFSIZE / widthBytesLine;

-            if (linesPerBuf > height)

-                linesPerBuf = height;

+    length = linesPerBuf * widthBytesLine;

+    if (linesPerBuf < height) {

+        /* we have to make sure intermediate buffers don't need padding */

+        while ((linesPerBuf > 1) &&

+               (length & ((1L << LOG2_BYTES_PER_SCANLINE_PAD) - 1))) {

+            linesPerBuf--;

+            length -= widthBytesLine;

         }

-        length = linesPerBuf * widthBytesLine;

-        if (linesPerBuf < height) {

-            /* we have to make sure intermediate buffers don't need padding */

-            while ((linesPerBuf > 1) &&

-                   (length & ((1L << LOG2_BYTES_PER_SCANLINE_PAD) - 1))) {

-                linesPerBuf--;

-                length -= widthBytesLine;

-            }

-            while (length & ((1L << LOG2_BYTES_PER_SCANLINE_PAD) - 1)) {

-                linesPerBuf++;

-                length += widthBytesLine;

-            }

+        while (length & ((1L << LOG2_BYTES_PER_SCANLINE_PAD) - 1)) {

+            linesPerBuf++;

+            length += widthBytesLine;

         }

-        if (!(pBuf = calloc(1, length)))

-            return BadAlloc;

-        WriteReplyToClient(client, sizeof(xGetImageReply), &xgi);

     }

+    if (!(pBuf = calloc(1, length)))

+        return BadAlloc;

+    WriteReplyToClient(client, sizeof(xGetImageReply), &xgi);

 

     if (pDraw->type == DRAWABLE_WINDOW) {

         pVisibleRegion = NotClippedByChildren((WindowPtr) pDraw);

@@ -2188,13 +2174,10 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
 

             /* Note that this is NOT a call to WriteSwappedDataToClient,

                as we do NOT byte swap */

-            if (!im_return) {

-                ReformatImage(pBuf, (int) (nlines * widthBytesLine),

-                              BitsPerPixel(pDraw->depth), ClientOrder(client));

+            ReformatImage(pBuf, (int) (nlines * widthBytesLine),

+                          BitsPerPixel(pDraw->depth), ClientOrder(client));

 

-/* Don't split me, gcc pukes when you do */

-                WriteToClient(client, (int) (nlines * widthBytesLine), pBuf);

-            }

+            WriteToClient(client, (int) (nlines * widthBytesLine), pBuf);

             linesDone += nlines;

         }

     }

@@ -2219,18 +2202,10 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
 

                     /* Note: NOT a call to WriteSwappedDataToClient,

                        as we do NOT byte swap */

-                    if (im_return) {

-                        pBuf += nlines * widthBytesLine;

-                    }

-                    else {

-                        ReformatImage(pBuf,

-                                      (int) (nlines * widthBytesLine),

-                                      1, ClientOrder(client));

-

-/* Don't split me, gcc pukes when you do */

-                        WriteToClient(client, (int) (nlines * widthBytesLine),

-				      pBuf);

-                    }

+                    ReformatImage(pBuf, (int) (nlines * widthBytesLine),

+                                  1, ClientOrder(client));

+

+                    WriteToClient(client, (int)(nlines * widthBytesLine), pBuf);

                     linesDone += nlines;

                 }

             }

@@ -2238,8 +2213,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
     }

     if (pVisibleRegion)

         RegionDestroy(pVisibleRegion);

-    if (!im_return)

-        free(pBuf);

+    free(pBuf);

     return Success;

 }

 

@@ -2253,7 +2227,7 @@ ProcGetImage(ClientPtr client)
     return DoGetImage(client, stuff->format, stuff->drawable,

                       stuff->x, stuff->y,

                       (int) stuff->width, (int) stuff->height,

-                      stuff->planeMask, (xGetImageReply **) NULL);

+                      stuff->planeMask);

 }

 

 int