Skip to content

C
core
Kaydet (Commit) b00a99e4 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

THIRTYTWO_BIT_TC_MASK is the same as THIRTYTWO_BIT_TC_MASK_BGRA 

Change-Id: I917c4136614664a1816769300707f170312c885d
üst 04d937c1
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 15 deletions
basebmp/test/basictest.cxx
Dosyayı görüntüle @ b00a99e4
......@@ -266,7 +266,7 @@ public:
{
pDevice = createBitmapDevice( aSize,
true,
Format::THIRTYTWO_BIT_TC_MASK );
Format::THIRTYTWO_BIT_TC_MASK_BGRA );
const Color aCol4(0x01010101);
pDevice->setPixel( aPt, aCol4, DrawMode_PAINT );
......
basebmp/test/bmpdemo.cxx
Dosyayı görüntüle @ b00a99e4
......@@ -1055,7 +1055,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
basegfx::B2ISize aTestSize(1000,1000);
basebmp::BitmapDeviceSharedPtr pDevice( basebmp::createBitmapDevice( aTestSize,
false,
basebmp::Format::THIRTYTWO_BIT_TC_MASK ));
basebmp::Format::THIRTYTWO_BIT_TC_MASK_BGRA ));
{
OUString aSvg;
......
basebmp/test/bmpmasktest.cxx
Dosyayı görüntüle @ b00a99e4
......@@ -96,7 +96,7 @@ public:
Format::ONE_BIT_MSB_PAL );
mpDevice32bpp = createBitmapDevice( aSize,
true,
Format::THIRTYTWO_BIT_TC_MASK );
Format::THIRTYTWO_BIT_TC_MASK_BGRA );
mpMaskBmp1bpp = createBitmapDevice( aSize,
true,
......@@ -107,7 +107,7 @@ public:
Format::ONE_BIT_MSB_PAL );
mpBmp32bpp = createBitmapDevice( aSize,
true,
Format::THIRTYTWO_BIT_TC_MASK );
Format::THIRTYTWO_BIT_TC_MASK_BGRA );
OUString aSvg( "m 0 0h5v10h5v-5h-10z" );
......
basebmp/test/bmptest.cxx
Dosyayı görüntüle @ b00a99e4
......@@ -153,14 +153,14 @@ public:
Format::ONE_BIT_MSB_PAL );
mpDevice32bpp = createBitmapDevice( aSize,
true,
Format::THIRTYTWO_BIT_TC_MASK );
Format::THIRTYTWO_BIT_TC_MASK_BGRA );
mpBmp1bpp = createBitmapDevice( aSize,
true,
Format::ONE_BIT_MSB_PAL );
mpBmp32bpp = createBitmapDevice( aSize,
true,
Format::THIRTYTWO_BIT_TC_MASK );
Format::THIRTYTWO_BIT_TC_MASK_BGRA );
OUString aSvg( "m 0 0h5v10h5v-5h-10z" );
......
basebmp/test/cliptest.cxx
Dosyayı görüntüle @ b00a99e4
......@@ -196,7 +196,7 @@ public:
Format::ONE_BIT_MSB_PAL );
mpDevice32bpp = createBitmapDevice( aSize,
true,
Format::THIRTYTWO_BIT_TC_MASK );
Format::THIRTYTWO_BIT_TC_MASK_BGRA );
OUString aSvg( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" );
basegfx::B2DPolyPolygon aPoly;
......
basebmp/test/filltest.cxx
Dosyayı görüntüle @ b00a99e4
......@@ -214,7 +214,7 @@ public:
Format::ONE_BIT_MSB_PAL );
mpDevice32bpp = createBitmapDevice( aSize,
true,
Format::THIRTYTWO_BIT_TC_MASK );
Format::THIRTYTWO_BIT_TC_MASK_BGRA );
}
void testRectFill()
......
basebmp/test/linetest.cxx
Dosyayı görüntüle @ b00a99e4
......@@ -154,7 +154,7 @@ public:
Format::ONE_BIT_MSB_PAL );
mpDevice32bpp = createBitmapDevice( aSize,
true,
Format::THIRTYTWO_BIT_TC_MASK );
Format::THIRTYTWO_BIT_TC_MASK_BGRA );
}
void testCornerCases()
......
basebmp/test/masktest.cxx
Dosyayı görüntüle @ b00a99e4
......@@ -107,7 +107,7 @@ public:
Format::ONE_BIT_MSB_PAL );
mpDevice32bpp = createBitmapDevice( aSize,
true,
Format::THIRTYTWO_BIT_TC_MASK );
Format::THIRTYTWO_BIT_TC_MASK_BGRA );
mpMask = createBitmapDevice( aSize,
true,
......
basebmp/test/polytest.cxx
Dosyayı görüntüle @ b00a99e4
......@@ -295,7 +295,7 @@ public:
Format::ONE_BIT_MSB_PAL );
mpDevice32bpp = createBitmapDevice( aSize,
true,
Format::THIRTYTWO_BIT_TC_MASK );
Format::THIRTYTWO_BIT_TC_MASK_BGRA );
}
void testEmpty()
......
include/basebmp/scanlineformats.hxx
Dosyayı görüntüle @ b00a99e4
......@@ -40,10 +40,9 @@ namespace basebmp { namespace Format
static const sal_Int32 SIXTEEN_BIT_LSB_TC_MASK = (sal_Int32)0x0B;
static const sal_Int32 SIXTEEN_BIT_MSB_TC_MASK = (sal_Int32)0x0C;
static const sal_Int32 TWENTYFOUR_BIT_TC_MASK = (sal_Int32)0x0D;
static const sal_Int32 THIRTYTWO_BIT_TC_MASK = (sal_Int32)0x0E;
// The order of the channels code letters indicates the order of the
// channel bytes in memory, I think
static const sal_Int32 THIRTYTWO_BIT_TC_MASK_BGRA = THIRTYTWO_BIT_TC_MASK;
static const sal_Int32 THIRTYTWO_BIT_TC_MASK_BGRA = (sal_Int32)0x0E;
static const sal_Int32 THIRTYTWO_BIT_TC_MASK_ARGB = (sal_Int32)0x0F;
static const sal_Int32 THIRTYTWO_BIT_TC_MASK_ABGR = (sal_Int32)0x10;
static const sal_Int32 THIRTYTWO_BIT_TC_MASK_RGBA = (sal_Int32)0x11;
......
vcl/headless/svpbmp.cxx
Dosyayı görüntüle @ b00a99e4
......@@ -54,7 +54,7 @@ bool SvpSalBitmap::Create( const Size& rSize,
#if defined(ANDROID) || defined(IOS)
case 32: nFormat = Format::THIRTYTWO_BIT_TC_MASK_RGBA; break;
#else
case 32: nFormat = Format::THIRTYTWO_BIT_TC_MASK; break;
case 32: nFormat = Format::THIRTYTWO_BIT_TC_MASK_BGRA; break;
#endif
}
B2IVector aSize( rSize.Width(), rSize.Height() );
......
vcl/headless/svpvd.cxx
Dosyayı görüntüle @ b00a99e4
......@@ -78,7 +78,7 @@ sal_Bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, cons
case 16: nFormat = Format::SIXTEEN_BIT_LSB_TC_MASK; break;
#endif
case 24: nFormat = Format::TWENTYFOUR_BIT_TC_MASK; break;
case 32: nFormat = Format::THIRTYTWO_BIT_TC_MASK; break;
case 32: nFormat = Format::THIRTYTWO_BIT_TC_MASK_BGRA; break;
#if defined(ANDROID) || defined(IOS)
case 0: nFormat = Format::THIRTYTWO_BIT_TC_MASK_RGBA; break;
#else
......
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