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

diff --git a/lib/pdf/pdf.cc b/lib/pdf/pdf.cc
index 9390e4a..ab274a5 100644
--- a/lib/pdf/pdf.cc
+++ b/lib/pdf/pdf.cc
@@ -41,6 +41,7 @@ typedef struct _pdf_doc_internal
     CommonOutputDev*outputDev;
     pdf_page_info_t*pages;
     gfxdevice_t* middev;
+    char*filename;
 } pdf_doc_internal_t;
 
 typedef struct _pdf_page_internal
@@ -148,6 +149,10 @@ void pdf_doc_destroy(gfxdocument_t*gfx)
     free(i->pages); i->pages = 0;
 
     i->docinfo.free();
+
+    if(i->filename) {
+	free(i->filename);i->filename=0;
+    }
     
     if(i->info) {
 	delete i->info;i->info=0;
@@ -288,10 +293,21 @@ char* pdf_doc_getinfo(gfxdocument_t*doc, const char*name)
 
 static void storeDeviceParameter(const char*name, const char*value)
 {
+    parameter_t*o = device_config;
+    while(o) {
+        if(!strcmp(name, o->name)) {
+            /* overwrite old value */
+            free(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(device_config_next) {
 	device_config_next->next = p;
 	device_config_next = p;
@@ -359,7 +375,7 @@ static gfxdocument_t*pdf_open(gfxsource_t*src, const char*filename)
     pdf_doc->internal = i;
     char*userPassword=0;
     
-    filename = strdup(filename);
+    i->filename = strdup(filename);
 
     char*x = 0;
     if((x = strchr(filename, '|'))) {
@@ -426,7 +442,6 @@ static gfxdocument_t*pdf_open(gfxsource_t*src, const char*filename)
 	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) {
@@ -450,6 +465,14 @@ static gfxdocument_t*pdf_open(gfxsource_t*src, const char*filename)
     return pdf_doc;
 
 }
+    
+void pdf_destroy(gfxsource_t*src)
+{
+    if(!src->internal)
+	return;
+    gfxsource_internal_t*i = (gfxsource_internal_t*)src->internal;
+    free(src->internal);src->internal=0;
+}
 
 gfxsource_t*gfxsource_pdf_create()
 {
@@ -457,6 +480,7 @@ gfxsource_t*gfxsource_pdf_create()
     memset(src, 0, sizeof(gfxsource_t));
     src->set_parameter = pdf_set_parameter;
     src->open = pdf_open;
+    src->destroy = pdf_destroy;
     src->internal = malloc(sizeof(gfxsource_internal_t));
     memset(src->internal, 0, sizeof(gfxsource_internal_t));