diff options
author | Adam Jackson <ajax@redhat.com> | 2009-06-03 13:37:32 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2009-06-03 13:45:42 -0400 |
commit | e1e8c7ddd7fdbfd674361364295fb1cbd5f28b45 (patch) | |
tree | 52945278e94746acfb4c01fd5f81b0af19aaa5ea /miext/rootless/rootlessScreen.c | |
parent | 7f027d9dc0146e229802aeac342ea2dbab63264a (diff) |
s/MIN/min/, s/MAX/max/ (#2968)
Diffstat (limited to 'miext/rootless/rootlessScreen.c')
-rw-r--r-- | miext/rootless/rootlessScreen.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index 88d38698b..b10ca70eb 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -200,10 +200,10 @@ RootlessGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h, x1 = x0 + w; y1 = y0 + h; - x0 = MAX (x0, winRec->x); - y0 = MAX (y0, winRec->y); - x1 = MIN (x1, winRec->x + winRec->width); - y1 = MIN (y1, winRec->y + winRec->height); + x0 = max (x0, winRec->x); + y0 = max (y0, winRec->y); + x1 = min (x1, winRec->x + winRec->width); + y1 = min (y1, winRec->y + winRec->height); sx = x0 - pDrawable->x; sy = y0 - pDrawable->y; @@ -347,10 +347,10 @@ RootlessGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, x2 = x1 + glyph->info.width; y2 = y1 + glyph->info.height; - box.x1 = MAX (box.x1, x1); - box.y1 = MAX (box.y1, y1); - box.x2 = MAX (box.x2, x2); - box.y2 = MAX (box.y2, y2); + box.x1 = max (box.x1, x1); + box.y1 = max (box.y1, y1); + box.x2 = max (box.x2, x2); + box.y2 = max (box.y2, y2); x += glyph->info.xOff; y += glyph->info.yOff; |