From 3c4f7704e0af64bf967f5f767bf4b4cff7f59d6c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 26 Feb 2015 13:58:22 +0100 Subject: 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 --- vcl/inc/headless/svpbmp.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl/inc/headless/svpbmp.hxx') diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index 4b65acc8e9da..cb3336d9dd00 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -27,7 +27,7 @@ #include -#define SVP_DEFAULT_BITMAP_FORMAT basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX +#define SVP_DEFAULT_BITMAP_FORMAT basebmp::FORMAT_TWENTYFOUR_BIT_TC_MASK class SvpSalBitmap : public SalBitmap { -- cgit