Fixed the output format when changing encoding
This commit is contained in:
parent
502b2eacbd
commit
27b5ba800c
|
@ -573,7 +573,9 @@ int WrapLibxml::saveEncoding (
|
||||||
}
|
}
|
||||||
|
|
||||||
xmlDocPtr docPtr;
|
xmlDocPtr docPtr;
|
||||||
int flags = XML_PARSE_DTDLOAD | XML_PARSE_PEDANTIC /*| XML_PARSE_DTDVALID*/;//XML_PARSE_NONET//XML_PARSE_DTDLOAD//0//(netAccess) ? XML_PARSE_DTDLOAD | XML_PARSE_NOENT : XML_PARSE_DTDLOAD | XML_PARSE_NONET | XML_PARSE_NOENT//0
|
// Don't load DTD because additional namespace declarations will be added
|
||||||
|
// to every element when processing a docbook XML
|
||||||
|
int flags = XML_PARSE_PEDANTIC /*| XML_PARSE_DTDLOAD | XML_PARSE_DTDVALID*/;
|
||||||
if ( !netAccess )
|
if ( !netAccess )
|
||||||
flags |= XML_PARSE_NONET;
|
flags |= XML_PARSE_NONET;
|
||||||
if ( utf8Buffer != NULL )
|
if ( utf8Buffer != NULL )
|
||||||
|
@ -598,8 +600,8 @@ int WrapLibxml::saveEncoding (
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
xmlChar *buffer;
|
xmlChar *buffer;
|
||||||
xmlDocDumpMemoryEnc ( docPtr, &buffer, &result,
|
xmlDocDumpFormatMemoryEnc ( docPtr, &buffer, &result,
|
||||||
encoding.utf8_str() );
|
encoding.utf8_str(), 1 );
|
||||||
outputBuffer->AppendData ( buffer, result );
|
outputBuffer->AppendData ( buffer, result );
|
||||||
xmlFree ( buffer );
|
xmlFree ( buffer );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue