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

Turns out drawing text using the outline path always results in an endless loop.

Browse Source 
Since I have no clue about AGG at this point, I just disabled rendering the glyphs;
instead, their bounding boxes will be shown.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19721 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2007-01-06 13:26:46 +00:00
parent 98969dd0a4
commit 167c61fce4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2005-2006, Stephan Aßmus <superstippi@gmx.de>. All rights reserved. * Copyright 2005-2007, Stephan Aßmus <superstippi@gmx.de>. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
@ -29,7 +29,7 @@
#define FLIP_Y false #define FLIP_Y false
#define SHOW_GLYPH_BOUNDS 0 #define SHOW_GLYPH_BOUNDS 1
#if SHOW_GLYPH_BOUNDS #if SHOW_GLYPH_BOUNDS
# include <agg_conv_stroke.h> # include <agg_conv_stroke.h>
@ -184,6 +184,7 @@ AGGTextRenderer::RenderString(const char* string,
fCurves.approximation_scale(transform.scale()); fCurves.approximation_scale(transform.scale());
#if 0
// 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
@ -194,6 +195,7 @@ AGGTextRenderer::RenderString(const char* string,
typedef agg::conv_transform<conv_font_contour_type, agg::trans_affine> typedef agg::conv_transform<conv_font_contour_type, agg::trans_affine>
conv_font_contour_trans_type; conv_font_contour_trans_type;
conv_font_contour_trans_type transformedContourOutline(fContour, transform); conv_font_contour_trans_type transformedContourOutline(fContour, transform);
#endif
float falseBoldWidth = fContour.width(); float falseBoldWidth = fContour.width();
double x = 0.0; double x = 0.0;
@ -295,12 +297,15 @@ AGGTextRenderer::RenderString(const char* string,
case agg::glyph_data_outline: { case agg::glyph_data_outline: {
fRasterizer.reset(); fRasterizer.reset();
// TODO: this currently falls into an endless loop - this is a quick fix to keep the
// app_server running - instead of the characters, their bounding boxes will be shown
#if 0
if (fContour.width() == 0.0) { if (fContour.width() == 0.0) {
fRasterizer.add_path(transformedOutline); fRasterizer.add_path(transformedOutline);
} else { } else {
fRasterizer.add_path(transformedContourOutline); fRasterizer.add_path(transformedContourOutline);
} }
#endif
#if SHOW_GLYPH_BOUNDS #if SHOW_GLYPH_BOUNDS
agg::path_storage p; agg::path_storage p;
p.move_to(glyphBounds.left + 0.5, glyphBounds.top + 0.5); p.move_to(glyphBounds.left + 0.5, glyphBounds.top + 0.5);
@ -327,7 +332,7 @@ AGGTextRenderer::RenderString(const char* string,
advanceY = glyph->advance_y; advanceY = glyph->advance_y;
firstLoop = false; firstLoop = false;
}; }
// put pen location behind rendered text // put pen location behind rendered text
// (at the baseline of the virtual next glyph) // (at the baseline of the virtual next glyph)