diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-25 15:43:07 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-25 17:06:15 +0000 |
| commit | 940914489c7679dc660dd671c93a7f1ec0d49ead (patch) | |
| tree | 6cc2f9fb3e5e8020300e943a88b394ed5b8d581f /basebmp | |
| parent | daf248bf85f4fa5fc212b6c75cf3b74fb25b3e26 (diff) | |
rename BGRU to BGRX
Change-Id: I0f28b986542b4d30c0a2cb75e15fb258af98e9cd
Diffstat (limited to 'basebmp')
| -rw-r--r-- | basebmp/source/bitmapdevice.cxx | 12 | ||||
| -rw-r--r-- | basebmp/source/debug.cxx | 4 |
2 files changed, 8 insertions, 8 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: |