Module Name: xsrc
Committed By: mrg
Date: Wed Aug 3 06:01:55 UTC 2011
Modified Files:
xsrc/external/mit/pixman/dist/pixman: pixman-bits-image.c
Removed Files:
xsrc/external/mit/pixman/dist/pixman: pixman-x64-mmx-emulation.h
xsrc/external/mit/pixman/dist/test: alpha-test.c clip-in.c clip-test.c
composite-test.c convolution-test.c gradient-test.c gtk-utils.c
gtk-utils.h radial-test.c screen-test.c trap-test.c
Log Message:
merge pixman 0.23.2
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/pixman/dist/pixman/pixman-x64-mmx-emulation.h
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/pixman/dist/test/alpha-test.c \
xsrc/external/mit/pixman/dist/test/clip-in.c \
xsrc/external/mit/pixman/dist/test/convolution-test.c \
xsrc/external/mit/pixman/dist/test/gtk-utils.c \
xsrc/external/mit/pixman/dist/test/screen-test.c \
xsrc/external/mit/pixman/dist/test/trap-test.c
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/pixman/dist/test/clip-test.c
cvs rdiff -u -r1.1.1.6 -r0 \
xsrc/external/mit/pixman/dist/test/composite-test.c
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/pixman/dist/test/gradient-test.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/pixman/dist/test/gtk-utils.h \
xsrc/external/mit/pixman/dist/test/radial-test.c
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.3 xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.4
--- xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.3 Mon Feb 21 05:33:34 2011
+++ xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c Wed Aug 3 06:01:54 2011
@@ -1362,12 +1362,9 @@
}
void
-_pixman_bits_image_src_iter_init (pixman_image_t *image,
- pixman_iter_t *iter,
- int x, int y, int width, int height,
- uint8_t *buffer, iter_flags_t flags)
+_pixman_bits_image_src_iter_init (pixman_image_t *image, pixman_iter_t *iter)
{
- if (flags & ITER_NARROW)
+ if (iter->flags & ITER_NARROW)
iter->get_scanline = src_get_scanline_narrow;
else
iter->get_scanline = src_get_scanline_wide;
@@ -1465,46 +1462,22 @@
iter->y++;
}
-static void
-dest_write_back_direct (pixman_iter_t *iter)
-{
- iter->buffer += iter->image->bits.rowstride;
-}
-
void
-_pixman_bits_image_dest_iter_init (pixman_image_t *image,
- pixman_iter_t *iter,
- int x, int y, int width, int height,
- uint8_t *buffer, iter_flags_t flags)
-{
- if (flags & ITER_NARROW)
- {
- if (((image->common.flags &
- (FAST_PATH_NO_ALPHA_MAP | FAST_PATH_NO_ACCESSORS)) ==
- (FAST_PATH_NO_ALPHA_MAP | FAST_PATH_NO_ACCESSORS)) &&
- (image->bits.format == PIXMAN_a8r8g8b8 ||
- (image->bits.format == PIXMAN_x8r8g8b8 &&
- (flags & ITER_LOCALIZED_ALPHA))))
+_pixman_bits_image_dest_iter_init (pixman_image_t *image, pixman_iter_t *iter)
+{
+ if (iter->flags & ITER_NARROW)
+ {
+ if ((iter->flags & (ITER_IGNORE_RGB | ITER_IGNORE_ALPHA)) ==
+ (ITER_IGNORE_RGB | ITER_IGNORE_ALPHA))
{
- iter->buffer = image->bits.bits + y * image->bits.rowstride + x;
-
iter->get_scanline = _pixman_iter_get_scanline_noop;
- iter->write_back = dest_write_back_direct;
}
else
{
- if ((flags & (ITER_IGNORE_RGB | ITER_IGNORE_ALPHA)) ==
- (ITER_IGNORE_RGB | ITER_IGNORE_ALPHA))
- {
- iter->get_scanline = _pixman_iter_get_scanline_noop;
- }
- else
- {
- iter->get_scanline = dest_get_scanline_narrow;
- }
-
- iter->write_back = dest_write_back_narrow;
+ iter->get_scanline = dest_get_scanline_narrow;
}
+
+ iter->write_back = dest_write_back_narrow;
}
else
{
