Update safe numerics package to get bitwise ops

core/fxge/ge/cfx_renderdevice.cpp

 // Copyright 2016 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 "core/fxge/cfx_renderdevice.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 1004 matching lines @@
                                 nrows, pGlyph, fill_color, 0, 0,
                                 FXDIB_BLEND_NORMAL, nullptr, false, 0,
                                 nullptr)) {
         return false;
       }
       continue;
     }
     bool bBGRStripe = !!(text_flags & FXTEXT_BGR_STRIPE);
     ncols /= 3;
     int x_subpixel = (int)(glyph.m_fOriginX * 3) % 3;
-    int start_col = std::max(left.ValueOrDie(), 0);
+    int start_col = std::max(static_cast<int>(left.ValueOrDie<int>()), 0);

[dsinclair, 2017/01/23 14:46:33]

If this is templated as <int> why do we need the cast?

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

Because the type returned from ValueOrDie is a StrictNumeric, which will throw a
compile error because the template provides too many valid conversions. The
better solution is to just use this variadic template function:

  int start_col = base::CheckMax(left, 0).template ValueOrDie<int>();

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

done, used functional form rather than template keyword.

     pdfium::base::CheckedNumeric<int> end_col_safe = left;
     end_col_safe += ncols;
     if (!end_col_safe.IsValid())
       return false;
 
-    int end_col = std::min(end_col_safe.ValueOrDie(), dest_width);
+    int end_col =
+        std::min(static_cast<int>(end_col_safe.ValueOrDie<int>()), dest_width);
     if (start_col >= end_col)
       continue;
 
     DrawNormalTextHelper(&bitmap, pGlyph, nrows, left.ValueOrDie(),
                          top.ValueOrDie(), start_col, end_col, bNormal,
                          bBGRStripe, x_subpixel, a, r, g, b);
   }
   if (bitmap.IsAlphaMask())
     SetBitMask(&bitmap, bmp_rect.left, bmp_rect.top, fill_color);
   else
@@ skipping 37 matching lines @@
                              fill_color, stroke_color, fill_mode,
                              FXDIB_BLEND_NORMAL)) {
         return false;
       }
     }
     if (pClippingPath)
       pClippingPath->Append(&TransformedPath, pUser2Device);
   }
   return true;
 }