diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 18:46:26 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 18:46:26 +0000 |
| commit | 76b3af422d58822e17523064aca0a3de116a3457 (patch) | |
| tree | 312e948e14acfd7bbf63dfd3a6677b8625df80d2 /o3d/core/cross/bitmap.cc | |
| parent | 9a5bf36ab389af98120f9922bd191509321366da (diff) | |
| download | chromium_src-76b3af422d58822e17523064aca0a3de116a3457.zip chromium_src-76b3af422d58822e17523064aca0a3de116a3457.tar.gz chromium_src-76b3af422d58822e17523064aca0a3de116a3457.tar.bz2 | |
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
Diffstat (limited to 'o3d/core/cross/bitmap.cc')
| -rw-r--r-- | o3d/core/cross/bitmap.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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<int>(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<int>(src_img.num_mipmaps())) { O3D_ERROR(service_locator()) << "Source Mip out of range"; } |