commit e860d239529a484021d779d391c823ca93323ae1
author Colin Cross <ccross@android.com> Thu Apr 26 16:40:35 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 26 16:40:35 2012 -0700
tree edf6b97d84ea6a72cf99f6cdde8e826ee0529277
parent 1875930a9d24f2b97650bf511c52d197ba0d44d6
parent 9c1c205931311d576442b5025391d851b22afccb

am 9c1c2059: am 5b3eb07e: Merge "Prevent bit shifting if num bits is negative"

* commit '9c1c205931311d576442b5025391d851b22afccb':
  Prevent bit shifting if num bits is negative

libpixelflinger/fixed.cpp

diff --git a/libpixelflinger/fixed.cpp b/libpixelflinger/fixed.cpp
index 5b92062..5094537 100644
--- a/libpixelflinger/fixed.cpp
+++ b/libpixelflinger/fixed.cpp
@@ -62,7 +62,8 @@
     int shift;
     x = gglRecipQNormalized(x, &shift);
     shift += 16-q;
-    x += 1L << (shift-1);   // rounding
+    if (shift > 0)
+        x += 1L << (shift-1);   // rounding
     x >>= shift;
     return x;
 }