X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Fpdf.cc;h=98fb665f7e38d2bcbc67b0d865538987cb987748;hb=6e7e2136be1493c97a6fde2dd6565d6b34d9b888;hp=ab274a56d03aa8854ae79b55a91fe3f3232858bc;hpb=4e4ca53503fe65d797c088859b3bdcd60d48cf8f;p=swftools.git

diff --git a/lib/pdf/pdf.cc b/lib/pdf/pdf.cc
index ab274a5..98fb665 100644
--- a/lib/pdf/pdf.cc
+++ b/lib/pdf/pdf.cc
@@ -6,6 +6,7 @@
 #include "GlobalParams.h"
 #include "InfoOutputDev.h"
 #include "GFXOutputDev.h"
+#include "FullBitmapOutputDev.h"
 #include "BitmapOutputDev.h"
 #include "../mem.h"
 #include "pdf.h"
@@ -21,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;
@@ -105,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);
@@ -132,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;
@@ -320,6 +323,7 @@ static void storeDeviceParameter(const char*name, const char*value)
 typedef struct _gfxsource_internal
 {
     int config_bitmap_optimizing;
+    int config_full_bitmap_optimizing;
 } gfxsource_internal_t;
 
 static void pdf_set_parameter(gfxsource_t*src, const char*name, const char*value)
@@ -330,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);
@@ -353,14 +357,20 @@ static void pdf_set_parameter(gfxsource_t*src, const char*name, const char*value
 	storeDeviceParameter("ppmsubpixels", buf);
     } else if(!strcmp(name, "poly2bitmap")) {
         i->config_bitmap_optimizing = atoi(value);
+    } else if(!strcmp(name, "bitmapfonts") || !strcmp(name, "bitmap")) {
+        i->config_full_bitmap_optimizing = atoi(value);
     } else if(!strcmp(name, "multiply")) {
         multiply = atoi(value);
     } else if(!strcmp(name, "help")) {
 	printf("\nPDF device global parameters:\n");
-	printf("fontdir=<dir>   a directory with additional fonts\n");
-	printf("font=<filename> an dditional font filename\n");
-	printf("pages=<range>   the range of pages to convert (example: pages=1-100,210-)\n");
-	printf("zoom=<dpi>      the resultion (default: 72)\n");
+	printf("fontdir=<dir>     a directory with additional fonts\n");
+	printf("font=<filename>   an additional font filename\n");
+	printf("pages=<range>     the range of pages to convert (example: pages=1-100,210-)\n");
+	printf("zoom=<dpi>        the resultion (default: 72)\n");
+	printf("languagedir=<dir> Add an xpdf language directory\n");
+	printf("multiply=<times>  Render everything at <times> the resolution\n");
+	printf("poly2bitmap       Convert graphics to bitmaps\n");
+	printf("bitmap            Convert everything to bitmaps\n");
     }	
     storeDeviceParameter(name,value);
 }
@@ -435,13 +445,17 @@ static gfxdocument_t*pdf_open(gfxsource_t*src, const char*filename)
 	}
     }
 
-    if(isrc->config_bitmap_optimizing) {
+    if(isrc->config_full_bitmap_optimizing) {
+	FullBitmapOutputDev*outputDev = new FullBitmapOutputDev(i->info, i->doc);
+	i->outputDev = (CommonOutputDev*)outputDev;
+    } else if(isrc->config_bitmap_optimizing) {
 	BitmapOutputDev*outputDev = new BitmapOutputDev(i->info, i->doc);
 	i->outputDev = (CommonOutputDev*)outputDev;
     } else {
 	GFXOutputDev*outputDev = new GFXOutputDev(i->info, i->doc);
 	i->outputDev = (CommonOutputDev*)outputDev;
     }
+
     /* pass global parameters to PDF driver*/
     parameter_t*p = device_config;
     while(p) {
@@ -472,6 +486,17 @@ void pdf_destroy(gfxsource_t*src)
 	return;
     gfxsource_internal_t*i = (gfxsource_internal_t*)src->internal;
     free(src->internal);src->internal=0;
+    
+    parameter_t*p = device_config;
+    while(p) {
+	parameter_t*next = p->next;
+	if(p->name) free(p->name);p->name = 0;
+	if(p->value) free(p->value);p->value =0;
+	p->next = 0;delete p;
+	p = next;
+    }
+    delete globalParams;globalParams = 0;
+    free(src);
 }
 
 gfxsource_t*gfxsource_pdf_create()