diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-11 23:02:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 23:02:01 +0000 |
| commit | 2965dab9091382803430a0607118e20e93d2bd1d (patch) | |
| tree | 171368ac803c8ec49dea700767f57f7c00f0e5c1 /opengl/tests/linetex/linetex.cpp | |
| parent | d9799072de47ecd3e6d4cdb2bfd3db75f4d94bd5 (diff) | |
| parent | bceb29c83ea54d38b38e40d66402e56364cff56b (diff) | |
| download | frameworks_native-2965dab9091382803430a0607118e20e93d2bd1d.zip frameworks_native-2965dab9091382803430a0607118e20e93d2bd1d.tar.gz frameworks_native-2965dab9091382803430a0607118e20e93d2bd1d.tar.bz2 | |
am bceb29c8: Merge "Fix clang -Wc++11-narrowing warnings."
* commit 'bceb29c83ea54d38b38e40d66402e56364cff56b':
Fix clang -Wc++11-narrowing warnings.
Diffstat (limited to 'opengl/tests/linetex/linetex.cpp')
| -rw-r--r-- | opengl/tests/linetex/linetex.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/opengl/tests/linetex/linetex.cpp b/opengl/tests/linetex/linetex.cpp index 7921f80..5ad695b 100644 --- a/opengl/tests/linetex/linetex.cpp +++ b/opengl/tests/linetex/linetex.cpp @@ -80,9 +80,11 @@ int main(int argc, char** argv) // default pack-alignment is 4 const uint16_t t16[64] = { 0xFFFF, 0, 0xF800, 0, 0x07E0, 0, 0x001F, 0 }; + const GLfloat fh = h; + const GLfloat fw2 = w/2; const GLfloat vertices[4][2] = { - { w/2, 0 }, - { w/2, h } + { fw2, 0 }, + { fw2, fh } }; const GLfloat texCoords[4][2] = { |