X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Fpdf.cc;h=f06949ea5ea6794352495aba59ffad126f1b7f60;hb=072be5204983fd801b1d573f5a8efc6e0ae2bc5a;hp=b4469233e38c21251fc5295beda9f8eb407292a7;hpb=ac7ae5fff104f26aca891fe172a52b6a13775517;p=swftools.git

diff --git a/lib/pdf/pdf.cc b/lib/pdf/pdf.cc
index b446923..f06949e 100644
--- a/lib/pdf/pdf.cc
+++ b/lib/pdf/pdf.cc
@@ -115,6 +115,8 @@ void pdfpage_rendersection(gfxpage_t*page, gfxdevice_t*output, gfxcoord_t x, gfx
     pi->outputDev->setDevice(0);
 }
 
+static int globalparams_count=0;
+
 void pdf_doc_destroy(gfxdocument_t*gfx)
 {
     pdf_doc_internal_t*i= (pdf_doc_internal_t*)gfx->internal;
@@ -135,9 +137,16 @@ void pdf_doc_destroy(gfxdocument_t*gfx)
 	free(global_page_range);
 	global_page_range = 0;
     }
+    
+    globalparams_count--;
+    if(!globalparams_count) {
+	delete globalParams;
+	globalParams = 0;
+	globalparams_count = 0;
+    }
 }
 
-void pdf_doc_set_parameter(gfxdocument_t*gfx, char*name, char*value)
+void pdf_doc_set_parameter(gfxdocument_t*gfx, const char*name, const char*value)
 {
     pdf_doc_internal_t*i= (pdf_doc_internal_t*)gfx->internal;
     GFXOutputDev*o = i->outputDev;
@@ -179,7 +188,7 @@ static char*getInfoString(Dict *infoDict, char *key)
     GString *s1, *s2;
     int i;
 
-    if (infoDict->lookup(key, &obj)->isString()) {
+    if (infoDict && infoDict->lookup(key, &obj)->isString()) {
 	s1 = obj.getString();
 	if ((s1->getChar(0) & 0xff) == 0xfe &&
 	    (s1->getChar(1) & 0xff) == 0xff) {
@@ -211,7 +220,7 @@ static char*getInfoDate(Dict *infoDict, char *key)
     Object obj;
     char *s;
 
-    if (infoDict->lookup(key, &obj)->isString()) {
+    if (infoDict && infoDict->lookup(key, &obj)->isString()) {
 	s = obj.getString()->getCString();
 	if (s[0] == 'D' && s[1] == ':') {
 	  s += 2;
@@ -223,7 +232,7 @@ static char*getInfoDate(Dict *infoDict, char *key)
     return strdup("");
 }
 
-char* pdf_doc_getinfo(gfxdocument_t*doc, char*name)
+char* pdf_doc_getinfo(gfxdocument_t*doc, const char*name)
 {
     pdf_doc_internal_t*i= (pdf_doc_internal_t*)doc->internal;
     if(!strcmp(name, "title")) return getInfoString(i->docinfo.getDict(), "Title");
@@ -250,7 +259,7 @@ char* pdf_doc_getinfo(gfxdocument_t*doc, char*name)
 }
 
 
-void storeDeviceParameter(char*name, char*value)
+static void storeDeviceParameter(const char*name, const char*value)
 {
     parameter_t*p = new parameter_t();
     p->name = strdup(name);
@@ -265,7 +274,7 @@ void storeDeviceParameter(char*name, char*value)
     }
 }
 
-void pdf_set_parameter(char*name, char*value)
+static void pdf_set_parameter(const char*name, const char*value)
 {
     msg("<verbose> setting parameter %s to \"%s\"", name, value);
     if(!strncmp(name, "fontdir", strlen("fontdir"))) {
@@ -298,8 +307,13 @@ void pdf_set_parameter(char*name, char*value)
     }
 }
 
-gfxdocument_t*pdf_open(char*filename)
+static gfxdocument_t*pdf_open(const char*filename)
 {
+    if(!globalParams) {
+        globalParams = new GFXGlobalParams();
+	globalparams_count++;
+    }
+    
     gfxdocument_t*pdf_doc = (gfxdocument_t*)malloc(sizeof(gfxdocument_t));
     memset(pdf_doc, 0, sizeof(gfxdocument_t));
     pdf_doc_internal_t*i= (pdf_doc_internal_t*)malloc(sizeof(pdf_doc_internal_t));
@@ -318,10 +332,6 @@ gfxdocument_t*pdf_open(char*filename)
     GString *fileName = new GString(filename);
     GString *userPW;
 
-    // read config file
-    if(!globalParams)
-        globalParams = new GlobalParams("");
-
     // open PDF file
     if (userPassword && userPassword[0]) {
       userPW = new GString(userPassword);
@@ -351,7 +361,7 @@ gfxdocument_t*pdf_open(char*filename)
               i->protect = 1;
     }
 
-    InfoOutputDev*io = new InfoOutputDev();
+    InfoOutputDev*io = new InfoOutputDev(i->doc->getXRef());
     int t;
     i->pages = (pdf_page_info_t*)malloc(sizeof(pdf_page_info_t)*pdf_doc->num_pages);
     memset(i->pages,0,sizeof(pdf_page_info_t)*pdf_doc->num_pages);