diff options
| -rw-r--r-- | src/bitmap/bitscale.c | 15 | ||||
| -rw-r--r-- | src/fontfile/fontdir.c | 4 | ||||
| -rw-r--r-- | src/fontfile/fontfile.c | 33 |
3 files changed, 0 insertions, 52 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. */ diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c index 73ad317..8b446a9 100644 --- a/src/fontfile/fontdir.c +++ b/src/fontfile/fontdir.c @@ -92,10 +92,6 @@ FontFileFreeEntry (FontEntryPtr entry) free (entry->u.alias.resolved); entry->u.alias.resolved = NULL; break; -#ifdef NOTYET - case FONT_ENTRY_BC: - break; -#endif } } diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c index c2eae29..a738c4d 100644 --- a/src/fontfile/fontfile.c +++ b/src/fontfile/fontfile.c @@ -325,17 +325,6 @@ FontFileOpenFont (pointer client, FontPathElementPtr fpe, Mask flags, entry->u.alias.resolved, aliasName, &vals); ret = FontNameAlias; break; -#ifdef NOTYET - case FONT_ENTRY_BC: - bc = &entry->u.bc; - entry = bc->entry; - ret = (*scalable->renderer->OpenScalable) - (fpe, pFont, flags, entry, &bc->vals, format, fmask, - non_cachable_font); - if (ret == Successful && *pFont) - (*pFont)->fpe = fpe; - break; -#endif default: ret = BadFontName; } @@ -922,23 +911,6 @@ FontFileListOneFontWithInfo (pointer client, FontPathElementPtr fpe, *namelenp = strlen (*namep); ret = FontNameAlias; break; -#ifdef NOTYET - case FONT_ENTRY_BC: - /* no LFWI for this yet */ - bc = &entry->u.bc; - entry = bc->entry; - /* Make a new scaled instance */ - if (strlen(dir->directory) + strlen(scalable->fileName) >= - sizeof(fileName)) { - ret = BadFontName; - } else { - strcpy (fileName, dir->directory); - strcat (fileName, scalable->fileName); - ret = (*scalable->renderer->GetInfoScalable) - (fpe, *pFontInfo, entry, tmpName, fileName, &bc->vals); - } - break; -#endif default: ret = BadFontName; } @@ -1026,11 +998,6 @@ FontFileListOneFontWithInfo (pointer client, FontPathElementPtr fpe, } else { -#ifdef NOTDEF - /* no special case yet */ - ret = FontFileMatchBitmapSource (fpe, pFont, flags, entry, &vals, format, fmask, noSpecificSize); - if (ret != Successful) -#endif { char origName[MAXFONTNAMELEN]; |