Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to zlib 1.2.5.

Browse Source 
blenderloader now reads gzip compressed files.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@737 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2010-05-26 00:21:07 +00:00
parent 9d978918d1
commit 1b87557fd1
22 changed files with 2262 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/XFileParser.cpp
View File

@@ -61,14 +61,12 @@ using namespace Assimp::XFile;
// ------------------------------------------------------------------------------------------------
// Dummy memory wrappers for use with zlib
void* dummy_alloc (void* /*opaque*/, unsigned int items, unsigned int size) {
// we're using calloc to make it easier to debug the whole stuff
return ::calloc(items,size);
static void* dummy_alloc (void* /*opaque*/, unsigned int items, unsigned int size) {
return ::operator new(items*size);
}
void dummy_free (void* /*opaque*/, void* address) {
return ::free(address);
static void dummy_free (void* /*opaque*/, void* address) {
return ::operator delete(address);
}
#endif // !! ASSIMP_BUILD_NO_COMPRESSED_X