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"

contrib/harfbuzz-unicode.c

diff --git a/contrib/harfbuzz-unicode.c b/contrib/harfbuzz-unicode.c
index 0a34b65..6b4778c 100755
--- a/contrib/harfbuzz-unicode.c
+++ b/contrib/harfbuzz-unicode.c
@@ -114,7 +114,10 @@
     const HB_Script script = code_point_to_script(cp);
 
     if (script != current_script) {
-      if (current_script == init_script == HB_Script_Inherited) {
+        /* BEGIN android-changed
+           The condition was not correct by doing "a == b == constant"
+           END android-changed */
+      if (current_script == HB_Script_Inherited && init_script == HB_Script_Inherited) {
         // If we started off as inherited, we take whatever we can find.
         output->script = script;
         current_script = script;