From 75ad4b83652737d3323ccddfb322accb6cb90676 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Wed, 28 May 2003 06:10:57 +0000
Subject: [PATCH] * src/base/ftglyph.c (FT_Glyph_To_Bitmap): Activate code for
 handling `origin'.

---
 ChangeLog                  | 3 +++
 include/freetype/ftglyph.h | 5 ++---
 src/base/ftglyph.c         | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d88cb446..3edc1279e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* src/pshinter/pshalgo3.c (psh3_glyph_compute_extrema): Skip
 	contours with only a single point to avoid segfault.
 
+	* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Activate code for
+	handling `origin'.
+
 2003-05-24  Werner Lemberg  <wl@gnu.org>
 
 	* src/autohint/ahtypes.h (AH_OPTION_NO_STRONG_INTERPOLATION):
diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h
index e1acae7b8..b51e0bd7e 100644
--- a/include/freetype/ftglyph.h
+++ b/include/freetype/ftglyph.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    FreeType convenience functions to handle glyphs (specification).     */
 /*                                                                         */
-/*  Copyright 1996-2001 by                                                 */
+/*  Copyright 1996-2001, 2002, 2003 by                                     */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -391,8 +391,7 @@ FT_BEGIN_HEADER
   /*                                                                       */
   /* <Note>                                                                */
   /*    The glyph image is translated with the `origin' vector before      */
-  /*    rendering.  In case of error, it it translated back to its         */
-  /*    original position and the glyph is left untouched.                 */
+  /*    rendering.                                                         */
   /*                                                                       */
   /*    The first parameter is a pointer to a FT_Glyph handle, that will   */
   /*    be replaced by this function.  Typically, you would use (omitting  */
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
index 047aacda1..8223aabaa 100644
--- a/src/base/ftglyph.c
+++ b/src/base/ftglyph.c
@@ -592,7 +592,7 @@
 
     clazz = glyph->clazz;
 
-    /* when called with a bitmap glyph, do nothing and return succesfully */
+    /* when called with a bitmap glyph, do nothing and return successfully */
     if ( clazz == &ft_bitmap_glyph_class )
       goto Exit;
 
@@ -609,7 +609,7 @@
     if ( error )
       goto Exit;
 
-#if 0
+#if 1
     /* if `origin' is set, translate the glyph image */
     if ( origin )
       FT_Glyph_Transform( glyph, 0, origin );
@@ -622,7 +622,7 @@
     if ( !error )
       error = FT_Render_Glyph_Internal( glyph->library, &dummy, render_mode );
 
-#if 0
+#if 1
     if ( !destroy && origin )
     {
       FT_Vector  v;