CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ chg: encoding detection: reliability/confidence calculation adjustments

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-03-04 23:42:00 +01:00
parent 92c1cce89a
commit 5134fd48ff
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Edit.c
View File

@ -1087,24 +1087,25 @@ bool EditLoadFile(
// --------------------------------------------------------------------------
bool bIsReliable = false;
float confidence = 0.0f;
float const reliability_threshold = 0.50f;
float const reliability_threshold = 0.51f;
char origUCHARDET[256] = { '\0' };
reliability_threshold;
int const iAnalyzedEncoding_UCD = Encoding_Analyze_UCHARDET(lpData, cbNbytes4Analysis, &confidence, origUCHARDET, 256);
float const confidence_UCD = confidence;
int const iAnalyzedEncoding_CED = Encoding_Analyze_CED(lpData, cbNbytes4Analysis, iPreferedEncoding, &bIsReliable);
// ------------------------------------------------------
// calculate reliability
confidence = confidence_UCD;
int iAnalyzedEncoding = iAnalyzedEncoding_UCD;
float const ced_confidence = bIsReliable ? reliability_threshold + 0.25f : 0.25f;
float const ced_confidence = bIsReliable ? 0.70f : 0.20f;
int iAnalyzedEncoding = iAnalyzedEncoding_UCD;
float const bonus = (iAnalyzedEncoding == iPreferedEncoding) ? (1.0f - confidence_UCD) / 2.0f : 0.0f;
confidence = confidence_UCD + bonus;
if (iAnalyzedEncoding == iAnalyzedEncoding_CED) {
if (!Encoding_IsNONE(iAnalyzedEncoding)) {
confidence = (confidence + ced_confidence + 0.25f) / 2.0f;
confidence = (confidence + ced_confidence) / 2.0f;
}
}
else { // ambiguous results

2
src/Notepad3.c
View File

@ -10431,7 +10431,7 @@ void ShowZoomCallTip()
SciCall_CallTipShow(iPos, chToolTip);
SciCall_SetXOffset(iXOff);
Globals.CallTipType = CT_ZOOM;
_DelayClearZoomCallTip(2000);
_DelayClearZoomCallTip(3600);
}