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

fixed confusion of byteCount and charCount in ServerFont::StringWidth(), just in case anyone really uses it later. Added UTF8CountChars() to moreUTF8.h, but then I didn't need it...

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12750 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2005-05-20 23:51:33 +00:00
parent 81cc749f6b
commit 7220b138f2
3 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/ServerFont.cpp
+28 -11
View File
@@ -402,22 +402,39 @@ ServerFont::GetEscapements(const char charArray[], int32 numChars,
// StringWidth
float
ServerFont::StringWidth(const char* string, int32 numChars) const
ServerFont::StringWidth(const char* string, int32 numBytes) const
{
// TODO: we're lazy for now and reuse the existing
// functionality in GetEscapements
escapement_delta delta;
delta.space = 0.0;
delta.nonspace = 0.0;
if (!string || numBytes <= 0)
return 0.0;
float* widthArray = new float[numChars];
FT_Face face = fStyle->GetFTFace();
if (!face)
return 0.0;
GetEscapements(string, numChars, widthArray, delta);
float width = 0.0;
for (int32 i = 0; i < numChars; i++)
width += widthArray[i] * fSize;
delete[] widthArray;
int32 convertedLength = numBytes * 2;
char* convertedBuffer = new char[convertedLength];
int32 state = 0;
status_t ret;
if ((ret = convert_from_utf8(B_UNICODE_CONVERSION,
string, &numBytes,
convertedBuffer, &convertedLength,
&state, B_SUBSTITUTE)) >= B_OK
&& (ret = swap_data(B_INT16_TYPE, convertedBuffer, convertedLength,
B_SWAP_BENDIAN_TO_HOST)) >= B_OK) {
uint16* glyphIndex = (uint16*)convertedBuffer;
// just to be sure
int numChars = convertedLength / sizeof(uint16);
for (int i = 0; i < numChars; i++) {
FT_Load_Char(face, glyphIndex[i], FT_LOAD_NO_BITMAP);
width += ((float)face->glyph->metrics.horiAdvance / 64.0) / fSize;
}
}
delete[] convertedBuffer;
return width;
}