fixed mismatched free/delete

[swftools.git] / lib / pdf / pdf.cc

diff --git a/lib/pdf/pdf.cc b/lib/pdf/pdf.cc
index 9390e4a..1d56679 100644 (file)
--- 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;
@@ -41,6 +44,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
@@ -131,8 +135,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;
@@ -148,6 +150,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 +294,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;
@@ -304,6 +321,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)
@@ -337,12 +355,14 @@ 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("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");
     }  
@@ -359,7 +379,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, '|'))) {
@@ -419,7 +439,10 @@ 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 {
@@ -450,6 +473,23 @@ 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;
+    
+    parameter_t*p = device_config;
+    while(p) {
+       parameter_t*next = p->next;
+       p->next = 0;delete p;
+       p = next;
+    }
+    delete globalParams;globalParams = 0;
+    free(src);
+}
 
 gfxsource_t*gfxsource_pdf_create()
 {
@@ -457,6 +497,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));