[HarfBuzz] harfbuzz: Branch 'master'

[Lars Knoll]

 contrib/harfbuzz-unicode-tables.c |    2 +-
 src/harfbuzz-external.h           |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit d10a264823e81631336bab37f08a52cc243d3654
Author: Lars Knoll <lars.knoll at nokia.com>
Date:   Wed Jul 13 13:28:14 2011 +0200

    remove NoCategory from HB_CharCategory
    
    The enum value doesn't make sense, HB_Other_NotAssigned
    should be used for unassigned characters.

diff --git a/contrib/harfbuzz-unicode-tables.c b/contrib/harfbuzz-unicode-tables.c
index 3c3fead..7cf6056 100644
--- a/contrib/harfbuzz-unicode-tables.c
+++ b/contrib/harfbuzz-unicode-tables.c
@@ -65,7 +65,7 @@ code_point_to_category(HB_UChar32 cp) {
                               sizeof(struct category_property),
                               category_property_cmp);
   if (!vprop)
-    return HB_NoCategory;
+    return HB_Other_NotAssigned;
 
   return ((const struct category_property *) vprop)->category;
 }
diff --git a/src/harfbuzz-external.h b/src/harfbuzz-external.h
index 7644f0d..5fff35f 100644
--- a/src/harfbuzz-external.h
+++ b/src/harfbuzz-external.h
@@ -52,8 +52,6 @@ typedef enum {
 
 typedef enum 
 {
-    HB_NoCategory,
-
     HB_Mark_NonSpacing,          /*   Mn */
     HB_Mark_SpacingCombining,    /*   Mc */
     HB_Mark_Enclosing,           /*   Me */