From d30ff7484cf66d781dfa74bc979065f690cb8473 Mon Sep 17 00:00:00 2001 From: "gspencer@google.com" Date: Tue, 4 Aug 2009 00:08:32 +0000 Subject: This fixes some things that crept into the build as the scons build changed. Review URL: http://codereview.chromium.org/160557 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22350 0039d316-1c4b-4281-b951-d872f2087c98 --- o3d/core/cross/bitmap.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'o3d/core/cross/bitmap.cc') diff --git a/o3d/core/cross/bitmap.cc b/o3d/core/cross/bitmap.cc index 4dbf330..31ba128 100644 --- a/o3d/core/cross/bitmap.cc +++ b/o3d/core/cross/bitmap.cc @@ -194,7 +194,7 @@ void Bitmap::SetRect( const void* src_data, int src_pitch) { DCHECK(src_data); - DCHECK(level < num_mipmaps() && level >= 0); + DCHECK(level < static_cast(num_mipmaps()) && level >= 0); unsigned mip_width; unsigned mip_height; Bitmap::GetMipSize(level, width(), height(), &mip_width, &mip_height); @@ -236,7 +236,7 @@ void Bitmap::SetFaceRect( const void* src_data, int src_pitch) { DCHECK(src_data); - DCHECK(level < num_mipmaps() && level >= 0); + DCHECK(level < static_cast(num_mipmaps()) && level >= 0); unsigned mip_width; unsigned mip_height; Bitmap::GetMipSize(level, width(), height(), &mip_width, &mip_height); -- cgit v1.1