third_party/freetype/src/raster/ftraster.c - Issue 1416993005: Merge to XFA: Update bundled freetype to 2.6.1

Unified Diff: third_party/freetype/src/raster/ftraster.c

Issue 1416993005: Merge to XFA: Update bundled freetype to 2.6.1 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 5 years, 1 month 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

Download patch

Index: third_party/freetype/src/raster/ftraster.c

diff --git a/third_party/freetype/src/raster/ftraster.c b/third_party/freetype/src/raster/ftraster.c

index b06ac333da176141b52c9da61ae6a398fa3a9ef6..e4bab987285993858cad2f99c31e8bba066cc173 100644

--- a/third_party/freetype/src/raster/ftraster.c

+++ b/third_party/freetype/src/raster/ftraster.c

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

/* */

/* The FreeType glyph rasterizer (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/raster/ftraster.c' (this file) to your current directory */

/* */

- /* - copy `include/ftimage.h' and `src/raster/ftmisc.h' to your current */

- /* directory */

+ /* - copy `include/freetype/ftimage.h' and `src/raster/ftmisc.h' to your */

+ /* current directory */

/* */

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

/* */

@@ -49,6 +49,10 @@

#ifdef _STANDALONE_

+ /* The size in bytes of the render pool used by the scan-line converter */

+ /* to do all of its work. */

+#define FT_RENDER_POOL_SIZE 16384L

#define FT_CONFIG_STANDARD_LIBRARY_H <stdlib.h>

#include <string.h> /* for memset */

@@ -150,14 +154,6 @@

/* define DEBUG_RASTER if you want to compile a debugging version */

/* #define DEBUG_RASTER */

- /* define FT_RASTER_OPTION_ANTI_ALIASING if you want to support */

- /* 5-levels anti-aliasing */

-/* #define FT_RASTER_OPTION_ANTI_ALIASING */

- /* The size of the two-lines intermediate bitmap used */

- /* for anti-aliasing, in bytes. */

-#define RASTER_GRAY_LINES 2048

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

@@ -183,6 +179,8 @@

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

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

+#define FT_MAX( a, b ) ( (a) > (b) ? (a) : (b) )

/* This macro is used to indicate that a function parameter is unused. */

/* Its purpose is simply to reduce compiler warnings. Note also that */

/* simply defining it as `(void)x' doesn't avoid warnings with certain */

@@ -199,6 +197,7 @@

#define FT_TRACE( x ) do { } while ( 0 ) /* nothing */

#define FT_TRACE1( x ) do { } while ( 0 ) /* nothing */

#define FT_TRACE6( x ) do { } while ( 0 ) /* nothing */

+#define FT_TRACE7( x ) do { } while ( 0 ) /* nothing */

#endif

#ifndef FT_THROW

@@ -318,7 +317,7 @@

typedef union Alignment_

{

- long l;

+ Long l;

void* p;

void (*f)(void);

@@ -334,9 +333,9 @@

/* values for the `flags' bit field */

-#define Flow_Up 0x8

-#define Overshoot_Top 0x10

-#define Overshoot_Bottom 0x20

+#define Flow_Up 0x08U

+#define Overshoot_Top 0x10U

+#define Overshoot_Bottom 0x20U

/* States of each line, arc, and profile */

@@ -358,14 +357,14 @@

FT_F26Dot6 X; /* current coordinate during sweep */

PProfile link; /* link to next profile (various purposes) */

PLong offset; /* start of profile's data in render pool */

- unsigned flags; /* Bit 0-2: drop-out mode */

+ UShort flags; /* Bit 0-2: drop-out mode */

/* Bit 3: profile orientation (up/down) */

/* Bit 4: is top profile? */

/* Bit 5: is bottom profile? */

- long height; /* profile's height in scanlines */

- long start; /* profile's starting scanline */

+ Long height; /* profile's height in scanlines */

+ Long start; /* profile's starting scanline */

- unsigned countL; /* number of lines to step before this */

+ Int countL; /* number of lines to step before this */

/* profile becomes drawable */

PProfile next; /* next profile in same contour, used */

@@ -387,7 +386,7 @@

#define AlignProfileSize \

- ( ( sizeof ( TProfile ) + sizeof ( Alignment ) - 1 ) / sizeof ( long ) )

+ ( ( sizeof ( TProfile ) + sizeof ( Alignment ) - 1 ) / sizeof ( Long ) )

#undef RAS_ARG

@@ -451,7 +450,9 @@

#define CEILING( x ) ( ( (x) + ras.precision - 1 ) & -ras.precision )

#define TRUNC( x ) ( (Long)(x) >> ras.precision_bits )

#define FRAC( x ) ( (x) & ( ras.precision - 1 ) )

-#define SCALED( x ) ( ( (ULong)(x) << ras.scale_shift ) - ras.precision_half )

+#define SCALED( x ) ( ( (x) < 0 ? -( -(x) << ras.scale_shift ) \

+ : ( (x) << ras.scale_shift ) ) \

+ - ras.precision_half )

#define IS_BOTTOM_OVERSHOOT( x ) \

(Bool)( CEILING( x ) - x >= ras.precision_half )

@@ -514,9 +515,6 @@

Short traceIncr; /* sweep's increment in target bitmap */

- Short gray_min_x; /* current min x during gray rendering */

- Short gray_max_x; /* current max x during gray rendering */

/* dispatch variables */

Function_Sweep_Init* Proc_Sweep_Init;

@@ -529,45 +527,19 @@

Bool second_pass; /* indicates whether a horizontal pass */

/* should be performed to control */

/* drop-out accurately when calling */

- /* Render_Glyph. Note that there is */

- /* no horizontal pass during gray */

- /* rendering. */

+ /* Render_Glyph. */

TPoint arcs[3 * MaxBezier + 1]; /* The Bezier stack */

black_TBand band_stack[16]; /* band stack used for sub-banding */

Int band_top; /* band stack top */

-#ifdef FT_RASTER_OPTION_ANTI_ALIASING

- Byte* grays;

- Byte gray_lines[RASTER_GRAY_LINES];

- /* Intermediate table used to render the */

- /* graylevels pixmaps. */

- /* gray_lines is a buffer holding two */

- /* monochrome scanlines */

- Short gray_width; /* width in bytes of one monochrome */

- /* intermediate scanline of gray_lines. */

- /* Each gray pixel takes 2 bits long there */

- /* The gray_lines must hold 2 lines, thus with size */

- /* in bytes of at least `gray_width*2'. */

-#endif /* FT_RASTER_ANTI_ALIASING */

};

typedef struct black_TRaster_

{

- char* buffer;

- long buffer_size;

void* memory;

- black_PWorker worker;

- Byte grays[5];

- Short gray_width;

} black_TRaster, *black_PRaster;

@@ -583,70 +555,6 @@

#endif /* !FT_STATIC_RASTER */

-#ifdef FT_RASTER_OPTION_ANTI_ALIASING

- /* A lookup table used to quickly count set bits in four gray 2x2 */

- /* cells. The values of the table have been produced with the */

- /* following code: */

- /* */

- /* for ( i = 0; i < 256; i++ ) */

- /* { */

- /* l = 0; */

- /* j = i; */

- /* */

- /* for ( c = 0; c < 4; c++ ) */

- /* { */

- /* l <<= 4; */

- /* */

- /* if ( j & 0x80 ) l++; */

- /* if ( j & 0x40 ) l++; */

- /* */

- /* j = ( j << 2 ) & 0xFF; */

- /* } */

- /* printf( "0x%04X", l ); */

- /* } */

- /* */

- static const short count_table[256] =

- {

- 0x0000, 0x0001, 0x0001, 0x0002, 0x0010, 0x0011, 0x0011, 0x0012,

- 0x0010, 0x0011, 0x0011, 0x0012, 0x0020, 0x0021, 0x0021, 0x0022,

- 0x0100, 0x0101, 0x0101, 0x0102, 0x0110, 0x0111, 0x0111, 0x0112,

- 0x0110, 0x0111, 0x0111, 0x0112, 0x0120, 0x0121, 0x0121, 0x0122,

- 0x0100, 0x0101, 0x0101, 0x0102, 0x0110, 0x0111, 0x0111, 0x0112,

- 0x0110, 0x0111, 0x0111, 0x0112, 0x0120, 0x0121, 0x0121, 0x0122,

- 0x0200, 0x0201, 0x0201, 0x0202, 0x0210, 0x0211, 0x0211, 0x0212,

- 0x0210, 0x0211, 0x0211, 0x0212, 0x0220, 0x0221, 0x0221, 0x0222,

- 0x1000, 0x1001, 0x1001, 0x1002, 0x1010, 0x1011, 0x1011, 0x1012,

- 0x1010, 0x1011, 0x1011, 0x1012, 0x1020, 0x1021, 0x1021, 0x1022,

- 0x1100, 0x1101, 0x1101, 0x1102, 0x1110, 0x1111, 0x1111, 0x1112,

- 0x1110, 0x1111, 0x1111, 0x1112, 0x1120, 0x1121, 0x1121, 0x1122,

- 0x1100, 0x1101, 0x1101, 0x1102, 0x1110, 0x1111, 0x1111, 0x1112,

- 0x1110, 0x1111, 0x1111, 0x1112, 0x1120, 0x1121, 0x1121, 0x1122,

- 0x1200, 0x1201, 0x1201, 0x1202, 0x1210, 0x1211, 0x1211, 0x1212,

- 0x1210, 0x1211, 0x1211, 0x1212, 0x1220, 0x1221, 0x1221, 0x1222,