Clean up XFA code which causes warnings

xfa/fgas/layout/fgas_textbreak.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 "xfa/fgas/layout/fgas_textbreak.h"
 
 #include <algorithm>
 
@@ skipping 1176 matching lines @@
   int32_t iFontSize = FXSYS_round(fFontSize * 20.0f);
   int32_t iAscent = pFont->GetAscent();
   int32_t iDescent = pFont->GetDescent();
   int32_t iMaxHeight = iAscent - iDescent;
   FX_FLOAT fFontHeight = fFontSize;
   FX_FLOAT fAscent = fFontHeight * (FX_FLOAT)iAscent / (FX_FLOAT)iMaxHeight;
   FX_FLOAT fDescent = fFontHeight * (FX_FLOAT)iDescent / (FX_FLOAT)iMaxHeight;
   FX_BOOL bVerticalDoc = (dwStyles & FX_TXTLAYOUTSTYLE_VerticalLayout) != 0;
   FX_BOOL bVerticalChar = (dwStyles & FX_TXTLAYOUTSTYLE_VerticalChars) != 0;
   int32_t iRotation = GetLineRotation(dwStyles) + pTxtRun->iCharRotation;
-  int32_t iCharRotation;
-  FX_WCHAR wch, wPrev = 0xFEFF, wNext, wForm, wLast = 0xFEFF;
-  int32_t iWidth, iCharWidth, iCharHeight;
   FX_FLOAT fX, fY, fCharWidth, fCharHeight;
   int32_t iHorScale = pTxtRun->iHorizontalScale;
   int32_t iVerScale = pTxtRun->iVerticalScale;
   FX_BOOL bSkipSpace = pTxtRun->bSkipSpace;
-  FX_BOOL bEmptyChar, bShadda = FALSE, bLam = FALSE;
-  uint32_t dwProps, dwCharType;
   FX_FORMCHAR formChars[3];
   FX_FLOAT fYBase;
   fX = rtText.left;
   if (bVerticalDoc) {
     fX += (rtText.width - fFontSize) / 2.0f;
     fYBase = bRTLPiece ? rtText.bottom() : rtText.top;
     fY = fYBase;
   } else {
     if (bRTLPiece) {
       fX = rtText.right();
     }
     fYBase = rtText.top + (rtText.height - fFontSize) / 2.0f;
     fY = fYBase + fAscent;
   }
-  int32_t iCount = 0, iNext, iForms;
+  int32_t iCount = 0;
+  int32_t iNext = 0;
+  FX_WCHAR wPrev = 0xFEFF;
+  FX_WCHAR wNext = 0xFEFF;
+  FX_WCHAR wForm = 0xFEFF;
+  FX_WCHAR wLast = 0xFEFF;
+  FX_BOOL bShadda = FALSE;
+  FX_BOOL bLam = FALSE;
   for (int32_t i = 0; i <= iLength; i++) {
+    int32_t iWidth;
+    FX_WCHAR wch;
     if (pAccess != NULL) {
       wch = pAccess->GetChar(pIdentity, i);
       iWidth = pAccess->GetWidth(pIdentity, i);
     } else {
       wch = *pStr++;
       iWidth = *pWidths++;
     }
-    dwProps = FX_GetUnicodeProperties(wch);
-    dwCharType = (dwProps & FX_CHARTYPEBITSMASK);
+    uint32_t dwProps = FX_GetUnicodeProperties(wch);
+    uint32_t dwCharType = (dwProps & FX_CHARTYPEBITSMASK);
     if (dwCharType == FX_CHARTYPE_ArabicAlef && iWidth == 0) {
       wPrev = 0xFEFF;
       wLast = wch;
       continue;
     }
     if (dwCharType >= FX_CHARTYPE_ArabicAlef) {
       if (i < iLength) {
         if (pAccess != NULL) {
           iNext = i + 1;
           while (iNext <= iLength) {
@@ skipping 92 matching lines @@
     } else {
       wForm = wch;
     }
     if (dwCharType != FX_CHARTYPE_Combination) {
       bShadda = FALSE;
     }
     if (dwCharType < FX_CHARTYPE_ArabicAlef) {
       bLam = FALSE;
     }
     dwProps = FX_GetUnicodeProperties(wForm);
-    iCharRotation = iRotation;
+    int32_t iCharRotation = iRotation;
     if (bVerticalChar && (dwProps & 0x8000) != 0) {
       iCharRotation++;
     }
     iCharRotation %= 4;
-    bEmptyChar =
+    FX_BOOL bEmptyChar =
         (dwCharType >= FX_CHARTYPE_Tab && dwCharType <= FX_CHARTYPE_Control);
     if (wForm == 0xFEFF) {
       bEmptyChar = TRUE;
     }
-    iForms = bLam ? 3 : 1;
+    int32_t iForms = bLam ? 3 : 1;
     iCount += (bEmptyChar && bSkipSpace) ? 0 : iForms;
     if (pCharPos == NULL) {
       if (iWidth > 0) {
         wPrev = wch;
       }
       wLast = wch;
       continue;
     }
-    iCharWidth = iWidth;
+    int32_t iCharWidth = iWidth;
     if (iCharWidth < 0) {
       iCharWidth = -iCharWidth;
     }
     iCharWidth /= iFontSize;
     formChars[0].wch = wch;
     formChars[0].wForm = wForm;
     formChars[0].iWidth = iCharWidth;
     if (bLam) {
       formChars[1].wForm = 0x0651;
       iCharWidth = 0;
@@ skipping 14 matching lines @@
       }
       if (!bEmptyChar || (bEmptyChar && !bSkipSpace)) {
         pCharPos->m_GlyphIndex =
             bCharCode ? wch : pFont->GetGlyphIndex(wForm, FALSE);
         pCharPos->m_ExtGID = pCharPos->m_GlyphIndex;
         pCharPos->m_FontCharWidth = iCharWidth;
         if (pWSForms) {
           *pWSForms += wForm;
         }
       }
+      int32_t iCharHeight;
       if (bVerticalDoc) {
         iCharHeight = iCharWidth;
         iCharWidth = 1000;
       } else {
         iCharHeight = 1000;
       }
       fCharWidth = fFontSize * iCharWidth / 1000.0f;
       fCharHeight = fFontSize * iCharHeight / 1000.0f;
       if (bRTLPiece && dwCharType != FX_CHARTYPE_Combination) {
         if (bVerticalDoc) {
@@ skipping 240 matching lines @@
         rtBBoxF.height = fHeight;
         rtBBoxF.top = std::max(rtBBoxF.top, 0.0f);
       }
       rtArray.SetAt(i, rtBBoxF);
       continue;
     }
     rtArray.SetAt(i, rect);
   }
   return iLength;
 }