i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some cleanups

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7189 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2004-04-09 11:12:13 +00:00
parent ac41b0f103
commit 6746ac963e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/BTextView/WidthBuffer.cpp
+4 -4
View File
@@ -174,7 +174,7 @@ _BWidthBuffer_::FindTable(const BFont *inStyle, int32 *outIndex)
for (int32 i = 0; i < fItemCount; i++) { for (int32 i = 0; i < fItemCount; i++) {
#ifdef USE_DANO_WIDTHBUFFER #if USE_DANO_WIDTHBUFFER
if (*inStyle == fBuffer[i].font) { if (*inStyle == fBuffer[i].font) {
#else #else
if (fontSize == fBuffer[i].fontSize if (fontSize == fBuffer[i].fontSize
@@ -236,7 +236,7 @@ _BWidthBuffer_::GetEscapement(uint32 value, int32 index, float *escapement)
{ {
_width_table_ *table = &fBuffer[index]; _width_table_ *table = &fBuffer[index];
hashed_escapement *widths = static_cast<hashed_escapement *>(table->widths); hashed_escapement *widths = static_cast<hashed_escapement *>(table->widths);
uint32 hashed = Hash(value) & (table->tableCount - 1); uint32 hashed = Hash(value) % table->tableCount;
DEBUG_ONLY(uint32 iterations = 1;) DEBUG_ONLY(uint32 iterations = 1;)
uint32 found; uint32 found;
@@ -306,7 +306,7 @@ _BWidthBuffer_::HashEscapements(const char *inText, int32 numChars, int32 textLe
uint32 value = CharToCode(inText + offset, charLen); uint32 value = CharToCode(inText + offset, charLen);
uint32 hashed = Hash(value) & (table->tableCount - 1); uint32 hashed = Hash(value) % table->tableCount;
uint32 found = widths[hashed].code; uint32 found = widths[hashed].code;
// Check if the value is already in the table // Check if the value is already in the table
@@ -341,7 +341,7 @@ _BWidthBuffer_::HashEscapements(const char *inText, int32 numChars, int32 textLe
// Rehash the values, and put them into the new table // Rehash the values, and put them into the new table
for (int32 oldPos = 0; oldPos < table->tableCount; oldPos++) { for (int32 oldPos = 0; oldPos < table->tableCount; oldPos++) {
if (widths[oldPos].code != (uint32) -1) { if (widths[oldPos].code != (uint32) -1) {
uint32 newPos = Hash(widths[oldPos].code) & (newSize - 1); uint32 newPos = Hash(widths[oldPos].code) % newSize;
while (newWidths[newPos].code != (uint32)-1) { while (newWidths[newPos].code != (uint32)-1) {
if (++newPos >= (uint32)newSize) if (++newPos >= (uint32)newSize)
newPos = 0; newPos = 0;