1 files changed, 11 insertions, 12 deletions

diff --git a/mi/mibitblt.c b/mi/mibitblt.c
index b9873c16d..3dde410fe 100644
--- a/mi/mibitblt.c
+++ b/mi/mibitblt.c
@@ -223,9 +223,9 @@ miCopyArea(DrawablePtr pSrcDrawable,
         }
         pbits = malloc(height * PixmapBytePad(width, pSrcDrawable->depth));
         if (pbits) {
-            (*pSrcDrawable->pScreen->GetSpans) (pSrcDrawable, width, pptFirst,
-                                                (int *) pwidthFirst, height,
-                                                (char *) pbits);
+            pSrcDrawable->ops->GetSpans(pSrcDrawable, width, pptFirst,
+                                        (int *) pwidthFirst, height,
+                                        (char *) pbits);
             ppt = pptFirst;
             pwidth = pwidthFirst;
             xMin -= (srcx - dstx);
@@ -262,8 +262,7 @@ miCopyArea(DrawablePtr pSrcDrawable,
  * This should be replaced with something more general.  mi shouldn't have to
  * care about such things as scanline padding et alia.
  */
-static
-MiBits *
+static MiBits *
 miGetPlane(DrawablePtr pDraw, int planeNum,     /* number of the bitPlane */
            int sx, int sy, int w, int h, MiBits * result)
 {
@@ -314,16 +313,16 @@ miGetPlane(DrawablePtr pDraw, int planeNum,     /* number of the bitPlane */
     for (i = h; --i >= 0; pt.y++) {
         pt.x = sx;
         if (bitsPerPixel == 1) {
-            (*pDraw->pScreen->GetSpans) (pDraw, width, &pt, &width, 1,
-                                         (char *) pCharsOut);
+            pDraw->ops->GetSpans(pDraw, width, &pt, &width, 1,
+                                 (char *) pCharsOut);
             pCharsOut += widthInBytes;
         }
         else {
             k = 0;
             for (j = w; --j >= 0; pt.x++) {
                 /* Fetch the next pixel */
-                (*pDraw->pScreen->GetSpans) (pDraw, width, &pt, &width, 1,
-                                             (char *) &pixel);
+                pDraw->ops->GetSpans(pDraw, width, &pt, &width, 1,
+                                     (char *) &pixel);
                 /*
                  * Now get the bit and insert into a bitmap in XY format.
                  */
@@ -647,15 +646,15 @@ miGetImage(DrawablePtr pDraw, int sx, int sy, int w, int h,
             pt.x = srcx;
             pt.y = srcy + i;
             width = w;
-            (*pDraw->pScreen->GetSpans) (pDraw, w, &pt, &width, 1, pDst);
+            pDraw->ops->GetSpans(pDraw, w, &pt, &width, 1, pDst);
             if (pPixmap) {
                 pt.x = 0;
                 pt.y = 0;
                 width = w;
                 (*pGC->ops->SetSpans) ((DrawablePtr) pPixmap, pGC, pDst,
                                        &pt, &width, 1, TRUE);
-                (*pDraw->pScreen->GetSpans) ((DrawablePtr) pPixmap, w, &pt,
-                                             &width, 1, pDst);
+                pDraw->ops->GetSpans((DrawablePtr) pPixmap, w, &pt, &width, 1,
+                                     pDst);
             }
             pDst += linelength;
         }