Commit 4ebc890e0658b8b9c13795559e142b255781aeb5
2008-04-13T22:06:12
* src/pcf/pcfdrivr.c (PCF_Face_Init): Protect call to `FT_Stream_OpenLZW' with `FT_CONFIG_OPTION_USE_LZ'. From Savannah bug #22909.
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
diff --git a/ChangeLog b/ChangeLog
index f1d1f17..26bca16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-14 Werner Lemberg <wl@gnu.org>
+
+ * src/pcf/pcfdrivr.c (PCF_Face_Init): Protect call to
+ `FT_Stream_OpenLZW' with `FT_CONFIG_OPTION_USE_LZ'. From Savannah
+ bug #22909.
+
2008-04-13 Werner Lemberg <wl@gnu.org>
* src/psaux/psconv.c (PS_Conv_ToFixed): Increase precision if
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
index 9cd330d..0fea30e 100644
--- a/src/pcf/pcfdrivr.c
+++ b/src/pcf/pcfdrivr.c
@@ -2,7 +2,7 @@
FreeType font driver for pcf files
- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007 by
+ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 by
Francesco Zappa Nardelli
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -273,6 +273,7 @@ THE SOFTWARE.
error = error2;
if ( error )
+#ifdef FT_CONFIG_OPTION_USE_LZW
{
FT_Error error3;
@@ -295,6 +296,9 @@ THE SOFTWARE.
if ( error )
goto Fail;
}
+#else
+ goto Fail;
+#endif
else
{
face->gzip_source = stream;