GFF2XML: Add support for GFF4 files with big endian strings

xoreos · Aug 19, 2018 · e0251b0 · e0251b0
1 parent 7d4b295
commit e0251b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/gff2xml.cpp b/src/gff2xml.cpp
@@ -65,7 +65,7 @@ int main(int argc, char **argv) {
 		std::vector<Common::UString> args;
 		Common::Platform::getParameters(argc, argv, args);
 
-		Common::Encoding encoding = Common::kEncodingUTF16LE;
+		Common::Encoding encoding = Common::kEncodingInvalid;
 		Aurora::GameID   game     = Aurora::kGameIDUnknown;
 
 		EncodingOverrides encOverrides;

diff --git a/src/xml/gff4dumper.cpp b/src/xml/gff4dumper.cpp
@@ -73,6 +73,9 @@ void GFF4Dumper::dump(Common::WriteStream &output, Common::SeekableReadStream *i
 	_gff4.reset(new Aurora::GFF4File(input));
 	_xml.reset(new XMLWriter(output));
 
+	if (_encoding == Common::kEncodingInvalid)
+			_encoding = _gff4->getNativeEncoding();
+
 	_xml->openTag("gff4");
 	_xml->addProperty("type"    , Common::tagToString(_gff4->getType()       , true));
 	_xml->addProperty("version" , Common::tagToString(_gff4->getTypeVersion(), true));