diff options
author | marha <marha@users.sourceforge.net> | 2013-09-11 11:15:52 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-09-11 11:15:52 +0200 |
commit | 1de316b38f589817344e1a342050de4c427501df (patch) | |
tree | de3ec426a2a640a021b17ea55da8d71a07a8a412 /pixman/pixman/pixman-private.h | |
parent | 41665774749bc54dcd635ebbaab045a4350d5b2f (diff) | |
parent | a7d3f63ee5e292379ed6d6eba0c65512205a4786 (diff) | |
download | vcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.gz vcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.bz2 vcxsrv-1de316b38f589817344e1a342050de4c427501df.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update 11 Sep 2013
Conflicts:
pixman/pixman/pixman-sse2.c
Diffstat (limited to 'pixman/pixman/pixman-private.h')
-rw-r--r-- | pixman/pixman/pixman-private.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pixman/pixman/pixman-private.h b/pixman/pixman/pixman-private.h index 964660508..120196ddf 100644 --- a/pixman/pixman/pixman-private.h +++ b/pixman/pixman/pixman-private.h @@ -57,7 +57,7 @@ struct argb_t float b; }; -typedef void (*fetch_scanline_t) (pixman_image_t *image, +typedef void (*fetch_scanline_t) (bits_image_t *image, int x, int y, int width, |