From 76b3af422d58822e17523064aca0a3de116a3457 Mon Sep 17 00:00:00 2001 From: "maf@google.com" Date: Wed, 19 Aug 2009 18:46:26 +0000 Subject: Changes needed to make "all" build complete, including fixing the generated converter tool. Review URL: http://codereview.chromium.org/173045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23721 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 f2c96a0..1672a4e 100644 --- a/o3d/core/cross/bitmap.cc +++ b/o3d/core/cross/bitmap.cc @@ -344,11 +344,11 @@ void Bitmap::DrawImage(const Bitmap& src_img, DCHECK(src_img.image_data()); DCHECK(image_data()); - if (dst_level < 0 || dst_level >= num_mipmaps()) { + if (dst_level < 0 || dst_level >= static_cast(num_mipmaps())) { O3D_ERROR(service_locator()) << "Destination Mip out of range"; } - if (src_level < 0 || src_level >= src_img.num_mipmaps()) { + if (src_level < 0 || src_level >= static_cast(src_img.num_mipmaps())) { O3D_ERROR(service_locator()) << "Source Mip out of range"; } -- cgit v1.1