summaryrefslogtreecommitdiff
path: root/desktop/unx/source/splashx.c
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2011-04-05 20:06:07 +0200
committerPetr Mladek <pmladek@suse.cz>2011-04-05 20:06:07 +0200
commit33b12b721ecacdc16869cfd78db05f6876137f44 (patch)
tree4cb48f9451ddef111cd65a644268ab3118912a42 /desktop/unx/source/splashx.c
parent9e1bffbc1abd41a11ee1ddbf449e3d631782450a (diff)
parent2833c4cb4dc6c6def3d3cb3b134f22eda3a87207 (diff)
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts: basic/source/runtime/dllmgr.cxx drawinglayer/source/processor2d/vclpixelprocessor2d.cxx editeng/inc/editeng/boxitem.hxx editeng/source/items/frmitems.cxx sfx2/workben/custompanel/makefile.mk
Diffstat (limited to 'desktop/unx/source/splashx.c')
-rwxr-xr-xdesktop/unx/source/splashx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index d7d8b1df46..711671fe28 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 );