[poppler] poppler/poppler: TextOutputDev.cc, 1.6.2.3, 1.6.2.4 TextOutputDev.h, 1.3.2.2, 1.3.2.3

[Kristian Hogsberg]

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

Modified Files:
      Tag: POPPLER_0_4_X
	TextOutputDev.cc TextOutputDev.h 
Log Message:
2005-08-24  Kristian Høgsberg  <krh at redhat.com>

        * poppler/TextOutputDev.cc: Push rotation argument down to
        GfxState constructor.  This is still not completely functional yet.

        * glib/poppler-page.cc (poppler_page_render_selection): Add
        rotation argument so API is useful.  Not yet implemented.
        (poppler_page_prepare_output_dev): Patch from Marco to fix
        rotation using the cairo backend.



Index: TextOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/TextOutputDev.cc,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -d -r1.6.2.3 -r1.6.2.4
--- TextOutputDev.cc	5 Aug 2005 22:31:14 -0000	1.6.2.3
+++ TextOutputDev.cc	24 Aug 2005 18:17:51 -0000	1.6.2.4
@@ -3193,6 +3193,7 @@
 public:
   TextSelectionPainter(TextPage *page,
 		       double scale,
+		       int rotation,
 		       OutputDev *out,
 		       GfxColor *box_color,
 		       GfxColor *glyph_color);
@@ -3219,6 +3220,7 @@
 
 TextSelectionPainter::TextSelectionPainter(TextPage *page,
 					   double scale,
+					   int rotation,
 					   OutputDev *out,
 					   GfxColor *box_color,
 					   GfxColor *glyph_color)
@@ -3229,7 +3231,7 @@
 {
   PDFRectangle box(0, 0, page->pageWidth, page->pageHeight);
 
-  state = new GfxState(72 * scale, 72 * scale, &box, 0, gFalse);
+  state = new GfxState(72 * scale, 72 * scale, &box, rotation, gFalse);
 
   out->startPage (0, state);
 
@@ -3523,10 +3525,12 @@
 
 void TextPage::drawSelection(OutputDev *out,
 			     double scale,
+			     int rotation,
 			     PDFRectangle *selection,
 			     GfxColor *glyph_color, GfxColor *box_color)
 {
-  TextSelectionPainter painter(this, scale, out, box_color, glyph_color);
+  TextSelectionPainter painter(this, scale, rotation, 
+			       out, box_color, glyph_color);
 
   visitSelection(&painter, selection);
 }
@@ -4094,9 +4098,10 @@
 
 void TextOutputDev::drawSelection(OutputDev *out,
 				  double scale,
+				  int rotation,
 				  PDFRectangle *selection,
 				  GfxColor *glyph_color, GfxColor *box_color) {
-  text->drawSelection(out, scale, selection, glyph_color, box_color);
+  text->drawSelection(out, scale, rotation, selection, glyph_color, box_color);
 }
 
 GooList *TextOutputDev::getSelectionRegion(PDFRectangle *selection,

Index: TextOutputDev.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/TextOutputDev.h,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- TextOutputDev.h	5 Aug 2005 19:07:47 -0000	1.3.2.2
+++ TextOutputDev.h	24 Aug 2005 18:17:51 -0000	1.3.2.3
@@ -425,6 +425,7 @@
 
   void drawSelection(OutputDev *out,
 		     double scale,
+		     int rotation,
 		     PDFRectangle *selection,
 		     GfxColor *glyph_color, GfxColor *box_color);
 
@@ -586,7 +587,8 @@
 		      double *xMin, double *yMin,
 		      double *xMax, double *yMax);
 
-  void drawSelection(OutputDev *out, double scale, PDFRectangle *selection,
+  void drawSelection(OutputDev *out, double scale, int rotation,
+		     PDFRectangle *selection,
 		     GfxColor *glyph_color, GfxColor *box_color);
 
   GooList *getSelectionRegion(PDFRectangle *selection, double scale);