summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Turner <david@freetype.org>2001-12-10 10:47:47 +0000
committerDavid Turner <david@freetype.org>2001-12-10 10:47:47 +0000
commit0ffc299a70c4373c8cf94e6cb1c5fdc54de3218f (patch)
tree9336bab04876d3bac5780b70b65df26f4921d1e6
parentea5ef83f3a765c2a245d6149d4250ec48241a83e (diff)
downloadfreetype2-0ffc299a70c4373c8cf94e6cb1c5fdc54de3218f.tar.gz
* src/pcf/pcfdriver.c (PCF_Init_Face): allow Xft to use PCF fonts
by setting the "face->metrics.max_advance" correctly..
-rw-r--r--ChangeLog6
-rw-r--r--docs/CHANGES6
-rw-r--r--include/freetype/config/ftoption.h8
-rw-r--r--src/pcf/pcfdriver.c2
4 files changed, 18 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a596d301f..a50e73ddd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-10 Francesco Zappa Nardelli <Francesco.Zappa.Nardelli@ens.fr>
+
+ * src/pcf/pcfdriver.c (PCF_Init_Face): allow Xft to use PCF fonts
+ by setting the "face->metrics.max_advance" correctly..
+
+
2001-12-07 David Turner <david@freetype.org>
* include/freetype/cache/ftccmap.h, src/cache/ftccmap.c: Added new
diff --git a/docs/CHANGES b/docs/CHANGES
index 5f542e7cc..a998c42ab 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,5 +1,11 @@
LATEST CHANGES BETWEEN 2.0.6 and 2.0.5
+ - the caching sub-system has been completely re-designed and its API
+ has evolved (the old one is still supported for bacwards compatibility
+ though..)
+
+ - a new charmap cache is provided too
+
- A new Postscript hinter module has been added to support native hints in
the following formats: Postscript Type 1, Postscript CID and CFF/CEF.
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 7a57a6108..d16d57518 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -249,8 +249,8 @@ FT_BEGIN_HEADER
/* */
/* Don't define any of these macros to compile in `release' mode! */
/* */
-#define FT_DEBUG_LEVEL_ERROR
-#define FT_DEBUG_LEVEL_TRACE
+#undef FT_DEBUG_LEVEL_ERROR
+#undef FT_DEBUG_LEVEL_TRACE
/*************************************************************************/
@@ -265,7 +265,7 @@ FT_BEGIN_HEADER
/* Note that the memory debugger is only activated at runtime when */
/* when the _environment_ variable "FT_DEBUG_MEMORY" is also defined! */
/* */
-#define FT_DEBUG_MEMORY
+#undef FT_DEBUG_MEMORY
/*************************************************************************/
@@ -454,7 +454,7 @@ FT_BEGIN_HEADER
#undef T1_CONFIG_OPTION_NO_MM_SUPPORT
/* */
-
+
FT_END_HEADER
diff --git a/src/pcf/pcfdriver.c b/src/pcf/pcfdriver.c
index 6c34524fe..34cc1c30b 100644
--- a/src/pcf/pcfdriver.c
+++ b/src/pcf/pcfdriver.c
@@ -120,6 +120,8 @@ THE SOFTWARE.
size->metrics.height = size->metrics.ascender -
size->metrics.descender;
+ size->metrics.max_advance = face->accel.maxbounds.characterWidth << 6;
+
return PCF_Err_Ok;
}
else