diff options
| author | Adam Jackson <ajax@redhat.com> | 2014-09-26 13:30:06 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2014-10-27 15:45:53 -0400 |
| commit | 5db0f067ed4ff24c48cdb7998e4a52ad80037cb7 (patch) | |
| tree | bc907b1670e0af3902e420a6e110413d6d247d8e /fb | |
| parent | b184a863c111834e28564d963c0733a30833f128 (diff) | |
fb: Hide Bresenham line details
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'fb')
| -rw-r--r-- | fb/fb.h | 22 | ||||
| -rw-r--r-- | fb/fbseg.c | 22 |
2 files changed, 9 insertions, 35 deletions
@@ -1268,34 +1268,20 @@ typedef void FbBres(DrawablePtr pDrawable, int signdy, int axis, int x, int y, int e, int e1, int e3, int len); -extern _X_EXPORT FbBres fbBresSolid, fbBresDash, fbBresFill, fbBresFillDash; +extern _X_EXPORT void +fbSegment(DrawablePtr pDrawable, + GCPtr pGC, + int xa, int ya, int xb, int yb, Bool drawLast, int *dashOffset); /* * fbsetsp.c */ extern _X_EXPORT void - fbSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *src, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted); -extern _X_EXPORT FbBres *fbSelectBres(DrawablePtr pDrawable, GCPtr pGC); - -extern _X_EXPORT void - -fbBres(DrawablePtr pDrawable, - GCPtr pGC, - int dashOffset, - int signdx, - int signdy, int axis, int x, int y, int e, int e1, int e3, int len); - -extern _X_EXPORT void - -fbSegment(DrawablePtr pDrawable, - GCPtr pGC, - int xa, int ya, int xb, int yb, Bool drawLast, int *dashOffset); - /* * fbsolid.c */ diff --git a/fb/fbseg.c b/fb/fbseg.c index 1848387f6..36b17e376 100644 --- a/fb/fbseg.c +++ b/fb/fbseg.c @@ -33,7 +33,7 @@ ((dir < 0) ? FbStipLeft(mask,bpp) : \ FbStipRight(mask,bpp))) -void +static void fbBresSolid(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -103,7 +103,7 @@ fbBresSolid(DrawablePtr pDrawable, fbFinishAccess(pDrawable); } -void +static void fbBresDash(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -176,7 +176,7 @@ fbBresDash(DrawablePtr pDrawable, fbFinishAccess(pDrawable); } -void +static void fbBresFill(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -216,7 +216,7 @@ fbSetFg(DrawablePtr pDrawable, GCPtr pGC, Pixel fg) } } -void +static void fbBresFillDash(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -434,7 +434,7 @@ fbBresDash24RRop(DrawablePtr pDrawable, * based on the contents of the specified GC. */ -FbBres * +static FbBres * fbSelectBres(DrawablePtr pDrawable, GCPtr pGC) { FbGCPrivPtr pPriv = fbGetGCPrivate(pGC); @@ -494,18 +494,6 @@ fbSelectBres(DrawablePtr pDrawable, GCPtr pGC) } void -fbBres(DrawablePtr pDrawable, - GCPtr pGC, - int dashOffset, - int signdx, - int signdy, int axis, int x1, int y1, int e, int e1, int e3, int len) -{ - (*fbSelectBres(pDrawable, pGC)) (pDrawable, pGC, dashOffset, - signdx, signdy, axis, x1, y1, - e, e1, e3, len); -} - -void fbSegment(DrawablePtr pDrawable, GCPtr pGC, int x1, int y1, int x2, int y2, Bool drawLast, int *dashOffset) |