v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into issue_3570

pull/3571/head
JacksonM8 2021-01-07 01:47:06 +10:30 committed by GitHub
parent 3eed6fa006 53c03fa364
commit a01ef5374c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/Open3DGC/o3dgcArithmeticCodec.cpp
View File

@ -522,8 +522,7 @@ namespace o3dgc
buffer_size = max_code_bytes; // assign new memory buffer_size = max_code_bytes; // assign new memory
delete [] new_buffer; // free anything previously assigned delete [] new_buffer; // free anything previously assigned
if ((new_buffer = new unsigned char[buffer_size+16]) == 0) // 16 extra bytes new_buffer = new unsigned char[buffer_size+16]; // 16 extra bytes
AC_Error("cannot assign memory for compressed data buffer");
code_buffer = new_buffer; // set buffer for compressed data code_buffer = new_buffer; // set buffer for compressed data
} }
@ -732,7 +731,6 @@ namespace o3dgc
table_size = table_shift = 0; table_size = table_shift = 0;
distribution = new unsigned[data_symbols]; distribution = new unsigned[data_symbols];
} }
if (distribution == 0) AC_Error("cannot assign model memory");
} }
// compute cumulative distribution, decoder table // compute cumulative distribution, decoder table
unsigned s = 0; unsigned s = 0;
@ -803,7 +801,6 @@ namespace o3dgc
distribution = new unsigned[2*data_symbols]; distribution = new unsigned[2*data_symbols];
} }
symbol_count = distribution + data_symbols; symbol_count = distribution + data_symbols;
if (distribution == 0) AC_Error("cannot assign model memory");
} }
reset(); // initialize model reset(); // initialize model

2
contrib/openddlparser/code/OpenDDLParser.cpp
View File

@ -527,10 +527,8 @@ char *OpenDDLParser::parseName(char *in, char *end, Name **name) {
in = parseIdentifier(in, end, &id); in = parseIdentifier(in, end, &id);
if (id) { if (id) {
currentName = new Name(ntype, id); currentName = new Name(ntype, id);
if (currentName) {
*name = currentName; *name = currentName;
} }
}
return in; return in;
} }