added logging of glyph bounding boxes.

[swftools.git] / pdf2swf / swfoutput.cc

diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc
index 6ed1c31..9abde43 100644 (file)
--- a/pdf2swf/swfoutput.cc
+++ b/pdf2swf/swfoutput.cc
@@ -44,7 +44,7 @@ int jpegquality=85;
 int storeallcharacters=0;
 int enablezlib=0;
 int insertstoptag=0;
-int flashversion=4;
+int flashversion=5;
 int splinemaxerror=1;
 int fontsplinemaxerror=1;
 
@@ -119,11 +119,17 @@ static int moveto(TAG*tag, plotxy p0)
 // write a line-to command into the swf
 static void lineto(TAG*tag, plotxy p0)
 {
-    int rx = ((int)(p0.x*20)-swflastx);
-    int ry = ((int)(p0.y*20)-swflasty);
+    int px = (int)(p0.x*20);
+    int py = (int)(p0.y*20);
+    int rx = (px-swflastx);
+    int ry = (py-swflasty);
     /* we can't skip this for rx=0,ry=0, those
        are plots */
     swf_ShapeSetLine (tag, shape, rx,ry);
+
+    //swf_ExpandRect3(boundingBox, px, py, linewidth);
+    //swf_ExpandRect3(boundingBox, swflastx, swflasty, linewidth);
+
     shapeisempty = 0;
     swflastx+=rx;
     swflasty+=ry;
@@ -941,6 +947,7 @@ static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int
 
         putcharacter(obj, swffont->id, charid,(int)(m->m13*20),(int)(m->m23*20),
                 (int)(m->m11+0.5));
+       swf_FontUseGlyph(swffont, charid);
        return 1;
     }
     /*else
@@ -1031,11 +1038,6 @@ int getCharID(SWFFONT *font, int charnr, char *charname, int u)
     }
 
     if(u>0) {
-       if(u>=font->maxascii)
-           msg("<debug> u=%d, font->maxascii=%d",u,font->maxascii);
-       else
-           msg("<debug> u=%d, font->maxascii=%d ascci2glyph[%d]=%d",u,font->maxascii,u,font->ascii2glyph[u]);
-
        /* try to use the unicode id */
        if(u>=0 && u<font->maxascii && font->ascii2glyph[u]>=0) {
            return font->ascii2glyph[u];
@@ -1046,6 +1048,13 @@ int getCharID(SWFFONT *font, int charnr, char *charname, int u)
        return charnr;
     }
 
+    /* the following is technically wrong, and only works if the font encoding
+       is US-ASCII based. It's needed for fonts which return broken unicode
+       indices */
+/*    if(charnr>=0 && charnr<font->maxascii && font->ascii2glyph[charnr]>=0) {
+       return font->ascii2glyph[charnr];
+    }*/
+
     return -1;
 }
 
@@ -1077,6 +1086,7 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename)
        return;
     }
 
+    swf_SetLoadFontParameters(0,/*skip unused*/0,/*full unicode*/1);
     SWFFONT*swffont = swf_LoadFont(filename);
 
     if(swffont == 0) {
@@ -1097,7 +1107,12 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename)
        msg("<debug> |   Style: %d", swffont->style);
        msg("<debug> |   Encoding: %d", swffont->encoding);
        for(int iii=0; iii<swffont->numchars;iii++) {
-           msg("<debug> |   Glyph %d) name=%s, unicode=%d\n", iii, swffont->glyphnames[iii], swffont->glyph2ascii[iii]);
+           msg("<debug> |   Glyph %d) name=%s, unicode=%d size=%d bbox=(%.2f,%.2f,%.2f,%.2f)\n", iii, swffont->glyphnames[iii], swffont->glyph2ascii[iii], swffont->glyph[iii].shape->bitlen, 
+                   swffont->layout->bounds[iii].xmin/20.0,
+                   swffont->layout->bounds[iii].ymin/20.0,
+                   swffont->layout->bounds[iii].xmax/20.0,
+                   swffont->layout->bounds[iii].ymax/20.0
+                   );
        }
     }
 
@@ -1307,6 +1322,7 @@ static void endshape()
        tag = tag->prev;
        swf_DeleteTag(todel);
     } else {
+       /* TODO: fix bounding box */
        tag = swf_InsertTag(tag,ST_PLACEOBJECT2);
        swf_ObjectPlace(tag,shapeid,/*depth*/depth++,NULL,NULL,NULL);
     }
@@ -1355,8 +1371,7 @@ void swfoutput_newpage(struct swfoutput*obj)
     depth = startdepth;
 }
 
-/* "destroy" like in (oo-terminology) "destructor". Perform cleaning
-   up, complete the swf, and write it out. */
+/* Perform cleaning up, complete the swf, and write it out. */
 void swfoutput_destroy(struct swfoutput* obj) 
 {
     endpage(obj);
@@ -1365,6 +1380,8 @@ void swfoutput_destroy(struct swfoutput* obj)
        TAG*mtag = swf.firstTag;
        if(iterator->swffont) {
            mtag = swf_InsertTag(mtag, ST_DEFINEFONT2);
+           /*if(!storeallcharacters)
+               swf_FontReduce(iterator->swffont);*/
            swf_FontSetDefine2(mtag, iterator->swffont);
            swf_FontFree(iterator->swffont);
        }
@@ -1388,7 +1405,7 @@ void swfoutput_destroy(struct swfoutput* obj)
  
     tag = swf_InsertTag(tag,ST_END);
 
-    if(enablezlib) {
+    if(enablezlib || flashversion>=6) {
       if FAILED(swf_WriteSWC(fi,&swf)) 
        msg("<error> WriteSWC() failed.\n");
     } else {