diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 22:17:39 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 22:17:39 +0000 |
| commit | 6a60ae4c2967bae910cbd1a1ff5a53c5f7d78a19 (patch) | |
| tree | ac02524310011c60f7d4f5255f1df5b592b4ca5c /o3d/core/cross/bitmap.cc | |
| parent | 05c453db1e7a357eb2cc1b6ac67ff32a5256bb19 (diff) | |
| download | chromium_src-6a60ae4c2967bae910cbd1a1ff5a53c5f7d78a19.zip chromium_src-6a60ae4c2967bae910cbd1a1ff5a53c5f7d78a19.tar.gz chromium_src-6a60ae4c2967bae910cbd1a1ff5a53c5f7d78a19.tar.bz2 | |
This completes the building of o3d.msi from the GYP build.
Review URL: http://codereview.chromium.org/164044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22680 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 e44f5d9..8069451 100644 --- a/o3d/core/cross/bitmap.cc +++ b/o3d/core/cross/bitmap.cc @@ -403,11 +403,11 @@ void Bitmap::DrawImage(const Bitmap& src_img, void Bitmap::GenerateMips(int source_level, int num_levels) { - if (source_level >= num_mipmaps() || source_level < 0) { + if (source_level >= static_cast<int>(num_mipmaps()) || source_level < 0) { O3D_ERROR(service_locator()) << "source level out of range."; return; } - if (source_level + num_levels >= num_mipmaps() || num_levels < 0) { + if (source_level + num_levels >= static_cast<int>(num_mipmaps()) || num_levels < 0) { O3D_ERROR(service_locator()) << "num levels out of range."; return; } |