diff options
| author | Jack Palevich <jackpal@google.com> | 2011-12-09 14:06:07 -0800 |
|---|---|---|
| committer | Jack Palevich <jackpal@google.com> | 2011-12-09 14:06:07 -0800 |
| commit | 0501f8a913e43f78ef7909346424f3264d03f8ea (patch) | |
| tree | a473a0e45b8f0f5e7ea9f6dcc9767ce17238f914 /opengl | |
| parent | bfda435744fc110ba2c6ac070a09394a8608a422 (diff) | |
| download | frameworks_base-0501f8a913e43f78ef7909346424f3264d03f8ea.zip frameworks_base-0501f8a913e43f78ef7909346424f3264d03f8ea.tar.gz frameworks_base-0501f8a913e43f78ef7909346424f3264d03f8ea.tar.bz2 | |
Fix convert8To4, convert8To5
See b/5680952 "Compilation warnings in etc1.cpp" for discussion.
Fixes b/5680952
Change-Id: I0af6ba5ed5e60f3ed7a6a28eba3b09504fee1a3f
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/ETC1/etc1.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/libs/ETC1/etc1.cpp b/opengl/libs/ETC1/etc1.cpp index 5ed2c3c..97d1085 100644 --- a/opengl/libs/ETC1/etc1.cpp +++ b/opengl/libs/ETC1/etc1.cpp @@ -149,13 +149,13 @@ inline int divideBy255(int d) { static inline int convert8To4(int b) { int c = b & 0xff; - return divideBy255(b * 15); + return divideBy255(c * 15); } static inline int convert8To5(int b) { int c = b & 0xff; - return divideBy255(b * 31); + return divideBy255(c * 31); } static |