| commit | f0b684d9b7b34b19ad3b8d31dce3d17264ad0706 | [log] [tgz] |
|---|---|---|
| author | Jack Palevich <jackpal@google.com> | Fri Jun 15 19:34:04 2012 +0800 |
| committer | Raphael Moll <ralf@android.com> | Fri Jun 15 17:07:40 2012 -0700 |
| tree | 776433576e27f32aaba50d8e8117c09a07f17fe0 | |
| parent | 70a2564660313a798b461a50b07dc029a6117ac0 [diff] |
Fix convert8To4, convert8To5 See b/5680952 "Compilation warnings in etc1.cpp" for discussion. This is a manual merge of an update that was made to frameworks/native/opengl/libs/ETC1/etc1.cpp. sdk/emulator/opengl/host/libs/Translator/GLcommon/etc1.cpp is an exact copy of frameworks/native/opengl/libs/ETC1/etc1.cpp, so we might as well keep the two versions in synch. Bug: 5680952 Change-Id: Icf5d5ed2e7c5c79eb9677d210b1ff5fee507271d