summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/FreeType/ftfuncs.c4
-rw-r--r--src/bitmap/pcfread.c1
-rw-r--r--src/util/utilbitmap.c5
3 files changed, 7 insertions, 3 deletions
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c
index f47e03a..365374c 100644
--- a/src/FreeType/ftfuncs.c
+++ b/src/FreeType/ftfuncs.c
@@ -25,7 +25,7 @@ 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$ */
+/* $XdotOrg: xc/lib/font/FreeType/ftfuncs.c,v 1.1.4.4.2.2.6.3 2004/04/13 03:16:31 gisburn Exp $ */
/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */
@@ -122,7 +122,7 @@ static char *xlfd_props[] = {
static int ftypeInitP = 0; /* is the engine initialised? */
-static FT_Library ftypeLibrary;
+FT_Library ftypeLibrary;
static FTFacePtr faceTable[NUMFACEBUCKETS];
diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
index ed496be..0b4b6c7 100644
--- a/src/bitmap/pcfread.c
+++ b/src/bitmap/pcfread.c
@@ -908,7 +908,6 @@ pmfReadFont(FontPtr pFont, FontFilePtr file,
if (IS_EOF(file)) goto Bail;
if (encodingOffset == 0xFFFF) {
pFont->info.allExist = FALSE;
- encoding[i] = 0;
} else {
if(!encoding[SEGMENT_MAJOR(i)]) {
encoding[SEGMENT_MAJOR(i)]=
diff --git a/src/util/utilbitmap.c b/src/util/utilbitmap.c
index bd7c2cd..d832268 100644
--- a/src/util/utilbitmap.c
+++ b/src/util/utilbitmap.c
@@ -27,6 +27,8 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.4 2001/01/17 19:43:34 dawes Exp $ */
+#ifndef USE_INTERNAL_FREETYPE
+
/*
* Author: Keith Packard, MIT X Consortium
*/
@@ -181,3 +183,6 @@ RepadBitmap (char *pSrc, char *pDst,
}
return dstWidthBytes * height;
}
+
+#endif /* !USE_INTERNAL_FREETYPE */
+