diff options
| author | David Tardon <dtardon@redhat.com> | 2015-12-15 20:46:54 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-12-17 19:51:40 +0100 |
| commit | e1f3d2cce6e2717189ab8a1e85b98f28df05734b (patch) | |
| tree | d98acbdb8ec1cc31b10f9104a7b848c4725b89ec | |
| parent | dad3c6752e44d81cbba9c0a81dd776158ee2b7b3 (diff) | |
tdf#95450 avoid double swap on big endian arches
AFAICS the swapping is already done at basebmp::BitmapDevice level.
Change-Id: Ie82f2610b4415ed11fc1164a54bc1fe183f523ed
| -rw-r--r-- | vcl/headless/svpbmp.cxx | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index e6d962f268b3..a3ff4d785915 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -202,17 +202,10 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode ) { nBitCount = 32; pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; -#ifdef OSL_BIGENDIAN - ColorMaskElement aRedMask(0x0000ff00); - ColorMaskElement aGreenMask(0x00ff0000); - ColorMaskElement aBlueMask(0xff000000); - sal_uInt32 nAlphaChannel(0x000000ff); -#else ColorMaskElement aRedMask(0x00ff0000); ColorMaskElement aGreenMask(0x0000ff00); ColorMaskElement aBlueMask(0x000000ff); sal_uInt32 nAlphaChannel(0xff000000); -#endif aBlueMask.CalcMaskShift(); aRedMask.CalcMaskShift(); aGreenMask.CalcMaskShift(); @@ -223,17 +216,10 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode ) { nBitCount = 32; pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; -#ifdef OSL_BIGENDIAN - ColorMaskElement aRedMask(0x00ff0000); - ColorMaskElement aGreenMask(0x0000ff00); - ColorMaskElement aBlueMask(0x000000ff); - sal_uInt32 nAlphaChannel(0xff000000); -#else ColorMaskElement aRedMask(0x0000ff00); ColorMaskElement aGreenMask(0x00ff0000); ColorMaskElement aBlueMask(0xff000000); sal_uInt32 nAlphaChannel(0x000000ff); -#endif aBlueMask.CalcMaskShift(); aRedMask.CalcMaskShift(); aGreenMask.CalcMaskShift(); @@ -244,17 +230,10 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode ) { nBitCount = 32; pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; -#ifdef OSL_BIGENDIAN - ColorMaskElement aRedMask(0x000000ff); - ColorMaskElement aGreenMask(0x0000ff00); - ColorMaskElement aBlueMask(0x00ff0000); - sal_uInt32 nAlphaChannel(0xff000000); -#else ColorMaskElement aRedMask(0xff000000); ColorMaskElement aGreenMask(0x00ff0000); ColorMaskElement aBlueMask(0x0000ff00); sal_uInt32 nAlphaChannel(0x000000ff); -#endif aBlueMask.CalcMaskShift(); aRedMask.CalcMaskShift(); aGreenMask.CalcMaskShift(); @@ -265,17 +244,10 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode ) { nBitCount = 32; pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; -#ifdef OSL_BIGENDIAN - ColorMaskElement aRedMask(0xff000000); - ColorMaskElement aGreenMask(0x00ff0000); - ColorMaskElement aBlueMask(0x0000ff00); - sal_uInt32 nAlphaChannel(0x000000ff); -#else ColorMaskElement aRedMask(0x000000ff); ColorMaskElement aGreenMask(0x0000ff00); ColorMaskElement aBlueMask(0x00ff0000); sal_uInt32 nAlphaChannel(0xff000000); -#endif aBlueMask.CalcMaskShift(); aRedMask.CalcMaskShift(); aGreenMask.CalcMaskShift(); |