diff options
| author | Stefan Boberg <[email protected]> | 2023-10-05 16:07:33 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-10-05 16:07:33 +0200 |
| commit | 0521e8acc4aa11c9083ef25bf13d870db5ef2c9e (patch) | |
| tree | d7b54d6c086454d26f602522b3a095ffa72b1266 /src | |
| parent | check that block does not exists on disk before starting write to it (#449) (diff) | |
| download | zen-0521e8acc4aa11c9083ef25bf13d870db5ef2c9e.tar.xz zen-0521e8acc4aa11c9083ef25bf13d870db5ef2c9e.zip | |
fixed issue where IoBufferBuilder::ReadFromFileMaybe loses content type (#450)
Diffstat (limited to 'src')
| -rw-r--r-- | src/zencore/include/zencore/iobuffer.h | 2 | ||||
| -rw-r--r-- | src/zencore/iobuffer.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/zencore/include/zencore/iobuffer.h b/src/zencore/include/zencore/iobuffer.h index fef78741f..da73aab12 100644 --- a/src/zencore/include/zencore/iobuffer.h +++ b/src/zencore/include/zencore/iobuffer.h @@ -413,7 +413,7 @@ public: ZENCORE_API static IoBuffer MakeFromFileHandle(void* FileHandle, uint64_t Offset = 0, uint64_t Size = ~0ull); /** Make sure buffer data is memory resident, but avoid memory mapping data from files */ - ZENCORE_API static IoBuffer ReadFromFileMaybe(IoBuffer& InBuffer); + ZENCORE_API static IoBuffer ReadFromFileMaybe(const IoBuffer& InBuffer); inline static IoBuffer MakeFromMemory(MemoryView Memory) { return IoBuffer(IoBuffer::Wrap, Memory.GetData(), Memory.GetSize()); } inline static IoBuffer MakeCloneFromMemory(const void* Ptr, size_t Sz) { diff --git a/src/zencore/iobuffer.cpp b/src/zencore/iobuffer.cpp index 74fec4c51..82ead42f0 100644 --- a/src/zencore/iobuffer.cpp +++ b/src/zencore/iobuffer.cpp @@ -536,7 +536,7 @@ IoBuffer::SetDeleteOnClose(bool DeleteOnClose) ////////////////////////////////////////////////////////////////////////// IoBuffer -IoBufferBuilder::ReadFromFileMaybe(IoBuffer& InBuffer) +IoBufferBuilder::ReadFromFileMaybe(const IoBuffer& InBuffer) { IoBufferFileReference FileRef; if (InBuffer.GetFileReference(/* out */ FileRef)) @@ -569,6 +569,8 @@ IoBufferBuilder::ReadFromFileMaybe(IoBuffer& InBuffer) ZEN_ASSERT(dwNumberOfBytesRead == FileRef.FileChunkSize); + OutBuffer.SetContentType(InBuffer.GetContentType()); + return OutBuffer; } else |