commit 4d61f7edade0f237b5f009b8c0df08b59845d77a
author Cooper Partin <coopp@microsoft.com> Wed Aug 12 10:56:50 2015 -0700
committer Geoff Lang <geofflang@chromium.org> Thu Aug 13 13:28:42 2015 +0000
tree 1deb2c80824668380fd7584e0f56290e5ecb1152
parent fd00ccff1219e35dddee176af3d289582c08bd9f

Reland Fixed compiler warning C4267 'conversion from 'size_t' to 'type', possible loss of data'
Additional warnings found with more testing and added C4267 warning disable only for angle_libpng

BUG=angleproject:1120

Change-Id: Ic403dcff5a8018056fa51a8c408e64207f3362eb
Reviewed-on: https://chromium-review.googlesource.com/293028
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>

src/tests/gl_tests/PbufferTest.cpp

diff --git a/src/tests/gl_tests/PbufferTest.cpp b/src/tests/gl_tests/PbufferTest.cpp
index 35d91c9..ab08078 100644
--- a/src/tests/gl_tests/PbufferTest.cpp
+++ b/src/tests/gl_tests/PbufferTest.cpp
@@ -136,11 +136,12 @@
     eglMakeCurrent(window->getDisplay(), mPbuffer, mPbuffer, window->getContext());
     ASSERT_EGL_SUCCESS();
 
-    glViewport(0, 0, mPbufferSize, mPbufferSize);
+    glViewport(0, 0, static_cast<GLsizei>(mPbufferSize), static_cast<GLsizei>(mPbufferSize));
     glClearColor(1.0f, 0.0f, 1.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT);
     ASSERT_GL_NO_ERROR();
-    EXPECT_PIXEL_EQ(mPbufferSize / 2, mPbufferSize / 2, 255, 0, 255, 255);
+    EXPECT_PIXEL_EQ(static_cast<GLint>(mPbufferSize) / 2, static_cast<GLint>(mPbufferSize) / 2, 255,
+                    0, 255, 255);
 
     // Rebind the window surface and verify that it is still blue
     eglMakeCurrent(window->getDisplay(), window->getSurface(), window->getSurface(), window->getContext());
@@ -169,12 +170,13 @@
     eglMakeCurrent(window->getDisplay(), mPbuffer, mPbuffer, window->getContext());
     ASSERT_EGL_SUCCESS();
 
-    glViewport(0, 0, mPbufferSize, mPbufferSize);
+    glViewport(0, 0, static_cast<GLsizei>(mPbufferSize), static_cast<GLsizei>(mPbufferSize));
     glClearColor(1.0f, 0.0f, 1.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT);
     ASSERT_GL_NO_ERROR();
 
-    EXPECT_PIXEL_EQ(mPbufferSize / 2, mPbufferSize / 2, 255, 0, 255, 255);
+    EXPECT_PIXEL_EQ(static_cast<GLint>(mPbufferSize) / 2, static_cast<GLint>(mPbufferSize) / 2, 255,
+                    0, 255, 255);
 
     // Apply the window surface
     eglMakeCurrent(window->getDisplay(), window->getSurface(), window->getSurface(), window->getContext());
@@ -240,7 +242,8 @@
 
     // Fill the texture with white pixels
     std::vector<GLubyte> whitePixels(mPbufferSize * mPbufferSize * 4, 255);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, mPbufferSize, mPbufferSize, 0, GL_RGBA, GL_UNSIGNED_BYTE, &whitePixels[0]);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, static_cast<GLsizei>(mPbufferSize),
+                 static_cast<GLsizei>(mPbufferSize), 0, GL_RGBA, GL_UNSIGNED_BYTE, &whitePixels[0]);
     EXPECT_GL_NO_ERROR();
 
     // Draw the white texture and verify that the pixels are correct
@@ -287,12 +290,13 @@
     eglMakeCurrent(window->getDisplay(), mPbuffer, mPbuffer, window->getContext());
     ASSERT_EGL_SUCCESS();
 
-    glViewport(0, 0, mPbufferSize, mPbufferSize);
+    glViewport(0, 0, static_cast<GLsizei>(mPbufferSize), static_cast<GLsizei>(mPbufferSize));
     glClearColor(1.0f, 0.0f, 1.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT);
     ASSERT_GL_NO_ERROR();
 
-    EXPECT_PIXEL_EQ(mPbufferSize / 2, mPbufferSize / 2, 255, 0, 255, 255);
+    EXPECT_PIXEL_EQ(static_cast<GLint>(mPbufferSize) / 2, static_cast<GLint>(mPbufferSize) / 2, 255,
+                    0, 255, 255);
 
     // Apply the window surface
     eglMakeCurrent(window->getDisplay(), window->getSurface(), window->getSurface(), window->getContext());