Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/os/log.c

1 files changed, 9 insertions, 0 deletions

diff --git a/pixman/test/utils.h b/pixman/test/utils.h
index 3c0647bc6..01af316d2 100644
--- a/pixman/test/utils.h
+++ b/pixman/test/utils.h
@@ -107,6 +107,15 @@ fail_after (int seconds, const char *msg);
 /* If possible, enable traps for floating point exceptions */
 void enable_fp_exceptions(void);
 
+/* Converts a8r8g8b8 pixels to pixels that
+ *  - are not premultiplied,
+ *  - are stored in this order in memory: R, G, B, A, regardless of
+ *    the endianness of the computer.
+ * It is allowed for @src and @dst to point to the same memory buffer.
+ */
+void
+a8r8g8b8_to_rgba_np (uint32_t *dst, uint32_t *src, int n_pixels);
+
 pixman_bool_t
 write_png (pixman_image_t *image, const char *filename);