asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some comparisons between signed and unsigned integers

Browse source
This commit is contained in:
Johan Manuel 2016-07-26 15:05:30 +02:00
parent 67b29e3b9e
commit a4674bda47
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/png/image_loader_png.cpp
View file

@ -270,7 +270,7 @@ static void user_read_data(png_structp png_ptr,png_bytep data, png_size_t p_leng
PNGReadStatus *rstatus; PNGReadStatus *rstatus;
rstatus=(PNGReadStatus*)png_get_io_ptr(png_ptr); rstatus=(PNGReadStatus*)png_get_io_ptr(png_ptr);
int to_read=p_length; png_size_t to_read=p_length;
if (rstatus->size>=0) { if (rstatus->size>=0) {
to_read = MIN( p_length, rstatus->size - rstatus->offset); to_read = MIN( p_length, rstatus->size - rstatus->offset);
} }

4
modules/gdscript/gd_tokenizer.cpp
View file

@ -1322,7 +1322,7 @@ StringName GDTokenizerBuffer::get_token_identifier(int p_offset) const{
ERR_FAIL_INDEX_V(offset,tokens.size(),StringName()); ERR_FAIL_INDEX_V(offset,tokens.size(),StringName());
uint32_t identifier = tokens[offset]>>TOKEN_BITS; uint32_t identifier = tokens[offset]>>TOKEN_BITS;
ERR_FAIL_INDEX_V(identifier,identifiers.size(),StringName()); ERR_FAIL_INDEX_V(identifier,(uint32_t)identifiers.size(),StringName());
return identifiers[identifier]; return identifiers[identifier];
} }
@ -1381,7 +1381,7 @@ const Variant& GDTokenizerBuffer::get_token_constant(int p_offset) const{
int offset = token+p_offset; int offset = token+p_offset;
ERR_FAIL_INDEX_V(offset,tokens.size(),nil); ERR_FAIL_INDEX_V(offset,tokens.size(),nil);
uint32_t constant = tokens[offset]>>TOKEN_BITS; uint32_t constant = tokens[offset]>>TOKEN_BITS;
ERR_FAIL_INDEX_V(constant,constants.size(),nil); ERR_FAIL_INDEX_V(constant,(uint32_t)constants.size(),nil);
return constants[constant]; return constants[constant];
} }

22
platform/android/export/export.cpp
View file

@ -495,7 +495,7 @@ static String _parse_string(const uint8_t *p_bytes,bool p_utf8) {
Vector<uint8_t> str8; Vector<uint8_t> str8;
str8.resize(len+1); str8.resize(len+1);
for(int i=0;i<len;i++) { for(uint32_t i=0;i<len;i++) {
str8[i]=p_bytes[offset+i]; str8[i]=p_bytes[offset+i];
} }
str8[len]=0; str8[len]=0;
@ -505,7 +505,7 @@ static String _parse_string(const uint8_t *p_bytes,bool p_utf8) {
} else { } else {
String str; String str;
for(int i=0;i<len;i++) { for(uint32_t i=0;i<len;i++) {
CharType c = decode_uint16(&p_bytes[offset+i*2]); CharType c = decode_uint16(&p_bytes[offset+i*2]);
if (c==0) if (c==0)
break; break;
@ -535,7 +535,7 @@ void EditorExportPlatformAndroid::_fix_resources(Vector<uint8_t>& p_manifest) {
printf("stirng count: %i\n",string_count); printf("stirng count: %i\n",string_count);
printf("flags: %x\n",string_flags); printf("flags: %x\n",string_flags);
for(int i=0;i<string_count;i++) { for(uint32_t i=0;i<string_count;i++) {
uint32_t offset = decode_uint32(&p_manifest[string_table_begins+i*4]); uint32_t offset = decode_uint32(&p_manifest[string_table_begins+i*4]);
offset+=string_table_begins+string_count*4; offset+=string_table_begins+string_count*4;
@ -569,7 +569,7 @@ void EditorExportPlatformAndroid::_fix_resources(Vector<uint8_t>& p_manifest) {
Vector<uint8_t> ret; Vector<uint8_t> ret;
ret.resize(string_table_begins+string_table.size()*4); ret.resize(string_table_begins+string_table.size()*4);
for(int i=0;i<string_table_begins;i++) { for(uint32_t i=0;i<string_table_begins;i++) {
ret[i]=p_manifest[i]; ret[i]=p_manifest[i];
} }
@ -672,7 +672,7 @@ void EditorExportPlatformAndroid::_fix_manifest(Vector<uint8_t>& p_manifest,bool
uint32_t string_table_ends; uint32_t string_table_ends;
Vector<uint8_t> stable_extra; Vector<uint8_t> stable_extra;
while(ofs < p_manifest.size()) { while(ofs < (uint32_t)p_manifest.size()) {
uint32_t chunk = decode_uint32(&p_manifest[ofs]); uint32_t chunk = decode_uint32(&p_manifest[ofs]);
uint32_t size = decode_uint32(&p_manifest[ofs+4]); uint32_t size = decode_uint32(&p_manifest[ofs+4]);
@ -703,7 +703,7 @@ void EditorExportPlatformAndroid::_fix_manifest(Vector<uint8_t>& p_manifest,bool
string_table_begins=st_offset; string_table_begins=st_offset;
for(int i=0;i<string_count;i++) { for(uint32_t i=0;i<string_count;i++) {
uint32_t string_at = decode_uint32(&p_manifest[st_offset+i*4]); uint32_t string_at = decode_uint32(&p_manifest[st_offset+i*4]);
string_at+=st_offset+string_count*4; string_at+=st_offset+string_count*4;
@ -719,7 +719,7 @@ void EditorExportPlatformAndroid::_fix_manifest(Vector<uint8_t>& p_manifest,bool
uint32_t len = decode_uint16(&p_manifest[string_at]); uint32_t len = decode_uint16(&p_manifest[string_at]);
Vector<CharType> ucstring; Vector<CharType> ucstring;
ucstring.resize(len+1); ucstring.resize(len+1);
for(int j=0;j<len;j++) { for(uint32_t j=0;j<len;j++) {
uint16_t c=decode_uint16(&p_manifest[string_at+2+2*j]); uint16_t c=decode_uint16(&p_manifest[string_at+2+2*j]);
ucstring[j]=c; ucstring[j]=c;
} }
@ -732,7 +732,7 @@ void EditorExportPlatformAndroid::_fix_manifest(Vector<uint8_t>& p_manifest,bool
// print_line("String "+itos(i)+": "+string_table[i]); // print_line("String "+itos(i)+": "+string_table[i]);
} }
for(int i=string_end;i<(ofs+size);i++) { for(uint32_t i=string_end;i<(ofs+size);i++) {
stable_extra.push_back(p_manifest[i]); stable_extra.push_back(p_manifest[i]);
} }
@ -758,7 +758,7 @@ void EditorExportPlatformAndroid::_fix_manifest(Vector<uint8_t>& p_manifest,bool
uint32_t attrcount=decode_uint32(&p_manifest[iofs+20]); uint32_t attrcount=decode_uint32(&p_manifest[iofs+20]);
iofs+=28; iofs+=28;
//printf("ATTRCOUNT: %x\n",attrcount); //printf("ATTRCOUNT: %x\n",attrcount);
for(int i=0;i<attrcount;i++) { for(uint32_t i=0;i<attrcount;i++) {
uint32_t attr_nspace=decode_uint32(&p_manifest[iofs]); uint32_t attr_nspace=decode_uint32(&p_manifest[iofs]);
uint32_t attr_name=decode_uint32(&p_manifest[iofs+4]); uint32_t attr_name=decode_uint32(&p_manifest[iofs+4]);
uint32_t attr_value=decode_uint32(&p_manifest[iofs+8]); uint32_t attr_value=decode_uint32(&p_manifest[iofs+8]);
@ -883,7 +883,7 @@ void EditorExportPlatformAndroid::_fix_manifest(Vector<uint8_t>& p_manifest,bool
Vector<uint8_t> ret; Vector<uint8_t> ret;
ret.resize(string_table_begins+string_table.size()*4); ret.resize(string_table_begins+string_table.size()*4);
for(int i=0;i<string_table_begins;i++) { for(uint32_t i=0;i<string_table_begins;i++) {
ret[i]=p_manifest[i]; ret[i]=p_manifest[i];
} }
@ -927,7 +927,7 @@ void EditorExportPlatformAndroid::_fix_manifest(Vector<uint8_t>& p_manifest,bool
uint32_t extra = (p_manifest.size()-string_table_ends); uint32_t extra = (p_manifest.size()-string_table_ends);
ret.resize(new_stable_end + extra); ret.resize(new_stable_end + extra);
for(int i=0;i<extra;i++) for(uint32_t i=0;i<extra;i++)
ret[new_stable_end+i]=p_manifest[string_table_ends+i]; ret[new_stable_end+i]=p_manifest[string_table_ends+i];
while(ret.size()%4) while(ret.size()%4)