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

mi: Unexport wide line details 

XAA wanted these, once upon a time, but that's gone now.

Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2014-05-23 11:21:28 -04:00
parent d181e52ceb
commit 9bdc9b0113
4 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xfree86/sdksyms.sh
View File

@ -217,7 +217,6 @@ cat > sdksyms.c << EOF
#include "micoord.h" #include "micoord.h"
#include "mifillarc.h" #include "mifillarc.h"
#include "mispans.h" #include "mispans.h"
#include "miwideline.h"
#include "mistruct.h" #include "mistruct.h"
#include "mifpoly.h" #include "mifpoly.h"
#include "mioverlay.h" #include "mioverlay.h"

2
mi/Makefile.am
View File

@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libmi.la
if XORG if XORG
sdk_HEADERS = micmap.h miline.h mipointer.h mi.h \ sdk_HEADERS = micmap.h miline.h mipointer.h mi.h \
migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \ migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \
mispans.h miwideline.h mistruct.h mifpoly.h mioverlay.h mispans.h mistruct.h mifpoly.h mioverlay.h
endif endif
AM_CFLAGS = $(DIX_CFLAGS) AM_CFLAGS = $(DIX_CFLAGS)

8
mi/miwideline.c
View File

@ -273,7 +273,7 @@ miFillRectPolyHelper(DrawablePtr pDrawable,
} }
} }
/* static */ int static int
miPolyBuildEdge(double x0, double y0, double k, /* x0 * dy - y0 * dx */ miPolyBuildEdge(double x0, double y0, double k, /* x0 * dy - y0 * dx */
int dx, int dy, int xi, int yi, int left, PolyEdgePtr edge) int dx, int dy, int xi, int yi, int left, PolyEdgePtr edge)
{ {
@ -325,7 +325,7 @@ miPolyBuildEdge(double x0, double y0, double k, /* x0 * dy - y0 * dx */
#define StepAround(v, incr, max) (((v) + (incr) < 0) ? (max - 1) : ((v) + (incr) == max) ? 0 : ((v) + (incr))) #define StepAround(v, incr, max) (((v) + (incr) < 0) ? (max - 1) : ((v) + (incr) == max) ? 0 : ((v) + (incr)))
/* static */ int static int
miPolyBuildPoly(PolyVertexPtr vertices, miPolyBuildPoly(PolyVertexPtr vertices,
PolySlopePtr slopes, PolySlopePtr slopes,
int count, int count,
@ -865,7 +865,7 @@ miRoundJoinFace(LineFacePtr face, PolyEdgePtr edge, Bool *leftEdge)
return y; return y;
} }
void static void
miRoundJoinClip(LineFacePtr pLeft, LineFacePtr pRight, miRoundJoinClip(LineFacePtr pLeft, LineFacePtr pRight,
PolyEdgePtr edge1, PolyEdgePtr edge2, PolyEdgePtr edge1, PolyEdgePtr edge2,
int *y1, int *y2, Bool *left1, Bool *left2) int *y1, int *y2, Bool *left1, Bool *left2)
@ -886,7 +886,7 @@ miRoundJoinClip(LineFacePtr pLeft, LineFacePtr pRight,
*y2 = miRoundJoinFace(pRight, edge2, left2); *y2 = miRoundJoinFace(pRight, edge2, left2);
} }
int static int
miRoundCapClip(LineFacePtr face, Bool isInt, PolyEdgePtr edge, Bool *leftEdge) miRoundCapClip(LineFacePtr face, Bool isInt, PolyEdgePtr edge, Bool *leftEdge)
{ {
int y; int y;

25
mi/miwideline.h
View File

@ -92,28 +92,3 @@ typedef struct _LineFace {
ValidateGC (pDrawable, pGC); \ ValidateGC (pDrawable, pGC); \
} \ } \
} }
extern _X_EXPORT void miRoundJoinClip(LineFacePtr /*pLeft */ ,
LineFacePtr /*pRight */ ,
PolyEdgePtr /*edge1 */ ,
PolyEdgePtr /*edge2 */ ,
int * /*y1 */ ,
int * /*y2 */ ,
Bool * /*left1 */ ,
Bool * /*left2 */
);
extern _X_EXPORT int miRoundCapClip(LineFacePtr /*face */ ,
Bool /*isInt */ ,
PolyEdgePtr /*edge */ ,
Bool * /*leftEdge */
);
extern _X_EXPORT int miPolyBuildEdge(double x0, double y0, double k, int dx,
int dy, int xi, int yi, int left,
PolyEdgePtr edge);
extern _X_EXPORT int miPolyBuildPoly(PolyVertexPtr vertices,
PolySlopePtr slopes, int count, int xi,
int yi, PolyEdgePtr left,
PolyEdgePtr right, int *pnleft,
int *pnright, int *h);