--- ./src/ports/SkFontHost_win.cpp.sav 2020-03-18 10:26:52.470184300 +0100 +++ ./src/ports/SkFontHost_win.cpp 2020-03-18 12:08:04.598406700 +0100 @@ -1215,17 +1215,23 @@ // since the caller may require A8 for maskfilters, we can't check for BW // ... until we have the caller tell us that explicitly const SkGdiRGB* src = (const SkGdiRGB*)bits; +#if defined(SK_GAMMA_APPLY_TO_A8) if (fPreBlend.isApplicable()) { RGBToA8(src, srcRB, glyph, fPreBlend.fG); - } else { + } else +#endif + { RGBToA8(src, srcRB, glyph, fPreBlend.fG); } } else { // LCD16 const SkGdiRGB* src = (const SkGdiRGB*)bits; SkASSERT(SkMask::kLCD16_Format == glyph.fMaskFormat); +#if defined(SK_GAMMA_APPLY_TO_A8) if (fPreBlend.isApplicable()) { RGBToLcd16(src, srcRB, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); - } else { + } else +#endif + { RGBToLcd16(src, srcRB, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); } } --- ./src/ports/SkScalerContext_win_dw.cpp +++ ./src/ports/SkScalerContext_win_dw.cpp @@ -1132,27 +1132,36 @@ void SkScalerContext_DW::generateImage(const SkGlyph& glyph) { BilevelToBW(src, glyph); } else if (!isLCD(fRec)) { if (textureType == DWRITE_TEXTURE_ALIASED_1x1) { +#if defined(SK_GAMMA_APPLY_TO_A8) if (fPreBlend.isApplicable()) { GrayscaleToA8(src, glyph, fPreBlend.fG); - } else { + } else +#endif + { GrayscaleToA8(src, glyph, fPreBlend.fG); } } else { +#if defined(SK_GAMMA_APPLY_TO_A8) if (fPreBlend.isApplicable()) { RGBToA8(src, glyph, fPreBlend.fG); - } else { + } else +#endif + { RGBToA8(src, glyph, fPreBlend.fG); } } } else { SkASSERT(SkMask::kLCD16_Format == glyph.fMaskFormat); +#if defined(SK_GAMMA_APPLY_TO_A8) if (fPreBlend.isApplicable()) { if (fRec.fFlags & SkScalerContext::kLCD_BGROrder_Flag) { RGBToLcd16(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); } else { RGBToLcd16(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); } - } else { + } else +#endif + { if (fRec.fFlags & SkScalerContext::kLCD_BGROrder_Flag) { RGBToLcd16(src, glyph, fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); } else { abora/co-24.04.10 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/sd/source/ui/slideshow
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2014-07-14 19:09:11 +0000
committerArmin Le Grand <alg@apache.org>2014-07-14 19:09:11 +0000
commit3c1d4742e649fe9c8aed8c2817fe3e1f3364f298 (patch)
treee0c6e02c89aa9227726c9469da1001b3e29c41df /sd/source/ui/slideshow
parentc5c31e2aeaedbdf76e1f38d3c385e34f5ed875ca (diff)
Resync to trunk, windows non-pro build aoo/aw080