Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType
Commits:
-
6dc2ecb7
by Alexei Podtelezhnikov (Алексей Подтележников) at 2023-11-14T23:06:41-05:00
-
b0265ccd
by Alexei Podtelezhnikov (Алексей Подтележников) at 2023-11-14T23:32:06-05:00
1 changed file:
Changes:
... | ... | @@ -625,10 +625,6 @@ |
625 | 625 | * aState ::
|
626 | 626 | * The state/orientation of the new profile.
|
627 | 627 | *
|
628 | - * overshoot ::
|
|
629 | - * Whether the profile's unrounded start position
|
|
630 | - * differs by at least a half pixel.
|
|
631 | - *
|
|
632 | 628 | * @Return:
|
633 | 629 | * SUCCESS on success. FAILURE in case of overflow or of incoherent
|
634 | 630 | * profile.
|
... | ... | @@ -706,11 +702,6 @@ |
706 | 702 | * @Description:
|
707 | 703 | * Finalize the current profile and record y-turns.
|
708 | 704 | *
|
709 | - * @Input:
|
|
710 | - * overshoot ::
|
|
711 | - * Whether the profile's unrounded end position differs
|
|
712 | - * by at least a half pixel.
|
|
713 | - *
|
|
714 | 705 | * @Return:
|
715 | 706 | * SUCCESS on success. FAILURE in case of overflow or incoherency.
|
716 | 707 | */
|
... | ... | @@ -761,6 +752,8 @@ |
761 | 752 | p->offset = h - 1;
|
762 | 753 | }
|
763 | 754 | |
755 | + p->X = p->x[p->offset];
|
|
756 | + |
|
764 | 757 | if ( Insert_Y_Turn( RAS_VARS bottom ) ||
|
765 | 758 | Insert_Y_Turn( RAS_VARS top ) )
|
766 | 759 | return FAILURE;
|
... | ... | @@ -1588,6 +1581,11 @@ |
1588 | 1581 | *
|
1589 | 1582 | * @Return:
|
1590 | 1583 | * SUCCESS on success, FAILURE on error.
|
1584 | + *
|
|
1585 | + * @Note:
|
|
1586 | + * Unlike FT_Outline_Decompose(), this function handles the scanmode
|
|
1587 | + * dropout tags in the individual contours. Therefore, it cannot be
|
|
1588 | + * replaced.
|
|
1591 | 1589 | */
|
1592 | 1590 | static Bool
|
1593 | 1591 | Decompose_Curve( RAS_ARGS Int first,
|
... | ... | @@ -2467,21 +2465,10 @@ |
2467 | 2465 | |
2468 | 2466 | ras.Proc_Sweep_Init( RAS_VARS min_Y, max_Y );
|
2469 | 2467 | |
2470 | - /* set the activation countdowns and the initial positions */
|
|
2471 | - |
|
2472 | - P = waiting;
|
|
2473 | - while ( P )
|
|
2474 | - {
|
|
2475 | - P->start -= min_Y;
|
|
2476 | - P->X = P->x[P->offset];
|
|
2477 | - |
|
2478 | - P = P->link;
|
|
2479 | - }
|
|
2480 | - |
|
2481 | 2468 | /* let's go, iterating through y_turns */
|
2482 | 2469 | |
2483 | 2470 | y = min_Y;
|
2484 | - y_height = 0;
|
|
2471 | + y_height = min_Y;
|
|
2485 | 2472 | |
2486 | 2473 | while ( ++ras.maxBuff < ras.sizeBuff )
|
2487 | 2474 | {
|