[poppler] poppler/poppler: CairoOutputDev.cc,1.47,1.48

[Jeff Muizelaar]

Update of /cvs/poppler/poppler/poppler
In directory kemper:/tmp/cvs-serv3645/poppler

Modified Files:
	CairoOutputDev.cc 
Log Message:
2006-12-20  Jeff Muizelaar  <jeff at infidigm.net>

	* poppler/CairoOutputDev.cc: Fix scaling of maskedImage masks. They
	should be scaled to the size of the image not the size of the mask.
	Fixes #9403.


Index: CairoOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/CairoOutputDev.cc,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- CairoOutputDev.cc	20 Dec 2006 19:55:55 -0000	1.47
+++ CairoOutputDev.cc	21 Dec 2006 01:01:30 -0000	1.48
@@ -621,7 +621,6 @@
   GfxRGB rgb;
   int alpha, i;
   cairo_matrix_t matrix;
-  cairo_matrix_t maskMatrix;
   int is_identity_transform;
 
   buffer = (unsigned char *)gmalloc (width * height * 4);
@@ -663,12 +662,9 @@
   cairo_matrix_init_translate (&matrix, 0, height);
   cairo_matrix_scale (&matrix, width, -height);
 
-  cairo_matrix_init_translate (&maskMatrix, 0, maskHeight);
-  cairo_matrix_scale (&maskMatrix, maskWidth, -maskHeight);
-
-
+  /* scale the mask to the size of the image unlike softMask */
   cairo_pattern_set_matrix (pattern, &matrix);
-  cairo_pattern_set_matrix (maskPattern, &maskMatrix);
+  cairo_pattern_set_matrix (maskPattern, &matrix);
 
   cairo_pattern_set_filter (pattern, CAIRO_FILTER_BILINEAR);
   cairo_set_source (cairo, pattern);