summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2016-04-03 17:32:53 (GMT)
committeralbert-github <albert.tests@gmail.com>2016-04-03 17:32:53 (GMT)
commit711c6c0bee87d47d70b3ffa9ca8b39b704e91723 (patch)
tree2842df1d22c068cc374c70a9819cce8e60c643de
parent3731948d0b66ab53251201687ba7c682c2872e4d (diff)
downloadDoxygen-711c6c0bee87d47d70b3ffa9ca8b39b704e91723.zip
Doxygen-711c6c0bee87d47d70b3ffa9ca8b39b704e91723.tar.gz
Doxygen-711c6c0bee87d47d70b3ffa9ca8b39b704e91723.tar.bz2
Doxygen fails to copy logo image to LaTex output dir
Logo was only copied for HTML, now it is done for LaTeX and RTF as well.
-rw-r--r--src/doxygen.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 0180eec..5fb643a 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -9255,7 +9255,7 @@ static void copyStyleSheet()
}
}
-static void copyLogo()
+static void copyLogo(const QCString &outputOption)
{
QCString &projectLogo = Config_getString(PROJECT_LOGO);
if (!projectLogo.isEmpty())
@@ -9268,7 +9268,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());
}
@@ -11657,14 +11657,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) &&