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

Fixed base name check.

pull/3894/head
Carsten Rudolph 2021-05-27 10:10:55 +02:00
parent 0905252833
commit c33a4b2634
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/assimp/BlobIOSystem.h
View File

@ -197,7 +197,7 @@ class BlobIOSystem : public IOSystem {
public: public:
BlobIOSystem() : BlobIOSystem() :
baseName{} { baseName{AI_BLOBIO_MAGIC} {
} }
BlobIOSystem(const std::string &baseName) : BlobIOSystem(const std::string &baseName) :
@ -213,13 +213,13 @@ public:
public: public:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
const char *GetMagicFileName() const { const char *GetMagicFileName() const {
return baseName.empty() ? AI_BLOBIO_MAGIC : baseName.c_str(); return baseName.c_str();
} }
// ------------------------------------------------------------------- // -------------------------------------------------------------------
aiExportDataBlob *GetBlobChain() { aiExportDataBlob *GetBlobChain() {
const auto magicName = std::string(this->GetMagicFileName()); const auto magicName = std::string(this->GetMagicFileName());
const bool hasBaseName = baseName.empty(); const bool hasBaseName = baseName != AI_BLOBIO_MAGIC;
// one must be the master // one must be the master
aiExportDataBlob *master = nullptr, *cur; aiExportDataBlob *master = nullptr, *cur;
@ -249,8 +249,7 @@ public:
if (hasBaseName) { if (hasBaseName) {
cur->name.Set(blobby.first); cur->name.Set(blobby.first);
} } else {
else {
// extract the file extension from the file written // extract the file extension from the file written
const std::string::size_type s = blobby.first.find_first_of('.'); const std::string::size_type s = blobby.first.find_first_of('.');
cur->name.Set(s == std::string::npos ? blobby.first : blobby.first.substr(s + 1)); cur->name.Set(s == std::string::npos ? blobby.first : blobby.first.substr(s + 1));