[Libreoffice-commits] .: Branch 'libreoffice-3-3-1' - desktop/unx

[Petr Mladek]

 desktop/unx/source/splashx.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ee4d096d9b9164b27153b25f0293f88363d27a1a
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Feb 15 14:17:24 2011 +0100

    crashing oosplash and malformed picture (bnc#652562)
    
    it was visible only on screens that did not use 32bpp
    
    Signed-off-by: Thorsten Behrens <thb at documentfoundation.org>
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Jan Holesovsky <kendy at suse.cz>

diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 6e7088b..1c6ab45 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -333,6 +333,7 @@ static void create_pixmap()
             int x, y; \
             for ( y = 0; y < height; ++y ) \
             { \
+                out = data + y * bytes_per_line; \
                 unsigned long red_delta = 0, green_delta = 0, blue_delta = 0; \
                 color_t *in = (color_t *)bitmap_rows[y]; \
                 for ( x = 0; x < width; ++x, ++in  ) \
@@ -376,7 +377,7 @@ static void create_pixmap()
         {
             if ( machine_byte_order == byte_order && byte_order == LSBFirst )
                 COPY_IN_OUT( 3, *( (color_t *)out ) = *( (color_t *)( &pixel ) ); out += 3; )
-            if ( machine_byte_order == byte_order && byte_order == MSBFirst )
+            else if ( machine_byte_order == byte_order && byte_order == MSBFirst )
                 COPY_IN_OUT( 3, uint32_t tmp = pixel;
                              *( (uint8_t *)out     ) = *( (uint8_t *)(&tmp) + 1 );
                              *( (uint8_t *)out + 1 ) = *( (uint8_t *)(&tmp) + 2 );