Module Name: xsrc
Committed By: mrg
Date: Sat Jul 12 04:31:43 UTC 2014
Modified Files:
xsrc/external/mit/pixman/dist/pixman: pixman-bits-image.c
xsrc/external/mit/pixman/include: config.h
Log Message:
merge pixman 0.32.6.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/pixman/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.7 xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.8
--- xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.7 Mon Mar 17 01:24:18 2014
+++ xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c Sat Jul 12 04:31:43 2014
@@ -926,7 +926,7 @@ create_bits (pixman_format_code_t format
if (_pixman_multiply_overflows_size (height, stride))
return NULL;
- buf_size = height * stride;
+ buf_size = (size_t)height * stride;
if (rowstride_bytes)
*rowstride_bytes = stride;
Index: xsrc/external/mit/pixman/include/config.h
diff -u xsrc/external/mit/pixman/include/config.h:1.18 xsrc/external/mit/pixman/include/config.h:1.19
--- xsrc/external/mit/pixman/include/config.h:1.18 Mon Mar 17 02:49:08 2014
+++ xsrc/external/mit/pixman/include/config.h Sat Jul 12 04:31:43 2014
@@ -90,7 +90,7 @@
#define PACKAGE_NAME "pixman"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "pixman 0.23.2"
+#define PACKAGE_STRING "pixman 0.32.6"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "pixman"
@@ -102,7 +102,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.23.2"
+#define PACKAGE_VERSION "0.32.6"
/* enable TIMER_BEGIN/TIMER_END macros */
/* #undef PIXMAN_TIMERS */
@@ -155,7 +155,7 @@
/* #undef USE_X86_MMX */
/* Version number of package */
-#define VERSION "0.32.4"
+#define VERSION "0.32.6"
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
