walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch to FreeType 2.1.7 style includes. Bug #150. 

reviewed by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2003-11-18 07:53:04 +00:00
parent 8e8fcda45c
commit 408dd9c07a
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2003-11-17 Eric Christopherson <rakko@charter.net>
reviewed by: Keith Packard <keithp@keithp.com>
* doc/Makefile.am:
* fontconfig/fcfreetype.h:
* src/fcfreetype.c:
Switch to FreeType 2.1.7 style includes. Bug #150.
2003-11-16 Noah Levitt <nlevitt@columbia.edu> 2003-11-16 Noah Levitt <nlevitt@columbia.edu>
* fc-list/fc-list.sgml: Add some example usages. * fc-list/fc-list.sgml: Add some example usages.

1
doc/Makefile.am
View File

@ -134,6 +134,7 @@ fontconfig-user.html: local-fontconfig-user.sgml version.sgml confdir.sgml
$(DOC2HTML) -u local-fontconfig-user.sgml > $@.tmp $(DOC2HTML) -u local-fontconfig-user.sgml > $@.tmp
-test -f local-$@ && mv local-$@ $@ -test -f local-$@ && mv local-$@ $@
-test -f $@ || mv $@.tmp $@ -test -f $@ || mv $@.tmp $@
-test -f $@.tmp && $(RM) $@.tmp
fontconfig-user.txt: local-fontconfig-user.sgml version.sgml confdir.sgml fontconfig-user.txt: local-fontconfig-user.sgml version.sgml confdir.sgml
$(RM) $@ $(RM) $@

3
fontconfig/fcfreetype.h
View File

@ -24,7 +24,8 @@
#ifndef _FCFREETYPE_H_ #ifndef _FCFREETYPE_H_
#define _FCFREETYPE_H_ #define _FCFREETYPE_H_
#include <freetype/freetype.h> #include <ft2build.h>
#include FT_FREETYPE_H
_FCFUNCPROTOBEGIN _FCFUNCPROTOBEGIN

17
src/fcfreetype.c
View File

@ -48,16 +48,17 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "fcint.h" #include "fcint.h"
#include <freetype/freetype.h> #include <ft2build.h>
#include <freetype/internal/ftobjs.h> #include FT_FREETYPE_H
#include <freetype/tttables.h> #include FT_INTERNAL_OBJECTS_H
#include <freetype/ftsnames.h> #include FT_TRUETYPE_TABLES_H
#include <freetype/ttnameid.h> #include FT_SFNT_NAMES_H
#include <freetype/t1tables.h> #include FT_TRUETYPE_IDS_H
#include FT_TYPE1_TABLES_H
#if HAVE_FT_GET_BDF_PROPERTY #if HAVE_FT_GET_BDF_PROPERTY
#include <freetype/ftbdf.h> #include FT_BDF_H
#include <freetype/ftmodule.h> #include FT_MODULE_H
#define HAS_BDF_PROPERTY(f) ((f) && (f)->driver && \ #define HAS_BDF_PROPERTY(f) ((f) && (f)->driver && \
(f)->driver->root.clazz->get_interface) (f)->driver->root.clazz->get_interface)
#define MY_Get_BDF_Property(f,n,p) (HAS_BDF_PROPERTY(f) ? \ #define MY_Get_BDF_Property(f,n,p) (HAS_BDF_PROPERTY(f) ? \