Minor warning fixes.

This commit is contained in:
Unknown W. Brackets
2013-03-15 08:10:34 -07:00
parent 1ec67d5ac2
commit e572fac401
3 changed files with 9 additions and 1 deletions
+1 -1
View File
@@ -46,7 +46,7 @@ void gl_lost() {
}
ILOG("gl_lost() restoring %i items:", (int)holders->size());
for (size_t i = 0; i < holders->size(); i++) {
ILOG("GLLost(%i, %p)", i, holders->size(), (*holders)[i]);
ILOG("GLLost(%i / %i, %p)", (int) i, (int) holders->size(), (*holders)[i]);
(*holders)[i]->GLLost();
}
ILOG("gl_lost() completed restoring %i items:", (int)holders->size());
+2
View File
@@ -47,6 +47,8 @@ uint8_t *generateTexture(const char *filename, int &bpp, int &w, int &h, bool &c
data[y*w + x] = val * 255;
}
}
} else {
data = NULL;
}
return data;
+6
View File
@@ -100,6 +100,12 @@ int LoadZIMPtr(uint8_t *zim, int datasize, int *width, int *height, int *flags,
total_data_size += image_data_size[i];
}
if (total_data_size == 0)
{
ELOG("Invalid ZIM data size 0");
return 0;
}
image[0] = (uint8 *)malloc(total_data_size);
for (int i = 1; i < num_levels; i++) {
image[i] = image[i-1] + image_data_size[i-1];