From 8e950680538b11cf3c4eb630f0b8e7bd400b6dcd Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 20 Sep 2018 06:26:34 +0200 Subject: [PATCH] [base] Remove unused function `FT_GlyphLoader_CopyPoints'. * include/freetype/internal/ftgloadr.h, src/base/ftgloadr.c (FT_GlyphLoader_CopyPoints): Do it. --- ChangeLog | 7 +++++ include/freetype/internal/ftgloadr.h | 5 ---- src/base/ftgloadr.c | 42 ---------------------------- src/raster/ftraster.c | 6 ++-- 4 files changed, 10 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index 89ae80285..ecf6d9d45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-09-20 Werner Lemberg + + [base] Remove unused function `FT_GlyphLoader_CopyPoints'. + + * include/freetype/internal/ftgloadr.h, src/base/ftgloadr.c + (FT_GlyphLoader_CopyPoints): Do it. + 2018-09-19 Alexei Podtelezhnikov [pcf] Prepare to replace charmap implementation. diff --git a/include/freetype/internal/ftgloadr.h b/include/freetype/internal/ftgloadr.h index c731b2dc7..0d24a6359 100644 --- a/include/freetype/internal/ftgloadr.h +++ b/include/freetype/internal/ftgloadr.h @@ -138,11 +138,6 @@ FT_BEGIN_HEADER FT_BASE( void ) FT_GlyphLoader_Add( FT_GlyphLoader loader ); - /* copy points from one glyph loader to another */ - FT_BASE( FT_Error ) - FT_GlyphLoader_CopyPoints( FT_GlyphLoader target, - FT_GlyphLoader source ); - /* */ diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c index 3efa461c4..b6eb53118 100644 --- a/src/base/ftgloadr.c +++ b/src/base/ftgloadr.c @@ -361,46 +361,4 @@ } - FT_BASE_DEF( FT_Error ) - FT_GlyphLoader_CopyPoints( FT_GlyphLoader target, - FT_GlyphLoader source ) - { - FT_Error error; - FT_UInt num_points = (FT_UInt)source->base.outline.n_points; - FT_UInt num_contours = (FT_UInt)source->base.outline.n_contours; - - - error = FT_GlyphLoader_CheckPoints( target, num_points, num_contours ); - if ( !error ) - { - FT_Outline* out = &target->base.outline; - FT_Outline* in = &source->base.outline; - - - FT_ARRAY_COPY( out->points, in->points, - num_points ); - FT_ARRAY_COPY( out->tags, in->tags, - num_points ); - FT_ARRAY_COPY( out->contours, in->contours, - num_contours ); - - /* do we need to copy the extra points? */ - if ( target->use_extra && source->use_extra ) - { - FT_ARRAY_COPY( target->base.extra_points, source->base.extra_points, - num_points ); - FT_ARRAY_COPY( target->base.extra_points2, source->base.extra_points2, - num_points ); - } - - out->n_points = (short)num_points; - out->n_contours = (short)num_contours; - - FT_GlyphLoader_Adjust_Points( target ); - } - - return error; - } - - /* END */ diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c index 5b47d15c9..0c1d88176 100644 --- a/src/raster/ftraster.c +++ b/src/raster/ftraster.c @@ -99,7 +99,7 @@ * built from the bottom of the render pool, used as a stack. The * following graphics shows the profile list under construction: * - * __________________________________________________________ _ _ + * __________________________________________________________ _ _ * | | | | | * | profile | coordinates for | profile | coordinates for |--> * | 1 | profile 1 | 2 | profile 2 |--> @@ -125,8 +125,8 @@ * * _ _ _______________________________________ * | | - * <--| sorted list of | - * <--| extrema scanlines | + * <--| sorted list of | + * <--| extrema scanlines | * _ _ __________________|____________________| * * ^ ^