ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

improve readability of VirtualDevice constructor

Browse Source 
(a) It is not obvious what DeviceFormat::DEFAULT means
(b) There are two parameters (each with two states), but only really 2
possible overall states

So
(1) use more useful names
(2) combine the two parameters into one enum

Change-Id: Ic0595b39e032cc9e019b88326389d055b977da00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146589
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2023-02-07 10:19:32 +00:00
parent 545ddfbaa9
commit 00659bcdbb
50 changed files with 126 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
canvas/qa/cppunit/canvastest.cxx
+2 -3
View File
@@ -76,9 +76,8 @@ public:
void setupCanvas(const Size& size, Color backgroundColor = COL_WHITE, bool alpha = false)
{
mVclDevice
= alpha ? VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT)
: VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
mVclDevice = alpha ? VclPtr<VirtualDevice>::Create(DeviceFormat::WITH_ALPHA)
: VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
mVclDevice->SetOutputSizePixel(size);
mVclDevice->SetBackground(Wallpaper(backgroundColor));
mVclDevice->Erase();
canvas/source/directx/dx_textlayout_drawhelper.cxx
+2 -2
View File
@@ -83,7 +83,7 @@ namespace dxcanvas
SystemGraphicsData aSystemGraphicsData;
aSystemGraphicsData.nSize = sizeof(SystemGraphicsData);
aSystemGraphicsData.hDC = reinterpret_cast< ::HDC >(hdc);
ScopedVclPtrInstance<VirtualDevice> xVirtualDevice(aSystemGraphicsData, Size(1, 1), DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> xVirtualDevice(aSystemGraphicsData, Size(1, 1), DeviceFormat::WITHOUT_ALPHA);
// disable font antialiasing - GDI does not handle alpha
// surfaces properly.
@@ -246,7 +246,7 @@ namespace dxcanvas
SystemGraphicsData aSystemGraphicsData;
aSystemGraphicsData.nSize = sizeof(SystemGraphicsData);
aSystemGraphicsData.hDC = reinterpret_cast< ::HDC >(GetDC( nullptr ));
ScopedVclPtrInstance<VirtualDevice> xVirtualDevice(aSystemGraphicsData, Size(1, 1), DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> xVirtualDevice(aSystemGraphicsData, Size(1, 1), DeviceFormat::WITHOUT_ALPHA);
// create the font
const css::rendering::FontRequest& rFontRequest = rCanvasFont->getFontRequest();
canvas/source/vcl/backbuffer.cxx
+1 -1
View File
@@ -28,7 +28,7 @@
namespace vclcanvas
{
BackBuffer::BackBuffer( const OutputDevice& rRefDevice ) :
maVDev( VclPtr<VirtualDevice>::Create( rRefDevice, DeviceFormat::DEFAULT ) )
maVDev( VclPtr<VirtualDevice>::Create( rRefDevice, DeviceFormat::WITHOUT_ALPHA ) )
{
tools::SetDefaultDeviceAntiAliasing( maVDev );
}
canvas/source/vcl/bitmapbackbuffer.cxx
+1 -1
View File
@@ -112,7 +112,7 @@ namespace vclcanvas
// VDev not yet created, do it now. Create an alpha-VDev,
// if bitmap has transparency.
mpVDev = maBitmap->IsAlpha() ?
VclPtr<VirtualDevice>::Create( mrRefDevice, DeviceFormat::DEFAULT, DeviceFormat::DEFAULT ) :
VclPtr<VirtualDevice>::Create( mrRefDevice, DeviceFormat::WITH_ALPHA ) :
VclPtr<VirtualDevice>::Create( mrRefDevice );
OSL_ENSURE( mpVDev,
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+1 -1
View File
@@ -228,7 +228,7 @@ namespace cppcanvas::internal
// render our content into an appropriately sized
// VirtualDevice with alpha channel
ScopedVclPtrInstance<VirtualDevice> aVDev(
*::Application::GetDefaultDevice(), DeviceFormat::DEFAULT, DeviceFormat::DEFAULT );
*::Application::GetDefaultDevice(), DeviceFormat::WITH_ALPHA );
aVDev->SetOutputSizePixel( aBitmapSizePixel );
aVDev->SetMapMode();
cui/source/dialogs/FontFeaturesDialog.cxx
+1 -1
View File
@@ -55,7 +55,7 @@ static sal_Int32 makeEnumComboBox(weld::ComboBox& rNameBox,
void FontFeaturesDialog::initialize()
{
ScopedVclPtrInstance<VirtualDevice> aVDev(*Application::GetDefaultDevice(),
DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
DeviceFormat::WITH_ALPHA);
std::vector<vcl::font::Feature> rFontFeatures = getFontFeatureList(m_sFontName, *aVDev);
std::unordered_set<sal_uInt32> aDoneFeatures;
cui/source/dialogs/screenshotannotationdlg.cxx
+1 -1
View File
@@ -232,7 +232,7 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
maDimmedDialogBitmap.Adjust(-15, 0, 0, 0, 0);
// init paint buffering VirtualDevice
mxVirtualBufferDevice = VclPtr<VirtualDevice>::Create(*Application::GetDefaultDevice(), DeviceFormat::DEFAULT);
mxVirtualBufferDevice = VclPtr<VirtualDevice>::Create(*Application::GetDefaultDevice(), DeviceFormat::WITHOUT_ALPHA);
mxVirtualBufferDevice->SetOutputSizePixel(maParentDialogSize);
mxVirtualBufferDevice->SetFillColor(COL_TRANSPARENT);
cui/source/tabpages/chardlg.cxx
+1 -1
View File
@@ -224,7 +224,7 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
, m_xCTLFontFeaturesButton(m_xBuilder->weld_button("btnCTLFeatures"))
, m_xCTLFontTypeFT(m_xBuilder->weld_label("lbCTLFontinfo"))
, m_xVDev(*Application::GetDefaultDevice(), DeviceFormat::DEFAULT, DeviceFormat::DEFAULT)
, m_xVDev(*Application::GetDefaultDevice(), DeviceFormat::WITH_ALPHA)
{
m_xPreviewWin.reset(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWin));
#ifdef IOS
desktop/source/lib/init.cxx
+4 -4
View File
@@ -3754,7 +3754,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
double fDPIScaleX = 1.0;
paintTileIOS(pThis, pBuffer, nCanvasWidth, nCanvasHeight, fDPIScaleX, nTilePosX, nTilePosY, nTileWidth, nTileHeight);
#else
ScopedVclPtrInstance< VirtualDevice > pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance< VirtualDevice > pDevice(DeviceFormat::WITHOUT_ALPHA);
// Set background to transparent by default.
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
@@ -5632,7 +5632,7 @@ static char* getFontSubset (std::string_view aFontName)
if (const vcl::Font* pFont = FindFont(aFoundFont))
{
FontCharMapRef xFontCharMap (new FontCharMap());
auto aDevice(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));
auto aDevice(VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA));
aDevice->SetFont(*pFont);
aDevice->GetFontCharMap(xFontCharMap);
@@ -6269,7 +6269,7 @@ unsigned char* doc_renderFontOrientation(SAL_UNUSED_PARAMETER LibreOfficeKitDocu
if (aText.isEmpty())
aText = aFont.GetFamilyName();
auto aDevice(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));
auto aDevice(VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA));
::tools::Rectangle aRect;
aFont.SetFontSize(Size(0, nDefaultFontSize));
aFont.SetOrientation(Degree10(pOrientation));
@@ -6408,7 +6408,7 @@ static void doc_paintWindowForView(LibreOfficeKitDocument* pThis, unsigned nLOKW
#else
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nWidth, nHeight), Fraction(1.0), Point(), pBuffer);
drawinglayer/qa/unit/vclmetafileprocessor2d.cxx
+2 -3
View File
@@ -61,9 +61,8 @@ public:
void setupCanvas(const Size& size, Color backgroundColor = COL_WHITE, bool alpha = false)
{
mVclDevice
= alpha ? VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT)
: VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
mVclDevice = alpha ? VclPtr<VirtualDevice>::Create(DeviceFormat::WITH_ALPHA)
: VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
mVclDevice->SetOutputSizePixel(size);
mVclDevice->SetBackground(Wallpaper(backgroundColor));
mVclDevice->Erase();
drawinglayer/qa/unit/vclpixelprocessor2d.cxx
+2 -1
View File
@@ -46,7 +46,8 @@ public:
// Test that drawing only a part of a gradient draws the proper part of it.
void testTdf139000()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device
= VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(100, 200));
device->SetBackground(Wallpaper(COL_RED));
device->Erase();
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+1 -1
View File
@@ -234,7 +234,7 @@ VclPtr<VirtualDevice> VDevBuffer::alloc(OutputDevice& rOutDev, const Size& rSize
// no success yet, create new buffer
if (!pRetval)
{
pRetval = VclPtr<VirtualDevice>::Create(rOutDev, DeviceFormat::DEFAULT);
pRetval = VclPtr<VirtualDevice>::Create(rOutDev, DeviceFormat::WITHOUT_ALPHA);
maDeviceTemplates[pRetval] = &rOutDev;
pRetval->SetOutputSizePixel(rSizePixel, true);
}
filter/source/msfilter/msdffimp.cxx
+1 -1
View File
@@ -4561,7 +4561,7 @@ rtl::Reference<SdrObject> SvxMSDffManager::ImportShape( const DffRecordHeader& r
rOutliner.SetStyleSheetPool(static_cast< SfxStyleSheetPool* >(xRet->getSdrModelFromSdrObject().GetStyleSheetPool()));
bool bOldUpdateMode = rOutliner.SetUpdateLayout( false );
rOutliner.SetText( *pParaObj );
ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::DEFAULT);
ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::WITHOUT_ALPHA);
pVirDev->SetMapMode(MapMode(MapUnit::Map100thMM));
sal_Int32 i, nParagraphs = rOutliner.GetParagraphCount();
if ( nParagraphs )
include/vcl/salgtype.hxx
+2 -1
View File
@@ -27,7 +27,8 @@
enum class DeviceFormat {
NONE = -1,
DEFAULT = 0,
WITHOUT_ALPHA = 0,
WITH_ALPHA = 1,
#ifdef IOS
GRAYSCALE = 8
#endif
include/vcl/virdev.hxx
+9 -38
View File
@@ -50,8 +50,7 @@ private:
VclPtr<VirtualDevice> mpNext;
sal_uInt16 mnBitCount;
bool mbScreenComp;
const DeviceFormat meFormat;
const DeviceFormat meAlphaFormat;
const DeviceFormat meFormatAndAlpha;
RefDevMode meRefDevMode;
bool mbForceZeroExtleadBug;
@@ -81,33 +80,23 @@ protected:
If it's the nullptr, it uses Application::GetDefaultDevice().
@param eFormat
Device format of the generated virtual device. Use DeviceFormat::DEFAULT here, to
indicate: take default screen depth.
@param eAlphaFormat
Device format of the generated virtual device. Use DeviceFormat::DEFAULT here, to
indicate: take default screen depth.
Device format of the generated virtual device.
@param eOutDevType
This real virtual output device type.
*/
explicit VirtualDevice(const OutputDevice* pCompDev, DeviceFormat eFormat,
DeviceFormat eAlphaFormat, OutDevType eOutDevType);
OutDevType eOutDevType);
public:
/** Create a virtual device of size 1x1
@param eFormat
Device format of the generated virtual device. Use DeviceFormat::DEFAULT here, to
indicate: take default screen depth.
@param eAlphaFormat
Device format of the generated virtual device. Use DeviceFormat::DEFAULT here, to
indicate: take default screen depth.
Device format of the generated virtual device.
*/
explicit VirtualDevice(DeviceFormat eFormat = DeviceFormat::DEFAULT, DeviceFormat eAlphaFormat = DeviceFormat::NONE)
: VirtualDevice(nullptr, eFormat, eAlphaFormat, OUTDEV_VIRDEV) {}
explicit VirtualDevice(DeviceFormat eFormat = DeviceFormat::WITHOUT_ALPHA)
: VirtualDevice(nullptr, eFormat, OUTDEV_VIRDEV) {}
/** Create a virtual device of size 1x1
@@ -115,29 +104,11 @@ public:
The generated vdev will be compatible to this device.
@param eFormat
Device format of the generated virtual device. Use DeviceFormat::DEFAULT here, to
indicate: take default screen depth.
Device format of the generated virtual device.
*/
explicit VirtualDevice(const OutputDevice& rCompDev,
DeviceFormat eFormat = DeviceFormat::DEFAULT)
: VirtualDevice(&rCompDev, eFormat, DeviceFormat::NONE, OUTDEV_VIRDEV) {}
/** Create a virtual device of size 1x1 with alpha channel
@param rCompDev
The generated vdev will be compatible to this device.
@param eFormat
Device format of the generated virtual device. Use DeviceFormat::DEFAULT here, to
indicate: take default screen depth.
@param eAlphaFormat
Device format of the generated virtual device. Use DeviceFormat::DEFAULT here, to
indicate: take default screen depth.
*/
explicit VirtualDevice(const OutputDevice& rCompDev,
DeviceFormat eFormat, DeviceFormat eAlphaFormat)
: VirtualDevice(&rCompDev, eFormat, eAlphaFormat, OUTDEV_VIRDEV) {}
DeviceFormat eFormat = DeviceFormat::WITHOUT_ALPHA)
: VirtualDevice(&rCompDev, eFormat, OUTDEV_VIRDEV) {}
/** Create a virtual device using an existing system dependent device or graphics context
Any rendering will happen directly on the context and not on any intermediate bitmap.
sc/qa/unit/tiledrendering/tiledrendering.cxx
+3 -3
View File
@@ -1440,7 +1440,7 @@ void ScTiledRenderingTest::testInsertGraphicInvalidations()
int nCanvasWidth = 256;
int nCanvasHeight = 256;
std::vector<unsigned char> aBuffer(nCanvasWidth * nCanvasHeight * 4);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(), aBuffer.data());
pModelObj->paintTile(*pDevice, nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/0, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
Scheduler::ProcessEventsToIdle();
@@ -1476,7 +1476,7 @@ void ScTiledRenderingTest::testDocumentSizeWithTwoViews()
int nCanvasWidth = 256;
int nCanvasHeight = 256;
std::vector<unsigned char> aBuffer1(nCanvasWidth * nCanvasHeight * 4);
ScopedVclPtrInstance<VirtualDevice> pDevice1(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice1(DeviceFormat::WITHOUT_ALPHA);
pDevice1->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(), aBuffer1.data());
pModelObj->paintTile(*pDevice1, nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
Scheduler::ProcessEventsToIdle();
@@ -1486,7 +1486,7 @@ void ScTiledRenderingTest::testDocumentSizeWithTwoViews()
SfxLokHelper::createView();
std::vector<unsigned char> aBuffer2(nCanvasWidth * nCanvasHeight * 4);
ScopedVclPtrInstance<VirtualDevice> pDevice2(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice2(DeviceFormat::WITHOUT_ALPHA);
pDevice2->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(), aBuffer2.data());
pModelObj->paintTile(*pDevice2, nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
Scheduler::ProcessEventsToIdle();
sc/source/core/data/documen8.cxx
+1 -1
View File
@@ -186,7 +186,7 @@ VirtualDevice* ScDocument::GetVirtualDevice_100th_mm()
#ifdef IOS
mpVirtualDevice_100th_mm = VclPtr<VirtualDevice>::Create(DeviceFormat::GRAYSCALE);
#else
mpVirtualDevice_100th_mm = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
mpVirtualDevice_100th_mm = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
#endif
mpVirtualDevice_100th_mm->SetReferenceDevice(VirtualDevice::RefDevMode::MSO1);
MapMode aMapMode( mpVirtualDevice_100th_mm->GetMapMode() );
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+1 -1
View File
@@ -128,7 +128,7 @@ void InsertionIndicatorOverlay::Create (
// Create virtual devices for bitmap and mask whose bitmaps later be
// combined to form the BitmapEx of the icon.
ScopedVclPtrInstance<VirtualDevice> pContent(
*mrSlideSorter.GetContentWindow()->GetOutDev(), DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
*mrSlideSorter.GetContentWindow()->GetOutDev(), DeviceFormat::WITH_ALPHA);
pContent->SetOutputSizePixel(aIconSize);
pContent->SetFillColor();
slideshow/source/engine/shapes/gdimtftools.cxx
+1 -1
View File
@@ -268,7 +268,7 @@ bool getAnimationFromGraphic( VectorOfMtfAnimationFrames& o_rFrames,
pVDev->EnableMapMode( false );
// setup mask VDev (alpha VDev is currently rather slow)
ScopedVclPtrInstance<VirtualDevice> pVDevMask(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pVDevMask(DeviceFormat::WITHOUT_ALPHA);
pVDevMask->SetOutputSizePixel( aAnimSize );
pVDevMask->EnableMapMode( false );
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+2 -2
View File
@@ -225,7 +225,7 @@ static void CalculateHorizontalScalingFactor(
aFont.SetOrientation( 0_deg10 );
// initializing virtual device
ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::DEFAULT);
ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::WITHOUT_ALPHA);
pVirDev->SetMapMode(MapMode(MapUnit::Map100thMM));
pVirDev->SetFont( aFont );
@@ -338,7 +338,7 @@ static void GetTextAreaOutline(
aFont.SetWeight( rWeightItem.GetWeight() );
// initializing virtual device
ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::DEFAULT);
ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::WITHOUT_ALPHA);
pVirDev->SetMapMode(MapMode(MapUnit::Map100thMM));
pVirDev->SetFont( aFont );
pVirDev->EnableRTL();
svx/source/dialog/dialcontrol.cxx
+1 -1
View File
@@ -32,7 +32,7 @@ namespace svx {
const tools::Long DIAL_OUTER_WIDTH = 8;
DialControlBmp::DialControlBmp(OutputDevice& rReference)
: VirtualDevice(rReference, DeviceFormat::DEFAULT, DeviceFormat::DEFAULT)
: VirtualDevice(rReference, DeviceFormat::WITH_ALPHA)
, mbEnabled(true)
, mrParent(rReference)
, mnCenterX(0)
sw/qa/extras/tiledrendering/tiledrendering.cxx
+13 -13
View File
@@ -1838,7 +1838,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testPaintCallbacks)
int nCanvasWidth = 256;
int nCanvasHeight = 256;
std::vector<unsigned char> aBuffer(nCanvasWidth * nCanvasHeight * 4);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(), aBuffer.data());
// Make sure that painting a tile in the second view doesn't invoke
// callbacks on the first view.
@@ -2674,7 +2674,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSemiTransparent)
size_t nCanvasHeight = 512;
size_t nTileSize = 256;
std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight),
Fraction(1.0), Point(), aPixmap.data());
@@ -2703,7 +2703,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testHighlightNumbering)
size_t nCanvasHeight = 512;
size_t nTileSize = 256;
std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight),
Fraction(1.0), Point(), aPixmap.data());
@@ -2728,7 +2728,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testHighlightNumbering_shd)
size_t nCanvasHeight = 512;
size_t nTileSize = 256;
std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight),
Fraction(1.0), Point(), aPixmap.data());
@@ -2758,7 +2758,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testPilcrowRedlining)
size_t nCanvasHeight = 1024;
size_t nTileSize = 512;
std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight),
Fraction(1.0), Point(), aPixmap.data());
@@ -2821,7 +2821,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut)
size_t nCanvasHeight = 350;
size_t nTileSize = 350;
std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight),
Fraction(1.0), Point(), aPixmap.data());
@@ -2867,7 +2867,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testTdf43244_SpacesOnMargin)
size_t nCanvasHeight = 512;
size_t nTileSize = 64;
std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight),
Fraction(1.0), Point(), aPixmap.data());
@@ -2910,7 +2910,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testClipText)
size_t nCanvasHeight = 512;
size_t nTileSize = 256;
std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight),
Fraction(1.0), Point(), aPixmap.data());
@@ -3039,7 +3039,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDropDownFormFieldButton)
size_t nCanvasWidth = 1024;
size_t nCanvasHeight = 512;
std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight),
Fraction(1.0), Point(), aPixmap.data());
@@ -3112,7 +3112,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDropDownFormFieldButtonEditing)
size_t nCanvasWidth = 1024;
size_t nCanvasHeight = 512;
std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight),
Fraction(1.0), Point(), aPixmap.data());
@@ -3169,7 +3169,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDropDownFormFieldButtonNoSelectio
size_t nCanvasWidth = 1024;
size_t nCanvasHeight = 512;
std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight),
Fraction(1.0), Point(), aPixmap.data());
@@ -3255,7 +3255,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDropDownFormFieldButtonNoItem)
size_t nCanvasWidth = 1024;
size_t nCanvasHeight = 512;
std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight),
Fraction(1.0), Point(), aPixmap.data());
@@ -3292,7 +3292,7 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testTablePaintInvalidate)
size_t nCanvasWidth = 256;
size_t nCanvasHeight = 256;
std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::WITHOUT_ALPHA);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndLOKBuffer(Size(nCanvasWidth, nCanvasHeight),
Fraction(1.0), Point(), aPixmap.data());
sw/source/core/doc/DocumentDeviceManager.cxx
+1 -1
View File
@@ -262,7 +262,7 @@ VirtualDevice& DocumentDeviceManager::CreateVirtualDevice_() const
#ifdef IOS
VclPtr<VirtualDevice> pNewVir = VclPtr<VirtualDevice>::Create(DeviceFormat::GRAYSCALE);
#else
VclPtr<VirtualDevice> pNewVir = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
VclPtr<VirtualDevice> pNewVir = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
#endif
pNewVir->SetReferenceDevice( VirtualDevice::RefDevMode::MSO1 );
sw/source/uibase/uno/unotxdoc.cxx
+1 -1
View File
@@ -3771,7 +3771,7 @@ void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_I
sal_Int64 nWindowHandle;
Parent >>= nWindowHandle;
aData.hWnd = reinterpret_cast<HWND>(nWindowHandle);
ScopedVclPtrInstance<VirtualDevice> xDevice(aData, Size(1, 1), DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> xDevice(aData, Size(1, 1), DeviceFormat::WITHOUT_ALPHA);
paintTile(*xDevice, nOutputWidth, nOutputHeight, nTilePosX, nTilePosY, nTileWidth, nTileHeight);
#else
// TODO: support other platforms
test/source/bootstrapfixture.cxx
+1 -1
View File
@@ -274,7 +274,7 @@ std::pair<double, double> test::BootstrapFixture::getDPIScaling()
sal_uInt16 test::BootstrapFixture::getDefaultDeviceBitCount()
{
ScopedVclPtr<VirtualDevice> device
= VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
= VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
return device->GetBitCount();
}
toolkit/source/controls/table/gridtablerenderer.cxx
+1 -2
View File
@@ -85,8 +85,7 @@ namespace svt::table
Point const aBitmapPos( 0, 0 );
Size const aBitmapSize( nSortIndicatorWidth, nSortIndicatorHeight );
ScopedVclPtrInstance< VirtualDevice > aDevice(i_device, DeviceFormat::DEFAULT,
DeviceFormat::DEFAULT);
ScopedVclPtrInstance< VirtualDevice > aDevice(i_device, DeviceFormat::WITH_ALPHA);
aDevice->SetOutputSizePixel( aBitmapSize );
DecorationView aDecoView(aDevice.get());
vcl/backendtest/outputdevice/common.cxx
+2 -2
View File
@@ -352,9 +352,9 @@ OUString OutputDeviceTestCommon::getRenderBackendName() const
void OutputDeviceTestCommon::initialSetup(tools::Long nWidth, tools::Long nHeight, Color aColor, bool bEnableAA, bool bAlphaVirtualDevice)
{
if (bAlphaVirtualDevice)
mpVirtualDevice = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
mpVirtualDevice = VclPtr<VirtualDevice>::Create(DeviceFormat::WITH_ALPHA);
else
mpVirtualDevice = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
mpVirtualDevice = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
maVDRectangle = tools::Rectangle(Point(), Size (nWidth, nHeight));
mpVirtualDevice->SetOutputSizePixel(maVDRectangle.GetSize());
vcl/qa/cppunit/BackendTest.cxx
+13 -9
View File
@@ -779,7 +779,7 @@ public:
{
// Create normal virtual device (no alpha).
ScopedVclPtr<VirtualDevice> device
= VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
= VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(10, 10));
// Erase with white, check it's white.
device->SetBackground(Wallpaper(COL_WHITE));
@@ -806,7 +806,7 @@ public:
{
// Create virtual device with alpha.
ScopedVclPtr<VirtualDevice> device
= VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
= VclPtr<VirtualDevice>::Create(DeviceFormat::WITH_ALPHA);
device->SetOutputSizePixel(Size(10, 10));
// Erase with white, check it's white.
device->SetBackground(Wallpaper(COL_WHITE));
@@ -1139,7 +1139,7 @@ public:
return;
// Create virtual device with alpha.
ScopedVclPtr<VirtualDevice> device
= VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
= VclPtr<VirtualDevice>::Create(DeviceFormat::WITH_ALPHA);
#ifdef MACOSX
// TODO: This unit test is not executed for macOS unless bitmap scaling is implemented
if (getRenderBackendName(device) == "aqua")
@@ -1194,7 +1194,8 @@ public:
if (getDefaultDeviceBitCount() < 24)
return;
// Normal virtual device.
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device
= VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
#ifdef MACOSX
// TODO: This unit test is not executed for macOS unless bitmap scaling is implemented
if (getRenderBackendName(device) == "aqua")
@@ -1202,7 +1203,7 @@ public:
#endif
// Virtual device with alpha.
ScopedVclPtr<VirtualDevice> alphaDevice
= VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
= VclPtr<VirtualDevice>::Create(DeviceFormat::WITH_ALPHA);
device->SetOutputSizePixel(Size(20, 20));
device->SetBackground(Wallpaper(COL_BLACK));
device->Erase();
@@ -1349,7 +1350,8 @@ public:
void testTdf124848()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device
= VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
#ifdef MACOSX
// TODO: This unit test is not executed for macOS unless bitmap scaling is implemented
if (getRenderBackendName(device) == "aqua")
@@ -1390,7 +1392,7 @@ public:
return;
// Create virtual device with alpha.
ScopedVclPtr<VirtualDevice> device
= VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
= VclPtr<VirtualDevice>::Create(DeviceFormat::WITH_ALPHA);
device->SetOutputSizePixel(Size(10, 10));
device->SetBackground(Wallpaper(COL_WHITE));
device->Erase();
@@ -1415,7 +1417,8 @@ public:
{
// VCL may call copyArea()/copyBits() of backends even with coordinates partially
// outside of the device, so try various copying like that.
ScopedVclPtr<VirtualDevice> device1 = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device1
= VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device1->SetOutputSizePixel(Size(100, 100));
device1->SetBackground(Wallpaper(COL_YELLOW));
device1->Erase();
@@ -1429,7 +1432,8 @@ public:
#endif
// Plain 1:1 copy device1->device2.
ScopedVclPtr<VirtualDevice> device2 = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device2
= VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device2->SetOutputSizePixel(Size(100, 100));
device2->DrawOutDev(Point(0, 0), Size(100, 100), Point(0, 0), Size(100, 100), *device1);
exportDevice("tdf145811-1.png", device2);
vcl/qa/cppunit/FontFeatureTest.cxx
+3 -3
View File
@@ -42,7 +42,7 @@ void FontFeatureTest::testGetFontFeaturesGraphite()
{
#if HAVE_MORE_FONTS
ScopedVclPtrInstance<VirtualDevice> aVDev(*Application::GetDefaultDevice(),
DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
DeviceFormat::WITH_ALPHA);
aVDev->SetOutputSizePixel(Size(10, 10));
OUString aFontName("Linux Libertine G");
@@ -126,7 +126,7 @@ void FontFeatureTest::testGetFontFeaturesOpenType()
{
#if HAVE_MORE_FONTS
ScopedVclPtrInstance<VirtualDevice> aVDev(*Application::GetDefaultDevice(),
DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
DeviceFormat::WITH_ALPHA);
aVDev->SetOutputSizePixel(Size(10, 10));
OUString aFontName("Amiri");
@@ -175,7 +175,7 @@ void FontFeatureTest::testGetFontFeaturesOpenTypeEnum()
{
#if HAVE_MORE_FONTS
ScopedVclPtrInstance<VirtualDevice> aVDev(*Application::GetDefaultDevice(),
DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
DeviceFormat::WITH_ALPHA);
aVDev->SetOutputSizePixel(Size(10, 10));
OUString aFontName("Reem Kufi");
vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
+2 -2
View File
@@ -182,8 +182,8 @@ void BitmapRenderTest::testAlphaVirtualDevice()
// TODO: This unit test is not executed for macOS unless bitmap scaling is implemented
#ifndef MACOSX
// Create an alpha virtual device
ScopedVclPtr<VirtualDevice> pAlphaVirtualDevice(VclPtr<VirtualDevice>::Create(
*Application::GetDefaultDevice(), DeviceFormat::DEFAULT, DeviceFormat::DEFAULT));
ScopedVclPtr<VirtualDevice> pAlphaVirtualDevice(
VclPtr<VirtualDevice>::Create(*Application::GetDefaultDevice(), DeviceFormat::WITH_ALPHA));
// Set it up
pAlphaVirtualDevice->SetOutputSizePixel(Size(4, 4));
vcl/qa/cppunit/cjktext.cxx
+1 -1
View File
@@ -105,7 +105,7 @@ static tools::Long getCharacterRightSideHeight(VirtualDevice* device, const Poin
void VclCjkTextTest::testVerticalText()
{
OUString text(u"\x30e8");
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(100, 100));
device->SetBackground(Wallpaper(COL_WHITE));
// Disable AA, to make all pixels be black or white.
vcl/qa/cppunit/lifecycle.cxx
+1 -1
View File
@@ -72,7 +72,7 @@ void LifecycleTest::testVirtualDevice()
VclPtr<VirtualDevice> pVDev = VclPtr< VirtualDevice >::Create();
ScopedVclPtrInstance< VirtualDevice > pVDev2;
VclPtrInstance<VirtualDevice> pVDev3;
VclPtrInstance<VirtualDevice> pVDev4(DeviceFormat::DEFAULT);
VclPtrInstance<VirtualDevice> pVDev4(DeviceFormat::WITHOUT_ALPHA);
CPPUNIT_ASSERT(!!pVDev);
CPPUNIT_ASSERT(!!pVDev2);
CPPUNIT_ASSERT(!!pVDev3);
vcl/qa/cppunit/logicalfontinstance.cxx
+1 -1
View File
@@ -37,7 +37,7 @@ public:
void VclLogicalFontInstanceTest::testglyphboundrect()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(1000, 1000));
device->SetFont(vcl::Font("Liberation Sans", Size(0, 110)));
vcl/qa/cppunit/skia/skia.cxx
+7 -6
View File
@@ -116,7 +116,7 @@ void SkiaTest::testDrawShaders()
{
if (!SkiaHelper::isVCLSkiaEnabled())
return;
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(20, 20));
device->SetBackground(Wallpaper(COL_WHITE));
device->Erase();
@@ -159,7 +159,8 @@ void SkiaTest::testDrawShaders()
device->Erase();
// Test with scaling. Use everything 10x larger to reduce the impact of smoothscaling.
ScopedVclPtr<VirtualDevice> deviceLarge = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> deviceLarge
= VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
deviceLarge->SetOutputSizePixel(Size(200, 200));
deviceLarge->SetBackground(Wallpaper(COL_WHITE));
deviceLarge->Erase();
@@ -439,7 +440,7 @@ void SkiaTest::testDrawDelayedScaleImage()
return;
if (SkiaHelper::renderMethodToUse() != SkiaHelper::RenderRaster)
return; // This test tests caching that's done only in raster mode.
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(10, 10));
device->SetBackground(Wallpaper(COL_WHITE));
device->Erase();
@@ -513,7 +514,7 @@ void SkiaTest::testTdf137329()
return;
// Draw a filled polygon in the entire device, with AA enabled.
// All pixels in the device should be black, even those at edges (i.e. not affected by AA).
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(10, 10));
device->SetBackground(Wallpaper(COL_WHITE));
device->SetAntialiasing(AntialiasingFlags::Enable);
@@ -534,7 +535,7 @@ void SkiaTest::testTdf140848()
{
if (!SkiaHelper::isVCLSkiaEnabled())
return;
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(1300, 400));
device->SetBackground(Wallpaper(COL_BLACK));
device->SetAntialiasing(AntialiasingFlags::Enable);
@@ -562,7 +563,7 @@ void SkiaTest::testTdf132367()
{
if (!SkiaHelper::isVCLSkiaEnabled())
return;
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(2, 2));
device->SetBackground(Wallpaper(COL_BLACK));
device->Erase();
vcl/qa/cppunit/text.cxx
+12 -12
View File
@@ -175,7 +175,7 @@ static tools::Long getCharacterLeftSideHeight(VirtualDevice* device, const Point
void VclTextTest::testSimpleText()
{
OUString text("L");
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(100, 100));
device->SetBackground(Wallpaper(COL_WHITE));
// Disable AA, to make all pixels be black or white.
@@ -605,7 +605,7 @@ void VclTextTest::testImplLayoutArgs_PrepareFallback_precalculatedglyphs()
void VclTextTest::testGetStringWithCenterEllpsis()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(1000, 1000));
device->SetFont(vcl::Font("DejaVu Sans", "Book", Size(0, 11)));
@@ -617,7 +617,7 @@ void VclTextTest::testGetStringWithCenterEllpsis()
void VclTextTest::testGetStringWithEndEllpsis()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(1000, 1000));
device->SetFont(vcl::Font("DejaVu Sans", "Book", Size(0, 11)));
@@ -636,7 +636,7 @@ void VclTextTest::testGetStringWithEndEllpsis()
void VclTextTest::testGetStringWithNewsEllpsis()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(1000, 1000));
device->SetFont(vcl::Font("DejaVu Sans", "Book", Size(0, 11)));
@@ -670,7 +670,7 @@ void VclTextTest::testGetStringWithNewsEllpsis()
void VclTextTest::testGetTextBreak()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(1000, 1000));
device->SetFont(vcl::Font("DejaVu Sans", "Book", Size(0, 11)));
@@ -694,7 +694,7 @@ void VclTextTest::testGetTextBreak()
void VclTextTest::testGetSingleLineTextRect()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(1000, 1000));
device->SetFont(vcl::Font("Liberation Sans", Size(0, 11)));
@@ -705,7 +705,7 @@ void VclTextTest::testGetSingleLineTextRect()
void VclTextTest::testGetSingleLineTextRectWithEndEllipsis()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(1000, 1000));
device->SetFont(vcl::Font("Liberation Sans", Size(0, 11)));
@@ -717,7 +717,7 @@ void VclTextTest::testGetSingleLineTextRectWithEndEllipsis()
void VclTextTest::testGetRightBottomAlignedSingleLineTextRect()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(1000, 1000));
device->SetFont(vcl::Font("Liberation Sans", Size(0, 11)));
@@ -729,7 +729,7 @@ void VclTextTest::testGetRightBottomAlignedSingleLineTextRect()
void VclTextTest::testGetRotatedSingleLineTextRect()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(1000, 1000));
device->SetFont(vcl::Font("Liberation Sans", Size(0, 11)));
@@ -744,7 +744,7 @@ void VclTextTest::testGetRotatedSingleLineTextRect()
void VclTextTest::testGetMultiLineTextRect()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(1000, 1000));
device->SetFont(vcl::Font("Liberation Sans", Size(0, 11)));
@@ -756,7 +756,7 @@ void VclTextTest::testGetMultiLineTextRect()
void VclTextTest::testGetMultiLineTextRectWithEndEllipsis()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(1000, 1000));
device->SetFont(vcl::Font("Liberation Sans", Size(0, 11)));
@@ -769,7 +769,7 @@ void VclTextTest::testGetMultiLineTextRectWithEndEllipsis()
void VclTextTest::testGetRightBottomAlignedMultiLineTextRect()
{
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT);
ScopedVclPtr<VirtualDevice> device = VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA);
device->SetOutputSizePixel(Size(1000, 1000));
device->SetFont(vcl::Font("Liberation Sans", Size(0, 11)));
vcl/qt5/QtSvpSurface.cxx
+1 -1
View File
@@ -83,7 +83,7 @@ VclPtr<VirtualDevice> QtSvpSurface::createVirtualDevice() const
aSystemGraphicsData.pSurface = m_pSurface.get();
return VclPtr<VirtualDevice>::Create(aSystemGraphicsData, get_surface_size(m_pSurface.get()),
DeviceFormat::DEFAULT);
DeviceFormat::WITHOUT_ALPHA);
}
} // namespace cairo
vcl/source/app/salvtables.cxx
+3 -3
View File
@@ -662,8 +662,8 @@ OUString SalInstanceWidget::strip_mnemonic(const OUString& rLabel) const
VclPtr<VirtualDevice> SalInstanceWidget::create_virtual_device() const
{
// create with (annoying) separate alpha layer that LibreOffice itself uses
return VclPtr<VirtualDevice>::Create(*Application::GetDefaultDevice(), DeviceFormat::DEFAULT,
DeviceFormat::DEFAULT);
return VclPtr<VirtualDevice>::Create(*Application::GetDefaultDevice(),
DeviceFormat::WITH_ALPHA);
}
void SalInstanceWidget::call_attention_to()
@@ -1379,7 +1379,7 @@ void SalInstanceWidget::DoRecursivePaint(vcl::Window* pWindow, const Point& rRen
pWindow->SetMapMode(aMapMode);
}
VclPtr<VirtualDevice> xOutput(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));
VclPtr<VirtualDevice> xOutput(VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA));
Size aChildSizePixel(pWindow->GetSizePixel());
xOutput->SetOutputSizePixel(aChildSizePixel);
vcl/source/filter/eps/eps.cxx
+1 -1
View File
@@ -1997,7 +1997,7 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, KernArra
vcl::Font aNotRotatedFont( maFont );
aNotRotatedFont.SetOrientation( 0_deg10 );
ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::DEFAULT);
ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::WITHOUT_ALPHA);
pVirDev->SetMapMode( rVDev.GetMapMode() );
pVirDev->SetFont( aNotRotatedFont );
pVirDev->SetTextAlign( eTextAlign );
vcl/source/gdi/gdimtf.cxx
+1 -1
View File
@@ -818,7 +818,7 @@ void GDIMetaFile::ImplAddGradientEx( GDIMetaFile& rMtf,
const Gradient& rGrad )
{
// Generate comment, GradientEx and Gradient actions (within DrawGradient)
ScopedVclPtrInstance< VirtualDevice > aVDev(rMapDev, DeviceFormat::DEFAULT);
ScopedVclPtrInstance< VirtualDevice > aVDev(rMapDev, DeviceFormat::WITHOUT_ALPHA);
aVDev->EnableOutput( false );
GDIMetaFile aGradMtf;
vcl/source/gdi/pdfwriter_impl.cxx
+1 -1
View File
@@ -1198,7 +1198,7 @@ double PDFPage::getHeight() const
PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext,
const css::uno::Reference< css::beans::XMaterialHolder >& xEnc,
PDFWriter& i_rOuterFace)
: VirtualDevice(Application::GetDefaultDevice(), DeviceFormat::DEFAULT, DeviceFormat::NONE, OUTDEV_PDF),
: VirtualDevice(Application::GetDefaultDevice(), DeviceFormat::WITHOUT_ALPHA, OUTDEV_PDF),
m_aMapMode( MapUnit::MapPoint, Point(), Fraction( 1, pointToPixel(1) ), Fraction( 1, pointToPixel(1) ) ),
m_aWidgetStyleSettings(Application::GetSettings().GetStyleSettings()),
m_nCurrentStructElement( 0 ),
vcl/source/gdi/virdev.cxx
+9 -12
View File
@@ -154,7 +154,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
(void)pOutDev->AcquireGraphics();
pGraphics = pOutDev->mpGraphics;
if ( pGraphics )
mpVirDev = pSVData->mpDefInst->CreateVirtualDevice(*pGraphics, nDX, nDY, meFormat, pData);
mpVirDev = pSVData->mpDefInst->CreateVirtualDevice(*pGraphics, nDX, nDY, meFormatAndAlpha, pData);
else
mpVirDev = nullptr;
if ( !mpVirDev )
@@ -200,14 +200,12 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
pSVData->maGDIData.mpFirstVirDev = this;
}
VirtualDevice::VirtualDevice(const OutputDevice* pCompDev, DeviceFormat eFormat,
DeviceFormat eAlphaFormat, OutDevType eOutDevType)
VirtualDevice::VirtualDevice(const OutputDevice* pCompDev, DeviceFormat eFormatAndAlpha,
OutDevType eOutDevType)
: OutputDevice(eOutDevType)
, meFormat(eFormat)
, meAlphaFormat(eAlphaFormat)
, meFormatAndAlpha(eFormatAndAlpha)
{
SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat)
<< ", " << static_cast<int>(eAlphaFormat)
SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormatAndAlpha)
<< ", " << static_cast<int>(eOutDevType) << " )" );
ImplInitVirDev(pCompDev ? pCompDev : Application::GetDefaultDevice(), 0, 0);
@@ -216,8 +214,7 @@ VirtualDevice::VirtualDevice(const OutputDevice* pCompDev, DeviceFormat eFormat,
VirtualDevice::VirtualDevice(const SystemGraphicsData& rData, const Size &rSize,
DeviceFormat eFormat)
: OutputDevice(OUTDEV_VIRDEV)
, meFormat(eFormat)
, meAlphaFormat(DeviceFormat::NONE)
, meFormatAndAlpha(eFormat)
{
SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat) << " )" );
@@ -303,7 +300,7 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bEra
assert(mpGraphics);
pNewVirDev = pSVData->mpDefInst->CreateVirtualDevice(*mpGraphics, nNewWidth, nNewHeight, meFormat);
pNewVirDev = pSVData->mpDefInst->CreateVirtualDevice(*mpGraphics, nNewWidth, nNewHeight, meFormatAndAlpha);
if ( pNewVirDev )
{
SalGraphics* pGraphics = pNewVirDev->AcquireGraphics();
@@ -359,7 +356,7 @@ bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
{
if( InnerImplSetOutputSizePixel(rNewSize, bErase, pBuffer) )
{
if (meAlphaFormat != DeviceFormat::NONE)
if (meFormatAndAlpha != DeviceFormat::WITHOUT_ALPHA)
{
// #110958# Setup alpha bitmap
if(mpAlphaVDev && mpAlphaVDev->GetOutputSizePixel() != rNewSize)
@@ -369,7 +366,7 @@ bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
if( !mpAlphaVDev )
{
mpAlphaVDev = VclPtr<VirtualDevice>::Create(*this, meAlphaFormat);
mpAlphaVDev = VclPtr<VirtualDevice>::Create(*this, meFormatAndAlpha);
mpAlphaVDev->InnerImplSetOutputSizePixel(rNewSize, bErase, nullptr);
}
vcl/source/image/ImplImage.cxx
+1 -1
View File
@@ -163,7 +163,7 @@ BitmapEx const & ImplImage::getBitmapExForHiDPI(bool bDisabled, SalGraphics* pGr
loadStockAtScale(pGraphics, maBitmapEx);
else // if (mxMetaFile)
{
ScopedVclPtrInstance<VirtualDevice> aVDev(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> aVDev(DeviceFormat::WITH_ALPHA);
aVDev->SetOutputSizePixel(aTarget);
mxMetaFile->WindStart();
mxMetaFile->Play(*aVDev, Point(), aTarget);
vcl/source/outdev/textline.cxx
+1 -2
View File
@@ -1050,8 +1050,7 @@ void OutputDevice::DrawWaveLine(const Point& rStartPos, const Point& rEndPos, to
size_t nWordLength = nEndX - nStartX;
// start with something big to avoid updating it frequently
nWordLength = nWordLength < 1024 ? 1024 : nWordLength;
ScopedVclPtrInstance< VirtualDevice > pVirtDev( *this, DeviceFormat::DEFAULT,
DeviceFormat::DEFAULT );
ScopedVclPtrInstance< VirtualDevice > pVirtDev( *this, DeviceFormat::WITH_ALPHA );
pVirtDev->SetOutputSizePixel( Size( nWordLength, nWaveHeight * 2 ), false );
pVirtDev->SetLineColor( GetLineColor() );
pVirtDev->SetBackground( Wallpaper( COL_TRANSPARENT ) );
vcl/source/outdev/transparent.cxx
+1 -1
View File
@@ -597,7 +597,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
if( !aDstRect.IsEmpty() )
{
// Create transparent buffer
ScopedVclPtrInstance<VirtualDevice> xVDev(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
ScopedVclPtrInstance<VirtualDevice> xVDev(DeviceFormat::WITH_ALPHA);
xVDev->mnDPIX = mnDPIX;
xVDev->mnDPIY = mnDPIY;
vcl/source/window/paint.cxx
+1 -2
View File
@@ -1521,8 +1521,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
// paint metafile to VDev
VclPtrInstance<VirtualDevice> pMaskedDevice(*i_pTargetOutDev,
DeviceFormat::DEFAULT,
DeviceFormat::DEFAULT);
DeviceFormat::WITH_ALPHA);
pMaskedDevice->SetOutputSizePixel( GetOutputSizePixel() );
pMaskedDevice->EnableRTL( IsRTLEnabled() );
vcl/source/window/syswin.cxx
+1 -1
View File
@@ -1124,7 +1124,7 @@ VclPtr<VirtualDevice> SystemWindow::createScreenshot()
Size aSize(GetOutputSizePixel());
VclPtr<VirtualDevice> xOutput(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));
VclPtr<VirtualDevice> xOutput(VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA));
xOutput->SetOutputSizePixel(aSize);
Point aPos;
vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
+1 -1
View File
@@ -250,7 +250,7 @@ namespace cairo
return VclPtr<VirtualDevice>::Create(aSystemGraphicsData,
Size(width, height),
DeviceFormat::DEFAULT);
DeviceFormat::WITHOUT_ALPHA);
}
/**
vcl/unx/gtk3/gtkcairo.cxx
+1 -1
View File
@@ -122,7 +122,7 @@ namespace cairo
return VclPtr<VirtualDevice>::Create(aSystemGraphicsData,
get_surface_size(mpSurface.get()),
DeviceFormat::DEFAULT);
DeviceFormat::WITHOUT_ALPHA);
}
}
vcl/unx/gtk3/gtkinst.cxx
+3 -3
View File
@@ -4483,7 +4483,7 @@ public:
gtk_container_resize_children(GTK_CONTAINER(m_pWidget));
#endif
VclPtr<VirtualDevice> xOutput(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));
VclPtr<VirtualDevice> xOutput(VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA));
xOutput->SetOutputSizePixel(aSize);
switch (rOutput.GetOutDevType())
@@ -6543,7 +6543,7 @@ public:
#endif
}
VclPtr<VirtualDevice> xOutput(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));
VclPtr<VirtualDevice> xOutput(VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA));
xOutput->SetOutputSizePixel(get_size());
cairo_surface_t* pSurface = get_underlying_cairo_surface(*xOutput);
cairo_t* cr = cairo_create(pSurface);
@@ -18352,7 +18352,7 @@ public:
#if !GTK_CHECK_VERSION(4, 0, 0)
, m_pAccessible(nullptr)
#endif
, m_xDevice(DeviceFormat::DEFAULT)
, m_xDevice(DeviceFormat::WITHOUT_ALPHA)
, m_pSurface(nullptr)
, m_nQueryTooltip(g_signal_connect(m_pDrawingArea, "query-tooltip", G_CALLBACK(signalQueryTooltip), this))
#if !GTK_CHECK_VERSION(4, 0, 0)
vcl/workben/vcldemo.cxx
+1 -1
View File
@@ -1096,7 +1096,7 @@ public:
if (static_cast<int>(eType) < RENDER_AS_BITMAPEX)
pNested = VclPtr<VirtualDevice>::Create(rDev).get();
else
pNested = VclPtr<VirtualDevice>::Create(rDev,DeviceFormat::DEFAULT,DeviceFormat::DEFAULT).get();
pNested = VclPtr<VirtualDevice>::Create(rDev,DeviceFormat::WITH_ALPHA).get();
pNested->SetOutputSizePixel(r.GetSize());
tools::Rectangle aWhole(Point(0,0), r.GetSize());