Import freetype 2.2.1

7 files changed, 79 insertions, 76 deletions

diff --git a/lib/freetype/builds/amiga/README b/lib/freetype/builds/amiga/README
index 2b8f8e87d..bef27a897 100644
--- a/lib/freetype/builds/amiga/README
+++ b/lib/freetype/builds/amiga/README
@@ -56,7 +56,7 @@ directory.  The results are:
 
 - ftdebugpure.o, an object module containing the pure version of the
   debugging code which uses KVPrintf() from lib:debug.lib and no
-  exit().  For debugging of Amiga run-time shared system libraries.
+  exit().  For debugging of Amiga run-time shared system libraries. 
   Source code is in src/base/ftdebug.c.
 
 - NO ftinit.o.  Because linking with a link library should result in
diff --git a/lib/freetype/builds/amiga/include/freetype/config/ftconfig.h b/lib/freetype/builds/amiga/include/freetype/config/ftconfig.h
index c2c2ac8db..23d2edab2 100644
--- a/lib/freetype/builds/amiga/include/freetype/config/ftconfig.h
+++ b/lib/freetype/builds/amiga/include/freetype/config/ftconfig.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Amiga-specific configuration file (specification only).              */
 /*                                                                         */
-/*  Copyright 2005, 2006, 2007 by                                          */
+/*  Copyright 2005 by                                                      */
 /*  Werner Lemberg and Detlef Würkner.                                     */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -20,14 +20,18 @@
  * with Amiga-specific changes. When the compiler searches this directory
  * before the default directory, we can do some modifications.
  *
- * Here we must change FT_EXPORT_DEF so that SAS/C does
+ * Here we must change FT_BASE_DEF and FT_EXPORT_DEF so that SAS/C does
  * generate the needed XDEFs.
  */
 
 #if 0
+#define FT_BASE_DEF( x )  extern  x
 #define FT_EXPORT_DEF( x )  extern  x
 #endif
 
+#undef FT_BASE_DEF
+#define FT_BASE_DEF( x )  x
+
 #undef FT_EXPORT_DEF
 #define FT_EXPORT_DEF( x )  x
 
@@ -40,7 +44,7 @@
 #endif
 #else
 /* We must define that, it seems that
- * lib/gcc-lib/ppc-morphos/2.95.3/include/syslimits.h is missing in
+ * lib/gcc-lib/ppc-morphos/2.95.3/include/syslimits.h is missing in 
  * ppc-morphos-gcc-2.95.3-bin.tgz (gcc for 68k producing MorphOS PPC elf
  * binaries from http://www.morphos.de)
  */
diff --git a/lib/freetype/builds/win32/detect.mk b/lib/freetype/builds/win32/detect.mk
index 190653960..97e7b5227 100644
--- a/lib/freetype/builds/win32/detect.mk
+++ b/lib/freetype/builds/win32/detect.mk
@@ -3,7 +3,7 @@
 #
 
 
-# Copyright 1996-2000, 2003, 2004, 2006, 2007 by
+# Copyright 1996-2000, 2003, 2004 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
 #
 # This file is part of the FreeType project, and may only be used, modified,
@@ -48,7 +48,7 @@ ifeq ($(PLATFORM),ansi)
     #
     # Note that on Windows NT, such an environment variable will not be seen
     # from DOS-based tools like DJGPP's make; this is not actually a problem
-    # since NT is detected independently above.  But do not try to be clever!
+    # since NT is detected independantly above.  But do not try to be clever!
     #
     ifdef winbootdir
       ifdef windir
@@ -65,7 +65,6 @@ endif # test PLATFORM ansi
 ifeq ($(PLATFORM),win32)
 
   DELETE := del
-  CAT    := type
   SEP    := $(BACKSLASH)
 
   # Setting COPY is a bit trickier.  Plain COPY on NT will not work
@@ -76,7 +75,7 @@ ifeq ($(PLATFORM),win32)
   # So we need to hack.
   #
   # Kudos to Eli Zaretskii (DJGPP guru) that helped debug it.
-  # Details are available in threads of the freetype mailing list
+  # Details are available in threads of the freetype mailing list 
   # (2004-11-11), and then in the devel mailing list (2004-11-20 to -23).
   #
   ifeq ($(OS),Windows_NT)
diff --git a/lib/freetype/include/freetype/internal/services/svkern.h b/lib/freetype/include/freetype/internal/services/svkern.h
index 1488adf49..169b36dde 100644
--- a/lib/freetype/include/freetype/internal/services/svkern.h
+++ b/lib/freetype/include/freetype/internal/services/svkern.h
@@ -36,12 +36,12 @@ FT_BEGIN_HEADER
 
   FT_DEFINE_SERVICE( Kerning )
   {
-    FT_Kerning_TrackGetFunc  get_track;
+    FT_Kerning_TrackGetFunc  get_track;  
   };
 
   /* */
 
-
+ 
 FT_END_HEADER
 
 
diff --git a/lib/freetype/include/freetype/internal/services/svotval.h b/lib/freetype/include/freetype/internal/services/svotval.h
index 970bbd575..88da77887 100644
--- a/lib/freetype/include/freetype/internal/services/svotval.h
+++ b/lib/freetype/include/freetype/internal/services/svotval.h
@@ -29,13 +29,13 @@ FT_BEGIN_HEADER
 
 
   typedef FT_Error
-  (*otv_validate_func)( FT_Face volatile  face,
-                        FT_UInt           ot_flags,
-                        FT_Bytes         *base,
-                        FT_Bytes         *gdef,
-                        FT_Bytes         *gpos,
-                        FT_Bytes         *gsub,
-                        FT_Bytes         *jstf );
+  (*otv_validate_func)( FT_Face    face,
+                        FT_UInt    ot_flags,
+                        FT_Bytes  *base,
+                        FT_Bytes  *gdef,
+                        FT_Bytes  *gpos,
+                        FT_Bytes  *gsub,
+                        FT_Bytes  *jstf );
 
 
   FT_DEFINE_SERVICE( OTvalidate )
diff --git a/lib/freetype/include/freetype/internal/services/svxf86nm.h b/lib/freetype/include/freetype/internal/services/svxf86nm.h
index ca5d884a8..3a33abcd8 100644
--- a/lib/freetype/include/freetype/internal/services/svxf86nm.h
+++ b/lib/freetype/include/freetype/internal/services/svxf86nm.h
@@ -45,7 +45,7 @@ FT_BEGIN_HEADER
 
   /* */
 
-
+ 
 FT_END_HEADER
 
 
diff --git a/lib/freetype/vms_make.com b/lib/freetype/vms_make.com
index 1aa83e7e3..77eb1f479 100644
--- a/lib/freetype/vms_make.com
+++ b/lib/freetype/vms_make.com
@@ -1,6 +1,6 @@
 $! make Freetype2 under OpenVMS
 $!
-$! Copyright 2003, 2004, 2006, 2007 by
+$! Copyright 2003, 2004 by
 $! David Turner, Robert Wilhelm, and Werner Lemberg.
 $!
 $! This file is part of the FreeType project, and may only be used, modified,
@@ -15,24 +15,24 @@ $! config file VMSLIB.DAT. Please check the sample file, which is part of this
 $! distribution, for the information you need to provide
 $!
 $! This procedure currently does support the following commandline options
-$! in arbitrary order
+$! in arbitrary order 
 $!
-$! * DEBUG - Compile modules with /noopt/debug and link shareable image
+$! * DEBUG - Compile modules with /noopt/debug and link shareable image 
 $!           with /debug
 $! * LOPTS - Options to be passed to the link command
 $! * CCOPT - Options to be passed to the C compiler
 $!
 $! In case of problems with the install you might contact me at
-$! zinser@zinser.no-ip.info(preferred) or
+$! zinser@zinser.no-ip.info(preferred) or 
 $! zinser@sysdev.deutsche-boerse.com (work)
 $!
 $! Make procedure history for Freetype2
-$!
+$! 
 $!------------------------------------------------------------------------------
 $! Version history
 $! 0.01 20040401 First version to receive a number
 $! 0.02 20041030 Add error handling, Freetype 2.1.9
-$!
+$! 
 $ on error then goto err_exit
 $ true  = 1
 $ false = 0
@@ -57,7 +57,7 @@ $ optfile =  name + ".opt"
 $ s_case  = false
 $ liblist = ""
 $!
-$ whoami = f$parse(f$environment("Procedure"),,,,"NO_CONCEAL")
+$ whoami = f$parse(f$enviornment("Procedure"),,,,"NO_CONCEAL")
 $ mydef  = F$parse(whoami,,,"DEVICE")
 $ mydir  = f$parse(whoami,,,"DIRECTORY") - "]["
 $ myproc = f$parse(whoami,,,"Name") + f$parse(whoami,,,"type")
@@ -83,12 +83,12 @@ $ gosub check_create_vmslib
 $!
 $! Create objects
 $!
-$ if libdefs .nes. ""
-$ then
+$ if libdefs .nes. "" 
+$ then 
 $   ccopt = ccopt + "/define=(" + f$extract(0,f$length(libdefs)-1,libdefs) + ")"
 $ endif
 $!
-$ if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
+$ if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) - 
     then s_case = true
 $ gosub crea_mms
 $!
@@ -103,7 +103,7 @@ $  if (file .nes. "")
 $  then
 $    if f$locate("DEMOS",file) .eqs. f$length(file) then write optf file
 $    goto floop
-$  endif
+$  endif 
 $!
 $ close optf
 $!
@@ -117,7 +117,7 @@ $   call anal_obj_axp 'optfile' _link.opt
 $   open/append  optf 'optfile'
 $   if s_case then WRITE optf "case_sensitive=YES"
 $   close optf
-$   LINK_/NODEB/SHARE=[.lib]freetype2shr.exe -
+$   LINK_/NODEB/SHARE=[.lib]freetype2shr.exe - 
                             'optfile'/opt,libs.opt/opt,_link.opt/opt
 $ endif
 $!
@@ -143,7 +143,7 @@ $ exit 2
 $!
 $!------------------------------------------------------------------------------
 $!
-$! If MMS/MMK are available dump out the descrip.mms if required
+$! If MMS/MMK are available dump out the descrip.mms if required 
 $!
 $CREA_MMS:
 $ write sys$output "Creating descrip.mms files ..."
@@ -169,25 +169,25 @@ $ EOD
 $ write out "CFLAGS = ", ccopt
 $ copy sys$input: out
 $ deck
-
+ 
 
 all :
-        define freetype [--.include.freetype]
-        define psaux [-.psaux]
-        define autofit [-.autofit]
-        define autohint [-.autohint]
-        define base [-.base]
-        define cache [-.cache]
-        define cff [-.cff]
-        define cid [-.cid]
-        define pcf [-.pcf]
-        define psnames [-.psnames]
-        define raster [-.raster]
-        define sfnt [-.sfnt]
-        define smooth [-.smooth]
-        define truetype [-.truetype]
-        define type1 [-.type1]
-        define winfonts [-.winfonts]
+        define freetype [--.include.freetype] 
+        define psaux [-.psaux] 
+        define autofit [-.autofit] 
+        define autohint [-.autohint] 
+        define base [-.base] 
+        define cache [-.cache] 
+        define cff [-.cff] 
+        define cid [-.cid] 
+        define pcf [-.pcf] 
+        define psnames [-.psnames] 
+        define raster [-.raster] 
+        define sfnt [-.sfnt] 
+        define smooth [-.smooth] 
+        define truetype [-.truetype] 
+        define type1 [-.type1] 
+        define winfonts [-.winfonts] 
         if f$search("lib.dir") .eqs. "" then create/directory [.lib]
         set default [.builds.vms]
         $(MMS)$(MMSQUALIFIERS)
@@ -357,7 +357,7 @@ 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
+     ftbitmap.obj
 
 all : $(OBJS)
         library [--.lib]freetype.olb $(OBJS)
@@ -423,7 +423,7 @@ all : $(OBJS)
         library [--.lib]freetype.olb $(OBJS)
 
 ftcache.obj : ftcache.c ftcbasic.c ftccache.c ftccmap.c ftcglyph.c ftcimage.c \
-              ftcmanag.c ftcmru.c ftcsbits.c
+              ftcmanag.c ftcmru.c ftcsbits.c 
 
 # EOF
 $ eod
@@ -1015,41 +1015,41 @@ $     len   = f$length(cparm) - start
 $     ccopt = ccopt + f$extract(start,len,cparm)
 $   endif
 $   if cparm .eqs. "LINK" then linkonly = true
-$   if f$locate("LOPTS=",cparm) .lt. f$length(cparm)
+$   if f$locate("LOPTS=",cparm) .lt. f$length(cparm) 
 $   then
 $     start = f$locate("=",cparm) + 1
 $     len   = f$length(cparm) - start
 $     lopts = lopts + f$extract(start,len,cparm)
 $   endif
-$   if f$locate("CC=",cparm) .lt. f$length(cparm)
+$   if f$locate("CC=",cparm) .lt. f$length(cparm) 
 $   then
 $     start  = f$locate("=",cparm) + 1
 $     len    = f$length(cparm) - start
 $     cc_com = f$extract(start,len,cparm)
-      if (cc_com .nes. "DECC") .and. -
-         (cc_com .nes. "VAXC") .and. -
+      if (cc_com .nes. "DECC") .and. - 
+         (cc_com .nes. "VAXC") .and. - 
 	 (cc_com .nes. "GNUC")
 $     then
 $       write sys$output "Unsupported compiler choice ''cc_com' ignored"
 $       write sys$output "Use DECC, VAXC, or GNUC instead"
-$     else
-$     	if cc_com .eqs. "DECC" then its_decc = true
-$     	if cc_com .eqs. "VAXC" then its_vaxc = true
-$     	if cc_com .eqs. "GNUC" then its_gnuc = true
-$     endif
+$     else 
+$     	if cc_com .eqs. "DECC" then its_decc = true   
+$     	if cc_com .eqs. "VAXC" then its_vaxc = true   
+$     	if cc_com .eqs. "GNUC" then its_gnuc = true   
+$     endif 
 $   endif
-$   if f$locate("MAKE=",cparm) .lt. f$length(cparm)
+$   if f$locate("MAKE=",cparm) .lt. f$length(cparm) 
 $   then
 $     start  = f$locate("=",cparm) + 1
 $     len    = f$length(cparm) - start
 $     mmks = f$extract(start,len,cparm)
-$     if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")
+$     if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS") 
 $     then
 $       make = mmks
-$     else
+$     else 
 $       write sys$output "Unsupported make choice ''mmks' ignored"
 $       write sys$output "Use MMK or MMS instead"
-$     endif
+$     endif 
 $   endif
 $   i = i + 1
 $   goto opt_loop
@@ -1062,7 +1062,7 @@ $!
 $! Version history
 $! 0.01 20040220 First version to receive a number
 $! 0.02 20040229 Echo current procedure name; use general error exit handler
-$!               Remove xpm hack -> Replaced by more general dnsrl handling
+$!               Remove xpm hack -> Replaced by more general dnsrl handling 
 $CHECK_CREATE_VMSLIB:
 $!
 $ if f$search("VMSLIB.DAT") .eqs. ""
@@ -1078,18 +1078,18 @@ $   type/out=vmslib.dat sys$input
 !    - Lines starting with ! are treated as comments
 !    - Elements in a data line are separated by # signs
 !    - The elements need to be listed in the following order
-!      1.) Name of the Library (only used for informative messages
+!      1.) Name of the Library (only used for informative messages 
 !                               from vms_make.com)
 !      2.) Location where the object library can be found
 !      3.) Location where the include files for the library can be found
 !      4.) Include file used to verify library location
-!      5.) CPP define to pass to the build to indicate availability of
+!      5.) CPP define to pass to the build to indicate availability of 
 !          the library
 !
-! Example: The following lines show how definitions
-!          might look like. They are site specific and the locations of the
+! Example: The following lines show how definitions  
+!          might look like. They are site specific and the locations of the 
 !          library and include files need almost certainly to be changed.
-!
+! 
 ! Location: All of the libaries can be found at the following addresses
 !
 !   ZLIB:     http://zinser.no-ip.info/vms/sw/zlib.htmlx
@@ -1101,7 +1101,7 @@ $   write sys$output "and afterwards re-execute ''myproc'"
 $   goto err_exit
 $ endif
 $!
-$! Init symbols used to hold CPP definitions and include path
+$! Init symbols used to hold CPP definitons and include path
 $!
 $ libdefs = ""
 $ libincs = ""
@@ -1159,7 +1159,7 @@ $   if ((f$search("freetype:freetype.h") .nes. "") .and. -
 $   then
 $     write sys$output "Will use local definition of freetype logical"
 $   else
-$     ft2elem = 0
+$     ft2elem = 0 
 $FT2_LOOP:
 $     ft2srcdir = f$element(ft2elem,",",libsrc)
 $     if f$search("''ft2srcdir'''testinc'") .nes. ""
@@ -1185,7 +1185,7 @@ $     else
 $       ft2elem = ft2elem + 1
 $       goto ft2_loop
 $     endif
-$   endif
+$   endif	 
 $ endif
 $ goto LIB_LOOP
 $END_LIB:
@@ -1193,7 +1193,7 @@ $ close libdata
 $ return
 $!------------------------------------------------------------------------------
 $!
-$! Analyze Object files for OpenVMS AXP to extract Procedure and Data
+$! Analyze Object files for OpenVMS AXP to extract Procedure and Data 
 $! information to build a symbol vector for a shareable image
 $! All the "brains" of this logic was suggested by Hartmut Becker
 $! (Hartmut.Becker@compaq.com). All the bugs were introduced by me
@@ -1203,10 +1203,10 @@ $!
 $! Version history
 $! 0.01 20040006 Skip over shareable images in option file
 $!
-$ ANAL_OBJ_AXP: Subroutine
+$ ANAL_OBJ_AXP: Subroutine   
 $ V = 'F$Verify(0)
 $ SAY := "WRITE_ SYS$OUTPUT"
-$
+$ 
 $ IF F$SEARCH("''P1'") .EQS. ""
 $ THEN
 $    SAY "ANAL_OBJ_AXP-E-NOSUCHFILE:  Error, inputfile ''p1' not available"
@@ -1283,4 +1283,4 @@ $!
 $ close libsf
 $ EXIT_AA:
 $ if V then set verify
-$ endsubroutine
+$ endsubroutine