commit 9829cceca11a0fc92ab1318ce32b4d4dae8d347d
author Alex Sakhartchouk <alexst@google.com> Mon Nov 07 09:53:28 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 07 09:53:28 2011 -0800
tree c610620dfbbed5e4a2b7509337374c966cecb29d
parent 01b35d7b1c70e23b89fe642577ef2e2446bde12a
parent fc5e224e8dcc878606e47ba3d834be0a79498ac6

Merge "Properly passing an unused variable through."

opengl/java/android/opengl/ETC1Util.java

diff --git a/opengl/java/android/opengl/ETC1Util.java b/opengl/java/android/opengl/ETC1Util.java
index 3629d41..e343c97 100644
--- a/opengl/java/android/opengl/ETC1Util.java
+++ b/opengl/java/android/opengl/ETC1Util.java
@@ -193,7 +193,7 @@
         int encodedImageSize = ETC1.getEncodedDataSize(width, height);
         ByteBuffer compressedImage = ByteBuffer.allocateDirect(encodedImageSize).
             order(ByteOrder.nativeOrder());
-        ETC1.encodeImage(input, width, height, 3, stride, compressedImage);
+        ETC1.encodeImage(input, width, height, pixelSize, stride, compressedImage);
         return new ETC1Texture(width, height, compressedImage);
     }