diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-26 13:58:22 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-02-26 13:58:22 +0100 |
| commit | 3c4f7704e0af64bf967f5f767bf4b4cff7f59d6c (patch) | |
| tree | 9d72d858bd7c52d98e7af23947b4cbcd61ff1dcd /vcl/headless/svpbmp.cxx | |
| parent | dee6cbbc1aa16f1f51d7880d6e622146e3baf21d (diff) | |
Revert "Use the cairo-compatible basebmp surface for headless"
This reverts commit a785df6a5f9ad327210f51163129ef8b59c3af29 plus follow-up
3594c9ce1c94dfc52b9efe526a88baa79ea4b3e9 "presumably destroy flushes" and
b5b19508dafc2702eb3713fb6b07edb5e05d6601 "WaE: -Werror=unused-variable," as it
triggered the assert(nLen <= 8) in ColorMask::ImplCalcMaskShift
(include/vcl/salbtype.hxx) in various tests.
Change-Id: Ic5433522fcd9b8cc7c4e82704cebe7d9bbcea586
Diffstat (limited to 'vcl/headless/svpbmp.cxx')
| -rw-r--r-- | vcl/headless/svpbmp.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index d9da88b920d7..cedb9751a025 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -185,15 +185,6 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( BitmapAccessMode ) nBitCount = 24; pBuf->mnFormat = BMP_FORMAT_24BIT_TC_BGR; break; - case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX: - nBitCount = 32; - pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; -#ifdef OSL_BIGENDIAN - pBuf->maColorMask = ColorMask( 0x0000ff00, 0x00ff0000, 0xff000000 ); -#else - pBuf->maColorMask = ColorMask( 0x00ff0000, 0x0000ff00, 0x000000ff ); -#endif - break; case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA: nBitCount = 32; pBuf->mnFormat = BMP_FORMAT_32BIT_TC_MASK; @@ -398,7 +389,6 @@ sal_uInt32 SvpSalBitmap::getBitCountFromScanlineFormat( basebmp::Format nFormat case FORMAT_TWENTYFOUR_BIT_TC_MASK: nBitCount = 24; break; - case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX: case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA: case FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB: case FORMAT_THIRTYTWO_BIT_TC_MASK_ABGR: |