1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29:23 +02:00

ZLEncodingConverter has a name; Rtf plugin as compilable again

Conflicts:

	jni/NativeFormats/fbreader/src/formats/rtf/RtfDescriptionReader.cpp
This commit is contained in:
Nikolay Pultsin 2012-03-22 18:40:23 +00:00
parent 50d6d2c00f
commit 5f6eb8a469
12 changed files with 42 additions and 16 deletions

View file

@ -51,7 +51,7 @@ void FormatPlugin::detectEncodingAndLanguage(Book &book, ZLInputStream &stream)
language = info->Language;
}
encoding = info->Encoding;
if ((encoding == "US-ASCII") || (encoding == "ISO-8859-1")) {
if ((encoding == "us-ascii") || (encoding == "iso-8859-1")) {
encoding = "windows-1252";
}
}