commit 11de741c46a0583ba50dd912158b5c41f929bd7b
author Russell Brenner <russellbrenner@google.com> Wed Dec 14 13:16:51 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 14 13:16:51 2011 -0800
tree 3028b080cbe3e0c166ade2ccdc8615561759b420
parent 873b7b3e703e0f228f8d2d12896def00e281adf2
parent c8f4ca0ba9aee81cc4578386149056779e94be2a

Merge "Fix double comparison"

src/harfbuzz-indic.cpp

diff --git a/src/harfbuzz-indic.cpp b/src/harfbuzz-indic.cpp
index 4d8418b..038160e 100755
--- a/src/harfbuzz-indic.cpp
+++ b/src/harfbuzz-indic.cpp
@@ -37,7 +37,10 @@
                      FLAG(HB_Letter_Titlecase) |
                      FLAG(HB_Letter_Modifier) |
                      FLAG(HB_Letter_Other);
-    return FLAG(HB_GetUnicodeCharCategory(ucs)) & test;
+    // BEGIN android-changed
+    // Check the value is zero or not instead of casting int to HB_Bool(unsigned char).
+    return (FLAG(HB_GetUnicodeCharCategory(ucs)) & test) != 0;
+    // END android-changed
 }
 
 static HB_Bool isMark(HB_UChar16 ucs)
@@ -45,7 +48,10 @@
     const int test = FLAG(HB_Mark_NonSpacing) |
                      FLAG(HB_Mark_SpacingCombining) |
                      FLAG(HB_Mark_Enclosing);
-    return FLAG(HB_GetUnicodeCharCategory(ucs)) & test;
+    // BEGIN android-changed
+    // Check the value is zero or not instead of casting int to HB_Bool(unsigned char).
+    return (FLAG(HB_GetUnicodeCharCategory(ucs)) & test) != 0;
+    // END android-changed
 }
 
 enum Form {