Commit 75ad4b83652737d3323ccddfb322accb6cb90676
2003-05-28T06:10:57
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Activate code for handling `origin'.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
diff --git a/ChangeLog b/ChangeLog
index 4d88cb4..3edc127 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 e1acae7..b51e0bd 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 047aacd..8223aab 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;