[poppler] poppler/poppler: ArthurOutputDev.cc,1.1,1.2

[Albert Astals Cid]

Update of /cvs/poppler/poppler/poppler
In directory gabe:/tmp/cvs-serv3660/poppler

Modified Files:
	ArthurOutputDev.cc 
Log Message:
use transformation matrix for image rendering in Arthur backend


Index: ArthurOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/ArthurOutputDev.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ArthurOutputDev.cc	28 Jun 2005 10:00:09 -0000	1.1
+++ ArthurOutputDev.cc	28 Jun 2005 22:00:05 -0000	1.2
@@ -574,16 +574,19 @@
   pattern = cairo_pattern_create_for_surface (image);
   if (pattern == NULL)
     return;
-
+#endif
   ctm = state->getCTM();
-  matrix.xx = ctm[0] / width;
+  /*matrix.xx = ctm[0] / width;
   matrix.xy = -ctm[2] / height;
   matrix.yx = ctm[1] / width;
   matrix.yy = -ctm[3] / height;
   matrix.x0 = ctm[2] + ctm[4];
-  matrix.y0 = ctm[3] + ctm[5];
+  matrix.y0 = ctm[3] + ctm[5];*/
+  matrix.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
 
-  cairo_matrix_invert (&matrix);
+  //cairo_matrix_invert (&matrix);
+  m_painter->setMatrix(matrix, true);
+#if 0
   cairo_pattern_set_matrix (pattern, &matrix);
 
   cairo_pattern_set_filter (pattern, CAIRO_FILTER_BILINEAR);
@@ -593,7 +596,6 @@
   cairo_pattern_destroy (pattern);
   cairo_surface_destroy (image);
 #endif
-  // TODO - figure out how to apply the matrix
   
   // verify image is correct.
   m_image->save("m_image.png", "PNG");