diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-28 20:08:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-28 20:08:43 -0700 |
| commit | bf049a6aaf4e012064e6a047cbb51bc843165a7d (patch) | |
| tree | 0bdf0e5f65a20a9b0328790686722604588af7ba /src/com | |
| parent | 33c0d192e51fc2cf776ce19666907c7a751c9222 (diff) | |
| parent | 9b551f035a4bf9fede311b735b8a3c9bfcff5cda (diff) | |
| download | android_packages_apps_Gallery2-bf049a6aaf4e012064e6a047cbb51bc843165a7d.tar.gz android_packages_apps_Gallery2-bf049a6aaf4e012064e6a047cbb51bc843165a7d.tar.bz2 android_packages_apps_Gallery2-bf049a6aaf4e012064e6a047cbb51bc843165a7d.zip | |
Merge "SnapdragonGallery:Fix gallery crash while loading content" into android_ui.lnx.2.1-dev
Diffstat (limited to 'src/com')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/gallery3d/glrenderer/GLES11Canvas.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/glrenderer/GLES11Canvas.java b/src/com/android/gallery3d/glrenderer/GLES11Canvas.java index 7013c3d1f..38ee50a5e 100644..100755 --- a/src/com/android/gallery3d/glrenderer/GLES11Canvas.java +++ b/src/com/android/gallery3d/glrenderer/GLES11Canvas.java @@ -24,6 +24,7 @@ import android.opengl.GLUtils; import android.opengl.Matrix; import android.util.Log; +import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.common.Utils; import com.android.gallery3d.util.IntArray; @@ -617,7 +618,11 @@ public class GLES11Canvas implements GLCanvas { gl.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA); // We use 565 or 8888 format, so set the alignment to 2 bytes/pixel. - gl.glPixelStorei(GL11.GL_UNPACK_ALIGNMENT, 2); + if (ApiHelper.USE_888_PIXEL_FORMAT) { + gl.glPixelStorei(GL11.GL_UNPACK_ALIGNMENT, 2); + } else { + gl.glPixelStorei(GL11.GL_UNPACK_ALIGNMENT, 1); + } } public void setTexEnvMode(int mode) { |