summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-19 05:24:13 +0000
committerjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-19 05:24:13 +0000
commitcdfa6b1c3e64ee6aef56dbc49e1e3331df19a212 (patch)
treedca144300fc419c742fb36f6b7bd0808dffd7630 /tools
parentdb190253e250efc46b27bbe0e43398ee1adc50d2 (diff)
downloadchromium_src-cdfa6b1c3e64ee6aef56dbc49e1e3331df19a212.zip
chromium_src-cdfa6b1c3e64ee6aef56dbc49e1e3331df19a212.tar.gz
chromium_src-cdfa6b1c3e64ee6aef56dbc49e1e3331df19a212.tar.bz2
Make imagediff build on Win64
Just fix an implicit conversion. BUG=166496 Review URL: https://chromiumcodereview.appspot.com/12296017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183164 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/imagediff/image_diff.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc
index 99d6282..9467340 100644
--- a/tools/imagediff/image_diff.cc
+++ b/tools/imagediff/image_diff.cc
@@ -20,6 +20,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/process_util.h"
+#include "base/safe_numerics.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "ui/gfx/codec/png_codec.h"
@@ -321,7 +322,8 @@ int DiffImages(const base::FilePath& file1, const base::FilePath& file2,
diff_image.w() * 4, false,
std::vector<gfx::PNGCodec::Comment>(), &png_encoding);
if (file_util::WriteFile(out_file,
- reinterpret_cast<char*>(&png_encoding.front()), png_encoding.size()) < 0)
+ reinterpret_cast<char*>(&png_encoding.front()),
+ base::checked_numeric_cast<int>(png_encoding.size())) < 0)
return kStatusError;
return kStatusDifferent;