tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix x86 build error

This commit is contained in:
Don Ho 2023-03-08 19:34:41 +01:00
parent 36da61dc35
commit bf8b9e613e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PowerEditor/src/WinControls/FindCharsInRange/FindCharsInRange.cpp
View File

@ -127,10 +127,10 @@ intptr_t CALLBACK FindCharsInRangeDlg::run_dlgProc(UINT message, WPARAM wParam,
bool FindCharsInRangeDlg::findCharInRange(unsigned char beginRange, unsigned char endRange, intptr_t startPos, bool direction, bool wrap) bool FindCharsInRangeDlg::findCharInRange(unsigned char beginRange, unsigned char endRange, intptr_t startPos, bool direction, bool wrap)
{ {
int64_t totalSize = (*_ppEditView)->getCurrentDocLen(); size_t totalSize = (*_ppEditView)->getCurrentDocLen();
if (startPos == -1) if (startPos == -1)
startPos = direction == dirDown ? 0 : totalSize - 1; startPos = direction == dirDown ? 0 : totalSize - 1;
if (startPos > totalSize) if (startPos > static_cast<intptr_t>(totalSize))
return false; return false;
char *content = new char[totalSize + 1]; char *content = new char[totalSize + 1];
@ -140,12 +140,12 @@ bool FindCharsInRangeDlg::findCharInRange(unsigned char beginRange, unsigned cha
size_t found = 0; size_t found = 0;
for (int64_t i = startPos - (direction == dirDown ? 0 : 1); for (int64_t i = startPos - (direction == dirDown ? 0 : 1);
(direction == dirDown) ? i < totalSize : i >= 0 ; (direction == dirDown) ? i < static_cast<int64_t>(totalSize) : i >= 0 ;
(direction == dirDown) ? (++i) : (--i)) (direction == dirDown) ? (++i) : (--i))
{ {
if (static_cast<unsigned char>(content[i]) >= beginRange && static_cast<unsigned char>(content[i]) <= endRange) if (static_cast<unsigned char>(content[i]) >= beginRange && static_cast<unsigned char>(content[i]) <= endRange)
{ {
found = i; found = static_cast<size_t>(i);
isFound = true; isFound = true;
break; break;
} }
@ -156,12 +156,12 @@ bool FindCharsInRangeDlg::findCharInRange(unsigned char beginRange, unsigned cha
if (wrap) if (wrap)
{ {
for (int64_t i = (direction == dirDown ? 0: totalSize - 1); for (int64_t i = (direction == dirDown ? 0: totalSize - 1);
(direction == dirDown) ? i < totalSize : i >= 0 ; (direction == dirDown) ? i < static_cast<int64_t>(totalSize) : i >= 0 ;
(direction == dirDown) ? (++i) : (--i)) (direction == dirDown) ? (++i) : (--i))
{ {
if (static_cast<unsigned char>(content[i]) >= beginRange && static_cast<unsigned char>(content[i]) <= endRange) if (static_cast<unsigned char>(content[i]) >= beginRange && static_cast<unsigned char>(content[i]) <= endRange)
{ {
found = i; found = static_cast<size_t>(i);
isFound = true; isFound = true;
break; break;
} }