X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.cc;h=52b92a5fec3d0082fbab9eb5c74db2d30ec03380;hb=f0a09477923d23dbdd74d00209d0247ae09e7ec9;hp=c3e290bfc591daa8c42d6f62a35c2126877e723c;hpb=ccf121bf7dc70517dad86f20d11592416ed9d7d9;p=swftools.git

diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index c3e290b..52b92a5 100644
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -80,7 +80,7 @@
 
 typedef struct _fontfile
 {
-    char*filename;
+    const char*filename;
     int used;
 } fontfile_t;
 
@@ -93,8 +93,8 @@ static int fontnum = 0;
 static char* lastfontdir = 0;
 
 struct fontentry {
-    char*pdffont;
-    char*filename;
+    const char*pdffont;
+    const char*filename;
     char*afm;
     int afmlen;
     char*pfb;
@@ -119,7 +119,7 @@ struct fontentry {
 
 static int verbose = 0;
 static int dbgindent = 0;
-static void dbg(char*format, ...)
+static void dbg(const char*format, ...)
 {
     char buf[1024];
     int l;
@@ -152,7 +152,7 @@ typedef struct _feature
 } feature_t;
 feature_t*featurewarnings = 0;
 
-void GFXOutputDev::showfeature(char*feature,char fully, char warn)
+void GFXOutputDev::showfeature(const char*feature,char fully, char warn)
 {
     feature_t*f = featurewarnings;
     while(f) {
@@ -174,18 +174,17 @@ void GFXOutputDev::showfeature(char*feature,char fully, char warn)
 	msg("<notice> File contains %s",feature);
     }
 }
-void GFXOutputDev::warnfeature(char*feature,char fully)
+void GFXOutputDev::warnfeature(const char*feature,char fully)
 {
     showfeature(feature,fully,1);
 }
-void GFXOutputDev::infofeature(char*feature)
+void GFXOutputDev::infofeature(const char*feature)
 {
     showfeature(feature,0,0);
 }
 
 GFXOutputState::GFXOutputState() {
     this->clipping = 0;
-    this->textRender = 0;
     this->createsoftmask = 0;
     this->transparencygroup = 0;
     this->softmask = 0;
@@ -286,7 +285,7 @@ GFXOutputDev::GFXOutputDev(parameter_t*p)
     }
 };
 
-void GFXOutputDev::setParameter(char*key, char*value)
+void GFXOutputDev::setParameter(const char*key, const char*value)
 {
     if(!strcmp(key,"rawtext")) {
         this->do_interpretType3Chars = atoi(value)^1;
@@ -476,7 +475,7 @@ static char* gfxstate2str(GfxState *state)
   return mybuf;
 }
 
-static void dumpFontInfo(char*loglevel, GfxFont*font);
+static void dumpFontInfo(const char*loglevel, GfxFont*font);
 static int lastdumps[1024];
 static int lastdumppos = 0;
 /* nr = 0  unknown
@@ -499,11 +498,11 @@ static void showFontError(GfxFont*font, int nr)
     else if(nr == 1)
       msg("<warning> The following font caused problems (substituting):");
     else if(nr == 2)
-      msg("<warning> The following Type 3 Font will be rendered as bitmap:");
+      msg("<warning> The following Type 3 Font will be rendered as graphics:");
     dumpFontInfo("<warning>", font);
 }
 
-static void dumpFontInfo(char*loglevel, GfxFont*font)
+static void dumpFontInfo(const char*loglevel, GfxFont*font)
 {
   char* id = getFontID(font);
   char* name = getFontName(font);
@@ -664,6 +663,24 @@ GBool GFXOutputDev::useShadedFills()
     infofeature("shaded fills");
     return gFalse;
 }
+  
+GBool GFXOutputDev::useDrawForm() 
+{ 
+    infofeature("forms");
+    return gFalse; 
+}
+void GFXOutputDev::drawForm(Ref id) 
+{
+    msg("<error> drawForm not implemented");
+}
+GBool GFXOutputDev::needNonText() 
+{ 
+    return gTrue; 
+}
+void GFXOutputDev::endPage() 
+{
+    msg("<verbose> endPage");
+}
 
 #define STROKE_FILL 1
 #define STROKE_CLIP 2
@@ -868,7 +885,7 @@ GBool GFXOutputDev::useDrawChar()
     return gTrue;
 }
 
-char*renderModeDesc[]= {"fill", "stroke", "fill+stroke", "invisible",
+const char*renderModeDesc[]= {"fill", "stroke", "fill+stroke", "invisible",
                       "clip+fill", "stroke+clip", "fill+stroke+clip", "clip"};
 
 #define RENDER_FILL 0
@@ -906,7 +923,7 @@ char* makeStringPrintable(char*str)
 
 int getGfxCharID(gfxfont_t*font, int charnr, char *charname, int u)
 {
-    char*uniname = 0;
+    const char*uniname = 0;
     if(!font)
         return charnr;
     if(u>0) {
@@ -963,6 +980,14 @@ int getGfxCharID(gfxfont_t*font, int charnr, char *charname, int u)
 	msg("<debug> Char [%d,%s,>%d<] maps to %d\n", charnr, charname, u, font->unicode2glyph[u]);
 	return font->unicode2glyph[u];
     }
+    /* try to use the unicode|0xe000 (needed for some WingDings fonts)
+       FIXME: do this only if we know the font is wingdings?
+     */
+    u |= 0xe000;
+    if(u>=0 && u<font->max_unicode && font->unicode2glyph[u]>=0) {
+	msg("<debug> Char [%d,%s,>%d<] maps to %d\n", charnr, charname, u, font->unicode2glyph[u]);
+	return font->unicode2glyph[u];
+    }
 
     if(charnr>=0 && charnr<font->num_glyphs) {
 	msg("<debug> Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr);
@@ -995,8 +1020,13 @@ void GFXOutputDev::beginString(GfxState *state, GString *s)
     this->current_font_matrix.ty = 0;
 
     gfxmatrix_t m = this->current_font_matrix;
+}
 
-    states[statepos].textRender = render;
+static gfxline_t* mkEmptyGfxShape(double x, double y)
+{
+    gfxline_t*line = (gfxline_t*)malloc(sizeof(gfxline_t));
+    line->x = x;line->y = y;line->type = gfx_moveTo;line->next = 0;
+    return line;
 }
 
 void GFXOutputDev::drawChar(GfxState *state, double x, double y,
@@ -1011,9 +1041,6 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y,
 	return;
     }
 
-    if(states[statepos].textRender != render)
-	msg("<error> Internal error: drawChar.render!=beginString.render");
-
     gfxcolor_t col = getFillColor(state);
 
     Gushort *CIDToGIDMap = 0;
@@ -1031,6 +1058,13 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y,
     if(uLen)
 	u = _u[0];
 
+/*    char*fontname = getFontName(font);
+    if(u<256 && strstr(fontname, "ingdings")) {
+        // symbols are at 0xe000 in the unicode table
+        u |= 0xe000;
+    }
+    free(fontname);*/
+
     if(font->isCIDFont()) {
 	GfxCIDFont*cfont = (GfxCIDFont*)font;
 
@@ -1079,6 +1113,22 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y,
     m.tx += user_movex + clipmovex;
     m.ty += user_movey + clipmovey;
 
+    if((!name || strcmp(name, "space")) && charid!=32 && u!=32)
+    {
+        gfxline_t*l = current_gfxfont->glyphs[charid].line;
+        double x,y;
+        char ok = 0;
+        while(l) {
+            if((l->type == gfx_lineTo || l->type == gfx_splineTo) && l->x!=x && l->y!=y) {
+                ok = 1;
+            }
+            l = l->next;
+        }
+        if(!ok) {
+            msg("<warning> Drawing empty character charid=%d", charid);
+        }
+    }
+
     if(render == RENDER_FILL) {
 	device->drawchar(device, current_gfxfont, charid, &col, &m);
     } else {
@@ -1097,6 +1147,9 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y,
 	if(render&RENDER_CLIP) {
 	    gfxline_t*add = gfxline_clone(tglyph);
 	    current_text_clip = gfxline_append(current_text_clip, add);
+	    if(!current_text_clip) {
+		current_text_clip = mkEmptyGfxShape(m.tx, m.ty);
+	    }
 	}
 	gfxline_free(tglyph);
     }
@@ -1106,8 +1159,6 @@ void GFXOutputDev::endString(GfxState *state)
 { 
     int render = state->getRender();
     msg("<trace> endString() render=%d textstroke=%08x", render, current_text_stroke);
-    if(states[statepos].textRender != render)
-	msg("<error> Internal error: drawChar.render!=beginString.render");
     
     if(current_text_stroke) {
 	/* fillstroke and stroke text rendering objects we can process right
@@ -1137,8 +1188,6 @@ void GFXOutputDev::endTextObject(GfxState *state)
 {
     int render = state->getRender();
     msg("<trace> endTextObject() render=%d textstroke=%08x clipstroke=%08x", render, current_text_stroke, current_text_clip);
-    if(states[statepos].textRender != render)
-	msg("<error> Internal error: drawChar.render!=beginString.render");
     
     if(current_text_clip) {
 	device->setparameter(device, "mark","TXT");
@@ -1302,7 +1351,7 @@ void GFXOutputDev::processLink(Link *link, Catalog *catalog)
     LinkAction*action=link->getAction();
     char buf[128];
     char*s = 0;
-    char*type = "-?-";
+    const char*type = "-?-";
     char*named = 0;
     int page = -1;
     msg("<trace> drawlink action=%d\n", action->getKind());
@@ -1452,7 +1501,6 @@ void GFXOutputDev::saveState(GfxState *state) {
       return;
     }
     statepos ++;
-    states[statepos].textRender = states[statepos-1].textRender;
     states[statepos].createsoftmask = states[statepos-1].createsoftmask;
     states[statepos].transparencygroup = states[statepos-1].transparencygroup;
     states[statepos].clipping = 0;
@@ -1465,7 +1513,8 @@ void GFXOutputDev::restoreState(GfxState *state) {
       msg("<error> Invalid restoreState");
       return;
   }
-  msg("<trace> restoreState");
+  msg("<trace> restoreState%s%s", states[statepos].softmask?" (end softmask)":"",
+	                          states[statepos].clipping?" (end clipping)":"");
   if(states[statepos].softmask) {
       clearSoftMask(state);
   }
@@ -1501,7 +1550,7 @@ char* writeOutStdFont(fontentry* f)
     return strdup(namebuf2);
 }
 
-char* GFXOutputDev::searchFont(char*name) 
+char* GFXOutputDev::searchFont(const char*name) 
 {	
     int i;
     char*filename=0;
@@ -1810,7 +1859,7 @@ char* GFXOutputDev::searchForSuitableFont(GfxFont*gfxFont)
 
 char* GFXOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
 {
-    char*fontname = 0, *filename = 0;
+    const char*fontname = 0, *filename = 0;
     msg("<notice> substituteFont(%s)", oldname);
 
     if(!(fontname = searchForSuitableFont(gfxFont))) {
@@ -2497,7 +2546,7 @@ void GFXOutputDev::eoFill(GfxState *state)
 }
 
 
-static char* dirseparator()
+static const char* dirseparator()
 {
 #ifdef WIN32
     return "\\";
@@ -2506,7 +2555,7 @@ static char* dirseparator()
 #endif
 }
 
-void addGlobalFont(char*filename)
+void addGlobalFont(const char*filename)
 {
     fontfile_t f;
     memset(&f, 0, sizeof(fontfile_t));
@@ -2519,10 +2568,10 @@ void addGlobalFont(char*filename)
     }
 }
 
-void addGlobalLanguageDir(char*dir)
+void addGlobalLanguageDir(const char*dir)
 {
     if(!globalParams)
-        globalParams = new GlobalParams("");
+        globalParams = new GlobalParams((char*)"");
     
     msg("<notice> Adding %s to language pack directories", dir);
 
@@ -2542,7 +2591,7 @@ void addGlobalLanguageDir(char*dir)
     fclose(fi);
 }
 
-void addGlobalFontDir(char*dirname)
+void addGlobalFontDir(const char*dirname)
 {
 #ifdef HAVE_DIRENT_H
     msg("<notice> Adding %s to font directories", dirname);
@@ -2694,7 +2743,7 @@ void GFXOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
 				      GBool isolated, GBool knockout,
 				      GBool forSoftMask)
 {
-    char*colormodename = "";
+    const char*colormodename = "";
     BBox rect = mkBBox(state, bbox, this->width, this->height);
 
     if(blendingColorSpace) {
@@ -2742,9 +2791,9 @@ void GFXOutputDev::endTransparencyGroup(GfxState *state)
 
 void GFXOutputDev::paintTransparencyGroup(GfxState *state, double *bbox)
 {
-    char*blendmodes[] = {"normal","multiply","screen","overlay","darken", "lighten",
-		       "colordodge","colorburn","hardlight","softlight","difference",
-		       "exclusion","hue","saturation","color","luminosity"};
+    const char*blendmodes[] = {"normal","multiply","screen","overlay","darken", "lighten",
+                               "colordodge","colorburn","hardlight","softlight","difference",
+                               "exclusion","hue","saturation","color","luminosity"};
 
     dbg("paintTransparencyGroup blend=%s softmaskon=%d", blendmodes[state->getBlendMode()], states[statepos].softmask);
     msg("<verbose> paintTransparencyGroup blend=%s softmaskon=%d", blendmodes[state->getBlendMode()], states[statepos].softmask);
@@ -2797,6 +2846,13 @@ static inline Guchar div255(int x) {
   return (Guchar)((x + (x >> 8) + 0x80) >> 8);
 }
 
+static unsigned char clampU8(unsigned char c, unsigned char min, unsigned char max)
+{
+    if(c < min) c = min;
+    if(c > max) c = max;
+    return c;
+}
+
 void GFXOutputDev::clearSoftMask(GfxState *state)
 {
     if(!states[statepos].softmask)
@@ -2872,11 +2928,13 @@ void GFXOutputDev::clearSoftMask(GfxState *state)
 		alpha = (77*l1->r + 151*l1->g + 28*l1->b) >> 8;
 	    }
 
-	    /* premultiply alpha */
 	    l2->a = div255(alpha*l2->a);
-	    l2->r = div255(alpha*l2->r);
-	    l2->g = div255(alpha*l2->g);
-	    l2->b = div255(alpha*l2->b);
+
+	    /* DON'T premultiply alpha- this is done by fillbitmap,
+	       depending on the output device */
+	    //l2->r = div255(alpha*l2->r);
+	    //l2->g = div255(alpha*l2->g);
+	    //l2->b = div255(alpha*l2->b);
 
 	    l1++;
 	    l2++;