Subtract instead of adding the negation.

core/fpdfdoc/doc_vt.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 
 #include "core/fpdfdoc/cpvt_wordinfo.h"
 #include "core/fpdfdoc/csection.h"
@@ skipping 354 matching lines @@
         fLineAscent = std::max(fLineAscent, fWordAscent);
         fLineDescent = std::min(fLineDescent, fWordDescent);
       }
     }
     pLine->m_LineInfo.nBeginWordIndex = 0;
     pLine->m_LineInfo.nEndWordIndex = m_pSection->m_WordArray.GetSize() - 1;
     pLine->m_LineInfo.fLineY = y;
     pLine->m_LineInfo.fLineWidth = x - pLine->m_LineInfo.fLineX;
     pLine->m_LineInfo.fLineAscent = fLineAscent;
     pLine->m_LineInfo.fLineDescent = fLineDescent;
-    y += (-fLineDescent);
+    y -= fLineDescent;
   }
   return m_rcRet = CPVT_FloatRect(0, 0, x, y);
 }
 CPVT_Size CTypeset::GetEditSize(FX_FLOAT fFontSize) {
   ASSERT(m_pSection);
   ASSERT(m_pVT);
   SplitLines(FALSE, fFontSize);
   return CPVT_Size(m_rcRet.Width(), m_rcRet.Height());
 }
 CPVT_FloatRect CTypeset::Typeset() {
@@ skipping 247 matching lines @@
         if (bTypeset) {
           line.nBeginWordIndex = nLineHead;
           line.nEndWordIndex = nLineTail;
           line.nTotalWord = nLineTail - nLineHead + 1;
           line.fLineWidth = fLineWidth;
           line.fLineAscent = fLineAscent;
           line.fLineDescent = fLineDescent;
           m_pSection->AddLine(line);
         }
         fMaxY += (fLineAscent + m_pVT->GetLineLeading(m_pSection->m_SecInfo));
-        fMaxY += (-fLineDescent);
+        fMaxY -= fLineDescent;
         fMaxX = std::max(fLineWidth, fMaxX);
         nLineHead = i;
         fLineWidth = 0.0f;
         fLineAscent = 0.0f;
         fLineDescent = 0.0f;
         nCharIndex = 0;
         nLineFullWordIndex = 0;
         bFullWord = FALSE;
       } else {
         fLineWidth += fWordWidth;
         i++;
       }
     }
     if (nLineHead <= nTotalWords - 1) {
       nLineTail = nTotalWords - 1;
       if (bTypeset) {
         line.nBeginWordIndex = nLineHead;
         line.nEndWordIndex = nLineTail;
         line.nTotalWord = nLineTail - nLineHead + 1;
         line.fLineWidth = fLineWidth;
         line.fLineAscent = fLineAscent;
         line.fLineDescent = fLineDescent;
         m_pSection->AddLine(line);
       }
       fMaxY += (fLineAscent + m_pVT->GetLineLeading(m_pSection->m_SecInfo));
-      fMaxY += (-fLineDescent);
+      fMaxY -= fLineDescent;
       fMaxX = std::max(fLineWidth, fMaxX);
     }
   } else {
     if (bTypeset) {
       fLineAscent = m_pVT->GetLineAscent(m_pSection->m_SecInfo);
       fLineDescent = m_pVT->GetLineDescent(m_pSection->m_SecInfo);
     } else {
       fLineAscent =
           m_pVT->GetFontAscent(m_pVT->GetDefaultFontIndex(), fFontSize);
       fLineDescent =
           m_pVT->GetFontDescent(m_pVT->GetDefaultFontIndex(), fFontSize);
     }
     if (bTypeset) {
       line.nBeginWordIndex = -1;
       line.nEndWordIndex = -1;
       line.nTotalWord = 0;
       line.fLineWidth = 0;
       line.fLineAscent = fLineAscent;
       line.fLineDescent = fLineDescent;
       m_pSection->AddLine(line);
     }
-    fMaxY += (m_pVT->GetLineLeading(m_pSection->m_SecInfo) + fLineAscent +
-              (-fLineDescent));
+    fMaxY += m_pVT->GetLineLeading(m_pSection->m_SecInfo) + fLineAscent -
+             fLineDescent;
   }
   m_rcRet = CPVT_FloatRect(0, 0, fMaxX, fMaxY);
 }
 void CTypeset::OutputLines() {
   ASSERT(m_pVT);
   ASSERT(m_pSection);
   FX_FLOAT fMinX = 0.0f, fMinY = 0.0f, fMaxX = 0.0f, fMaxY = 0.0f;
   FX_FLOAT fPosX = 0.0f, fPosY = 0.0f;
   FX_FLOAT fLineIndent = m_pVT->GetLineIndent(m_pSection->m_SecInfo);
   FX_FLOAT fTypesetWidth = std::max(m_pVT->GetPlateWidth() - fLineIndent, 0.0f);
@@ skipping 51 matching lines @@
                 case CPDF_VariableText::ScriptType::Sub:
                   pWord->fWordY = fPosY - m_pVT->GetWordDescent(*pWord) - fMinY;
                   break;
               }
             } else {
               pWord->fWordY = fPosY - fMinY;
             }
             fPosX += m_pVT->GetWordWidth(*pWord);
           }
         }
-        fPosY += (-pLine->m_LineInfo.fLineDescent);
+        fPosY -= pLine->m_LineInfo.fLineDescent;
       }
     }
   }
   m_rcRet = CPVT_FloatRect(fMinX, fMinY, fMaxX, fMaxY);
 }