Skip to content

C
core
Kaydet (Commit) e1f3d2cc authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

tdf#95450 avoid double swap on big endian arches 

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

Change-Id: Ie82f2610b4415ed11fc1164a54bc1fe183f523ed
üst dad3c675
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 28 deletions
vcl/headless/svpbmp.cxx
Dosyayı görüntüle @ e1f3d2cc
...@@ -202,17 +202,10 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode ) ...@@ -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 ) ...@@ -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 ) ...@@ -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 ) ...@@ -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();
......
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