frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fb: Hide glyph implementation details 

Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2014-07-08 12:13:13 -04:00
parent e572bcc7f4
commit 266cd552bd
5 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fb/fb.h
View File

@ -750,13 +750,6 @@ fbArc24(FbBits * dst,
int dstBpp, xArc * arc, int dx, int dy, FbBits and, FbBits xor); int dstBpp, xArc * arc, int dx, int dy, FbBits and, FbBits xor);
extern _X_EXPORT void 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, fbPolyline24(DrawablePtr pDrawable,
GCPtr pGC, int mode, int npt, DDXPointPtr ptsOrig); GCPtr pGC, int mode, int npt, DDXPointPtr ptsOrig);
@ -1045,9 +1038,6 @@ fbGetSpans(DrawablePtr pDrawable,
* fbglyph.c * fbglyph.c
*/ */
extern _X_EXPORT Bool
fbGlyphIn(RegionPtr pRegion, int x, int y, int width, int height);
extern _X_EXPORT void extern _X_EXPORT void
fbPolyGlyphBlt(DrawablePtr pDrawable, fbPolyGlyphBlt(DrawablePtr pDrawable,

4
fb/fbglyph.c
View File

@ -29,7 +29,7 @@
#include <X11/fonts/fontstruct.h> #include <X11/fonts/fontstruct.h>
#include "dixfontstr.h" #include "dixfontstr.h"
Bool static Bool
fbGlyphIn(RegionPtr pRegion, int x, int y, int width, int height) fbGlyphIn(RegionPtr pRegion, int x, int y, int width, int height)
{ {
BoxRec box; 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)) #define CASE(a,b,c,d) (a | (b << 1) | (c << 2) | (d << 3))
#endif #endif
void static void
fbGlyph24(FbBits * dstBits, fbGlyph24(FbBits * dstBits,
FbStride dstStride, FbStride dstStride,
int dstBpp, FbStip * stipple, FbBits fg, int x, int height) int dstBpp, FbStip * stipple, FbBits fg, int x, int height)

2
fb/fbpict.c
View File

@ -82,7 +82,7 @@ fbDestroyGlyphCache(void)
} }
} }
void static void
fbUnrealizeGlyph(ScreenPtr pScreen, fbUnrealizeGlyph(ScreenPtr pScreen,
GlyphPtr pGlyph) GlyphPtr pGlyph)
{ {

4
fb/fbpict.h
View File

@ -71,10 +71,6 @@ fbTriangles(CARD8 op,
PictFormatPtr maskFormat, PictFormatPtr maskFormat,
INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris); INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris);
extern _X_EXPORT void
fbUnrealizeGlyph(ScreenPtr pScreen,
GlyphPtr pGlyph);
extern _X_EXPORT void extern _X_EXPORT void
fbGlyphs(CARD8 op, fbGlyphs(CARD8 op,
PicturePtr pSrc, PicturePtr pSrc,

1
fb/wfbrename.h
View File

@ -74,7 +74,6 @@
#define fbGlyph24 wfbGlyph24 #define fbGlyph24 wfbGlyph24
#define fbGlyph32 wfbGlyph32 #define fbGlyph32 wfbGlyph32
#define fbGlyph8 wfbGlyph8 #define fbGlyph8 wfbGlyph8
#define fbGlyphIn wfbGlyphIn
#define fbHasVisualTypes wfbHasVisualTypes #define fbHasVisualTypes wfbHasVisualTypes
#define fbImageGlyphBlt wfbImageGlyphBlt #define fbImageGlyphBlt wfbImageGlyphBlt
#define fbIn wfbIn #define fbIn wfbIn