summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-24 23:19:19 +0200
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-24 23:19:19 +0200
commitb5f4261a220122485dfe4ed452149a964ddb515c (patch)
tree8c302aa2a52ead068abaf33642c203c22c5f22b0
parentam 3474ab28: Merge "Add libm due to libpng dependency." into jb-mr1-dev (diff)
parentam bddbb5b3: Merge "Fixing trivial warnings for libminui" (diff)
downloadandroid_bootable_recovery-b5f4261a220122485dfe4ed452149a964ddb515c.tar
android_bootable_recovery-b5f4261a220122485dfe4ed452149a964ddb515c.tar.gz
android_bootable_recovery-b5f4261a220122485dfe4ed452149a964ddb515c.tar.bz2
android_bootable_recovery-b5f4261a220122485dfe4ed452149a964ddb515c.tar.lz
android_bootable_recovery-b5f4261a220122485dfe4ed452149a964ddb515c.tar.xz
android_bootable_recovery-b5f4261a220122485dfe4ed452149a964ddb515c.tar.zst
android_bootable_recovery-b5f4261a220122485dfe4ed452149a964ddb515c.zip
-rw-r--r--minui/resources.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/minui/resources.c b/minui/resources.c
index af8720a56..60f354254 100644
--- a/minui/resources.c
+++ b/minui/resources.c
@@ -40,7 +40,7 @@ extern char* locale;
// 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 @@ int res_create_surface(const char* name, gr_surface* pSurface) {
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;