Bug 1428182 - 10. Add <stdlib.h> include in pixman patch; r=lsalzman
pixman-8888-over-565.patch added a call to free(), which is apparently
not included by the other headers when using the new NDK headers.
MozReview-Commit-ID: 9fAuSano36N
--- a/gfx/cairo/libpixman/src/pixman-inlines.h
+++ b/gfx/cairo/libpixman/src/pixman-inlines.h
@@ -21,16 +21,17 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Keith Packard, SuSE, Inc.
*/
#ifndef PIXMAN_FAST_PATH_H__
#define PIXMAN_FAST_PATH_H__
+#include <stdlib.h>
#include "pixman-private.h"
#define PIXMAN_REPEAT_COVER -1
/* Flags describing input parameters to fast path macro template.
* Turning on some flag values may indicate that
* "some property X is available so template can use this" or
* "some property X should be handled by template".
--- a/gfx/cairo/pixman-8888-over-565.patch
+++ b/gfx/cairo/pixman-8888-over-565.patch
@@ -243,16 +243,34 @@ diff --git a/gfx/cairo/libpixman/src/pix
#define REPEAT_MIN_WIDTH 32
static void
fast_composite_tiled_repeat (pixman_implementation_t *imp,
pixman_composite_info_t *info)
diff --git a/gfx/cairo/libpixman/src/pixman-inlines.h b/gfx/cairo/libpixman/src/pixman-inlines.h
--- a/gfx/cairo/libpixman/src/pixman-inlines.h
+++ b/gfx/cairo/libpixman/src/pixman-inlines.h
+@@ -21,16 +21,17 @@
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Keith Packard, SuSE, Inc.
+ */
+
+ #ifndef PIXMAN_FAST_PATH_H__
+ #define PIXMAN_FAST_PATH_H__
+
++#include <stdlib.h>
+ #include "pixman-private.h"
+
+ #define PIXMAN_REPEAT_COVER -1
+
+ /* Flags describing input parameters to fast path macro template.
+ * Turning on some flag values may indicate that
+ * "some property X is available so template can use this" or
+ * "some property X should be handled by template".
@@ -816,18 +816,48 @@ bilinear_pad_repeat_get_scanline_bounds
*
* Note: normally the sum of 'weight_top' and 'weight_bottom' is equal to 256,
* but sometimes it may be less than that for NONE repeat when handling
* fuzzy antialiased top or bottom image edges. Also both top and
* bottom weight variables are guaranteed to have value in 0-255
* range and can fit into unsigned byte or be used with 8-bit SIMD
* multiplication instructions.