diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-23 21:35:54 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-23 21:35:54 +0000 |
| commit | 840434d046cbaefb5a70875b7e364523c713c79b (patch) | |
| tree | b55362ca094f48705624af7f6812964d1faeda1c /o3d/plugin/idl | |
| parent | f17863106dd6715f2c18b6fcccacd5f232f95831 (diff) | |
| download | chromium_src-840434d046cbaefb5a70875b7e364523c713c79b.zip chromium_src-840434d046cbaefb5a70875b7e364523c713c79b.tar.gz chromium_src-840434d046cbaefb5a70875b7e364523c713c79b.tar.bz2 | |
These are code changes required to make the GYP build work.
Mostly these are fixes to warnings (signed/unsigned mismatches
were the most common), and some changes to include paths.
I've updated the build.scons files and DEPS file to match these
changes so that the scons build will still function with these
changes.
Review URL: http://codereview.chromium.org/146047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin/idl')
| -rw-r--r-- | o3d/plugin/idl/bounding_box.idl | 2 | ||||
| -rw-r--r-- | o3d/plugin/idl/texture.idl | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/o3d/plugin/idl/bounding_box.idl b/o3d/plugin/idl/bounding_box.idl index b8ac932..1904f59 100644 --- a/o3d/plugin/idl/bounding_box.idl +++ b/o3d/plugin/idl/bounding_box.idl @@ -143,7 +143,7 @@ class BoundingBox { O3D_ERROR(service_locator) << "BoundingBox: expected 2 values, got " << values.size(); } else { - for (int i = 0; i < values.size(); ++i) { + for (std::vector<float>::size_type i = 0; i < values.size(); ++i) { if (values[i].size() != 3) { o3d::ServiceLocator* service_locator = static_cast<glue::_o3d::PluginObject*>( diff --git a/o3d/plugin/idl/texture.idl b/o3d/plugin/idl/texture.idl index cc470c0..7039a9e 100644 --- a/o3d/plugin/idl/texture.idl +++ b/o3d/plugin/idl/texture.idl @@ -268,7 +268,7 @@ namespace o3d { source_x -= destination_x; destination_x = 0; } - if (destination_x + copy_width > texture_width) { + if (destination_x + copy_width > static_cast<int>(texture_width)) { copy_width -= destination_x + copy_width - texture_width; } @@ -277,7 +277,7 @@ namespace o3d { source_y -= destination_y; destination_y = 0; } - if (destination_y + copy_height > texture_height) { + if (destination_y + copy_height > static_cast<int>(texture_height)) { copy_height -= destination_y + copy_height - texture_height; } @@ -303,7 +303,7 @@ namespace o3d { (destination_y * texture_width + destination_x) * num_components; while (copy_height > 0) { for (int xx = 0; xx < copy_width; ++xx) { - for (int element = 0; element < num_components; ++element) { + for (unsigned element = 0; element < num_components; ++element) { destination[element] = Vectormath::Aos::FloatToHalf( source[swizzle[element]]); } @@ -323,7 +323,7 @@ namespace o3d { (destination_y * texture_width + destination_x) * num_components; while (copy_height > 0) { for (int xx = 0; xx < copy_width; ++xx) { - for (int element = 0; element < num_components; ++element) { + for (unsigned element = 0; element < num_components; ++element) { destination[element] = source[swizzle[element]]; } destination += num_components; |