diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2020-10-02 10:20:14 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2020-10-06 06:47:19 +0300 |
| commit | d0e28c072e402fa1e7dcac639cbc96a8caf2f0d5 (patch) | |
| tree | 5217c7f0c2711b2e5d3d9ad077c8c499d2910dcc /src/runtimerender/Qt3DSRenderUIPLoader.cpp | |
| parent | 58c0ba0f94df44c4ef24af864cb63d163fedfa1c (diff) | |
Fix crash when slide change occurs
The buffer manager needs to use resolved paths for each image loading
function. Also convert to use QString to avoid unnecessary string
conversions. Also fix image loading task to use resolved paths.
Task-number: QT3DS-4177
Change-Id: I79fae56a8f49ccbdcaed1fa9eb9a9d875583d0dd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/runtimerender/Qt3DSRenderUIPLoader.cpp')
| -rw-r--r-- | src/runtimerender/Qt3DSRenderUIPLoader.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/runtimerender/Qt3DSRenderUIPLoader.cpp b/src/runtimerender/Qt3DSRenderUIPLoader.cpp index f276f6d..769c28e 100644 --- a/src/runtimerender/Qt3DSRenderUIPLoader.cpp +++ b/src/runtimerender/Qt3DSRenderUIPLoader.cpp @@ -1844,7 +1844,10 @@ struct SRenderUIPLoader : public IDOMReferenceResolver m_Reader.Att("hasTransparency", hasTransparency); bool hasOpaque = false; m_Reader.Att("hasOpaquePixels", hasOpaque); - m_BufferManager.SetImageHasTransparency(imgPath, hasTransparency, + auto resolved = IBufferManager::resolveImagePath( + QString::fromLatin1(imgPath.c_str()), + m_Presentation->m_preferKTX); + m_BufferManager.SetImageHasTransparency(resolved, hasTransparency, hasOpaque); } } |