diff options
| author | kamil.jiwa@gmail.com <kamil.jiwa@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-03 12:30:52 +0000 |
|---|---|---|
| committer | kamil.jiwa@gmail.com <kamil.jiwa@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-03 12:30:52 +0000 |
| commit | 1885369433d7d51a164afbe73758752eb6c753d6 (patch) | |
| tree | 4226717c545b9d9af840975c6e43129eb933fe37 /gpu | |
| parent | 17e2bb91bb4a692972d55e116549676493978cd0 (diff) | |
| download | chromium_src-1885369433d7d51a164afbe73758752eb6c753d6.zip chromium_src-1885369433d7d51a164afbe73758752eb6c753d6.tar.gz chromium_src-1885369433d7d51a164afbe73758752eb6c753d6.tar.bz2 | |
Small fixes to allow unit tests to compile with gcc 4.7.x (tested with gcc 4.7.2)
Review URL: https://chromiumcodereview.appspot.com/11568033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/tests/gl_pointcoord_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gpu/command_buffer/tests/gl_pointcoord_unittest.cc b/gpu/command_buffer/tests/gl_pointcoord_unittest.cc index cf41927..5073ad3 100644 --- a/gpu/command_buffer/tests/gl_pointcoord_unittest.cc +++ b/gpu/command_buffer/tests/gl_pointcoord_unittest.cc @@ -40,10 +40,10 @@ GLuint PointCoordTest::SetupQuad( glGenBuffers(1, &vbo); glBindBuffer(GL_ARRAY_BUFFER, vbo); float vertices[] = { - -0.5 + pixel_offset, -0.5 + pixel_offset, - 0.5 + pixel_offset, -0.5 + pixel_offset, - -0.5 + pixel_offset, 0.5 + pixel_offset, - 0.5 + pixel_offset, 0.5 + pixel_offset, + -0.5f + pixel_offset, -0.5f + pixel_offset, + 0.5f + pixel_offset, -0.5f + pixel_offset, + -0.5f + pixel_offset, 0.5f + pixel_offset, + 0.5f + pixel_offset, 0.5f + pixel_offset, }; glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW); glEnableVertexAttribArray(position_location); @@ -136,8 +136,8 @@ TEST_F(PointCoordTest, MAYBE_RenderTo) { GLfloat s = 0.5 + (xf + 0.5 - xw) / max_point_size; GLfloat t = 0.5 + (yf + 0.5 - yw) / max_point_size; uint8 color[4] = { - s * 255, - (1 - t) * 255, + static_cast<uint8>(s * 255), + static_cast<uint8>((1 - t) * 255), 0, 255, }; |