[HarfBuzz] harfbuzz: Branch 'master'

[Simon Hausmann]

 src/harfbuzz-gdef.h   |    4 ----
 src/harfbuzz-global.h |   14 +++++++++++++-
 src/harfbuzz-gpos.h   |    4 ----
 src/harfbuzz-gsub.h   |    4 ----
 src/harfbuzz-open.h   |    8 --------
 5 files changed, 13 insertions(+), 21 deletions(-)

New commits:
diff-tree bd934100d788f70300ffb1934b4164abf1b6b2b7 (from 69dd290d3ce68119161f353b94c9cc2d6a817019)
Author: Simon Hausmann <shausman at trolltech.com>
Date:   Tue Jul 31 16:14:25 2007 +0200

    Moved all HB_Err macros into the HB_Error enum.

diff --git a/src/harfbuzz-gdef.h b/src/harfbuzz-gdef.h
index c7fc7f7..d63f2df 100644
--- a/src/harfbuzz-gdef.h
+++ b/src/harfbuzz-gdef.h
@@ -18,10 +18,6 @@
 
 HB_BEGIN_HEADER
 
-#define HB_Err_Invalid_GDEF_SubTable_Format  0x1030
-#define HB_Err_Invalid_GDEF_SubTable         0x1031
-
-
 /* GDEF glyph properties.  Note that HB_GDEF_COMPONENT has no corresponding
  * flag in the LookupFlag field.     */
 #define HB_GDEF_BASE_GLYPH  0x0002
diff --git a/src/harfbuzz-global.h b/src/harfbuzz-global.h
index 0bd01c9..7910e96 100644
--- a/src/harfbuzz-global.h
+++ b/src/harfbuzz-global.h
@@ -67,7 +67,19 @@ typedef enum {
     HB_Err_Invalid_Argument,
     HB_Err_Out_Of_Memory,
     HB_Err_Invalid_Face_Handle, 
-    HB_Err_Table_Missing
+    HB_Err_Table_Missing,
+    HB_Err_Invalid_SubTable_Format  = 0x1000,
+    HB_Err_Invalid_SubTable         = 0x1001,
+    HB_Err_Not_Covered              = 0x1002,
+    HB_Err_Too_Many_Nested_Contexts = 0x1003,
+    HB_Err_No_MM_Interpreter        = 0x1004,
+    HB_Err_Empty_Script             = 0x1005,
+    HB_Err_Invalid_GSUB_SubTable_Format = 0x1010,
+    HB_Err_Invalid_GSUB_SubTable        = 0x1011,
+    HB_Err_Invalid_GPOS_SubTable_Format = 0x1020,
+    HB_Err_Invalid_GPOS_SubTable        = 0x1021,
+    HB_Err_Invalid_GDEF_SubTable_Format = 0x1030,
+    HB_Err_Invalid_GDEF_SubTable        = 0x1031
 } HB_Error;
 
 typedef struct {
diff --git a/src/harfbuzz-gpos.h b/src/harfbuzz-gpos.h
index 24d95b6..4344367 100644
--- a/src/harfbuzz-gpos.h
+++ b/src/harfbuzz-gpos.h
@@ -18,10 +18,6 @@
 
 HB_BEGIN_HEADER
 
-#define HB_Err_Invalid_GPOS_SubTable_Format  0x1020
-#define HB_Err_Invalid_GPOS_SubTable         0x1021
-
-
 /* Lookup types for glyph positioning */
 
 #define HB_GPOS_LOOKUP_SINGLE     1
diff --git a/src/harfbuzz-gsub.h b/src/harfbuzz-gsub.h
index c263bcc..867d59d 100644
--- a/src/harfbuzz-gsub.h
+++ b/src/harfbuzz-gsub.h
@@ -18,10 +18,6 @@
 
 HB_BEGIN_HEADER
 
-#define HB_Err_Invalid_GSUB_SubTable_Format  0x1010
-#define HB_Err_Invalid_GSUB_SubTable         0x1011
-
-
 /* Lookup types for glyph substitution */
 
 #define HB_GSUB_LOOKUP_SINGLE        1
diff --git a/src/harfbuzz-open.h b/src/harfbuzz-open.h
index 69dc082..a3287a3 100644
--- a/src/harfbuzz-open.h
+++ b/src/harfbuzz-open.h
@@ -24,14 +24,6 @@ HB_BEGIN_HEADER
 
 #define HB_MAX_NESTING_LEVEL             100
 
-#define HB_Err_Invalid_SubTable_Format   0x1000
-#define HB_Err_Invalid_SubTable          0x1001
-#define HB_Err_Not_Covered               0x1002
-#define HB_Err_Too_Many_Nested_Contexts  0x1003
-#define HB_Err_No_MM_Interpreter         0x1004
-#define HB_Err_Empty_Script              0x1005
-
-
 /* Script list related structures */
 
 struct  HB_LangSys_