Attachment 266 Details for Bug 601 – Fix for the problems described

[patch] Fix for the problems described

diff.freetype_upd (text/plain), 2.82 KB, created by Egbert Eich on 2004-05-06 02:54:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2004-05-06 02:54:49 UTC

Size: 2.82 KB

patch

obsolete

>Index: FreeType/fttools.c
>===================================================================
>RCS file: /cvs/xorg/xc/lib/font/FreeType/fttools.c,v
>retrieving revision 1.2
>diff -u -r1.2 fttools.c
>--- a/FreeType/fttools.c	23 Apr 2004 18:44:07 -0000	1.2
>+++ b/FreeType/fttools.c	5 May 2004 15:34:43 -0000
>@@ -169,7 +169,7 @@
>     if(start) {
>         fn=0;
>         i=1;
>-        while(isdigit(start[i])) {
>+        while(ft_isdigit(start[i])) {
>             fn *= 10;
>             fn += start[i]-'0';
>             i++;
>Index: FreeType/module/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/lib/font/FreeType/module/Imakefile,v
>retrieving revision 1.2
>diff -u -r1.2 Imakefile
>--- a/FreeType/module/Imakefile	23 Apr 2004 18:44:08 -0000	1.2
>+++ b/FreeType/module/Imakefile	5 May 2004 15:34:43 -0000
>@@ -47,15 +47,16 @@
>            -I$(FT2SOURCEDIR)/pshinter \
>            -I$(FT2SOURCEDIR)/autohint \
>            -I$(FT2SOURCEDIR)/bdf \
>-           -I$(FT2SOURCEDIR)/pcf
>+           -I$(FT2SOURCEDIR)/pcf \
>+           -I$(FT2SOURCEDIR)/lzw
> 
> FT2SRCS = ftbase.c ftinit.c ftglyph.c ftbbox.c ftsystem.c fttype1.c ftxf86.c \
>           ftgzip.c raster.c sfnt.c truetype.c cff.c type1.c \
>-          psaux.c psnames.c pshinter.c  autohint.c \
>+          psaux.c psnames.c pshinter.c  autohint.c ftlzw.c \
>           ftbdf.c bdf.c pcf.c
> FT2OBJS = ftbase.o ftinit.o ftglyph.o ftbbox.o ftsystem.o fttype1.o ftxf86.o \
>           ftgzip.o raster.o sfnt.o truetype.o cff.o type1.o \
>-          psaux.o psnames.o pshinter.o autohint.o \
>+          psaux.o psnames.o pshinter.o autohint.o ftlzw.o \
>           ftbdf.o bdf.o pcf.o
> #endif
> 
>@@ -92,6 +93,7 @@
> LinkSourceFile(ftbdf.c,$(FT2SOURCEDIR)/base)
> LinkSourceFile(bdf.c,$(FT2SOURCEDIR)/bdf)
> LinkSourceFile(pcf.c,$(FT2SOURCEDIR)/pcf)
>+LinkSourceFile(ftlzw.c,$(FT2SOURCEDIR)/lzw)
> #endif
> 
> ModuleObjectRule()
>Index: FreeType/module/ftheader.h
>===================================================================
>RCS file: /cvs/xorg/xc/lib/font/FreeType/module/ftheader.h,v
>retrieving revision 1.3
>diff -u -r1.3 ftheader.h
>--- a/FreeType/module/ftheader.h	28 Apr 2004 10:39:08 -0000	1.3
>+++ b/FreeType/module/ftheader.h	5 May 2004 15:34:43 -0000
>@@ -105,7 +105,7 @@
>   /*    FreeType 2 configuration data.                                     */
>   /*                                                                       */
> #ifndef FT_CONFIG_CONFIG_H
>-#define FT_CONFIG_CONFIG_H  <ftconfig.h>
>+#define FT_CONFIG_CONFIG_H  <freetype/config/ftconfig.h>
> #endif
> 
> 
>@@ -119,7 +119,7 @@
>   /*    FreeType 2 configuration data.                                     */
>   /*                                                                       */
> #ifndef FT_CONFIG_STANDARD_LIBRARY_H
>-#define FT_CONFIG_STANDARD_LIBRARY_H  <ftstdlib.h>
>+#define FT_CONFIG_STANDARD_LIBRARY_H  <myftstdlib.h>
> #endif
> 
>

Actions: View | Splinter Review

Attachments on bug 601: 266 | 270

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.