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

_PrepareUnicodeBuffer() no longer processes empty strings which should hide the

Browse Source 
often seen error message.
I'll investigate if convert_from_utf8() is supposed to return an error for empty
strings.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16327 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-02-10 11:37:06 +00:00
parent 48a3e0875c
commit a544829365
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp
View File

@ -181,13 +181,13 @@ AGGTextRenderer::RenderString(const char* string,
uint32 glyphCount; uint32 glyphCount;
if (_PrepareUnicodeBuffer(string, length, &glyphCount) >= B_OK) { if (_PrepareUnicodeBuffer(string, length, &glyphCount) >= B_OK) {
fCurves.approximation_scale(transform.scale()); fCurves.approximation_scale(transform.scale());
// use a transformation behind the curves // use a transformation behind the curves
// (only if glyph->data_type == agg::glyph_data_outline) // (only if glyph->data_type == agg::glyph_data_outline)
// in the pipeline for the rasterizer // in the pipeline for the rasterizer
typedef agg::conv_transform<conv_font_curve_type, agg::trans_affine> conv_font_trans_type; typedef agg::conv_transform<conv_font_curve_type, agg::trans_affine>
conv_font_trans_type;
conv_font_trans_type transformedOutline(fCurves, transform); conv_font_trans_type transformedOutline(fCurves, transform);
uint16* p = (uint16*)fUnicodeBuffer; uint16* p = (uint16*)fUnicodeBuffer;
@ -204,7 +204,6 @@ AGGTextRenderer::RenderString(const char* string,
transform.Transform(&transformOffset); transform.Transform(&transformOffset);
for (uint32 i = 0; i < glyphCount; i++) { for (uint32 i = 0; i < glyphCount; i++) {
/* // line break (not supported by R5) /* // line break (not supported by R5)
if (*p == '\n') { if (*p == '\n') {
y0 += LineOffset(); y0 += LineOffset();
@ -219,9 +218,8 @@ AGGTextRenderer::RenderString(const char* string,
const agg::glyph_cache* glyph = fFontCache.glyph(*p); const agg::glyph_cache* glyph = fFontCache.glyph(*p);
if (glyph) { if (glyph) {
if (i > 0 && fKerning) { if (i > 0 && fKerning)
fFontCache.add_kerning(&advanceX, &advanceY); fFontCache.add_kerning(&advanceX, &advanceY);
}
x += advanceX; x += advanceX;
y += advanceY; y += advanceY;
@ -268,7 +266,7 @@ AGGTextRenderer::RenderString(const char* string,
fFontCache.init_embedded_adaptors(glyph, x, y); fFontCache.init_embedded_adaptors(glyph, x, y);
glyphBounds = transform.TransformBounds(glyphBounds); glyphBounds = transform.TransformBounds(glyphBounds);
} }
if (clippingFrame.Intersects(glyphBounds)) { if (clippingFrame.Intersects(glyphBounds)) {
switch (glyph->data_type) { switch (glyph->data_type) {
case agg::glyph_data_mono: case agg::glyph_data_mono:
@ -276,7 +274,7 @@ AGGTextRenderer::RenderString(const char* string,
fFontCache.mono_scanline(), fFontCache.mono_scanline(),
*binRenderer); *binRenderer);
break; break;
case agg::glyph_data_gray8: case agg::glyph_data_gray8:
agg::render_scanlines(fFontCache.gray8_adaptor(), agg::render_scanlines(fFontCache.gray8_adaptor(),
fFontCache.gray8_scanline(), fFontCache.gray8_scanline(),
@ -347,6 +345,7 @@ AGGTextRenderer::RenderString(const char* string,
return transform.TransformBounds(bounds); return transform.TransformBounds(bounds);
} }
// StringWidth // StringWidth
double double
AGGTextRenderer::StringWidth(const char* utf8String, uint32 length) AGGTextRenderer::StringWidth(const char* utf8String, uint32 length)
@ -364,19 +363,15 @@ AGGTextRenderer::StringWidth(const char* utf8String, uint32 length)
double width = 0.0; double width = 0.0;
uint32 glyphCount; uint32 glyphCount;
if (_PrepareUnicodeBuffer(utf8String, length, &glyphCount) >= B_OK) { if (_PrepareUnicodeBuffer(utf8String, length, &glyphCount) >= B_OK) {
uint16* p = (uint16*)fUnicodeBuffer; uint16* p = (uint16*)fUnicodeBuffer;
double y = 0.0; double y = 0.0;
const agg::glyph_cache* glyph; const agg::glyph_cache* glyph;
for (uint32 i = 0; i < glyphCount; i++) { for (uint32 i = 0; i < glyphCount; i++) {
if ((glyph = fFontCache.glyph(*p))) { if ((glyph = fFontCache.glyph(*p))) {
if (i > 0 && fKerning)
if (i > 0 && fKerning) {
fFontCache.add_kerning(&width, &y); fFontCache.add_kerning(&width, &y);
}
width += glyph->advance_x; width += glyph->advance_x;
} }
@ -386,11 +381,17 @@ AGGTextRenderer::StringWidth(const char* utf8String, uint32 length)
return width; return width;
} }
// _PrepareUnicodeBuffer // _PrepareUnicodeBuffer
status_t status_t
AGGTextRenderer::_PrepareUnicodeBuffer(const char* utf8String, AGGTextRenderer::_PrepareUnicodeBuffer(const char* utf8String,
uint32 length, uint32* glyphCount) uint32 length, uint32* glyphCount)
{ {
if (length == 0) {
*glyphCount = 0;
return B_OK;
}
int32 srcLength = length; int32 srcLength = length;
int32 dstLength = srcLength * 4; int32 dstLength = srcLength * 4;