diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2016-07-30 14:06:36 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-30 14:06:36 (GMT) |
| commit | 646302c93b65f7584f73b739e7aff2eee70583b7 (patch) | |
| tree | 87535b7e89b886b321514f8015f2a8679baad2fc | |
| parent | 2d8a8cedfb7b0eda7a46d218c70e226c81516b71 (diff) | |
| parent | 711c6c0bee87d47d70b3ffa9ca8b39b704e91723 (diff) | |
| download | Doxygen-646302c93b65f7584f73b739e7aff2eee70583b7.zip Doxygen-646302c93b65f7584f73b739e7aff2eee70583b7.tar.gz Doxygen-646302c93b65f7584f73b739e7aff2eee70583b7.tar.bz2 | |
Merge pull request #463 from albert-github/feature/bug_copyLogo_latex
Doxygen fails to copy logo image to LaTex output dir
| -rw-r--r-- | src/doxygen.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index a2eb53a..d545265 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -9258,7 +9258,7 @@ static void copyStyleSheet() } } -static void copyLogo() +static void copyLogo(const QCString &outputOption) { QCString &projectLogo = Config_getString(PROJECT_LOGO); if (!projectLogo.isEmpty()) @@ -9271,7 +9271,7 @@ static void copyLogo() } else { - QCString destFileName = Config_getString(HTML_OUTPUT)+"/"+fi.fileName().data(); + QCString destFileName = outputOption+"/"+fi.fileName().data(); copyFile(projectLogo,destFileName); Doxygen::indexList->addImageFile(fi.fileName().data()); } @@ -11662,14 +11662,19 @@ void generateOutput() { FTVHelp::generateTreeViewImages(); copyStyleSheet(); - copyLogo(); + copyLogo(Config_getString(HTML_OUTPUT)); copyExtraFiles(Config_getList(HTML_EXTRA_FILES),"HTML_EXTRA_FILES",Config_getString(HTML_OUTPUT)); } if (generateLatex) { copyLatexStyleSheet(); + copyLogo(Config_getString(LATEX_OUTPUT)); copyExtraFiles(Config_getList(LATEX_EXTRA_FILES),"LATEX_EXTRA_FILES",Config_getString(LATEX_OUTPUT)); } + if (generateRtf) + { + copyLogo(Config_getString(RTF_OUTPUT)); + } if (generateHtml && Config_getBool(GENERATE_HTMLHELP) && |