Bug 710992 - Fix third argument in memcmp call in pixman-image.c; r=roc

This commit is contained in:
Thomas Prip Vestergaard 2012-01-02 19:15:04 +01:00
parent 929e604b82
commit dedc91c6d0
3 changed files with 31 additions and 1 deletions

View File

@ -186,6 +186,8 @@ NOTE: we previously supported ARM assembler on MSVC, this has been removed becau
pixman-export.patch: use cairo_public for PIXMAN_EXPORT to make sure pixman symbols are not exported in libxul
bad-memset.patch: Fix third argument in memcmp call in pixman-image.c
==== disable printing patch ====
disable-printing.patch: allows us to use NS_PRINTING to disable printing.

View File

@ -0,0 +1,28 @@
# HG changeset patch
# Parent a968f1430c74282c673c01a2c0a4417e238f2de7
# User Thomas Prip Vestergaard <thomas@prip.nu>
Bug 710992 - Fix third argument in memcmp call in pixman-image.c
diff --git a/gfx/cairo/libpixman/src/pixman-image.c b/gfx/cairo/libpixman/src/pixman-image.c
--- a/gfx/cairo/libpixman/src/pixman-image.c
+++ b/gfx/cairo/libpixman/src/pixman-image.c
@@ -512,17 +512,17 @@ pixman_image_set_transform (pixman_image
free (common->transform);
common->transform = NULL;
result = TRUE;
goto out;
}
if (common->transform &&
- memcmp (common->transform, transform, sizeof (pixman_transform_t) == 0))
+ memcmp (common->transform, transform, sizeof (pixman_transform_t)) == 0)
{
return TRUE;
}
if (common->transform == NULL)
common->transform = malloc (sizeof (pixman_transform_t));
if (common->transform == NULL)

View File

@ -517,7 +517,7 @@ pixman_image_set_transform (pixman_image_t * image,
}
if (common->transform &&
memcmp (common->transform, transform, sizeof (pixman_transform_t) == 0))
memcmp (common->transform, transform, sizeof (pixman_transform_t)) == 0)
{
return TRUE;
}