diff options
author | Chris Liddell <chris.liddell@artifex.com> | 2021-01-05 09:01:59 +0000 |
---|---|---|
committer | Chris Liddell <chris.liddell@artifex.com> | 2021-01-05 09:09:33 +0000 |
commit | cc2f67265d1508a6cf953470ef7b2a0d9a1a14e3 (patch) | |
tree | 608dea8bbda514d23762a5972ce574e629c9f443 /freetype/src/cache/ftcbasic.c | |
parent | 6b4c229d4bf4bcccf8000611caaef59f859d04a6 (diff) | |
download | ghostpdl-cc2f67265d1508a6cf953470ef7b2a0d9a1a14e3.tar.gz |
Update freetype to 2.10.4 (for real, this time!)
(with zlib "Diagnostic functions" hack/fix in freetype/src/zutil.h)
Diffstat (limited to 'freetype/src/cache/ftcbasic.c')
-rw-r--r-- | freetype/src/cache/ftcbasic.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/freetype/src/cache/ftcbasic.c b/freetype/src/cache/ftcbasic.c index a473585eb..43ea314d4 100644 --- a/freetype/src/cache/ftcbasic.c +++ b/freetype/src/cache/ftcbasic.c @@ -4,7 +4,7 @@ * * The FreeType basic cache interface (body). * - * Copyright (C) 2003-2019 by + * Copyright (C) 2003-2020 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, @@ -16,10 +16,9 @@ */ -#include <ft2build.h> -#include FT_INTERNAL_OBJECTS_H -#include FT_INTERNAL_DEBUG_H -#include FT_CACHE_H +#include <freetype/internal/ftobjs.h> +#include <freetype/internal/ftdebug.h> +#include <freetype/ftcache.h> #include "ftcglyph.h" #include "ftcimage.h" #include "ftcsbits.h" @@ -111,7 +110,9 @@ if ( (FT_ULong)face->num_glyphs > FT_UINT_MAX || 0 > face->num_glyphs ) FT_TRACE1(( "ftc_basic_family_get_count:" - " too large number of glyphs in this face, truncated\n", + " the number of glyphs in this face is %ld,\n" + " " + " which is too much and thus truncated\n", face->num_glyphs )); if ( !error ) @@ -394,7 +395,7 @@ #if FT_ULONG_MAX > FT_UINT_MAX if ( load_flags > FT_UINT_MAX ) FT_TRACE1(( "FTC_ImageCache_LookupScaler:" - " higher bits in load_flags 0x%x are dropped\n", + " higher bits in load_flags 0x%lx are dropped\n", load_flags & ~((FT_ULong)FT_UINT_MAX) )); #endif @@ -594,7 +595,7 @@ #if FT_ULONG_MAX > FT_UINT_MAX if ( load_flags > FT_UINT_MAX ) FT_TRACE1(( "FTC_ImageCache_LookupScaler:" - " higher bits in load_flags 0x%x are dropped\n", + " higher bits in load_flags 0x%lx are dropped\n", load_flags & ~((FT_ULong)FT_UINT_MAX) )); #endif |