|
@@ -137,7 +137,7 @@ static int readTuple (const char* end, Str tuple[]) {
|
|
}
|
|
}
|
|
|
|
|
|
static char* mallocString (Str* str) {
|
|
static char* mallocString (Str* str) {
|
|
- int length = str->end - str->begin;
|
|
|
|
|
|
+ int length = (int)(str->end - str->begin);
|
|
char* string = MALLOC(char, length + 1);
|
|
char* string = MALLOC(char, length + 1);
|
|
memcpy(string, str->begin, length);
|
|
memcpy(string, str->begin, length);
|
|
string[length] = '\0';
|
|
string[length] = '\0';
|
|
@@ -145,7 +145,7 @@ static char* mallocString (Str* str) {
|
|
}
|
|
}
|
|
|
|
|
|
static int indexOf (const char** array, int count, Str* str) {
|
|
static int indexOf (const char** array, int count, Str* str) {
|
|
- int length = str->end - str->begin;
|
|
|
|
|
|
+ int length = (int)(str->end - str->begin);
|
|
int i;
|
|
int i;
|
|
for (i = count - 1; i >= 0; i--)
|
|
for (i = count - 1; i >= 0; i--)
|
|
if (strncmp(array[i], str->begin, length) == 0) return i;
|
|
if (strncmp(array[i], str->begin, length) == 0) return i;
|
|
@@ -172,7 +172,7 @@ static const char* textureFilterNames[] = {"Nearest", "Linear", "MipMap", "MipMa
|
|
spAtlas* spAtlas_readAtlas (const char* begin, int length, const char* dir) {
|
|
spAtlas* spAtlas_readAtlas (const char* begin, int length, const char* dir) {
|
|
int count;
|
|
int count;
|
|
const char* end = begin + length;
|
|
const char* end = begin + length;
|
|
- int dirLength = strlen(dir);
|
|
|
|
|
|
+ int dirLength = (int)strlen(dir);
|
|
int needsSlash = dirLength > 0 && dir[dirLength - 1] != '/' && dir[dirLength - 1] != '\\';
|
|
int needsSlash = dirLength > 0 && dir[dirLength - 1] != '/' && dir[dirLength - 1] != '\\';
|
|
|
|
|
|
spAtlas* self = NEW(spAtlas);
|
|
spAtlas* self = NEW(spAtlas);
|