[poppler] poppler/qt4/src: poppler-page.cc,1.4,1.5

[Albert Astals Cid]

Update of /cvs/poppler/poppler/qt4/src
In directory gabe:/tmp/cvs-serv31488/qt4/src

Modified Files:
	poppler-page.cc 
Log Message:
Last xpdf 3.01 merge (at least from my side)
It's very big, but noone has opposed in the 2 weeks time i gave on the ml so either poppler is dead or people agree with the patch


Index: poppler-page.cc
===================================================================
RCS file: /cvs/poppler/poppler/qt4/src/poppler-page.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- poppler-page.cc	31 Jul 2005 09:54:04 -0000	1.4
+++ poppler-page.cc	30 Oct 2005 20:29:05 -0000	1.5
@@ -57,19 +57,19 @@
   SplashOutputDev *output_dev;
   SplashColor white;
   SplashBitmap *bitmap;
-  white.rgb8 = splashMakeRGB8(255,255,255);
+  white[0] = 255;
+  white[1] = 255;
+  white[2] = 255;
   SplashColorPtr color_ptr;
-  output_dev = new SplashOutputDev(splashModeRGB8, gFalse, white);
+  output_dev = new SplashOutputDev(splashModeRGB8, 4, gFalse, white);
   output_dev->startDoc(m_page->parentDoc->m_doc->doc.getXRef ());
   
   m_page->parentDoc->m_doc->doc.displayPageSlice(output_dev, m_page->index + 1, 72, 72,
-      0, -1, -1, -1, -1,
-      true,
-      false);
+      0, false, true, false, -1, -1, -1, -1);
   bitmap = output_dev->getBitmap ();
   color_ptr = bitmap->getDataPtr ();
 
-  QImage * img = new QImage( (uchar*)color_ptr.rgb8, bitmap->getWidth(), bitmap->getHeight(), QImage::Format_RGB32 );
+  QImage * img = new QImage( (uchar*)color_ptr, bitmap->getWidth(), bitmap->getHeight(), QImage::Format_RGB32 );
   *q = new QPixmap(QPixmap::fromImage(*img));
   
   delete img;
@@ -87,12 +87,13 @@
 						 72,
 						 72,
 						 0,
+						 false,
+						 true,
+						 false,
 						 -1,
 						 -1,
 						 -1,
-						 -1,
-						 true,
-						 false);
+						 -1);
   painter->end();
 }
 
@@ -106,19 +107,17 @@
   
   output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse);
   m_page->parentDoc->m_doc->doc.displayPageSlice(output_dev, m_page->index + 1, 72, 72,
-      0, -1, -1, -1, -1,
-      true,
-      false);
+      0, false, true, false, -1, -1, -1, -1);
   p = m_page->parentDoc->m_doc->doc.getCatalog()->getPage(m_page->index + 1);
   if (r.isNull())
   {
-    rect = p->getBox();
+    rect = p->getCropBox();
     s = output_dev->getText(rect->x1, rect->y1, rect->x2, rect->y2);
   }
   else
   {
     double height, y1, y2;
-    height = p->getHeight();
+    height = p->getCropHeight();
     y1 = height - r.top();
     y2 = height - r.bottom();
     s = output_dev->getText(r.left(), y1, r.right(), y2);
@@ -137,9 +136,9 @@
   
   p = m_page->parentDoc->m_doc->doc.getCatalog()->getPage(m_page->index + 1);
   if ( ( Page::Landscape == orientation() ) || (Page::Seascape == orientation() ) ) {
-      return QSizeF( p->getHeight(), p->getWidth() );
+      return QSizeF( p->getCropHeight(), p->getCropWidth() );
   } else {
-    return QSizeF( p->getWidth(), p->getHeight() );
+    return QSizeF( p->getCropWidth(), p->getCropHeight() );
   }
 }