diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-18 16:55:50 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-18 23:18:19 +0200 |
| commit | e94e1ed8435606ae4a85638947fe02e72946ca0f (patch) | |
| tree | e44d2aa889b0411d005f8b53ad3eb669e350e6e1 /vcl | |
| parent | 2d2f00bd499d69a91eda99f31910c3998b560e86 (diff) | |
Move comment closer to where it belongs
The comment was introduced in commit bc584ddc617f1b6be2cd3b330c2b999ec8f376a4,
when a check for mpAlphaVDev was introduced. Later the code was refactored, so
the relation of the comment to the code was lost.
Change-Id: Ie258720be9aaa67a8ec8ad3b5a1c7f068e453d92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94284
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/outdev/bitmap.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 251219add82b..44d28e15229a 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -647,14 +647,6 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& rBmp, const AlphaMask& r if (!aDstRect.Intersection(tools::Rectangle(aOutPt, aOutSz)).IsEmpty()) { static const char* pDisableNative = getenv( "SAL_DISABLE_NATIVE_ALPHA"); - // #i83087# Naturally, system alpha blending cannot work with - // separate alpha VDev - - // Not clear how the above comment relates to the following declaration and initialisation - // of bTryDirectPaint. Does bTryDirectPaint being true mean that we can use "system alpha - // blending"? Or that we can't? Or are the two not related at all, and should the above - // comment actually be better located below, before the "if (mpAlphaVDev)" test? - bool bTryDirectPaint(!pDisableNative && !bHMirr && !bVMirr); if (bTryDirectPaint) @@ -669,6 +661,9 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& rBmp, const AlphaMask& r SalBitmap* pSalSrcBmp = rBmp.ImplGetSalBitmap().get(); SalBitmap* pSalAlphaBmp = rAlpha.ImplGetSalBitmap().get(); + // #i83087# Naturally, system alpha blending (SalGraphics::DrawAlphaBitmap) cannot work + // with separate alpha VDev + // try to blend the alpha bitmap with the alpha virtual device if (mpAlphaVDev) { |