[Libreoffice-commits] core.git: desktop/unx

Stephan Bergmann sbergman at redhat.com
Tue Jan 19 01:44:23 PST 2016


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

New commits:
commit ef219e719116fd02030503d4711b22894b9208c9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 19 10:43:55 2016 +0100

    -Werror=strict-aliasing (GCC 6)
    
    Change-Id: I080315852db2f6e852f63f3965a2b7bf91529168

diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index e26c530..d10ee89 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -304,7 +304,7 @@ static void create_pixmap(struct splash* splash)
         else if ( bpp == 24 )
         {
             if ( machine_byte_order == byte_order && byte_order == LSBFirst )
-                COPY_IN_OUT( 3, *( (color_t *)out ) = *( (color_t *)( &pixel ) ); out += 3; )
+                COPY_IN_OUT( 3, memcpy(out, &pixel, sizeof (color_t)); out += 3; )
             else if ( machine_byte_order == byte_order && byte_order == MSBFirst )
                 COPY_IN_OUT( 3, tmp = pixel;
                              *( (uint8_t *)out     ) = *( (uint8_t *)(&tmp) + 1 );


More information about the Libreoffice-commits mailing list