Rename ZipFileReader::Load to LoadBytes

rism-digital · May 23, 2024 · d64db41 · d64db41
1 parent 971ecf7
commit d64db41
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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<unsigned char> &bytes);
+    bool LoadBytes(const std::vector<unsigned char> &bytes);
 
     /**
      * Check if the archive contains the file

diff --git 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<unsigned char> 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<unsigned char> &bytes)
+bool ZipFileReader::LoadBytes(const std::vector<unsigned char> &bytes)
 {
     this->Reset();
 

diff --git a/src/toolkit.cpp b/src/toolkit.cpp
@@ -436,7 +436,7 @@ bool Toolkit::LoadZipData(const std::vector<unsigned char> &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)) {