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

less overhead when byte count of string is already known

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14639 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2005-11-02 13:14:03 +00:00
parent ecf92c7e4b
commit 26a2be8ba5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
headers/private/servers/app/ServerFont.h
View File

@ -127,6 +127,7 @@ class ServerFont {
BPoint offsetArray[]) const;
bool GetEscapements(const char charArray[],
int32 numChars,
int32 numBytes,
float widthArray[],
escapement_delta delta) const;

2
src/servers/app/ServerApp.cpp
View File

@ -1852,7 +1852,7 @@ ServerApp::_DispatchMessage(int32 code, BPrivate::LinkReceiver &link)
font.SetRotation(rotation);
font.SetFlags(flags);
if (font.GetEscapements(charArray, numChars, escapements, delta)) {
if (font.GetEscapements(charArray, numChars, numBytes, escapements, delta)) {
fLink.StartMessage(B_OK);
fLink.Attach(escapements, numChars * sizeof(float));
} else

7
src/servers/app/ServerFont.cpp
View File

@ -509,7 +509,7 @@ ServerFont::GetEscapements(const char charArray[], int32 numChars,
// GetEscapements
bool
ServerFont::GetEscapements(const char charArray[], int32 numChars,
ServerFont::GetEscapements(const char charArray[], int32 numChars, int32 numBytes,
float widthArray[], escapement_delta delta) const
{
if (!fStyle || !charArray || numChars <= 0)
@ -525,7 +525,6 @@ ServerFont::GetEscapements(const char charArray[], int32 numChars,
// UTF8 handling...this can probably be smarter
// Here is what I do in the AGGTextRenderer to handle UTF8...
// It is probably highly inefficient, so it should be reviewed.
int32 numBytes = UTF8CountBytes(charArray, numChars);
int32 convertedLength = numBytes * 2;
char* convertedBuffer = new char[convertedLength];
@ -631,7 +630,7 @@ ServerFont::GetBoundingBoxesForStrings(char *charArray[], int32 lengthArray[],
FT_Set_Char_Size(face, 0, int32(fSize * 64), 72, 72);
for (int32 i=0; i<numStrings; i++) {
// TODO: ...
}
@ -717,7 +716,7 @@ ServerFont::TruncateString(BString* inOut, uint32 mode, float width) const
// get the escapement of each glyph in font units
float* escapementArray = new float[numChars];
static escapement_delta delta = (escapement_delta){ 0.0, 0.0 };
GetEscapements(string, numChars, escapementArray, delta);
GetEscapements(string, numChars, length, escapementArray, delta);
truncate_string(string, mode, width, result,
escapementArray, fSize, ellipsisWidth, length, numChars);