diff options
| -rw-r--r-- | o3d/DEPS_gyp | 5 | ||||
| -rw-r--r-- | o3d/core/cross/bitmap.cc | 4 | ||||
| -rw-r--r-- | o3d/import/archive.gyp | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp index 8e823a9..404768b 100644 --- a/o3d/DEPS_gyp +++ b/o3d/DEPS_gyp @@ -1,6 +1,6 @@ vars = { "chromium_trunk": "http://src.chromium.org/svn/trunk", - "nixysa_rev": "28", + "nixysa_rev": "29", "chromium_rev": "21287", "o3d_code_rev": "109", "skia_rev": "279", @@ -31,6 +31,9 @@ deps = { "third_party/jsdoctoolkit": "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jsdoctoolkit@" + Var("o3d_code_rev"), + "third_party/libevent": + "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/libevent@" + Var("o3d_code_rev"), + "third_party/pdiff": "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pdiff@" + Var("o3d_code_rev"), 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<int>(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<int>(num_mipmaps()) && level >= 0); unsigned mip_width; unsigned mip_height; Bitmap::GetMipSize(level, width(), height(), &mip_width, &mip_height); diff --git a/o3d/import/archive.gyp b/o3d/import/archive.gyp index b2e2fc6..7465206 100644 --- a/o3d/import/archive.gyp +++ b/o3d/import/archive.gyp @@ -65,7 +65,7 @@ 'cross/raw_data_test.cc', 'cross/tar_processor_test.cc', 'cross/targz_processor_test.cc', - 'thread_stream_processor_test.cc', + 'cross/threaded_stream_processor_test.cc', ], }, 'copies': [ |