[Fontconfig] fontconfig: Branch 'fc-2_4-keithp'

[Keith Packard]

 src/fcint.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 09bd9ae2be032efb05a8be7bae584fa18756d951 (from 18b6857c6476517db7932025847ae952feba758d)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Fri Sep 1 02:22:59 2006 -0700

    Fontset pattern references are relative to fontset, not array.
    
    Within a fontset, the patterns are stored as pointers in an array.
    When stored as offsets, the offsets are relative to the fontset object
    itself, not the base of the array of pointers.

diff --git a/src/fcint.h b/src/fcint.h
index 42aa0eb..78d17e7 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -201,7 +201,7 @@ struct _FcPattern {
 #define FcFontSetFonts(fs)	FcPointerMember(fs,fonts,FcPattern *)
 
 #define FcFontSetFont(fs,i)	(FcIsEncodedOffset((fs)->fonts) ? \
-				 FcEncodedOffsetToPtr(FcFontSetFonts(fs), \
+				 FcEncodedOffsetToPtr(fs, \
 						      FcFontSetFonts(fs)[i], \
 						      FcPattern) : \
 				 fs->fonts[i])