Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Turns out #1804 was fixed, but I broke it again with a "cleanup" commit. Fixed for real. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24096 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2008-02-24 15:51:39 +00:00
parent b1ab9b5f07
commit 3429c09099
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/kits/interface/textview_support/WidthBuffer.cpp
View File

@ -101,7 +101,9 @@ _BWidthBuffer_::StringWidth(const char *inText, int32 fromOffset, int32 length,
sourceText < inText + length;
sourceText += charLen) {
charLen = UTF8NextCharLen(sourceText);
printf("charlen: %ld\n", charLen);
// End of string, bail out
if (charLen <= 0)
break;
@ -197,8 +199,7 @@ int32
_BWidthBuffer_::InsertTable(const BFont *font)
{
_width_table_ table;
hashed_escapement *deltas = new hashed_escapement[kTableCount];
#if USE_DANO_WIDTHBUFFER
table.font = *font;
#else
@ -208,7 +209,7 @@ _BWidthBuffer_::InsertTable(const BFont *font)
table.hashCount = 0;
table.tableCount = kTableCount;
table.widths = deltas;
table.widths = new hashed_escapement[kTableCount];
uint32 position = fItemCount;
InsertItemsAt(1, position, &table);
@ -295,6 +296,7 @@ _BWidthBuffer_::HashEscapements(const char *inText, int32 numChars, int32 textLe
// Insert the escapements into the hash table
do {
const int32 charLen = UTF8NextCharLen(text);
printf("charlen: %ld\n", charLen);
if (charLen == 0)
break;
@ -320,7 +322,6 @@ _BWidthBuffer_::HashEscapements(const char *inText, int32 numChars, int32 textLe
// the total size.
if (table.tableCount * 2 / 3 <= table.hashCount) {
const int32 newSize = table.tableCount * 2;
table.tableCount = newSize;
// Create and initialize a new hash table
hashed_escapement *newWidths = new hashed_escapement[newSize];
@ -336,9 +337,10 @@ _BWidthBuffer_::HashEscapements(const char *inText, int32 numChars, int32 textLe
newWidths[newPos] = widths[oldPos];
}
}
// Delete the old table, and put the new pointer into the _width_table_
delete[] widths;
table.tableCount = newSize;
table.widths = widths = newWidths;
}
}