drawinglayer/source/primitive2d/BufferedDecompositionFlusher.cxx | 7 ++----- vcl/headless/svpvd.cxx | 3 ++- 2 files changed, 4 insertions(+), 6 deletions(-)
New commits: commit 6935f82ebe9e2544f4cb1047718f72bacbafdb42 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu Apr 17 11:14:07 2025 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Apr 17 13:04:02 2025 +0200 fix BufferedDecompositionFlusher thread naming otherwise we end up renaming the main thread Change-Id: I59f8274e13273321d80ab264e1d31e66b70547c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184318 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/drawinglayer/source/primitive2d/BufferedDecompositionFlusher.cxx b/drawinglayer/source/primitive2d/BufferedDecompositionFlusher.cxx index 2dd36148bb66..902183b907d1 100644 --- a/drawinglayer/source/primitive2d/BufferedDecompositionFlusher.cxx +++ b/drawinglayer/source/primitive2d/BufferedDecompositionFlusher.cxx @@ -73,11 +73,7 @@ void BufferedDecompositionFlusher::update(const BufferedDecompositionGroupPrimit getInstance()->updateImpl(p); } -BufferedDecompositionFlusher::BufferedDecompositionFlusher() -{ - setName("BufferedDecompositionFlusher"); - create(); -} +BufferedDecompositionFlusher::BufferedDecompositionFlusher() { create(); } void BufferedDecompositionFlusher::updateImpl(const BufferedDecompositionPrimitive2D* p) { @@ -95,6 +91,7 @@ void BufferedDecompositionFlusher::updateImpl(const BufferedDecompositionGroupPr void SAL_CALL BufferedDecompositionFlusher::run() { + setName("BufferedDecompositionFlusher"); for (;;) { auto aNow = std::chrono::steady_clock::now(); commit 7dc032dc3deb7c68b68e45dbcf5cb57c66489a58 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu Apr 17 10:43:05 2025 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Apr 17 13:03:50 2025 +0200 add assert in SvpSalVirtualDevice::ReleaseGraphics so we don't ignore any mis-use of the API Change-Id: I8a1edf589d1a2893c4fa0ccb121dd15dd8329f14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184316 Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Jenkins diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx index eb991be08109..c9524aa65065 100644 --- a/vcl/headless/svpvd.cxx +++ b/vcl/headless/svpvd.cxx @@ -58,7 +58,8 @@ SalGraphics* SvpSalVirtualDevice::AcquireGraphics() void SvpSalVirtualDevice::ReleaseGraphics( SalGraphics* pGraphics ) { - std::erase(m_aGraphics, dynamic_cast<SvpSalGraphics*>(pGraphics)); + assert(dynamic_cast<SvpSalGraphics*>(pGraphics)); + std::erase(m_aGraphics, static_cast<SvpSalGraphics*>(pGraphics)); delete pGraphics; }