summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/CompressedBlob.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2016-12-21 11:30:12 +0100
committerJosJuice <josjuice@gmail.com>2017-01-11 13:23:19 +0100
commitd1ea00ed884cf714a252d3194d3f8dbdc54ac937 (patch)
tree37c721b64d3e9c1bbda9f32b98fb12171b2f908c /Source/Core/DiscIO/CompressedBlob.cpp
parent3fdcbbdd9273afb294d460dac0dcc52d991ab739 (diff)
Only open file once when detecting blob type
Diffstat (limited to 'Source/Core/DiscIO/CompressedBlob.cpp')
-rw-r--r--Source/Core/DiscIO/CompressedBlob.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp
index 680ca8d179..4a749a7ebe 100644
--- a/Source/Core/DiscIO/CompressedBlob.cpp
+++ b/Source/Core/DiscIO/CompressedBlob.cpp
@@ -28,6 +28,8 @@
namespace DiscIO
{
+bool IsGCZBlob(const std::string& filename);
+
CompressedBlobReader::CompressedBlobReader(const std::string& filename) : m_file_name(filename)
{
m_file.Open(filename, "rb");
@@ -192,7 +194,7 @@ bool CompressFileToBlob(const std::string& infile, const std::string& outfile, u
callback(GetStringT("Files opened, ready to compress."), 0, arg);
CompressedBlobHeader header;
- header.magic_cookie = kBlobCookie;
+ header.magic_cookie = GCZ_MAGIC;
header.sub_type = sub_type;
header.block_size = block_size;
header.data_size = File::GetSize(infile);
@@ -401,7 +403,7 @@ bool IsGCZBlob(const std::string& filename)
File::IOFile f(filename, "rb");
CompressedBlobHeader header;
- return f.ReadArray(&header, 1) && (header.magic_cookie == kBlobCookie);
+ return f.ReadArray(&header, 1) && (header.magic_cookie == GCZ_MAGIC);
}
} // namespace