diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-06 19:25:24 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-06 19:25:24 +0200 |
| commit | f18378b2d9d6a5996322231fc6618ab2ea2d9906 (patch) | |
| tree | 06d2b5ded42cb7b467d1bcc4076183820195a086 /desktop | |
| parent | 34d4fb1fe53d819880561b4062b71dedca770095 (diff) | |
| parent | c385e76c10b173b9820967825f0ce0c6fb71e9dd (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-4'
Diffstat (limited to 'desktop')
| -rwxr-xr-x | desktop/unx/source/splashx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c index d7d8b1df461c..711671fe28d4 100755 --- a/desktop/unx/source/splashx.c +++ b/desktop/unx/source/splashx.c @@ -336,6 +336,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 ) \ @@ -379,7 +380,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 ); |