summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJehan <jehan@girinstud.io>2021-03-22 18:29:34 +0100
committerJehan <jehan@girinstud.io>2021-03-22 18:29:34 +0100
commitd5759d7e93bcf238f0ba426d81300c892d2f8e49 (patch)
tree71c02dfca0a74f2c0970a57c38215a3f3e116b8b
parentf1e69d5bcf8f9fe9a0d70a803e5250284f68e3c8 (diff)
src: reset shortcut charset/language on Reset().
Failing to do so, we always return the same language once we detected a shortcut one, even after resetting. For instance, the issue happened on the uchardet CLI tool.
-rw-r--r--src/nsUniversalDetector.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/nsUniversalDetector.cpp b/src/nsUniversalDetector.cpp
index ea9a4d6..06c2d9a 100644
--- a/src/nsUniversalDetector.cpp
+++ b/src/nsUniversalDetector.cpp
@@ -59,6 +59,10 @@ nsUniversalDetector::nsUniversalDetector(PRUint32 aLanguageFilter)
mLastChar = '\0';
mLanguageFilter = aLanguageFilter;
+ shortcutCharset = nullptr;
+ shortcutLanguage = nullptr;
+ shortcutConfidence = 0.01;
+
PRUint32 i;
for (i = 0; i < NUM_OF_CHARSET_PROBERS; i++)
mCharSetProbers[i] = nsnull;
@@ -85,6 +89,10 @@ nsUniversalDetector::Reset()
mInputState = ePureAscii;
mLastChar = '\0';
+ shortcutCharset = nullptr;
+ shortcutLanguage = nullptr;
+ shortcutConfidence = 0.01;
+
if (mEscCharSetProber)
mEscCharSetProber->Reset();