diff options
| author | Martin Ridgers <[email protected]> | 2021-09-16 13:16:00 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-09-16 13:17:12 +0200 |
| commit | a20d09a9fec7ab6e8a0c987cdb4247c6cf69b507 (patch) | |
| tree | 64e5454f392550ec7a514d4a6fd3682f5b8ff824 /zencore/iobuffer.cpp | |
| parent | Merge from main (diff) | |
| parent | Fixed misleading comment for `CbAttachment::AsCompositeBinary` (diff) | |
| download | zen-a20d09a9fec7ab6e8a0c987cdb4247c6cf69b507.tar.xz zen-a20d09a9fec7ab6e8a0c987cdb4247c6cf69b507.zip | |
Merge from main
Diffstat (limited to 'zencore/iobuffer.cpp')
| -rw-r--r-- | zencore/iobuffer.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/zencore/iobuffer.cpp b/zencore/iobuffer.cpp index cf167a7c6..b591dee89 100644 --- a/zencore/iobuffer.cpp +++ b/zencore/iobuffer.cpp @@ -361,7 +361,7 @@ IoBufferBuilder::MakeFromFile(const wchar_t* FileName, uint64_t Offset, uint64_t } IoBuffer -IoBufferBuilder::MakeFromTemporaryFile(const wchar_t* FileName, uint64_t Offset, uint64_t Size) +IoBufferBuilder::MakeFromTemporaryFile(const wchar_t* FileName) { CAtlFile DataFile; @@ -376,20 +376,7 @@ IoBufferBuilder::MakeFromTemporaryFile(const wchar_t* FileName, uint64_t Offset, ULONGLONG FileSize; DataFile.GetSize(FileSize); - if (Size == ~0ull) - { - Size = FileSize; - } - else - { - // Clamp size - if ((Offset + Size) > FileSize) - { - Size = FileSize - Offset; - } - } - - IoBuffer Iob(IoBuffer::File, DataFile.Detach(), Offset, Size); + IoBuffer Iob(IoBuffer::File, DataFile.Detach(), 0, FileSize); Iob.m_Core->SetIsWholeFile(true); return Iob; |