diff options
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; } |