amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 13:37:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move buffering to Reader

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-02 01:04:35 +02:00
parent 6c4277bd35
commit 6edba0c5c0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/io/package.cpp
+2 -2
View File
@@ -202,10 +202,10 @@ unique_ptr<wxInputStream> Package::openIn(const String& file) {
unique_ptr<wxInputStream> stream; unique_ptr<wxInputStream> stream;
if (it != files.end() && it->second.wasWritten()) { if (it != files.end() && it->second.wasWritten()) {
// written to this file, open the temp file // written to this file, open the temp file
stream = make_unique<BufferedFileInputStream>(it->second.tempName); stream = make_unique<wxFileInputStream>(it->second.tempName);
} else if (wxFileExists(filename+_("/")+file)) { } else if (wxFileExists(filename+_("/")+file)) {
// a file in directory package // a file in directory package
stream = make_unique<BufferedFileInputStream>(filename+_("/")+file); stream = make_unique<wxFileInputStream>(filename+_("/")+file);
} else if (wxFileExists(filename) && it != files.end() && it->second.zipEntry) { } else if (wxFileExists(filename) && it != files.end() && it->second.zipEntry) {
// a file in a zip archive // a file in a zip archive
stream = make_unique<ZipFileInputStream>(filename, it->second.zipEntry); stream = make_unique<ZipFileInputStream>(filename, it->second.zipEntry);
src/util/io/reader.hpp
+1 -1
View File
@@ -145,7 +145,7 @@ private:
/// Line number of the previous_line /// Line number of the previous_line
int previous_line_number; int previous_line_number;
/// Input stream we are reading from /// Input stream we are reading from
wxInputStream& input; wxBufferedInputStream input;
/// Accumulated warning messages /// Accumulated warning messages
String warnings; String warnings;