diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-01 12:04:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-01 12:04:07 +0200 |
| commit | 7305d42f2ad0462ca3916a73df49cc6b70b41fe4 (patch) | |
| tree | 4de7ec9601f83c61d84e9b8cda40ca0f5ca6bc91 /pixman | |
| parent | c86fbbd2c3bb30e96a614456bbb7688e0387cf8c (diff) | |
| parent | 7ed9dbafdbc724c1030404f29678559134de559b (diff) | |
| download | vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.tar.gz vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.tar.bz2 vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb mesa pixman xkeyboard-config git update 1 oct 2012
Conflicts:
libxcb/src/man/.gitignore
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/pixman/pixman-mmx.c | 2 | ||||
| -rw-r--r-- | pixman/test/rotate-test.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pixman/pixman/pixman-mmx.c b/pixman/pixman/pixman-mmx.c index de57db930..3cb3131ec 100644 --- a/pixman/pixman/pixman-mmx.c +++ b/pixman/pixman/pixman-mmx.c @@ -52,7 +52,7 @@ #define CHECKPOINT() #endif -#ifdef USE_ARM_IWMMXT +#if defined USE_ARM_IWMMXT && __GNUC__ == 4 && __GNUC_MINOR__ < 8 /* Empty the multimedia state. For some reason, ARM's mmintrin.h doesn't provide this. */ extern __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__)) _mm_empty (void) diff --git a/pixman/test/rotate-test.c b/pixman/test/rotate-test.c index bc44281e3..d63a28947 100644 --- a/pixman/test/rotate-test.c +++ b/pixman/test/rotate-test.c @@ -74,7 +74,9 @@ make_image (void) pixman_image_set_transform (image, RANDOM_TRANSFORM()); pixman_image_set_destroy_function (image, on_destroy, bytes); pixman_image_set_repeat (image, PIXMAN_REPEAT_NORMAL); - + + image_endian_swap (image); + return image; } |