piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

UICommon/ResourcePack: Allow ReadCurrentFileUnlimited() to read into any contiguous container

Browse Source 
This allows the same code to be used to read into a std::string, which
allows for eliminating the vector->string transfer when reading the
manifest file.

A ContiguousContainer is a concept that includes std::array,
std::string, and std::vector.
This commit is contained in:
Lioncash
2019-05-27 13:27:03 -04:00
parent 5c4d3f55da
commit f07cf9ebab
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/UICommon/ResourcePack/ResourcePack.cpp
View File

@ -22,7 +22,8 @@ constexpr char TEXTURE_PATH[] = "Load/Textures/";
// Since minzip doesn't provide a way to unzip a file of a length > 65535, we have to implement // Since minzip doesn't provide a way to unzip a file of a length > 65535, we have to implement
// this ourselves // this ourselves
static bool ReadCurrentFileUnlimited(unzFile file, std::vector<char>& destination) template <typename ContiguousContainer>
static bool ReadCurrentFileUnlimited(unzFile file, ContiguousContainer& destination)
{ {
const u32 MAX_BUFFER_SIZE = 65535; const u32 MAX_BUFFER_SIZE = 65535;
@ -70,19 +71,16 @@ ResourcePack::ResourcePack(const std::string& path) : m_path(path)
unz_file_info manifest_info; unz_file_info manifest_info;
unzGetCurrentFileInfo(file, &manifest_info, nullptr, 0, nullptr, 0, nullptr, 0); unzGetCurrentFileInfo(file, &manifest_info, nullptr, 0, nullptr, 0, nullptr, 0);
std::vector<char> manifest_contents(manifest_info.uncompressed_size); std::string manifest_contents(manifest_info.uncompressed_size, '\0');
if (!ReadCurrentFileUnlimited(file, manifest_contents)) if (!ReadCurrentFileUnlimited(file, manifest_contents))
{ {
m_valid = false; m_valid = false;
m_error = "Failed to read manifest.json"; m_error = "Failed to read manifest.json";
return; return;
} }
unzCloseCurrentFile(file); unzCloseCurrentFile(file);
m_manifest = m_manifest = std::make_shared<Manifest>(manifest_contents);
std::make_shared<Manifest>(std::string(manifest_contents.begin(), manifest_contents.end()));
if (!m_manifest->IsValid()) if (!m_manifest->IsValid())
{ {
m_valid = false; m_valid = false;