cairo: Do not extend the pattern in drawImageMaskRegular
This is causing some documents with tiling patterns to take ages to render,
since we switched to use drawImageMaskRegular in 00a536a4. This patch
applies the same changes made in 7d8dfb09 and db87dc7f for
drawImageMaskPrescaled to drawImageMaskRegular.
diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index 24b9e65..4d3cf02 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -2178,9 +2178,6 @@
cairo_pattern_set_filter (pattern, filter);
- if (!printing)
- cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
-
cairo_matrix_init_translate (&matrix, 0, height);
cairo_matrix_scale (&matrix, width, -height);
cairo_pattern_set_matrix (pattern, &matrix);
@@ -2196,6 +2193,11 @@
cairo_save (cairo);
cairo_rectangle (cairo, 0., 0., 1., 1.);
cairo_clip (cairo);
+ if (strokePathClip) {
+ cairo_push_group (cairo);
+ fillToStrokePathClip (state);
+ cairo_pop_group_to_source (cairo);
+ }
cairo_mask (cairo, pattern);
cairo_restore (cairo);
} else {
