diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-31 15:26:51 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-11-01 00:18:48 +0200 |
| commit | d7a4a5b26813c94398aa51c3e817e882aba299ba (patch) | |
| tree | 4f43eb167740e390e6b7cca333b60bd8709eefd4 /vcl/source/gdi | |
| parent | 86ecd9560fe5666cd8814f513b80de7c67d1cbce (diff) | |
The "source size" of a VCL bitmap is not used for anything
Thorsten thought it might have been used for to the handling of the "Original
Size" functionality originally. That seems slightly broken currently in some
use cases, and this change doesn't make it any worse. (To see the brokenness,
play with resizing an image, reloading the document, and using "Original
Size". With the right sequence of actions, LO seems to think that the
"original size" is very small (1x1 pixel perhaps).)
Change-Id: I4e0852d2b367def5bc40baf95aac273d59731eec
Diffstat (limited to 'vcl/source/gdi')
| -rw-r--r-- | vcl/source/gdi/bitmap.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/gdi/impbmp.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/gdi/pngread.cxx | 2 |
3 files changed, 1 insertions, 12 deletions
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 7ba90c7dbc53..41fff7466179 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -262,12 +262,6 @@ Size Bitmap::GetSizePixel() const return( mpImpBmp ? mpImpBmp->ImplGetSize() : Size() ); } -void Bitmap::SetSourceSizePixel( const Size& rSize) -{ - if( mpImpBmp ) - mpImpBmp->ImplSetSourceSize( rSize); -} - sal_uInt16 Bitmap::GetBitCount() const { return( mpImpBmp ? mpImpBmp->ImplGetBitCount() : 0 ); diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index 5148163b526b..7181c0dc8483 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -32,8 +32,7 @@ ImpBitmap::ImpBitmap() : mnRefCount ( 1UL ), mnChecksum ( 0UL ), - mpSalBitmap ( ImplGetSVData()->mpDefInst->CreateSalBitmap() ), - maSourceSize( 0, 0 ) + mpSalBitmap ( ImplGetSVData()->mpDefInst->CreateSalBitmap() ) { } @@ -54,7 +53,6 @@ void ImpBitmap::ImplSetSalBitmap( SalBitmap* pBitmap ) sal_Bool ImpBitmap::ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) { - maSourceSize = rSize; return mpSalBitmap->Create( rSize, nBitCount, rPal ); } @@ -62,7 +60,6 @@ sal_Bool ImpBitmap::ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const B sal_Bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap ) { - maSourceSize = rImpBitmap.maSourceSize; mnChecksum = rImpBitmap.mnChecksum; return mpSalBitmap->Create( *rImpBitmap.mpSalBitmap ); } diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index ad5eff05e241..1dc4f4d7f782 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -652,8 +652,6 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint ) if( !mpAcc ) return false; - mpBmp->SetSourceSizePixel( maOrigSize ); - if ( mbAlphaChannel ) { mpAlphaMask = new AlphaMask( maTargetSize ); |