OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c4d605f
)
Fix convert8To4, convert8To5
author
Jack Palevich
<jackpal@google.com>
Fri, 9 Dec 2011 22:06:07 +0000
(14:06 -0800)
committer
Jack Palevich
<jackpal@google.com>
Fri, 9 Dec 2011 22:06:07 +0000
(14:06 -0800)
See b/
5680952
"Compilation warnings in etc1.cpp" for discussion.
Fixes b/
5680952
Change-Id: I0af6ba5ed5e60f3ed7a6a28eba3b09504fee1a3f
opengl/libs/ETC1/etc1.cpp
patch
|
blob
|
history
diff --git
a/opengl/libs/ETC1/etc1.cpp
b/opengl/libs/ETC1/etc1.cpp
index
5ed2c3c
..
97d1085
100644
(file)
--- 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