Merge pull request #3092 from JosJuice/compressed-blobs

Display all compressed formats in blue in GUI
This commit is contained in:
flacs
2015-09-27 12:57:19 +02:00
19 changed files with 43 additions and 12 deletions

View File

@ -57,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;
@ -150,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;
@ -332,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;
@ -402,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");