diff --git a/extensions/universalchardet/src/base/nsSBCSGroupProber.cpp b/extensions/universalchardet/src/base/nsSBCSGroupProber.cpp index f0d1351dddc2..37e386216b13 100644 --- a/extensions/universalchardet/src/base/nsSBCSGroupProber.cpp +++ b/extensions/universalchardet/src/base/nsSBCSGroupProber.cpp @@ -55,8 +55,11 @@ nsSBCSGroupProber::nsSBCSGroupProber() mProbers[7] = new nsSingleByteCharSetProber(&Win1253Model); mProbers[8] = new nsSingleByteCharSetProber(&Latin5BulgarianModel); mProbers[9] = new nsSingleByteCharSetProber(&Win1251BulgarianModel); - mProbers[10] = new nsSingleByteCharSetProber(&Latin2HungarianModel); - mProbers[11] = new nsSingleByteCharSetProber(&Win1250HungarianModel); + + // disable latin2 before latin1 is available, otherwise all latin1 + // will be detected as latin2 because of their similarity. + //mProbers[10] = new nsSingleByteCharSetProber(&Latin2HungarianModel); + //mProbers[11] = new nsSingleByteCharSetProber(&Win1250HungarianModel); Reset(); } diff --git a/extensions/universalchardet/src/base/nsSBCSGroupProber.h b/extensions/universalchardet/src/base/nsSBCSGroupProber.h index b238a6afc192..6ae746c3cfff 100644 --- a/extensions/universalchardet/src/base/nsSBCSGroupProber.h +++ b/extensions/universalchardet/src/base/nsSBCSGroupProber.h @@ -40,7 +40,7 @@ #define nsSBCSGroupProber_h__ -#define NUM_OF_SBCS_PROBERS 12 +#define NUM_OF_SBCS_PROBERS 10 class nsSingleByteCharSetProber; class nsSBCSGroupProber: public nsCharSetProber { diff --git a/extensions/universalchardet/src/base/nsSBCharSetProber.cpp b/extensions/universalchardet/src/base/nsSBCharSetProber.cpp index b57b46176fb2..aa9eba69ae22 100644 --- a/extensions/universalchardet/src/base/nsSBCharSetProber.cpp +++ b/extensions/universalchardet/src/base/nsSBCharSetProber.cpp @@ -98,7 +98,7 @@ float nsSingleByteCharSetProber::GetConfidence(void) float r; if (mTotalSeqs > 0) { - r = ((float)1.2) * mSeqCounters[POSITIVE_CAT] / mTotalSeqs / mModel->mTypicalPositiveRatio; + r = ((float)1.0) * mSeqCounters[POSITIVE_CAT] / mTotalSeqs / mModel->mTypicalPositiveRatio; r = r*mFreqChar/mTotalChar; if (r >= (float)1.00) r = (float)0.99;