changed mediabox/cropbox handling

[swftools.git] / lib / pdf / xpdf-changes.patch

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index 44c646f..4036abd 100644 (file)
--- a/lib/pdf/xpdf-changes.patch
+++ b/lib/pdf/xpdf-changes.patch
@@ -1,24 +1,3 @@
-Index: FoFiType1C.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/FoFiType1C.cc,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- FoFiType1C.cc      3 Dec 2005 10:11:33 -0000       1.3
-+++ FoFiType1C.cc      3 Dec 2005 10:30:41 -0000       1.4
-@@ -231,8 +231,11 @@
-     (*outputFunc)(outputStream,
-                 "0 1 255 {1 index exch /.notdef put} for\n", 40);
-     enc = newEncoding ? newEncoding : encoding;
-+    if(!enc) {
-+      fprintf(stderr, "convertToType1: Warning: No Encoding\n");
-+    }
-     for (i = 0; i < 256; ++i) {
--      if (enc[i]) {
-+      if (enc && enc[i]) {
-       sprintf(buf, "dup %d /%s put\n", i, enc[i]);
-       (*outputFunc)(outputStream, buf, strlen(buf));
-       }
 Index: Gfx.cc
 ===================================================================
 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Gfx.cc,v
@@ -27,13 +6,15 @@ retrieving revision 1.10
 diff -u -r1.9 -r1.10
 --- Gfx.cc     3 Dec 2005 10:11:33 -0000       1.9
 +++ Gfx.cc     3 Dec 2005 10:30:41 -0000       1.10
-@@ -439,7 +439,9 @@
+@@ -439,7 +439,11 @@
    fontChanged = gFalse;
    clip = clipNone;
    ignoreUndef = 0;
 -  out->startPage(pageNum, state);
 +  if(cropBox) {
 +      out->startPage(pageNum, state, cropBox->x1,cropBox->y1,cropBox->x2,cropBox->y2);
++  } else {
++      out->startPage(pageNum, state, 0,0,0,0);
 +  }
    out->setDefaultCTM(state->getCTM());
    out->updateAll(state);
@@ -444,34 +425,6 @@ diff -u -r1.7 -r1.9
  
    // End a page.
    virtual void endPage() {}
-Index: Page.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Page.cc,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -r1.5 -r1.6
---- Page.cc    3 Dec 2005 10:11:33 -0000       1.5
-+++ Page.cc    3 Dec 2005 10:30:41 -0000       1.6
-@@ -66,6 +66,19 @@
-     cropBox = mediaBox;
-   }
- 
-+  /* if the crop box is larger than the media box, cut it down to 
-+     media box size */
-+  if(haveCropBox &&
-+     mediaBox.x1 <= cropBox.x2 &&
-+     mediaBox.y1 <= cropBox.y2 &&
-+     cropBox.x1 <= mediaBox.x2 &&
-+     cropBox.y1 <= mediaBox.y2) {
-+      if(mediaBox.x1 >= cropBox.x1) cropBox.x1 = mediaBox.x1;
-+      if(mediaBox.y1 >= cropBox.y1) cropBox.y1 = mediaBox.y1;
-+      if(mediaBox.x2 <= cropBox.x2) cropBox.x2 = mediaBox.x2;
-+      if(mediaBox.y2 <= cropBox.y2) cropBox.y2 = mediaBox.y2;
-+  }
-+
-   // other boxes
-   bleedBox = cropBox;
-   readBox(dict, "BleedBox", &bleedBox);
 Index: Stream.cc
 ===================================================================
 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Stream.cc,v