Skip to content

C
core
Kaydet (Commit) c686f29e authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

drop unused argument 

Change-Id: I0333f65f67cdd93f9773e6d738289e36353ef359
üst 3dc11410
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 43 deletions
basebmp/source/bitmapdevice.cxx
Dosyayı görüntüle @ c686f29e
...@@ -174,7 +174,6 @@ namespace ...@@ -174,7 +174,6 @@ namespace
BitmapRenderer( const basegfx::B2IBox& rBounds, BitmapRenderer( const basegfx::B2IBox& rBounds,
const basegfx::B2IVector& rBufferSize,
Format nScanlineFormat, Format nScanlineFormat,
sal_Int32 nScanlineStride, sal_Int32 nScanlineStride,
sal_uInt8* pFirstScanline, sal_uInt8* pFirstScanline,
...@@ -183,7 +182,7 @@ namespace ...@@ -183,7 +182,7 @@ namespace
dest_accessor_type accessor, dest_accessor_type accessor,
const RawMemorySharedArray& rMem, const RawMemorySharedArray& rMem,
const PaletteMemorySharedVector& rPalette ) : const PaletteMemorySharedVector& rPalette ) :
BitmapDevice( rBounds, rBufferSize, nScanlineFormat, BitmapDevice( rBounds, nScanlineFormat,
nScanlineStride, pFirstScanline, rMem, rPalette ), nScanlineStride, pFirstScanline, rMem, rPalette ),
maBegin( begin ), maBegin( begin ),
maColorLookup(), maColorLookup(),
...@@ -318,9 +317,6 @@ struct ImplBitmapDevice ...@@ -318,9 +317,6 @@ struct ImplBitmapDevice
*/ */
basegfx::B2IBox maBounds; basegfx::B2IBox maBounds;
//// Size of the actual frame buffer
basegfx::B2IVector maBufferSize;
/// Scanline format, as provided at the constructor /// Scanline format, as provided at the constructor
Format mnScanlineFormat; Format mnScanlineFormat;
...@@ -349,7 +345,6 @@ struct ImplBitmapDevice ...@@ -349,7 +345,6 @@ struct ImplBitmapDevice
BitmapDevice::BitmapDevice( const basegfx::B2IBox& rBounds, BitmapDevice::BitmapDevice( const basegfx::B2IBox& rBounds,
const basegfx::B2IVector& rBufferSize,
Format nScanlineFormat, Format nScanlineFormat,
sal_Int32 nScanlineStride, sal_Int32 nScanlineStride,
sal_uInt8* pFirstScanline, sal_uInt8* pFirstScanline,
...@@ -360,7 +355,6 @@ BitmapDevice::BitmapDevice( const basegfx::B2IBox& rBounds, ...@@ -360,7 +355,6 @@ BitmapDevice::BitmapDevice( const basegfx::B2IBox& rBounds,
mpImpl->mpMem = rMem; mpImpl->mpMem = rMem;
mpImpl->mpPalette = rPalette; mpImpl->mpPalette = rPalette;
mpImpl->maBounds = rBounds; mpImpl->maBounds = rBounds;
mpImpl->maBufferSize = rBufferSize;
mpImpl->mnScanlineFormat = nScanlineFormat; mpImpl->mnScanlineFormat = nScanlineFormat;
mpImpl->mnScanlineStride = nScanlineStride; mpImpl->mnScanlineStride = nScanlineStride;
mpImpl->mpFirstScanline = pFirstScanline; mpImpl->mpFirstScanline = pFirstScanline;
...@@ -379,11 +373,6 @@ basegfx::B2IVector BitmapDevice::getSize() const ...@@ -379,11 +373,6 @@ basegfx::B2IVector BitmapDevice::getSize() const
mpImpl->maBounds.getMaxY() - mpImpl->maBounds.getMinY() ); mpImpl->maBounds.getMaxY() - mpImpl->maBounds.getMinY() );
} }
basegfx::B2IVector BitmapDevice::getBufferSize() const
{
return mpImpl->maBufferSize;
}
Format BitmapDevice::getScanlineFormat() const Format BitmapDevice::getScanlineFormat() const
{ {
return mpImpl->mnScanlineFormat; return mpImpl->mnScanlineFormat;
...@@ -431,7 +420,6 @@ void BitmapDevice::copyBitmap( const BitmapDeviceSharedPtr& rSrcBitmap ) ...@@ -431,7 +420,6 @@ void BitmapDevice::copyBitmap( const BitmapDeviceSharedPtr& rSrcBitmap )
template< class FormatTraits > template< class FormatTraits >
BitmapDeviceSharedPtr createRenderer( BitmapDeviceSharedPtr createRenderer(
const basegfx::B2IBox& rBounds, const basegfx::B2IBox& rBounds,
const basegfx::B2IVector& rBufferSize,
Format nScanlineFormat, Format nScanlineFormat,
sal_Int32 nScanlineStride, sal_Int32 nScanlineStride,
sal_uInt8* pFirstScanline, sal_uInt8* pFirstScanline,
...@@ -449,7 +437,6 @@ BitmapDeviceSharedPtr createRenderer( ...@@ -449,7 +437,6 @@ BitmapDeviceSharedPtr createRenderer(
return BitmapDeviceSharedPtr( return BitmapDeviceSharedPtr(
new Renderer( rBounds, new Renderer( rBounds,
rBufferSize,
nScanlineFormat, nScanlineFormat,
nScanlineStride, nScanlineStride,
pFirstScanline, pFirstScanline,
...@@ -487,7 +474,6 @@ PaletteMemorySharedVector createStandardPalette( ...@@ -487,7 +474,6 @@ PaletteMemorySharedVector createStandardPalette(
template< class FormatTraits > template< class FormatTraits >
BitmapDeviceSharedPtr createRenderer( BitmapDeviceSharedPtr createRenderer(
const basegfx::B2IBox& rBounds, const basegfx::B2IBox& rBounds,
const basegfx::B2IVector& rBufferSize,
Format nScanlineFormat, Format nScanlineFormat,
sal_Int32 nScanlineStride, sal_Int32 nScanlineStride,
sal_uInt8* pFirstScanline, sal_uInt8* pFirstScanline,
...@@ -495,7 +481,6 @@ BitmapDeviceSharedPtr createRenderer( ...@@ -495,7 +481,6 @@ BitmapDeviceSharedPtr createRenderer(
const PaletteMemorySharedVector& pPal ) const PaletteMemorySharedVector& pPal )
{ {
return createRenderer<FormatTraits>(rBounds, return createRenderer<FormatTraits>(rBounds,
rBufferSize,
nScanlineFormat, nScanlineFormat,
nScanlineStride, nScanlineStride,
pFirstScanline, pFirstScanline,
...@@ -510,7 +495,6 @@ BitmapDeviceSharedPtr createRenderer( ...@@ -510,7 +495,6 @@ BitmapDeviceSharedPtr createRenderer(
template< class FormatTraits > template< class FormatTraits >
BitmapDeviceSharedPtr createRenderer( BitmapDeviceSharedPtr createRenderer(
const basegfx::B2IBox& rBounds, const basegfx::B2IBox& rBounds,
const basegfx::B2IVector& rBufferSize,
Format nScanlineFormat, Format nScanlineFormat,
sal_Int32 nScanlineStride, sal_Int32 nScanlineStride,
sal_uInt8* pFirstScanline, sal_uInt8* pFirstScanline,
...@@ -523,7 +507,6 @@ BitmapDeviceSharedPtr createRenderer( ...@@ -523,7 +507,6 @@ BitmapDeviceSharedPtr createRenderer(
OSL_ASSERT(pPal); OSL_ASSERT(pPal);
return createRenderer<FormatTraits>(rBounds, return createRenderer<FormatTraits>(rBounds,
rBufferSize,
nScanlineFormat, nScanlineFormat,
nScanlineStride, nScanlineStride,
pFirstScanline, pFirstScanline,
...@@ -601,23 +584,23 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector& ...@@ -601,23 +584,23 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
case Format::OneBitMsbGrey: case Format::OneBitMsbGrey:
return createRenderer<PixelFormatTraits_GREY1_MSB>( return createRenderer<PixelFormatTraits_GREY1_MSB>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal ); pFirstScanline, pMem, pPal );
case Format::OneBitLsbGrey: case Format::OneBitLsbGrey:
return createRenderer<PixelFormatTraits_GREY1_LSB>( return createRenderer<PixelFormatTraits_GREY1_LSB>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal ); pFirstScanline, pMem, pPal );
case Format::OneBitMsbPal: case Format::OneBitMsbPal:
return createRenderer<PixelFormatTraits_PAL1_MSB>( return createRenderer<PixelFormatTraits_PAL1_MSB>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, pFirstScanline, pMem, pPal,
bitsPerPixel[nScanlineFormat] ); bitsPerPixel[nScanlineFormat] );
case Format::OneBitLsbPal: case Format::OneBitLsbPal:
return createRenderer<PixelFormatTraits_PAL1_LSB>( return createRenderer<PixelFormatTraits_PAL1_LSB>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, pFirstScanline, pMem, pPal,
bitsPerPixel[nScanlineFormat] ); bitsPerPixel[nScanlineFormat] );
...@@ -627,23 +610,23 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector& ...@@ -627,23 +610,23 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
case Format::FourBitMsbGrey: case Format::FourBitMsbGrey:
return createRenderer<PixelFormatTraits_GREY4_MSB>( return createRenderer<PixelFormatTraits_GREY4_MSB>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal ); pFirstScanline, pMem, pPal );
case Format::FourBitLsbGrey: case Format::FourBitLsbGrey:
return createRenderer<PixelFormatTraits_GREY4_LSB>( return createRenderer<PixelFormatTraits_GREY4_LSB>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal ); pFirstScanline, pMem, pPal );
case Format::FourBitMsbPal: case Format::FourBitMsbPal:
return createRenderer<PixelFormatTraits_PAL4_MSB>( return createRenderer<PixelFormatTraits_PAL4_MSB>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, pFirstScanline, pMem, pPal,
bitsPerPixel[nScanlineFormat] ); bitsPerPixel[nScanlineFormat] );
case Format::FourBitLsbPal: case Format::FourBitLsbPal:
return createRenderer<PixelFormatTraits_PAL4_LSB>( return createRenderer<PixelFormatTraits_PAL4_LSB>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, pFirstScanline, pMem, pPal,
bitsPerPixel[nScanlineFormat] ); bitsPerPixel[nScanlineFormat] );
...@@ -653,12 +636,12 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector& ...@@ -653,12 +636,12 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
case Format::EightBitGrey: case Format::EightBitGrey:
return createRenderer<PixelFormatTraits_GREY8>( return createRenderer<PixelFormatTraits_GREY8>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal ); pFirstScanline, pMem, pPal );
case Format::EightBitPal: case Format::EightBitPal:
return createRenderer<PixelFormatTraits_PAL8>( return createRenderer<PixelFormatTraits_PAL8>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal, pFirstScanline, pMem, pPal,
bitsPerPixel[nScanlineFormat] ); bitsPerPixel[nScanlineFormat] );
...@@ -668,40 +651,40 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector& ...@@ -668,40 +651,40 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector&
case Format::SixteenBitLsbTcMask: case Format::SixteenBitLsbTcMask:
return createRenderer<PixelFormatTraits_RGB16_565_LSB>( return createRenderer<PixelFormatTraits_RGB16_565_LSB>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal ); pFirstScanline, pMem, pPal );
case Format::SixteenBitMsbTcMask: case Format::SixteenBitMsbTcMask:
return createRenderer<PixelFormatTraits_RGB16_565_MSB>( return createRenderer<PixelFormatTraits_RGB16_565_MSB>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal ); pFirstScanline, pMem, pPal );
// twentyfour bit formats // twentyfour bit formats
case Format::TwentyFourBitTcMask: case Format::TwentyFourBitTcMask:
return createRenderer<PixelFormatTraits_BGR24>( return createRenderer<PixelFormatTraits_BGR24>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal ); pFirstScanline, pMem, pPal );
// thirtytwo bit formats // thirtytwo bit formats
case Format::ThirtyTwoBitTcMaskBGRA: case Format::ThirtyTwoBitTcMaskBGRA:
return createRenderer<PixelFormatTraits_BGRA32_8888>( return createRenderer<PixelFormatTraits_BGRA32_8888>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal ); pFirstScanline, pMem, pPal );
case Format::ThirtyTwoBitTcMaskARGB: case Format::ThirtyTwoBitTcMaskARGB:
return createRenderer<PixelFormatTraits_ARGB32_8888>( return createRenderer<PixelFormatTraits_ARGB32_8888>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal ); pFirstScanline, pMem, pPal );
case Format::ThirtyTwoBitTcMaskABGR: case Format::ThirtyTwoBitTcMaskABGR:
return createRenderer<PixelFormatTraits_ABGR32_8888>( return createRenderer<PixelFormatTraits_ABGR32_8888>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal ); pFirstScanline, pMem, pPal );
case Format::ThirtyTwoBitTcMaskRGBA: case Format::ThirtyTwoBitTcMaskRGBA:
return createRenderer<PixelFormatTraits_RGBA32_8888>( return createRenderer<PixelFormatTraits_RGBA32_8888>(
aBounds, rSize, nScanlineFormat, nScanlineStride, aBounds, nScanlineFormat, nScanlineStride,
pFirstScanline, pMem, pPal ); pFirstScanline, pMem, pPal );
default: default:
......
include/basebmp/bitmapdevice.hxx
Dosyayı görüntüle @ c686f29e
...@@ -64,13 +64,6 @@ public: ...@@ -64,13 +64,6 @@ public:
*/ */
basegfx::B2IVector getSize() const; 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 /** Query type of scanline memory format
*/ */
Format getScanlineFormat() const; Format getScanlineFormat() const;
...@@ -121,7 +114,6 @@ public: ...@@ -121,7 +114,6 @@ public:
protected: protected:
BASEBMP_DLLPRIVATE BitmapDevice( const basegfx::B2IBox& rBounds, BASEBMP_DLLPRIVATE BitmapDevice( const basegfx::B2IBox& rBounds,
const basegfx::B2IVector& rBufferSize,
Format nScanlineFormat, Format nScanlineFormat,
sal_Int32 nScanlineStride, sal_Int32 nScanlineStride,
sal_uInt8* pFirstScanline, sal_uInt8* pFirstScanline,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment