diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-09-08 16:59:04 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-09-08 16:59:04 +0000 |
| commit | a7b795dd673ecc7490bc9a10b449680db17cef49 (patch) | |
| tree | b81610fa1ef5e32fd83d2f746d9ce11dd05b9776 /lib | |
| parent | d1284b8456f20c37b6c5893bdea19292bee63a90 (diff) | |
More bits for freetype 2.3.5
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/freetype/include/freetype/Makefile | 6 | ||||
| -rw-r--r-- | lib/freetype/include/freetype/internal/services/Makefile | 5 | ||||
| -rw-r--r-- | lib/freetype/src/gzip/zutil.c | 1 | ||||
| -rw-r--r-- | lib/freetype/src/truetype/ttgload.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/freetype/include/freetype/Makefile b/lib/freetype/include/freetype/Makefile index c23b79a9a..a93ea3202 100644 --- a/lib/freetype/include/freetype/Makefile +++ b/lib/freetype/include/freetype/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $ +# $OpenBSD: Makefile,v 1.3 2007/09/08 16:59:03 matthieu Exp $ .include <bsd.xorg.mk> @@ -9,8 +9,8 @@ SUBDIR= config internal INCSDIR=${X11BASE}/include/freetype2/freetype INCS= freetype.h ftbbox.h ftbdf.h ftbitmap.h \ - ftcache.h ftchapters.h fterrdef.h \ - fterrors.h ftglyph.h ftgzip.h ftimage.h ftincrem.h ftlist.h \ + ftcache.h ftchapters.h fterrdef.h fterrors.h ftgasp.h \ + ftglyph.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h \ ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftoutln.h ftpfr.h \ ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \ ftsystem.h fttrigon.h fttypes.h ftwinfnt.h ftxf86.h \ diff --git a/lib/freetype/include/freetype/internal/services/Makefile b/lib/freetype/include/freetype/internal/services/Makefile index 7ca602db8..3597ea1b9 100644 --- a/lib/freetype/include/freetype/internal/services/Makefile +++ b/lib/freetype/include/freetype/internal/services/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $ +# $OpenBSD: Makefile,v 1.3 2007/09/08 16:59:03 matthieu Exp $ .include <bsd.xorg.mk> INCSDIR=${X11BASE}/include/freetype2/freetype/internal/services INCS= svbdf.h svgldict.h svkern.h svmm.h svpfr.h svpostnm.h svpscmap.h \ - svpsinfo.h svsfnt.h svttcmap.h svtteng.h svwinfnt.h svxf86nm.h + svpsinfo.h svsfnt.h svttcmap.h svtteng.h svttglyf.h \ + svwinfnt.h svxf86nm.h .include "../../Makefile.inc" diff --git a/lib/freetype/src/gzip/zutil.c b/lib/freetype/src/gzip/zutil.c index f8b26d40f..48ba38385 100644 --- a/lib/freetype/src/gzip/zutil.c +++ b/lib/freetype/src/gzip/zutil.c @@ -3,7 +3,6 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: zutil.c,v 1.1 2006/11/25 18:44:42 matthieu Exp $ */ #include "zutil.h" diff --git a/lib/freetype/src/truetype/ttgload.c b/lib/freetype/src/truetype/ttgload.c index d41b2ee82..ae476a417 100644 --- a/lib/freetype/src/truetype/ttgload.c +++ b/lib/freetype/src/truetype/ttgload.c @@ -702,7 +702,7 @@ FT_GlyphLoader gloader = loader->gloader; FT_Error error = TT_Err_Ok; FT_Outline* outline; - FT_Int n_points; + FT_UInt n_points; outline = &gloader->current.outline; @@ -729,7 +729,7 @@ /* Deltas apply to the unscaled data. */ FT_Vector* deltas; FT_Memory memory = loader->face->memory; - FT_Int i; + FT_UInt i; error = TT_Vary_Get_Glyph_Deltas( (TT_Face)(loader->face), |