X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=lib%2Fpdf%2Fpdf.cc;h=98fb665f7e38d2bcbc67b0d865538987cb987748;hb=61fc99e1cb873d81d5badc053e9f6903e22db2d2;hp=f7fb640e729bd589d87f6df081f4f80879205f1f;hpb=21a3f7b017e8bc721f55c9f3365005b57b19816a;p=swftools.git diff --git a/lib/pdf/pdf.cc b/lib/pdf/pdf.cc index f7fb640..98fb665 100644 --- a/lib/pdf/pdf.cc +++ b/lib/pdf/pdf.cc @@ -8,7 +8,6 @@ #include "GFXOutputDev.h" #include "FullBitmapOutputDev.h" #include "BitmapOutputDev.h" -#include "DummyOutputDev.h" #include "../mem.h" #include "pdf.h" #define NO_ARGPARSER @@ -23,6 +22,8 @@ static char* global_page_range = 0; static parameter_t* device_config = 0; static parameter_t* device_config_next = 0; +static int globalparams_count=0; + typedef struct _pdf_page_info { int xMin, yMin, xMax, yMax; @@ -107,6 +108,8 @@ void render2(gfxpage_t*page, gfxdevice_t*dev) } pi->doc->displayPage((OutputDev*)pi->outputDev, page->nr, zoom*multiply, zoom*multiply, /*rotate*/0, true, true, /*doLinks*/(int)1); pi->doc->processLinks((OutputDev*)pi->outputDev, page->nr); + pi->outputDev->finishPage(); + pi->outputDev->setDevice(0); if(pi->middev) { gfxdevice_rescale_setdevice(pi->middev, 0x00000000); @@ -134,8 +137,6 @@ void pdfpage_rendersection(gfxpage_t*page, gfxdevice_t*output, gfxcoord_t x, gfx render2(page, output); } -static int globalparams_count=0; - void pdf_doc_destroy(gfxdocument_t*gfx) { pdf_doc_internal_t*i= (pdf_doc_internal_t*)gfx->internal; @@ -333,7 +334,7 @@ static void pdf_set_parameter(gfxsource_t*src, const char*name, const char*value addGlobalFontDir(value); } else if(!strcmp(name, "pages")) { global_page_range = strdup(value); - } else if(!strncmp(name, "font", strlen("font"))) { + } else if(!strncmp(name, "font", strlen("font")) && name[4]!='q') { addGlobalFont(value); } else if(!strncmp(name, "languagedir", strlen("languagedir"))) { addGlobalLanguageDir(value); @@ -362,10 +363,14 @@ static void pdf_set_parameter(gfxsource_t*src, const char*name, const char*value multiply = atoi(value); } else if(!strcmp(name, "help")) { printf("\nPDF device global parameters:\n"); - printf("fontdir=