Commit 8335c7ee authored by Jeff Muizelaar's avatar Jeff Muizelaar

2006-09-08 Jeff Muizelaar <jeff@infidigm.net>

	* 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.
parent 02d505aa
2006-09-08 Jeff Muizelaar <jeff@infidigm.net>
* 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.
2006-09-06 Jeff Muizelaar <jeff@infidigm.net>
* poppler/CairoOutputDev.cc: Avoid crashing in CairoOutputDev if
......
......@@ -504,9 +504,11 @@ void CairoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
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 @@ void CairoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
* 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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment