mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Direct2D: Move MemoryFontFileFileStream to DirectX.cpp

Browse source
This commit is contained in:
reuk 2025-04-17 14:24:36 +01:00 • committed by Oli
parent 96683e49a1
commit 234e75b2be
2 changed files with 38 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

67
modules/juce_graphics/native/juce_DirectX_windows.cpp
View file

@ -825,39 +825,48 @@ auto AggregateFontCollection::mapCharacters (IDWriteFontFallback* fallback,
}
//==============================================================================
MemoryFontFileStream::MemoryFontFileStream (std::shared_ptr<const MemoryBlock> blockIn)
: block (std::move (blockIn))
class MemoryFontFileStream final : public ComBaseClassHelper<IDWriteFontFileStream>
{
}
JUCE_COMRESULT MemoryFontFileStream::GetFileSize (UINT64* fileSize) noexcept
{
*fileSize = block->getSize();
return S_OK;
}
JUCE_COMRESULT MemoryFontFileStream::GetLastWriteTime (UINT64* lastWriteTime) noexcept
{
*lastWriteTime = 0;
return S_OK;
}
JUCE_COMRESULT MemoryFontFileStream::ReadFileFragment (const void** fragmentStart,
UINT64 fileOffset,
UINT64 fragmentSize,
void** fragmentContext) noexcept
{
if (fileOffset + fragmentSize > block->getSize())
public:
explicit MemoryFontFileStream (std::shared_ptr<const MemoryBlock> blockIn)
: block (std::move (blockIn))
{
*fragmentStart = nullptr;
*fragmentContext = nullptr;
return E_INVALIDARG;
}
*fragmentStart = addBytesToPointer (block->getData(), fileOffset);
*fragmentContext = this;
return S_OK;
}
JUCE_COMRESULT GetFileSize (UINT64* fileSize) noexcept override
{
*fileSize = block->getSize();
return S_OK;
}
JUCE_COMRESULT GetLastWriteTime (UINT64* lastWriteTime) noexcept override
{
*lastWriteTime = 0;
return S_OK;
}
JUCE_COMRESULT ReadFileFragment (const void** fragmentStart,
UINT64 fileOffset,
UINT64 fragmentSize,
void** fragmentContext) noexcept override
{
if (fileOffset + fragmentSize > block->getSize())
{
*fragmentStart = nullptr;
*fragmentContext = nullptr;
return E_INVALIDARG;
}
*fragmentStart = addBytesToPointer (block->getData(), fileOffset);
*fragmentContext = this;
return S_OK;
}
void WINAPI ReleaseFileFragment (void*) noexcept override {}
private:
std::shared_ptr<const MemoryBlock> block;
};
//==============================================================================
MemoryFontFileLoader::MemoryFontFileLoader (MemoryBlock blob)

18
modules/juce_graphics/native/juce_DirectX_windows.h
View file

@ -470,24 +470,6 @@ private:
std::mutex mutex;
};
class MemoryFontFileStream final : public ComBaseClassHelper<IDWriteFontFileStream>
{
public:
explicit MemoryFontFileStream (std::shared_ptr<const MemoryBlock> blockIn);
JUCE_COMRESULT GetFileSize (UINT64* fileSize) noexcept override;
JUCE_COMRESULT GetLastWriteTime (UINT64* lastWriteTime) noexcept override;
JUCE_COMRESULT ReadFileFragment (const void** fragmentStart,
UINT64 fileOffset,
UINT64 fragmentSize,
void** fragmentContext) noexcept override;
void WINAPI ReleaseFileFragment (void*) noexcept override {}
private:
std::shared_ptr<const MemoryBlock> block;
};
class MemoryFontFileLoader final : public ComBaseClassHelper<IDWriteFontFileLoader>
{
public: