From 8ce1665fdb508fc66ba84111aee897cd9b19858c Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Fri, 7 Mar 2025 16:54:56 -0600 Subject: [PATCH] protocols: Fix blocked color management get_information (#9563) --- src/protocols/ColorManagement.cpp | 8 ++++---- src/protocols/ColorManagement.hpp | 2 +- src/protocols/XXColorManagement.cpp | 4 ++-- src/protocols/XXColorManagement.hpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/protocols/ColorManagement.cpp b/src/protocols/ColorManagement.cpp index ef48b20c4..1a95c8bff 100644 --- a/src/protocols/ColorManagement.cpp +++ b/src/protocols/ColorManagement.cpp @@ -186,7 +186,7 @@ CColorManager::CColorManager(SP resource) : m_resource(resour } const auto RESOURCE = PROTO::colorManagement->m_vImageDescriptions.emplace_back( - makeShared(makeShared(r->client(), r->version(), id))); + makeShared(makeShared(r->client(), r->version(), id), false)); if UNLIKELY (!RESOURCE->good()) { r->noMemory(); @@ -230,7 +230,7 @@ CColorManagementOutput::CColorManagementOutput(SP re PROTO::colorManagement->destroyResource(imageDescription.get()); const auto RESOURCE = PROTO::colorManagement->m_vImageDescriptions.emplace_back( - makeShared(makeShared(r->client(), r->version(), id))); + makeShared(makeShared(r->client(), r->version(), id), true)); if UNLIKELY (!RESOURCE->good()) { r->noMemory(); @@ -448,7 +448,7 @@ CColorManagementIccCreator::CColorManagementIccCreator(SPm_vImageDescriptions.emplace_back( - makeShared(makeShared(r->client(), r->version(), id))); + makeShared(makeShared(r->client(), r->version(), id), false)); if UNLIKELY (!RESOURCE->good()) { r->noMemory(); @@ -505,7 +505,7 @@ CColorManagementParametricCreator::CColorManagementParametricCreator(SPm_vImageDescriptions.emplace_back( - makeShared(makeShared(r->client(), r->version(), id))); + makeShared(makeShared(r->client(), r->version(), id), false)); if UNLIKELY (!RESOURCE->good()) { r->noMemory(); diff --git a/src/protocols/ColorManagement.hpp b/src/protocols/ColorManagement.hpp index 5e1a70baa..55219b8fa 100644 --- a/src/protocols/ColorManagement.hpp +++ b/src/protocols/ColorManagement.hpp @@ -138,7 +138,7 @@ class CColorManagementParametricCreator { class CColorManagementImageDescription { public: - CColorManagementImageDescription(SP resource, bool allowGetInformation = false); + CColorManagementImageDescription(SP resource, bool allowGetInformation); bool good(); wl_client* client(); diff --git a/src/protocols/XXColorManagement.cpp b/src/protocols/XXColorManagement.cpp index 5c27c6e73..57d4c5fd3 100644 --- a/src/protocols/XXColorManagement.cpp +++ b/src/protocols/XXColorManagement.cpp @@ -161,7 +161,7 @@ CXXColorManagementOutput::CXXColorManagementOutput(SPdestroyResource(imageDescription.get()); const auto RESOURCE = PROTO::xxColorManagement->m_vImageDescriptions.emplace_back( - makeShared(makeShared(r->client(), r->version(), id))); + makeShared(makeShared(r->client(), r->version(), id), true)); if UNLIKELY (!RESOURCE->good()) { r->noMemory(); @@ -368,7 +368,7 @@ CXXColorManagementParametricCreator::CXXColorManagementParametricCreator(SPm_vImageDescriptions.emplace_back( - makeShared(makeShared(r->client(), r->version(), id))); + makeShared(makeShared(r->client(), r->version(), id), false)); if UNLIKELY (!RESOURCE->good()) { r->noMemory(); diff --git a/src/protocols/XXColorManagement.hpp b/src/protocols/XXColorManagement.hpp index 24a269242..96e997522 100644 --- a/src/protocols/XXColorManagement.hpp +++ b/src/protocols/XXColorManagement.hpp @@ -119,7 +119,7 @@ class CXXColorManagementParametricCreator { class CXXColorManagementImageDescription { public: - CXXColorManagementImageDescription(SP resource_, bool allowGetInformation = false); + CXXColorManagementImageDescription(SP resource_, bool allowGetInformation); bool good(); wl_client* client();