upgrade for xorg-server 1.12.99.905 (for 1.13 RC)

[framework/uifw/xorg/lib/libxrandr.git] / src / XrrCrtc.c

diff --git a/src/XrrCrtc.c b/src/XrrCrtc.c
index 697987a..0762373 100644 (file)
--- a/src/XrrCrtc.c
+++ b/src/XrrCrtc.c
@@ -62,8 +62,8 @@ XRRGetCrtcInfo (Display *dpy, XRRScreenResources *resources, RRCrtc crtc)
     nbytesRead = (long) (rep.nOutput * 4 +
                         rep.nPossibleOutput * 4);
 
-    /* 
-     * first we must compute how much space to allocate for 
+    /*
+     * first we must compute how much space to allocate for
      * randr library's use; we'll allocate the structures in a single
      * allocation, on cleanlyness grounds.
      */
@@ -95,13 +95,13 @@ XRRGetCrtcInfo (Display *dpy, XRRScreenResources *resources, RRCrtc crtc)
 
     _XRead32 (dpy, xci->outputs, rep.nOutput << 2);
     _XRead32 (dpy, xci->possible, rep.nPossibleOutput << 2);
-    
+
     /*
      * Skip any extra data
      */
     if (nbytes > nbytesRead)
        _XEatData (dpy, (unsigned long) (nbytes - nbytesRead));
-    
+
     UnlockDisplay (dpy);
     SyncHandle ();
     return (XRRCrtcInfo *) xci;
@@ -195,12 +195,12 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
        goto out;
 
     nbytes = (long) rep.length << 2;
-    
+
     /* three channels of CARD16 data */
     nbytesRead = (rep.size * 2 * 3);
 
     crtc_gamma = XRRAllocGamma (rep.size);
-    
+
     if (!crtc_gamma)
     {
        _XEatData (dpy, (unsigned long) nbytes);
@@ -209,7 +209,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
     _XRead16 (dpy, crtc_gamma->red, rep.size * 2);
     _XRead16 (dpy, crtc_gamma->green, rep.size * 2);
     _XRead16 (dpy, crtc_gamma->blue, rep.size * 2);
-    
+
     if (nbytes > nbytesRead)
        _XEatData (dpy, (unsigned long) (nbytes - nbytesRead));
 
@@ -255,7 +255,7 @@ XRRSetCrtcGamma (Display *dpy, RRCrtc crtc, XRRCrtcGamma *crtc_gamma)
      * otherwise the channels might not be contiguous
      */
     Data16 (dpy, crtc_gamma->red, crtc_gamma->size * 2 * 3);
-    
+
     UnlockDisplay (dpy);
     SyncHandle ();
 }
@@ -304,7 +304,7 @@ xRenderTransform_from_XTransform (xRenderTransform *render,
 
 void
 XRRSetCrtcTransform (Display   *dpy,
-                    RRCrtc     crtc, 
+                    RRCrtc     crtc,
                     XTransform *transform,
                     char       *filter,
                     XFixed     *params,
@@ -334,7 +334,7 @@ XRRSetCrtcTransform (Display        *dpy,
 }
 
 #define CrtcTransformExtra     (SIZEOF(xRRGetCrtcTransformReply) - 32)
-                               
+
 static const xRenderTransform identity = {
     0x10000, 0, 0,
     0, 0x10000, 0,
@@ -364,7 +364,7 @@ XRRGetCrtcTransform (Display        *dpy,
 
     RRCheckExtension (dpy, info, False);
 
-    if (!XRRQueryVersion (dpy, &major_version, &minor_version) || 
+    if (!XRRQueryVersion (dpy, &major_version, &minor_version) ||
        !_XRRHasTransform (major_version, minor_version))
     {
        /* For pre-1.3 servers, just report identity matrices everywhere */
@@ -382,7 +382,7 @@ XRRGetCrtcTransform (Display        *dpy,
        req->reqType = info->codes->major_opcode;
        req->randrReqType = X_RRGetCrtcTransform;
        req->crtc = crtc;
-    
+
        if (!_XReply (dpy, (xReply *) &rep, CrtcTransformExtra >> 2, xFalse))
        {
            rep.pendingTransform = identity;