| Index: ui/gfx/icon_util.cc
|
| diff --git a/ui/gfx/icon_util.cc b/ui/gfx/icon_util.cc
|
| index 4f4b4b7c68f576b10d499f67c43a9dc466c56bd7..35d595572fc5cb882e24cc7160aaa064e4d7d253 100644
|
| --- a/ui/gfx/icon_util.cc
|
| +++ b/ui/gfx/icon_util.cc
|
| @@ -297,8 +297,8 @@ bool IconUtil::CreateIconFileFromSkBitmap(const SkBitmap& bitmap,
|
| // If |large_bitmap| was specified, validate its dimension and convert to PNG.
|
| scoped_refptr<base::RefCountedMemory> png_bytes;
|
| if (!large_bitmap.empty()) {
|
| - DCHECK_EQ(256, large_bitmap.width());
|
| - DCHECK_EQ(256, large_bitmap.height());
|
| + CHECK_EQ(256, large_bitmap.width());
|
| + CHECK_EQ(256, large_bitmap.height());
|
| png_bytes = gfx::Image(large_bitmap).As1xPNGBytes();
|
| }
|
|
|
| @@ -331,7 +331,7 @@ bool IconUtil::CreateIconFileFromSkBitmap(const SkBitmap& bitmap,
|
| std::vector<uint8> buffer(buffer_size);
|
| ICONDIR* icon_dir = reinterpret_cast<ICONDIR*>(&buffer[0]);
|
| icon_dir->idType = kResourceTypeIcon;
|
| - icon_dir->idCount = bitmap_count;
|
| + icon_dir->idCount = static_cast<WORD>(bitmap_count);
|
| size_t icon_dir_count = bitmap_count - 1; // Note DCHECK(!bitmaps.empty())!
|
|
|
| // Increment counts if a PNG entry will be added.
|
| @@ -358,8 +358,8 @@ bool IconUtil::CreateIconFileFromSkBitmap(const SkBitmap& bitmap,
|
| entry->bHeight = 0;
|
| entry->wPlanes = 1;
|
| entry->wBitCount = 32;
|
| - entry->dwBytesInRes = png_bytes->size();
|
| - entry->dwImageOffset = offset;
|
| + entry->dwBytesInRes = static_cast<DWORD>(png_bytes->size());
|
| + entry->dwImageOffset = static_cast<DWORD>(offset);
|
| memcpy(&buffer[offset], png_bytes->front(), png_bytes->size());
|
| offset += png_bytes->size();
|
| }
|
|
|