Changeset 1163

Timestamp:

10/15/09 23:13:34 (11 months ago)

Author:

astrange

Message:

SSA: Fix toptitles being too low.

Ignoring the descent brings us closer to the
accurate positioning for them.

Especially improves [Mazui]_To_Aru_Kagaku_no_Railgun_-_02v2_[C1073458].mkv.

Files:

• trunk/Subtitles/SubATSUIRenderer.m (modified) (6 diffs)

trunk/Subtitles/SubATSUIRenderer.m

@@ -633 +633 @@
 
 // XXX see comment for GetTypographicRectangleForLayout
-static ATSUTextMeasurement GetLineHeight(ATSUTextLayout layout, UniCharArrayOffset lpos)
-{
-        ATSUTextMeasurement ascent, descent;
+static ATSUTextMeasurement GetLineHeight(ATSUTextLayout layout, UniCharArrayOffset lpos, Boolean includeDescent)
+{
+        ATSUTextMeasurement ascent = 0, descent = 0;
         
         ATSUGetLineControl(layout, lpos, kATSULineAscentTag,  sizeof(ATSUTextMeasurement), &ascent,  NULL);
-        ATSUGetLineControl(layout, lpos, kATSULineDescentTag, sizeof(ATSUTextMeasurement), &descent, NULL);
+        if (includeDescent) ATSUGetLineControl(layout, lpos, kATSULineDescentTag, sizeof(ATSUTextMeasurement), &descent, NULL);
         
         return ascent + descent;
@@ -667 +667 @@
                 ATSUGetGlyphBounds(layout, 0, baseY, breaks[i], end-breaks[i], kATSUseDeviceOrigins, 1, &trap, &trapCount);
 
-                baseY += GetLineHeight(layout, breaks[i]) + extraHeight;
+                baseY += GetLineHeight(layout, breaks[i], YES) + extraHeight;
                 
                 rect.bottom = MAX(trap.lowerLeft.y, trap.lowerRight.y);
@@ -716 +716 @@
                 CGContextStrokeRect(c, CGRectMake(FixedToFloat(penX) + pixRect.left, FixedToFloat(penY) + pixRect.top, pixRect.right - pixRect.left, pixRect.bottom - pixRect.top));
                 
-                penY += GetLineHeight(layout, breaks[i]) + extraHeight;
+                penY += GetLineHeight(layout, breaks[i], YES) + extraHeight;
         }
 }
@@ -733 +733 @@
                 ATSUMeasureTextImage(layout, breaks[i], end-breaks[i], 0, baseY, &rect);
                 
-                baseY += GetLineHeight(layout, breaks[i]) + extraHeight;
+                baseY += GetLineHeight(layout, breaks[i], YES) + extraHeight;
                 
                 if (i == breakCount) largeRect = rect;
@@ -1059 +1059 @@
                 }
 
-                penY += breakc.direction * (GetLineHeight(layout, thisBreak) + FloatToFixed(extraHeight));
+                penY += breakc.direction * (GetLineHeight(layout, thisBreak, YES) + FloatToFixed(extraHeight));
         }
                 
@@ -1182 +1182 @@
                                 case kSubAlignmentTop:
                                         if (!topPen || resetPens) {
-                                                penY = FloatToFixed(NSMaxY(marginRect)) - GetLineHeight(layout, kATSUFromTextBeginning);
+                                                penY = FloatToFixed(NSMaxY(marginRect)) - GetLineHeight(layout, kATSUFromTextBeginning, NO);
                                         } else penY = topPen;