Update of /cvs/poppler/poppler/poppler
In directory kemper:/tmp/cvs-serv8120/poppler
Modified Files:
CairoOutputDev.cc
Log Message:
2006-09-08 Jeff Muizelaar <[EMAIL PROTECTED]>
* poppler/CairoOutputDev.cc: The work-around for 1x1 imagemasks was not
calling cairo_set_source causing the rectangles to be drawn the wrong
colour occasionally. Fix by moving the existing call to
cairo_set_source above the work-around. Fixes #7113.
Index: CairoOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/CairoOutputDev.cc,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- CairoOutputDev.cc 7 Sep 2006 04:01:39 -0000 1.42
+++ CairoOutputDev.cc 8 Sep 2006 23:28:22 -0000 1.43
@@ -504,9 +504,11 @@
cairo_matrix_t matrix;
int invert_bit;
int row_stride;
-
- /* work around a cairo bug when scaling 1x1 surfaces */
+ /* FIXME: Doesn't the image mask support any colorspace? */
+ cairo_set_source (cairo, fill_pattern);
+
+ /* work around a cairo bug when scaling 1x1 surfaces */
if (width == 1 && height == 1) {
cairo_save (cairo);
cairo_rectangle (cairo, 0., 0., width, height);
@@ -563,8 +565,6 @@
* images with CAIRO_FILTER_NEAREST to look really bad */
cairo_pattern_set_filter (pattern, CAIRO_FILTER_BEST);
- /* FIXME: Doesn't the image mask support any colorspace? */
- cairo_set_source (cairo, fill_pattern);
cairo_mask (cairo, pattern);
cairo_pattern_destroy (pattern);
_______________________________________________
poppler mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/poppler
