[poppler] poppler/poppler: Page.cc,1.8,1.9

[Albert Astals Cid]

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

Modified Files:
	Page.cc 
Log Message:
       * poppler/Page.cc: Only discard cropbox sizes one by one and not
       completely. Jeff and Martin were right


Index: Page.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Page.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Page.cc	12 Dec 2005 20:21:08 -0000	1.8
+++ Page.cc	18 Dec 2005 22:03:30 -0000	1.9
@@ -70,9 +70,16 @@
   else
   {
     // cropBox can not be bigger than mediaBox
-    if (cropBox.x2 - cropBox.x1 > mediaBox.x2 - mediaBox.x1 ||
-        cropBox.y2 - cropBox.y1 > mediaBox.y2 - mediaBox.y1)
-            cropBox = mediaBox;
+    if (cropBox.x2 - cropBox.x1 > mediaBox.x2 - mediaBox.x1)
+    {
+      cropBox.x1 = mediaBox.x1;
+      cropBox.x2 = mediaBox.x2;
+    }
+    if (cropBox.y2 - cropBox.y1 > mediaBox.y2 - mediaBox.y1)
+    {
+      cropBox.y1 = mediaBox.y1;
+      cropBox.y2 = mediaBox.y2;
+    }
   }
 
   // other boxes