diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-24 13:06:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-24 13:06:43 -0700 |
| commit | d52ef348d5abb65cd067be334d37c86d621786b9 (patch) | |
| tree | 8c302aa2a52ead068abaf33642c203c22c5f22b0 /minui | |
| parent | 3474ab2888838e512c6bcff588fa88f02c81135f (diff) | |
| parent | bddbb5b370d925d6e5ae62d560f5e7ad09a6ffac (diff) | |
| download | bootable_recovery-d52ef348d5abb65cd067be334d37c86d621786b9.zip bootable_recovery-d52ef348d5abb65cd067be334d37c86d621786b9.tar.gz bootable_recovery-d52ef348d5abb65cd067be334d37c86d621786b9.tar.bz2 | |
am bddbb5b3: Merge "Fixing trivial warnings for libminui"
* commit 'bddbb5b370d925d6e5ae62d560f5e7ad09a6ffac':
Fixing trivial warnings for libminui
Diffstat (limited to 'minui')
| -rw-r--r-- | minui/resources.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/minui/resources.c b/minui/resources.c index af8720a..60f3542 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; |