diff options
author | marha <marha@users.sourceforge.net> | 2011-03-25 10:41:05 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-03-25 10:41:05 +0000 |
commit | 272e57235cd60a2e65ac8258d96a02eb3939b687 (patch) | |
tree | 789d74bd6ec1cc468f1f81aab97d4e4dfdb2d5c5 /libXfont/src/FreeType/ftfuncs.c | |
parent | b39f063f74bf0163eaf34db03134f226d18142ec (diff) | |
download | vcxsrv-272e57235cd60a2e65ac8258d96a02eb3939b687.tar.gz vcxsrv-272e57235cd60a2e65ac8258d96a02eb3939b687.tar.bz2 vcxsrv-272e57235cd60a2e65ac8258d96a02eb3939b687.zip |
git update until 25 Mar 2011
xserver
fontconfig
glproto
libXau
libXft
libXmu
libfontenc
libxcb
mesa
mkfontscale
pixman
randrproto
xkeyboard-config
xtrans
xwininfo
updated following packages:
xproto-7.0.21
xineramaproto-1.2.1
libXt-1.1.1
libxkbfile-1.0.7
libXpm-3.5.9
libXfont-1.4.3
libXaw-1.0.9
bdftopcf-1.0.3
encodings-1.0.4
fixesproto-5.0
font-adobe-100dpi-1.0.3
font-adobe-75dpi-1.0.3
font-adobe-utopia-100dpi-1.0.4
font-adobe-utopia-75dpi-1.0.4
font-adobe-utopia-type1-1.0.4
font-alias-1.0.3
font-arabic-misc-1.0.3
font-bh-100dpi-1.0.3
font-bh-75dpi-1.0.3
font-bh-lucidatypewriter-100dpi-1.0.3
font-bh-lucidatypewriter-75dpi-1.0.3
font-bh-ttf-1.0.3
font-bh-type1-1.0.3
font-bitstream-100dpi-1.0.3
font-bitstream-75dpi-1.0.3
font-bitstream-speedo-1.0.2
font-bitstream-type1-1.0.3
font-cronyx-cyrillic-1.0.3
font-cursor-misc-1.0.3
font-daewoo-misc-1.0.3
font-dec-misc-1.0.3
font-ibm-type1-1.0.3
font-isas-misc-1.0.3
font-jis-misc-1.0.3
font-micro-misc-1.0.3
font-misc-cyrillic-1.0.3
font-misc-ethiopic-1.0.3
font-misc-meltho-1.0.3
font-misc-misc-1.1.2
font-mutt-misc-1.0.3
font-schumacher-misc-1.1.2
font-screen-cyrillic-1.0.4
font-sony-misc-1.0.3
font-sun-misc-1.0.3
font-util-1.2.0
font-winitzki-cyrillic-1.0.3
font-xfree86-type1-1.0.4
Diffstat (limited to 'libXfont/src/FreeType/ftfuncs.c')
-rw-r--r-- | libXfont/src/FreeType/ftfuncs.c | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/libXfont/src/FreeType/ftfuncs.c b/libXfont/src/FreeType/ftfuncs.c index 47ebac737..fd8e53e5f 100644 --- a/libXfont/src/FreeType/ftfuncs.c +++ b/libXfont/src/FreeType/ftfuncs.c @@ -25,9 +25,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XdotOrg: xc/lib/font/FreeType/ftfuncs.c,v 1.11 2005/07/03 07:00:58 daniels Exp $ */ - -/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <config.h> @@ -188,7 +185,7 @@ FreeTypeOpenFace(FTFacePtr *facep, char *FTFileName, char *realFileName, int fac otherFace = otherFace->next; } if(otherFace) { - MUMBLE1("Returning cached face: %s\n", otherFace->filename); + MUMBLE("Returning cached face: %s\n", otherFace->filename); *facep = otherFace; return Successful; } @@ -253,7 +250,7 @@ FreeTypeFreeFace(FTFacePtr face) else ErrorF("FreeType: freeing unknown face\n"); } - MUMBLE1("Closing face: %s\n", face->filename); + MUMBLE("Closing face: %s\n", face->filename); FT_Done_Face(face->face); free(face->filename); free(face); @@ -3645,7 +3642,7 @@ FreeTypeGetMetrics(FontPtr pFont, unsigned long count, unsigned char *chars, struct TTCapInfo *ttcap; xCharInfo **mp, *m; - /* MUMBLE1("Get metrics for %ld characters\n", count);*/ + /* MUMBLE("Get metrics for %ld characters\n", count);*/ tf = (FTFontPtr)pFont->fontPrivate; ttcap = &tf->instance->ttcap; @@ -3780,7 +3777,7 @@ FreeTypeSetUpFont(FontPathElementPtr fpe, FontPtr xf, FontInfoPtr info, if ((xrc = CheckFSFormat(format, fmask, &bmfmt->bit, &bmfmt->byte, &bmfmt->scan, &bmfmt->glyph, &image)) != Successful) { - MUMBLE1("Aborting after checking FS format: %d\n", xrc); + MUMBLE("Aborting after checking FS format: %d\n", xrc); return xrc; } @@ -3829,11 +3826,7 @@ FreeTypeOpenScalable(FontPathElementPtr fpe, FontPtr *ppFont, int flags, FontPtr xf; FontBitmapFormatRec bmfmt; - MUMBLE1("Open Scalable %s, XLFD=",fileName); -#ifdef DEBUG_TRUETYPE - fwrite(entry->name.name, entry->name.length, 1, stdout); -#endif - MUMBLE("\n"); + MUMBLE("Open Scalable %s, XLFD=%s\n",fileName, entry->name.length ? entry->name.name : ""); xf = CreateFontRec(); if (xf == NULL) @@ -3846,7 +3839,7 @@ FreeTypeOpenScalable(FontPathElementPtr fpe, FontPtr *ppFont, int flags, } xrc = FreeTypeLoadXFont(fileName, vals, xf, &xf->info, &bmfmt, entry); if(xrc != Successful) { - MUMBLE1("Error during load: %d\n",xrc); + MUMBLE("Error during load: %d\n",xrc); DestroyFontRec(xf); return xrc; } @@ -3866,11 +3859,7 @@ FreeTypeGetInfoScalable(FontPathElementPtr fpe, FontInfoPtr info, int xrc; FontBitmapFormatRec bmfmt; - MUMBLE("Get info, XLFD= "); -#ifdef DEBUG_TRUETYPE - fwrite(entry->name.name, entry->name.length, 1, stdout); -#endif - MUMBLE("\n"); + MUMBLE("Get info, XLFD=%s\n", entry->name.length ? entry->name.name : ""); xrc = FreeTypeSetUpFont(fpe, 0, info, 0, 0, &bmfmt); if(xrc != Successful) { @@ -3881,7 +3870,7 @@ FreeTypeGetInfoScalable(FontPathElementPtr fpe, FontInfoPtr info, xrc = FreeTypeLoadXFont(fileName, vals, 0, info, &bmfmt, entry); if(xrc != Successful) { - MUMBLE1("Error during load: %d\n", xrc); + MUMBLE("Error during load: %d\n", xrc); return xrc; } |