summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basebmp/test/basictest.cxx2
-rw-r--r--basebmp/test/bmpdemo.cxx2
-rw-r--r--basebmp/test/bmpmasktest.cxx4
-rw-r--r--basebmp/test/bmptest.cxx4
-rw-r--r--basebmp/test/cliptest.cxx2
-rw-r--r--basebmp/test/filltest.cxx2
-rw-r--r--basebmp/test/linetest.cxx2
-rw-r--r--basebmp/test/masktest.cxx2
-rw-r--r--basebmp/test/polytest.cxx2
-rw-r--r--include/basebmp/scanlineformats.hxx3
-rw-r--r--vcl/headless/svpbmp.cxx2
-rw-r--r--vcl/headless/svpvd.cxx2
12 files changed, 14 insertions, 15 deletions
diff --git a/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index 9e625c2e931d..e9e2dbe67ed8 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.cxx
@@ -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 );
diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index ae24c65bd22d..62d9b2262c8a 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.cxx
@@ -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;
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index 500ba91667d4..6f9a604a2503 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -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" );
diff --git a/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index 376b24f4ff2e..37fd4b5155d9 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.cxx
@@ -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" );
diff --git a/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index 21f94aa5474c..aa0c15a01483 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.cxx
@@ -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;
diff --git a/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index a6e87e4cf5bc..a393144ab411 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.cxx
@@ -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()
diff --git a/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index cf5f3942befd..9943a399a335 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.cxx
@@ -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()
diff --git a/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index 052db904ea24..4b2aebb70640 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.cxx
@@ -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,
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index cfc02b4c2ab6..e07508b16c90 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -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()
diff --git a/include/basebmp/scanlineformats.hxx b/include/basebmp/scanlineformats.hxx
index a1708980b5ac..daac381e810a 100644
--- a/include/basebmp/scanlineformats.hxx
+++ b/include/basebmp/scanlineformats.hxx
@@ -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;
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index cd5a2f9c4af5..dc4d5b8a3302 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -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() );
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index 990848553468..82f34f432c50 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -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
generated by cgit (git 2.34.1) at 2025-01-23 22:44:58 +0000