Keith Packard
2006-Sep-02 23:11 UTC
[Fontconfig] fontconfig: Branch ''fc-2_4-keithp'' - 2 commits
conf.d/60-delicious.conf | 20 ++++++++++++++++++++
src/fcstr.c | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
New commits:
diff-tree 2a5ea80023657724e3e6ba629d828ab5e33bdb70 (from
e3b771a63e837b341bbd1e3e7e9c868244506f62)
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Sep 2 23:10:59 2006 -0700
Oops; missed the 60-delicious.conf file.
This file fixes Delicious Heavy fonts to have the correct weight value.
diff --git a/conf.d/60-delicious.conf b/conf.d/60-delicious.conf
new file mode 100644
index 0000000..701429b
--- /dev/null
+++ b/conf.d/60-delicious.conf
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.d/60-delicious.conf -->
+<fontconfig>
+<!-- Fix-ups for Delicious family -->
+
+<!-- Delicious ''heavy'' variant says its Medium weight
-->
+<match target="scan">
+ <test name="family">
+ <string>Delicious</string>
+ </test>
+ <test name="style">
+ <string>Heavy</string>
+ </test>
+ <edit name="weight">
+ <const>heavy</const>
+ </edit>
+</match>
+
+</fontconfig>
diff-tree e3b771a63e837b341bbd1e3e7e9c868244506f62 (from
04cedae0d5a720662bdc0de3d4cb97f6c77e7d1a)
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Sep 2 23:09:44 2006 -0700
Using uninitialized (and wrong) variable in FcStrCopyFilename.
A typo from the change in where filename canonicalization occurs.
diff --git a/src/fcstr.c b/src/fcstr.c
index 3309014..5faf579 100644
--- a/src/fcstr.c
+++ b/src/fcstr.c
@@ -770,7 +770,7 @@ FcStrCopyFilename (const FcChar8 *s)
return 0;
size = strlen ((char *) home) + strlen ((char *) s);
full = (FcChar8 *) malloc (size);
- if (!new)
+ if (!full)
return 0;
strcpy ((char *) full, (char *) home);
strcat ((char *) full, (char *) s + 1);