diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-01-19 10:22:28 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-19 13:24:27 +0000 |
commit | c686f29e1e2e1ebf19ad711028135bf557702fd0 (patch) | |
tree | 9c07bcd091ebbe8b035b174241873eb23b619f4c | |
parent | MaskTraits unused now (diff) | |
download | core-c686f29e1e2e1ebf19ad711028135bf557702fd0.tar.gz core-c686f29e1e2e1ebf19ad711028135bf557702fd0.zip |
drop unused argument
Change-Id: I0333f65f67cdd93f9773e6d738289e36353ef359
-rw-r--r-- | basebmp/source/bitmapdevice.cxx | 53 | ||||
-rw-r--r-- | include/basebmp/bitmapdevice.hxx | 8 |
2 files changed, 18 insertions, 43 deletions
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index 5fc73863d24b..0eb5f47f8b91 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -174,7 +174,6 @@ namespace BitmapRenderer( const basegfx::B2IBox& rBounds, - const basegfx::B2IVector& rBufferSize, Format nScanlineFormat, sal_Int32 nScanlineStride, sal_uInt8* pFirstScanline, @@ -183,7 +182,7 @@ namespace dest_accessor_type accessor, const RawMemorySharedArray& rMem, const PaletteMemorySharedVector& rPalette ) : - BitmapDevice( rBounds, rBufferSize, nScanlineFormat, + BitmapDevice( rBounds, nScanlineFormat, nScanlineStride, pFirstScanline, rMem, rPalette ), maBegin( begin ), maColorLookup(), @@ -318,9 +317,6 @@ struct ImplBitmapDevice */ basegfx::B2IBox maBounds; - //// Size of the actual frame buffer - basegfx::B2IVector maBufferSize; - /// Scanline format, as provided at the constructor Format mnScanlineFormat; @@ -349,7 +345,6 @@ struct ImplBitmapDevice BitmapDevice::BitmapDevice( const basegfx::B2IBox& rBounds, - const basegfx::B2IVector& rBufferSize, Format nScanlineFormat, sal_Int32 nScanlineStride, sal_uInt8* pFirstScanline, @@ -360,7 +355,6 @@ BitmapDevice::BitmapDevice( const basegfx::B2IBox& rBounds, mpImpl->mpMem = rMem; mpImpl->mpPalette = rPalette; mpImpl->maBounds = rBounds; - mpImpl->maBufferSize = rBufferSize; mpImpl->mnScanlineFormat = nScanlineFormat; mpImpl->mnScanlineStride = nScanlineStride; mpImpl->mpFirstScanline = pFirstScanline; @@ -379,11 +373,6 @@ basegfx::B2IVector BitmapDevice::getSize() const mpImpl->maBounds.getMaxY() - mpImpl->maBounds.getMinY() ); } -basegfx::B2IVector BitmapDevice::getBufferSize() const -{ - return mpImpl->maBufferSize; -} - Format BitmapDevice::getScanlineFormat() const { return mpImpl->mnScanlineFormat; @@ -431,7 +420,6 @@ void BitmapDevice::copyBitmap( const BitmapDeviceSharedPtr& rSrcBitmap ) template< class FormatTraits > BitmapDeviceSharedPtr createRenderer( const basegfx::B2IBox& rBounds, - const basegfx::B2IVector& rBufferSize, Format nScanlineFormat, sal_Int32 nScanlineStride, sal_uInt8* pFirstScanline, @@ -449,7 +437,6 @@ BitmapDeviceSharedPtr createRenderer( return BitmapDeviceSharedPtr( new Renderer( rBounds, - rBufferSize, nScanlineFormat, nScanlineStride, pFirstScanline, @@ -487,7 +474,6 @@ PaletteMemorySharedVector createStandardPalette( template< class FormatTraits > BitmapDeviceSharedPtr createRenderer( const basegfx::B2IBox& rBounds, - const basegfx::B2IVector& rBufferSize, Format nScanlineFormat, sal_Int32 nScanlineStride, sal_uInt8* pFirstScanline, @@ -495,7 +481,6 @@ BitmapDeviceSharedPtr createRenderer( const PaletteMemorySharedVector& pPal ) { return createRenderer<FormatTraits>(rBounds, - rBufferSize, nScanlineFormat, nScanlineStride, pFirstScanline, @@ -510,7 +495,6 @@ BitmapDeviceSharedPtr createRenderer( template< class FormatTraits > BitmapDeviceSharedPtr createRenderer( const basegfx::B2IBox& rBounds, - const basegfx::B2IVector& rBufferSize, Format nScanlineFormat, sal_Int32 nScanlineStride, sal_uInt8* pFirstScanline, @@ -523,7 +507,6 @@ BitmapDeviceSharedPtr createRenderer( OSL_ASSERT(pPal); return createRenderer<FormatTraits>(rBounds, - rBufferSize, nScanlineFormat, nScanlineStride, pFirstScanline, @@ -601,23 +584,23 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector& case Format::OneBitMsbGrey: return createRenderer<PixelFormatTraits_GREY1_MSB>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal ); case Format::OneBitLsbGrey: return createRenderer<PixelFormatTraits_GREY1_LSB>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal ); case Format::OneBitMsbPal: return createRenderer<PixelFormatTraits_PAL1_MSB>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal, bitsPerPixel[nScanlineFormat] ); case Format::OneBitLsbPal: return createRenderer<PixelFormatTraits_PAL1_LSB>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal, bitsPerPixel[nScanlineFormat] ); @@ -627,23 +610,23 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector& case Format::FourBitMsbGrey: return createRenderer<PixelFormatTraits_GREY4_MSB>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal ); case Format::FourBitLsbGrey: return createRenderer<PixelFormatTraits_GREY4_LSB>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal ); case Format::FourBitMsbPal: return createRenderer<PixelFormatTraits_PAL4_MSB>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal, bitsPerPixel[nScanlineFormat] ); case Format::FourBitLsbPal: return createRenderer<PixelFormatTraits_PAL4_LSB>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal, bitsPerPixel[nScanlineFormat] ); @@ -653,12 +636,12 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector& case Format::EightBitGrey: return createRenderer<PixelFormatTraits_GREY8>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal ); case Format::EightBitPal: return createRenderer<PixelFormatTraits_PAL8>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal, bitsPerPixel[nScanlineFormat] ); @@ -668,40 +651,40 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector& case Format::SixteenBitLsbTcMask: return createRenderer<PixelFormatTraits_RGB16_565_LSB>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal ); case Format::SixteenBitMsbTcMask: return createRenderer<PixelFormatTraits_RGB16_565_MSB>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal ); // twentyfour bit formats case Format::TwentyFourBitTcMask: return createRenderer<PixelFormatTraits_BGR24>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal ); // thirtytwo bit formats case Format::ThirtyTwoBitTcMaskBGRA: return createRenderer<PixelFormatTraits_BGRA32_8888>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal ); case Format::ThirtyTwoBitTcMaskARGB: return createRenderer<PixelFormatTraits_ARGB32_8888>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal ); case Format::ThirtyTwoBitTcMaskABGR: return createRenderer<PixelFormatTraits_ABGR32_8888>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal ); case Format::ThirtyTwoBitTcMaskRGBA: return createRenderer<PixelFormatTraits_RGBA32_8888>( - aBounds, rSize, nScanlineFormat, nScanlineStride, + aBounds, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal ); default: diff --git a/include/basebmp/bitmapdevice.hxx b/include/basebmp/bitmapdevice.hxx index 85dc153a4576..8087adfe9b4e 100644 --- a/include/basebmp/bitmapdevice.hxx +++ b/include/basebmp/bitmapdevice.hxx @@ -64,13 +64,6 @@ public: */ basegfx::B2IVector getSize() const; - /** Query the size of the whole frame buffer - - @ return the size of the whole frame buffer, the same as - getSize() unless this is a "subset" device. - */ - basegfx::B2IVector getBufferSize() const; - /** Query type of scanline memory format */ Format getScanlineFormat() const; @@ -121,7 +114,6 @@ public: protected: BASEBMP_DLLPRIVATE BitmapDevice( const basegfx::B2IBox& rBounds, - const basegfx::B2IVector& rBufferSize, Format nScanlineFormat, sal_Int32 nScanlineStride, sal_uInt8* pFirstScanline, |