summaryrefslogtreecommitdiff
path: root/src/fc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fc')
-rw-r--r--src/fc/fsconvert.c2
-rw-r--r--src/fc/fserve.c56
-rw-r--r--src/fc/fserve.h2
-rw-r--r--src/fc/fservestr.h2
-rw-r--r--src/fc/fsio.c2
-rw-r--r--src/fc/fsio.h2
-rw-r--r--src/fc/fslibos.h2
7 files changed, 26 insertions, 42 deletions
diff --git a/src/fc/fsconvert.c b/src/fc/fsconvert.c
index 6b694fd..84ad901 100644
--- a/src/fc/fsconvert.c
+++ b/src/fc/fsconvert.c
@@ -22,7 +22,7 @@
*
* Author: Dave Lemke, Network Computing Devices, Inc
*/
-/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.15 2003/09/01 20:50:43 herrb Exp $ */
+/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.14 2003/08/30 18:06:29 dawes Exp $ */
/*
* FS data conversion
*/
diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index c9fccc4..1dab860 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: xc/lib/font/fc/fserve.c,v 1.1.4.4.2.1 2004/03/04 17:47:11 eich Exp $ */
/* $Xorg: fserve.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
/*
@@ -24,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/fc/fserve.c,v 3.25 2003/11/20 18:16:34 dawes Exp $ */
+/* $XFree86: xc/lib/font/fc/fserve.c,v 3.26tsi Exp $ */
/*
* Copyright 1990 Network Computing Devices
@@ -1052,44 +1053,27 @@ fs_read_extent_info(FontPathElementPtr fpe, FSBlockDataPtr blockrec)
ci->metrics.descent = FONT_MAX_DESCENT(fi);
ci->metrics.characterWidth = FONT_MAX_WIDTH(fi);
ci->metrics.attributes = ii->metrics.attributes;
- /* Bounds check. */
- if (ci->metrics.ascent > fi->maxbounds.ascent)
- {
- ErrorF("fserve: warning: %s %s ascent (%d) "
- "> maxascent (%d)\n",
- fpe->name, fsd->name,
- ci->metrics.ascent, fi->maxbounds.ascent);
- ci->metrics.ascent = fi->maxbounds.ascent;
- }
- if (ci->metrics.descent > fi->maxbounds.descent)
- {
- ErrorF("fserve: warning: %s %s descent (%d) "
- "> maxdescent (%d)\n",
- fpe->name, fsd->name,
- ci->metrics.descent, fi->maxbounds.descent);
- ci->metrics.descent = fi->maxbounds.descent;
- }
}
else
{
ci->metrics = ii->metrics;
- /* Bounds check. */
- if (ci->metrics.ascent > fi->maxbounds.ascent)
- {
- ErrorF("fserve: warning: %s %s ascent (%d) "
- "> maxascent (%d)\n",
- fpe->name, fsd->name,
- ci->metrics.ascent, fi->maxbounds.ascent);
- ci->metrics.ascent = fi->maxbounds.ascent;
- }
- if (ci->metrics.descent > fi->maxbounds.descent)
- {
- ErrorF("fserve: warning: %s %s descent (%d) "
- "> maxdescent (%d)\n",
- fpe->name, fsd->name,
- ci->metrics.descent, fi->maxbounds.descent);
- ci->metrics.descent = fi->maxbounds.descent;
- }
+ }
+ /* Bounds check. */
+ if (ci->metrics.ascent > fi->maxbounds.ascent)
+ {
+ ErrorF("fserve: warning: %s %s ascent (%d) "
+ "> maxascent (%d)\n",
+ fpe->name, fsd->name,
+ ci->metrics.ascent, fi->maxbounds.ascent);
+ ci->metrics.ascent = fi->maxbounds.ascent;
+ }
+ if (ci->metrics.descent > fi->maxbounds.descent)
+ {
+ ErrorF("fserve: warning: %s %s descent (%d) "
+ "> maxdescent (%d)\n",
+ fpe->name, fsd->name,
+ ci->metrics.descent, fi->maxbounds.descent);
+ ci->metrics.descent = fi->maxbounds.descent;
}
}
}
@@ -2231,7 +2215,7 @@ _fs_load_glyphs(pointer client, FontPtr pfont, Bool range_flag,
xfree(ranges);
/* Now try to reopen the font. */
- return fs_send_open_font(client, (FontPathElementPtr)0,
+ return fs_send_open_font(client, pfont->fpe,
(Mask)FontReopen, (char *)0, 0,
(fsBitmapFormat)0, (fsBitmapFormatMask)0,
(XID)0, &pfont);
diff --git a/src/fc/fserve.h b/src/fc/fserve.h
index 9d69257..3254f40 100644
--- a/src/fc/fserve.h
+++ b/src/fc/fserve.h
@@ -24,7 +24,7 @@
* Author: Dave Lemke, Network Computing Devices, Inc
*
*/
-/* $XFree86: xc/lib/font/fc/fserve.h,v 1.5 2001/04/05 17:42:28 dawes Exp $ */
+/* $XFree86: xc/lib/font/fc/fserve.h,v 1.4 2001/01/17 19:43:29 dawes Exp $ */
#ifndef _FSERVE_H_
#define _FSERVE_H_
diff --git a/src/fc/fservestr.h b/src/fc/fservestr.h
index 20c85f6..0e41666 100644
--- a/src/fc/fservestr.h
+++ b/src/fc/fservestr.h
@@ -23,7 +23,7 @@
*
* Author: Dave Lemke, Network Computing Devices, Inc
*/
-/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.4 2001/07/25 15:04:56 dawes Exp $ */
+/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.3 2001/01/17 19:43:29 dawes Exp $ */
#ifndef _FSERVESTR_H_
#define _FSERVESTR_H_
diff --git a/src/fc/fsio.c b/src/fc/fsio.c
index 6f589c8..e5c0c05 100644
--- a/src/fc/fsio.c
+++ b/src/fc/fsio.c
@@ -23,7 +23,7 @@
*
* Author: Dave Lemke, Network Computing Devices, Inc
*/
-/* $XFree86: xc/lib/font/fc/fsio.c,v 3.17 2003/05/27 22:26:49 tsi Exp $ */
+/* $XFree86: xc/lib/font/fc/fsio.c,v 3.16tsi Exp $ */
/*
* font server i/o routines
*/
diff --git a/src/fc/fsio.h b/src/fc/fsio.h
index 974ef4a..2241436 100644
--- a/src/fc/fsio.h
+++ b/src/fc/fsio.h
@@ -23,7 +23,7 @@
*
* Author: Dave Lemke, Network Computing Devices, Inc
*/
-/* $XFree86: xc/lib/font/fc/fsio.h,v 1.6 2001/01/17 19:43:29 dawes Exp $ */
+/* $XFree86: xc/lib/font/fc/fsio.h,v 1.5 1999/12/30 02:39:06 robin Exp $ */
#ifndef _FSIO_H_
#define _FSIO_H_
diff --git a/src/fc/fslibos.h b/src/fc/fslibos.h
index 09f1ade..8d3ff55 100644
--- a/src/fc/fslibos.h
+++ b/src/fc/fslibos.h
@@ -31,7 +31,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.9 2003/09/01 20:50:44 herrb Exp $ */
+/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.8 2003/08/29 18:01:14 herrb Exp $ */
/*
* FSlib networking & os include file
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-06 23:55:51 +0000