diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/basebmp/rgbmaskpixelformats.hxx | 9 | ||||
| -rw-r--r-- | include/basebmp/scanlineformats.hxx | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/basebmp/rgbmaskpixelformats.hxx b/include/basebmp/rgbmaskpixelformats.hxx index 5d80fae7b4f1..060c0a99e59a 100644 --- a/include/basebmp/rgbmaskpixelformats.hxx +++ b/include/basebmp/rgbmaskpixelformats.hxx @@ -334,7 +334,8 @@ typedef PixelFormatTraitsTemplate_RGBMask< BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_RGBA32_8888::getter_type, PixelFormatTraits_RGBA32_8888::setter_type); -// The following hybrid 24bits used out of 32bit was added for Cairo needs +// Added for Cairo needs, perhaps Android should get an XRGB and replace +// some uses of ARGB with that instead ? typedef PixelFormatTraitsTemplate_RGBMask< sal_uInt32, @@ -342,9 +343,9 @@ typedef PixelFormatTraitsTemplate_RGBMask< 0x00FF0000, 0x0000FF00, 0x000000FF, - BASEBMP_TRUECOLORMASK_LSB_SWAP > PixelFormatTraits_BGRU32_8888; -BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_BGRU32_8888::getter_type, - PixelFormatTraits_BGRU32_8888::setter_type); + BASEBMP_TRUECOLORMASK_LSB_SWAP > PixelFormatTraits_BGRX32_8888; +BASEBMP_SPECIALIZE_ACCESSORTRAITS(PixelFormatTraits_BGRX32_8888::getter_type, + PixelFormatTraits_BGRX32_8888::setter_type); } // namespace basebmp diff --git a/include/basebmp/scanlineformats.hxx b/include/basebmp/scanlineformats.hxx index 80278792241a..b1a54b46b320 100644 --- a/include/basebmp/scanlineformats.hxx +++ b/include/basebmp/scanlineformats.hxx @@ -45,7 +45,7 @@ enum Format // CAIRO_FORMAT_RGB24, each pixel is a 32-bit quantity, with the upper 8 // bits unused. Red, Green, and Blue are stored in the remaining 24 bits in // that order (below U is for unused) - FORMAT_THIRTYTWO_BIT_TC_MASK_BGRU, + FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX, // The order of the channels code letters indicates the order of the // channel bytes in memory FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA, |