Clean up XFA code which causes warnings

xfa/fxfa/app/xfa_ffwidget.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/fxfa/include/xfa_ffwidget.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 250 matching lines @@
 void CXFA_FFWidget::Rotate2Normal(FX_FLOAT& fx, FX_FLOAT& fy) {
   CFX_Matrix mt;
   GetRotateMatrix(mt);
   if (mt.IsIdentity()) {
     return;
   }
   CFX_Matrix mtReverse;
   mtReverse.SetReverse(mt);
   mtReverse.TransformPoint(fx, fy);
 }
 static void XFA_GetMatrix(CFX_Matrix& m,

[Lei Zhang, 2016/05/20 03:48:02]

BTW, this only has 1 caller and |at| is always XFA_ATTRIBUTEENUM_TopLeft.

[Wei Li, 2016/05/20 16:33:15]

Yes, I noticed that. I suspect there are some unfinished code as 
we probably want support on rotation on other points as well.
So keep this utility function for now.

                           int32_t iRotate,
-                          int32_t at,
+                          XFA_ATTRIBUTEENUM at,
                           const CFX_RectF& rt) {
   if (!iRotate) {
     return;
   }
-  FX_FLOAT fAnchorX, fAnchorY;
+  FX_FLOAT fAnchorX = 0, fAnchorY = 0;

[Lei Zhang, 2016/05/20 03:48:02]

One per line please.

[Wei Li, 2016/05/20 16:33:14]

Done.

   switch (at) {
     case XFA_ATTRIBUTEENUM_TopLeft:
       fAnchorX = rt.left, fAnchorY = rt.top;
       break;
     case XFA_ATTRIBUTEENUM_TopCenter:
       fAnchorX = (rt.left + rt.right()) / 2, fAnchorY = rt.top;
       break;
     case XFA_ATTRIBUTEENUM_TopRight:
       fAnchorX = rt.right(), fAnchorY = rt.top;
       break;
     case XFA_ATTRIBUTEENUM_MiddleLeft:
       fAnchorX = rt.left, fAnchorY = (rt.top + rt.bottom()) / 2;
       break;
     case XFA_ATTRIBUTEENUM_MiddleCenter:
       fAnchorX = (rt.left + rt.right()) / 2,
       fAnchorY = (rt.top + rt.bottom()) / 2;
       break;
     case XFA_ATTRIBUTEENUM_MiddleRight:
       fAnchorX = rt.right(), fAnchorY = (rt.top + rt.bottom()) / 2;
       break;
     case XFA_ATTRIBUTEENUM_BottomLeft:
       fAnchorX = rt.left, fAnchorY = rt.bottom();
       break;
     case XFA_ATTRIBUTEENUM_BottomCenter:
       fAnchorX = (rt.left + rt.right()) / 2, fAnchorY = rt.bottom();
       break;
     case XFA_ATTRIBUTEENUM_BottomRight:
       fAnchorX = rt.right(), fAnchorY = rt.bottom();
       break;
+    default:
+      break;
   }
   switch (iRotate) {
     case 90:
       m.a = 0, m.b = -1, m.c = 1, m.d = 0, m.e = fAnchorX - fAnchorY,
       m.f = fAnchorX + fAnchorY;
       break;
     case 180:
       m.a = -1, m.b = 0, m.c = 0, m.d = -1, m.e = fAnchorX * 2,
       m.f = fAnchorY * 2;
       break;
@@ skipping 832 matching lines @@
                   startAngle, sweepAngle);
 }
 static void XFA_BOX_GetPath(CXFA_Box box,
                             const CXFA_StrokeArray& strokes,
                             CFX_RectF rtWidget,
                             CFX_Path& path,
                             int32_t nIndex,
                             FX_BOOL bStart,
                             FX_BOOL bCorner) {
   ASSERT(nIndex >= 0 && nIndex < 8);
-  FX_BOOL bInverted, bRound;
-  FX_FLOAT fRadius1, fRadius2, sx, sy, vx, vy, nx, ny, offsetY, offsetX,
-      offsetEX, offsetEY;
-  CFX_PointF cpStart, cp, cp1, cp2;
-  CFX_RectF rtRadius;
+  FX_FLOAT sx = 0.0f;

[Lei Zhang, 2016/05/20 03:48:02]

Can you declare variables closer to where they are used?

[Wei Li, 2016/05/20 16:33:15]

Done.

+  FX_FLOAT sy = 0.0f;
+  FX_FLOAT vx = 1.0f;
+  FX_FLOAT vy = 1.0f;
+  FX_FLOAT nx = 1.0f;
+  FX_FLOAT ny = 1.0f;
+  CFX_PointF cpStart;
+  CFX_PointF cp1;
+  CFX_PointF cp2;
   int32_t n = (nIndex & 1) ? nIndex - 1 : nIndex;
   CXFA_Corner corner1(strokes[n].GetNode());
   CXFA_Corner corner2(strokes[(n + 2) % 8].GetNode());
-  fRadius1 = bCorner ? corner1.GetRadius() : 0;
-  fRadius2 = bCorner ? corner2.GetRadius() : 0;
-  bInverted = corner1.IsInverted();
-  offsetY = 0.0f;
-  offsetX = 0.0f;
-  bRound = corner1.GetJoinType() == XFA_ATTRIBUTEENUM_Round;
+  FX_FLOAT fRadius1 = bCorner ? corner1.GetRadius() : 0.0f;
+  FX_FLOAT fRadius2 = bCorner ? corner2.GetRadius() : 0.0f;
+  FX_BOOL bInverted = corner1.IsInverted();
+  FX_FLOAT offsetY = 0.0f;
+  FX_FLOAT offsetX = 0.0f;
+  FX_BOOL bRound = corner1.GetJoinType() == XFA_ATTRIBUTEENUM_Round;
   FX_FLOAT halfAfter = 0.0f;
   FX_FLOAT halfBefore = 0.0f;
   CXFA_Stroke stroke = strokes[nIndex];
   if (stroke.IsCorner()) {
     CXFA_Stroke edgeBefore = strokes[(nIndex + 1 * 8 - 1) % 8];
     CXFA_Stroke edgeAfter = strokes[nIndex + 1];
     if (stroke.IsInverted()) {
       if (!stroke.SameStyles(edgeBefore)) {
         halfBefore = edgeBefore.GetThickness() / 2;
       }
       if (!stroke.SameStyles(edgeAfter)) {
         halfAfter = edgeAfter.GetThickness() / 2;
       }
     }
   } else {
     CXFA_Stroke edgeBefore = strokes[(nIndex + 8 - 2) % 8];
     CXFA_Stroke edgeAfter = strokes[(nIndex + 2) % 8];
     if (!bRound && !bInverted) {
       { halfBefore = edgeBefore.GetThickness() / 2; }

[Lei Zhang, 2016/05/20 03:48:02]

There's some extra braces here.

[Wei Li, 2016/05/20 16:33:15]

Done.

       { halfAfter = edgeAfter.GetThickness() / 2; }
     }
   }
-  offsetEX = 0.0f;
-  offsetEY = 0.0f;
+  FX_FLOAT offsetEX = 0.0f;
+  FX_FLOAT offsetEY = 0.0f;
   if (bRound) {
     sy = FX_PI / 2;
   }
   switch (nIndex) {
     case 0:
     case 1:
       cp1 = rtWidget.TopLeft();
       cp2 = rtWidget.TopRight();
       if (nIndex == 0) {
         cpStart.x = cp1.x - halfBefore;
@@ skipping 76 matching lines @@
                 cp2.y + fRadius2 * ny + offsetEY);
     return;
   }
   if (bRound) {
     if (fRadius1 < 0) {
       sx -= FX_PI;
     }
     if (bInverted) {
       sy *= -1;
     }
+    CFX_RectF rtRadius;
     rtRadius.Set(cp1.x + offsetX * 2, cp1.y + offsetY * 2,
                  fRadius1 * 2 * vx - offsetX * 2,
                  fRadius1 * 2 * vy - offsetY * 2);
     rtRadius.Normalize();
     if (bInverted) {
       rtRadius.Offset(-fRadius1 * vx, -fRadius1 * vy);
     }
     path.ArcTo(rtRadius.left, rtRadius.top, rtRadius.width, rtRadius.height, sx,
                sy);
   } else {
+    CFX_PointF cp;
     if (bInverted) {
       cp.x = cp1.x + fRadius1 * vx, cp.y = cp1.y + fRadius1 * vy;
     } else {
       cp = cp1;
     }
     path.LineTo(cp.x, cp.y);
     path.LineTo(cp1.x + fRadius1 * sx + offsetX,
                 cp1.y + fRadius1 * sy + offsetY);
   }
 }
@@ skipping 48 matching lines @@
       if (stroke1.GetJoinType() != XFA_ATTRIBUTEENUM_Square) {
         bSameStyles = FALSE;
       }
     }
   }
   if (bSameStyles) {
     fillPath.AddRectangle(rtWidget.left, rtWidget.top, rtWidget.width,
                           rtWidget.height);
     return;
   }
-  FX_BOOL bInverted, bRound;
-  FX_FLOAT fRadius1, fRadius2, sx, sy, vx, vy, nx, ny;
-  CFX_PointF cp, cp1, cp2;
-  CFX_RectF rtRadius;
+
   for (int32_t i = 0; i < 8; i += 2) {
+    FX_FLOAT sx = 0.0f;
+    FX_FLOAT sy = 0.0f;
+    FX_FLOAT vx = 1.0f;
+    FX_FLOAT vy = 1.0f;
+    FX_FLOAT nx = 1.0f;
+    FX_FLOAT ny = 1.0f;
+    CFX_PointF cp1, cp2;
     CXFA_Corner corner1(strokes[i].GetNode());
     CXFA_Corner corner2(strokes[(i + 2) % 8].GetNode());
-    fRadius1 = corner1.GetRadius();
-    fRadius2 = corner2.GetRadius();
-    bInverted = corner1.IsInverted();
-    bRound = corner1.GetJoinType() == XFA_ATTRIBUTEENUM_Round;
+    FX_FLOAT fRadius1 = corner1.GetRadius();
+    FX_FLOAT fRadius2 = corner2.GetRadius();
+    FX_BOOL bInverted = corner1.IsInverted();
+    FX_BOOL bRound = corner1.GetJoinType() == XFA_ATTRIBUTEENUM_Round;
     if (bRound) {
       sy = FX_PI / 2;
     }
     switch (i) {
       case 0:
         cp1 = rtWidget.TopLeft();
         cp2 = rtWidget.TopRight();
         vx = 1, vy = 1;
         nx = -1, ny = 0;
         if (bRound) {
@@ skipping 39 matching lines @@
     if (i == 0) {
       fillPath.MoveTo(cp1.x, cp1.y + fRadius1);
     }
     if (bRound) {
       if (fRadius1 < 0) {
         sx -= FX_PI;
       }
       if (bInverted) {
         sy *= -1;
       }
+      CFX_RectF rtRadius;
       rtRadius.Set(cp1.x, cp1.y, fRadius1 * 2 * vx, fRadius1 * 2 * vy);
       rtRadius.Normalize();
       if (bInverted) {
         rtRadius.Offset(-fRadius1 * vx, -fRadius1 * vy);
       }
       fillPath.ArcTo(rtRadius.left, rtRadius.top, rtRadius.width,
                      rtRadius.height, sx, sy);
     } else {
+      CFX_PointF cp;
       if (bInverted) {
         cp.x = cp1.x + fRadius1 * vx, cp.y = cp1.y + fRadius1 * vy;
       } else {
         cp = cp1;
       }
       fillPath.LineTo(cp.x, cp.y);
       fillPath.LineTo(cp1.x + fRadius1 * sx, cp1.y + fRadius1 * sy);
     }
     fillPath.LineTo(cp2.x + fRadius2 * nx, cp2.y + fRadius2 * ny);
   }
@@ skipping 501 matching lines @@
       iType != XFA_ELEMENT_Rectangle) {
     return;
   }
   CXFA_StrokeArray strokes;
   if (!(dwFlags & XFA_DRAWBOX_ForceRound) && iType != XFA_ELEMENT_Arc) {
     box.GetStrokes(strokes);
   }
   XFA_BOX_Fill(box, strokes, pGS, rtWidget, pMatrix, dwFlags);
   XFA_BOX_Stroke(box, strokes, pGS, rtWidget, pMatrix, dwFlags);
 }