From 5f7d6d70fc00dd1ba741ec8d1aff8f6159f63386 Mon Sep 17 00:00:00 2001 From: reuk Date: Tue, 10 Dec 2024 20:04:56 +0000 Subject: [PATCH] Direct2DContext: Remove unnecessary public constants --- .../native/juce_Direct2DGraphicsContext_windows.h | 5 ----- .../native/juce_Direct2DResources_windows.cpp | 7 +++++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h b/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h index bc71df5908..293e96753d 100644 --- a/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h +++ b/modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h @@ -108,11 +108,6 @@ public: Direct2DMetrics::Ptr metrics; - //============================================================================== - // Min & max frame sizes; same as Direct3D texture size limits - static int constexpr minFrameSize = 1; - static int constexpr maxFrameSize = 16384; - protected: struct SavedState; SavedState* currentState = nullptr; diff --git a/modules/juce_graphics/native/juce_Direct2DResources_windows.cpp b/modules/juce_graphics/native/juce_Direct2DResources_windows.cpp index c9c7534d78..3df898db7f 100644 --- a/modules/juce_graphics/native/juce_Direct2DResources_windows.cpp +++ b/modules/juce_graphics/native/juce_Direct2DResources_windows.cpp @@ -432,8 +432,11 @@ public: if (chain == nullptr) return E_FAIL; - auto scaledSize = newSize.getUnion ({ Direct2DGraphicsContext::minFrameSize, Direct2DGraphicsContext::minFrameSize }) - .getIntersection ({ Direct2DGraphicsContext::maxFrameSize, Direct2DGraphicsContext::maxFrameSize }); + constexpr auto minFrameSize = 1; + constexpr auto maxFrameSize = 16384; + + auto scaledSize = newSize.getUnion ({ minFrameSize, minFrameSize }) + .getIntersection ({ maxFrameSize, maxFrameSize }); buffer = nullptr;