mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#95450 avoid double swap on big endian arches

Browse Source 
AFAICS the swapping is already done at basebmp::BitmapDevice level.

Change-Id: Ie82f2610b4415ed11fc1164a54bc1fe183f523ed
This commit is contained in:
David Tardon
2015-12-15 20:46:54 +01:00
parent dad3c6752e
commit e1f3d2cce6
1 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
vcl/headless/svpbmp.cxx
View File

@@ -202,17 +202,10 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode )
{ {
nBitCount = 32; nBitCount = 32;
pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; 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 aRedMask(0x00ff0000);
ColorMaskElement aGreenMask(0x0000ff00); ColorMaskElement aGreenMask(0x0000ff00);
ColorMaskElement aBlueMask(0x000000ff); ColorMaskElement aBlueMask(0x000000ff);
sal_uInt32 nAlphaChannel(0xff000000); sal_uInt32 nAlphaChannel(0xff000000);
#endif
aBlueMask.CalcMaskShift(); aBlueMask.CalcMaskShift();
aRedMask.CalcMaskShift(); aRedMask.CalcMaskShift();
aGreenMask.CalcMaskShift(); aGreenMask.CalcMaskShift();
@@ -223,17 +216,10 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode )
{ {
nBitCount = 32; nBitCount = 32;
pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; 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 aRedMask(0x0000ff00);
ColorMaskElement aGreenMask(0x00ff0000); ColorMaskElement aGreenMask(0x00ff0000);
ColorMaskElement aBlueMask(0xff000000); ColorMaskElement aBlueMask(0xff000000);
sal_uInt32 nAlphaChannel(0x000000ff); sal_uInt32 nAlphaChannel(0x000000ff);
#endif
aBlueMask.CalcMaskShift(); aBlueMask.CalcMaskShift();
aRedMask.CalcMaskShift(); aRedMask.CalcMaskShift();
aGreenMask.CalcMaskShift(); aGreenMask.CalcMaskShift();
@@ -244,17 +230,10 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode )
{ {
nBitCount = 32; nBitCount = 32;
pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; 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 aRedMask(0xff000000);
ColorMaskElement aGreenMask(0x00ff0000); ColorMaskElement aGreenMask(0x00ff0000);
ColorMaskElement aBlueMask(0x0000ff00); ColorMaskElement aBlueMask(0x0000ff00);
sal_uInt32 nAlphaChannel(0x000000ff); sal_uInt32 nAlphaChannel(0x000000ff);
#endif
aBlueMask.CalcMaskShift(); aBlueMask.CalcMaskShift();
aRedMask.CalcMaskShift(); aRedMask.CalcMaskShift();
aGreenMask.CalcMaskShift(); aGreenMask.CalcMaskShift();
@@ -265,17 +244,10 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode )
{ {
nBitCount = 32; nBitCount = 32;
pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; 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 aRedMask(0x000000ff);
ColorMaskElement aGreenMask(0x0000ff00); ColorMaskElement aGreenMask(0x0000ff00);
ColorMaskElement aBlueMask(0x00ff0000); ColorMaskElement aBlueMask(0x00ff0000);
sal_uInt32 nAlphaChannel(0xff000000); sal_uInt32 nAlphaChannel(0xff000000);
#endif
aBlueMask.CalcMaskShift(); aBlueMask.CalcMaskShift();
aRedMask.CalcMaskShift(); aRedMask.CalcMaskShift();
aGreenMask.CalcMaskShift(); aGreenMask.CalcMaskShift();