|
| 1 | +diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp |
| 2 | +index b9d69ab303204b68f97a1cae3bafbb1f77f0ac67..e434abba3b0c75dff4a48600e34c91ac6e9d766a 100644 |
| 3 | +--- a/src/ports/SkTypeface_win_dw.cpp |
| 4 | ++++ b/src/ports/SkTypeface_win_dw.cpp |
| 5 | +@@ -543,6 +543,12 @@ std::unique_ptr<SkScalerContext> DWriteFontTypeface::onCreateScalerContext( |
| 6 | + sk_ref_sp(const_cast<DWriteFontTypeface*>(this)), effects, desc); |
| 7 | + } |
| 8 | + |
| 9 | ++static std::atomic<int> gUseSystemRenderingParams{-1}; |
| 10 | ++ |
| 11 | ++extern "C" void DWriteTypeface_UseSystemRenderingParams(int value) { |
| 12 | ++ gUseSystemRenderingParams.store(value); |
| 13 | ++} |
| 14 | ++ |
| 15 | + void DWriteFontTypeface::onFilterRec(SkScalerContextRec* rec) const { |
| 16 | + if (rec->fFlags & SkScalerContext::kLCD_Vertical_Flag) { |
| 17 | + rec->fMaskFormat = SkMask::kA8_Format; |
| 18 | +@@ -561,19 +567,31 @@ void DWriteFontTypeface::onFilterRec(SkScalerContextRec* rec) const { |
| 19 | + } |
| 20 | + rec->setHinting(h); |
| 21 | + |
| 22 | ++ int setting = gUseSystemRenderingParams.load(); |
| 23 | ++ bool useSystem; |
| 24 | ++ if (setting == -1) { |
| 25 | + #if defined(SK_FONT_HOST_USE_SYSTEM_SETTINGS) |
| 26 | +- IDWriteFactory* factory = sk_get_dwrite_factory(); |
| 27 | +- if (factory != nullptr) { |
| 28 | +- SkTScopedComPtr<IDWriteRenderingParams> defaultRenderingParams; |
| 29 | +- if (SUCCEEDED(factory->CreateRenderingParams(&defaultRenderingParams))) { |
| 30 | +- float gamma = defaultRenderingParams->GetGamma(); |
| 31 | +- rec->setDeviceGamma(gamma); |
| 32 | +- rec->setPaintGamma(gamma); |
| 33 | +- |
| 34 | +- rec->setContrast(defaultRenderingParams->GetEnhancedContrast()); |
| 35 | ++ useSystem = true; |
| 36 | ++#else |
| 37 | ++ useSystem = false; |
| 38 | ++#endif |
| 39 | ++ } else { |
| 40 | ++ useSystem = (setting == 1); |
| 41 | ++ } |
| 42 | ++ |
| 43 | ++ if (useSystem) { |
| 44 | ++ IDWriteFactory* factory = sk_get_dwrite_factory(); |
| 45 | ++ if (factory != nullptr) { |
| 46 | ++ SkTScopedComPtr<IDWriteRenderingParams> defaultRenderingParams; |
| 47 | ++ if (SUCCEEDED(factory->CreateRenderingParams(&defaultRenderingParams))) { |
| 48 | ++ float gamma = defaultRenderingParams->GetGamma(); |
| 49 | ++ rec->setDeviceGamma(gamma); |
| 50 | ++ rec->setPaintGamma(gamma); |
| 51 | ++ |
| 52 | ++ rec->setContrast(defaultRenderingParams->GetEnhancedContrast()); |
| 53 | ++ } |
| 54 | + } |
| 55 | + } |
| 56 | +-#endif |
| 57 | + } |
| 58 | + |
| 59 | + /////////////////////////////////////////////////////////////////////////////// |
0 commit comments