commit aff4dbb0ae33e55785d1a11f93c1e20ebfed4a90
author Doug Zongker <dougz@google.com> Wed Aug 29 15:57:01 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 29 15:57:02 2012 -0700
tree 13812661982fda40e2261c45ce25e8c68856701c
parent d52ef348d5abb65cd067be334d37c86d621786b9
parent 8b240ccca1ad32cbd09d3807614f3086914ceaaf

Merge "recovery locale handling fixes" into jb-mr1-dev

Android.mk

diff --git a/Android.mk b/Android.mk
index 1c78b42..215cfe5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,6 +47,7 @@
     libpng \
     libcutils \
     libstdc++ \
+    libm \
     libc
 
 ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)

minui/resources.c

diff --git a/minui/resources.c b/minui/resources.c
index b5c9951..ac7bdac 100644
--- a/minui/resources.c
+++ b/minui/resources.c
@@ -40,7 +40,7 @@
 // need this functionality (it's used for gamma adjustment) so provide
 // a dummy implementation to satisfy the linker.
 double pow(double x, double y) {
-    return x;
+    return x * y;
 }
 
 int res_create_surface(const char* name, gr_surface* pSurface) {
@@ -132,7 +132,7 @@
         alpha = 1;
     }
 
-    int y;
+    unsigned int y;
     if (channels == 3 || (channels == 1 && !alpha)) {
         for (y = 0; y < height; ++y) {
             unsigned char* pRow = pData + y * stride;