Require a pageBox in the constructor for GfxState so that we do not always need to specify a cropbox

(bzr r3520)

2 files changed, 4 insertions, 3 deletions

diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 49c551be5..121e6aa47 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -257,7 +257,8 @@ PdfOperator PdfParser::opTab[] = {
 //------------------------------------------------------------------------
 
 PdfParser::PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA,
-                     int pageNum, int rotate, Dict *resDict, PDFRectangle *cropBox) {
+                     int pageNum, int rotate, Dict *resDict,
+                     PDFRectangle *box, PDFRectangle *cropBox) {
 
   int i;
 
@@ -269,7 +270,7 @@ PdfParser::PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *bui
   res = new GfxResources(xref, resDict, NULL);
 
   // initialize
-  state = new GfxState(72.0, 72.0, cropBox, rotate, gTrue);
+  state = new GfxState(72.0, 72.0, box, rotate, gTrue);
   clipHistory = new ClipHistoryEntry();
   setDefaultApproximationPrecision();
   fontChanged = gFalse;
diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
index 9caa01106..a40532fca 100644
--- a/src/extension/internal/pdfinput/pdf-parser.h
+++ b/src/extension/internal/pdfinput/pdf-parser.h
@@ -150,7 +150,7 @@ public:
 
   // Constructor for regular output.
   PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate,
-            Dict *resDict, PDFRectangle *cropBox);
+            Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox);
 
   // Constructor for a sub-page object.
   PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA,