Update to pixman 0.30.2. No functional change.

7 files changed, 191 insertions, 41 deletions

diff --git a/lib/pixman/ChangeLog b/lib/pixman/ChangeLog
index 562bcc066..bb9e1eb48 100644
--- a/lib/pixman/ChangeLog
+++ b/lib/pixman/ChangeLog
@@ -1,3 +1,98 @@
+commit f8a0812b1c4d5a4e24939da5ad6229f5adcafb34
+Author: Søren Sandmann Pedersen <ssp@redhat.com>
+Date:   Wed Aug 7 10:07:35 2013 -0400
+
+    Pre-release version bump to 0.30.2
+
+commit b5167b8a5439d30bde8a178568cb3fe1c95b509a
+Author: Siarhei Siamashka <siarhei.siamashka@gmail.com>
+Date:   Sat Jul 27 19:25:32 2013 +0300
+
+    test: fix matrix-test on big endian systems
+
+commit a82b95a26487344023623ead34f26af235dfd24e
+Author: Andrea Canciani <ranma42@gmail.com>
+Date:   Tue Jul 17 16:14:20 2012 +0200
+
+    test: Fix build on MSVC
+    
+    The MSVC compiler is very strict about variable declarations after
+    statements.
+    
+    Move all the declarations of each block before any statement in the
+    same block to fix multiple instances of:
+    
+    alpha-loop.c(XX) : error C2275: 'pixman_image_t' : illegal use of this
+    type as an expression
+
+commit 4c04a86c684d929ff734170eff8be8fea74b4c51
+Author: Søren Sandmann Pedersen <ssp@redhat.com>
+Date:   Thu Aug 1 07:19:21 2013 -0400
+
+    Version bump to 0.30.1
+
+commit 63004529526db1ba1ba5a95a93522fa0cf385ec5
+Author: Alexander Troosh <trush@yandex.ru>
+Date:   Tue Jun 11 15:55:34 2013 +0400
+
+    Require GTK+ version >= 2.16
+    
+    I'm got bug in my system:
+    
+    lcc: "scale.c", line 374: warning: function "gtk_scale_add_mark" declared
+              implicitly [-Wimplicit-function-declaration]
+          gtk_scale_add_mark (GTK_SCALE (widget), 0.0, GTK_POS_LEFT, NULL);
+          ^
+    
+      CCLD   scale
+    scale.o: In function `app_new':
+    (.text+0x23e4): undefined reference to `gtk_scale_add_mark'
+    scale.o: In function `app_new':
+    (.text+0x250c): undefined reference to `gtk_scale_add_mark'
+    scale.o: In function `app_new':
+    (.text+0x2634): undefined reference to `gtk_scale_add_mark'
+    make[2]: *** [scale] Error 1
+    make[2]: Target `all' not remade because of errors.
+    
+    $ pkg-config --modversion gtk+-2.0
+    2.12.1
+    
+    The demos/scale.c use call to gtk_scale_add_mark() function from 2.16+
+    version of GTK+. Need do support old GTK+ (rewrite scale.c) or simple
+    demand of high version of GTK+, like this:
+
+commit 02869a1229833a3272355f3d9e1206936b430fa1
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sat Jun 8 18:07:20 2013 +0200
+
+    configure.ac: Don't use '+=' since it's not POSIX
+    
+    Reviewed-by: Matt Turner <mattst88@gmail.com>
+    Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+
+commit 35da06c828049d90975c08655bb9b77184cdab68
+Author: Markos Chandras <markos.chandras@imgtec.com>
+Date:   Wed May 15 09:51:20 2013 -0700
+
+    Use AC_LINK_IFELSE to check if the Loongson MMI code can link
+    
+    The Loongson code is compiled with -march=loongson2f to enable the MMI
+    instructions, but binutils refuses to link object code compiled with
+    different -march settings, leading to link failures later in the
+    compile. This avoids that problem by checking if we can link code
+    compiled for Loongson.
+    
+    Reviewed-by: Matt Turner <mattst88@gmail.com>
+    Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+
+commit e14f5a739f3ea1a3a6cff9bd5681677f05962314
+Author: ingmar@irsoft.de <ingmar@irsoft.de>
+Date:   Sat May 11 11:55:04 2013 +0200
+
+    Fix broken build when HAVE_CONFIG_H is undefined, e.g. on Win32.
+    
+    Build fix for platforms without a generated config.h, for example Win32.
+
 commit 41daf50aaeca71e70bc27aa4bf27ae4812c6eecf
 Author: Søren Sandmann Pedersen <ssp@redhat.com>
 Date:   Wed May 8 19:31:22 2013 -0400
@@ -19850,7 +19945,7 @@ commit 9a0639650e276c4c0da5dfe37a8d3ba5a6b81712
 Author: Vladimir Vukicevic <vladimir@pobox.com>
 Date:   Tue Nov 6 16:15:01 2007 -0800
 
-    Remove last CVS $Id: ChangeLog,v 1.6 2013/06/07 17:18:00 matthieu Exp $ tags
+    Remove last CVS $Id: ChangeLog,v 1.7 2013/08/25 17:42:39 matthieu Exp $ tags
 
 commit df964790e893a8b511e9322e7161087d8ba182cc
 Author: Søren Sandmann <sandmann@redhat.com>
diff --git a/lib/pixman/configure b/lib/pixman/configure
index 9792fef54..f68eac867 100644
--- a/lib/pixman/configure
+++ b/lib/pixman/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pixman 0.30.0.
+# Generated by GNU Autoconf 2.69 for pixman 0.30.2.
 #
 # Report bugs to <pixman@lists.freedesktop.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pixman'
 PACKAGE_TARNAME='pixman'
-PACKAGE_VERSION='0.30.0'
-PACKAGE_STRING='pixman 0.30.0'
+PACKAGE_VERSION='0.30.2'
+PACKAGE_STRING='pixman 0.30.2'
 PACKAGE_BUGREPORT='pixman@lists.freedesktop.org'
 PACKAGE_URL=''
 
@@ -1385,7 +1385,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pixman 0.30.0 to adapt to many kinds of systems.
+\`configure' configures pixman 0.30.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1455,7 +1455,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pixman 0.30.0:";;
+     short | recursive ) echo "Configuration of pixman 0.30.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1589,7 +1589,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pixman configure 0.30.0
+pixman configure 0.30.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2187,7 +2187,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pixman $as_me 0.30.0, which was
+It was created by pixman $as_me 0.30.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3011,7 +3011,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='pixman'
- VERSION='0.30.0'
+ VERSION='0.30.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12195,13 +12195,13 @@ fi
 
 
 
-LT_VERSION_INFO="30:0:30"
+LT_VERSION_INFO="30:2:30"
 
 PIXMAN_VERSION_MAJOR=0
 
 PIXMAN_VERSION_MINOR=30
 
-PIXMAN_VERSION_MICRO=0
+PIXMAN_VERSION_MICRO=2
 
 
 
@@ -12597,10 +12597,11 @@ int main () {
     return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   have_loongson_mmi=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 CFLAGS=$xserver_save_CFLAGS
 
 # Check whether --enable-loongson-mmi was given.
@@ -13436,12 +13437,12 @@ if test -n "$GTK_CFLAGS"; then
     pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 pixman-1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 pixman-1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16 pixman-1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16 pixman-1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 pixman-1" 2>/dev/null`
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.16 pixman-1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13453,12 +13454,12 @@ if test -n "$GTK_LIBS"; then
     pkg_cv_GTK_LIBS="$GTK_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 pixman-1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 pixman-1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16 pixman-1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16 pixman-1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 pixman-1" 2>/dev/null`
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.16 pixman-1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13479,14 +13480,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 pixman-1" 2>&1`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.16 pixman-1" 2>&1`
         else
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 pixman-1" 2>&1`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.16 pixman-1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gtk+-2.0 pixman-1) were not met:
+	as_fn_error $? "Package requirements (gtk+-2.0 >= 2.16 pixman-1) were not met:
 
 $GTK_PKG_ERRORS
 
@@ -13575,12 +13576,12 @@ if test -n "$GTK_CFLAGS"; then
     pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 pixman-1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 pixman-1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16 pixman-1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16 pixman-1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 pixman-1" 2>/dev/null`
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.16 pixman-1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13592,12 +13593,12 @@ if test -n "$GTK_LIBS"; then
     pkg_cv_GTK_LIBS="$GTK_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 pixman-1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 pixman-1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.16 pixman-1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.16 pixman-1") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 pixman-1" 2>/dev/null`
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.16 pixman-1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13618,9 +13619,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 pixman-1" 2>&1`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.16 pixman-1" 2>&1`
         else
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 pixman-1" 2>&1`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.16 pixman-1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK_PKG_ERRORS" >&5
@@ -15077,7 +15078,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pixman $as_me 0.30.0, which was
+This file was extended by pixman $as_me 0.30.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15143,7 +15144,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pixman config.status 0.30.0
+pixman config.status 0.30.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/lib/pixman/configure.ac b/lib/pixman/configure.ac
index afafdcc96..25c6c5b7d 100644
--- a/lib/pixman/configure.ac
+++ b/lib/pixman/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 30)
-m4_define([pixman_micro], 0)
+m4_define([pixman_micro], 2)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
@@ -279,7 +279,7 @@ AC_MSG_CHECKING(whether to use Loongson MMI assembler)
 
 xserver_save_CFLAGS=$CFLAGS
 CFLAGS=" $LS_CFLAGS $CFLAGS -I$srcdir"
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+AC_LINK_IFELSE([AC_LANG_SOURCE([[
 #ifndef __mips_loongson_vector_rev
 #error "Loongson Multimedia Instructions are only available on Loongson"
 #endif
@@ -778,7 +778,7 @@ PKG_PROG_PKG_CONFIG
 
 if test $enable_gtk = yes ; then
    AC_CHECK_LIB([pixman-1], [pixman_version_string])
-   PKG_CHECK_MODULES(GTK, [gtk+-2.0 pixman-1])
+   PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.16 pixman-1])
 fi
 
 if test $enable_gtk = auto ; then
@@ -786,7 +786,7 @@ if test $enable_gtk = auto ; then
 fi
 
 if test $enable_gtk = auto ; then
-   PKG_CHECK_MODULES(GTK, [gtk+-2.0 pixman-1], [enable_gtk=yes], [enable_gtk=no])
+   PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.16 pixman-1], [enable_gtk=yes], [enable_gtk=no])
 fi
 
 AM_CONDITIONAL(HAVE_GTK, [test "x$enable_gtk" = xyes])
diff --git a/lib/pixman/pixman/pixman-filter.c b/lib/pixman/pixman/pixman-filter.c
index 26b39d571..5ff7b6eaa 100644
--- a/lib/pixman/pixman/pixman-filter.c
+++ b/lib/pixman/pixman/pixman-filter.c
@@ -28,7 +28,9 @@
 #include <stdio.h>
 #include <math.h>
 #include <assert.h>
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 #include "pixman-private.h"
 
 typedef double (* kernel_func_t) (double x);
diff --git a/lib/pixman/pixman/pixman-vmx.c b/lib/pixman/pixman/pixman-vmx.c
index 6868704a8..f629003ab 100644
--- a/lib/pixman/pixman/pixman-vmx.c
+++ b/lib/pixman/pixman/pixman-vmx.c
@@ -25,7 +25,9 @@
  * Based on fbmmx.c by Owen Taylor, Søren Sandmann and Nicholas Miell
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 #include "pixman-private.h"
 #include "pixman-combine32.h"
 #include <altivec.h>
diff --git a/lib/pixman/test/alpha-loop.c b/lib/pixman/test/alpha-loop.c
index eca761537..4d4384d00 100644
--- a/lib/pixman/test/alpha-loop.c
+++ b/lib/pixman/test/alpha-loop.c
@@ -8,6 +8,7 @@
 int
 main (int argc, char **argv)
 {
+    pixman_image_t *a, *d, *s;
     uint8_t *alpha;
     uint32_t *src, *dest;
 
@@ -17,9 +18,9 @@ main (int argc, char **argv)
     src = (uint32_t *)make_random_bytes (WIDTH * HEIGHT * 4);
     dest = (uint32_t *)make_random_bytes (WIDTH * HEIGHT * 4);
 
-    pixman_image_t *a = pixman_image_create_bits (PIXMAN_a8, WIDTH, HEIGHT, (uint32_t *)alpha, WIDTH);
-    pixman_image_t *d = pixman_image_create_bits (PIXMAN_a8r8g8b8, WIDTH, HEIGHT, dest, WIDTH * 4);
-    pixman_image_t *s = pixman_image_create_bits (PIXMAN_a2r10g10b10, WIDTH, HEIGHT, src, WIDTH * 4);
+    a = pixman_image_create_bits (PIXMAN_a8, WIDTH, HEIGHT, (uint32_t *)alpha, WIDTH);
+    d = pixman_image_create_bits (PIXMAN_a8r8g8b8, WIDTH, HEIGHT, dest, WIDTH * 4);
+    s = pixman_image_create_bits (PIXMAN_a2r10g10b10, WIDTH, HEIGHT, src, WIDTH * 4);
 
     fail_after (5, "Infinite loop detected: 5 seconds without progress\n");
 
diff --git a/lib/pixman/test/matrix-test.c b/lib/pixman/test/matrix-test.c
index 8437dd291..0a5f203f5 100644
--- a/lib/pixman/test/matrix-test.c
+++ b/lib/pixman/test/matrix-test.c
@@ -70,6 +70,53 @@ pixman_bool_t does_it_fit_fixed_48_16 (__float128 x)
 
 #endif
 
+static inline uint32_t
+byteswap32 (uint32_t x)
+{
+    return ((x & ((uint32_t)0xFF << 24)) >> 24) |
+           ((x & ((uint32_t)0xFF << 16)) >>  8) |
+           ((x & ((uint32_t)0xFF <<  8)) <<  8) |
+           ((x & ((uint32_t)0xFF <<  0)) << 24);
+}
+
+static inline uint64_t
+byteswap64 (uint64_t x)
+{
+    return ((x & ((uint64_t)0xFF << 56)) >> 56) |
+           ((x & ((uint64_t)0xFF << 48)) >> 40) |
+           ((x & ((uint64_t)0xFF << 40)) >> 24) |
+           ((x & ((uint64_t)0xFF << 32)) >>  8) |
+           ((x & ((uint64_t)0xFF << 24)) <<  8) |
+           ((x & ((uint64_t)0xFF << 16)) << 24) |
+           ((x & ((uint64_t)0xFF <<  8)) << 40) |
+           ((x & ((uint64_t)0xFF <<  0)) << 56);
+}
+
+static void
+byteswap_transform (pixman_transform_t *t)
+{
+    int i, j;
+
+    if (is_little_endian ())
+        return;
+
+    for (i = 0; i < 3; i++)
+        for (j = 0; j < 3; j++)
+            t->matrix[i][j] = byteswap32 (t->matrix[i][j]);
+}
+
+static void
+byteswap_vector_48_16 (pixman_vector_48_16_t *v)
+{
+    int i;
+
+    if (is_little_endian ())
+        return;
+
+    for (i = 0; i < 3; i++)
+        v->v[i] = byteswap64 (v->v[i]);
+}
+
 uint32_t
 test_matrix (int testnum, int verbose)
 {
@@ -90,6 +137,8 @@ test_matrix (int testnum, int verbose)
 #endif
         prng_randmemset (&ti, sizeof(ti), 0);
         prng_randmemset (&vi, sizeof(vi), 0);
+        byteswap_transform (&ti);
+        byteswap_vector_48_16 (&vi);
 
         for (j = 0; j < 3; j++)
         {
@@ -132,8 +181,6 @@ test_matrix (int testnum, int verbose)
         else
             transform_ok = pixman_transform_point_31_16 (&ti, &vi, &result_i);
 
-        crc32 = compute_crc32 (crc32, &result_i, sizeof(result_i));
-
 #ifdef HAVE_FLOAT128
         /* compare with a reference 128-bit floating point implementation */
         for (j = 0; j < 3; j++)
@@ -173,6 +220,8 @@ test_matrix (int testnum, int verbose)
             }
         }
 #endif
+        byteswap_vector_48_16 (&result_i);
+        crc32 = compute_crc32 (crc32, &result_i, sizeof (result_i));
     }
     return crc32;
 }