ref: 0633995b558975fabe3082f50836b93d5077a03e
parent: 6b832c872d9726fd3f0979b3f95c7fa618fb50f2
author: Werner Lemberg <[email protected]>
date: Wed Mar 11 02:30:23 EDT 2015
Rename `ftxf86.[ch]' to `ftfntfmt.[ch]'. CMakeLists.txt, builds/amiga/makefile, builds/amiga/makefile.os4, builds/amiga/smakefile, builds/mac/FreeType.m68k_cfm.make.txt, builds/mac/FreeType.m68k_far.make.txt, builds/mac/FreeType.ppc_carbon.make.txt, builds/mac/FreeType.ppc_classic.make.txt, builds/symbian/bld.inf, builds/symbian/freetype.mmp, builds/wince/vc2005-ce/freetype.vcproj, builds/wince/vc2008-ce/freetype.vcproj, builds/windows/vc2005/freetype.vcproj, builds/windows/vc2008/freetype.vcproj, builds/windows/vc2010/freetype.vcxproj, builds/windows/vc2010/freetype.vcxproj.filters, builds/windows/visualc/freetype.dsp, builds/windows/visualc/freetype.vcproj, builds/windows/visualce/freetype.dsp, builds/windows/visualce/freetype.vcproj, docs/INSTALL.ANY, include/config/ftheader.h, include/ftfntfmt.h, modules.cfg, src/base/ftfntfmt.c, vms_make.com: Updated.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,6 +135,7 @@
src/base/ftcid.c
src/base/ftdbgmem.c
src/base/ftdebug.c
+ src/base/ftfntfmt.c
src/base/ftfstype.c
src/base/ftgasp.c
src/base/ftgloadr.c
@@ -158,7 +159,6 @@
src/base/fttype1.c
src/base/ftutil.c
src/base/ftwinfnt.c
- src/base/ftxf86.c
src/bdf/bdf.c
src/bzip2/ftbzip2.c
src/cache/ftcache.c
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2015-03-11 Werner Lemberg <[email protected]>
+
+ Rename `ftxf86.[ch]' to `ftfntfmt.[ch]'.
+
+ CMakeLists.txt, builds/amiga/makefile, builds/amiga/makefile.os4,
+ builds/amiga/smakefile, builds/mac/FreeType.m68k_cfm.make.txt,
+ builds/mac/FreeType.m68k_far.make.txt,
+ builds/mac/FreeType.ppc_carbon.make.txt,
+ builds/mac/FreeType.ppc_classic.make.txt, builds/symbian/bld.inf,
+ builds/symbian/freetype.mmp, builds/wince/vc2005-ce/freetype.vcproj,
+ builds/wince/vc2008-ce/freetype.vcproj,
+ builds/windows/vc2005/freetype.vcproj,
+ builds/windows/vc2008/freetype.vcproj,
+ builds/windows/vc2010/freetype.vcxproj,
+ builds/windows/vc2010/freetype.vcxproj.filters,
+ builds/windows/visualc/freetype.dsp,
+ builds/windows/visualc/freetype.vcproj,
+ builds/windows/visualce/freetype.dsp,
+ builds/windows/visualce/freetype.vcproj, docs/INSTALL.ANY,
+ include/config/ftheader.h, include/ftfntfmt.h, modules.cfg,
+ src/base/ftfntfmt.c, vms_make.com: Updated.
+
2015-03-10 Alexei Podtelezhnikov <[email protected]>
Fix Savannah bug #44412 (part 1).
--- a/builds/amiga/makefile
+++ b/builds/amiga/makefile
@@ -96,6 +96,9 @@
ftcid.ppc.o: $(FTSRC)/base/ftcid.c
$(CC) -c $(CFLAGS) -o $@ $<
+ftfntfmt.ppc.o: $(FTSRC)/base/ftfntfmt.c
+ $(CC) -c $(CFLAGS) -o $@ $<
+
ftfstype.ppc.o: $(FTSRC)/base/ftfstype.c
$(CC) -c $(CFLAGS) -o $@ $<
@@ -135,9 +138,6 @@
ftwinfnt.ppc.o: $(FTSRC)/base/ftwinfnt.c
$(CC) -c $(CFLAGS) -o $@ $<
-ftxf86.ppc.o: $(FTSRC)/base/ftxf86.c
- $(CC) -c $(CFLAGS) -o $@ $<
-
#
# FreeType2 library autofitting module
#
@@ -269,11 +269,11 @@
otvalid.ppc.o: $(FTSRC)/otvalid/otvalid.c
$(CC) -c $(CFLAGS) -o $@ $<
-BASEPPC = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftcid.ppc.o \
- ftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o ftgxval.ppc.o \
- ftlcdfil.ppc.o ftmm.ppc.o ftotval.ppc.o ftpatent.ppc.o ftpfr.ppc.o \
- ftstroke.ppc.o ftsynth.ppc.o fttype1.ppc.o ftwinfnt.ppc.o \
- ftxf86.ppc.o
+BASEPPC = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftcid.ppc.o \
+ ftfntfmt.ppc.oftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o \
+ ftgxval.ppc.o ftlcdfil.ppc.o ftmm.ppc.o ftotval.ppc.o \
+ ftpatent.ppc.o ftpfr.ppc.o ftstroke.ppc.o ftsynth.ppc.o \
+ fttype1.ppc.o ftwinfnt.ppc.o
DEBUGPPC = ftdebug.ppc.o ftdebugpure.ppc.o
--- a/builds/amiga/makefile.os4
+++ b/builds/amiga/makefile.os4
@@ -99,6 +99,9 @@
ftdebugpure.ppc.o: src/base/ftdebug.c
$(CC) -c $(CFLAGS) -o $@ src/base/ftdebug.c
+ftfntfmt.ppc.o: FT:src/base/ftfntfmt.c
+ $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftfntfmt.c
+
ftfstype.ppc.o: FT:src/base/ftfstype.c
$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftfstype.c
@@ -138,9 +141,6 @@
ftwinfnt.ppc.o: FT:src/base/ftwinfnt.c
$(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftwinfnt.c
-ftxf86.ppc.o: FT:src/base/ftxf86.c
- $(CC) -c $(CFLAGS) -o $@ /FT/src/base/ftxf86.c
-
#
# FreeType2 library autofitting module
#
@@ -273,11 +273,11 @@
otvalid.ppc.o: FT:src/otvalid/otvalid.c
$(CC) -c $(CFLAGS) -o $@ /FT/src/otvalid/otvalid.c
-BASE = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftcid.ppc.o \
- ftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o ftgxval.ppc.o \
- ftlcdfil.ppc.o ftmm.ppc.o ftotval.ppc.o ftpatent.ppc.o ftpfr.ppc.o \
- ftstroke.ppc.o ftsynth.ppc.o fttype1.ppc.o ftwinfnt.ppc.o \
- ftxf86.ppc.o
+BASE = ftbase.ppc.o ftbbox.ppc.o ftbdf.ppc.o ftbitmap.ppc.o ftcid.ppc.o \
+ ftfntfmt.ppc.o ftfstype.ppc.o ftgasp.ppc.o ftglyph.ppc.o \
+ ftgxval.ppc.o ftlcdfil.ppc.o ftmm.ppc.o ftotval.ppc.o \
+ ftpatent.ppc.o ftpfr.ppc.o ftstroke.ppc.o ftsynth.ppc.o \
+ fttype1.ppc.o ftwinfnt.ppc.o
DEBUG = ftdebug.ppc.o ftdebugpure.ppc.o
--- a/builds/amiga/smakefile
+++ b/builds/amiga/smakefile
@@ -42,9 +42,9 @@
# (and either ftdebug.o or ftdebugpure.o if you enabled FT_DEBUG_LEVEL_ERROR or
# FT_DEBUG_LEVEL_TRACE in include/config/ftoption.h).
-OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfstype.o ftgasp.o \
- ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o ftpatent.o ftpfr.o \
- ftstroke.o ftsynth.o fttype1.o ftwinfnt.o ftxf86.o
+OBJBASE = ftbase.o ftbbox.o ftbdf.o ftbitmap.o ftcid.o ftfntfmt.o ftfstype.o \
+ ftgasp.o ftglyph.o ftgxval.o ftlcdfil.o ftmm.o ftotval.o \
+ ftpatent.o ftpfr.o ftstroke.o ftsynth.o fttype1.o ftwinfnt.o
OBJSYSTEM = ftsystem.o ftsystempure.o
@@ -133,6 +133,8 @@
sc $(SCFLAGS) objname=$@ $<
ftcid.o: $(CORE)base/ftcid.c
sc $(SCFLAGS) objname=$@ $<
+ftfntfmt.o: $(CORE)base/ftfntfmt.c
+ sc $(SCFLAGS) objname=$@ $<
ftfstype.o: $(CORE)base/ftfstype.c
sc $(SCFLAGS) objname=$@ $<
ftgasp.o: $(CORE)base/ftgasp.c
@@ -158,8 +160,6 @@
fttype1.o: $(CORE)base/fttype1.c
sc $(SCFLAGS) objname=$@ $<
ftwinfnt.o: $(CORE)base/ftwinfnt.c
- sc $(SCFLAGS) objname=$@ $<
-ftxf86.o: $(CORE)base/ftxf86.c
sc $(SCFLAGS) objname=$@ $<
#
--- a/builds/mac/FreeType.m68k_cfm.make.txt
+++ b/builds/mac/FreeType.m68k_cfm.make.txt
@@ -38,6 +38,7 @@
:src:base:ftbdf.c \xB6
:src:base:ftbitmap.c \xB6
:src:base:ftdebug.c \xB6
+ :src:base:ftfntfmt.c \xB6
:src:base:ftfstype.c \xB6
:src:base:ftglyph.c \xB6
:src:base:ftgxval.c \xB6
@@ -50,7 +51,6 @@
:src:base:ftsystem.c \xB6
:src:base:fttype1.c \xB6
:src:base:ftwinfnt.c \xB6
- :src:base:ftxf86.c \xB6
:src:cache:ftcache.c \xB6
:src:bdf:bdf.c \xB6
:src:cff:cff.c \xB6
@@ -83,6 +83,7 @@
"{ObjDir}ftbdf.c.o" \xB6 "{ObjDir}ftbitmap.c.o" \xB6 "{ObjDir}ftdebug.c.o" \xB6+ "{ObjDir}ftfntfmt.c.o" \xB6 "{ObjDir}ftfstype.c.o" \xB6 "{ObjDir}ftglyph.c.o" \xB6 "{ObjDir}ftgxval.c.o" \xB6@@ -95,7 +96,6 @@
"{ObjDir}ftsystem.c.o" \xB6 "{ObjDir}fttype1.c.o" \xB6 "{ObjDir}ftwinfnt.c.o" \xB6- "{ObjDir}ftxf86.c.o" \xB6 "{ObjDir}ftcache.c.o" \xB6 "{ObjDir}bdf.c.o" \xB6 "{ObjDir}cff.c.o" \xB6@@ -161,6 +161,7 @@
"{ObjDir}ftbdf.c.o" \xC4 :src:base:ftbdf.c "{ObjDir}ftbitmap.c.o" \xC4 :src:base:ftbitmap.c "{ObjDir}ftdebug.c.o" \xC4 :src:base:ftdebug.c+"{ObjDir}ftfntfmt.c.o" \xC4 :src:base:ftfntfmt.c "{ObjDir}ftfstype.c.o" \xC4 :src:base:ftfstype.c "{ObjDir}ftglyph.c.o" \xC4 :src:base:ftglyph.c "{ObjDir}ftgxval.c.o" \xC4 :src:base:ftgxval.c@@ -173,7 +174,6 @@
"{ObjDir}ftsystem.c.o" \xC4 :src:base:ftsystem.c "{ObjDir}fttype1.c.o" \xC4 :src:base:fttype1.c "{ObjDir}ftwinfnt.c.o" \xC4 :src:base:ftwinfnt.c-"{ObjDir}ftxf86.c.o" \xC4 :src:base:ftxf86.c "{ObjDir}ftcache.c.o" \xC4 :src:cache:ftcache.c "{ObjDir}bdf.c.o" \xC4 :src:bdf:bdf.c "{ObjDir}cff.c.o" \xC4 :src:cff:cff.c--- a/builds/mac/FreeType.m68k_far.make.txt
+++ b/builds/mac/FreeType.m68k_far.make.txt
@@ -37,6 +37,7 @@
:src:base:ftbdf.c \xB6
:src:base:ftbitmap.c \xB6
:src:base:ftdebug.c \xB6
+ :src:base:ftfntfmt.c \xB6
:src:base:ftfstype.c \xB6
:src:base:ftglyph.c \xB6
:src:base:ftgxval.c \xB6
@@ -49,7 +50,6 @@
:src:base:ftsystem.c \xB6
:src:base:fttype1.c \xB6
:src:base:ftwinfnt.c \xB6
- :src:base:ftxf86.c \xB6
:src:cache:ftcache.c \xB6
:src:bdf:bdf.c \xB6
:src:cff:cff.c \xB6
@@ -82,6 +82,7 @@
"{ObjDir}ftbdf.c.o" \xB6 "{ObjDir}ftbitmap.c.o" \xB6 "{ObjDir}ftdebug.c.o" \xB6+ "{ObjDir}ftfntfmt.c.o" \xB6 "{ObjDir}ftfstype.c.o" \xB6 "{ObjDir}ftglyph.c.o" \xB6 "{ObjDir}ftgxval.c.o" \xB6@@ -94,7 +95,6 @@
"{ObjDir}ftsystem.c.o" \xB6 "{ObjDir}fttype1.c.o" \xB6 "{ObjDir}ftwinfnt.c.o" \xB6- "{ObjDir}ftxf86.c.o" \xB6 "{ObjDir}ftcache.c.o" \xB6 "{ObjDir}bdf.c.o" \xB6 "{ObjDir}cff.c.o" \xB6@@ -160,6 +160,7 @@
"{ObjDir}ftbdf.c.o" \xC4 :src:base:ftbdf.c "{ObjDir}ftbitmap.c.o" \xC4 :src:base:ftbitmap.c "{ObjDir}ftdebug.c.o" \xC4 :src:base:ftdebug.c+"{ObjDir}ftfntfmt.c.o" \xC4 :src:base:ftfntfmt.c "{ObjDir}ftfstype.c.o" \xC4 :src:base:ftfstype.c "{ObjDir}ftglyph.c.o" \xC4 :src:base:ftglyph.c "{ObjDir}ftgxval.c.o" \xC4 :src:base:ftgxval.c@@ -172,7 +173,6 @@
"{ObjDir}ftsystem.c.o" \xC4 :src:base:ftsystem.c "{ObjDir}fttype1.c.o" \xC4 :src:base:fttype1.c "{ObjDir}ftwinfnt.c.o" \xC4 :src:base:ftwinfnt.c-"{ObjDir}ftxf86.c.o" \xC4 :src:base:ftxf86.c "{ObjDir}ftcache.c.o" \xC4 :src:cache:ftcache.c "{ObjDir}bdf.c.o" \xC4 :src:bdf:bdf.c "{ObjDir}cff.c.o" \xC4 :src:cff:cff.c--- a/builds/mac/FreeType.ppc_carbon.make.txt
+++ b/builds/mac/FreeType.ppc_carbon.make.txt
@@ -38,6 +38,7 @@
:src:base:ftbdf.c \xB6
:src:base:ftbitmap.c \xB6
:src:base:ftdebug.c \xB6
+ :src:base:ftfntfmt.c \xB6
:src:base:ftfstype.c \xB6
:src:base:ftglyph.c \xB6
:src:base:ftgxval.c \xB6
@@ -50,7 +51,6 @@
:src:base:ftsystem.c \xB6
:src:base:fttype1.c \xB6
:src:base:ftwinfnt.c \xB6
- :src:base:ftxf86.c \xB6
:src:cache:ftcache.c \xB6
:src:bdf:bdf.c \xB6
:src:cff:cff.c \xB6
@@ -83,6 +83,7 @@
"{ObjDir}ftbdf.c.x" \xB6 "{ObjDir}ftbitmap.c.x" \xB6 "{ObjDir}ftdebug.c.x" \xB6+ "{ObjDir}ftfntfmt.c.x" \xB6 "{ObjDir}ftfstype.c.x" \xB6 "{ObjDir}ftglyph.c.x" \xB6 "{ObjDir}ftgxval.c.x" \xB6@@ -95,7 +96,6 @@
"{ObjDir}ftsystem.c.x" \xB6 "{ObjDir}fttype1.c.x" \xB6 "{ObjDir}ftwinfnt.c.x" \xB6- "{ObjDir}ftxf86.c.x" \xB6 "{ObjDir}ftcache.c.x" \xB6 "{ObjDir}bdf.c.x" \xB6 "{ObjDir}cff.c.x" \xB6@@ -164,6 +164,7 @@
"{ObjDir}ftbdf.c.x" \xC4 :src:base:ftbdf.c "{ObjDir}ftbitmap.c.x" \xC4 :src:base:ftbitmap.c "{ObjDir}ftdebug.c.x" \xC4 :src:base:ftdebug.c+"{ObjDir}ftfntfmt.c.x" \xC4 :src:base:ftfntfmt.c "{ObjDir}ftfstype.c.x" \xC4 :src:base:ftfstype.c "{ObjDir}ftglyph.c.x" \xC4 :src:base:ftglyph.c "{ObjDir}ftgxval.c.x" \xC4 :src:base:ftgxval.c@@ -176,7 +177,6 @@
"{ObjDir}ftsystem.c.x" \xC4 :src:base:ftsystem.c "{ObjDir}fttype1.c.x" \xC4 :src:base:fttype1.c "{ObjDir}ftwinfnt.c.x" \xC4 :src:base:ftwinfnt.c-"{ObjDir}ftxf86.c.x" \xC4 :src:base:ftxf86.c "{ObjDir}ftcache.c.x" \xC4 :src:cache:ftcache.c "{ObjDir}bdf.c.x" \xC4 :src:bdf:bdf.c "{ObjDir}cff.c.x" \xC4 :src:cff:cff.c--- a/builds/mac/FreeType.ppc_classic.make.txt
+++ b/builds/mac/FreeType.ppc_classic.make.txt
@@ -38,6 +38,7 @@
:src:base:ftbdf.c \xB6
:src:base:ftbitmap.c \xB6
:src:base:ftdebug.c \xB6
+ :src:base:ftfntfmt.c \xB6
:src:base:ftfstype.c \xB6
:src:base:ftglyph.c \xB6
:src:base:ftgxval.c \xB6
@@ -50,7 +51,6 @@
:src:base:ftsystem.c \xB6
:src:base:fttype1.c \xB6
:src:base:ftwinfnt.c \xB6
- :src:base:ftxf86.c \xB6
:src:cache:ftcache.c \xB6
:src:bdf:bdf.c \xB6
:src:cff:cff.c \xB6
@@ -83,6 +83,7 @@
"{ObjDir}ftbdf.c.x" \xB6 "{ObjDir}ftbitmap.c.x" \xB6 "{ObjDir}ftdebug.c.x" \xB6+ "{ObjDir}ftfntfmt.c.x" \xB6 "{ObjDir}ftfstype.c.x" \xB6 "{ObjDir}ftglyph.c.x" \xB6 "{ObjDir}ftgxval.c.x" \xB6@@ -95,7 +96,6 @@
"{ObjDir}ftsystem.c.x" \xB6 "{ObjDir}fttype1.c.x" \xB6 "{ObjDir}ftwinfnt.c.x" \xB6- "{ObjDir}ftxf86.c.x" \xB6 "{ObjDir}ftcache.c.x" \xB6 "{ObjDir}bdf.c.x" \xB6 "{ObjDir}cff.c.x" \xB6@@ -164,6 +164,7 @@
"{ObjDir}ftbdf.c.x" \xC4 :src:base:ftbdf.c "{ObjDir}ftbitmap.c.x" \xC4 :src:base:ftbitmap.c "{ObjDir}ftdebug.c.x" \xC4 :src:base:ftdebug.c+"{ObjDir}ftfntfmt.c.x" \xC4 :src:base:ftfntfmt.c "{ObjDir}ftfstype.c.x" \xC4 :src:base:ftfstype.c "{ObjDir}ftglyph.c.x" \xC4 :src:base:ftglyph.c "{ObjDir}ftgxval.c.x" \xC4 :src:base:ftgxval.c@@ -176,7 +177,6 @@
"{ObjDir}ftsystem.c.x" \xC4 :src:base:ftsystem.c "{ObjDir}fttype1.c.x" \xC4 :src:base:fttype1.c "{ObjDir}ftwinfnt.c.x" \xC4 :src:base:ftwinfnt.c-"{ObjDir}ftxf86.c.x" \xC4 :src:base:ftxf86.c "{ObjDir}ftcache.c.x" \xC4 :src:cache:ftcache.c "{ObjDir}bdf.c.x" \xC4 :src:bdf:bdf.c "{ObjDir}cff.c.x" \xC4 :src:cff:cff.c--- a/builds/symbian/bld.inf
+++ b/builds/symbian/bld.inf
@@ -32,6 +32,7 @@
../../include/ftcid.h ftcid.h
../../include/fterrdef.h fterrdef.h
../../include/fterrors.h fterrors.h
+../../include/ftfntfmt.h ftfntfmt.h
../../include/ftgasp.h ftgasp.h
../../include/ftglyph.h ftglyph.h
../../include/ftgxval.h ftgxval.h
@@ -58,7 +59,6 @@
../../include/fttrigon.h fttrigon.h
../../include/fttypes.h fttypes.h
../../include/ftwinfnt.h ftwinfnt.h
-../../include/ftxf86.h ftxf86.h
../../include/t1tables.h t1tables.h
../../include/ttnameid.h ttnameid.h
../../include/tttables.h tttables.h
--- a/builds/symbian/freetype.mmp
+++ b/builds/symbian/freetype.mmp
@@ -28,6 +28,7 @@
source ftbdf.c
source ftbitmap.c
source ftcid.c
+source ftfntfmt.c
source ftfstype.c
source ftgasp.c
source ftglyph.c
--- a/builds/wince/vc2005-ce/freetype.vcproj
+++ b/builds/wince/vc2005-ce/freetype.vcproj
@@ -2135,6 +2135,8 @@
</File>
<File RelativePath="..\..\..\src\base\ftcid.c">
</File>
+ <File RelativePath="..\..\..\src\base\ftfntfmt.c">
+ </File>
<File RelativePath="..\..\..\src\base\ftgxval.c">
</File>
<File RelativePath="..\..\..\src\base\ftlcdfil.c">
@@ -2278,8 +2280,6 @@
<File RelativePath="..\..\..\src\base\fttype1.c">
</File>
<File RelativePath="..\..\..\src\base\ftwinfnt.c">
- </File>
- <File RelativePath="..\..\..\src\base\ftxf86.c">
</File>
<File RelativePath="..\..\..\src\pcf\pcf.c">
<FileConfiguration Name="Release|Pocket PC 2003 (ARMV4)">
--- a/builds/wince/vc2008-ce/freetype.vcproj
+++ b/builds/wince/vc2008-ce/freetype.vcproj
@@ -7872,6 +7872,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\base\ftfntfmt.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\base\ftgxval.c"
>
</File>
@@ -8328,10 +8332,6 @@
</File>
<File
RelativePath="..\..\..\src\base\ftwinfnt.c"
- >
- </File>
- <File
- RelativePath="..\..\..\src\base\ftxf86.c"
>
</File>
<File
--- a/builds/windows/vc2005/freetype.vcproj
+++ b/builds/windows/vc2005/freetype.vcproj
@@ -346,6 +346,8 @@
<Filter Name="FT_MODULES">
<File RelativePath="..\..\..\src\base\ftbbox.c">
</File>
+ <File RelativePath="..\..\..\src\base\ftfntfmt.c">
+ </File>
<File RelativePath="..\..\..\src\base\ftmm.c">
<FileConfiguration Name="Release|Win32">
<Tool Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="" PreprocessorDefinitions="" />
@@ -373,8 +375,6 @@
<File RelativePath="..\..\..\src\base\fttype1.c">
</File>
<File RelativePath="..\..\..\src\base\ftwinfnt.c">
- </File>
- <File RelativePath="..\..\..\src\base\ftxf86.c">
</File>
<File RelativePath="..\..\..\src\base\ftlcdfil.c">
</File>
--- a/builds/windows/vc2008/freetype.vcproj
+++ b/builds/windows/vc2008/freetype.vcproj
@@ -1237,6 +1237,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\base\ftfntfmt.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\base\ftmm.c"
>
<FileConfiguration
@@ -1317,10 +1321,6 @@
</File>
<File
RelativePath="..\..\..\src\base\ftwinfnt.c"
- >
- </File>
- <File
- RelativePath="..\..\..\src\base\ftxf86.c"
>
</File>
<File
--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@@ -1122,6 +1122,7 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\..\src\base\ftbbox.c" />
+ <ClCompile Include="..\..\..\src\base\ftfntfmt.c" />
<ClCompile Include="..\..\..\src\base\ftmm.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">Disabled</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">Disabled</Optimization>
@@ -1170,7 +1171,6 @@
<ClCompile Include="..\..\..\src\base\ftsynth.c" />
<ClCompile Include="..\..\..\src\base\fttype1.c" />
<ClCompile Include="..\..\..\src\base\ftwinfnt.c" />
- <ClCompile Include="..\..\..\src\base\ftxf86.c" />
<ClCompile Include="..\..\..\src\base\ftlcdfil.c" />
<ClCompile Include="..\..\..\src\base\ftgxval.c" />
<ClCompile Include="..\..\..\src\base\ftotval.c" />
--- a/builds/windows/vc2010/freetype.vcxproj.filters
+++ b/builds/windows/vc2010/freetype.vcxproj.filters
@@ -65,6 +65,9 @@
<ClCompile Include="..\..\..\src\base\ftbbox.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\base\ftfntfmt.c">
+ <Filter>Source Files\FT_MODULES</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\src\base\ftmm.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
@@ -78,9 +81,6 @@
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\base\ftwinfnt.c">
- <Filter>Source Files\FT_MODULES</Filter>
- </ClCompile>
- <ClCompile Include="..\..\..\src\base\ftxf86.c">
<Filter>Source Files\FT_MODULES</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\base\ftlcdfil.c">
--- a/builds/windows/visualc/freetype.dsp
+++ b/builds/windows/visualc/freetype.dsp
@@ -226,6 +226,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\base\ftfntfmt.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\base\ftfstype.c
# End Source File
# Begin Source File
@@ -298,10 +302,6 @@
# Begin Source File
SOURCE=..\..\..\src\base\ftwinfnt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\base\ftxf86.c
# End Source File
# Begin Source File
--- a/builds/windows/visualc/freetype.vcproj
+++ b/builds/windows/visualc/freetype.vcproj
@@ -1236,6 +1236,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\base\ftfntfmt.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\base\ftmm.c"
>
<FileConfiguration
@@ -1316,10 +1320,6 @@
</File>
<File
RelativePath="..\..\..\src\base\ftwinfnt.c"
- >
- </File>
- <File
- RelativePath="..\..\..\src\base\ftxf86.c"
>
</File>
<File
--- a/builds/windows/visualce/freetype.dsp
+++ b/builds/windows/visualce/freetype.dsp
@@ -226,6 +226,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\..\src\base\ftfntfmt.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\..\src\base\ftfstype.c
# End Source File
# Begin Source File
@@ -298,10 +302,6 @@
# Begin Source File
SOURCE=..\..\..\src\base\ftwinfnt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\base\ftxf86.c
# End Source File
# Begin Source File
--- a/builds/windows/visualce/freetype.vcproj
+++ b/builds/windows/visualce/freetype.vcproj
@@ -8262,6 +8262,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\base\ftfntfmt.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\base\ftmm.c"
>
<FileConfiguration
@@ -8702,10 +8706,6 @@
</File>
<File
RelativePath="..\..\..\src\base\ftwinfnt.c"
- >
- </File>
- <File
- RelativePath="..\..\..\src\base\ftxf86.c"
>
</File>
<File
--- a/docs/INSTALL.ANY
+++ b/docs/INSTALL.ANY
@@ -39,6 +39,7 @@
src/base/ftbdf.c -- optional, see <ftbdf.h>
src/base/ftbitmap.c -- optional, see <ftbitmap.h>
src/base/ftcid.c -- optional, see <ftcid.h>
+ src/base/ftfntfmt.c -- optional, see <ftfntfmt.h>
src/base/ftfstype.c -- optional
src/base/ftgasp.c -- optional, see <ftgasp.h>
src/base/ftgxval.c -- optional, see <ftgxval.h>
@@ -51,7 +52,6 @@
src/base/ftsynth.c -- optional, see <ftsynth.h>
src/base/fttype1.c -- optional, see <t1tables.h>
src/base/ftwinfnt.c -- optional, see <ftwinfnt.h>
- src/base/ftxf86.c -- optional, see <ftxf86.h>
src/base/ftmac.c -- only on the Macintosh
--- a/include/config/ftheader.h
+++ b/include/config/ftheader.h
@@ -717,7 +717,7 @@
* FreeType~2 API which provides functions specific to the XFree86 and
* X.Org X11 servers.
*/
-#define FT_XFREE86_H <ftxf86.h>
+#define FT_XFREE86_H <ftfntfmt.h>
/*************************************************************************
--- /dev/null
+++ b/include/ftfntfmt.h
@@ -1,0 +1,84 @@
+/***************************************************************************/
+/* */
+/* ftfntfmt.h */
+/* */
+/* Support functions for X11. */
+/* */
+/* Copyright 2002-2015 by */
+/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+/* */
+/* This file is part of the FreeType project, and may only be used, */
+/* modified, and distributed under the terms of the FreeType project */
+/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
+/* this file you indicate that you have read the license and */
+/* understand and accept it fully. */
+/* */
+/***************************************************************************/
+
+
+#ifndef __FTXF86_H__
+#define __FTXF86_H__
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
+
+FT_BEGIN_HEADER
+
+
+ /*************************************************************************/
+ /* */
+ /* <Section> */
+ /* font_formats */
+ /* */
+ /* <Title> */
+ /* Font Formats */
+ /* */
+ /* <Abstract> */
+ /* Getting the font format. */
+ /* */
+ /* <Description> */
+ /* The single function in this section can be used to get the font */
+ /* format. Note that this information is not needed normally; */
+ /* however, there are special cases (like in PDF devices) where it is */
+ /* important to differentiate, in spite of FreeType's uniform API. */
+ /* */
+ /* This function is in the X11/xf86 namespace for historical reasons */
+ /* and in no way depends on that windowing system. */
+ /* */
+ /*************************************************************************/
+
+
+ /*************************************************************************/
+ /* */
+ /* <Function> */
+ /* FT_Get_X11_Font_Format */
+ /* */
+ /* <Description> */
+ /* Return a string describing the format of a given face, using values */
+ /* that can be used as an X11 FONT_PROPERTY. Possible values are */
+ /* `TrueType', `Type~1', `BDF', `PCF', `Type~42', `CID~Type~1', `CFF', */
+ /* `PFR', and `Windows~FNT'. */
+ /* */
+ /* <Input> */
+ /* face :: */
+ /* Input face handle. */
+ /* */
+ /* <Return> */
+ /* Font format string. NULL in case of error. */
+ /* */
+ FT_EXPORT( const char* )
+ FT_Get_X11_Font_Format( FT_Face face );
+
+ /* */
+
+
+FT_END_HEADER
+
+#endif /* __FTXF86_H__ */
--- a/include/ftxf86.h
+++ /dev/null
@@ -1,84 +1,0 @@
-/***************************************************************************/
-/* */
-/* ftxf86.h */
-/* */
-/* Support functions for X11. */
-/* */
-/* Copyright 2002-2015 by */
-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
-/* */
-/* This file is part of the FreeType project, and may only be used, */
-/* modified, and distributed under the terms of the FreeType project */
-/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/***************************************************************************/
-
-
-#ifndef __FTXF86_H__
-#define __FTXF86_H__
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#ifdef FREETYPE_H
-#error "freetype.h of FreeType 1 has been loaded!"
-#error "Please fix the directory search order for header files"
-#error "so that freetype.h of FreeType 2 is found first."
-#endif
-
-
-FT_BEGIN_HEADER
-
-
- /*************************************************************************/
- /* */
- /* <Section> */
- /* font_formats */
- /* */
- /* <Title> */
- /* Font Formats */
- /* */
- /* <Abstract> */
- /* Getting the font format. */
- /* */
- /* <Description> */
- /* The single function in this section can be used to get the font */
- /* format. Note that this information is not needed normally; */
- /* however, there are special cases (like in PDF devices) where it is */
- /* important to differentiate, in spite of FreeType's uniform API. */
- /* */
- /* This function is in the X11/xf86 namespace for historical reasons */
- /* and in no way depends on that windowing system. */
- /* */
- /*************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
- /* FT_Get_X11_Font_Format */
- /* */
- /* <Description> */
- /* Return a string describing the format of a given face, using values */
- /* that can be used as an X11 FONT_PROPERTY. Possible values are */
- /* `TrueType', `Type~1', `BDF', `PCF', `Type~42', `CID~Type~1', `CFF', */
- /* `PFR', and `Windows~FNT'. */
- /* */
- /* <Input> */
- /* face :: */
- /* Input face handle. */
- /* */
- /* <Return> */
- /* Font format string. NULL in case of error. */
- /* */
- FT_EXPORT( const char* )
- FT_Get_X11_Font_Format( FT_Face face );
-
- /* */
-
-
-FT_END_HEADER
-
-#endif /* __FTXF86_H__ */
--- a/modules.cfg
+++ b/modules.cfg
@@ -168,6 +168,11 @@
# See include/ftcid.h for the API.
BASE_EXTENSIONS += ftcid.c
+# Support functions for X11.
+#
+# See include/ftfntfmt.h for the API.
+BASE_EXTENSIONS += ftfntfmt.c
+
# Access FSType information. Needs fttype1.c.
#
# See include/freetype.h for the API.
@@ -234,11 +239,6 @@
#
# See include/ftwinfnt.h for the API.
BASE_EXTENSIONS += ftwinfnt.c
-
-# Support functions for X11.
-#
-# See include/ftxf86.h for the API.
-BASE_EXTENSIONS += ftxf86.c
####
#### The components `ftsystem.c' (for memory allocation and stream I/O
--- /dev/null
+++ b/src/base/ftfntfmt.c
@@ -1,0 +1,40 @@
+/***************************************************************************/
+/* */
+/* ftfntfmt.c */
+/* */
+/* FreeType utility file for X11 support (body). */
+/* */
+/* Copyright 2002-2015 by */
+/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+/* */
+/* This file is part of the FreeType project, and may only be used, */
+/* modified, and distributed under the terms of the FreeType project */
+/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
+/* this file you indicate that you have read the license and */
+/* understand and accept it fully. */
+/* */
+/***************************************************************************/
+
+
+#include <ft2build.h>
+#include FT_XFREE86_H
+#include FT_INTERNAL_OBJECTS_H
+#include FT_SERVICE_XFREE86_NAME_H
+
+
+ /* documentation is in ftfntfmt.h */
+
+ FT_EXPORT_DEF( const char* )
+ FT_Get_X11_Font_Format( FT_Face face )
+ {+ const char* result = NULL;
+
+
+ if ( face )
+ FT_FACE_FIND_SERVICE( face, result, XF86_NAME );
+
+ return result;
+ }
+
+
+/* END */
--- a/src/base/ftxf86.c
+++ /dev/null
@@ -1,40 +1,0 @@
-/***************************************************************************/
-/* */
-/* ftxf86.c */
-/* */
-/* FreeType utility file for X11 support (body). */
-/* */
-/* Copyright 2002-2015 by */
-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
-/* */
-/* This file is part of the FreeType project, and may only be used, */
-/* modified, and distributed under the terms of the FreeType project */
-/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/***************************************************************************/
-
-
-#include <ft2build.h>
-#include FT_XFREE86_H
-#include FT_INTERNAL_OBJECTS_H
-#include FT_SERVICE_XFREE86_NAME_H
-
-
- /* documentation is in ftxf86.h */
-
- FT_EXPORT_DEF( const char* )
- FT_Get_X11_Font_Format( FT_Face face )
- {- const char* result = NULL;
-
-
- if ( face )
- FT_FACE_FIND_SERVICE( face, result, XF86_NAME );
-
- return result;
- }
-
-
-/* END */
--- a/vms_make.com
+++ b/vms_make.com
@@ -356,8 +356,8 @@
CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base])
OBJS=ftbase.obj,ftinit.obj,ftglyph.obj,ftdebug.obj,ftbdf.obj,ftmm.obj,\
- fttype1.obj,ftxf86.obj,ftpfr.obj,ftstroke.obj,ftwinfnt.obj,ftbbox.obj,\
- ftbitmap.obj ftlcdfil.obj ftgasp.obj
+ fttype1.obj,ftfntfmt.obj,ftpfr.obj,ftstroke.obj,ftwinfnt.obj,ftbbox.obj,\
+ ftbitmap.obj,ftlcdfil.obj,ftgasp.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)