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

Fix warnings and linker errors on gcc

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-04-30 14:25:28 +02:00
parent 30391672ad
commit e74774138c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/util.cpp
+5 -5
View File
@@ -147,7 +147,7 @@ public:
return stream.IsOk(); return stream.IsOk();
} }
bool IsSeekable() const override { bool IsSeekable() const override {
return pos < BUFFER_SIZE; return pos < (wxFileOffset)BUFFER_SIZE;
} }
size_t LastRead() const override { size_t LastRead() const override {
return last_read; return last_read;
@@ -176,7 +176,7 @@ public:
stream.Read(out_buffer, size); stream.Read(out_buffer, size);
size_t read = stream.LastRead(); size_t read = stream.LastRead();
last_read += read; last_read += read;
if (pos < BUFFER_SIZE) { if (pos < (wxFileOffset)BUFFER_SIZE) {
// update buffer // update buffer
memcpy(buffer + pos, out_buffer, min(BUFFER_SIZE - (size_t)pos, read)); memcpy(buffer + pos, out_buffer, min(BUFFER_SIZE - (size_t)pos, read));
} }
@@ -187,8 +187,8 @@ public:
} }
wxFileOffset SeekI(wxFileOffset target, wxSeekMode mode = wxFromStart) override { wxFileOffset SeekI(wxFileOffset target, wxSeekMode mode = wxFromStart) override {
assert(mode == wxFromStart); assert(mode == wxFromStart);
assert(target < BUFFER_SIZE); assert(target < (wxFileOffset)BUFFER_SIZE);
if (target < BUFFER_SIZE) { if (target < (wxFileOffset)BUFFER_SIZE) {
pos = target; pos = target;
return target; return target;
} else { } else {
@@ -205,7 +205,7 @@ protected:
} }
private: private:
wxInputStream& stream; wxInputStream& stream;
static const size_t BUFFER_SIZE = 16; static constexpr size_t BUFFER_SIZE = 16;
Byte buffer[BUFFER_SIZE]; Byte buffer[BUFFER_SIZE];
// positions: // positions:
// Invariant: pos < stream_pos ==> pos < BUFFER_SIZE && buffer[i] is valid for i<=pos // Invariant: pos < stream_pos ==> pos < BUFFER_SIZE && buffer[i] is valid for i<=pos