diff options
| -rw-r--r-- | zencore/include/zencore/iobuffer.h | 2 | ||||
| -rw-r--r-- | zencore/iobuffer.cpp | 17 |
2 files changed, 3 insertions, 16 deletions
diff --git a/zencore/include/zencore/iobuffer.h b/zencore/include/zencore/iobuffer.h index c3860f2b0..f8b8217d7 100644 --- a/zencore/include/zencore/iobuffer.h +++ b/zencore/include/zencore/iobuffer.h @@ -343,7 +343,7 @@ class IoBufferBuilder { public: ZENCORE_API static IoBuffer MakeFromFile(const wchar_t* FileName, uint64_t Offset = 0, uint64_t Size = ~0ull); - ZENCORE_API static IoBuffer MakeFromTemporaryFile(const wchar_t* FileName, uint64_t Offset = 0, uint64_t Size = ~0ull); + ZENCORE_API static IoBuffer MakeFromTemporaryFile(const wchar_t* FileName); ZENCORE_API static IoBuffer MakeFromFileHandle(void* FileHandle, uint64_t Offset = 0, uint64_t Size = ~0ull); inline static IoBuffer MakeCloneFromMemory(const void* Ptr, size_t Sz) { return IoBuffer(IoBuffer::Clone, Ptr, Sz); } }; diff --git a/zencore/iobuffer.cpp b/zencore/iobuffer.cpp index 758cf539c..ee06f379e 100644 --- a/zencore/iobuffer.cpp +++ b/zencore/iobuffer.cpp @@ -356,7 +356,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; @@ -371,20 +371,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; |