* re-enabled rendering of vector glyph shapes (when text is rotated,
sheared or put to "false bold"), the actual problem was resolved with the last revision git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20480 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
84cf0edda0
commit
d2e5bdb4e8
|
@ -29,7 +29,7 @@
|
||||||
|
|
||||||
#define FLIP_Y false
|
#define FLIP_Y false
|
||||||
|
|
||||||
#define SHOW_GLYPH_BOUNDS 1
|
#define SHOW_GLYPH_BOUNDS 0
|
||||||
|
|
||||||
#if SHOW_GLYPH_BOUNDS
|
#if SHOW_GLYPH_BOUNDS
|
||||||
# include <agg_conv_stroke.h>
|
# include <agg_conv_stroke.h>
|
||||||
|
@ -184,7 +184,6 @@ 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
|
||||||
|
@ -195,7 +194,6 @@ 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;
|
||||||
|
@ -299,13 +297,11 @@ AGGTextRenderer::RenderString(const char* string,
|
||||||
|
|
||||||
// TODO: this currently falls into an endless loop - this is a quick fix to keep the
|
// 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
|
// 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);
|
||||||
|
|
Loading…
Reference in New Issue