aboutsummaryrefslogtreecommitdiff
path: root/pixman
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-09-02 09:07:34 +0200
committermarha <marha@users.sourceforge.net>2013-09-02 09:07:34 +0200
commitcaffc15f0b9e35698a6039fa3df2fa6a588608e6 (patch)
tree61f42fb9479366667cd4d3629d1a0d28081a774c /pixman
parent22bc825e9931f718cc0564aa55915961abaffce4 (diff)
parent9e382b6be0e81397f18ec0b733a2e88dc3465a33 (diff)
downloadvcxsrv-caffc15f0b9e35698a6039fa3df2fa6a588608e6.tar.gz
vcxsrv-caffc15f0b9e35698a6039fa3df2fa6a588608e6.tar.bz2
vcxsrv-caffc15f0b9e35698a6039fa3df2fa6a588608e6.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig libX11 mesa pixman git update 2 Sep 2013
Diffstat (limited to 'pixman')
-rw-r--r--pixman/pixman/pixman-fast-path.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pixman/pixman/pixman-fast-path.c b/pixman/pixman/pixman-fast-path.c
index 2608268d9..5d52b4a57 100644
--- a/pixman/pixman/pixman-fast-path.c
+++ b/pixman/pixman/pixman-fast-path.c
@@ -2489,7 +2489,7 @@ fail:
FUNC, "Allocation failure or bad matrix, skipping rendering\n");
iter->get_scanline = _pixman_iter_get_scanline_noop;
- iter->fini = bilinear_cover_iter_fini;
+ iter->fini = NULL;
}
#define IMAGE_FLAGS \