From 2fbc33967abe8fd301a1c0ce35a625ed98bf41f9 Mon Sep 17 00:00:00 2001 From: "rafaelw@chromium.org" Date: Wed, 26 May 2010 01:52:40 +0000 Subject: Revert "Another dependency the bbot missed!!!" This reverts commit 161f7fd3bdd425167af9fe26fdc5373a2ff44c98. Revert "Missed a file as part of checkin for r48186" This reverts commit cff86beba5938209393a6c3bccced62a7f3ff36b. Revert "Enable warning 4389 as an error on windows builds. This will make" This reverts commit c78936bcfc65b98edf288191d927a495b0364621. TBR=mbelshe Review URL: http://codereview.chromium.org/2253001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48238 0039d316-1c4b-4281-b951-d872f2087c98 --- gfx/icon_util.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gfx/icon_util.cc') diff --git a/gfx/icon_util.cc b/gfx/icon_util.cc index 8ce2279..b3b89a8 100644 --- a/gfx/icon_util.cc +++ b/gfx/icon_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 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(bitmap->getPixels()); for (size_t i = 0; i < num_pixels; ++p, ++i) { - DCHECK_EQ((*p & 0xff000000), 0u); + DCHECK_EQ((*p & 0xff000000), 0); 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) || - static_cast(bytes_written) != buffer_size) { + bytes_written != buffer_size) { delete_file = true; } -- cgit v1.1