commit bae491c03a00757d83ede8d855b7d85d246bde3d
author Fabrice Di Meglio <fdimeglio@google.com> Thu Oct 20 15:12:23 2011 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Thu Oct 20 15:14:33 2011 -0700
tree c834dace4d8d0cf7e0ba884848604fee801309a2
parent 5deafc828f0892d6c75f12067bc366cc70475802

Fix Harfbuzz hb_utf16_script_run_prev()

- fix the condition for setting the script

Change-Id: Id8d7da34bad485d2e0a1e34cc7ebb831a73a6be6

contrib/harfbuzz-unicode.c

diff --git a/contrib/harfbuzz-unicode.c b/contrib/harfbuzz-unicode.c
index 2953a85..0a34b65 100755
--- a/contrib/harfbuzz-unicode.c
+++ b/contrib/harfbuzz-unicode.c
@@ -164,7 +164,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;