summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2010-12-13 20:17:26 +0100
committerWerner Lemberg <wl@gnu.org>2010-12-13 20:17:26 +0100
commit312d26a4915bcf7ca1e428f7bdf7ed631574dc13 (patch)
tree0645c47282c579f738f97bb4c183d96e9c7cc1d3
parent396b11b840f84e8bff62f3c361d0b592e77ee703 (diff)
downloadfreetype2-312d26a4915bcf7ca1e428f7bdf7ed631574dc13.tar.gz
Fix parameter handling of `FT_Set_Renderer'.
Reported by Kirill Tishin <siege@bk.ru>. * src/base/ftobjs.c (FT_Set_Renderer): Increment `parameters'.
-rw-r--r--ChangeLog7
-rw-r--r--include/freetype/ftrender.h8
-rw-r--r--src/base/ftobjs.c1
3 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 579ae6222..0c9c1a52d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-13 Werner Lemberg <wl@gnu.org>
+
+ Fix parameter handling of `FT_Set_Renderer'.
+ Reported by Kirill Tishin <siege@bk.ru>.
+
+ * src/base/ftobjs.c (FT_Set_Renderer): Increment `parameters'.
+
2010-12-09 Werner Lemberg <wl@gnu.org>
[cff] Allow `hlineto' and `vlineto' without arguments.
diff --git a/include/freetype/ftrender.h b/include/freetype/ftrender.h
index e06a8142e..dd0229b81 100644
--- a/include/freetype/ftrender.h
+++ b/include/freetype/ftrender.h
@@ -212,6 +212,14 @@ FT_BEGIN_HEADER
/* */
/* This doesn't change the current renderer for other formats. */
/* */
+ /* Currently, only the B/W renderer, if compiled with */
+ /* FT_RASTER_OPTION_ANTI_ALIASING (providing a 5-levels */
+ /* anti-aliasing mode; this option must be set directly in */
+ /* `ftraster.c' and is undefined by default) accepts a single tag */
+ /* `pal5' to set its gray palette as a character string with */
+ /* 5~elements. Consequently, the third and fourth argument are zero */
+ /* normally. */
+ /* */
FT_EXPORT( FT_Error )
FT_Set_Renderer( FT_Library library,
FT_Renderer renderer,
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index cb44b8cca..6b01f43d5 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -3887,6 +3887,7 @@
error = set_mode( renderer, parameters->tag, parameters->data );
if ( error )
break;
+ parameters++;
}
}