From ab51e4cc0f311af3378aead667e1c45bbe5671cd Mon Sep 17 00:00:00 2001 From: miklosh Date: Sat, 21 Jul 2007 17:59:49 +0000 Subject: Further development of the PDF import module: continued pruning of PdfParser.cpp, added basic text and image support and did some coding style adjustments. (bzr r3272) --- src/extension/internal/pdfinput/pdf-input.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/extension/internal/pdfinput/pdf-input.cpp') diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index b9e616025..db401731f 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -44,7 +44,6 @@ PdfInput::open(::Inkscape::Extension::Input * mod, const gchar * uri) { // Initialize the globalParams variable for poppler if (!globalParams) { globalParams = new GlobalParams(); - g_message("Created globalParams"); } GooString *filename_goo = new GooString(uri); PDFDoc *pdf_doc = new PDFDoc(filename_goo, NULL, NULL, NULL); // TODO: Could ask for password @@ -65,23 +64,13 @@ PdfInput::open(::Inkscape::Extension::Input * mod, const gchar * uri) { Catalog *catalog = pdf_doc->getCatalog(); Page *page = catalog->getPage(page_num); - double width, height; - int rotate = page->getRotate(); - if (rotate == 90 || rotate == 270) { - width = page->getCropHeight(); - height = page->getCropWidth(); - } else { - width = page->getCropWidth(); - height = page->getCropHeight(); - } - SPDocument *doc = sp_document_new(NULL, TRUE, TRUE); bool saved = sp_document_get_undo_sensitive(doc); sp_document_set_undo_sensitive(doc, false); // No need to undo in this temporary document // Create builder and parser SvgBuilder *builder = new SvgBuilder(doc); - PdfParser *pdf_parser = new PdfParser(pdf_doc->getXRef(), builder, page_num-1, + PdfParser *pdf_parser = new PdfParser(pdf_doc->getXRef(), builder, page_num-1, page->getRotate(), page->getResourceDict(), page->getCropBox()); // Parse the document structure @@ -97,6 +86,7 @@ PdfInput::open(::Inkscape::Extension::Input * mod, const gchar * uri) { obj.free(); delete pdf_parser; delete builder; + delete pdf_doc; // Restore undo sp_document_set_undo_sensitive(doc, saved); -- cgit v1.2.3