diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2021-03-29 18:31:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 18:31:38 (GMT) |
| commit | e1e7e08d72d8d59def650fe3ad2a1c0e7e851354 (patch) | |
| tree | 572da07329c8f292e52dcd4f09812b4bec329a3f | |
| parent | 61d7591de12fbdfa141638c07bc230632f1e8106 (diff) | |
| parent | 50ac94e567aec98cc58754cbf429ff084903db89 (diff) | |
| download | Doxygen-e1e7e08d72d8d59def650fe3ad2a1c0e7e851354.zip Doxygen-e1e7e08d72d8d59def650fe3ad2a1c0e7e851354.tar.gz Doxygen-e1e7e08d72d8d59def650fe3ad2a1c0e7e851354.tar.bz2 | |
Merge pull request #8467 from albert-github/feature/bug_doxyfile_encoding
Incorrect DOXYFILE_ENCODING upon update
| -rw-r--r-- | src/configimpl.l | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/configimpl.l b/src/configimpl.l index bde2290..cae157b 100644 --- a/src/configimpl.l +++ b/src/configimpl.l @@ -2076,7 +2076,14 @@ void Config::compareDoxyfile(TextStream &t) bool Config::parse(const char *fileName,bool update) { - return ConfigImpl::instance()->parse(fileName,update); + bool parseRes = ConfigImpl::instance()->parse(fileName,update); + if (!parseRes) return parseRes; + + // Internally we use the default format UTF-8 and + // when updating etc. the output is in this format as well and not in the read format + ConfigString *option = (ConfigString*)g_config->get("DOXYFILE_ENCODING"); + option->init(); + return parseRes; } void Config::postProcess(bool clearHeaderAndFooter, bool compare) |