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

Merge branch 'master' into fix-artifact

pull/4839/head
Kazuki Y 2022-12-28 22:07:07 +09:00 committed by GitHub
parent d04dd1af9b 7eadcebc9f
commit cd0bbe15af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/CMakeLists.txt
View File

@ -1,6 +1,5 @@
# Open Asset Import Library (assimp) # Open Asset Import Library (assimp)
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
#
# Copyright (c) 2006-2022, assimp team # Copyright (c) 2006-2022, assimp team
# #
# All rights reserved. # All rights reserved.
@ -94,6 +93,7 @@ SET( PUBLIC_HEADERS
${HEADER_PATH}/vector3.inl ${HEADER_PATH}/vector3.inl
${HEADER_PATH}/version.h ${HEADER_PATH}/version.h
${HEADER_PATH}/cimport.h ${HEADER_PATH}/cimport.h
${HEADER_PATH}/AssertHandler.h
${HEADER_PATH}/importerdesc.h ${HEADER_PATH}/importerdesc.h
${HEADER_PATH}/Importer.hpp ${HEADER_PATH}/Importer.hpp
${HEADER_PATH}/DefaultLogger.hpp ${HEADER_PATH}/DefaultLogger.hpp

2
code/Common/AssertHandler.cpp
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @brief Implementation of assert handling logic. * @brief Implementation of assert handling logic.
*/ */
#include "AssertHandler.h" #include <assimp/AssertHandler.h>
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>

4
contrib/unzip/unzip.c
View File

@ -1175,7 +1175,7 @@ extern int ZEXPORT unzOpenCurrentFile3(unzFile file, int *method, int *level, in
pfile_in_zip_read_info->stream.zalloc = (alloc_func)0; pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
pfile_in_zip_read_info->stream.zfree = (free_func)0; pfile_in_zip_read_info->stream.zfree = (free_func)0;
pfile_in_zip_read_info->stream.opaque = (voidpf)s; pfile_in_zip_read_info->stream.opaque = (voidpf)s;
pfile_in_zip_read_info->stream.next_in = 0; pfile_in_zip_read_info->stream.next_in = (voidpf)0;
pfile_in_zip_read_info->stream.avail_in = 0; pfile_in_zip_read_info->stream.avail_in = 0;
#ifdef HAVE_APPLE_COMPRESSION #ifdef HAVE_APPLE_COMPRESSION
@ -1997,4 +1997,4 @@ extern int ZEXPORT unzEndOfFile(unzFile file)
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(pop) # pragma warning(pop)
#endif // _MSC_VER #endif // _MSC_VER

0
code/Common/AssertHandler.h → include/assimp/AssertHandler.h
View File

2
test/unit/Common/utAssertHandler.cpp
View File

@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endif #endif
#include <assimp/ai_assert.h> #include <assimp/ai_assert.h>
#include <code/Common/AssertHandler.h> #include <assimp/AssertHandler.h>
namespace namespace
{ {

2
test/unit/Common/utBaseProcess.cpp
View File

@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "UnitTestPCH.h" #include "UnitTestPCH.h"
#include "Common/BaseProcess.h" #include "Common/BaseProcess.h"
#include "Common/AssertHandler.h" #include <assimp/AssertHandler.h>
using namespace Assimp; using namespace Assimp;