diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 18:24:21 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 18:24:21 +0000 |
| commit | c99fcf5a1913cea79dbf53cc5ca3dba8e3ee5d64 (patch) | |
| tree | ec671064fb18a8e0cf198c514680ea6f86ecc345 /tools/imagediff | |
| parent | a6e70b07a557d6c1765df2560c0104a9033c4015 (diff) | |
| download | chromium_src-c99fcf5a1913cea79dbf53cc5ca3dba8e3ee5d64.zip chromium_src-c99fcf5a1913cea79dbf53cc5ca3dba8e3ee5d64.tar.gz chromium_src-c99fcf5a1913cea79dbf53cc5ca3dba8e3ee5d64.tar.bz2 | |
Add the ability to write comments to PNGCodec::Encode.
I'm going to use this to write layout test checksums to the
expected png files.
Review URL: http://codereview.chromium.org/6696085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/imagediff')
| -rw-r--r-- | tools/imagediff/DEPS | 2 | ||||
| -rw-r--r-- | tools/imagediff/image_diff.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/imagediff/DEPS b/tools/imagediff/DEPS index 1a45e54..b273ae3 100644 --- a/tools/imagediff/DEPS +++ b/tools/imagediff/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+ui/gfx/codec", + "+ui/gfx", ] diff --git a/tools/imagediff/image_diff.cc b/tools/imagediff/image_diff.cc index 6f775a5..294e2e3 100644 --- a/tools/imagediff/image_diff.cc +++ b/tools/imagediff/image_diff.cc @@ -23,6 +23,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "ui/gfx/codec/png_codec.h" +#include "ui/gfx/size.h" #if defined(OS_WIN) #include "windows.h" @@ -316,8 +317,9 @@ int DiffImages(const FilePath& file1, const FilePath& file2, std::vector<unsigned char> png_encoding; gfx::PNGCodec::Encode(diff_image.data(), gfx::PNGCodec::FORMAT_RGBA, - diff_image.w(), diff_image.h(), diff_image.w() * 4, - false, &png_encoding); + gfx::Size(diff_image.w(), diff_image.h()), + 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) return kStatusError; |