Skip to content

treewide: drop ifdef's for GLYPHPADBYTES != 4 #1348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −39
Open

treewide: drop ifdef's for GLYPHPADBYTES != 4 #1348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions dix/dixfonts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,18 +256,7 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
((screenInfo.bitmapBitOrder == LSBFirst) ?
BitmapFormatBitOrderLSB : BitmapFormatBitOrderMSB) |
BitmapFormatImageRectMin |
#if GLYPHPADBYTES == 1
BitmapFormatScanlinePad8 |
#endif
#if GLYPHPADBYTES == 2
BitmapFormatScanlinePad16 |
#endif
#if GLYPHPADBYTES == 4
BitmapFormatScanlinePad32 |
#endif
#if GLYPHPADBYTES == 8
BitmapFormatScanlinePad64 |
#endif
BitmapFormatScanlineUnit8;

if (client->clientGone) {
Expand Down
3 changes: 0 additions & 3 deletions fb/fb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@
#define FB_UNIT (1 << FB_SHIFT)
#define FB_MASK (FB_UNIT - 1)
#define FB_ALLONES ((FbBits) -1)
#if GLYPHPADBYTES != 4
#error "GLYPHPADBYTES must be 4"
#endif
#define FB_STIP_SHIFT LOG2_BITMAP_PAD
#define FB_STIP_UNIT (1 << FB_STIP_SHIFT)
#define FB_STIP_MASK (FB_STIP_UNIT - 1)
Expand Down
18 changes: 0 additions & 18 deletions include/dixfontstr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,24 +65,6 @@ SOFTWARE.
#define N2dChars(pfont) (N1dChars(pfont) * \
(FONTLASTROW(pfont) - FONTFIRSTROW(pfont) + 1))

#ifndef GLYPHPADBYTES
#define GLYPHPADBYTES -1
#endif

#if GLYPHPADBYTES == 0 || GLYPHPADBYTES == 1
#define GLYPHWIDTHBYTESPADDED(pci) (GLYPHWIDTHBYTES(pci))
#endif

#if GLYPHPADBYTES == 2
#define GLYPHWIDTHBYTESPADDED(pci) ((GLYPHWIDTHBYTES(pci)+1) & ~0x1)
#endif

#if GLYPHPADBYTES == 4
#define GLYPHWIDTHBYTESPADDED(pci) ((GLYPHWIDTHBYTES(pci)+3) & ~0x3)
#endif

#if GLYPHPADBYTES == 8 /* for a cray? */
#define GLYPHWIDTHBYTESPADDED(pci) ((GLYPHWIDTHBYTES(pci)+7) & ~0x7)
#endif

#endif /* DIXFONTSTRUCT_H */
2 changes: 0 additions & 2 deletions include/servermd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ SOFTWARE.
#error "Too weird to live."
#endif

#ifndef GLYPHPADBYTES
#define GLYPHPADBYTES 4
#endif

/* pad scanline to a longword */
#ifndef BITMAP_SCANLINE_UNIT
Expand Down
6 changes: 1 addition & 5 deletions mi/miglblt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,7 @@ miPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, int x, int y, unsigned int ngly
nbyGlyphWidth = GLYPHWIDTHBYTESPADDED(pci);
nbyPadGlyph = BitmapBytePad(gWidth);

if (nbyGlyphWidth == nbyPadGlyph
#if GLYPHPADBYTES != 4
&& (((int) pglyph) & 3) == 0
#endif
) {
if (nbyGlyphWidth == nbyPadGlyph) {
pb = pglyph;
}
else {
Expand Down
Loading