new parameter addspacechars

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

diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index c35cb39..1149088 100644 (file)
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -627,6 +627,7 @@ GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc)
     this->config_drawonlyshapes = 0;
     this->config_disable_polygon_conversion = 0;
     this->config_multiply = 1;
+    this->config_detectspaces = 1;
     this->config_linkdatafile = 0;
     this->page2page = 0;
     this->num_pages = 0;
@@ -644,6 +645,8 @@ void GFXOutputDev::setParameter(const char*key, const char*value)
         this->config_transparent = atoi(value);
     } else if(!strcmp(key,"drawonlyshapes")) {
         this->config_drawonlyshapes = atoi(value);
+    } else if(!strcmp(key,"detectspaces")) {
+        this->config_detectspaces = atoi(value);
     } else if(!strcmp(key,"extrafontdata")) {
         this->config_extrafontdata = atoi(value);
     } else if(!strcmp(key,"linkdatafile")) {
@@ -996,7 +999,8 @@ GBool GFXOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading)
            colToByte(color2.c[0]), colToByte(color2.c[1]), colToByte(color2.c[2]));
     infofeature("radial shaded fills");
 
-    gfxgradient_t*g = (gfxgradient_t*)malloc(sizeof(gfxgradient_t)*3);
+    gfxgradient_t gr[3];
+    gfxgradient_t*g = &gr[0];
     g[0].next = &g[1];
     g[1].next = &g[2];
     g[2].next = 0;
@@ -1452,7 +1456,7 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y,
        (render == RENDER_INVISIBLE)) {
 
        int space = this->current_fontinfo->space_char;
-       if(config_extrafontdata && space>=0 && m.m00 && !m.m01) {
+       if(config_extrafontdata && config_detectspaces && space>=0 && m.m00 && !m.m01) {
            /* space char detection */
            if(last_char_gfxfont == current_gfxfont && 
               last_char_y == m.ty &&
@@ -2663,7 +2667,7 @@ void GFXOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
     this->device = (gfxdevice_t*)rfx_calloc(sizeof(gfxdevice_t));
     dbg("this->device now %p (old: %p)", this->device, states[statepos].olddevice);
 
-    gfxdevice_record_init(this->device);
+    gfxdevice_record_init(this->device, 0);
     
     /*if(!forSoftMask) { ////???
        state->setFillOpacity(0.0);
@@ -2760,7 +2764,7 @@ void GFXOutputDev::setSoftMask(GfxState *state, double *bbox, GBool alpha, Funct
     }
     states[statepos].olddevice = this->device;
     this->device = (gfxdevice_t*)rfx_calloc(sizeof(gfxdevice_t));
-    gfxdevice_record_init(this->device);
+    gfxdevice_record_init(this->device, 0);
 
     dbg("softmaskrecording is %p (dev=%p) at statepos %d\n", states[statepos].softmaskrecording, this->device, statepos);