Commit 510b85522cd6ee8e70285167ebf1300fffdc0f04

Werner Lemberg 2004-08-30T05:27:57

* include/freetype/tttags.h (TTAG_BASE, TTAG_GDEF, TTAG_GPOS, TTAG_JSTF): New tags. * include/freetype/fttypes.h (FT_Bytes, FT_Tag): New typedefs. (FT_Int): Add `signed'.

diff --git a/ChangeLog b/ChangeLog
index 3d8a4e4..56544f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-30  Werner Lemberg  <wl@gnu.org>
+
+	* include/freetype/tttags.h (TTAG_BASE, TTAG_GDEF, TTAG_GPOS,
+	TTAG_JSTF): New tags.
+
+	* include/freetype/fttypes.h (FT_Bytes, FT_Tag): New typedefs.
+	(FT_Int): Add `signed'.
+
 2004-08-29  Werner Lemberg  <wl@gnu.org>
 
 	* src/otlayout/otlgpos.c (otl_gpos_subtable_validate): Add argument
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index 2782f74..b2da13e 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -49,6 +49,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Order>                                                               */
   /*    FT_Byte                                                            */
+  /*    FT_Bytes                                                           */
   /*    FT_Char                                                            */
   /*    FT_Int                                                             */
   /*    FT_UInt                                                            */
@@ -60,6 +61,7 @@ FT_BEGIN_HEADER
   /*    FT_Offset                                                          */
   /*    FT_PtrDist                                                         */
   /*    FT_String                                                          */
+  /*    FT_Tag                                                             */
   /*    FT_Error                                                           */
   /*    FT_Fixed                                                           */
   /*    FT_Pointer                                                         */
@@ -146,6 +148,28 @@ FT_BEGIN_HEADER
   /*************************************************************************/
   /*                                                                       */
   /* <Type>                                                                */
+  /*    FT_Bytes                                                           */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for constant memory areas.                               */
+  /*                                                                       */
+  typedef const FT_Byte*  FT_Bytes;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
+  /*    FT_Tag                                                             */
+  /*                                                                       */
+  /* <Description>                                                         */
+  /*    A typedef for 32bit tags (as used in the SFNT format).             */
+  /*                                                                       */
+  typedef FT_UInt32  FT_Tag;
+
+
+  /*************************************************************************/
+  /*                                                                       */
+  /* <Type>                                                                */
   /*    FT_String                                                          */
   /*                                                                       */
   /* <Description>                                                         */
@@ -184,7 +208,7 @@ FT_BEGIN_HEADER
   /* <Description>                                                         */
   /*    A typedef for the int type.                                        */
   /*                                                                       */
-  typedef int  FT_Int;
+  typedef signed int  FT_Int;
 
 
   /*************************************************************************/
diff --git a/include/freetype/tttags.h b/include/freetype/tttags.h
index a6876d4..9fee71b 100644
--- a/include/freetype/tttags.h
+++ b/include/freetype/tttags.h
@@ -2,7 +2,7 @@
 /*                                                                         */
 /*  tttags.h                                                               */
 /*                                                                         */
-/*    Tags for TrueType tables (specification only).                       */
+/*    Tags for TrueType and OpenType tables (specification only).          */
 /*                                                                         */
 /*  Copyright 1996-2001, 2004 by                                           */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
@@ -34,6 +34,7 @@ FT_BEGIN_HEADER
 
 
 #define TTAG_avar  FT_MAKE_TAG( 'a', 'v', 'a', 'r' )
+#define TTAG_BASE  FT_MAKE_TAG( 'B', 'A', 'S', 'E' )
 #define TTAG_bdat  FT_MAKE_TAG( 'b', 'd', 'a', 't' )
 #define TTAG_bhed  FT_MAKE_TAG( 'b', 'h', 'e', 'd' )
 #define TTAG_bloc  FT_MAKE_TAG( 'b', 'l', 'o', 'c' )
@@ -48,13 +49,16 @@ FT_BEGIN_HEADER
 #define TTAG_fpgm  FT_MAKE_TAG( 'f', 'p', 'g', 'm' )
 #define TTAG_fvar  FT_MAKE_TAG( 'f', 'v', 'a', 'r' )
 #define TTAG_gasp  FT_MAKE_TAG( 'g', 'a', 's', 'p' )
+#define TTAG_GDEF  FT_MAKE_TAG( 'G', 'D', 'E', 'F' )
 #define TTAG_glyf  FT_MAKE_TAG( 'g', 'l', 'y', 'f' )
+#define TTAG_GPOS  FT_MAKE_TAG( 'G', 'P', 'O', 'S' )
 #define TTAG_GSUB  FT_MAKE_TAG( 'G', 'S', 'U', 'B' )
 #define TTAG_gvar  FT_MAKE_TAG( 'g', 'v', 'a', 'r' )
 #define TTAG_hdmx  FT_MAKE_TAG( 'h', 'd', 'm', 'x' )
 #define TTAG_head  FT_MAKE_TAG( 'h', 'e', 'a', 'd' )
 #define TTAG_hhea  FT_MAKE_TAG( 'h', 'h', 'e', 'a' )
 #define TTAG_hmtx  FT_MAKE_TAG( 'h', 'm', 't', 'x' )
+#define TTAG_JSTF  FT_MAKE_TAG( 'J', 'S', 'T', 'F' )
 #define TTAG_kern  FT_MAKE_TAG( 'k', 'e', 'r', 'n' )
 #define TTAG_loca  FT_MAKE_TAG( 'l', 'o', 'c', 'a' )
 #define TTAG_LTSH  FT_MAKE_TAG( 'L', 'T', 'S', 'H' )