Merge to XFA: Use stdint.h types throughout PDFium.

xfa/src/fxbarcode/BC_UtilRSS.cpp

Index: xfa/src/fxbarcode/BC_UtilRSS.cpp
diff --git a/xfa/src/fxbarcode/BC_UtilRSS.cpp b/xfa/src/fxbarcode/BC_UtilRSS.cpp
index c65df34e13d3b12a08437dea5d5b56e8675d0a78..8ebfb6d6f15844adbac03cf62da12f173ec8e421 100644
--- a/xfa/src/fxbarcode/BC_UtilRSS.cpp
+++ b/xfa/src/fxbarcode/BC_UtilRSS.cpp
@@ -28,17 +28,17 @@ CBC_UtilRSS::CBC_UtilRSS()
 CBC_UtilRSS::~CBC_UtilRSS()
 {
 }
-CFX_Int32Array *CBC_UtilRSS::GetRssWidths(FX_INT32 val, FX_INT32 n, FX_INT32 elements, FX_INT32 maxWidth, FX_BOOL noNarrow)
+CFX_Int32Array *CBC_UtilRSS::GetRssWidths(int32_t val, int32_t n, int32_t elements, int32_t maxWidth, FX_BOOL noNarrow)
 {
     CFX_Int32Array *iTemp =  FX_NEW CFX_Int32Array;
     iTemp->SetSize(elements);
     CBC_AutoPtr<CFX_Int32Array > widths(iTemp);
-    FX_INT32 bar;
-    FX_INT32 narrowMask = 0;
+    int32_t bar;
+    int32_t narrowMask = 0;
     for (bar = 0; bar < elements - 1; bar++) {
         narrowMask |= (1 << bar);
-        FX_INT32 elmWidth = 1;
-        FX_INT32 subVal;
+        int32_t elmWidth = 1;
+        int32_t subVal;
         while (TRUE) {
             subVal = Combins(n - elmWidth - 1, elements - bar - 2);
             if (noNarrow && (narrowMask == 0) &&
@@ -46,8 +46,8 @@ CFX_Int32Array *CBC_UtilRSS::GetRssWidths(FX_INT32 val, FX_INT32 n, FX_INT32 ele
                 subVal -= Combins(n - elmWidth - (elements - bar), elements - bar - 2);
             }
             if (elements - bar - 1 > 1) {
-                FX_INT32 lessVal = 0;
-                for (FX_INT32 mxwElement = n - elmWidth - (elements - bar - 2);
+                int32_t lessVal = 0;
+                for (int32_t mxwElement = n - elmWidth - (elements - bar - 2);
                         mxwElement > maxWidth;
                         mxwElement--) {
                     lessVal += Combins(n - elmWidth - mxwElement - 1, elements - bar - 3);
@@ -70,29 +70,29 @@ CFX_Int32Array *CBC_UtilRSS::GetRssWidths(FX_INT32 val, FX_INT32 n, FX_INT32 ele
     (*widths)[bar] = n;
     return widths.release();
 }
-FX_INT32 CBC_UtilRSS::GetRSSvalue(CFX_Int32Array &widths, FX_INT32 maxWidth, FX_BOOL noNarrow)
+int32_t CBC_UtilRSS::GetRSSvalue(CFX_Int32Array &widths, int32_t maxWidth, FX_BOOL noNarrow)
 {
-    FX_INT32 elements = widths.GetSize();
-    FX_INT32 n = 0;
-    for (FX_INT32 i = 0; i < elements; i++) {
+    int32_t elements = widths.GetSize();
+    int32_t n = 0;
+    for (int32_t i = 0; i < elements; i++) {
         n += widths[i];
     }
-    FX_INT32 val = 0;
-    FX_INT32 narrowMask = 0;
-    for (FX_INT32 bar = 0; bar < elements - 1; bar++) {
-        FX_INT32 elmWidth;
+    int32_t val = 0;
+    int32_t narrowMask = 0;
+    for (int32_t bar = 0; bar < elements - 1; bar++) {
+        int32_t elmWidth;
         for (elmWidth = 1, narrowMask |= (1 << bar);
                 elmWidth < widths[bar];
                 elmWidth++, narrowMask &= ~(1 << bar)) {
-            FX_INT32 subVal = Combins(n - elmWidth - 1, elements - bar - 2);
+            int32_t subVal = Combins(n - elmWidth - 1, elements - bar - 2);
             if (noNarrow && (narrowMask == 0) &&
                     (n - elmWidth - (elements - bar - 1) >= elements - bar - 1)) {
                 subVal -= Combins(n - elmWidth - (elements - bar),
                                   elements - bar - 2);
             }
             if (elements - bar - 1 > 1) {
-                FX_INT32 lessVal = 0;
-                for (FX_INT32 mxwElement = n - elmWidth - (elements - bar - 2);
+                int32_t lessVal = 0;
+                for (int32_t mxwElement = n - elmWidth - (elements - bar - 2);
                         mxwElement > maxWidth; mxwElement--) {
                     lessVal += Combins(n - elmWidth - mxwElement - 1,
                                        elements - bar - 3);
@@ -107,10 +107,10 @@ FX_INT32 CBC_UtilRSS::GetRSSvalue(CFX_Int32Array &widths, FX_INT32 maxWidth, FX_
     }
     return val;
 }
-FX_INT32 CBC_UtilRSS::Combins(FX_INT32 n, FX_INT32 r)
+int32_t CBC_UtilRSS::Combins(int32_t n, int32_t r)
 {
-    FX_INT32 maxDenom;
-    FX_INT32 minDenom;
+    int32_t maxDenom;
+    int32_t minDenom;
     if (n - r > r) {
         minDenom = r;
         maxDenom = n - r;
@@ -118,9 +118,9 @@ FX_INT32 CBC_UtilRSS::Combins(FX_INT32 n, FX_INT32 r)
         minDenom = n - r;
         maxDenom = r;
     }
-    FX_INT32 val = 1;
-    FX_INT32 j = 1;
-    for (FX_INT32 i = n; i > maxDenom; i--) {
+    int32_t val = 1;
+    int32_t j = 1;
+    for (int32_t i = n; i > maxDenom; i--) {
         val *= i;
         if (j <= minDenom) {
             val /= j;
@@ -133,15 +133,15 @@ FX_INT32 CBC_UtilRSS::Combins(FX_INT32 n, FX_INT32 r)
     }
     return val;
 }
-CFX_Int32Array *CBC_UtilRSS::Elements(CFX_Int32Array &eDist, FX_INT32 N, FX_INT32 K)
+CFX_Int32Array *CBC_UtilRSS::Elements(CFX_Int32Array &eDist, int32_t N, int32_t K)
 {
     CFX_Int32Array *widths = FX_NEW CFX_Int32Array;
     widths->SetSize(eDist.GetSize() + 2);
-    FX_INT32 twoK = K << 1;
+    int32_t twoK = K << 1;
     (*widths)[0] = 1;
-    FX_INT32 i;
-    FX_INT32 minEven = 10;
-    FX_INT32 barSum = 1;
+    int32_t i;
+    int32_t minEven = 10;
+    int32_t barSum = 1;
     for (i = 1; i < twoK - 2; i += 2) {
         (*widths)[i] = eDist[i - 1] - (*widths)[i - 1];
         (*widths)[i + 1] = eDist[i] - (*widths)[i];