diff options
Diffstat (limited to 'src/psaux/t1decode.c')
| -rw-r--r-- | src/psaux/t1decode.c | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c index 04de1228d..1250b53f5 100644 --- a/src/psaux/t1decode.c +++ b/src/psaux/t1decode.c @@ -864,9 +864,9 @@ for ( mm = 1; mm < blend->num_designs; mm++ ) - tmp = OVERFLOW_ADD_LONG( - tmp, - FT_MulFix( *delta++, blend->weight_vector[mm] ) ); + tmp = ADD_LONG( tmp, + FT_MulFix( *delta++, + blend->weight_vector[mm] ) ); *values++ = tmp; } @@ -906,7 +906,7 @@ if ( arg_cnt != 2 ) goto Unexpected_OtherSubr; - top[0] = OVERFLOW_ADD_LONG( top[0], top[1] ); + top[0] = ADD_LONG( top[0], top[1] ); known_othersubr_result_cnt = 1; break; @@ -917,7 +917,7 @@ if ( arg_cnt != 2 ) goto Unexpected_OtherSubr; - top[0] = OVERFLOW_SUB_LONG( top[0], top[1] ); + top[0] = SUB_LONG( top[0], top[1] ); known_othersubr_result_cnt = 1; break; @@ -1149,13 +1149,13 @@ builder->parse_state = T1_Parse_Have_Width; - builder->left_bearing.x = OVERFLOW_ADD_LONG( - builder->left_bearing.x, top[0] ); + builder->left_bearing.x = ADD_LONG( builder->left_bearing.x, + top[0] ); builder->advance.x = top[1]; builder->advance.y = 0; - orig_x = x = OVERFLOW_ADD_LONG( builder->pos_x, top[0] ); + orig_x = x = ADD_LONG( builder->pos_x, top[0] ); orig_y = y = builder->pos_y; FT_UNUSED( orig_y ); @@ -1181,16 +1181,16 @@ builder->parse_state = T1_Parse_Have_Width; - builder->left_bearing.x = OVERFLOW_ADD_LONG( - builder->left_bearing.x, top[0] ); - builder->left_bearing.y = OVERFLOW_ADD_LONG( - builder->left_bearing.y, top[1] ); + builder->left_bearing.x = ADD_LONG( builder->left_bearing.x, + top[0] ); + builder->left_bearing.y = ADD_LONG( builder->left_bearing.y, + top[1] ); builder->advance.x = top[2]; builder->advance.y = top[3]; - x = OVERFLOW_ADD_LONG( builder->pos_x, top[0] ); - y = OVERFLOW_ADD_LONG( builder->pos_y, top[1] ); + x = ADD_LONG( builder->pos_x, top[0] ); + y = ADD_LONG( builder->pos_y, top[1] ); /* the `metrics_only' indicates that we only want to compute */ /* the glyph's metrics (lsb + advance width), not load the */ @@ -1217,13 +1217,13 @@ if ( FT_SET_ERROR( t1_builder_start_point( builder, x, y ) ) ) goto Fail; - x = OVERFLOW_ADD_LONG( x, top[0] ); + x = ADD_LONG( x, top[0] ); goto Add_Line; case op_hmoveto: FT_TRACE4(( " hmoveto" )); - x = OVERFLOW_ADD_LONG( x, top[0] ); + x = ADD_LONG( x, top[0] ); if ( !decoder->flex_state ) { @@ -1240,14 +1240,14 @@ FT_SET_ERROR( t1_builder_check_points( builder, 3 ) ) ) goto Fail; - x = OVERFLOW_ADD_LONG( x, top[0] ); + x = ADD_LONG( x, top[0] ); t1_builder_add_point( builder, x, y, 0 ); - x = OVERFLOW_ADD_LONG( x, top[1] ); - y = OVERFLOW_ADD_LONG( y, top[2] ); + x = ADD_LONG( x, top[1] ); + y = ADD_LONG( y, top[2] ); t1_builder_add_point( builder, x, y, 0 ); - y = OVERFLOW_ADD_LONG( y, top[3] ); + y = ADD_LONG( y, top[3] ); t1_builder_add_point( builder, x, y, 1 ); break; @@ -1257,8 +1257,8 @@ if ( FT_SET_ERROR( t1_builder_start_point( builder, x, y ) ) ) goto Fail; - x = OVERFLOW_ADD_LONG( x, top[0] ); - y = OVERFLOW_ADD_LONG( y, top[1] ); + x = ADD_LONG( x, top[0] ); + y = ADD_LONG( y, top[1] ); Add_Line: if ( FT_SET_ERROR( t1_builder_add_point1( builder, x, y ) ) ) @@ -1268,8 +1268,8 @@ case op_rmoveto: FT_TRACE4(( " rmoveto" )); - x = OVERFLOW_ADD_LONG( x, top[0] ); - y = OVERFLOW_ADD_LONG( y, top[1] ); + x = ADD_LONG( x, top[0] ); + y = ADD_LONG( y, top[1] ); if ( !decoder->flex_state ) { @@ -1286,16 +1286,16 @@ FT_SET_ERROR( t1_builder_check_points( builder, 3 ) ) ) goto Fail; - x = OVERFLOW_ADD_LONG( x, top[0] ); - y = OVERFLOW_ADD_LONG( y, top[1] ); + x = ADD_LONG( x, top[0] ); + y = ADD_LONG( y, top[1] ); t1_builder_add_point( builder, x, y, 0 ); - x = OVERFLOW_ADD_LONG( x, top[2] ); - y = OVERFLOW_ADD_LONG( y, top[3] ); + x = ADD_LONG( x, top[2] ); + y = ADD_LONG( y, top[3] ); t1_builder_add_point( builder, x, y, 0 ); - x = OVERFLOW_ADD_LONG( x, top[4] ); - y = OVERFLOW_ADD_LONG( y, top[5] ); + x = ADD_LONG( x, top[4] ); + y = ADD_LONG( y, top[5] ); t1_builder_add_point( builder, x, y, 1 ); break; @@ -1306,14 +1306,14 @@ FT_SET_ERROR( t1_builder_check_points( builder, 3 ) ) ) goto Fail; - y = OVERFLOW_ADD_LONG( y, top[0] ); + y = ADD_LONG( y, top[0] ); t1_builder_add_point( builder, x, y, 0 ); - x = OVERFLOW_ADD_LONG( x, top[1] ); - y = OVERFLOW_ADD_LONG( y, top[2] ); + x = ADD_LONG( x, top[1] ); + y = ADD_LONG( y, top[2] ); t1_builder_add_point( builder, x, y, 0 ); - x = OVERFLOW_ADD_LONG( x, top[3] ); + x = ADD_LONG( x, top[3] ); t1_builder_add_point( builder, x, y, 1 ); break; @@ -1323,13 +1323,13 @@ if ( FT_SET_ERROR( t1_builder_start_point( builder, x, y ) ) ) goto Fail; - y = OVERFLOW_ADD_LONG( y, top[0] ); + y = ADD_LONG( y, top[0] ); goto Add_Line; case op_vmoveto: FT_TRACE4(( " vmoveto" )); - y = OVERFLOW_ADD_LONG( y, top[0] ); + y = ADD_LONG( y, top[0] ); if ( !decoder->flex_state ) { @@ -1487,7 +1487,7 @@ /* record vertical hint */ if ( hinter ) { - top[0] = OVERFLOW_ADD_LONG( top[0], orig_x ); + top[0] = ADD_LONG( top[0], orig_x ); hinter->stem( hinter->hints, 0, top ); } break; @@ -1501,9 +1501,9 @@ FT_Pos dx = orig_x; - top[0] = OVERFLOW_ADD_LONG( top[0], dx ); - top[2] = OVERFLOW_ADD_LONG( top[2], dx ); - top[4] = OVERFLOW_ADD_LONG( top[4], dx ); + top[0] = ADD_LONG( top[0], dx ); + top[2] = ADD_LONG( top[2], dx ); + top[4] = ADD_LONG( top[4], dx ); hinter->stem3( hinter->hints, 0, top ); } break; |