|
 |
04fd9a1 |
diff -up ./code/X3D/FIReader.cpp.irrxml ./code/X3D/FIReader.cpp
|
|
|
04fd9a1 |
--- ./code/X3D/FIReader.cpp.irrxml 2020-01-12 06:56:40.000000000 -0500
|
|
|
951ad34 |
+++ ./code/X3D/FIReader.cpp 2021-03-07 20:38:31.402545036 -0500
|
|
|
04fd9a1 |
@@ -60,11 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
04fd9a1 |
#include <assimp/types.h>
|
|
|
04fd9a1 |
#include <assimp/MemoryIOWrapper.h>
|
|
|
04fd9a1 |
#include <assimp/irrXMLWrapper.h>
|
|
|
04fd9a1 |
-#ifdef ASSIMP_USE_HUNTER
|
|
|
04fd9a1 |
-# include <utf8/utf8.h>
|
|
|
04fd9a1 |
-#else
|
|
|
04fd9a1 |
-# include "../contrib/utf8cpp/source/utf8.h"
|
|
|
04fd9a1 |
-#endif
|
|
|
951ad34 |
+#include <utf8.h>
|
|
|
04fd9a1 |
#include <assimp/fast_atof.h>
|
|
|
04fd9a1 |
#include <stack>
|
|
|
04fd9a1 |
#include <map>
|
|
|
04fd9a1 |
@@ -654,7 +650,7 @@ public:
|
|
|
04fd9a1 |
return currentNodeType;
|
|
|
04fd9a1 |
}
|
|
|
04fd9a1 |
|
|
|
04fd9a1 |
- virtual int getAttributeCount() const /*override*/ {
|
|
|
04fd9a1 |
+ virtual unsigned int getAttributeCount() const /*override*/ {
|
|
|
04fd9a1 |
return static_cast<int>(attributes.size());
|
|
|
04fd9a1 |
}
|
|
|
04fd9a1 |
|
|
|
04fd9a1 |
@@ -1733,7 +1729,7 @@ public:
|
|
|
04fd9a1 |
return reader->getNodeType();
|
|
|
04fd9a1 |
}
|
|
|
04fd9a1 |
|
|
|
04fd9a1 |
- virtual int getAttributeCount() const /*override*/ {
|
|
|
04fd9a1 |
+ virtual unsigned int getAttributeCount() const /*override*/ {
|
|
|
04fd9a1 |
return reader->getAttributeCount();
|
|
|
04fd9a1 |
}
|
|
|
04fd9a1 |
|
|
|
04fd9a1 |
diff -up ./include/assimp/irrXMLWrapper.h.irrxml ./include/assimp/irrXMLWrapper.h
|
|
|
04fd9a1 |
--- ./include/assimp/irrXMLWrapper.h.irrxml 2020-01-12 06:56:40.000000000 -0500
|
|
|
951ad34 |
+++ ./include/assimp/irrXMLWrapper.h 2021-03-07 20:38:15.760525926 -0500
|
|
|
04fd9a1 |
@@ -133,7 +133,7 @@ public:
|
|
|
04fd9a1 |
|
|
|
04fd9a1 |
// ----------------------------------------------------------------------------------
|
|
|
04fd9a1 |
//! Returns size of file in bytes
|
|
|
04fd9a1 |
- virtual int getSize() {
|
|
|
04fd9a1 |
+ virtual long getSize() const {
|
|
|
04fd9a1 |
return (int)data.size();
|
|
|
04fd9a1 |
}
|
|
|
04fd9a1 |
|