gimp r27433 - in trunk: . app/text

[neo svn gnome org]

Author: neo
Date: Mon Oct 27 08:11:41 2008
New Revision: 27433
URL: http://svn.gnome.org/viewvc/gimp?rev=27433&view=rev

Log:
2008-10-27  Sven Neumann  <sven gimp org>

	* app/text/gimptext-bitmap.c: cleanup, removed unused includes.



Modified:
   trunk/ChangeLog
   trunk/app/text/gimptext-bitmap.c

Modified: trunk/app/text/gimptext-bitmap.c
==============================================================================
--- trunk/app/text/gimptext-bitmap.c	(original)
+++ trunk/app/text/gimptext-bitmap.c	Mon Oct 27 08:11:41 2008
@@ -23,8 +23,6 @@
 
 #include <glib-object.h>
 
-#define PANGO_ENABLE_ENGINE
-#include <cairo.h>
 #include <pango/pangocairo.h>
 
 #include "text-types.h"
@@ -32,12 +30,6 @@
 #include "gimptext-bitmap.h"
 
 
-/* for compatibility with older freetype versions */
-#ifndef FT_LOAD_TARGET_MONO
-#define FT_LOAD_TARGET_MONO  FT_LOAD_MONOCHROME
-#endif
-
-
 void
 gimp_text_render_bitmap (PangoFont            *font,
                          PangoGlyph            glyph,
@@ -53,11 +45,8 @@
 
   cfont = pango_cairo_font_get_scaled_font ((PangoCairoFont *) font);
 
-  x = PANGO_PIXELS (x);
-  y = PANGO_PIXELS (y);
-
-  cglyph.x     = x;
-  cglyph.y     = y;
+  cglyph.x     = PANGO_PIXELS (x);
+  cglyph.y     = PANGO_PIXELS (y);
   cglyph.index = glyph;
 
   cairo_set_scaled_font (cr, cfont);