Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 473530 - PRBool violations after landing of bug 441782; r,sr=roc

Browse Source
This commit is contained in:
Ehsan Akhgari 2009-01-15 11:24:44 +03:30
parent a370bd81e2
commit 925938f029
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/thebes/src/gfxTextRunWordCache.cpp
View File

@ -601,9 +601,9 @@ TextRunWordCache::MakeTextRun(const PRUnichar *aText, PRUint32 aLength,
PRUnichar ch = i < aLength ? aText[i] : ' '; PRUnichar ch = i < aLength ? aText[i] : ' ';
if (!seenDigitToModify && needsNumeralProcessing) { if (!seenDigitToModify && needsNumeralProcessing) {
// check if there is a digit that needs to be transformed // check if there is a digit that needs to be transformed
if (HandleNumberInChar(ch, i > 0 ? if (HandleNumberInChar(ch, !!(i > 0 ?
IS_ARABIC_CHAR(aText[i-1]) : IS_ARABIC_CHAR(aText[i-1]) :
(aFlags & gfxTextRunWordCache::TEXT_INCOMING_ARABICCHAR), (aFlags & gfxTextRunWordCache::TEXT_INCOMING_ARABICCHAR)),
mBidiNumeral) != ch) mBidiNumeral) != ch)
seenDigitToModify = PR_TRUE; seenDigitToModify = PR_TRUE;
} }
@ -617,9 +617,9 @@ TextRunWordCache::MakeTextRun(const PRUnichar *aText, PRUint32 aLength,
numString = new PRUnichar[length]; numString = new PRUnichar[length];
for (PRUint32 j = 0; j < length; ++j) { for (PRUint32 j = 0; j < length; ++j) {
numString[j] = HandleNumberInChar(aText[wordStart+j], numString[j] = HandleNumberInChar(aText[wordStart+j],
wordStart+j > 0 ? !!(wordStart+j > 0 ?
IS_ARABIC_CHAR(numString[j-1]) : IS_ARABIC_CHAR(numString[j-1]) :
(aFlags & gfxTextRunWordCache::TEXT_INCOMING_ARABICCHAR), (aFlags & gfxTextRunWordCache::TEXT_INCOMING_ARABICCHAR)),
mBidiNumeral); mBidiNumeral);
} }
// now we make a transient textRun for the transformed word; this will not be cached // now we make a transient textRun for the transformed word; this will not be cached
@ -737,9 +737,9 @@ TextRunWordCache::MakeTextRun(const PRUint8 *aText, PRUint32 aLength,
numString = new PRUnichar[length]; numString = new PRUnichar[length];
for (PRUint32 j = 0; j < length; ++j) { for (PRUint32 j = 0; j < length; ++j) {
numString[j] = HandleNumberInChar(aText[wordStart+j], numString[j] = HandleNumberInChar(aText[wordStart+j],
wordStart+j > 0 ? !!(wordStart+j > 0 ?
IS_ARABIC_CHAR(numString[j-1]) : IS_ARABIC_CHAR(numString[j-1]) :
(aFlags & gfxTextRunWordCache::TEXT_INCOMING_ARABICCHAR), (aFlags & gfxTextRunWordCache::TEXT_INCOMING_ARABICCHAR)),
mBidiNumeral); mBidiNumeral);
} }
// now we make a transient textRun for the transformed word; this will not be cached // now we make a transient textRun for the transformed word; this will not be cached

2
intl/unicharutil/util/nsBidiUtils.cpp
View File

@ -584,7 +584,7 @@ nsresult HandleNumbers(PRUnichar* aBuffer, PRUint32 aSize, PRUint32 aNumFlag)
case IBMBIDI_NUMERAL_REGULAR: case IBMBIDI_NUMERAL_REGULAR:
case IBMBIDI_NUMERAL_HINDICONTEXT: case IBMBIDI_NUMERAL_HINDICONTEXT:
for (i=0;i<aSize;i++) for (i=0;i<aSize;i++)
aBuffer[i] = HandleNumberInChar(aBuffer[i], i>0 ? aBuffer[i-1] : 0, aNumFlag); aBuffer[i] = HandleNumberInChar(aBuffer[i], !!(i>0 ? aBuffer[i-1] : 0), aNumFlag);
break; break;
case IBMBIDI_NUMERAL_NOMINAL: case IBMBIDI_NUMERAL_NOMINAL:
default: default: