aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-24 13:00:02 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-08-24 13:00:02 -0700
commitbddbb5b370d925d6e5ae62d560f5e7ad09a6ffac (patch)
tree0097050939c367599ed4ca3d120588079e30dcb0
parent6a693d57687a18f8e032293b71ca98882a78c93d (diff)
parentedc5d17096bd1a69fee0f3470a2af4fe46969bec (diff)
downloadbootable_recovery-bddbb5b370d925d6e5ae62d560f5e7ad09a6ffac.zip
bootable_recovery-bddbb5b370d925d6e5ae62d560f5e7ad09a6ffac.tar.gz
bootable_recovery-bddbb5b370d925d6e5ae62d560f5e7ad09a6ffac.tar.bz2
Merge "Fixing trivial warnings for libminui"
-rw-r--r--minui/resources.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/minui/resources.c b/minui/resources.c
index b437a87..5e20621 100644
--- a/minui/resources.c
+++ b/minui/resources.c
@@ -38,7 +38,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) {
@@ -130,7 +130,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;