From 634df6e3ba1370110f057dce5285df23594940c9 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 16 Sep 2008 07:25:31 +0000 Subject: [PATCH] * src/cff/cffgload.h, src/cff/cffgload.c (cff_decoder_set_width_only): Eliminate function call. --- ChangeLog | 5 +++++ include/freetype/ftstroke.h | 18 +++++++++--------- src/cff/cffgload.c | 9 +-------- src/cff/cffgload.h | 3 --- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa303813d..4dc018292 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Werner Lemberg + + * src/cff/cffgload.h, src/cff/cffgload.c + (cff_decoder_set_width_only): Eliminate function call. + 2008-09-15 George Williams Fix Savannah bug #24179, reported by Bram Tassyns. diff --git a/include/freetype/ftstroke.h b/include/freetype/ftstroke.h index 38d20553e..1596f6a28 100644 --- a/include/freetype/ftstroke.h +++ b/include/freetype/ftstroke.h @@ -249,7 +249,7 @@ FT_BEGIN_HEADER * expressed as 16.16 fixed point value. * * @note: - * The radius is expressed in the same units that the outline + * The radius is expressed in the same units as the outline * coordinates. */ FT_EXPORT( void ) @@ -305,10 +305,10 @@ FT_BEGIN_HEADER * * @note: * If `opened' is~0 (the default), the outline is treated as a closed - * path, and the stroker will generate two distinct `border' outlines. + * path, and the stroker generates two distinct `border' outlines. * * If `opened' is~1, the outline is processed as an open path, and the - * stroker will generate a single `stroke' outline. + * stroker generates a single `stroke' outline. * * This function calls @FT_Stroker_Rewind automatically. */ @@ -366,7 +366,7 @@ FT_BEGIN_HEADER * * @note: * You should call this function after @FT_Stroker_BeginSubPath. - * If the subpath was not `opened', this function will `draw' a + * If the subpath was not `opened', this function `draws' a * single line segment to the start position when needed. */ FT_EXPORT( FT_Error ) @@ -476,7 +476,7 @@ FT_BEGIN_HEADER * * @description: * Call this function once you have finished parsing your paths - * with the stroker. It will return the number of points and + * with the stroker. It returns the number of points and * contours necessary to export one of the `border' or `stroke' * outlines generated by the stroker. * @@ -525,8 +525,8 @@ FT_BEGIN_HEADER * export the corresponding border to your own @FT_Outline * structure. * - * Note that this function will append the border points and - * contours to your outline, but will not try to resize its + * Note that this function appends the border points and + * contours to your outline, but does not try to resize its * arrays. * * @input: @@ -600,8 +600,8 @@ FT_BEGIN_HEADER * Call this function after @FT_Stroker_GetBorderCounts to * export the all borders to your own @FT_Outline structure. * - * Note that this function will append the border points and - * contours to your outline, but will not try to resize its + * Note that this function appends the border points and + * contours to your outline, but does not try to resize its * arrays. * * @input: diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index 381422044..53ec3e566 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -385,13 +385,6 @@ } - FT_LOCAL_DEF( void ) - cff_decoder_set_width_only( CFF_Decoder* decoder ) - { - decoder->width_only = 1; - } - - /* this function is used to select the subfont */ /* and the locals subrs array */ FT_LOCAL_DEF( FT_Error ) @@ -2573,7 +2566,7 @@ FT_LOAD_TARGET_MODE( load_flags ) ); if ( load_flags & FT_LOAD_ADVANCE_ONLY ) - cff_decoder_set_width_only( &decoder ); + decoder.width_only = TRUE; decoder.builder.no_recurse = (FT_Bool)( load_flags & FT_LOAD_NO_RECURSE ); diff --git a/src/cff/cffgload.h b/src/cff/cffgload.h index bf2165411..667134e3b 100644 --- a/src/cff/cffgload.h +++ b/src/cff/cffgload.h @@ -169,9 +169,6 @@ FT_BEGIN_HEADER FT_Bool hinting, FT_Render_Mode hint_mode ); - FT_LOCAL( void ) - cff_decoder_set_width_only( CFF_Decoder* decoder ); - FT_LOCAL( FT_Error ) cff_decoder_prepare( CFF_Decoder* decoder, CFF_Size size,