diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-07 13:34:01 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-12-07 20:48:41 +0000 |
| commit | bc45215ec6e5d508415465ad3f619c3dbe23f7c8 (patch) | |
| tree | 09b3fd7124e8b4274f8d5331cd4bfed1c943efff /basebmp | |
| parent | 48f0ba92a6e9828805ce6f5d87147b9d0dcefe3b (diff) | |
Resolves: tdf#96224 don't fiddle around with a separate alpha buffer
use a format that supports alpha directly
now we can unify the android and linux cases as well and drop the
BGRX support
Change-Id: I3c845913691d8194822423005d308cfa7ef13ec3
Reviewed-on: https://gerrit.libreoffice.org/20440
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'basebmp')
| -rw-r--r-- | basebmp/inc/rgbmaskpixelformats.hxx | 14 | ||||
| -rw-r--r-- | basebmp/source/bitmapdevice.cxx | 7 | ||||
| -rw-r--r-- | basebmp/source/debug.cxx | 2 | ||||
| -rw-r--r-- | basebmp/test/bmpmasktest.cxx | 4 |
4 files changed, 2 insertions, 25 deletions
diff --git a/basebmp/inc/rgbmaskpixelformats.hxx b/basebmp/inc/rgbmaskpixelformats.hxx index 63068826e04f..9fde0d015730 100644 --- a/basebmp/inc/rgbmaskpixelformats.hxx +++ b/basebmp/inc/rgbmaskpixelformats.hxx @@ -334,20 +334,6 @@ typedef PixelFormatTraitsTemplate_RGBMask< BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_RGBA32_8888::getter_type, PixelFormatTraits_RGBA32_8888::setter_type); -// Added for Cairo needs, perhaps Android should get an XRGB and replace -// some uses of ARGB with that instead ? - -typedef PixelFormatTraitsTemplate_RGBMask< - sal_uInt32, - 0x00000000, - 0x00FF0000, - 0x0000FF00, - 0x000000FF, - BASEBMP_TRUECOLORMASK_LSB_SWAP > PixelFormatTraits_BGRX32_8888; -BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_BGRX32_8888::getter_type, - PixelFormatTraits_BGRX32_8888::setter_type); - - } // namespace basebmp #endif /* INCLUDED_BASEBMP_INC_RGBMASKPIXELFORMATS_HXX */ diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index a50f0dfd5efc..37ebf9136686 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -109,7 +109,6 @@ static const o3tl::enumarray<Format,sal_uInt8> bitsPerPixel = 16, // SIXTEEN_BIT_LSB_TC_MASK 16, // SIXTEEN_BIT_MSB_TC_MASK 24, // TWENTYFOUR_BIT_TC_MASK - 32, // TWENTYFOUR_BIT_TC_MASK_BGRX 32, // THIRTYTWO_BIT_TC_MASK_BGRA 32, // THIRTYTWO_BIT_TC_MASK_ARGB 32, // THIRTYTWO_BIT_TC_MASK_ABGR @@ -2053,12 +2052,6 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector& // thirtytwo bit formats - // 8 red bits, 8 green bits, 8 blue bits, and 8 ignored bits like CAIRO_FORMAT_RGB24 - case Format::ThirtyTwoBitTcMaskBGRX: - return createRenderer<PixelFormatTraits_BGRX32_8888,StdMasks>( - aBounds, rSize, nScanlineFormat, nScanlineStride, - pFirstScanline, pMem, pPal, rDamage ); - case Format::ThirtyTwoBitTcMaskBGRA: return createRenderer<PixelFormatTraits_BGRA32_8888,StdMasks>( aBounds, rSize, nScanlineFormat, nScanlineStride, diff --git a/basebmp/source/debug.cxx b/basebmp/source/debug.cxx index 3b9de684e86b..f01fd390e1c2 100644 --- a/basebmp/source/debug.cxx +++ b/basebmp/source/debug.cxx @@ -63,8 +63,6 @@ namespace basebmp return "SIXTEEN_BIT_MSB_TC_MASK"; case Format::TwentyFourBitTcMask: return "TWENTYFOUR_BIT_TC_MASK"; - case Format::ThirtyTwoBitTcMaskBGRX: - return "THIRTYTWO_BIT_TC_MASK_BGRX"; case Format::ThirtyTwoBitTcMaskBGRA: return "THIRTYTWO_BIT_TC_MASK_BGRA"; case Format::ThirtyTwoBitTcMaskARGB: diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx index 7f7e9130c3d2..daa926365a46 100644 --- a/basebmp/test/bmpmasktest.cxx +++ b/basebmp/test/bmpmasktest.cxx @@ -177,13 +177,13 @@ public: DrawMode::Paint ); xBitmap = createBitmapDevice( aSize, false, - Format::ThirtyTwoBitTcMaskBGRX ); + Format::ThirtyTwoBitTcMaskBGRA ); xBitmap->clear(Color(0x80808080)); } { // mpOutput & mpBitmap const basegfx::B2ISize aSize(9, 9); xOutput = createBitmapDevice( aSize, false, - Format::ThirtyTwoBitTcMaskBGRX ); + Format::ThirtyTwoBitTcMaskBGRA ); xOutput->clear(Color(0xffffffff)); } |