From ab861c197c596f78c7aea4f45c0e1252de10fc1f Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sun, 30 Aug 2015 21:43:50 +0200 Subject: Repaired breaking @include for LaTeX output --- src/latexgen.cpp | 4 +++- src/lodepng.cpp | 2 +- 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; } -- cgit v0.12