made output filename optional

[swftools.git] / pdf2swf / SWFOutputDev.cc

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index 251cd04..46a07bf 100644 (file)
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -442,6 +442,14 @@ T1_OUTLINE* gfxPath_to_T1_OUTLINE(GfxState*state, GfxPath*path)
     bezierpathsegment*outline = start = new bezierpathsegment();
     int cpos = 0;
     double lastx=0,lasty=0;
+    if(!num) {
+       logf("<warning> empty path");
+       outline->type = T1_PATHTYPE_MOVE;
+       outline->dest.x = 0;
+       outline->dest.y = 0;
+       outline->link = 0;
+       return (T1_OUTLINE*)outline;
+    }
     for(t = 0; t < num; t++) {
        GfxSubpath *subpath = path->getSubpath(t);
        int subnum = subpath->getNumPoints();
@@ -965,8 +973,30 @@ char*SWFOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
        refObj.fetch(ref, &strObj);
        refObj.free();
        strObj.streamReset();
-       while ((c = strObj.streamGetChar()) != EOF) {
-         fputc(c, f);
+       int f4[4];
+       char f4c[4];
+       int t;
+       for(t=0;t<4;t++) {
+           f4[t] = strObj.streamGetChar();
+           f4c[t] = (char)f4[t];
+           if(f4[t] == EOF)
+               break;
+       }
+       if(t==4) {
+           if(!strncmp(f4c, "true", 4)) {
+               /* some weird TTF fonts don't start with 0,1,0,0 but with "true".
+                  Change this on the fly */
+               f4[0] = f4[2] = f4[3] = 0;
+               f4[1] = 1;
+           }
+           fputc(f4[0], f);
+           fputc(f4[1], f);
+           fputc(f4[2], f);
+           fputc(f4[3], f);
+
+           while ((c = strObj.streamGetChar()) != EOF) {
+             fputc(c, f);
+           }
        }
        strObj.streamClose();
        strObj.free();