diff options
| author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 20:21:16 +0000 |
|---|---|---|
| committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 20:21:16 +0000 |
| commit | bd635c097dfc689674d6b21c006850a7b07f23f4 (patch) | |
| tree | b9c8bdf9edc379e288c14f64e063e29efe7635c8 /gfx/icon_util.cc | |
| parent | 19dc5d7922dc07b61c037ebbcc86f20dad27eab2 (diff) | |
| download | chromium_src-bd635c097dfc689674d6b21c006850a7b07f23f4.zip chromium_src-bd635c097dfc689674d6b21c006850a7b07f23f4.tar.gz chromium_src-bd635c097dfc689674d6b21c006850a7b07f23f4.tar.bz2 | |
Enable warning 4389 as an error on windows builds. This will make
windows builds more similar to linux/mac, which already treat signed/
unsigned equality comparisons as warnings (and hence errors).
BUG=44471
TEST=none
Review URL: http://codereview.chromium.org/2081007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx/icon_util.cc')
| -rw-r--r-- | gfx/icon_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gfx/icon_util.cc b/gfx/icon_util.cc index b3b89a8..8ce2279 100644 --- a/gfx/icon_util.cc +++ b/gfx/icon_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -176,7 +176,7 @@ SkBitmap* IconUtil::CreateSkBitmapFromHICON(HICON icon, const gfx::Size& s) { if (!bitmap_has_alpha_channel) { unsigned int* p = static_cast<unsigned int*>(bitmap->getPixels()); for (size_t i = 0; i < num_pixels; ++p, ++i) { - DCHECK_EQ((*p & 0xff000000), 0); + DCHECK_EQ((*p & 0xff000000), 0u); if (opaque[i]) *p |= 0xff000000; else @@ -259,7 +259,7 @@ bool IconUtil::CreateIconFileFromSkBitmap(const SkBitmap& bitmap, DWORD bytes_written; bool delete_file = false; if (!WriteFile(icon_file.Get(), buffer, buffer_size, &bytes_written, NULL) || - bytes_written != buffer_size) { + static_cast<int>(bytes_written) != buffer_size) { delete_file = true; } |