diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-01 16:37:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-06-21 08:19:31 +0200 |
| commit | ec665e3e898e733c9f602b21046079e569b58568 (patch) | |
| tree | d557ec77afb9c7a19c4edf46325a403ef1a05d10 /vcl | |
| parent | 30d5569dcf46ddd84a85eb9bd38e18e59cfd2c9d (diff) | |
use more OutputDevice::GetBitmapEx
instead of GetBitmap
Change-Id: Ib43cfaf3c91968d623e5a24f44539368da28d36f
Reviewed-on: https://gerrit.libreoffice.org/55190
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/printdlg.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/impgraph.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/outdev/wallpaper.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/printdlg.cxx | 6 |
6 files changed, 9 insertions, 9 deletions
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index b16d91cad1f6..e855c123e5d3 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -44,7 +44,7 @@ namespace vcl Size maPreviewSize; sal_Int32 mnDPIX; sal_Int32 mnDPIY; - Bitmap maPreviewBitmap; + BitmapEx maPreviewBitmap; OUString maReplacementString; OUString maToolTipString; bool mbGreyscale; diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index e26dc197c004..b928b83f7695 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -2202,7 +2202,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r Graphic aGraphic2=aGraphic; aGraphic2.Draw(aVirDev.get(),Point(0,0),aSizePixel); // this changes the MapMode aVirDev->SetMapMode(MapMode(MapUnit::MapPixel)); - aGraphic=Graphic(aVirDev->GetBitmap(Point(0,0),aSizePixel)); + aGraphic=Graphic(aVirDev->GetBitmapEx(Point(0,0),aSizePixel)); } } if( rOStm.GetError() ) diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index aee51fb98b99..afad52d2cc3e 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -2812,7 +2812,7 @@ bool GDIMetaFile::CreateThumbnail(BitmapEx& rBitmapEx, BmpConversion eColorConve const_cast<GDIMetaFile *>(this)->Play(aVDev.get(), Point(), aAntialias); // get paint bitmap - Bitmap aBitmap( aVDev->GetBitmap( aNullPt, aVDev->GetOutputSizePixel() ) ); + BitmapEx aBitmap( aVDev->GetBitmapEx( aNullPt, aVDev->GetOutputSizePixel() ) ); // scale down the image to the desired size - use the input scaler for the scaling operation aBitmap.Scale(aDrawSize, nScaleFlag); @@ -2822,7 +2822,7 @@ bool GDIMetaFile::CreateThumbnail(BitmapEx& rBitmapEx, BmpConversion eColorConve if (aSize.Width() && aSize.Height()) aBitmap.Convert(eColorConversion); - rBitmapEx = BitmapEx(aBitmap); + rBitmapEx = aBitmap; } return !rBitmapEx.IsEmpty(); diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 792e46d27f27..ff59da4a9f0b 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -737,7 +737,7 @@ Bitmap ImpGraphic::ImplGetBitmap(const GraphicConversionParameters& rParameters) ImplDraw( aVDev.get(), Point(), aDrawSize ); // use maEx as local buffer for rendered metafile - const_cast< ImpGraphic* >(this)->maEx = aVDev->GetBitmap( Point(), aVDev->GetOutputSizePixel() ); + const_cast< ImpGraphic* >(this)->maEx = aVDev->GetBitmapEx( Point(), aVDev->GetOutputSizePixel() ); } } diff --git a/vcl/source/outdev/wallpaper.cxx b/vcl/source/outdev/wallpaper.cxx index 71b75c6c9054..105c23447229 100644 --- a/vcl/source/outdev/wallpaper.cxx +++ b/vcl/source/outdev/wallpaper.cxx @@ -146,7 +146,7 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY, aVDev->SetBackground( rWallpaper.GetColor() ); aVDev->SetOutputSizePixel( Size( nBmpWidth, nBmpHeight ) ); aVDev->DrawBitmapEx( Point(), aBmpEx ); - aBmpEx = BitmapEx(aVDev->GetBitmap( Point(), aVDev->GetOutputSizePixel() )); + aBmpEx = aVDev->GetBitmapEx( Point(), aVDev->GetOutputSizePixel() ); } bDrawColorBackground = true; diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 084763fa934b..f5bf9a09326d 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -165,14 +165,14 @@ void PrintDialog::PrintPreviewWindow::Paint(vcl::RenderContext& rRenderContext, } else { - Bitmap aPreviewBitmap(maPreviewBitmap); + BitmapEx aPreviewBitmap(maPreviewBitmap); // This explicit force-to-scale allows us to get the // mentioned best quality here. Unfortunately this is // currently not sure when using just ::DrawBitmap with // a defined size or ::DrawOutDev aPreviewBitmap.Scale(maPreviewSize, BmpScaleFlag::BestQuality); - rRenderContext.DrawBitmap(aOffset, aPreviewBitmap); + rRenderContext.DrawBitmapEx(aOffset, aPreviewBitmap); } tools::Rectangle aFrameRect(aOffset + Point(-1, -1), Size(maPreviewSize.Width() + 2, maPreviewSize.Height() + 2)); @@ -377,7 +377,7 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap() SetMapMode(MapMode(MapUnit::MapPixel)); pPrerenderVDev->SetMapMode(MapMode(MapUnit::MapPixel)); - maPreviewBitmap = pPrerenderVDev->GetBitmap(Point(0, 0), aVDevSize); + maPreviewBitmap = pPrerenderVDev->GetBitmapEx(Point(0, 0), aVDevSize); pPrerenderVDev->SetDrawMode( nOldDrawMode ); } |