X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2Fpdf.cc;h=68fa71103ba0fc5f47deda37f33a3f5f261a7ce0;hp=a0d9c6a36158a3da3640da17e3b7ab9123cd923c;hb=f29d8006b1d8253c50808d6eb4941bdeb808c601;hpb=bcdeea968b4e4ec2cfdfaa21a7f6151a875fd5ce diff --git a/lib/pdf/pdf.cc b/lib/pdf/pdf.cc index a0d9c6a..68fa711 100644 --- a/lib/pdf/pdf.cc +++ b/lib/pdf/pdf.cc @@ -1,3 +1,5 @@ +#include +#include #include "../gfxdevice.h" #include "../gfxsource.h" #include "../devices/rescale.h" @@ -20,18 +22,6 @@ static char* global_page_range = 0; static int globalparams_count=0; -typedef struct _parameter -{ - struct _parameter *next; - const char*name; - const char*value; -} parameter_t; -typedef struct _parameterlist -{ - parameter_t* device_config; - parameter_t* device_config_next; -} parameterlist_t; - typedef struct _pdf_page_info { int xMin, yMin, xMax, yMax; @@ -47,7 +37,7 @@ typedef struct _pdf_doc_internal char config_bitmap_optimizing; char config_full_bitmap_optimizing; char config_print; - parameterlist_t parameters; + gfxparams_t* parameters; int protect; int nocopy; @@ -80,7 +70,7 @@ typedef struct _dev_output_internal typedef struct _gfxsource_internal { - parameterlist_t parameters; + gfxparams_t* parameters; } gfxsource_internal_t; @@ -93,34 +83,6 @@ static const char* dirseparator() #endif } -static void storeDeviceParameter(parameterlist_t*i, const char*name, const char*value) -{ - parameter_t*o = i->device_config; - while(o) { - if(!strcmp(name, o->name)) { - /* overwrite old value */ - free((void*)o->value); - o->value = strdup(value); - return; - } - o = o->next; - } - parameter_t*p = new parameter_t(); - p->name = strdup(name); - p->value = strdup(value); - p->next = 0; - - if(i->device_config_next) { - i->device_config_next->next = p; - i->device_config_next = p; - } else { - i->device_config = p; - i->device_config_next = p; - } -} - - - void pdfpage_destroy(gfxpage_t*pdf_page) { pdf_page_internal_t*i= (pdf_page_internal_t*)pdf_page->internal; @@ -148,14 +110,14 @@ static void render2(gfxpage_t*page, gfxdevice_t*dev, int x,int y, int x1,int y1, outputDev = (CommonOutputDev*)d; } /* pass global parameters to PDF driver*/ - parameter_t*p = i->parameters.device_config; + gfxparam_t*p = i->parameters->params; while(p) { - outputDev->setParameter(p->name, p->value); + outputDev->setParameter(p->key, p->value); p = p->next; } - p = pi->parameters.device_config; + p = pi->parameters->params; while(p) { - outputDev->setParameter(p->name, p->value); + outputDev->setParameter(p->key, p->value); p = p->next; } @@ -274,7 +236,7 @@ static void add_page_to_map(gfxdocument_t*gfx, int pdfpage, int outputpage) i->pagemap_pos = pdfpage; } -void pdf_doc_set_parameter(gfxdocument_t*gfx, const char*name, const char*value) +void pdf_doc_setparameter(gfxdocument_t*gfx, const char*name, const char*value) { pdf_doc_internal_t*i= (pdf_doc_internal_t*)gfx->internal; if(!strcmp(name, "pagemap")) { @@ -288,7 +250,7 @@ void pdf_doc_set_parameter(gfxdocument_t*gfx, const char*name, const char*value) } else if(!strcmp(name, "asprint")) { i->config_print = 1; } else { - storeDeviceParameter(&i->parameters, name, value); + gfxparams_store(i->parameters, name, value); } } @@ -388,17 +350,33 @@ char* pdf_doc_getinfo(gfxdocument_t*doc, const char*name) sprintf(buf, "%.1f", i->doc->getPDFVersion()); return strdup(buf); } - return 0; + return strdup(""); } -static void pdf_set_parameter(gfxsource_t*src, const char*name, const char*value) +/* shortcut to InfoOutputDev.cc */ +extern int config_addspace; +extern int config_fontquality; +extern int config_bigchar; + +static void pdf_setparameter(gfxsource_t*src, const char*name, const char*value) { gfxsource_internal_t*i = (gfxsource_internal_t*)src->internal; - parameterlist_t*p = &i->parameters; + + gfxparams_store(i->parameters, name, value); + msg(" setting parameter %s to \"%s\"", name, value); if(!strncmp(name, "fontdir", strlen("fontdir"))) { addGlobalFontDir(value); + } else if(!strcmp(name, "addspacechars")) { + config_addspace = atoi(value); + gfxparams_store(i->parameters, "detectspaces", 0); + } else if(!strcmp(name, "detectspaces")) { + config_addspace = atoi(value); + } else if(!strcmp(name, "fontquality")) { + config_fontquality = atoi(value); + } else if(!strcmp(name, "bigchar")) { + config_bigchar = atoi(value); } else if(!strcmp(name, "pages")) { global_page_range = strdup(value); } else if(!strncmp(name, "font", strlen("font")) && name[4]!='q') { @@ -441,13 +419,14 @@ static gfxdocument_t*pdf_open(gfxsource_t*src, const char*filename) pdf_doc_internal_t*i= (pdf_doc_internal_t*)malloc(sizeof(pdf_doc_internal_t)); memset(i, 0, sizeof(pdf_doc_internal_t)); i->parent = src; + i->parameters = gfxparams_new(); pdf_doc->internal = i; char*userPassword=0; i->filename = strdup(filename); char*x = 0; - if((x = strchr(filename, '|'))) { + if((x = strchr((char*)filename, '|'))) { *x = 0; userPassword = x+1; } @@ -466,7 +445,6 @@ static gfxdocument_t*pdf_open(gfxsource_t*src, const char*filename) delete userPW; } if (!i->doc->isOk()) { - printf("xpdf reports document as broken.\n"); return 0; } @@ -517,13 +495,19 @@ static gfxdocument_t*pdf_open(gfxsource_t*src, const char*filename) pdf_doc->get = 0; pdf_doc->destroy = pdf_doc_destroy; - pdf_doc->set_parameter = pdf_doc_set_parameter; + pdf_doc->setparameter = pdf_doc_setparameter; pdf_doc->getinfo = pdf_doc_getinfo; pdf_doc->getpage = pdf_doc_getpage; pdf_doc->prepare = pdf_doc_prepare; + + /* pass global parameters to PDF driver*/ + gfxparam_t*p = isrc->parameters->params; + while(p) { + pdf_doc->setparameter(pdf_doc, p->key, p->value); + p = p->next; + } return pdf_doc; - } void pdf_destroy(gfxsource_t*src) @@ -531,16 +515,9 @@ void pdf_destroy(gfxsource_t*src) if(!src->internal) return; gfxsource_internal_t*i = (gfxsource_internal_t*)src->internal; - - parameter_t*p = i->parameters.device_config; - while(p) { - parameter_t*next = p->next; - if(p->name) free((void*)p->name);p->name = 0; - if(p->value) free((void*)p->value);p->value =0; - p->next = 0;delete p; - p = next; - } - i->parameters.device_config=i->parameters.device_config_next=0; + + gfxparams_free(i->parameters); + i->parameters=0; free(src->internal);src->internal=0; @@ -552,11 +529,12 @@ gfxsource_t*gfxsource_pdf_create() { gfxsource_t*src = (gfxsource_t*)malloc(sizeof(gfxsource_t)); memset(src, 0, sizeof(gfxsource_t)); - src->set_parameter = pdf_set_parameter; + src->setparameter = pdf_setparameter; src->open = pdf_open; src->destroy = pdf_destroy; - src->internal = malloc(sizeof(gfxsource_internal_t)); - memset(src->internal, 0, sizeof(gfxsource_internal_t)); + gfxsource_internal_t*i = (gfxsource_internal_t*)rfx_calloc(sizeof(gfxsource_internal_t)); + src->internal = (void*)i; + i->parameters = gfxparams_new(); if(!globalParams) { globalParams = new GFXGlobalParams();