diff options
author | Armin Le Grand <alg@apache.org> | 2012-10-29 16:20:25 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-09 16:35:40 +0100 |
commit | 44fb0ceeb98f45bc301d021c11af2c13f051bd4b (patch) | |
tree | 8d276c90e9d324aafbdcf01a538ad41ba71ac380 /sd | |
parent | d6fd3fa6e840c6374f53beeae54f4aa71d73ffcd (diff) |
Resolves: #i121233# Added bitmap scaling methods BMP_SCALE_SUPER
added from symphony, also BMP_SCALE_LANCZOS, BMP_SCALE_BICUBIC,
BMP_SCALE_BILINEAR and BMP_SCALE_BOX.
Changed defaults for internal scalings, enhanced PDF export when reduched DPI
is used, added BMP_SCALE_BESTQUALITY and BMP_SCALE_FASTESTINTERPOLATE as new
default for Bitmap::Scale
(cherry picked from commit bf734a151dc5169b65cf5d2a127e4142b765326c)
Conflicts:
canvas/source/vcl/canvasbitmaphelper.cxx
canvas/source/vcl/canvashelper.cxx
sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx
vcl/inc/vcl/alpha.hxx
vcl/inc/vcl/bitmap.hxx
vcl/inc/vcl/bitmapex.hxx
vcl/source/gdi/bitmap3.cxx
vcl/source/gdi/impgraph.cxx
vcl/source/gdi/pdfwriter_impl2.cxx
vcl/source/helper/canvasbitmap.cxx
(cherry picked from commit 593c86280b64d97725adde0c0a0cc4f090fb2310)
Change-Id: I41cf0a7e11bdbc6510e22e762486420995ba739b
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/dlg/dlgass.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/presenter/SlideRenderer.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsFramePainter.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/tools/PreviewRenderer.cxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 1676e051f4a9..787d9f3c9a83 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -80,7 +80,7 @@ void InterpolateFixedBitmap( FixedBitmap * pBitmap ) { Bitmap aBmp( pBitmap->GetBitmap() ); Size aSize = pBitmap->GetSizePixel(); - aBmp.Scale( aSize, BMP_SCALE_BEST ); + aBmp.Scale( aSize, BMP_SCALE_BESTQUALITY ); pBitmap->SetBitmap( aBmp ); } diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index ccd6e795e087..6bf192a70baa 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -223,7 +223,7 @@ BitmapEx SlideRenderer::CreatePreview ( BitmapEx aScaledPreview = aPreview.GetBitmapEx(); aScaledPreview.Scale( Size(aPreviewSize.Width,aPreviewSize.Height), - BMP_SCALE_BEST); + BMP_SCALE_BESTQUALITY); return aScaledPreview; } } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx index 2c20852d956f..c70fad5e1124 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx @@ -76,7 +76,7 @@ Bitmap BitmapFactory::CreateBitmap ( false).GetBitmapEx().GetBitmap()); if (bDoSuperSampling) { - aPreview.Scale(rPixelSize, BMP_SCALE_BEST); + aPreview.Scale(rPixelSize, BMP_SCALE_BESTQUALITY); } return aPreview; diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx index dcf950f11926..45222d53a584 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -149,15 +149,15 @@ FramePainter::OffsetBitmap::OffsetBitmap ( const sal_Int32 nSideBitmapSize (64); if (nHorizontalPosition == 0 && nVerticalPosition == 0) { - maBitmap.Scale(Size(nSideBitmapSize,nSideBitmapSize), BMP_SCALE_FAST); + maBitmap.Scale(Size(nSideBitmapSize,nSideBitmapSize)); } else if (nHorizontalPosition == 0) { - maBitmap.Scale(Size(nSideBitmapSize,aSize.Height()), BMP_SCALE_FAST); + maBitmap.Scale(Size(nSideBitmapSize,aSize.Height())); } else if (nVerticalPosition == 0) { - maBitmap.Scale(Size(maBitmap.GetSizePixel().Width(), nSideBitmapSize), BMP_SCALE_FAST); + maBitmap.Scale(Size(maBitmap.GetSizePixel().Width(), nSideBitmapSize)); } } diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index b718c8f7c160..4375dfa2b7f6 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -207,7 +207,7 @@ Point InsertionIndicatorOverlay::PaintRepresentatives ( // Paint the preview. Bitmap aPreview (rRepresentatives[nIndex].maBitmap); - aPreview.Scale(aPreviewSize, BMP_SCALE_BEST); + aPreview.Scale(aPreviewSize, BMP_SCALE_BESTQUALITY); rContent.DrawBitmapEx(aPageOffset, aPreview); // When the page is marked as excluded from the slide show then diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 9aaa5b482ef5..9a355aa148e2 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -501,7 +501,7 @@ Image PreviewRenderer::ScaleBitmap ( // Paint the bitmap scaled to the desired width. BitmapEx aScaledBitmap (rBitmapEx.GetBitmap()); - aScaledBitmap.Scale (aPreviewSize, BMP_SCALE_BEST); + aScaledBitmap.Scale (aPreviewSize, BMP_SCALE_BESTQUALITY); mpPreviewDevice->DrawBitmap ( Point(1,1), aPreviewSize, |