diff options
| author | Adam Jackson <ajax@redhat.com> | 2014-07-08 12:13:13 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2014-10-27 15:45:48 -0400 |
| commit | 266cd552bd54fd3e7a83ae7178a303285857631e (patch) | |
| tree | 94ca956d81a805d219a8c502fc5ab0a981170bfe /fb | |
| parent | e572bcc7f4236b7e0f23ab762f225b3bce37db59 (diff) | |
fb: Hide glyph implementation 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 | 10 | ||||
| -rw-r--r-- | fb/fbglyph.c | 4 | ||||
| -rw-r--r-- | fb/fbpict.c | 2 | ||||
| -rw-r--r-- | fb/fbpict.h | 4 | ||||
| -rw-r--r-- | fb/wfbrename.h | 1 |
5 files changed, 3 insertions, 18 deletions
@@ -750,13 +750,6 @@ fbArc24(FbBits * dst, int dstBpp, xArc * arc, int dx, int dy, FbBits and, FbBits xor); extern _X_EXPORT void - -fbGlyph24(FbBits * dstLine, - FbStride dstStride, - int dstBpp, FbStip * stipple, FbBits fg, int height, int shift); - -extern _X_EXPORT void - fbPolyline24(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr ptsOrig); @@ -1045,9 +1038,6 @@ fbGetSpans(DrawablePtr pDrawable, * fbglyph.c */ -extern _X_EXPORT Bool - fbGlyphIn(RegionPtr pRegion, int x, int y, int width, int height); - extern _X_EXPORT void fbPolyGlyphBlt(DrawablePtr pDrawable, diff --git a/fb/fbglyph.c b/fb/fbglyph.c index 848478258..2f3bb8a12 100644 --- a/fb/fbglyph.c +++ b/fb/fbglyph.c @@ -29,7 +29,7 @@ #include <X11/fonts/fontstruct.h> #include "dixfontstr.h" -Bool +static Bool fbGlyphIn(RegionPtr pRegion, int x, int y, int width, int height) { BoxRec box; @@ -116,7 +116,7 @@ fbGlyphIn(RegionPtr pRegion, int x, int y, int width, int height) #define CASE(a,b,c,d) (a | (b << 1) | (c << 2) | (d << 3)) #endif -void +static void fbGlyph24(FbBits * dstBits, FbStride dstStride, int dstBpp, FbStip * stipple, FbBits fg, int x, int height) diff --git a/fb/fbpict.c b/fb/fbpict.c index 7a9e46aa5..e726691b0 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -82,7 +82,7 @@ fbDestroyGlyphCache(void) } } -void +static void fbUnrealizeGlyph(ScreenPtr pScreen, GlyphPtr pGlyph) { diff --git a/fb/fbpict.h b/fb/fbpict.h index 8b0f59f7a..5cb866368 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -72,10 +72,6 @@ fbTriangles(CARD8 op, INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris); extern _X_EXPORT void -fbUnrealizeGlyph(ScreenPtr pScreen, - GlyphPtr pGlyph); - -extern _X_EXPORT void fbGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, diff --git a/fb/wfbrename.h b/fb/wfbrename.h index 30221c5b1..adac64a39 100644 --- a/fb/wfbrename.h +++ b/fb/wfbrename.h @@ -74,7 +74,6 @@ #define fbGlyph24 wfbGlyph24 #define fbGlyph32 wfbGlyph32 #define fbGlyph8 wfbGlyph8 -#define fbGlyphIn wfbGlyphIn #define fbHasVisualTypes wfbHasVisualTypes #define fbImageGlyphBlt wfbImageGlyphBlt #define fbIn wfbIn |