diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-05-10 13:45:20 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-10 13:45:20 (GMT) |
| commit | 057b8f281c95b8da56b8f2aea815bd2eff72f59c (patch) | |
| tree | b46e4ca7553f9e491a8ec7f182784cae0d30b620 /src/plantuml.cpp | |
| parent | 188b350bb4430485b1794a18ededcf12de80459e (diff) | |
| parent | 1e8a4daf669fa83a2b04c32a5be65ceffea59d9a (diff) | |
| download | Doxygen-057b8f281c95b8da56b8f2aea815bd2eff72f59c.zip Doxygen-057b8f281c95b8da56b8f2aea815bd2eff72f59c.tar.gz Doxygen-057b8f281c95b8da56b8f2aea815bd2eff72f59c.tar.bz2 | |
Merge pull request #7559 from albert-github/feature/bug_plantuml_hashAsciiKey
Plantuml has problems with output directories ending with directory separator
Diffstat (limited to 'src/plantuml.cpp')
| -rw-r--r-- | src/plantuml.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plantuml.cpp b/src/plantuml.cpp index 7995883..c11ab14 100644 --- a/src/plantuml.cpp +++ b/src/plantuml.cpp @@ -27,16 +27,22 @@ #include <qlist.h> -QCString PlantumlManager::writePlantUMLSource(const QCString &outDir,const QCString &fileName,const QCString &content,OutputFormat format) +QCString PlantumlManager::writePlantUMLSource(const QCString &outDirArg,const QCString &fileName,const QCString &content,OutputFormat format) { QCString baseName; QCString puName; QCString imgName; + QCString outDir(outDirArg); static int umlindex=1; Debug::print(Debug::Plantuml,0,"*** %s fileName: %s\n","writePlantUMLSource",qPrint(fileName)); Debug::print(Debug::Plantuml,0,"*** %s outDir: %s\n","writePlantUMLSource",qPrint(outDir)); + while ((outDir.findRev('/') == outDir.length()-1) || (outDir.findRev('\\') == outDir.length()-1)) + { + outDir = outDir.left(outDir.length()-1); + } + if (fileName.isEmpty()) // generate name { puName = "inline_umlgraph_"+QCString().setNum(umlindex); |