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 /svx | |
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 'svx')
-rw-r--r-- | svx/source/dialog/compressgraphicdialog.cxx | 2 | ||||
-rw-r--r-- | svx/source/gallery2/galobj.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index c691b1532220..597bd2929db4 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -228,7 +228,7 @@ sal_uLong CompressGraphicsDialog::GetSelectedInterpolationType() } else if ( aSelectionText == "None" ) { return BMP_SCALE_FAST; } - return BMP_SCALE_BEST; + return BMP_SCALE_BESTQUALITY; } void CompressGraphicsDialog::Compress(SvStream& aStream) diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 763790a15e48..290eaec38055 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -102,7 +102,7 @@ sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic ) std::max( (long) (fFactor < 1. ? S_THUMB : S_THUMB / fFactor), 8L ) ); if( aThumbBmp.Scale( (double) aNewSize.Width() / aBmpSize.Width(), - (double) aNewSize.Height() / aBmpSize.Height(), BMP_SCALE_BEST ) ) + (double) aNewSize.Height() / aBmpSize.Height(), BMP_SCALE_BESTQUALITY ) ) { aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS ); bRet = sal_True; |