summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2015-08-30 19:43:50 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2015-08-30 19:43:50 (GMT)
commitab861c197c596f78c7aea4f45c0e1252de10fc1f (patch)
tree229d4aaac37cbdeb8fb71ce49fc5d66b8bc6cadd
parent5dc8371ffb4fb0542a67656b0de900e265e96dc1 (diff)
downloadDoxygen-ab861c197c596f78c7aea4f45c0e1252de10fc1f.zip
Doxygen-ab861c197c596f78c7aea4f45c0e1252de10fc1f.tar.gz
Doxygen-ab861c197c596f78c7aea4f45c0e1252de10fc1f.tar.bz2
Repaired breaking @include for LaTeX output
-rw-r--r--src/latexgen.cpp4
-rw-r--r--src/lodepng.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index c524d2e..ad4cc89 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -791,9 +791,11 @@ void LatexGenerator::startFile(const char *name,const char *,const char *)
#endif
QCString fileName=name;
relPath = relativePathToRoot(fileName);
- m_codeGen.setSourceFileName(stripPath(fileName));
if (fileName.right(4)!=".tex" && fileName.right(4)!=".sty") fileName+=".tex";
startPlainFile(fileName);
+ m_codeGen.setTextStream(t);
+ m_codeGen.setRelativePath(relPath);
+ m_codeGen.setSourceFileName(stripPath(fileName));
}
void LatexGenerator::endFile()
diff --git a/src/lodepng.cpp b/src/lodepng.cpp
index 084f1c8..dbbced5 100644
--- a/src/lodepng.cpp
+++ b/src/lodepng.cpp
@@ -2347,7 +2347,7 @@ unsigned LodePNG_InfoRaw_copy(LodePNG_InfoRaw* dest, const LodePNG_InfoRaw* sour
LodePNG_InfoRaw_cleanup(dest);
*dest = *source;
LodePNG_InfoColor_init(&dest->color);
- error = LodePNG_InfoColor_copy(&dest->color, &source->color); if(error) return error;
+ error = LodePNG_InfoColor_copy(&dest->color, &source->color);
return error;
}