X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=6af41024cb1fae099ab5facb6ea714980e097fc5;hb=d78d39d495201b40537d2c38d42ab34c60467865;hp=a3077a4f5585d25b5d8a14057c0662b46a40d257;hpb=b915170933ae170fa8c554a31c9223705a0b6bfc;p=swftools.git

diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc
index a3077a4..6af4102 100644
--- a/pdf2swf/SWFOutputDev.cc
+++ b/pdf2swf/SWFOutputDev.cc
@@ -548,7 +548,7 @@ void SWFOutputDev::beginString(GfxState *state, GString *s)
     state->getFontTransMat(&m11, &m12, &m21, &m22);
     m11 *= state->getHorizScaling();
     m21 *= state->getHorizScaling();
-    swfoutput_setfontmatrix(&output, m11, -m12, m21, -m22);
+    swfoutput_setfontmatrix(&output, m11, -m21, m12, -m22);
 }
 
 int charcounter = 0;
@@ -631,6 +631,7 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog)
     char*s = "-?-";
     char*type = "-?-";
     char*url = 0;
+    char*named = 0;
     int page = -1;
     switch(action->getKind())
     {
@@ -666,6 +667,7 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog)
 	    GString*name = l->getName();
 	    if(name) {
 	      s = name->lowerCase()->getCString();
+	      named = name->getCString();
 	      if(strstr(s, "next") || strstr(s, "forward"))
 	      {
 		  page = currentpage + 1;
@@ -732,6 +734,10 @@ void SWFOutputDev::drawLink(Link *link, Catalog *catalog)
     {
 	swfoutput_linktourl(&output, url, points);
     }
+    else if(named)
+    {
+	swfoutput_namedlink(&output, named, points);
+    }
     logf("<verbose> \"%s\" link to \"%s\" (%d)\n", type, s, page);
   }
 }
@@ -1528,7 +1534,7 @@ void pdfswf_performconversion()
     for(t=0;t<pagepos;t++)
     {
        currentpage = pages[t];
-       doc->displayPage((OutputDev*)output, currentpage, /*zoom*/100, /*rotate*/0, /*doLinks*/(int)1);
+       doc->displayPage((OutputDev*)output, currentpage, /*dpi*/72, /*rotate*/0, /*doLinks*/(int)1);
     }
 }