diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-01-20 23:21:29 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2009-01-20 23:21:29 -0500 |
| commit | 903d39aeea73a973fb8b05ca1ac147c2cca146cb (patch) | |
| tree | 1d433436f6f8009cc06ff46cf5b73d72a12483c8 /src/bitmap | |
| parent | daa7af2bb2326de363aa5ea51c29616e3634343a (diff) | |
| download | xorg-lib-libXfont-903d39aeea73a973fb8b05ca1ac147c2cca146cb.tar.gz | |
Delete some dead ifdefs
Diffstat (limited to 'src/bitmap')
| -rw-r--r-- | src/bitmap/bitscale.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c index 824023f..a4d991d 100644 --- a/src/bitmap/bitscale.c +++ b/src/bitmap/bitscale.c @@ -510,17 +510,7 @@ FindBestToScale(FontPathElementPtr fpe, FontEntryPtr entry, the matrix appropriately */ vals->pixel_matrix[0] *= rescale_x; vals->pixel_matrix[1] *= rescale_x; -#ifdef NOTDEF - /* This would force the pointsize and pixelsize fields in the - FONT property to display as matrices to more accurately - report the font being supplied. It might also break existing - applications that expect a single number in that field. */ - vals->values_supplied = - vals->values_supplied & ~(PIXELSIZE_MASK | POINTSIZE_MASK) | - PIXELSIZE_ARRAY; -#else /* NOTDEF */ vals->values_supplied = vals->values_supplied & ~POINTSIZE_MASK; -#endif /* NOTDEF */ /* Recompute and reround the FontScalablePtr values after rescaling for the new width. */ FontFileCompleteXLFD(vals, vals); @@ -1582,11 +1572,6 @@ BitmapOpenScalable (FontPathElementPtr fpe, /* Can't deal with mix-endian fonts yet */ -#ifdef NOTDEF /* XXX need better test */ - if ((format & BitmapFormatByteOrderMask) != - (format & BitmapFormatBitOrderMask)) - return NullFontFileName; -#endif /* Reject outrageously small font sizes to keep the math from blowing up. */ |