From 6746ac963e4a7779b1c5a07fc6a4ff935d65b6c5 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Fri, 9 Apr 2004 11:12:13 +0000 Subject: [PATCH] Some cleanups git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7189 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/BTextView/WidthBuffer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kits/interface/BTextView/WidthBuffer.cpp b/src/kits/interface/BTextView/WidthBuffer.cpp index 853d450cf0..9560ef25ce 100644 --- a/src/kits/interface/BTextView/WidthBuffer.cpp +++ b/src/kits/interface/BTextView/WidthBuffer.cpp @@ -174,7 +174,7 @@ _BWidthBuffer_::FindTable(const BFont *inStyle, int32 *outIndex) for (int32 i = 0; i < fItemCount; i++) { -#ifdef USE_DANO_WIDTHBUFFER +#if USE_DANO_WIDTHBUFFER if (*inStyle == fBuffer[i].font) { #else if (fontSize == fBuffer[i].fontSize @@ -236,7 +236,7 @@ _BWidthBuffer_::GetEscapement(uint32 value, int32 index, float *escapement) { _width_table_ *table = &fBuffer[index]; hashed_escapement *widths = static_cast(table->widths); - uint32 hashed = Hash(value) & (table->tableCount - 1); + uint32 hashed = Hash(value) % table->tableCount; DEBUG_ONLY(uint32 iterations = 1;) uint32 found; @@ -306,7 +306,7 @@ _BWidthBuffer_::HashEscapements(const char *inText, int32 numChars, int32 textLe uint32 value = CharToCode(inText + offset, charLen); - uint32 hashed = Hash(value) & (table->tableCount - 1); + uint32 hashed = Hash(value) % table->tableCount; uint32 found = widths[hashed].code; // 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 for (int32 oldPos = 0; oldPos < table->tableCount; oldPos++) { 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) { if (++newPos >= (uint32)newSize) newPos = 0;