diff --git a/include/vrv/filereader.h b/include/vrv/filereader.h index ea17d92de86..80e631aa6bc 100644 --- a/include/vrv/filereader.h +++ b/include/vrv/filereader.h @@ -53,7 +53,7 @@ class ZipFileReader { /** * Load a vector into memory */ - bool Load(const std::vector &bytes); + bool LoadBytes(const std::vector &bytes); /** * Check if the archive contains the file diff --git a/src/filereader.cpp b/src/filereader.cpp index 2ae6dfc9659..c6ac259d1fa 100644 --- a/src/filereader.cpp +++ b/src/filereader.cpp @@ -54,7 +54,7 @@ bool ZipFileReader::Load(const std::string &filename) data = data.substr(data.find("base64,") + 7); } std::vector bytes = Base64Decode(data); - return this->Load(bytes); + return this->LoadBytes(bytes); #else std::ifstream fin(filename.c_str(), std::ios::in | std::ios::binary); if (!fin.is_open()) { @@ -74,11 +74,11 @@ bool ZipFileReader::Load(const std::string &filename) while (fin.read((char *)&buffer, sizeof(unsigned char))) { bytes.push_back(buffer); } - return this->Load(bytes); + return this->LoadBytes(bytes); #endif } -bool ZipFileReader::Load(const std::vector &bytes) +bool ZipFileReader::LoadBytes(const std::vector &bytes) { this->Reset(); diff --git a/src/toolkit.cpp b/src/toolkit.cpp index d79ed929038..3248a9faf76 100644 --- a/src/toolkit.cpp +++ b/src/toolkit.cpp @@ -436,7 +436,7 @@ bool Toolkit::LoadZipData(const std::vector &bytes) { #ifndef NO_MXL_SUPPORT ZipFileReader zipFileReader; - zipFileReader.Load(bytes); + zipFileReader.LoadBytes(bytes); const std::string metaInf = "META-INF/container.xml"; if (!zipFileReader.HasFile(metaInf)) {