[base,cff,cid] Whitespace, formatting.

This commit is contained in:
Werner Lemberg 2017-09-30 16:36:28 +02:00
parent 2127f07624
commit 9b549fa69a
7 changed files with 60 additions and 52 deletions

View File

@ -353,7 +353,7 @@
y_shift = origin->y;
}
/* compute the control box, and grid fit it */
/* compute the control box, and grid-fit it, */
/* taking into account the origin shift */
FT_Outline_Get_CBox( outline, &cbox );
@ -433,13 +433,16 @@
case FT_PIXEL_MODE_MONO:
pitch = ( ( width + 15 ) >> 4 ) << 1;
break;
case FT_PIXEL_MODE_LCD:
width *= 3;
pitch = FT_PAD_CEIL( width, 4 );
break;
case FT_PIXEL_MODE_LCD_V:
height *= 3;
/* fall through */
case FT_PIXEL_MODE_GRAY:
default:
pitch = width;

View File

@ -1106,6 +1106,7 @@
(FT_Blend_Build_Vector_Func) cff_blend_build_vector
)
/*************************************************************************/
/*************************************************************************/
/*************************************************************************/

View File

@ -145,6 +145,7 @@
PSAux_Service psaux = (PSAux_Service)face->psaux;
const CFF_Decoder_Funcs decoder_funcs = psaux->cff_decoder_funcs;
*max_advance = 0;
/* Initialize load decoder */

View File

@ -2097,7 +2097,8 @@
do
{
face->root.internal->random_seed =
(FT_Int32)psaux->cff_random( (FT_UInt32)face->root.internal->random_seed );
(FT_Int32)psaux->cff_random(
(FT_UInt32)face->root.internal->random_seed );
} while ( face->root.internal->random_seed < 0 );
}

View File

@ -504,8 +504,8 @@
FT_Library library = cffface->driver->root.library;
sfnt = (SFNT_Service)FT_Get_Module_Interface(
library, "sfnt" );
sfnt = (SFNT_Service)FT_Get_Module_Interface( library,
"sfnt" );
if ( !sfnt )
{
FT_ERROR(( "cff_face_init: cannot access `sfnt' module\n" ));
@ -515,11 +515,11 @@
FT_FACE_FIND_GLOBAL_SERVICE( face, psnames, POSTSCRIPT_CMAPS );
pshinter = (PSHinter_Service)FT_Get_Module_Interface(
library, "pshinter" );
pshinter = (PSHinter_Service)FT_Get_Module_Interface( library,
"pshinter" );
psaux = (PSAux_Service)FT_Get_Module_Interface(
library, "psaux" );
psaux = (PSAux_Service)FT_Get_Module_Interface( library,
"psaux" );
if ( !psaux )
{
FT_ERROR(( "cff_face_init: cannot access `psaux' module\n" ));

View File

@ -1303,12 +1303,11 @@
PSAux_Service psaux;
#endif
FT_Byte* p = start;
FT_Error error = FT_Err_Ok;
FT_Library library = parser->library;
FT_UNUSED( library );
FT_UNUSED( library );
parser->top = parser->stack;
@ -1394,8 +1393,7 @@
cff_rec.top_font.font_dict.num_axes = parser->num_axes;
decoder.cff = &cff_rec;
psaux = (PSAux_Service)FT_Get_Module_Interface(
library, "psaux" );
psaux = (PSAux_Service)FT_Get_Module_Interface( library, "psaux" );
if ( !psaux )
{
FT_ERROR(( "cff_parser_run: cannot access `psaux' module\n" ));
@ -1403,10 +1401,8 @@
goto Exit;
}
error = psaux->cff_decoder_funcs->parse_charstrings_old( &decoder,
charstring_base,
charstring_len,
1 );
error = psaux->cff_decoder_funcs->parse_charstrings_old(
&decoder, charstring_base, charstring_len, 1 );
/* Now copy the stack data in the temporary decoder object, */
/* converting it back to charstring number representations */

View File

@ -176,9 +176,11 @@
psaux->t1_decrypt( charstring, glyph_length, 4330 );
/* choose which renderer to use */
if ( ((PS_Driver)FT_FACE_DRIVER( face ))->hinting_engine == FT_T1_HINTING_FREETYPE ||
if ( ( (PS_Driver)FT_FACE_DRIVER( face ) )->hinting_engine ==
FT_T1_HINTING_FREETYPE ||
decoder->builder.metrics_only )
error = psaux->t1_decoder_funcs->parse_charstrings_old( decoder,
error = psaux->t1_decoder_funcs->parse_charstrings_old(
decoder,
charstring + cs_offset,
glyph_length - cs_offset );
else
@ -189,10 +191,13 @@
psaux->ps_decoder_init( &psdecoder, decoder, TRUE );
psaux->t1_make_subfont( FT_FACE( face ), &dict->private_dict, &subfont );
psaux->t1_make_subfont( FT_FACE( face ),
&dict->private_dict,
&subfont );
psdecoder.current_subfont = &subfont;
error = psaux->t1_decoder_funcs->parse_charstrings( &psdecoder,
error = psaux->t1_decoder_funcs->parse_charstrings(
&psdecoder,
charstring + cs_offset,
glyph_length - cs_offset );
@ -207,7 +212,8 @@
force_scaling = TRUE;
error = psaux->t1_decoder_funcs->parse_charstrings( &psdecoder,
error = psaux->t1_decoder_funcs->parse_charstrings(
&psdecoder,
charstring + cs_offset,
glyph_length - cs_offset );
}
@ -386,7 +392,7 @@
if ( error )
goto Exit;
/* Copy flags back for forced scaling */
/* copy flags back for forced scaling */
hinting = glyph->hint;
scaled = glyph->scaled;