Update safe numerics package to get bitwise ops

core/fxge/ge/fx_ge_text.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 <limits>
 #include <vector>
 
@@ skipping 61 matching lines @@
     FX_SAFE_INT32 char_height = pGlyph->m_Bitmap.GetHeight();
     char_height /= retinaScaleY;
     if (!char_height.IsValid())
       continue;
 
     FX_SAFE_INT32 char_bottom = char_top + char_height;
     if (!char_bottom.IsValid())
       continue;
 
     if (bStarted) {
-      rect.left = std::min(rect.left, char_left.ValueOrDie());
-      rect.right = std::max(rect.right, char_right.ValueOrDie());
-      rect.top = std::min(rect.top, char_top.ValueOrDie());
-      rect.bottom = std::max(rect.bottom, char_bottom.ValueOrDie());
+      rect.left =
+          std::min(rect.left, static_cast<int>(char_left.ValueOrDie<int>()));

[jschuh, 2017/01/23 17:05:19]

Same as above. This is what CheckMax() is for.

[Tom Sepez, 2017/01/23 18:19:14]

Done.

+      rect.right =
+          std::max(rect.right, static_cast<int>(char_right.ValueOrDie<int>()));
+      rect.top =
+          std::min(rect.top, static_cast<int>(char_top.ValueOrDie<int>()));
+      rect.bottom = std::max(rect.bottom,
+                             static_cast<int>(char_bottom.ValueOrDie<int>()));
       continue;
     }
 
     rect.left = char_left.ValueOrDie();
     rect.right = char_right.ValueOrDie();
     rect.top = char_top.ValueOrDie();
     rect.bottom = char_bottom.ValueOrDie();
     bStarted = true;
   }
   return rect;
@@ skipping 11 matching lines @@
 void _CFX_UniqueKeyGen::Generate(int count, ...) {
   va_list argList;
   va_start(argList, count);
   for (int i = 0; i < count; i++) {
     int p = va_arg(argList, int);
     ((uint32_t*)m_Key)[i] = p;
   }
   va_end(argList);
   m_KeyLen = count * sizeof(uint32_t);
 }