X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Fpdf.cc;h=d3f8b4da4f698efbb3d197f371be13cf56434b49;hb=36a061ee38719c1f4968fc22188086b98f9da716;hp=189a05cadae723f39673cf2a3148191d60c22114;hpb=5f1e7e9ebbac00effaae0545c32fe9060215d125;p=swftools.git

diff --git a/lib/pdf/pdf.cc b/lib/pdf/pdf.cc
index 189a05c..d3f8b4d 100644
--- a/lib/pdf/pdf.cc
+++ b/lib/pdf/pdf.cc
@@ -133,6 +133,11 @@ static void render2(gfxpage_t*page, gfxdevice_t*dev, int x,int y, int x1,int y1,
     pdf_doc_internal_t*pi = (pdf_doc_internal_t*)page->parent->internal;
     gfxsource_internal_t*i = (gfxsource_internal_t*)pi->parent->internal;
 
+    if(pi->nocopy) {
+        msg("<fatal> PDF disallows copying");
+        exit(0);
+    }
+
     CommonOutputDev*outputDev = 0;
     if(pi->config_full_bitmap_optimizing) {
 	FullBitmapOutputDev*d = new FullBitmapOutputDev(pi->info, pi->doc);
@@ -150,6 +155,12 @@ static void render2(gfxpage_t*page, gfxdevice_t*dev, int x,int y, int x1,int y1,
 	outputDev->setParameter(p->name, p->value);
 	p = p->next;
     }
+    p = pi->parameters.device_config;
+    while(p) {
+	outputDev->setParameter(p->name, p->value);
+	p = p->next;
+    }
+
     outputDev->setPageMap(pi->pagemap, pi->pagemap_pos);
     outputDev->setMove(x,y);
     outputDev->setClip(x1,y1,x2,y2);
@@ -182,11 +193,13 @@ static void render2(gfxpage_t*page, gfxdevice_t*dev, int x,int y, int x1,int y1,
     pi->doc->processLinks((OutputDev*)outputDev, page->nr);
     outputDev->finishPage();
     outputDev->setDevice(0);
+    delete outputDev;
 
     if(middev) {
 	gfxdevice_rescale_setdevice(middev, 0x00000000);
 	middev->finish(middev);
     }
+
 }
 
     
@@ -424,6 +437,12 @@ static void pdf_set_parameter(gfxsource_t*src, const char*name, const char*value
     }	
 }
 
+void pdf_doc_prepare(gfxdocument_t*doc, gfxdevice_t*dev)
+{
+    pdf_doc_internal_t*i= (pdf_doc_internal_t*)doc->internal;
+    i->info->dumpfonts(dev);
+}
+
 static gfxdocument_t*pdf_open(gfxsource_t*src, const char*filename)
 {
     gfxsource_internal_t*isrc = (gfxsource_internal_t*)src->internal;
@@ -500,8 +519,8 @@ static gfxdocument_t*pdf_open(gfxsource_t*src, const char*filename)
     pdf_doc->set_parameter = pdf_doc_set_parameter;
     pdf_doc->getinfo = pdf_doc_getinfo;
     pdf_doc->getpage = pdf_doc_getpage;
-
-
+    pdf_doc->prepare = pdf_doc_prepare;
+    
     return pdf_doc;
 
 }