Release-1.6.3-20100603

1 files changed, 10 insertions, 6 deletions

diff --git a/src/msc.cpp b/src/msc.cpp
index 72f9681..d844b32 100644
--- a/src/msc.cpp
+++ b/src/msc.cpp
@@ -68,13 +68,9 @@ static bool convertMapFile(QTextStream &t,const char *mapName,const QCString rel
       if ( isRef )
       {
         // handle doxygen \ref tag URL reference
-        QCString *dest;
         DocRef *df = new DocRef( (DocNode*) 0, url, context );
-        if (!df->ref().isEmpty())
-        {
-          if ((dest=Doxygen::tagDestinationDict[df->ref()])) t << *dest << "/";
-        }
-        if (!df->file().isEmpty()) t << relPath << df->file() << Doxygen::htmlFileExtension;
+        t << externalRef(relPath,df->ref(),TRUE);
+        if (!df->file().isEmpty()) t << df->file() << Doxygen::htmlFileExtension;
         if (!df->anchor().isEmpty()) t << "#" << df->anchor();
       }
       else
@@ -121,19 +117,24 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir,
   mscArgs+=extension+"\"";
   int exitCode;
   //printf("*** running: %s %s\n",mscExe.data(),mscArgs.data());
+  portable_sysTimerStart();
   if ((exitCode=portable_system(mscExe,mscArgs,FALSE))!=0)
   {
+    portable_sysTimerStop();
     goto error;
   }
+  portable_sysTimerStop();
   if ( (format==MSC_EPS) && (Config_getBool("USE_PDFLATEX")) )
   {
     QCString epstopdfArgs(maxCmdLine);
     epstopdfArgs.sprintf("\"%s.eps\" --outfile=\"%s.pdf\"",
                          outFile,outFile);
+    portable_sysTimerStart();
     if (portable_system("epstopdf",epstopdfArgs)!=0)
     {
       err("Error: Problems running epstopdf. Check your TeX installation!\n");
     }
+    portable_sysTimerStop();
   }
 
 error:
@@ -157,11 +158,14 @@ QCString getMscImageMapFromFile(const QCString& inFile, const QCString& outDir,
   mscArgs+=outFile + "\"";
 
   int exitCode;
+  portable_sysTimerStart();
   if ((exitCode=portable_system(mscExe,mscArgs,FALSE))!=0)
   {
+    portable_sysTimerStop();
     QDir::setCurrent(oldDir);
     return "";
   }
+  portable_sysTimerStop();
   
   QString result;
   QTextOStream tmpout(&result);