From e980fe005f3ca91c1d30a7d1a530f62b7763c560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Fri, 20 May 2005 19:59:24 +0000 Subject: [PATCH] fixed the build, sorry git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12747 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/drawing/Painter/Painter.cpp | 1 - .../app/drawing/Painter/font_support/AGGTextRenderer.cpp | 8 -------- .../app/drawing/Painter/font_support/AGGTextRenderer.h | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/servers/app/drawing/Painter/Painter.cpp b/src/servers/app/drawing/Painter/Painter.cpp index 9f90e46e5e..84a334d8b0 100644 --- a/src/servers/app/drawing/Painter/Painter.cpp +++ b/src/servers/app/drawing/Painter/Painter.cpp @@ -22,7 +22,6 @@ #include "AGGTextRenderer.h" #include "DrawingMode.h" #include "DrawingModeFactory.h" -#include "FontManager.h" #include "PatternHandler.h" #include "RenderingBuffer.h" #include "ShapeConverter.h" diff --git a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp index 7c945cc205..d5d3001818 100644 --- a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp +++ b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp @@ -244,14 +244,6 @@ AGGTextRenderer::RenderString(const char* string, } if (glyphBounds.IsValid()) bounds = bounds.IsValid() ? bounds | glyphBounds : glyphBounds; - else { - if (bounds.IsValid()) { - bounds.right += glyph->advance_x; - bounds.bottom += glyph->advance_y; - } else { - bounds.Set(0.0, 0.0, glyph->advance_x, glyph->advance_y); - } - } // increment pen position advanceX = glyph->advance_x; diff --git a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h index 1ba2e17fbb..c11b959908 100644 --- a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h +++ b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h @@ -10,7 +10,7 @@ #include "agg_font_freetype.h" #include "defines.h" -#include "TextRenderer.h" +#include "Transformable.h" class ServerFont;