commit 9c1c205931311d576442b5025391d851b22afccb
author Colin Cross <ccross@android.com> Thu Apr 26 16:37:45 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 26 16:37:45 2012 -0700
tree 0013d0acf0d32b24aab7ab580e2358cdba6b3091
parent a9aa02cc4cf7520aa2f4348235e3ff637fe024f3
parent 5b3eb07ed730f9765c93afcb7f49559c212fe533

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

* commit '5b3eb07ed730f9765c93afcb7f49559c212fe533':
  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;
 }