[Libreoffice-commits] core.git: Branch 'feature/gtkbmptiledviewer' - vcl/headless

[Andrzej Hunt]

 vcl/headless/svpbmp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4df66b4f7f70f69d43c371be1cebf1d1935d0352
Author: Andrzej Hunt <andrzej.hunt at collabora.com>
Date:   Fri May 16 18:41:32 2014 +0100

    Default to RGB for Bitmap Buffers in svp.
    
    By default we seem to use FORMAT_TWENTYFOUR_BIT_TC_MASK for most of our
    buffers, and presumably we should be using RGB as that's the default
    format expected by anyone else -- previously red and blue channels
    were switched when e.g. using tiled rendering on iOS (the vcl implementation
    is built on svp and appears to therefore reuse svpbmp without change), on
    Android (which uses svp directly) and in experimental tiled rendering
    on Linux with svp.
    
    Change-Id: I66a7f83bce286b7b2fddf0010587b019e8e1d01f

diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 3e08e90..1aa815b 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -194,7 +194,7 @@ BitmapBuffer* SvpSalBitmap::AcquireBuffer( bool )
                 break;
             case FORMAT_TWENTYFOUR_BIT_TC_MASK:
                 nBitCount = 24;
-                pBuf->mnFormat = BMP_FORMAT_24BIT_TC_BGR;
+                pBuf->mnFormat = BMP_FORMAT_24BIT_TC_RGB;
                 break;
             case FORMAT_THIRTYTWO_BIT_TC_MASK_BGRA:
                 nBitCount = 32;