third_party/freetype/src/smooth/ftgrays.c - Issue 815103002: Update freetype to 2.5.4.

Unified Diff: third_party/freetype/src/smooth/ftgrays.c

Issue 815103002: Update freetype to 2.5.4. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Adjust GYP and GN Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: third_party/freetype/src/smooth/ftgrays.c

diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/smooth/ftgrays.c b/third_party/freetype/src/smooth/ftgrays.c

similarity index 94%

rename from core/src/fxge/fx_freetype/fxft2.5.01/src/smooth/ftgrays.c

rename to third_party/freetype/src/smooth/ftgrays.c

index 3aafeed3237efac2c856dd72ad841be6286d95a1..9d37d64517beb14b4b475a0e5edc0a47563f3c9f 100644

--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/smooth/ftgrays.c

+++ b/third_party/freetype/src/smooth/ftgrays.c

@@ -4,7 +4,7 @@

/* */

/* A new `perfect' anti-aliasing renderer (body). */

/* */

/* David Turner, Robert Wilhelm, and Werner Lemberg. */

/* */

/* This file is part of the FreeType project, and may only be used, */

@@ -24,8 +24,8 @@

/* */

/* - copy `src/smooth/ftgrays.c' (this file) to your current directory */

/* */

- /* - copy `include/freetype/ftimage.h' and `src/smooth/ftgrays.h' to the */

- /* same directory */

+ /* - copy `include/ftimage.h' and `src/smooth/ftgrays.h' to the same */

+ /* directory */

/* */

/* - compile `ftgrays' with the _STANDALONE_ macro defined, as in */

/* */

@@ -98,6 +98,9 @@

#define FT_ERR_XCAT( x, y ) x ## y

#define FT_ERR_CAT( x, y ) FT_ERR_XCAT( x, y )

+#define FT_BEGIN_STMNT do {

+#define FT_END_STMNT } while ( 0 )

/* define this to dump debugging information */

/* #define FT_DEBUG_LEVEL_TRACE */

@@ -234,11 +237,11 @@ typedef ptrdiff_t FT_PtrDist;

#else /* !_STANDALONE_ */

-#include "../../include/ft2build.h"

+#include <ft2build.h>

#include "ftgrays.h"

-#include "../../include/freetype/internal/ftobjs.h"

-#include "../../include/freetype/internal/ftdebug.h"

-#include "../../include/freetype/ftoutln.h"

+#include FT_INTERNAL_OBJECTS_H

+#include FT_INTERNAL_DEBUG_H

+#include FT_OUTLINE_H

#include "ftsmerrs.h"

@@ -310,6 +313,40 @@ typedef ptrdiff_t FT_PtrDist;

#endif

+ /* Compute `dividend / divisor' and return both its quotient and */

+ /* remainder, cast to a specific type. This macro also ensures that */

+ /* the remainder is always positive. */

+#define FT_DIV_MOD( type, dividend, divisor, quotient, remainder ) \

+ FT_BEGIN_STMNT \

+ (quotient) = (type)( (dividend) / (divisor) ); \

+ (remainder) = (type)( (dividend) % (divisor) ); \

+ if ( (remainder) < 0 ) \

+ { \

+ (quotient)--; \

+ (remainder) += (type)(divisor); \

+ } \

+ FT_END_STMNT

+#ifdef __arm__

+ /* Work around a bug specific to GCC which make the compiler fail to */

+ /* optimize a division and modulo operation on the same parameters */

+ /* into a single call to `__aeabi_idivmod'. See */

+ /* */

+ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43721 */

+#undef FT_DIV_MOD

+#define FT_DIV_MOD( type, dividend, divisor, quotient, remainder ) \

+ FT_BEGIN_STMNT \

+ (quotient) = (type)( (dividend) / (divisor) ); \

+ (remainder) = (type)( (dividend) - (quotient) * (divisor) ); \

+ if ( (remainder) < 0 ) \

+ { \

+ (quotient)--; \

+ (remainder) += (type)(divisor); \

+ } \

+ FT_END_STMNT

+#endif /* __arm__ */

/*************************************************************************/

/* */

/* TYPE DEFINITIONS */

@@ -548,7 +585,7 @@ typedef ptrdiff_t FT_PtrDist;

static void

gray_record_cell( RAS_ARG )

{

- if ( !ras.invalid && ( ras.area | ras.cover ) )

+ if ( ras.area | ras.cover )

{

PCell cell = gray_find_cell( RAS_VAR );

@@ -597,10 +634,10 @@ typedef ptrdiff_t FT_PtrDist;

ras.area = 0;

ras.cover = 0;

+ ras.ex = ex;

+ ras.ey = ey;

}

- ras.ex = ex;

- ras.ey = ey;

ras.invalid = ( (unsigned)ey >= (unsigned)ras.count_ey ||

ex >= ras.count_ex );

}

@@ -686,13 +723,7 @@ typedef ptrdiff_t FT_PtrDist;

dx = -dx;

}

- delta = (TCoord)( p / dx );

- mod = (TCoord)( p % dx );

- if ( mod < 0 )

- {

- delta--;

- mod += (TCoord)dx;

- }

+ FT_DIV_MOD( TCoord, p, dx, delta, mod );

ras.area += (TArea)(( fx1 + first ) * delta);

ras.cover += delta;

@@ -706,14 +737,8 @@ typedef ptrdiff_t FT_PtrDist;

TCoord lift, rem;

- p = ONE_PIXEL * ( y2 - y1 + delta );

- lift = (TCoord)( p / dx );

- rem = (TCoord)( p % dx );

- if ( rem < 0 )

- {

- lift--;

- rem += (TCoord)dx;

- }

+ p = ONE_PIXEL * ( y2 - y1 + delta );

+ FT_DIV_MOD( TCoord, p, dx, lift, rem );

mod -= (int)dx;

@@ -763,9 +788,6 @@ typedef ptrdiff_t FT_PtrDist;

dx = to_x - ras.x;

dy = to_y - ras.y;

- /* XXX: we should do something about the trivial case where dx == 0, */

- /* as it happens very often! */

/* perform vertical clipping */

{

TCoord min, max;

@@ -844,13 +866,7 @@ typedef ptrdiff_t FT_PtrDist;

dy = -dy;

}

- delta = (int)( p / dy );

- mod = (int)( p % dy );

- if ( mod < 0 )

- {

- delta--;

- mod += (TCoord)dy;

- }

+ FT_DIV_MOD( int, p, dy, delta, mod );

x = ras.x + delta;

gray_render_scanline( RAS_VAR_ ey1, ras.x, fy1, x, (TCoord)first );

@@ -861,13 +877,7 @@ typedef ptrdiff_t FT_PtrDist;

if ( ey1 != ey2 )

{

p = ONE_PIXEL * dx;

- lift = (int)( p / dy );

- rem = (int)( p % dy );

- if ( rem < 0 )

- {

- lift--;

- rem += (int)dy;

- }

+ FT_DIV_MOD( int, p, dy, lift, rem );

mod -= (int)dy;

while ( ey1 != ey2 )

@@ -1081,37 +1091,10 @@ typedef ptrdiff_t FT_PtrDist;

/* dx and dy are x and y components of the P0-P3 chord vector. */

- dx = arc[3].x - arc[0].x;

- dy = arc[3].y - arc[0].y;

- /* L is an (under)estimate of the Euclidean distance P0-P3. */

- /* */

- /* If dx >= dy, then r = sqrt(dx^2 + dy^2) can be overestimated */

- /* with least maximum error by */

- /* */

- /* r_upperbound = dx + (sqrt(2) - 1) * dy , */

- /* */

- /* where sqrt(2) - 1 can be (over)estimated by 107/256, giving an */

- /* error of no more than 8.4%. */

- /* */

- /* Similarly, some elementary calculus shows that r can be */

- /* underestimated with least maximum error by */

- /* */

- /* r_lowerbound = sqrt(2 + sqrt(2)) / 2 * dx */

- /* + sqrt(2 - sqrt(2)) / 2 * dy . */

- /* */

- /* 236/256 and 97/256 are (under)estimates of the two algebraic */

- /* numbers, giving an error of no more than 8.1%. */

- dx_ = FT_ABS( dx );

- dy_ = FT_ABS( dy );

- /* This is the same as */

- /* */

- /* L = ( 236 * FT_MAX( dx_, dy_ ) */

- /* + 97 * FT_MIN( dx_, dy_ ) ) >> 8; */

- L = ( dx_ > dy_ ? 236 * dx_ + 97 * dy_

- : 97 * dx_ + 236 * dy_ ) >> 8;

+ dx = dx_ = arc[3].x - arc[0].x;

+ dy = dy_ = arc[3].y - arc[0].y;

+ L = FT_HYPOT( dx_, dy_ );

/* Avoid possible arithmetic overflow below by splitting. */

if ( L > 32767 )

@@ -1171,7 +1154,8 @@ typedef ptrdiff_t FT_PtrDist;

/* record current cell, if any */

- gray_record_cell( RAS_VAR );

+ if ( !ras.invalid )

+ gray_record_cell( RAS_VAR );

/* start to a new position */

x = UPSCALE( to->x );

@@ -1356,21 +1340,17 @@ typedef ptrdiff_t FT_PtrDist;

ras.num_gray_spans = 0;

ras.span_y = (int)y;

- count = 0;

span = ras.gray_spans;

}

else

span++;

- // Fix the Vulnerability Report FoxIT Reader - MSVR-10-0077.

- // Limited to the value range of 'x', we have to crop it for avoid the overflow.

- if (x < 32768) {

/* add a gray span to the current list */

span->x = (short)x;

span->len = (unsigned short)acount;

span->coverage = (unsigned char)coverage;

ras.num_gray_spans++;

- }

}

@@ -1535,7 +1515,10 @@ typedef ptrdiff_t FT_PtrDist;

TPos delta;

- if ( !outline || !func_interface )

+ if ( !outline )

+ return FT_THROW( Invalid_Outline );

+ if ( !func_interface )

return FT_THROW( Invalid_Argument );

shift = func_interface->shift;

@@ -1780,17 +1763,16 @@ typedef ptrdiff_t FT_PtrDist;

FT_Outline_Funcs func_interface;

Init_Class_func_interface(&func_interface);

#endif

-#ifndef _FX_MANAGED_CODE_

if ( ft_setjmp( ras.jump_buffer ) == 0 )

{

-#endif

error = FT_Outline_Decompose( &ras.outline, &func_interface, &ras );

- gray_record_cell( RAS_VAR );

-#ifndef _FX_MANAGED_CODE_

- }

+ if ( !ras.invalid )

+ gray_record_cell( RAS_VAR );

+ }

else

error = FT_THROW( Memory_Overflow );

-#endif

return error;

}

@@ -2118,12 +2100,26 @@ typedef ptrdiff_t FT_PtrDist;

}

+ static int

+ gray_raster_set_mode( FT_Raster raster,

+ unsigned long mode,

+ void* args )

+ {

+ FT_UNUSED( raster );

+ FT_UNUSED( mode );

+ FT_UNUSED( args );

+ return 0; /* nothing to do */

+ }

FT_DEFINE_RASTER_FUNCS(ft_grays_raster,

FT_GLYPH_FORMAT_OUTLINE,

(FT_Raster_New_Func) gray_raster_new,

(FT_Raster_Reset_Func) gray_raster_reset,

- (FT_Raster_Set_Mode_Func)0,

+ (FT_Raster_Set_Mode_Func)gray_raster_set_mode,

(FT_Raster_Render_Func) gray_raster_render,

(FT_Raster_Done_Func) gray_raster_done

)

« no previous file with comments | « third_party/freetype/src/smooth/ftgrays.h ('k') | third_party/freetype/src/smooth/ftsmerrs.h » ('j') | no next file with comments »