rename BGRU to BGRX

Change-Id: I0f28b986542b4d30c0a2cb75e15fb258af98e9cd

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,

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:

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

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,