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

Unified Diff: third_party/freetype/src/sfnt/ttsbit.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/sfnt/ttsbit.c

diff --git a/third_party/freetype/src/sfnt/ttsbit.c b/third_party/freetype/src/sfnt/ttsbit.c

index c2db96c6d8ca3a04a56eb2d3c83f2bf4833238d5..3b351ecfce458b8408b48faab2fc324a8cb81499 100644

--- a/third_party/freetype/src/sfnt/ttsbit.c

+++ b/third_party/freetype/src/sfnt/ttsbit.c

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

/* */

/* TrueType and OpenType embedded bitmap support (body). */

/* */

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

/* */

@@ -101,10 +101,10 @@

p = face->sbit_table;

- version = FT_NEXT_ULONG( p );

+ version = FT_NEXT_LONG( p );

num_strikes = FT_NEXT_ULONG( p );

- if ( ( version & 0xFFFF0000UL ) != 0x00020000UL )

+ if ( ( (FT_ULong)version & 0xFFFF0000UL ) != 0x00020000UL )

{

error = FT_THROW( Unknown_File_Format );

goto Exit;

@@ -254,15 +254,15 @@

metrics->x_ppem = (FT_UShort)strike[44];

metrics->y_ppem = (FT_UShort)strike[45];

- metrics->ascender = (FT_Char)strike[16] << 6; /* hori.ascender */

- metrics->descender = (FT_Char)strike[17] << 6; /* hori.descender */

+ metrics->ascender = (FT_Char)strike[16] * 64; /* hori.ascender */

+ metrics->descender = (FT_Char)strike[17] * 64; /* hori.descender */

metrics->height = metrics->ascender - metrics->descender;

/* Is this correct? */

metrics->max_advance = ( (FT_Char)strike[22] + /* min_origin_SB */

strike[18] + /* max_width */

(FT_Char)strike[23] /* min_advance_SB */

- ) << 6;

+ ) * 64;

return FT_Err_Ok;

}

@@ -273,6 +273,7 @@

FT_UShort ppem, resolution;

TT_HoriHeader *hori;

FT_ULong table_size;

+ FT_Pos ppem_, upem_; /* to reduce casts */

FT_Error error;

FT_Byte* p;

@@ -305,12 +306,15 @@

metrics->x_ppem = ppem;

metrics->y_ppem = ppem;

- metrics->ascender = ppem * hori->Ascender * 64 / upem;

- metrics->descender = ppem * hori->Descender * 64 / upem;

- metrics->height = ppem * ( hori->Ascender -

- hori->Descender +

- hori->Line_Gap ) * 64 / upem;

- metrics->max_advance = ppem * hori->advance_Width_Max * 64 / upem;

+ ppem_ = (FT_Pos)ppem;

+ upem_ = (FT_Pos)upem;

+ metrics->ascender = ppem_ * hori->Ascender * 64 / upem_;

+ metrics->descender = ppem_ * hori->Descender * 64 / upem_;

+ metrics->height = ppem_ * ( hori->Ascender -

+ hori->Descender +

+ hori->Line_Gap ) * 64 / upem_;

+ metrics->max_advance = ppem_ * hori->advance_Width_Max * 64 / upem_;

return error;

}

@@ -420,7 +424,7 @@

FT_Error error = FT_Err_Ok;

FT_UInt width, height;

FT_Bitmap* map = decoder->bitmap;

- FT_Long size;

+ FT_ULong size;

if ( !decoder->metrics_loaded )

@@ -432,38 +436,38 @@

width = decoder->metrics->width;

height = decoder->metrics->height;

- map->width = (int)width;

- map->rows = (int)height;

+ map->width = width;

+ map->rows = height;

switch ( decoder->bit_depth )

{

case 1:

map->pixel_mode = FT_PIXEL_MODE_MONO;

- map->pitch = ( map->width + 7 ) >> 3;

+ map->pitch = (int)( ( map->width + 7 ) >> 3 );

map->num_grays = 2;

break;

case 2:

map->pixel_mode = FT_PIXEL_MODE_GRAY2;

- map->pitch = ( map->width + 3 ) >> 2;

+ map->pitch = (int)( ( map->width + 3 ) >> 2 );

map->num_grays = 4;

break;

case 4:

map->pixel_mode = FT_PIXEL_MODE_GRAY4;

- map->pitch = ( map->width + 1 ) >> 1;

+ map->pitch = (int)( ( map->width + 1 ) >> 1 );

map->num_grays = 16;

break;

case 8:

map->pixel_mode = FT_PIXEL_MODE_GRAY;

- map->pitch = map->width;

+ map->pitch = (int)( map->width );

map->num_grays = 256;

break;

case 32:

map->pixel_mode = FT_PIXEL_MODE_BGRA;

- map->pitch = map->width * 4;

+ map->pitch = (int)( map->width * 4 );

map->num_grays = 256;

break;

@@ -472,7 +476,7 @@

goto Exit;

}

- size = map->rows * map->pitch;

+ size = map->rows * (FT_ULong)map->pitch;

/* check that there is no empty image */

if ( size == 0 )

@@ -561,7 +565,8 @@

{

FT_Error error = FT_Err_Ok;

FT_Byte* line;

- FT_Int bit_height, bit_width, pitch, width, height, line_bits, h;

+ FT_Int pitch, width, height, line_bits, h;

+ FT_UInt bit_height, bit_width;

FT_Bitmap* bitmap;

@@ -577,8 +582,8 @@

line_bits = width * decoder->bit_depth;

- if ( x_pos < 0 || x_pos + width > bit_width ||

- y_pos < 0 || y_pos + height > bit_height )

+ if ( x_pos < 0 || (FT_UInt)( x_pos + width ) > bit_width ||

+ y_pos < 0 || (FT_UInt)( y_pos + height ) > bit_height )

{

FT_TRACE1(( "tt_sbit_decoder_load_byte_aligned:"

" invalid bitmap dimensions\n" ));

@@ -699,7 +704,8 @@

{

FT_Error error = FT_Err_Ok;

FT_Byte* line;

- FT_Int bit_height, bit_width, pitch, width, height, line_bits, h, nbits;

+ FT_Int pitch, width, height, line_bits, h, nbits;

+ FT_UInt bit_height, bit_width;

FT_Bitmap* bitmap;

FT_UShort rval;

@@ -716,8 +722,8 @@

line_bits = width * decoder->bit_depth;

- if ( x_pos < 0 || x_pos + width > bit_width ||

- y_pos < 0 || y_pos + height > bit_height )

+ if ( x_pos < 0 || (FT_UInt)( x_pos + width ) > bit_width ||

+ y_pos < 0 || (FT_UInt)( y_pos + height ) > bit_height )

{

FT_TRACE1(( "tt_sbit_decoder_load_bit_aligned:"

" invalid bitmap dimensions\n" ));

@@ -1379,9 +1385,9 @@

metrics->horiBearingX = (FT_Short)originOffsetX;

metrics->horiBearingY = (FT_Short)( -originOffsetY + metrics->height );

- metrics->horiAdvance = (FT_Short)( aadvance *

- face->root.size->metrics.x_ppem /

- face->header.Units_Per_EM );

+ metrics->horiAdvance = (FT_UShort)( aadvance *

+ face->root.size->metrics.x_ppem /

+ face->header.Units_Per_EM );

}

return error;

@@ -1442,7 +1448,7 @@

FT_Library library = face->root.glyph->library;

- FT_Bitmap_New( &new_map );

+ FT_Bitmap_Init( &new_map );

/* Convert to 8bit grayscale. */

error = FT_Bitmap_Convert( library, map, &new_map, 1 );

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