diff options
| author | Linktothepast <kostamarino@gmail.com> | 2015-09-28 16:50:35 +0300 |
|---|---|---|
| committer | Linktothepast <kostamarino@gmail.com> | 2015-09-28 16:50:35 +0300 |
| commit | 748be565b8df535ef558e74b38cd0f4d615f8a21 (patch) | |
| tree | b151efee0a87e99125f2401325a9bddecf84fc73 /Source/Core/DiscIO/CompressedBlob.cpp | |
| parent | cf17fccdd3093a1b8476b10183b1c4bde36da74d (diff) | |
| parent | ce493b897d6d3735c930a8465cc0c26bbe5feb86 (diff) | |
Merge remote-tracking branch 'dolphin-emu/master' into gameinis
Diffstat (limited to 'Source/Core/DiscIO/CompressedBlob.cpp')
| -rw-r--r-- | Source/Core/DiscIO/CompressedBlob.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index 04304b7613..7b01aeed5d 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -19,7 +19,9 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/Hash.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" +#include "Common/Logging/Log.h" #include "DiscIO/Blob.h" #include "DiscIO/CompressedBlob.h" #include "DiscIO/DiscScrubber.h" @@ -55,7 +57,7 @@ CompressedBlobReader::CompressedBlobReader(const std::string& filename) : m_file CompressedBlobReader* CompressedBlobReader::Create(const std::string& filename) { - if (IsCompressedBlob(filename)) + if (IsGCZBlob(filename)) return new CompressedBlobReader(filename); else return nullptr; @@ -148,7 +150,7 @@ bool CompressFileToBlob(const std::string& infile, const std::string& outfile, u { bool scrubbing = false; - if (IsCompressedBlob(infile)) + if (IsGCZBlob(infile)) { PanicAlertT("\"%s\" is already compressed! Cannot compress it further.", infile.c_str()); return false; @@ -330,7 +332,7 @@ bool CompressFileToBlob(const std::string& infile, const std::string& outfile, u bool DecompressBlobToFile(const std::string& infile, const std::string& outfile, CompressCB callback, void* arg) { - if (!IsCompressedBlob(infile)) + if (!IsGCZBlob(infile)) { PanicAlertT("File not compressed"); return false; @@ -400,7 +402,7 @@ bool DecompressBlobToFile(const std::string& infile, const std::string& outfile, return true; } -bool IsCompressedBlob(const std::string& filename) +bool IsGCZBlob(const std::string& filename) { File::IOFile f(filename, "rb"); |