Merge "Fixing trivial warnings for libminui"

This commit is contained in:
Jean-Baptiste Queru 2012-08-24 13:00:02 -07:00 committed by android code review
commit bddbb5b370

View file

@ -38,7 +38,7 @@
// need this functionality (it's used for gamma adjustment) so provide // need this functionality (it's used for gamma adjustment) so provide
// a dummy implementation to satisfy the linker. // a dummy implementation to satisfy the linker.
double pow(double x, double y) { double pow(double x, double y) {
return x; return x * y;
} }
int res_create_surface(const char* name, gr_surface* pSurface) { 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; alpha = 1;
} }
int y; unsigned int y;
if (channels == 3 || (channels == 1 && !alpha)) { if (channels == 3 || (channels == 1 && !alpha)) {
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
unsigned char* pRow = pData + y * stride; unsigned char* pRow = pData + y * stride;