Skip to content

Commit

Permalink
Doxygen fails to copy logo image to LaTex output dir
Browse files Browse the repository at this point in the history
Logo was only copied for HTML, now it is done for LaTeX and RTF as well.
  • Loading branch information
albert-github committed Apr 3, 2016
1 parent 3731948 commit 711c6c0
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/doxygen.cpp
Expand Up @@ -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())
Expand All @@ -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());
}
Expand Down Expand Up @@ -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) &&
Expand Down

0 comments on commit 711c6c0

Please sign in to comment.