diff options
| -rw-r--r-- | basebmp/source/bitmapdevice.cxx | 12 | ||||
| -rw-r--r-- | basebmp/source/debug.cxx | 4 | ||||
| -rw-r--r-- | include/basebmp/rgbmaskpixelformats.hxx | 9 | ||||
| -rw-r--r-- | include/basebmp/scanlineformats.hxx | 2 |
4 files changed, 14 insertions, 13 deletions
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index a9fe6a1a3fb7..cb25e0999383 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -107,7 +107,7 @@ static const sal_uInt8 bitsPerPixel[] = 16, // SIXTEEN_BIT_LSB_TC_MASK 16, // SIXTEEN_BIT_MSB_TC_MASK 24, // TWENTYFOUR_BIT_TC_MASK - 32, // TWENTYFOUR_BIT_TC_MASK_BGRU + 32, // TWENTYFOUR_BIT_TC_MASK_BGRX 32, // THIRTYTWO_BIT_TC_MASK_BGRA 32, // THIRTYTWO_BIT_TC_MASK_ARGB 32, // THIRTYTWO_BIT_TC_MASK_ABGR @@ -2083,14 +2083,14 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector& aBounds, rSize, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal, rDamage ); - // hybrid cairo 24bits used out of 32bit format - case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRU: - return createRenderer<PixelFormatTraits_BGRU32_8888,StdMasks>( + // thirtytwo bit formats + + // 8 red bits, 8 green bits, 8 blue bits, and 8 ignored bits like CAIRO_FORMAT_RGB24 + case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX: + return createRenderer<PixelFormatTraits_BGRX32_8888,StdMasks>( aBounds, rSize, nScanlineFormat, nScanlineStride, pFirstScanline, pMem, pPal, rDamage ); - // thirtytwo bit formats - case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA: return createRenderer<PixelFormatTraits_BGRA32_8888,StdMasks>( aBounds, rSize, nScanlineFormat, nScanlineStride, diff --git a/basebmp/source/debug.cxx b/basebmp/source/debug.cxx index 3e719cd77825..3d68a43c2447 100644 --- a/basebmp/source/debug.cxx +++ b/basebmp/source/debug.cxx @@ -63,8 +63,8 @@ namespace basebmp return "SIXTEEN_BIT_MSB_TC_MASK"; case FORMAT_TWENTYFOUR_BIT_TC_MASK: return "TWENTYFOUR_BIT_TC_MASK"; - case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRU: - return "THIRTYTWO_BIT_TC_MASK_BGRU"; + case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX: + return "THIRTYTWO_BIT_TC_MASK_BGRX"; case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA: return "THIRTYTWO_BIT_TC_MASK_BGRA"; case FORMAT_THIRTYTWO_BIT_TC_MASK_ARGB: 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, |