am bddbb5b3: Merge "Fixing trivial warnings for libminui"

* commit 'bddbb5b370d925d6e5ae62d560f5e7ad09a6ffac':
  Fixing trivial warnings for libminui
This commit is contained in:
Jean-Baptiste Queru 2012-08-24 13:06:43 -07:00 committed by Android Git Automerger
commit d52ef348d5

View file

@ -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;