X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=37110fd8752e0a4ae4be8fdacb25d6f505434e21;hb=f27ce8fa3df8e15dc792bd008a37c5981b994267;hp=75d19e6bcf619dd99504ccd70e024488d42344cd;hpb=6db19c6950178d441f3a1ac99cda7cbf76d994a8;p=swftools.git

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index 75d19e6..37110fd 100644
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -846,7 +846,7 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
     // check for invisible text -- this is used by Acrobat Capture
     if ((state->getRender() & 3) == 3)
 	return;
-
+    Gushort *CIDToGIDMap = 0;
     GfxFont*font = state->getFont();
 
     if(font->getType() == fontType3) {
@@ -859,20 +859,29 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
     state->transform(x, y, &x1, &y1);
     
     Unicode u=0;
-    if(_u && uLen) 
+    char*name=0;
+
+    if(_u && uLen) {
 	u = *_u;
+	if (u) {
+	    int t;
+	    /* find out char name from unicode index 
+	       TODO: should be precomputed
+	     */
+	    for(t=0;t<sizeof(nameToUnicodeTab)/sizeof(nameToUnicodeTab[0]);t++) {
+		if(nameToUnicodeTab[t].u == u) {
+		    name = nameToUnicodeTab[t].name;
+		    break;
+		}
+	    }
+	}
+    }
 
-    /* find out the character name */
-    char*name=0;
-    if(font->isCIDFont() && u) {
+    if(font->isCIDFont()) {
 	GfxCIDFont*cfont = (GfxCIDFont*)font;
-	int t;
-	for(t=0;t<sizeof(nameToUnicodeTab)/sizeof(nameToUnicodeTab[0]);t++) {
-	    /* todo: should be precomputed */
-	    if(nameToUnicodeTab[t].u == u) {
-		name = nameToUnicodeTab[t].name;
-		break;
-	    }
+
+	if(font->getType() == fontCIDType2) {
+	    CIDToGIDMap = cfont->getCIDToGID();
 	}
     } else {
 	Gfx8BitFont*font8;
@@ -881,13 +890,14 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y,
 	if(enc && enc[c])
 	   name = enc[c];
     }
-    
-    msg("<debug> drawChar(%f,%f,c='%c' (%d),u=%d <%d>) CID=%d name=\"%s\"\n",x,y,(c&127)>=32?c:'?',c,u, uLen, font->isCIDFont(), FIXNULL(name));
-
-    /*x1 = (int)(x1+0.5);
-    y1 = (int)(y1+0.5);*/
-    
-    int ret = swfoutput_drawchar(&output, x1, y1, name, c, u);
+ 
+    if (CIDToGIDMap) {
+	msg("<debug> drawChar(%f, %f, c='%c' (%d), GID=%d, u=%d <%d>) CID=%d name=\"%s\"\n", x, y, (c&127)>=32?c:'?', c, CIDToGIDMap[c], u, uLen, font->isCIDFont(), FIXNULL(name));
+	swfoutput_drawchar(&output, x1, y1, name, CIDToGIDMap[c], u);
+    } else {
+	msg("<debug> drawChar(%f,%f,c='%c' (%d), u=%d <%d>) CID=%d name=\"%s\"\n",x,y,(c&127)>=32?c:'?',c,u, uLen, font->isCIDFont(), FIXNULL(name));
+	swfoutput_drawchar(&output, x1, y1, name, c, u);
+    }
 }
 
 void SWFOutputDev::endString(GfxState *state) {