diff options
Diffstat (limited to 'modules/freetype2/src/pfr')
-rw-r--r-- | modules/freetype2/src/pfr/Jamfile | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/module.mk | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfr.c | 11 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrcmap.c | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrcmap.h | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrdrivr.c | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrdrivr.h | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrerror.h | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrgload.c | 12 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrgload.h | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrload.c | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrload.h | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrobjs.c | 8 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrobjs.h | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrsbit.c | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrsbit.h | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/pfrtypes.h | 2 | ||||
-rw-r--r-- | modules/freetype2/src/pfr/rules.mk | 2 |
18 files changed, 30 insertions, 31 deletions
diff --git a/modules/freetype2/src/pfr/Jamfile b/modules/freetype2/src/pfr/Jamfile index a5b294b79..cb55a7ee8 100644 --- a/modules/freetype2/src/pfr/Jamfile +++ b/modules/freetype2/src/pfr/Jamfile @@ -1,6 +1,6 @@ # FreeType 2 src/pfr Jamfile # -# Copyright 2002-2016 by +# Copyright 2002-2018 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/modules/freetype2/src/pfr/module.mk b/modules/freetype2/src/pfr/module.mk index bf7808c72..27fec8e5f 100644 --- a/modules/freetype2/src/pfr/module.mk +++ b/modules/freetype2/src/pfr/module.mk @@ -3,7 +3,7 @@ # -# Copyright 2002-2016 by +# Copyright 2002-2018 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/modules/freetype2/src/pfr/pfr.c b/modules/freetype2/src/pfr/pfr.c index 1a433960a..1760882fc 100644 --- a/modules/freetype2/src/pfr/pfr.c +++ b/modules/freetype2/src/pfr/pfr.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR driver component. */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -15,15 +15,16 @@ /* */ /***************************************************************************/ -#define FT_MAKE_OPTION_SINGLE_OBJECT +#define FT_MAKE_OPTION_SINGLE_OBJECT #include <ft2build.h> -#include "pfrload.c" -#include "pfrgload.c" #include "pfrcmap.c" -#include "pfrobjs.c" #include "pfrdrivr.c" +#include "pfrgload.c" +#include "pfrload.c" +#include "pfrobjs.c" #include "pfrsbit.c" + /* END */ diff --git a/modules/freetype2/src/pfr/pfrcmap.c b/modules/freetype2/src/pfr/pfrcmap.c index f1f9c53b9..60643780a 100644 --- a/modules/freetype2/src/pfr/pfrcmap.c +++ b/modules/freetype2/src/pfr/pfrcmap.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR cmap handling (body). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/modules/freetype2/src/pfr/pfrcmap.h b/modules/freetype2/src/pfr/pfrcmap.h index 4a8a4d0a6..c70a0c83c 100644 --- a/modules/freetype2/src/pfr/pfrcmap.h +++ b/modules/freetype2/src/pfr/pfrcmap.h @@ -4,7 +4,7 @@ /* */ /* FreeType PFR cmap handling (specification). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/modules/freetype2/src/pfr/pfrdrivr.c b/modules/freetype2/src/pfr/pfrdrivr.c index 2316cd3e7..6c7e50128 100644 --- a/modules/freetype2/src/pfr/pfrdrivr.c +++ b/modules/freetype2/src/pfr/pfrdrivr.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR driver interface (body). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/modules/freetype2/src/pfr/pfrdrivr.h b/modules/freetype2/src/pfr/pfrdrivr.h index 32b2d9eab..cab852789 100644 --- a/modules/freetype2/src/pfr/pfrdrivr.h +++ b/modules/freetype2/src/pfr/pfrdrivr.h @@ -4,7 +4,7 @@ /* */ /* High-level Type PFR driver interface (specification). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/modules/freetype2/src/pfr/pfrerror.h b/modules/freetype2/src/pfr/pfrerror.h index 9305f8fb5..7027c818e 100644 --- a/modules/freetype2/src/pfr/pfrerror.h +++ b/modules/freetype2/src/pfr/pfrerror.h @@ -4,7 +4,7 @@ /* */ /* PFR error codes (specification only). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/modules/freetype2/src/pfr/pfrgload.c b/modules/freetype2/src/pfr/pfrgload.c index f9cd1f63b..b7990196b 100644 --- a/modules/freetype2/src/pfr/pfrgload.c +++ b/modules/freetype2/src/pfr/pfrgload.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR glyph loader (body). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -756,8 +756,10 @@ count = glyph->num_subs - old_count; - FT_TRACE4(( "compound glyph with %d elements (offset %lu):\n", - count, offset )); + FT_TRACE4(( "compound glyph with %d element%s (offset %lu):\n", + count, + count == 1 ? "" : "s", + offset )); /* now, load each individual glyph */ for ( n = 0; n < count; n++ ) @@ -810,7 +812,9 @@ /* proceed to next sub-glyph */ } - FT_TRACE4(( "end compound glyph with %d elements\n", count )); + FT_TRACE4(( "end compound glyph with %d element%s\n", + count, + count == 1 ? "" : "s" )); } else { diff --git a/modules/freetype2/src/pfr/pfrgload.h b/modules/freetype2/src/pfr/pfrgload.h index 908d4378a..01f48d770 100644 --- a/modules/freetype2/src/pfr/pfrgload.h +++ b/modules/freetype2/src/pfr/pfrgload.h @@ -4,7 +4,7 @@ /* */ /* FreeType PFR glyph loader (specification). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/modules/freetype2/src/pfr/pfrload.c b/modules/freetype2/src/pfr/pfrload.c index aad759af1..2776da462 100644 --- a/modules/freetype2/src/pfr/pfrload.c +++ b/modules/freetype2/src/pfr/pfrload.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR loader (body). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/modules/freetype2/src/pfr/pfrload.h b/modules/freetype2/src/pfr/pfrload.h index 0f7a2bb23..36e809a76 100644 --- a/modules/freetype2/src/pfr/pfrload.h +++ b/modules/freetype2/src/pfr/pfrload.h @@ -4,7 +4,7 @@ /* */ /* FreeType PFR loader (specification). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/modules/freetype2/src/pfr/pfrobjs.c b/modules/freetype2/src/pfr/pfrobjs.c index 0491d13df..737b97b5f 100644 --- a/modules/freetype2/src/pfr/pfrobjs.c +++ b/modules/freetype2/src/pfr/pfrobjs.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR object methods (body). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -264,12 +264,6 @@ charmap.encoding = FT_ENCODING_UNICODE; error = FT_CMap_New( &pfr_cmap_class_rec, NULL, &charmap, NULL ); - -#if 0 - /* select default charmap */ - if ( pfrface->num_charmaps ) - pfrface->charmap = pfrface->charmaps[0]; -#endif } /* check whether we have loaded any kerning pairs */ diff --git a/modules/freetype2/src/pfr/pfrobjs.h b/modules/freetype2/src/pfr/pfrobjs.h index 335aca885..59c709f58 100644 --- a/modules/freetype2/src/pfr/pfrobjs.h +++ b/modules/freetype2/src/pfr/pfrobjs.h @@ -4,7 +4,7 @@ /* */ /* FreeType PFR object methods (specification). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/modules/freetype2/src/pfr/pfrsbit.c b/modules/freetype2/src/pfr/pfrsbit.c index f9dbf734b..ba909ddca 100644 --- a/modules/freetype2/src/pfr/pfrsbit.c +++ b/modules/freetype2/src/pfr/pfrsbit.c @@ -4,7 +4,7 @@ /* */ /* FreeType PFR bitmap loader (body). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/modules/freetype2/src/pfr/pfrsbit.h b/modules/freetype2/src/pfr/pfrsbit.h index 676ad55a9..07b27bc06 100644 --- a/modules/freetype2/src/pfr/pfrsbit.h +++ b/modules/freetype2/src/pfr/pfrsbit.h @@ -4,7 +4,7 @@ /* */ /* FreeType PFR bitmap loader (specification). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/modules/freetype2/src/pfr/pfrtypes.h b/modules/freetype2/src/pfr/pfrtypes.h index bd6c2cd30..058d6aadc 100644 --- a/modules/freetype2/src/pfr/pfrtypes.h +++ b/modules/freetype2/src/pfr/pfrtypes.h @@ -4,7 +4,7 @@ /* */ /* FreeType PFR data structures (specification only). */ /* */ -/* Copyright 2002-2016 by */ +/* Copyright 2002-2018 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/modules/freetype2/src/pfr/rules.mk b/modules/freetype2/src/pfr/rules.mk index 39bb9e941..3acb79569 100644 --- a/modules/freetype2/src/pfr/rules.mk +++ b/modules/freetype2/src/pfr/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 2002-2016 by +# Copyright 2002-2018 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, |